gentoo resync : 30.09.2018

6 files changed, 185 insertions, 25 deletions

diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 5f7a51fd9d48..471c450491f4 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -1,13 +1,14 @@
-AUX compile.diff 3224 BLAKE2B bb837e117a299667449a3661ee1bcf10c488d1ea357086ef7d9fa0aa4e2df7157429ecdb3d10900605ca8ecc5a53702696d6bdb6e20735946e8d3741cfeed03e SHA512 f0b7e573b401812bba613342ece8e2a9d3ab3dee4b8746cbc3fa5a24f817efd05eccb6676b0e003f43eb6c83f76ad4f42988981e4f30c0a93fd5ec0e78c2cd1d
+AUX compile.diff 3264 BLAKE2B d67880d5a26de0cafa1cd81733b0f8e22ca920989b4acf3aa085cbba592478c8b24e033167bc09d20e5b565772e8de8c65e9c095392dd3abdf12c5aadbc71334 SHA512 7bebf40946a70f93e6ca5fad204e45b1187baafef346d1ef2e549dcdc750ed9853be760a5ec38eee820fdc8e51f2ff798b91b1a5bd5cbeb423c5090ba04fc152
 AUX ldflags-fix.patch 540 BLAKE2B d1f6c0b41212bec79d9f0381c07e738ec02ca9b54700cc89d6b1da3d94b4fe2555da4abc6262a9b4ed641e23f988e0c57aed94006610eef072763a08960a6c96 SHA512 9ade1e441b0b890a8c2284128124c02786868803771d9acdae560811a7dc56d0cab3673250491b6e99e012a6265db1e0e17fbe5f19aa913d6cc9796c61619d9f
 AUX oidentd.conf.psybnc 92 BLAKE2B 3653139da1f045214c609acc0a655bd617b681778339584ea01bc5373fc159cb581dfeb66c5ba8f58b75f20a12e2d5430977576c5d3c0c42b919543c8886eae2 SHA512 1670c597922c557eb4124ec75c41e30135dce47ced3f080051ef1f896b5b24ce8d0833b147fb5ba7b5056cc0c333ecd7a6105bb68f92a72e64f753253a2595ad
-AUX psybnc-2.3.2.9-multinetwork.patch 261 BLAKE2B 346d245759f83e2345e71c73920d7fb45c3dc0e0ea7f59473b66d833f895c763e82f0b7a1ae5f7d7d923834b07e758c7047599a6a11d6c83ff02b9de5043186a SHA512 fee258905d67ff49e2a227767c0355146687b54307601d931ba8435a88e3399fc5c2a1efbaf6f368f8d316aec76f5810e1a3b664fa72bff29af0b79d761a2be4
-AUX psybnc-2.3.2.9-oidentd.patch 237 BLAKE2B ea969ecbb5385da67aa4971875054df6ff0e79007541497006d4d2edeb79d74e056a5146d547a625676f324b68240310c0c76508b8e6ffaafe37633b7e04a73c SHA512 0c095c74ff6a9a76b417bdefa1b6d103b7fc25dd62c9446a8a2cf1faf0f3b46310e4c47b7b9072d081b240099d60420289eb5c2d1701b59e33a2a398a7e8d211
-AUX psybnc-2.3.2.9-scripting.patch 244 BLAKE2B 6fcec258cc5cd99a1b71e351ffd9dfaa1b1d491ce9a8bbef77bf937888a6107f86de87a5aff03b27f83b7dbc7f5d944b5cf737494175084c83199def7c4a8a0e SHA512 946d0cd7c79209f113dfea2bb4d35bfcb0f2a045e94d97cb969b7ac510cd61a1f32ee5a863fa751780bb05e808eeaefce3219cc9553a1232c09d1816421f5ae0
+AUX psybnc-2.3.2.9-multinetwork.patch 265 BLAKE2B 3bca2c18d521fe34445433090564e78e7c948048114231a79defac5082e0419062ee24fed6b4a4759090498340d16a31dc6114d19a397a97822660879c9ba326 SHA512 955b2455aad91d0145597096a7dc75de9279f828de94e8156f98f992734b86da5712d08b6d3ff3538359aaa1c1fb6b496b5cbbee44da7dadd444ddf020389821
+AUX psybnc-2.3.2.9-oidentd.patch 236 BLAKE2B 1af1ba8e2ca6edc8fa64040bfb4e195b9486356284bf83a95df9cbc69c5307a3845dc70586978dc2ee0ffd75cc48f9e88e9fb6c709b504a01e7e8906636c5257 SHA512 60e528060582f07e7b81d522bd93d0b69adba4ec56babde704baa820edc420b7a50d4158ce916f3a767a7d705f98fa30ac8229f64e8549eb551a47780ae002f4
+AUX psybnc-2.3.2.9-scripting.patch 248 BLAKE2B b0dec6f5202f6c5a38020c179fdd3cbe932028141c2c95d4a236a1f0140c1feddc60165197ab69ccad6a481f8e84c16dc950644e56bfd9af2c678a80ff9b6898 SHA512 8fbaa82295c53a8b592500c87aab92d46cc0f28d7d89cb8e3957671cc94f785dee52e405196cea8782a192ae942f3b29c892c03cdc2e94d00a2c73b196d4de36
 AUX psybnc-oidentd.initd 931 BLAKE2B d50dbad91198c457254edf568b7c203ba8f4c1dfdbb9c8a38b12ca5086b74b337f85fe514bd8ed74c0eacad9ba25bc36d1c385d96c03ea41d20ccf5150aac407 SHA512 bc338b243d5cf73da0c662601ea2e5fadbe34a64f57cd0d09be55c773e1e1f807fb0c43d46d225a9461d353762b16cf6010710fbf4f43a9dece5130374952e12
 AUX psybnc.conf 313 BLAKE2B c56022b42942b100479b6c539e9da85178db679b6596fc2b416299c929cdfac35b83cb1181d8ff3eedb4f17b1c711c97e6c73ae1a40e2f09b7c756ad3415025e SHA512 0a5f587e70f9c9a83da820a03e77b6b119c5094fa334397762c4838c0a88bb5574a17d7aded274dab9bb6b041d1758e08e3f0d78df71b382bdc04fc8aabe3317
 AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f0e686b504c2caf980c5a97864fac86a251431126c5a0338bb50a8eba9d3976156cf1eaf1b7681 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753
 AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
 EBUILD psybnc-2.3.2.9-r2.ebuild 4582 BLAKE2B 620329b195a3d03503fb72a38f78e9e125d091c3d7143a0a29fa3b3ddb006ac0b77bd68f6e3545b51a5d36f1185d53577648b7a0f0415148dbc767966fb549d5 SHA512 f4c18d8ec6bb989006fa6d81c9cff3a5cc7aa91ec5894b22e16d11948e02c24b5238d9d706f474f31a17d5020eb2621ad2f4a6af70799cbace0fb3ac96854374
+EBUILD psybnc-2.3.2.9-r3.ebuild 4618 BLAKE2B d27e82e18d1cb713f282278dacdb1a9fb61b92ce8bbbe3698355bfa353fce156204567a1f816ba0f712f98e1c016ac8166a3054efd095c0aace4e54cf4592ed2 SHA512 5c9500a9f673200841ba7cf14aa46889ba4b42312d7ce3a11158b640ec4e9fe1d8eb4539353cab767f7380c82c25d4b4aebd09b1da5c21fca4713ad75a639ebb
 MISC metadata.xml 434 BLAKE2B 7e478f33125a86a9298854d4f3196e74cdf7b7138139048d4d20bcb9a15b88ef988776fabacdbf247dbf08c99a5756007283e6e6ba20ec38529dc34c106a4abd SHA512 79ea36967c0e1d45d332e64c054e45114689f66d5c290bb1eb9c901244fb2f9a3629564d67581589cfee2e8764b9887bde66f07cc2d74e7abfaeb290ceac2286
diff --git a/net-irc/psybnc/files/compile.diff b/net-irc/psybnc/files/compile.diff
index fdee75c60732..99e55b6d8cdc 100644
--- a/net-irc/psybnc/files/compile.diff
+++ b/net-irc/psybnc/files/compile.diff
@@ -1,6 +1,6 @@
-diff -Naurp src/p_blowfish.c src/p_blowfish.c
---- src/p_blowfish.c	2007-02-26 12:16:53.000000000 +0000
-+++ src/p_blowfish.c	2007-02-26 12:17:11.000000000 +0000
+diff -Naurp a/src/p_blowfish.c b/src/p_blowfish.c
+--- a/src/p_blowfish.c	2007-02-26 12:16:53.000000000 +0000
++++ b/src/p_blowfish.c	2007-02-26 12:17:11.000000000 +0000
 @@ -31,7 +31,7 @@ static char rcsid[] = "@(#)# $Id$
  #include <string.h>
  #include <config.h>
@@ -10,9 +10,9 @@ diff -Naurp src/p_blowfish.c src/p_blowfish.c
  char *lngtxt(int msgnum);
  
  #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
-diff -Naurp src/p_global.h src/p_global.h
---- src/p_global.h	2007-02-26 12:16:53.000000000 +0000
-+++ src/p_global.h	2007-02-26 12:17:11.000000000 +0000
+diff -Naurp a/src/p_global.h b/src/p_global.h
+--- a/src/p_global.h	2007-02-26 12:16:53.000000000 +0000
++++ b/src/p_global.h	2007-02-26 12:17:11.000000000 +0000
 @@ -972,8 +972,8 @@ int checklogging(int usern);
  #endif
  
@@ -33,9 +33,9 @@ diff -Naurp src/p_global.h src/p_global.h
  int strmncasecmp(char *one, char *two);
  int strmcmp(char *one, char *two);
  int strmwildcmp(char *line, char *wildcard);
-diff -Naurp src/p_memory.c src/p_memory.c
---- src/p_memory.c	2007-02-26 12:16:53.000000000 +0000
-+++ src/p_memory.c	2007-02-26 12:17:11.000000000 +0000
+diff -Naurp a/src/p_memory.c b/src/p_memory.c
+--- a/src/p_memory.c	2007-02-26 12:16:53.000000000 +0000
++++ b/src/p_memory.c	2007-02-26 12:17:11.000000000 +0000
 @@ -32,7 +32,7 @@ FILE *logm=NULL;
  
  /* malloc-wrapper. No memory will log an error entry and kill the bouncer */
@@ -54,9 +54,9 @@ diff -Naurp src/p_memory.c src/p_memory.c
  {
  #ifdef LOGALLOC
      if(logm==NULL)
-diff -Naurp src/p_string.c src/p_string.c
---- src/p_string.c	2007-02-26 12:16:53.000000000 +0000
-+++ src/p_string.c	2007-02-26 12:17:11.000000000 +0000
+diff -Naurp a/src/p_string.c b/src/p_string.c
+--- a/src/p_string.c	2007-02-26 12:16:53.000000000 +0000
++++ b/src/p_string.c	2007-02-26 12:17:11.000000000 +0000
 @@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum)
  
  /* string copy with len and zero delimit */
@@ -66,9 +66,9 @@ diff -Naurp src/p_string.c src/p_string.c
  {
      char bf[strlen(source)+2];
      char *pt;
-diff -Naurp src/match.c src/match.c
---- src/match.c	2007-02-26 12:26:10.000000000 +0000
-+++ src/match.c	2007-02-26 12:26:17.000000000 +0000
+diff -Naurp a/src/match.c b/src/match.c
+--- a/src/match.c	2007-02-26 12:26:10.000000000 +0000
++++ b/src/match.c	2007-02-26 12:26:17.000000000 +0000
 @@ -36,6 +36,7 @@
  /* Remove the next line to use this in IrcII */
  #define EGGDROP
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
index 4d796961d6ff..b4688d7584c8 100644
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
@@ -1,5 +1,5 @@
---- config.h.orig	2009-06-10 21:30:24.000000000 +0000
-+++ config.h	2009-06-10 21:30:39.000000000 +0000
+--- a/config.h.orig	2009-06-10 21:30:24.000000000 +0000
++++ b/config.h	2009-06-10 21:30:39.000000000 +0000
 @@ -50,6 +50,10 @@
  
  #define BLOCKDNS
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
index fbb4b163e3a3..afc0dcfa140c 100644
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
@@ -1,5 +1,5 @@
---- config.h.orig	2008-12-14 20:02:57.000000000 +0000
-+++ config.h	2008-12-14 20:03:35.000000000 +0000
+--- a/config.h	2008-12-14 20:02:57.000000000 +0000
++++ b/config.h	2008-12-14 20:03:35.000000000 +0000
 @@ -14,6 +14,10 @@
  
  #define TRANSLATE
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-scripting.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-scripting.patch
index 08dce4fa715b..a8586e0638df 100644
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-scripting.patch
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-scripting.patch
@@ -1,5 +1,5 @@
---- config.h.orig	2009-01-03 17:30:41.000000000 +0000
-+++ config.h	2009-01-03 17:31:27.000000000 +0000
+--- a/config.h.orig	2009-01-03 17:30:41.000000000 +0000
++++ b/config.h	2009-01-03 17:31:27.000000000 +0000
 @@ -26,6 +26,10 @@
  
  #define TRAFFICLOG
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
new file mode 100644
index 000000000000..f7dc538ded25
--- /dev/null
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs user
+
+MY_PV="$(ver_rs 3 -)"
+PSYBNC_HOME="/var/lib/psybnc"
+
+DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
+HOMEPAGE="http://www.psybnc.at/index.html"
+SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
+IUSE="ipv6 ssl oidentd scripting multinetwork"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
+		oidentd? ( >=net-misc/oidentd-2.0 )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}"/"${PN}"
+
+pkg_setup() {
+	enewgroup psybnc
+	enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+
+	# Useless files
+	rm -f */INFO || die
+
+	# Pretend we already have a certificate, we generate it in pkg_config
+	touch key/psybnc.cert.pem || die
+
+	if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]; then
+		einfo "Using existing salt.h for password encryption"
+		cp "${ROOT}"/usr/share/psybnc/salt.h salt.h || die
+	fi
+}
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/compile.diff"
+	eapply "${FILESDIR}/ldflags-fix.patch"
+
+	# add oidentd
+	use oidentd && eapply "${FILESDIR}/${P}-oidentd.patch"
+
+	# add scripting support
+	use scripting && eapply "${FILESDIR}/${P}-scripting.patch"
+
+	# add multinetwork support
+	use multinetwork && eapply "${FILESDIR}/${P}-multinetwork.patch"
+
+	# Prevent stripping the binary
+	sed -i -e "/@strip/ d" tools/autoconf.c || die
+}
+
+src_compile() {
+	if use ipv6; then
+		rm -f tools/chkipv6.c || die
+	fi
+	if use ssl; then
+		rm -f tools/chkssl.c || die
+	fi
+
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin psybnc
+
+	insinto /usr/share/psybnc
+	doins -r help lang salt.h
+	fperms 0600 /usr/share/psybnc/salt.h
+
+	insinto /etc/psybnc
+	doins "${FILESDIR}"/psybnc.conf
+
+	keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
+	dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
+	dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
+
+	fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf
+	fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
+	fperms 0640 /etc/psybnc/psybnc.conf
+
+	if use ssl; then
+		keepdir /etc/psybnc/ssl
+		dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
+	else
+		# Drop SSL listener from psybnc.conf
+		sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf || die
+	fi
+
+	if use oidentd; then
+		insinto /etc
+		doins "${FILESDIR}"/oidentd.conf.psybnc
+		fperms 640 /etc/oidentd.conf.psybnc
+		# install init-script with oidentd-support
+		newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
+	else
+		# install init-script without oidentd-support
+		newinitd "${FILESDIR}"/psybnc.initd psybnc
+	fi
+
+	newconfd "${FILESDIR}"/psybnc.confd psybnc
+
+	dodoc CHANGES FAQ README SCRIPTING TODO
+	docinto example-script
+	dodoc scripts/example/DEFAULT.SCRIPT
+}
+
+pkg_config() {
+	if use ssl; then
+		if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f ${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]]; then
+			ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!"
+			ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again."
+			return
+		fi
+
+		einfo "Generating certificate request..."
+		openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
+			-keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes || die
+		einfo "Generating self-signed certificate..."
+		openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
+			-key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem \
+			-out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem || die
+		einfo "Setting permissions on files..."
+		chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die
+		chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		elog
+		elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create needed SSL certificates."
+	fi
+	if use oidentd; then
+		elog
+		elog "You have enabled oidentd-support. You will need to set"
+		elog "up your /etc/oident.conf file before running psybnc. An example"
+		elog "for psyBNC can be found under /etc/oidentd.conf.psybnc"
+	fi
+	elog
+	elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo."
+	elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf to change this."
+	elog
+	elog "To be able to reuse an existing psybnc.conf, you need to make sure that the"
+	elog "old salt.h is available at /usr/share/psybnc/salt.h when compiling a new"
+	elog "version of psyBNC. It is needed for password encryption and decryption."
+	elog
+}