diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
commit | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch) | |
tree | 2878053f3e7faed19a1f82c733d3bd29df69991e /app-admin/conserver/files | |
parent | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff) |
gentoo resync : 08.06.2019
Diffstat (limited to 'app-admin/conserver/files')
-rw-r--r-- | app-admin/conserver/files/8.2.3-libressl.patch | 31 | ||||
-rw-r--r-- | app-admin/conserver/files/8.2.4-libressl.patch | 27 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver-8.1.18-dmalloc.patch | 100 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch | 40 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver-8.2.2-time-argument.patch | 22 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver-prestrip.patch | 24 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver.confd | 6 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver.initd | 37 |
8 files changed, 58 insertions, 229 deletions
diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch new file mode 100644 index 000000000000..8b04acb7b88c --- /dev/null +++ b/app-admin/conserver/files/8.2.3-libressl.patch @@ -0,0 +1,31 @@ +From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Thu, 6 Jun 2019 21:30:16 -0700 +Subject: [PATCH] libressl + +backport of https://github.com/conserver/conserver/pull/26 +--- + conserver/cutil.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/conserver/cutil.h b/conserver/cutil.h +index 63aef65..07aa6d4 100644 +--- a/conserver/cutil.h ++++ b/conserver/cutil.h +@@ -12,10 +12,12 @@ + # include <openssl/err.h> + # if OPENSSL_VERSION_NUMBER < 0x10100000L + # define TLS_method SSLv23_method ++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + # define CIPHER_SEC0 + # else + # define CIPHER_SEC0 ":@SECLEVEL=0" +-# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ + #endif + #if HAVE_GSSAPI + # include <gssapi/gssapi.h> +-- +2.21.0 + diff --git a/app-admin/conserver/files/8.2.4-libressl.patch b/app-admin/conserver/files/8.2.4-libressl.patch new file mode 100644 index 000000000000..9151d697e756 --- /dev/null +++ b/app-admin/conserver/files/8.2.4-libressl.patch @@ -0,0 +1,27 @@ +From d3ffe500c934573115e313ac01b8fab5cb4d2e9f Mon Sep 17 00:00:00 2001 +From: Stuart Henderson <stu@spacehopper.org> +Date: Wed, 27 Mar 2019 23:29:31 +0000 +Subject: [PATCH] fix TLS with LibreSSL, it doesn't have :@SECLEVEL=0 + +--- + conserver/cutil.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/conserver/cutil.h b/conserver/cutil.h +index d21abc5..db4df7f 100644 +--- a/conserver/cutil.h ++++ b/conserver/cutil.h +@@ -12,10 +12,12 @@ + # include <openssl/err.h> + # if OPENSSL_VERSION_NUMBER < 0x10100000L + # define TLS_method SSLv23_method ++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + # define CIPHER_SEC0 + # else + # define CIPHER_SEC0 ":@SECLEVEL=0" +-# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ + #endif + #if HAVE_GSSAPI + # include <gssapi/gssapi.h> diff --git a/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch deleted file mode 100644 index ff82f74b261c..000000000000 --- a/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- configure.in 2011-08-19 01:11:06.000000000 -0400 -+++ configure.in 2011-08-19 02:06:50.000000000 -0400 -@@ -320,6 +320,8 @@ - AC_PROG_LN_S - AC_PROG_MAKE_SET - -+AM_WITH_DMALLOC([cons_with_dmalloc="YES"],[cons_with_dmalloc="NO"]) -+ - dnl ### Compiler characteristics. ################################## - AC_AIX - AC_C_CONST -@@ -578,51 +580,6 @@ - fi] - ) - --cons_with_dmalloc="NO" --AC_ARG_WITH(dmalloc, -- AS_HELP_STRING([--with-dmalloc@<:@=PATH@:>@], -- [Compile in dmalloc support]), -- [if test "$withval" != "no"; then -- if test "$withval" != "yes"; then -- DMALLOCCPPFLAGS="-I$withval/include" -- if test "$use_dash_r" != "yes"; then -- DMALLOCLDFLAGS="-L$withval/lib" -- else -- DMALLOCLDFLAGS="-L$withval/lib -R$withval/lib" -- fi -- else -- DMALLOCCPPFLAGS="" -- DMALLOCLDFLAGS="" -- fi -- -- oCPPFLAGS="$CPPFLAGS" -- oLDFLAGS="$LDFLAGS" -- oLIBS="$LIBS" -- have_dmalloc=no -- -- CPPFLAGS="$CPPFLAGS $DMALLOCCPPFLAGS" -- LDFLAGS="$LDFLAGS $DMALLOCLDFLAGS" -- -- AC_CHECK_HEADER([dmalloc.h], -- [LIBS="$LIBS -ldmalloc" -- AC_MSG_CHECKING(for dmalloc libraries -ldmalloc) -- AC_TRY_LINK([#include <dmalloc.h> -- ],[dmalloc_debug(0)], -- [AC_MSG_RESULT(yes) -- cons_with_dmalloc="YES" -- AC_DEFINE(HAVE_DMALLOC) -- have_dmalloc=yes], -- [AC_MSG_RESULT(no)])],) -- -- if test $have_dmalloc = no; then -- LIBS="$oLIBS" -- CPPFLAGS="$oCPPFLAGS" -- LDFLAGS="$oLDFLAGS" -- fi -- fi] --) -- -- - dnl ### Check for needed functions. ################################ - - dnl dnl The following basically stollen from the less-358 distribution, but ---- /dev/null 2011-08-07 13:18:05.535976733 -0400 -+++ m4/dmalloc.m4 2011-08-19 03:49:03.755073497 -0400 -@@ -0,0 +1,34 @@ -+## ----------------------------------- ## -*- Autoconf -*- -+## Check if --with-dmalloc was given. ## -+## From Franc,ois Pinard ## -+## ----------------------------------- ## -+ -+# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010, -+# 2011 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 7 -+ -+dnl AM_WITH_DMALLOC([ACTION-IF-FOUND],[ACTION-IF-NOT]) -+AC_DEFUN([AM_WITH_DMALLOC], -+[AC_MSG_CHECKING([if malloc debugging is wanted]) -+AC_ARG_WITH([dmalloc], -+[AS_HELP_STRING([--with-dmalloc], -+ [use dmalloc, as in http://www.dmalloc.com])], -+[if test "$withval" = yes; then -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE([WITH_DMALLOC], [1], -+ [Define if using the dmalloc debugging malloc package]) -+ LIBS="$LIBS -ldmalloc" -+ LDFLAGS="$LDFLAGS -g" -+ [$1] -+else -+ AC_MSG_RESULT([no]) -+ [$2] -+fi], [AC_MSG_RESULT([no])]) -+]) -+ -+AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC]) diff --git a/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch b/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch deleted file mode 100644 index f3054a9a0dac..000000000000 --- a/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/configure.in b/configure.in -index a060811..00b7f8b 100644 ---- a/configure.in -+++ b/configure.in -@@ -535,7 +535,7 @@ AC_ARG_WITH(openssl, - [LIBS="$LIBS -lssl -lcrypto" - AC_MSG_CHECKING(for openssl libraries -lssl and -lcrypto) - AC_TRY_LINK([#include <openssl/ssl.h> -- ],[SSL_library_init()], -+ ],[SSL_CTX_new(NULL)], - [AC_MSG_RESULT(yes) - cons_with_openssl="YES" - AC_DEFINE(HAVE_OPENSSL) -diff --git a/conserver/cutil.c b/conserver/cutil.c -index af8196c..dcfe333 100644 ---- a/conserver/cutil.c -+++ b/conserver/cutil.c -@@ -57,7 +57,9 @@ Bye(int status) - { - DestroyDataStructures(); - #if HAVE_OPENSSL -+# if OPENSSL_VERSION_NUMBER < 0x10100000L - ERR_free_strings(); -+# endif - #endif - exit(status); - } -diff --git a/conserver/cutil.h b/conserver/cutil.h -index 899da7a..63aef65 100644 ---- a/conserver/cutil.h -+++ b/conserver/cutil.h -@@ -7,6 +7,8 @@ - #include <stdarg.h> - #if HAVE_OPENSSL - # include <openssl/ssl.h> -+# include <openssl/bn.h> -+# include <openssl/dh.h> - # include <openssl/err.h> - # if OPENSSL_VERSION_NUMBER < 0x10100000L - # define TLS_method SSLv23_method diff --git a/app-admin/conserver/files/conserver-8.2.2-time-argument.patch b/app-admin/conserver/files/conserver-8.2.2-time-argument.patch deleted file mode 100644 index 0a42987135b1..000000000000 --- a/app-admin/conserver/files/conserver-8.2.2-time-argument.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 3d9d5509c90524256861dd7cf0b7c0c6fdf5424a Mon Sep 17 00:00:00 2001 -From: Ed Maste <emaste@freebsd.org> -Date: Wed, 10 Oct 2018 12:56:26 -0400 -Subject: [PATCH] Correct argument type passed to time() - ---- - conserver/readcfg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/conserver/readcfg.c b/conserver/readcfg.c -index 949b9bf..d5bb90a 100644 ---- a/conserver/readcfg.c -+++ b/conserver/readcfg.c -@@ -3116,7 +3116,7 @@ ConsoleAdd(CONSENT *c) - pCEmatch->logfilemax = c->logfilemax; - if (pCEmatch->logfilemax != (off_t) 0 && - timers[T_ROLL] == (time_t)0) -- timers[T_ROLL] = time((time_t)0); -+ timers[T_ROLL] = time((time_t *)0); - - SwapStr(&pCEmatch->motd, &c->motd); - SwapStr(&pCEmatch->idlestring, &c->idlestring); diff --git a/app-admin/conserver/files/conserver-prestrip.patch b/app-admin/conserver/files/conserver-prestrip.patch deleted file mode 100644 index e67c49da1a66..000000000000 --- a/app-admin/conserver/files/conserver-prestrip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nuar conserver-8.1.14.orig/conserver/Makefile.in conserver-8.1.14/conserver/Makefile.in ---- conserver-8.1.14.orig/conserver/Makefile.in 2006-10-25 17:41:00.398082243 -0600 -+++ conserver-8.1.14/conserver/Makefile.in 2006-10-25 17:41:27.876759095 -0600 -@@ -13,7 +13,7 @@ - - ### Installation programs and flags - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - LN_S = @LN_S@ - MKDIR = @MKDIR@ - -diff -Nuar conserver-8.1.14.orig/console/Makefile.in conserver-8.1.14/console/Makefile.in ---- conserver-8.1.14.orig/console/Makefile.in 2006-10-25 17:41:00.401081662 -0600 -+++ conserver-8.1.14/console/Makefile.in 2006-10-25 17:41:18.188635834 -0600 -@@ -9,7 +9,7 @@ - - ### Installation programs and flags - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - LN_S = @LN_S@ - MKDIR = @MKDIR@ - diff --git a/app-admin/conserver/files/conserver.confd b/app-admin/conserver/files/conserver.confd deleted file mode 100644 index 4544fed4ab36..000000000000 --- a/app-admin/conserver/files/conserver.confd +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -## Config file for /etc/init.d/conserver - -CONSERVER_OPTS="-d" diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd deleted file mode 100644 index 841892672cc2..000000000000 --- a/app-admin/conserver/files/conserver.initd +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need clock -} - -checkconfig() { - if [ ! -e /etc/conserver/conserver.cf ] ; then - eerror "You need to create /etc/conserver/conserver.cf first." - eerror "A sample is placed there to be renamed and ajusted." - eerror "Read the man page or see /usr/share/doc/conserver-<version>/." - return 1 - fi - - if [ ! -e /etc/conserver/conserver.passwd ] ; then - eerror "You need to create /etc/conserver/conserver.passwd first." - eerror "A sample is placed there to be renamed and ajusted." - eerror "Read the man page or see /usr/share/doc/conserver-<version>/." - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting conserver" - start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \ - /usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null - eend $? "Failed to start conserver" -} - -stop() { - ebegin "Stopping conserver" - start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid - eend $? "Failed to stop conserver" -} |