Version bump to development release. Fix potential buffer overflows (bug #434264), change from /var/run to /run, remove need

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

6 files changed, 189 insertions, 12 deletions

diff --git a/net-nntp/nzbget/ChangeLog b/net-nntp/nzbget/ChangeLog
index 6c1df778fa1b..beb1aaba99ab 100644
--- a/net-nntp/nzbget/ChangeLog
+++ b/net-nntp/nzbget/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nntp/nzbget
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.45 2012/10/06 16:58:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.46 2012/11/02 06:15:57 radhermit Exp $
+
+*nzbget-9.0_pre477 (02 Nov 2012)
+
+  02 Nov 2012; Tim Harder <radhermit@gentoo.org> +nzbget-9.0_pre477.ebuild,
+  +files/nzbget-9.0_pre477-buffer-overflows.patch,
+  +files/nzbget-9.0_pre477-header.patch, files/nzbget.initd:
+  Version bump to development release. Fix potential buffer overflows (bug
+  #434264), change from /var/run to /run, remove need net from init script, and
+  add zlib use flag.
 
   06 Oct 2012; Raúl Porcel <armin76@gentoo.org> nzbget-0.8.0.ebuild:
   x86 stable wrt #433882
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index d2502112f750..c99da89b0358 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -3,18 +3,26 @@ Hash: SHA256
 
 AUX nzbget-0.7.0-openssl-1.patch 1075 SHA256 82558aa85bdd078fec12e33fddd23df38b43a3f4f1a9270619aeac8943c48ceb SHA512 60c1af35d406a5453fb941a55941badabd40f7c46c470e09028df3c0c25a87b5409733b3eb3727a6b1c2e2a32a1d1699ba187f6d50dd84401d63af0ea7f67a4c WHIRLPOOL 56ddaacad8c9ae5476b1cd0c7ae94781eb6ebcfda97e58ccb9bf9d4fa9ac1f91463697a11ad3a70c1462649d49a6cd6396fb78bddaba84b3ef6fa7e18f8864dc
 AUX nzbget-0.7.0-underlinking.patch 621 SHA256 d311471cc648346047681433d9d6b715e554e36979d8b6771b74eae5e5dcb9bf SHA512 ae633aa15bc87e1f11d8640e2350da69997b4218eeea38c4e724d98164bca7ae5e97f795e483149266a452a4a4337dc136152f85fb77c8e278d46415eb3e5813 WHIRLPOOL a14ef2ac34cfe7d36009772848f315a6be0863433a0dbc7d522262f15fe4b82093d2a51bcc60492a3815a072be81c73ee2b1881c502b98c99b51bc31bb74c9c3
+AUX nzbget-9.0_pre477-buffer-overflows.patch 1783 SHA256 687318fa04f1446abcd54c845b92febde7f6f0b790e968546a0a7daf2a2095d8 SHA512 bb9da489c0ca3d01fc2a98f3813bb4e8ab586d9bb9e0ad8e7d4e2cecf80430b03501f430fed21034bf34523987316f9dabd52a00b2edd737e2d89598939fbda5 WHIRLPOOL dc23b13d2251c6dd0d024fb35aa12c87709e9b4afdc84755b014dac4effd51a0e72793a390d05704ad7424bb8571dbc2faf1e89ef862a095fd9feffc5ba6eca9
+AUX nzbget-9.0_pre477-header.patch 222 SHA256 db7f3c6bea0baf2c338d2d5a766e0476769df09d9e145beb8b419111de7e8d3f SHA512 65c025481f97dfb0490acb90b82433151da79eeaafb09383ce1ded1deaf70ee6e9c255daff0c553148c1566bbbb6d8e279651ed7b0dbb2c1dcb5ed90c8794be2 WHIRLPOOL 7a3d44c6abe3095b476b5cbf6694729a4758328025a361b8e450ce469d58703e432743512e113909c0345789cb5280d279c29b54cdae4fb36a5ebf736147ac17
 AUX nzbget.confd 337 SHA256 a2a305dc1ef482d82041c5261dba235f6faae229d894785f528d87c9c0e452b8 SHA512 0f9a0d62ac6ea35703ebd64ec68057596d63fd5957afa2d3bcd18b4e8db4b24e78d060dc36cf90dbd2f604b4c6f107fb8e59ff779b6865cd362e71a0666d6c56 WHIRLPOOL 220c7638c0f62f4cf4314e40b022c34c41a7124d6bf41bdf455948e2e862715413d62cc4750db63967b24f3cbf1b5d13cd3bcea4c016ee5611f5226a9f1bd750
-AUX nzbget.initd 894 SHA256 93f1e6eac8fdddf9d83da2f8c19541a2717ba67288bd04c03877d3dede40f082 SHA512 0321eb214cd2aaf22efc3cdb2ad9f75d9e0df9fc440f853823d38ecfc8caeb8a5d754313dcb52630981a3f732f0089fb7c4da71be92bfda527e18b478ac6f675 WHIRLPOOL 77f0ae88d1e9e735400238141c3fe21155832c8d150914655218d153cceacba1ff42770508b605e82c732b839137cabf48fdf77ca7e85eba677f17949ecae338
+AUX nzbget.initd 870 SHA256 ded31c1ab53ccd4748f54ff231910cfdc75f023f09dd41e4b49bd9966a0c9d35 SHA512 6fab33b0c55bf7b5af7468bb488f57a04b4f00a42fecab39242d93618d835008bf9e4c2ad909ea4506b7cdab89141d26a7aa24d070c7f9836acf91002fcc30ef WHIRLPOOL 86e9359e0b0b96f73a48f71e41571ca3d0cfce2b35795119266ffc1518527c0b0c0d8de2c001563728c8b39c68aebba3fb2c921e136f633128f8ecb60f68df07
 DIST nzbget-0.7.0.tar.gz 316059 SHA256 b798bbcc9f6816b4e19a95f74df067440f7ad49e1c16a3f33f99bddf7916771e
 DIST nzbget-0.8.0.tar.gz 321351 SHA256 646939596097fafdeb0b4064b433463419e7d0d9af7fe32f6689d6b95ad77d95 SHA512 ea9830effcfece3cc60592924840de3f65cf3c5581ed5afbc97c819c248c6b703a228e71bfb5997947c52c7efa84a5aa5457f7a7babc97ffae5b729179463ab3 WHIRLPOOL 692013bbf84c47f1bd22bdfce9554e3f5b2fb42892bf5b36e1a4612be7f3e85bad64897dfa48fa69ca96d2e9bd2fe923fca6171bf8843b96986f9ec55f949e2b
+DIST nzbget-9.0-testing-r477.tar.gz 619094 SHA256 269d54ec558a5472efa5ebf2e6c3bf7ffc0d7b10494480b97f15eb0671f36c65 SHA512 2009642e2e5bbc83bdab422a8d05848cb712db962f7edfb0b30c07dd11bc67538f110eaf9944f4006aac2a587fedcf656d55dab0027016c985560bb21aaac4df WHIRLPOOL 172570afda71c0b6d75c2913ea46c6c4e0ff701de758ac393e4d843af691c12239547f6893df9a6942c9433cdc9c331c2f0e01d8f1bab09889d284faa434a560
 EBUILD nzbget-0.7.0.ebuild 2793 SHA256 47798c3acf7d93c0b05b90ba292b9a51e7fdef93a3a2da4cbb3b9a8a847c0403 SHA512 c78309a9ea69b693753e11ba54294f10b2558b8e49d422bb261ee543e4f7f5cff7c1771f801ba952c4d1c64f62bf88579d9472755aff36506b949072f8fa2e14 WHIRLPOOL c377a3ae97699c596b6ec884f3ae786cae7bfe23b6cbb03a5b1a631861cc5eaea1c63c2f99a8866789259e1cdf5f808860d20782b5cc84b56fc022df59a9e823
 EBUILD nzbget-0.8.0.ebuild 2516 SHA256 88a1c05bb61435371acd3ed782181f969612364142cd9e37ca46196d3170ce6d SHA512 c5fdf279a847808d667d30e76e57d6e31471f08822699dbb66ce2eab3c162655c16403402dddfbaa5f705252618385dfa44473a0ef18d46ac84d7849201511de WHIRLPOOL ba4a08d05b9a1fa50398d3f33c05edfd2ac9d909441235d88b515e0a5b43edf5b8bc760d983c63dd6fe43709dcd0a2dafe5c97a1a99b6f3a34c97e6262e57e77
-MISC ChangeLog 7121 SHA256 db648c33b98bc4fa5f063170bd37682a608a0a7ce333159f8978a58c2f84ec0d SHA512 31aac45a360a8d00e5e45109f0a6da126711486aac37ebee2d575bfba28d9cd0477c42feddd1f6ae03d4f27cf407fe654436ec38923434384fafe6b85a9cab36 WHIRLPOOL ad13a468951a3a8b13e11b0092c718a3ce62200045949bdc33f1d0138c069603f54588ee3069e6c6354aecbc8a327fee383d4b5b94bb7e81ab4b309643658bf3
+EBUILD nzbget-9.0_pre477.ebuild 2778 SHA256 555fe52865b0031ee1faac6fdab7bf5fb484981f407ae051bc00fac3c1c50cd3 SHA512 70ba359c2ed7a393ec7ddd76deeb408552386f14708346af13d178addae7568fe5215f3cc2506f47ba887515e4dc8afe76a8b985da598f46c625ced13c800fe6 WHIRLPOOL 40e7701d85c67ad72958be984e9636a7251b73cdbfbb1b8bf393b06b927f71e530defb53a53e09084d95f78f7685b66b9846cd1dc8e9049dfaa2c05de959412f
+MISC ChangeLog 7522 SHA256 9802f4e3fcb173f036b5dbfcd2ef29fc822393a035ca64cad1cdd74437f6a373 SHA512 e4c8b0e31709c8b00acd545de25d6c4a71195033f1658a5649b790e85a15758934da2c91ba83f68830678b8e0a0cd97c0ad3777dd6dbb0de892aaf9ce6e72d1e WHIRLPOOL 9aa889de5f3bfe0c90572f810a18047232893109414bd7af5f6a2f15423a01f3596f26dfdce25c568afd5a29d144c6dcc134e3bb056e7e1ed476bdb2d206ffc6
 MISC metadata.xml 539 SHA256 48f9bc14033c2a447322b31e146267269726e47b8925fed04eb763fae4655e31 SHA512 bb80f64f00b908a589e8c9aad6e7be82fe2d44507cf7cb625c2b718f28a62dd86b6e530be16e0cae1209109b5289829211d120db24b5c2249263a8227b18fd26 WHIRLPOOL adc2d684e0c54ad489401de1ab2a7a76307ccf7bccfd80b00aed81b3ba09983f933469b7bcb126372616e5eab52d4caa9564a9cd3f14e713acb84e35605fc2f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBwY0UACgkQuQc30/atMkBKPACZAYAKaGbcalDWQkzSPWCjCnTW
-WsEAnRxwg5f3LcrfP4lm8P0KiYxRvl4r
-=/vbH
+iQEcBAEBCAAGBQJQk2UnAAoJEEqz6FtPBkyjppMH/0J9YeLn7pujz8gSwEJX+QNK
+Kk6wuyGJlxMx4QaPRghi+eLTNtEkGbrCnBs3Mv8kTb4qSvNjBu+UcxWCpZP/7L0B
+Ji/1epkdSmZ4UcE0Mr7GzqGFBkciZgEFj2x7klLg+ujA0L1+YJcyCFVonDPAcqO3
+EUn+g2WDiOeCf1Ypoy1XGQCoK6u3NNa7PEX8/0URBJuNfTx3CynfdiZ1yL4SEqd3
+5AhQI7MYJlcOSNdUXViOHPKQPCxZ39qc2P+YwbzclUNbrP/fYIzwLiJjcg+Y1eJA
+SbMnV/SW7NIPv/HP3/uY3rtFzA9lLyhfMzW9ehoOzEiw4UJDn0eJTjQl3dfaps0=
+=gc2R
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch b/net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch
new file mode 100644
index 000000000000..ca26fc141bc2
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch
@@ -0,0 +1,42 @@
+--- nzbget-9.0-testing/RemoteClient.cpp
++++ nzbget-9.0-testing/RemoteClient.cpp
+@@ -541,20 +541,20 @@
+ 				{
+ 					if (szParameters[0] == '\0')
+ 					{
+-						strncat(szParameters, " (", 1024);
++						strncat(szParameters, " (", sizeof(szParameters) - strlen(szParameters) - 1);
+ 					}
+ 					else
+ 					{
+-						strncat(szParameters, ", ", 1024);
++						strncat(szParameters, ", ", sizeof(szParameters) - strlen(szParameters) - 1);
+ 					}
+ 					NZBParameter* pNZBParameter = *it;
+-					strncat(szParameters, pNZBParameter->GetName(), 1024);
+-					strncat(szParameters, "=", 1024);
+-					strncat(szParameters, pNZBParameter->GetValue(), 1024);
++					strncat(szParameters, pNZBParameter->GetName(), sizeof(szParameters) - strlen(szParameters) - 1);
++					strncat(szParameters, "=", sizeof(szParameters) - strlen(szParameters) - 1);
++					strncat(szParameters, pNZBParameter->GetValue(), sizeof(szParameters) - strlen(szParameters) - 1);
+ 				}
+ 				if (szParameters[0] != '\0')
+ 				{
+-					strncat(szParameters, ")", 1024);
++					strncat(szParameters, ")", sizeof(szParameters) - strlen(szParameters) - 1);
+ 				}
+ 
+ 				if (!szPattern || ((MatchedNZBInfo*)pGroupInfo->GetNZBInfo())->m_bMatch)
+@@ -672,10 +672,10 @@
+ 
+ 	if (ntohl(ListResponse.m_iPostJobCount) > 0 || ntohl(ListResponse.m_bPostPaused))
+ 	{
+-		strncat(szServerState, strlen(szServerState) > 0 ? ", Post-Processing" : "Post-Processing", sizeof(szServerState));
++		strncat(szServerState, strlen(szServerState) > 0 ? ", Post-Processing" : "Post-Processing", sizeof(szServerState) - strlen(szServerState) - 1);
+ 		if (ntohl(ListResponse.m_bPostPaused))
+ 		{
+-			strncat(szServerState, " paused", sizeof(szServerState));
++			strncat(szServerState, " paused", sizeof(szServerState) - strlen(szServerState) - 1);
+ 		}
+ 	}
+ 
diff --git a/net-nntp/nzbget/files/nzbget-9.0_pre477-header.patch b/net-nntp/nzbget/files/nzbget-9.0_pre477-header.patch
new file mode 100644
index 000000000000..e60dd9f1a6f7
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-9.0_pre477-header.patch
@@ -0,0 +1,11 @@
+--- nzbget-9.0-testing/Scanner.cpp
++++ nzbget-9.0-testing/Scanner.cpp
+@@ -36,6 +36,8 @@
+ #include <fstream>
+ #ifdef WIN32
+ #include <direct.h>
++#else
++#include <unistd.h>
+ #endif
+ #include <sys/stat.h>
+ #include <errno.h>
diff --git a/net-nntp/nzbget/files/nzbget.initd b/net-nntp/nzbget/files/nzbget.initd
index 8d984ccc7ce5..22a6450dbacf 100644
--- a/net-nntp/nzbget/files/nzbget.initd
+++ b/net-nntp/nzbget/files/nzbget.initd
@@ -1,14 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/files/nzbget.initd,v 1.3 2011/12/25 07:42:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/files/nzbget.initd,v 1.4 2012/11/02 06:15:57 radhermit Exp $
 
 extra_started_commands="pause unpause"
 
-depend() {
-	need net
-}
-
 start() {
 	ebegin "Starting nzbget"
 	start-stop-daemon --quiet --start --user "${NZBGET_USER}" \
diff --git a/net-nntp/nzbget/nzbget-9.0_pre477.ebuild b/net-nntp/nzbget/nzbget-9.0_pre477.ebuild
new file mode 100644
index 000000000000..0cb24b90464b
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-9.0_pre477.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-9.0_pre477.ebuild,v 1.1 2012/11/02 06:15:57 radhermit Exp $
+
+EAPI="5"
+
+inherit eutils autotools user
+
+MY_P=${P/_pre/-testing-r}
+
+DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
+HOMEPAGE="http://nzbget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gnutls ncurses parcheck ssl zlib "
+
+RDEPEND="dev-libs/libxml2
+	ncurses? ( sys-libs/ncurses )
+	parcheck? (
+		app-arch/libpar2
+		dev-libs/libsigc++:2
+	)
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README nzbget.conf )
+
+S=${WORKDIR}/${P/_pre*/-testing}
+
+src_prepare() {
+	sed -i 's:^PostProcess=.*:#PostProcess=/usr/share/nzbget/nzbget-postprocess.sh:' \
+		nzbget.conf || die
+
+	sed -e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
+		-e 's:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \
+		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
+		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
+
+	sed -i "/^dist_doc_DATA/d" Makefile.am || die
+
+	epatch "${FILESDIR}"/${PN}-0.7.0-underlinking.patch
+	epatch "${FILESDIR}"/${P}-header.patch
+	epatch "${FILESDIR}"/${P}-buffer-overflows.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ncurses curses) \
+		$(use_enable parcheck) \
+		$(use_enable ssl tls) \
+		$(use_enable zlib gzip) \
+		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
+}
+
+src_install() {
+	default
+
+	# remove unneeded service script
+	rm "${D}"/usr/sbin/nzbgetd || die
+
+	insinto /etc
+	doins nzbget.conf
+	doins nzbgetd.conf
+
+	exeinto /usr/share/nzbget
+	doexe nzbget-postprocess.sh
+
+	# remove duplicate script/config
+	rm "${D}"/usr/share/nzbget/nzbget.conf
+	rm "${D}"/usr/bin/nzbget-postprocess.sh
+
+	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
+	keepdir /var/log/nzbget /run/nzbget
+
+	newinitd "${FILESDIR}"/nzbget.initd nzbget
+	newconfd "${FILESDIR}"/nzbget.confd nzbget
+}
+
+pkg_preinst() {
+	enewgroup nzbget
+	enewuser nzbget -1 -1 /var/lib/nzbget nzbget
+
+	fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp}
+	fperms 750 /var/lib/nzbget/{queue,tmp}
+	fperms 770 /var/lib/nzbget/{dst,nzb}
+
+	fowners nzbget:nzbget /var/log/nzbget /run/nzbget
+	fperms 750 /var/log/nzbget /run/nzbget
+
+	fowners root:nzbget /etc/nzbgetd.conf
+	fperms 640 /etc/nzbgetd.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "Please add users that you want to be able to use the system-wide"
+	elog "nzbget daemon to the nzbget group. To access the daemon run nzbget"
+	elog "with the --configfile /etc/nzbgetd.conf option."
+	elog
+}