[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2021-08-18 Thread Sam James
commit: 87669286bed561b03433926156c50c3dd5d5b345
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 18 14:11:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 18 14:27:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87669286

app-admin/conserver: add missing slot dep (libnsl)

Signed-off-by: Sam James  gentoo.org>

 .../conserver/{conserver-8.2.6-r2.ebuild => conserver-8.2.6-r3.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.6-r2.ebuild 
b/app-admin/conserver/conserver-8.2.6-r3.ebuild
similarity index 98%
rename from app-admin/conserver/conserver-8.2.6-r2.ebuild
rename to app-admin/conserver/conserver-8.2.6-r3.ebuild
index 6385d383e52..844eb0e88ff 100644
--- a/app-admin/conserver/conserver-8.2.6-r2.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 
-DEPEND="net-libs/libnsl
+DEPEND="net-libs/libnsl:=
virtual/libcrypt:=
debug? ( dev-libs/dmalloc:= )
freeipmi? ( sys-libs/freeipmi:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2021-05-01 Thread Andreas Sturmlechner
commit: 8701d341b29dff743129eadeefbe1f39d275
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  1 18:32:53 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  1 21:21:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8701d341

app-admin/conserver: Drop 8.2.3-r1, EAPI6--

Closes: https://bugs.gentoo.org/783870
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/conserver/Manifest  |  1 -
 app-admin/conserver/conserver-8.2.3-r1.ebuild | 95 ---
 2 files changed, 96 deletions(-)

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index f304cd426bf..bd0efbeb952 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,2 +1 @@
-DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 
94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11
 SHA512 
35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 
9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434
 SHA512 
3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283

diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild 
b/app-admin/conserver/conserver-8.2.3-r1.ebuild
deleted file mode 100644
index 063cb719746..000
--- a/app-admin/conserver/conserver-8.2.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 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 pam ssl test tcpd"
-RESTRICT="!test? ( test )"
-
-DEPEND="debug? ( dev-libs/dmalloc:= )
-   freeipmi? ( sys-libs/freeipmi:= )
-   kerberos? (
-   virtual/krb5
-   net-libs/libgssglue
-   )
-   ssl? ( dev-libs/openssl:0= )
-   pam? ( sys-libs/pam )
-   tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}
-   pam? ( sys-auth/pambase )"
-
-DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
-
-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/.
-
-   if use pam; then
-   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-   fi
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2021-05-01 Thread Sam James
commit: 5bc774b3d752ca6f41546abf59ec21d7323cd4a8
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 18:09:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  1 18:11:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc774b3

app-admin/conserver: Stabilize 8.2.6-r1 amd64, #783870

Signed-off-by: Sam James  gentoo.org>

 app-admin/conserver/conserver-8.2.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild 
b/app-admin/conserver/conserver-8.2.6-r1.ebuild
index e2c0dbbdf9b..371d2cd9bcc 100644
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2021-05-01 Thread Sam James
commit: fb04df2043ac0e4035b05f082eb7ae4526c547df
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 18:10:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  1 18:11:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb04df20

app-admin/conserver: Stabilize 8.2.6-r1 x86, #783870

Signed-off-by: Sam James  gentoo.org>

 app-admin/conserver/conserver-8.2.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild 
b/app-admin/conserver/conserver-8.2.6-r1.ebuild
index 371d2cd9bcc..34a51420681 100644
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/files/, app-admin/conserver/

2021-05-01 Thread Sam James
commit: 038193aedf12586f89cca32768cacb4ef0d2991b
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 17:29:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  1 18:06:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038193ae

app-admin/conserver: drop obsolete LibreSSL patch

Signed-off-by: Sam James  gentoo.org>

 app-admin/conserver/conserver-8.2.3-r1.ebuild  |  2 --
 app-admin/conserver/files/8.2.3-libressl.patch | 31 --
 2 files changed, 33 deletions(-)

diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild 
b/app-admin/conserver/conserver-8.2.3-r1.ebuild
index bbd550947e0..063cb719746 100644
--- a/app-admin/conserver/conserver-8.2.3-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.3-r1.ebuild
@@ -30,8 +30,6 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGES FAQ PROTOCOL README 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.3-libressl.patch 
b/app-admin/conserver/files/8.2.3-libressl.patch
deleted file mode 100644
index 8b04acb7b88..000
--- a/app-admin/conserver/files/8.2.3-libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev 
-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 
- # 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 
--- 
-2.21.0
-



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2021-05-01 Thread Sam James
commit: 4ec2b5c482fdb63a770296e8c014fbae3ea19ebc
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 17:12:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  1 17:12:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec2b5c4

app-admin/conserver: Stabilize 8.2.6-r1 ppc64, #783870

Signed-off-by: Sam James  gentoo.org>

 app-admin/conserver/conserver-8.2.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild 
b/app-admin/conserver/conserver-8.2.6-r1.ebuild
index 138b08fbcf7..c74df821bcd 100644
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2021-05-01 Thread Sam James
commit: 1c1301611a80dc842cd62ea8d6ce98cb8079e88e
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 17:12:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  1 17:12:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c130161

app-admin/conserver: Stabilize 8.2.6-r1 ppc, #783870

Signed-off-by: Sam James  gentoo.org>

 app-admin/conserver/conserver-8.2.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild 
b/app-admin/conserver/conserver-8.2.6-r1.ebuild
index c74df821bcd..e2c0dbbdf9b 100644
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2021-04-29 Thread Mikle Kolyada
commit: 3147baa787c400873e1151ebfd7c060c4f8a9692
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Apr 29 19:19:37 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Apr 29 19:20:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3147baa7

app-admin/conserver: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-admin/conserver/conserver-8.2.3-r1.ebuild | 7 ++-
 app-admin/conserver/conserver-8.2.6-r1.ebuild | 7 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild 
b/app-admin/conserver/conserver-8.2.3-r1.ebuild
index 7a587ea0938..bbd550947e0 100644
--- a/app-admin/conserver/conserver-8.2.3-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.3-r1.ebuild
@@ -12,7 +12,7 @@ 
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"
+IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )
@@ -21,10 +21,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
virtual/krb5
net-libs/libgssglue
)
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
+   ssl? ( dev-libs/openssl:0= )
pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
 "

diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild 
b/app-admin/conserver/conserver-8.2.6-r1.ebuild
index 7d0d422f9ba..138b08fbcf7 100644
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -12,7 +12,7 @@ 
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"
+IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )
@@ -21,10 +21,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
virtual/krb5
net-libs/libgssglue
)
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
+   ssl? ( dev-libs/openssl:0= )
pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
 "



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/files/

2021-03-22 Thread Joonas Niilola
commit: cbdd192532694a211f8e50b6c06d5ab5f5e79a2c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 21 12:34:21 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Mar 22 14:03:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbdd1925

app-admin/conserver: remove unused patch

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20031
Signed-off-by: Joonas Niilola  gentoo.org>

 app-admin/conserver/files/8.2.4-libressl.patch | 27 --
 1 file changed, 27 deletions(-)

diff --git a/app-admin/conserver/files/8.2.4-libressl.patch 
b/app-admin/conserver/files/8.2.4-libressl.patch
deleted file mode 100644
index 9151d697e75..000
--- a/app-admin/conserver/files/8.2.4-libressl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/

2021-01-23 Thread Mikle Kolyada
commit: e24777ae18c097a3f66b54221ba03cdacee49940
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jan 23 22:37:14 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jan 23 22:38:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24777ae

app-admin/conserver: install pam files conditionally

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 .../conserver/{conserver-8.2.3.ebuild => conserver-8.2.3-r1.ebuild} | 6 --
 .../conserver/{conserver-8.2.4.ebuild => conserver-8.2.4-r1.ebuild} | 6 --
 .../conserver/{conserver-8.2.5.ebuild => conserver-8.2.5-r1.ebuild} | 6 --
 .../conserver/{conserver-8.2.6.ebuild => conserver-8.2.6-r1.ebuild} | 4 +++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3-r1.ebuild
similarity index 95%
rename from app-admin/conserver/conserver-8.2.3.ebuild
rename to app-admin/conserver/conserver-8.2.3-r1.ebuild
index e2c44ccb114..7a587ea0938 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3-r1.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=6
@@ -81,7 +81,9 @@ src_install() {
docinto examples
dodoc -r conserver.cf/samples/.
 
-   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+   if use pam; then
+   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+   fi
 }
 
 src_test() {

diff --git a/app-admin/conserver/conserver-8.2.4.ebuild 
b/app-admin/conserver/conserver-8.2.4-r1.ebuild
similarity index 95%
rename from app-admin/conserver/conserver-8.2.4.ebuild
rename to app-admin/conserver/conserver-8.2.4-r1.ebuild
index 018a794f081..0bfcdb4896b 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,7 +81,9 @@ src_install() {
docinto examples
dodoc -r conserver.cf/samples/.
 
-   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+   if use pam; then
+   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+   fi
 }
 
 src_test() {

diff --git a/app-admin/conserver/conserver-8.2.5.ebuild 
b/app-admin/conserver/conserver-8.2.5-r1.ebuild
similarity index 95%
rename from app-admin/conserver/conserver-8.2.5.ebuild
rename to app-admin/conserver/conserver-8.2.5-r1.ebuild
index 8ecd6b02a53..f57c6924689 100644
--- a/app-admin/conserver/conserver-8.2.5.ebuild
+++ b/app-admin/conserver/conserver-8.2.5-r1.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
@@ -79,7 +79,9 @@ src_install() {
docinto examples
dodoc -r conserver.cf/samples/.
 
-   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+   if use pam; then
+   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+   fi
 }
 
 src_test() {

diff --git a/app-admin/conserver/conserver-8.2.6.ebuild 
b/app-admin/conserver/conserver-8.2.6-r1.ebuild
similarity index 96%
rename from app-admin/conserver/conserver-8.2.6.ebuild
rename to app-admin/conserver/conserver-8.2.6-r1.ebuild
index aa64a2c5943..7d0d422f9ba 100644
--- a/app-admin/conserver/conserver-8.2.6.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -83,7 +83,9 @@ src_install() {
docinto examples
dodoc -r conserver.cf/samples/.
 
-   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+   if use pam; then
+   newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+   fi
 }
 
 src_test() {



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/

2021-01-12 Thread Lars Wendler
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/

2020-10-26 Thread Georgy Yakovlev
commit: 3f797d193c58a3c465dd559658a421e2d9b8765b
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Oct 27 06:43:10 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Oct 27 06:43:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f797d19

app-admin/conserver: bump to 8.2.6

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-admin/conserver/Manifest   |  1 +
 app-admin/conserver/conserver-8.2.6.ebuild | 96 ++
 2 files changed, 97 insertions(+)

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index c87fb8546a1..62bc528ec55 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,3 +1,4 @@
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 
94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11
 SHA512 
35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 
5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091
 SHA512 
c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
 DIST conserver-8.2.5.tar.gz 434260 BLAKE2B 
f057a99db8e2f39f644ac8c55dc75372e74a9736c403ceaee8b70af6418ebec881f0c00d0ed4e0825c5f00900c70e0cf5c340637f5f16d19875448c58172ffb3
 SHA512 
76a1d75307faabeb04b65c5cd5fb1bb7df22e0ff25769f94a86a4b9134da262e6523ba207c8da1ec5b67299498c807ec92279a10846c0b3f23c9effa4ee01c1e
+DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 
9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434
 SHA512 
3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283

diff --git a/app-admin/conserver/conserver-8.2.6.ebuild 
b/app-admin/conserver/conserver-8.2.6.ebuild
new file mode 100644
index 000..8ecd6b02a53
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+RESTRICT="!test? ( test )"
+
+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? ( sys-libs/pam )
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}
+   pam? ( sys-auth/pambase )"
+
+DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial 
contrib/maketestcerts)
+
+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}"

[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2020-06-12 Thread Georgy Yakovlev
commit: 23d9602fbaaf83a7da276c8276db82e7e262684a
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Jun 13 03:37:04 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Jun 13 03:37:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d9602f

app-admin/conserver: bump to 8.2.5

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-admin/conserver/Manifest   |  1 +
 app-admin/conserver/conserver-8.2.5.ebuild | 96 ++
 2 files changed, 97 insertions(+)

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 037203a6f0f..c87fb8546a1 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,2 +1,3 @@
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 
94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11
 SHA512 
35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 
5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091
 SHA512 
c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
+DIST conserver-8.2.5.tar.gz 434260 BLAKE2B 
f057a99db8e2f39f644ac8c55dc75372e74a9736c403ceaee8b70af6418ebec881f0c00d0ed4e0825c5f00900c70e0cf5c340637f5f16d19875448c58172ffb3
 SHA512 
76a1d75307faabeb04b65c5cd5fb1bb7df22e0ff25769f94a86a4b9134da262e6523ba207c8da1ec5b67299498c807ec92279a10846c0b3f23c9effa4ee01c1e

diff --git a/app-admin/conserver/conserver-8.2.5.ebuild 
b/app-admin/conserver/conserver-8.2.5.ebuild
new file mode 100644
index 000..8ecd6b02a53
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+RESTRICT="!test? ( test )"
+
+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? ( sys-libs/pam )
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}
+   pam? ( sys-auth/pambase )"
+
+DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial 
contrib/maketestcerts)
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2019-10-12 Thread Mikle Kolyada
commit: 685344963d539da1c11bc64ec77d8272117b13a4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 12 18:32:02 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 12 18:32:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68534496

app-admin/conserver: migrate to sys-libs/pam

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-admin/conserver/conserver-8.2.3.ebuild | 2 +-
 app-admin/conserver/conserver-8.2.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
index d9a7265bfba..8050e3f5da8 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -24,7 +24,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
 "
 RDEPEND="${DEPEND}

diff --git a/app-admin/conserver/conserver-8.2.4.ebuild 
b/app-admin/conserver/conserver-8.2.4.ebuild
index 6429ff850b3..7b500c68159 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -24,7 +24,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
 "
 RDEPEND="${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/

2019-06-06 Thread Georgy Yakovlev
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/files/, app-admin/conserver/

2019-06-06 Thread Georgy Yakovlev
commit: cff9a317b7d3d0b4f5d5e550fa0ef36696dd53e3
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jun  7 04:35:54 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jun  7 04:36:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff9a317

app-admin/conserver: backport libressl patch to 8.2.3

does not affect openssl users, hence no rebvump

Bug: 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.3.ebuild |  2 ++
 app-admin/conserver/files/8.2.3-libressl.patch | 31 ++
 2 files changed, 33 insertions(+)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
index 9a067d23f71..d9a7265bfba 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGES FAQ PROTOCOL README 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.3-libressl.patch 
b/app-admin/conserver/files/8.2.3-libressl.patch
new file mode 100644
index 000..8b04acb7b88
--- /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 
+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 
+ # 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 
+-- 
+2.21.0
+



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/

2019-06-05 Thread Andreas Sturmlechner
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/

2019-05-24 Thread Georgy Yakovlev
commit: 37f50f49b68d5b5dc04a592ae5b1d1ded119197f
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri May 24 17:25:38 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri May 24 17:25:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f50f49

app-admin/conserver: bump to 8.2.4

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-admin/conserver/Manifest   |  1 +
 app-admin/conserver/conserver-8.2.4.ebuild | 95 ++
 2 files changed, 96 insertions(+)

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 9ac7b3d4286..63941d73e1e 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,3 +1,4 @@
 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.2.4.ebuild 
b/app-admin/conserver/conserver-8.2.4.ebuild
new file mode 100644
index 000..54eae640841
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -0,0 +1,95 @@
+# 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.md conserver/Sun-serial 
contrib/maketestcerts)
+
+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/conserv

[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2019-05-15 Thread Mikle Kolyada
commit: 7e4f49e78a8d2c462ae906044522ad5dffc4a82a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May 15 17:51:15 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May 15 17:51:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4f49e7

app-admin/conserver: x86 stable wrt bug #684666

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 app-admin/conserver/conserver-8.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
index aa2995a91e5..9a067d23f71 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2019-05-15 Thread Mikle Kolyada
commit: fb898675f7e27bc84f0d81a3fcda44c69448461c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May 15 17:50:54 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May 15 17:50:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb898675

app-admin/conserver: amd64 stable wrt bug #684666

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-admin/conserver/conserver-8.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
index 5ed536ba8a9..aa2995a91e5 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2019-05-12 Thread Sergei Trofimovich
commit: 616604e719d89fc975ac605586b6e8169ee0f0a8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 12 21:59:49 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 12 21:59:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=616604e7

app-admin/conserver: stable 8.2.3 for ppc64, bug #684666

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-admin/conserver/conserver-8.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
index 947e67f70f5..5ed536ba8a9 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="alpha ~amd64 ia64 ppc ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2019-05-12 Thread Sergei Trofimovich
commit: 7bb9311a19ca8b35f8512f75430a61905a8e5c10
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 12 21:55:21 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 12 21:55:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb9311a

app-admin/conserver: stable 8.2.3 for ppc, bug #684666

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-admin/conserver/conserver-8.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
index 0d1a17420ed..947e67f70f5 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="alpha ~amd64 ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2019-05-12 Thread Sergei Trofimovich
commit: 2fbd2c137a2307c936c328bc27d81c47debd1ad4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 12 21:27:02 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 12 21:27:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbd2c13

app-admin/conserver: stable 8.2.3 for ia64, bug #684666

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-admin/conserver/conserver-8.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
index e728c2b9cfd..0d1a17420ed 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2019-05-08 Thread Tobias Klausmann
commit: dd41a9b81cbcde685bf7774cb0eed09cf3420524
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed May  8 14:37:33 2019 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed May  8 14:37:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd41a9b8

app-admin/conserver-8.2.3-r0: alpha stable

Bug: http://bugs.gentoo.org/684666
Signed-off-by: Tobias Klausmann  gentoo.org>

 app-admin/conserver/conserver-8.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
index 3a8ca5f5f92..e728c2b9cfd 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2019-03-19 Thread Georgy Yakovlev
commit: d755ca484df0d2cd2f84c7530fbd15bf3e6ec7ae
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Mar 19 18:04:55 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Mar 19 18:05:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d755ca48

app-admin/conserver: bump to 8.2.3

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-admin/conserver/Manifest   |  1 +
 app-admin/conserver/conserver-8.2.3.ebuild | 95 ++
 2 files changed, 96 insertions(+)

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index fdc9c763ec8..9ac7b3d4286 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/app-admin/conserver/conserver-8.2.3.ebuild 
b/app-admin/conserver/conserver-8.2.3.ebuild
new file mode 100644
index 000..3a8ca5f5f92
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -0,0 +1,95 @@
+# 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)
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/, app-admin/conserver/files/

2019-03-05 Thread Georgy Yakovlev
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/

2019-03-05 Thread Georgy Yakovlev
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"
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2018-05-20 Thread Johannes Huber
commit: 8e984f9fd7a079512fba2bf01f27251230cfd354
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 20 12:04:45 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun May 20 12:04:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e984f9f

app-admin/conserver: Remove 8.1.18 (r0)

Uses deprecated EAPI 4 and overshadowed by 8.1.18-r1.

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 app-admin/conserver/conserver-8.1.18.ebuild | 86 -
 1 file changed, 86 deletions(-)

diff --git a/app-admin/conserver/conserver-8.1.18.ebuild 
b/app-admin/conserver/conserver-8.1.18.ebuild
deleted file mode 100644
index 008ee1e3176..000
--- a/app-admin/conserver/conserver-8.1.18.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-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 pam ssl tcpd debug"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2018-04-26 Thread Aaron Bauman
commit: 4e836cc4c1e60716424e776fb92d60450cc04c00
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Apr 26 10:57:27 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr 26 14:43:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e836cc4

app-admin/conserver: use HTTPS

Closes: https://github.com/gentoo/gentoo/pull/8148

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 4 ++--
 app-admin/conserver/conserver-8.1.18.ebuild| 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 1b0246c7ae6..0ab9102d365 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -6,8 +6,8 @@ EAPI="5"
 inherit ssl-cert eutils pam autotools
 
 DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/";
-SRC_URI="http://www.conserver.com/${P}.tar.gz";
+HOMEPAGE="https://www.conserver.com/";
+SRC_URI="https://www.conserver.com/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0"

diff --git a/app-admin/conserver/conserver-8.1.18.ebuild 
b/app-admin/conserver/conserver-8.1.18.ebuild
index cb1fea8dbe9..008ee1e3176 100644
--- a/app-admin/conserver/conserver-8.1.18.ebuild
+++ b/app-admin/conserver/conserver-8.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -6,8 +6,8 @@ EAPI="4"
 inherit ssl-cert eutils pam autotools
 
 DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/";
-SRC_URI="http://www.conserver.com/${P}.tar.gz";
+HOMEPAGE="https://www.conserver.com/";
+SRC_URI="https://www.conserver.com/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2018-03-18 Thread Sergei Trofimovich
commit: 5e8dbb76c14c3191860a91c6fbe03b2f346001cc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 18 12:39:54 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 18 12:39:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e8dbb76

app-admin/conserver: stable 8.1.18-r1 for ppc64, bug #632048

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 86c1d795496..1b0246c7ae6 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="kerberos libressl pam ssl tcpd debug"
 
 DEPEND="ssl? (



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2018-03-04 Thread Sergei Trofimovich
commit: 22fd5a1b2f54331ecbf44800057fac30210feed2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar  4 22:45:52 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar  4 22:45:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fd5a1b

app-admin/conserver: stable 8.1.18-r1 for ppc, bug #632048

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 2ea0b792127..86c1d795496 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86"
 IUSE="kerberos libressl pam ssl tcpd debug"
 
 DEPEND="ssl? (



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2018-01-28 Thread Tobias Klausmann
commit: 4c45c291840ebba617c32f171762ac95f77a7116
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sun Jan 28 17:03:18 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sun Jan 28 18:22:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c45c291

app-admin/conserver-8.1.18-r1: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/632048

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 33156624841..2ea0b792127 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="kerberos libressl pam ssl tcpd debug"
 
 DEPEND="ssl? (



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2017-12-16 Thread Tobias Klausmann
commit: 294d1b2f48c53a2f448973dbbb6fde7dfa816b25
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Dec 16 10:29:42 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Dec 16 10:31:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=294d1b2f

app-admin/conserver-8.1.18-r1: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/632048

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index c93ab404a36..33156624841 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="kerberos libressl pam ssl tcpd debug"
 
 DEPEND="ssl? (



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2017-12-15 Thread Sergei Trofimovich
commit: 6ad4122234bddafae89dd7b056be682c9fcdaa61
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 15 20:53:05 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 15 22:53:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad41222

app-admin/conserver: stable 8.1.18-r1 for ia64, bug #632048

Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 6ae29a02191..c93ab404a36 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="kerberos libressl pam ssl tcpd debug"
 
 DEPEND="ssl? (



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2017-12-08 Thread Thomas Deutschmann
commit: 5d2e59ca8fc4f5012c871068910ff57c85ae95ec
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  8 20:22:22 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  8 20:22:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2e59ca

app-admin/conserver: x86 stable (bug #632048)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index c23494679c7..6ae29a02191 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-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="kerberos libressl pam ssl tcpd debug"
 
 DEPEND="ssl? (



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2016-04-04 Thread Ian Delaney
commit: 3407a7c82e66bdac469cb0625f326a8bbad55711
Author: Ian Delaney  gentoo  org>
AuthorDate: Mon Apr  4 04:09:25 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Apr  4 09:00:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3407a7c8

app-admin/conserver: reset description for user in metadata.xml

Package-Manager: portage-2.2.28

 app-admin/conserver/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index 9ccbdbb..324e981 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -4,7 +4,7 @@

d...@danweeks.net
Dan Weeks
-   Maintainer. Assign bugs to him
+   Proxied maintainer; set to assignee in all 
bugs


proxy-ma...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2016-03-21 Thread Anthony G. Basile
commit: c0a6ab71c4c10347f3fd12a88ba02966a3ceaaa6
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Mar 21 21:30:37 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Mar 21 21:30:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a6ab71

app-admin/conserver: fix openssl and libressl slots

Package-Manager: portage-2.2.26

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 7e60c04..7cc4d1e 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -16,8 +16,8 @@ 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 )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
)
pam? ( virtual/pam )
tcpd? ( sys-apps/tcp-wrappers )



[gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/

2015-12-25 Thread Anthony G. Basile
commit: 36489dd5e040ef943793f26576a9432d869d63ee
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Dec 26 01:07:08 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Dec 26 01:07:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36489dd5

app-admin/conserver: add libressl support

Package-Manager: portage-2.2.24

 app-admin/conserver/conserver-8.1.18-r1.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild 
b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 5c91885..7e60c04 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
 inherit ssl-cert eutils pam autotools
 
@@ -13,9 +13,12 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz";
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kerberos pam ssl tcpd debug"
+IUSE="kerberos libressl pam ssl tcpd debug"
 
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+DEPEND="ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
pam? ( virtual/pam )
tcpd? ( sys-apps/tcp-wrappers )
debug? ( dev-libs/dmalloc )