Fix building with GLIBC 2.10+ wrt #278157.

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

4 files changed, 41 insertions, 8 deletions

diff --git a/www-servers/mini_httpd/ChangeLog b/www-servers/mini_httpd/ChangeLog
index 1c19dc038bf4..e84578356561 100644
--- a/www-servers/mini_httpd/ChangeLog
+++ b/www-servers/mini_httpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/mini_httpd
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/ChangeLog,v 1.11 2008/12/21 21:58:57 caleb Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/ChangeLog,v 1.12 2009/08/08 22:19:53 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mini_httpd-1.19.ebuild, +files/mini_httpd-1.19-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #278157.
 
   21 Dec 2008; Caleb Tennis <caleb@gentoo.org> mini_httpd-1.19.ebuild:
   amd64 stable
diff --git a/www-servers/mini_httpd/Manifest b/www-servers/mini_httpd/Manifest
index 175d5957d7e7..306c401b8a43 100644
--- a/www-servers/mini_httpd/Manifest
+++ b/www-servers/mini_httpd/Manifest
@@ -1,7 +1,8 @@
+AUX mini_httpd-1.19-glibc-2.10.patch 675 RMD160 57ca947d0440b166996c6560d33efc27e0061892 SHA1 a6915a35cc1415783858e0c41deb817551b81db2 SHA256 59d7151fb9f1a42bf38dd5d255b2cf4ad15a60bf889af59561949fc2cda56227
 AUX mini_httpd.conf.sample-1.19 860 RMD160 b19798ca09597d32e1a3a92901477b8fa7d13ed7 SHA1 1f3ed1ffd5e0f756065b9cdca1a9b2f74f97e52b SHA256 548f0209fa9f44538fb706397b613c9d5b4e72f7fcfbc06f46eccca47a8c7641
 AUX mini_httpd.confd-1.19 1310 RMD160 21ff345ddcdf3b41f959c058d567e0d70e381839 SHA1 429ca147cf382a875d574162a6af55fd1892f1b1 SHA256 7a180b360c80c0883ebf150693f92756218bf99cd127071664e9987774bfe9d2
 AUX mini_httpd.init 744 RMD160 37ff35b466e6ce0633f4ed34cfec6889610e8ccd SHA1 381e6c876e8e3fa9fe5ce6783e0ec543ebc12253 SHA256 93249b62ae0190cabed790d677f29a440dec5c3e1e1056a2ab5cde0beeddbca8
 DIST mini_httpd-1.19.tar.gz 42142 RMD160 376bda80c64395db9cbfbdeaea92dbee1f99ce65 SHA1 da1ce9cf717f16aea69a75d3a77e610e9a740cc7 SHA256 30e30fa22102dbea8b662ee258e6bf9ce687db5699fabdf3c2f518b717cebd96
-EBUILD mini_httpd-1.19.ebuild 1903 RMD160 e1a248c281c9a483068d276fc1b74aead95f9c49 SHA1 f31e0d64d95b9370e834d257a40d146fa93004a8 SHA256 bbac25bf2bdaf638ea7a8fc8bf6dc98ac2e4c312fc922de268429f3564e629a4
-MISC ChangeLog 2803 RMD160 87affe35c0026bbdb560aca3b69418feb2b5c551 SHA1 16c47462054d721736ad148db7e693b5fda61753 SHA256 d0417ef32fb7b8281eb468fe0712b39a07b01b8458f97228947edb70e720dd46
+EBUILD mini_httpd-1.19.ebuild 2021 RMD160 d5146e1ff63ce8ff2c99f576fab73bf2ae67e846 SHA1 8db1b5657602df40c7b0f75c7b219f2ee4857a52 SHA256 99381bb8b8f69df12315a5f400c3d9fe9cd3fa3db23736562017a74b49791384
+MISC ChangeLog 2974 RMD160 2eae4b5d16ef49681fc5e67cc8058f2b977cf99f SHA1 2aa3f6350013d53ea0758bbf0af22f7d1967074a SHA256 ec4f941193705b349a6cf5dac6cf00b60f913a70930b7e790863635166e5e406
 MISC metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 SHA1 f13cc4199505863990c257fe060882a5f9a32aab SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c
diff --git a/www-servers/mini_httpd/files/mini_httpd-1.19-glibc-2.10.patch b/www-servers/mini_httpd/files/mini_httpd-1.19-glibc-2.10.patch
new file mode 100644
index 000000000000..082b0ed58062
--- /dev/null
+++ b/www-servers/mini_httpd/files/mini_httpd-1.19-glibc-2.10.patch
@@ -0,0 +1,21 @@
+diff -ur mini_httpd-1.19.orig/htpasswd.c mini_httpd-1.19/htpasswd.c
+--- mini_httpd-1.19.orig/htpasswd.c	2001-12-19 02:08:10.000000000 +0200
++++ mini_httpd-1.19/htpasswd.c	2009-08-09 01:20:36.000000000 +0300
+@@ -49,7 +49,7 @@
+     while((line[y++] = line[x++]));
+ }
+ 
+-static int getline(char *s, int n, FILE *f) {
++static int get_line(char *s, int n, FILE *f) {
+     register int i=0;
+ 
+     while(1) {
+@@ -189,7 +189,7 @@
+     strcpy(user,argv[2]);
+ 
+     found = 0;
+-    while(!(getline(line,MAX_STRING_LEN,f))) {
++    while(!(get_line(line,MAX_STRING_LEN,f))) {
+         if(found || (line[0] == '#') || (!line[0])) {
+             putline(tfp,line);
+             continue;
diff --git a/www-servers/mini_httpd/mini_httpd-1.19.ebuild b/www-servers/mini_httpd/mini_httpd-1.19.ebuild
index 25fba8e77078..943f9147ec1d 100644
--- a/www-servers/mini_httpd/mini_httpd-1.19.ebuild
+++ b/www-servers/mini_httpd/mini_httpd-1.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/mini_httpd-1.19.ebuild,v 1.10 2008/12/21 21:58:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/mini_httpd-1.19.ebuild,v 1.11 2009/08/08 22:19:53 ssuominen Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Small forking webserver with optional ssl and ipv6 support"
 HOMEPAGE="http://www.acme.com/software/mini_httpd/"
@@ -13,7 +13,14 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc s390 sparc x86"
 IUSE="ssl ipv6"
 
-DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
 
 src_compile() {
 	## we need to hack a bit to have the correct install-dir -- no autoconf :(