summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2008-06-15 18:39:46 +0000
committerSven Wegener <swegener@gentoo.org>2008-06-15 18:39:46 +0000
commit1e1a27c21aa9363e8fc16d876c272506222edd19 (patch)
treedb35f3d2e9af839dead6ad88eb294ccb632d5457 /net-ftp/tnftp
parentAdd gcc-4.3 compability patch. (diff)
downloadgentoo-2-1e1a27c21aa9363e8fc16d876c272506222edd19.tar.gz
gentoo-2-1e1a27c21aa9363e8fc16d876c272506222edd19.tar.bz2
gentoo-2-1e1a27c21aa9363e8fc16d876c272506222edd19.zip
Add glibc-2.8 compability patch.
(Portage version: 2.1.5.5)
Diffstat (limited to 'net-ftp/tnftp')
-rw-r--r--net-ftp/tnftp/ChangeLog6
-rw-r--r--net-ftp/tnftp/files/tnftp-20070806-glibc-2.8-ARG_MAX.patch22
-rw-r--r--net-ftp/tnftp/tnftp-20070806.ebuild3
3 files changed, 29 insertions, 2 deletions
diff --git a/net-ftp/tnftp/ChangeLog b/net-ftp/tnftp/ChangeLog
index ff2412c523af..5effe8d4c9c8 100644
--- a/net-ftp/tnftp/ChangeLog
+++ b/net-ftp/tnftp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/tnftp
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.30 2008/05/12 15:53:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.31 2008/06/15 18:39:45 swegener Exp $
+
+ 15 Jun 2008; Sven Wegener <swegener@gentoo.org>
+ +files/tnftp-20070806-glibc-2.8-ARG_MAX.patch, tnftp-20070806.ebuild:
+ Add glibc-2.8 compability patch.
12 May 2008; Markus Meier <maekke@gentoo.org> tnftp-20070806.ebuild:
amd64 stable, bug #215491
diff --git a/net-ftp/tnftp/files/tnftp-20070806-glibc-2.8-ARG_MAX.patch b/net-ftp/tnftp/files/tnftp-20070806-glibc-2.8-ARG_MAX.patch
new file mode 100644
index 000000000000..e21acf646853
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20070806-glibc-2.8-ARG_MAX.patch
@@ -0,0 +1,22 @@
+glibc-2.8 no loner provides the ARG_MAX macro.
+
+--- tnftp-20070806/libnetbsd/glob.c
++++ tnftp-20070806/libnetbsd/glob.c
+@@ -55,6 +55,8 @@
+ * Number of matches in the current invocation of glob.
+ */
+
++#include <unistd.h>
++
+ #include "tnftp.h"
+
+ #undef TILDE /* XXX: AIX 4.1.5 has this in <sys/ioctl.h> */
+@@ -720,7 +722,7 @@
+ }
+ pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
+
+- if ((pglob->gl_flags & GLOB_LIMIT) && (newsize + *limit) >= ARG_MAX) {
++ if ((pglob->gl_flags & GLOB_LIMIT) && (newsize + *limit) >= sysconf(_SC_ARG_MAX)) {
+ errno = 0;
+ return(GLOB_NOSPACE);
+ }
diff --git a/net-ftp/tnftp/tnftp-20070806.ebuild b/net-ftp/tnftp/tnftp-20070806.ebuild
index 986b5ea9edd3..88cb5d1a120a 100644
--- a/net-ftp/tnftp/tnftp-20070806.ebuild
+++ b/net-ftp/tnftp/tnftp-20070806.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20070806.ebuild,v 1.6 2008/05/12 15:53:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20070806.ebuild,v 1.7 2008/06/15 18:39:45 swegener Exp $
WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="none"
@@ -26,6 +26,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P}-libedit.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.8-ARG_MAX.patch
eautoconf
}