diff options
| -rw-r--r-- | app-admin/conserver/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/conserver/conserver-8.1.18-r1.ebuild | 89 | ||||
| -rw-r--r-- | app-admin/conserver/conserver-8.2.2.ebuild | 100 | ||||
| -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 |
9 files changed, 0 insertions, 420 deletions
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest index 63941d73e1e3..037203a6f0f3 100644 --- a/app-admin/conserver/Manifest +++ b/app-admin/conserver/Manifest @@ -1,4 +1,2 @@ -DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f -DIST conserver-8.2.2.tar.gz 329048 BLAKE2B 0148a5b5b11fcc75a071b9759e129a94f1fe623df35e7549e967d0037ddb378447623070ce43429daf4868308be150f5ba318354e3181d94ccb1199655231373 SHA512 7c59dc59e59e3ee0172b2a52214cd8dd83383168fe0f145870d128b900a012cfa38c2f1ae85769c226d941ca1a764f93ec3bf353da896537ae1be5b6bc17e6c6 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild deleted file mode 100644 index 53a8cd7fd301..000000000000 --- a/app-admin/conserver/conserver-8.1.18-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit ssl-cert eutils pam autotools - -DESCRIPTION="Serial Console Manager" -HOMEPAGE="https://www.conserver.com/" -SRC_URI="https://www.conserver.com/${P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86" -IUSE="kerberos libressl pam ssl tcpd debug" - -DEPEND="ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - pam? ( virtual/pam ) - tcpd? ( sys-apps/tcp-wrappers ) - debug? ( dev-libs/dmalloc ) - kerberos? ( - virtual/krb5 - net-libs/libgssglue - )" -RDEPEND="${DEPEND} - pam? ( >=sys-auth/pambase-20080219.1 )" - -src_prepare() { - # Apply patch to prevent package from stripping binaries - epatch "${FILESDIR}"/${PN}-prestrip.patch - - # Apply patch to use custom dmalloc macro - epatch "${FILESDIR}"/${P}-dmalloc.patch - - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - econf \ - $(use_with ssl openssl) \ - $(use_with pam) \ - $(use_with tcpd libwrap) \ - $(use_with debug dmalloc) \ - $(use_with kerberos gssapi) \ - --with-logfile=/var/log/conserver.log \ - --with-pidfile=/var/run/conserver.pid \ - --with-cffile=conserver/conserver.cf \ - --with-pwdfile=conserver/conserver.passwd \ - --with-master=localhost \ - --with-port=7782 -} - -src_install() { - emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install - - ## create data directory - dodir /var/consoles - fowners daemon:daemon /var/consoles - fperms 700 /var/consoles - - ## add startup and sample config - newinitd "${FILESDIR}"/conserver.initd conserver - newconfd "${FILESDIR}"/conserver.confd conserver - - dodir /etc/conserver - fperms 700 /etc/conserver - insinto /etc/conserver - newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample - newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample - - ## add docs - dohtml conserver.html - dodoc CHANGES FAQ PROTOCOL README TODO - dodoc conserver/Sun-serial contrib/maketestcerts - newdoc conserver.cf/conserver.cf conserver.cf.sample - - # Add pam config - newpamd "${FILESDIR}"/conserver.pam-pambase conserver -} - -pkg_postinst() { - # Add certs if SSL use flag is enabled - if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then - install_cert /etc/ssl/conserver/conserver - fi -} diff --git a/app-admin/conserver/conserver-8.2.2.ebuild b/app-admin/conserver/conserver-8.2.2.ebuild deleted file mode 100644 index ceb5c721f569..000000000000 --- a/app-admin/conserver/conserver-8.2.2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools pam ssl-cert - -DESCRIPTION="Serial Console Manager" -HOMEPAGE="https://www.conserver.com" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD BSD-with-attribution" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd" - -DEPEND="debug? ( dev-libs/dmalloc:= ) - freeipmi? ( sys-libs/freeipmi:= ) - kerberos? ( - virtual/krb5 - net-libs/libgssglue - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - pam? ( virtual/pam ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND} - pam? ( sys-auth/pambase )" - -DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts) - -PATCHES=( - "${FILESDIR}/${P}-time-argument.patch" - "${FILESDIR}/${P}-ssl-compat.patch" -) - -src_prepare() { - default - sed -e '/^INSTALL_PROGRAM/s:-s::' \ - -i {console,conserver,autologin,contrib/chat}/Makefile.in || die - eautoreconf -} - -src_configure() { - local myconf=( - $(use_with debug dmalloc) - $(use_with ipv6) - $(use_with freeipmi) - $(use_with kerberos gssapi) - $(use_with ssl openssl) - $(use_with pam) - $(use_with tcpd libwrap) - --with-cffile=conserver/conserver.cf - --with-logfile=/var/log/conserver.log - --with-master=localhost - --with-pidfile=/run/conserver.pid - --with-port=7782 - --with-pwdfile=conserver/conserver.passwd - ) - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install - - keepdir /var/consoles - fowners daemon:daemon /var/consoles - fperms 700 /var/consoles - - newinitd "${FILESDIR}"/conserver.initd-r1 conserver - newconfd "${FILESDIR}"/conserver.confd-r1 conserver - - dodir /etc/conserver - fperms 700 /etc/conserver - insinto /etc/conserver - newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample - newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample - - einstalldocs - docinto examples - dodoc -r conserver.cf/samples/. - - newpamd "${FILESDIR}"/conserver.pam-pambase conserver -} - -src_test() { - # hangs without -j1 - emake -j1 test -} - -pkg_postinst() { - if use ssl; then - if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then - install_cert /etc/ssl/conserver/conserver - fi - fi -} 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" -} |