Added a patch to fix some problems with unexpected server replies, cf. bug 185468.

Package-Manager: portage-2.1.3.5

4 files changed, 127 insertions, 4 deletions

diff --git a/net-nntp/newspost/Manifest b/net-nntp/newspost/Manifest
index a5cc28518d77..6df78929dd21 100644
--- a/net-nntp/newspost/Manifest
+++ b/net-nntp/newspost/Manifest
@@ -5,11 +5,19 @@ AUX CAN-2005-0101.patch 284 RMD160 51ef58e499ec13df732aed2488c799144207d41f SHA1
 MD5 e72758703815a9480ba6c7b081011d30 files/CAN-2005-0101.patch 284
 RMD160 51ef58e499ec13df732aed2488c799144207d41f files/CAN-2005-0101.patch 284
 SHA256 cfa2276d82c991d8a45a12652a8b17963121ba4e7f42354fd54e9f9f23934377 files/CAN-2005-0101.patch 284
+AUX newspost-2.1.1-nntp.patch 1845 RMD160 85200786a05b419c54fb78b17c7aeed6340e932a SHA1 a06e5e664b7668aaf3967ae443f74fb1f69449ef SHA256 7fae7a480aeeb55eb6c9579040d26a1de71fd60ac10736635a836f61ccf326de
+MD5 ce4844096224b306e78104c204db102c files/newspost-2.1.1-nntp.patch 1845
+RMD160 85200786a05b419c54fb78b17c7aeed6340e932a files/newspost-2.1.1-nntp.patch 1845
+SHA256 7fae7a480aeeb55eb6c9579040d26a1de71fd60ac10736635a836f61ccf326de files/newspost-2.1.1-nntp.patch 1845
 DIST newspost-2.1.1.tar.gz 61412 RMD160 a954f727e3ba5b3dcf845b8158b2752d76dbac2a SHA1 244f31c6e5aa8e41224310295e477ab4a8a17071 SHA256 bdd1ae83d7459d2cdd726115c028405fce33f9b60e71b88969f82fbc02672be7
 EBUILD newspost-2.1.1-r1.ebuild 1063 RMD160 bdcc7f541b84812e625976379d0cc7a4945ee16a SHA1 3bfce397aed6b783eeb510e79468d624d042c13b SHA256 a8f74f380cbaadc65c6b9d638c4dd862d275d6a1b9b6e772b8b4f2224c2844d9
 MD5 d4a88e879922665dd8452e950cbc0181 newspost-2.1.1-r1.ebuild 1063
 RMD160 bdcc7f541b84812e625976379d0cc7a4945ee16a newspost-2.1.1-r1.ebuild 1063
 SHA256 a8f74f380cbaadc65c6b9d638c4dd862d275d6a1b9b6e772b8b4f2224c2844d9 newspost-2.1.1-r1.ebuild 1063
+EBUILD newspost-2.1.1-r2.ebuild 1068 RMD160 75414a4ca60fb317e114d1f61a4771f188a7b698 SHA1 c97d626bf30292465ce1ba8788e185930baa17a0 SHA256 572b23ac74fee026d3820fad21f17864592a0279c9c1fa98453c1a1ea62a6bb2
+MD5 ebb553bfbe37d8150a55e426df7a8142 newspost-2.1.1-r2.ebuild 1068
+RMD160 75414a4ca60fb317e114d1f61a4771f188a7b698 newspost-2.1.1-r2.ebuild 1068
+SHA256 572b23ac74fee026d3820fad21f17864592a0279c9c1fa98453c1a1ea62a6bb2 newspost-2.1.1-r2.ebuild 1068
 MISC ChangeLog 3372 RMD160 5328a50e96a2a3edbaffd25cbccdca8c8124622a SHA1 8ef7fba858b4cb4cea3853558d5658ebcd2ff22f SHA256 7e758cc2b5d4a0aa431ebe83aacb92a415309afdbfaed89c25317dd6530cb72a
 MD5 e46e048f6a3d0418ac780599880fe292 ChangeLog 3372
 RMD160 5328a50e96a2a3edbaffd25cbccdca8c8124622a ChangeLog 3372
@@ -21,10 +29,13 @@ SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153 metadata
 MD5 a2eb277accf3e4729f0aaadcf072464f files/digest-newspost-2.1.1-r1 241
 RMD160 232db2f709825252f0559d32af2c27e3330543c1 files/digest-newspost-2.1.1-r1 241
 SHA256 1b8ab2fe07052612aaf9592ecde043656ef08ae9de8a832a1f1b8de2de050fed files/digest-newspost-2.1.1-r1 241
+MD5 a2eb277accf3e4729f0aaadcf072464f files/digest-newspost-2.1.1-r2 241
+RMD160 232db2f709825252f0559d32af2c27e3330543c1 files/digest-newspost-2.1.1-r2 241
+SHA256 1b8ab2fe07052612aaf9592ecde043656ef08ae9de8a832a1f1b8de2de050fed files/digest-newspost-2.1.1-r2 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGIW3fI1lqEGTUzyQRAsi7AKCva9nYK95bjTU2Ny4ERaonsF3trACgl1Lc
-/3njUvEMANgol42QC4GAWbA=
-=mWwb
+iD8DBQFGx3eDCkvF58q80IkRApEzAJ9OLUvaUV73QJc1jwotjJB335aeiwCffBDy
+RXBoZgn2nn0iG4C6YvHhDaQ=
+=8JI3
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/newspost/files/digest-newspost-2.1.1-r2 b/net-nntp/newspost/files/digest-newspost-2.1.1-r2
new file mode 100644
index 000000000000..b924b933f069
--- /dev/null
+++ b/net-nntp/newspost/files/digest-newspost-2.1.1-r2
@@ -0,0 +1,3 @@
+MD5 099a69ce511f746aec88a57d03575d5f newspost-2.1.1.tar.gz 61412
+RMD160 a954f727e3ba5b3dcf845b8158b2752d76dbac2a newspost-2.1.1.tar.gz 61412
+SHA256 bdd1ae83d7459d2cdd726115c028405fce33f9b60e71b88969f82fbc02672be7 newspost-2.1.1.tar.gz 61412
diff --git a/net-nntp/newspost/files/newspost-2.1.1-nntp.patch b/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
new file mode 100644
index 000000000000..8779e8f36b47
--- /dev/null
+++ b/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
@@ -0,0 +1,69 @@
+--- newspost-2.1.1.orig/base/nntp.c
++++ newspost-2.1.1/base/nntp.c
+@@ -26,6 +26,10 @@
+ *** Public Routines
+ **/
+ 
++int _nntp_post(const char *subject, newspost_data *data,
++		const char *buffer, long length,
++		boolean no_ui_updates);
++
+ boolean nntp_logon(newspost_data *data) {
+ 	char buffer[STRING_BUFSIZE];
+ 
+@@ -78,6 +82,35 @@
+ int nntp_post(const char *subject, newspost_data *data, 
+ 	      const char *buffer, long length,
+ 	      boolean no_ui_updates) {
++	int retval = _nntp_post(subject, data, buffer, length, no_ui_updates);
++
++	if (retval == POSTING_FAILED-64) {
++		/* try log out then back in */
++		ui_nntp_posting_retry();
++		nntp_logoff();
++		socket_close();
++		sleep(5);
++
++		/* create the socket */
++		ui_socket_connect_start(data->address->data);
++		retval = socket_create(data->address->data, data->port);
++		if (retval < 0)
++			return retval;
++		ui_socket_connect_done();
++
++		ui_nntp_logon_start(data->address->data);
++		if (nntp_logon(data) == FALSE)
++			return POSTING_FAILED;
++		ui_nntp_logon_done();
++
++		retval = _nntp_post(subject, data, buffer, length, no_ui_updates);
++		}
++	return retval;
++}
++
++int _nntp_post(const char *subject, newspost_data *data, 
++	      const char *buffer, long length,
++	      boolean no_ui_updates) {
+ 	char response[STRING_BUFSIZE];
+ 	const char *pi;
+ 	long i, chunksize;
+@@ -95,7 +128,7 @@
+ 	if (strncmp(response, NNTP_PROCEED_WITH_POST, 3) != 0) {
+ 		/* this shouldn't really happen */
+ 		ui_nntp_unknown_response(response);
+-		return POSTING_FAILED;
++		return POSTING_FAILED-64;
+ 	}
+ 	
+ 	buff = buff_add(buff, "From: %s\r\n", data->from->data);
+--- newspost-2.1.1.orig/base/utils.c
++++ newspost-2.1.1/base/utils.c
+@@ -44,7 +44,7 @@
+ }
+ 
+ Buff * getline(Buff *buff, FILE *file){
+-	char c = fgetc(file);
++	int c = fgetc(file);
+ 	buff = buff_free(buff);
+ 	while(TRUE){
+ 		if((c == '\n')
diff --git a/net-nntp/newspost/newspost-2.1.1-r2.ebuild b/net-nntp/newspost/newspost-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..54e5d53c589c
--- /dev/null
+++ b/net-nntp/newspost/newspost-2.1.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/newspost/newspost-2.1.1-r2.ebuild,v 1.1 2007/08/18 22:49:32 philantrop Exp $
+
+inherit eutils
+
+DESCRIPTION="a usenet binary autoposter for unix"
+HOMEPAGE="http://newspost.unixcab.org/"
+SRC_URI="http://newspost.unixcab.org/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/CAN-2005-0101.patch"
+
+	# Should fix some problems with unexpected server replies, cf. bug 185468
+	epatch "${FILESDIR}/${P}-nntp.patch"
+
+	sed -i \
+		-e "s:OPT_FLAGS = :OPT_FLAGS = ${CFLAGS}#:" Makefile \
+		|| die "sed Makefile failed"
+
+	# We don't want pre-stripped binaries
+	sed -i -e "s:-strip newspost::" Makefile || die "pre-stripping sed failed"
+}
+
+src_install () {
+	dobin newspost || die "dobin failed"
+	doman man/man1/newspost.1 || die "doman failed"
+	dodoc README CHANGES || die "dodoc failed"
+}