diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /app-admin/conserver/files | |
parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) |
gentoo resync : 19.03.2019
Diffstat (limited to 'app-admin/conserver/files')
-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.confd-r1 | 5 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver.initd | 4 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver.initd-r1 | 39 |
5 files changed, 77 insertions, 33 deletions
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 new file mode 100644 index 000000000000..f3054a9a0dac --- /dev/null +++ b/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch @@ -0,0 +1,40 @@ +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 new file mode 100644 index 000000000000..0a42987135b1 --- /dev/null +++ b/app-admin/conserver/files/conserver-8.2.2-time-argument.patch @@ -0,0 +1,22 @@ +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.confd-r1 b/app-admin/conserver/files/conserver.confd-r1 new file mode 100644 index 000000000000..119ceb060063 --- /dev/null +++ b/app-admin/conserver/files/conserver.confd-r1 @@ -0,0 +1,5 @@ +# Config file for /etc/init.d/conserver +# check CONSERVER(8) for details + +#CONSERVER_LOG="/var/log/conserver.log" +#CONSERVER_OPTS="" diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd index 0c0771c72c6b..841892672cc2 100644 --- a/app-admin/conserver/files/conserver.initd +++ b/app-admin/conserver/files/conserver.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { @@ -25,7 +25,7 @@ checkconfig() { start() { checkconfig || return 1 ebegin "Starting conserver" - start-stop-daemon --start --quiet --exec \ + start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \ /usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null eend $? "Failed to start conserver" } diff --git a/app-admin/conserver/files/conserver.initd-r1 b/app-admin/conserver/files/conserver.initd-r1 index 907b1b711705..839aae6825df 100644 --- a/app-admin/conserver/files/conserver.initd-r1 +++ b/app-admin/conserver/files/conserver.initd-r1 @@ -1,37 +1,14 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { - need clock + need clock localmount + use net } -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" -} +command="/usr/sbin/conserver" +command_args="-d -L ${CONSERVER_LOG:-/var/log/${RC_SVCNAME}.log} ${CONSERVER_OPTS}" +command_background="true" +pidfile="/run/${RC_SVCNAME}.pid" +required_files="/etc/conserver/${RC_SVCNAME}.cf /etc/conserver/${RC_SVCNAME}.passwd" |