[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/
commit: 6b49ce0b8b7b4004f920eb26d0acf71abb665d90
Author: Lars Wendler gentoo org>
AuthorDate: Tue Jan 12 17:32:21 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Jan 12 17:32:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b49ce0b
app-admin/conserver: Fixed build with sys-devel/autoconf:2.70
Bug: https://bugs.gentoo.org/750230
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
app-admin/conserver/conserver-8.2.6.ebuild | 6 +++-
.../files/conserver-8.2.6-autoconf-2.70.patch | 32 ++
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/app-admin/conserver/conserver-8.2.6.ebuild
b/app-admin/conserver/conserver-8.2.6.ebuild
index 8ecd6b02a53..aa64a2c5943 100644
--- a/app-admin/conserver/conserver-8.2.6.ebuild
+++ b/app-admin/conserver/conserver-8.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,6 +33,10 @@ RDEPEND="${DEPEND}
DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial
contrib/maketestcerts)
+PATCHES=(
+ "${FILESDIR}/${PN}-8.2.6-autoconf-2.70.patch" #750230
+)
+
src_prepare() {
default
sed -e '/^INSTALL_PROGRAM/s:-s::' \
diff --git a/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch
b/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch
new file mode 100644
index 000..057809ffa44
--- /dev/null
+++ b/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch
@@ -0,0 +1,32 @@
+From ce3b4f1d000c75ace2be2be83a0cc0df84ff6983 Mon Sep 17 00:00:00 2001
+From: Lars Wendler
+Date: Tue, 12 Jan 2021 18:18:23 +0100
+Subject: [PATCH] configure.ac: autoconf-2.70 fix
+
+Gentoo-bug: https://bugs.gentoo.org/750230
+Signed-off-by: Lars Wendler
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ee2bc8a..26541f3 100644
+--- a/configure.ac
b/configure.ac
+@@ -30,11 +30,11 @@ AH_TEMPLATE([TRUST_UDS_CRED], [Defined if we trust
credentials from UDS client])
+
+ dnl ### Normal initialization. ##
+ AC_INIT([conserver],m4_esyscmd_s([./gen-version number]))
+-AC_PREREQ(2.59)
++AC_PREREQ(2.69)
+ AC_CONFIG_SRCDIR([conserver/main.c])
+ AC_CONFIG_HEADER(config.h)
+
+-AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $@")
++AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $*")
+
+ dnl ### Set some option defaults. ###
+ if test -z "$CFLAGS"; then
+--
+2.30.0
+
[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/
commit: 4b7479ee4fce3ca2a4597a9a9b95a693306e85f2
Author: Georgy Yakovlev gentoo org>
AuthorDate: Fri Jun 7 04:25:01 2019 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Fri Jun 7 04:25:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7479ee
app-admin/conserver: add libressl patch for 8.2.4
Closes: https://bugs.gentoo.org/687542
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Georgy Yakovlev gentoo.org>
app-admin/conserver/conserver-8.2.4.ebuild | 2 ++
app-admin/conserver/files/8.2.4-libressl.patch | 27 ++
2 files changed, 29 insertions(+)
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild
b/app-admin/conserver/conserver-8.2.4.ebuild
index 54eae640841..6429ff850b3 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial
contrib/maketestcerts)
+PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
+
src_prepare() {
default
sed -e '/^INSTALL_PROGRAM/s:-s::' \
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 000..9151d697e75
--- /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
+Date: Wed, 27 Mar 2019 23:29:31 +
+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
+ # if OPENSSL_VERSION_NUMBER < 0x1010L
+ # define TLS_method SSLv23_method
++# endif/* OPENSSL_VERSION_NUMBER < 0x1010L */
++# if (OPENSSL_VERSION_NUMBER < 0x1010L) ||
defined(LIBRESSL_VERSION_NUMBER)
+ # define CIPHER_SEC0
+ # else
+ # define CIPHER_SEC0 ":@SECLEVEL=0"
+-# endif/* OPENSSL_VERSION_NUMBER < 0x1010L */
++# endif/* OPENSSL_VERSION_NUMBER < 0x1010L ||
defined(LIBRESSL_VERSION_NUMBER) */
+ #endif
+ #if HAVE_GSSAPI
+ # include
[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/
commit: b10b018cae2715e5294df736cd5e78d17524ecdc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 15 18:17:50 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jun 5 21:19:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10b018c
app-admin/conserver: Drop old
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-admin/conserver/Manifest | 2 -
app-admin/conserver/conserver-8.1.18-r1.ebuild | 89 --
app-admin/conserver/conserver-8.2.2.ebuild | 100 -
.../conserver/files/conserver-8.1.18-dmalloc.patch | 100 -
.../files/conserver-8.2.2-ssl-compat.patch | 40 -
.../files/conserver-8.2.2-time-argument.patch | 22 -
app-admin/conserver/files/conserver-prestrip.patch | 24 -
app-admin/conserver/files/conserver.confd | 6 --
app-admin/conserver/files/conserver.initd | 37
9 files changed, 420 deletions(-)
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 63941d73e1e..037203a6f0f 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 53a8cd7fd30..000
--- 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
-
[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/
commit: cfe91b2bbc8bf7091051fbc1e14937338651e570
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sun Nov 11 03:28:30 2018 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Tue Mar 5 23:26:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe91b2b
app-admin/conserver: version bump to 8.2.2
Bump EAPI to 6
Added freeipmi useflag
modernized ebuild and initsripts
Bug: https://bugs.gentoo.org/674420
Closes: https://bugs.gentoo.org/488312
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev gentoo.org>
app-admin/conserver/Manifest | 1 +
app-admin/conserver/conserver-8.2.2.ebuild | 100 +
.../files/conserver-8.2.2-ssl-compat.patch | 40 +
.../files/conserver-8.2.2-time-argument.patch | 22 +
app-admin/conserver/files/conserver.confd-r1 | 5 ++
app-admin/conserver/files/conserver.initd-r1 | 14 +++
app-admin/conserver/metadata.xml | 7 ++
7 files changed, 189 insertions(+)
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index a6e85102fc3..fdc9c763ec8 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1 +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
diff --git a/app-admin/conserver/conserver-8.2.2.ebuild
b/app-admin/conserver/conserver-8.2.2.ebuild
new file mode 100644
index 000..ceb5c721f56
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.2.ebuild
@@ -0,0 +1,100 @@
+# 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
+ i
[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/
commit: eedb718206696562551762c452832acfdc523669
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sun Nov 11 01:08:43 2018 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Tue Mar 5 23:26:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedb7182
app-admin/conserver: remove unused conserver.initd
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev gentoo.org>
app-admin/conserver/conserver-8.1.18-r1.ebuild | 4 +--
app-admin/conserver/files/conserver.initd | 4 +--
app-admin/conserver/files/conserver.initd-r1 | 37 --
3 files changed, 4 insertions(+), 41 deletions(-)
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 0ab9102d365..53a8cd7fd30 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -62,7 +62,7 @@ src_install() {
fperms 700 /var/consoles
## add startup and sample config
- newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+ newinitd "${FILESDIR}"/conserver.initd conserver
newconfd "${FILESDIR}"/conserver.confd conserver
dodir /etc/conserver
diff --git a/app-admin/conserver/files/conserver.initd
b/app-admin/conserver/files/conserver.initd
index 0c0771c72c6..841892672cc 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
deleted file mode 100644
index 907b1b71170..000
--- a/app-admin/conserver/files/conserver.initd-r1
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# 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-/."
- 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-/."
- 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"
-}
