Fix building with GLIBC 2.10+ wrt #273987.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 74 insertions, 12 deletions

diff --git a/net-nntp/newspost/ChangeLog b/net-nntp/newspost/ChangeLog
index 6078b445a865..ea4360bdef04 100644
--- a/net-nntp/newspost/ChangeLog
+++ b/net-nntp/newspost/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/newspost
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/newspost/ChangeLog,v 1.10 2008/01/25 22:10:57 grobian Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/newspost/ChangeLog,v 1.11 2009/08/06 11:45:14 ssuominen Exp $
+
+  06 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  newspost-2.1.1-r2.ebuild, +files/newspost-2.1.1-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #273987.
 
   25 Jan 2008; Fabian Groffen <grobian@gentoo.org> newspost-2.1.1-r1.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/net-nntp/newspost/Manifest b/net-nntp/newspost/Manifest
index 0a1ba00d8829..418def5a5823 100644
--- a/net-nntp/newspost/Manifest
+++ b/net-nntp/newspost/Manifest
@@ -1,7 +1,8 @@
 AUX CAN-2005-0101.patch 284 RMD160 51ef58e499ec13df732aed2488c799144207d41f SHA1 e88d9fb15fa26c3e5d4041f940e5e7f11e8b34c2 SHA256 cfa2276d82c991d8a45a12652a8b17963121ba4e7f42354fd54e9f9f23934377
+AUX newspost-2.1.1-glibc-2.10.patch 2038 RMD160 e1a8e88d95c60e2b347656c982d2ccb6262b21f5 SHA1 f4ea7db5ed46377312abc6a42da3708c3d12056a SHA256 a0be86639a3fc953e40a56a348cfe48da2fb3e4e46c4e055b3ee9ddac6018437
 AUX newspost-2.1.1-nntp.patch 1845 RMD160 85200786a05b419c54fb78b17c7aeed6340e932a SHA1 a06e5e664b7668aaf3967ae443f74fb1f69449ef SHA256 7fae7a480aeeb55eb6c9579040d26a1de71fd60ac10736635a836f61ccf326de
 DIST newspost-2.1.1.tar.gz 61412 RMD160 a954f727e3ba5b3dcf845b8158b2752d76dbac2a SHA1 244f31c6e5aa8e41224310295e477ab4a8a17071 SHA256 bdd1ae83d7459d2cdd726115c028405fce33f9b60e71b88969f82fbc02672be7
 EBUILD newspost-2.1.1-r1.ebuild 1051 RMD160 cd1c22a59e2d34b5f3c4ca57b41aff750e6db153 SHA1 61bcbd648bef21ab7f02205b05cbce532fc5955b SHA256 9bb881fcd6651964e5adf459858c1bc7536a5303aec468c574d46e22a51c23d1
-EBUILD newspost-2.1.1-r2.ebuild 1068 RMD160 75414a4ca60fb317e114d1f61a4771f188a7b698 SHA1 c97d626bf30292465ce1ba8788e185930baa17a0 SHA256 572b23ac74fee026d3820fad21f17864592a0279c9c1fa98453c1a1ea62a6bb2
-MISC ChangeLog 3497 RMD160 57f2f834ba8265d1030c0ca94cf9d79cfe8b5b17 SHA1 23a57fbadc52c54916bc75a2af9d5972db4225b9 SHA256 b42385467a6668ce2edd547237fd742195a732176bd973704234dcb5494f96f8
+EBUILD newspost-2.1.1-r2.ebuild 1101 RMD160 dad2416423b46020f43f03cf65a34277afc469e6 SHA1 92143069392a68cc44e248c31b90043a22cb0796 SHA256 5fc24d6a068d57c167fbcf92d6ffcbbeb35d5a268c00d4478958a7b459c912b1
+MISC ChangeLog 3667 RMD160 f876ebb2d80c8c1e027be1fcdffba6455c633f50 SHA1 3c484384aa73f35200b7387de26b6ef85526e97f SHA256 fcf8cddca76292c5ddfd3db4674451e0dbe3841a015d2257ebca9d03087869d0
 MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153
diff --git a/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch b/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
new file mode 100644
index 000000000000..fdaa78cbefb7
--- /dev/null
+++ b/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
@@ -0,0 +1,57 @@
+diff -ur newspost-2.1.1.orig/base/newspost.c newspost-2.1.1/base/newspost.c
+--- newspost-2.1.1.orig/base/newspost.c	2003-04-23 18:33:23.000000000 +0300
++++ newspost-2.1.1/base/newspost.c	2009-08-06 14:46:41.000000000 +0300
+@@ -342,7 +342,7 @@
+ 	file = fopen(filename, "r");
+ 	if (file != NULL) {
+ 		while (!feof(file)) {
+-			line = getline(line, file);
++			line = get_line(line, file);
+ 			if(line == NULL){
+ 				text_buffer = buff_add(text_buffer, "\r\n");
+ 				continue;
+diff -ur newspost-2.1.1.orig/base/utils.c newspost-2.1.1/base/utils.c
+--- newspost-2.1.1.orig/base/utils.c	2009-08-06 14:44:35.000000000 +0300
++++ newspost-2.1.1/base/utils.c	2009-08-06 14:45:20.000000000 +0300
+@@ -43,7 +43,7 @@
+ 	return NULL;
+ }
+ 
+-Buff * getline(Buff *buff, FILE *file){
++Buff * get_line(Buff *buff, FILE *file){
+ 	int c = fgetc(file);
+ 	buff = buff_free(buff);
+ 	while(TRUE){
+diff -ur newspost-2.1.1.orig/base/utils.h newspost-2.1.1/base/utils.h
+--- newspost-2.1.1.orig/base/utils.h	2003-02-08 17:09:41.000000000 +0200
++++ newspost-2.1.1/base/utils.h	2009-08-06 14:45:13.000000000 +0300
+@@ -26,7 +26,7 @@
+ file_entry * file_entry_alloc();
+ file_entry * file_entry_free(file_entry *fe);
+ 
+-Buff * getline(Buff *buff, FILE *file);
++Buff * get_line(Buff *buff, FILE *file);
+ Buff *buff_add(Buff *buff, char *data, ... );
+ Buff * buff_free(Buff *buff);
+ Buff *buff_create(Buff *buff, char *data, ... );
+diff -ur newspost-2.1.1.orig/ui/options.c newspost-2.1.1/ui/options.c
+--- newspost-2.1.1.orig/ui/options.c	2003-04-23 18:33:33.000000000 +0300
++++ newspost-2.1.1/ui/options.c	2009-08-06 14:46:31.000000000 +0300
+@@ -332,7 +332,7 @@
+ 		file = fopen(filename->data, "r");
+ 		if (file != NULL) {
+ 			while (!feof(file)) {
+-				line = getline(line, file);
++				line = get_line(line, file);
+ 				linenum++;
+ 				if(line == NULL) continue;
+ 
+@@ -429,7 +429,7 @@
+ 				linenum = 0;
+ 				while (linenum < 8) {
+ 					linenum++;
+-					line = getline(line, file);
++					line = get_line(line, file);
+ 					if(line == NULL) continue;
+ 
+ 					switch (linenum) {
diff --git a/net-nntp/newspost/newspost-2.1.1-r2.ebuild b/net-nntp/newspost/newspost-2.1.1-r2.ebuild
index 54e5d53c589c..292553584dc8 100644
--- a/net-nntp/newspost/newspost-2.1.1-r2.ebuild
+++ b/net-nntp/newspost/newspost-2.1.1-r2.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/newspost/newspost-2.1.1-r2.ebuild,v 1.2 2009/08/06 11:45:14 ssuominen 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"
+IUSE=""
 
+RDEPEND=""
 DEPEND=">=sys-apps/sed-4"
-RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/CAN-2005-0101.patch"
+	epatch "${FILESDIR}"/CAN-2005-0101.patch
 
 	# Should fix some problems with unexpected server replies, cf. bug 185468
-	epatch "${FILESDIR}/${P}-nntp.patch"
+	epatch "${FILESDIR}"/${P}-nntp.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 
 	sed -i \
 		-e "s:OPT_FLAGS = :OPT_FLAGS = ${CFLAGS}#:" Makefile \