summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2009-06-20 20:57:34 +0000
committerAlin Năstac <mrness@gentoo.org>2009-06-20 20:57:34 +0000
commit464d317a5def01d8f76026d421c58a0a621cf57f (patch)
tree0f76612ceefcdbd7890e34affb81e869bc6886db /net-dialup/wvdial
parentBump so to enable pam_tall2 properly when building with Linux-PAM-1.1.0. (diff)
downloadhistorical-464d317a5def01d8f76026d421c58a0a621cf57f.tar.gz
historical-464d317a5def01d8f76026d421c58a0a621cf57f.tar.bz2
historical-464d317a5def01d8f76026d421c58a0a621cf57f.zip
Fix dirent patch for glibc versions prior to 2.10.1 (#271477).
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'net-dialup/wvdial')
-rw-r--r--net-dialup/wvdial/ChangeLog6
-rw-r--r--net-dialup/wvdial/Manifest10
-rw-r--r--net-dialup/wvdial/files/wvdial-1.60-dirent.patch22
3 files changed, 24 insertions, 14 deletions
diff --git a/net-dialup/wvdial/ChangeLog b/net-dialup/wvdial/ChangeLog
index b58425575eb3..6582308e6bb5 100644
--- a/net-dialup/wvdial/ChangeLog
+++ b/net-dialup/wvdial/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/wvdial
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/wvdial/ChangeLog,v 1.54 2009/06/20 09:40:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/wvdial/ChangeLog,v 1.55 2009/06/20 20:57:33 mrness Exp $
+
+ 20 Jun 2009; Alin Năstac <mrness@gentoo.org>
+ files/wvdial-1.60-dirent.patch:
+ Fix dirent patch for glibc versions prior to 2.10.1 (#271477).
*wvdial-1.60-r1 (20 Jun 2009)
diff --git a/net-dialup/wvdial/Manifest b/net-dialup/wvdial/Manifest
index ded55522bef9..d0548b35cd00 100644
--- a/net-dialup/wvdial/Manifest
+++ b/net-dialup/wvdial/Manifest
@@ -3,16 +3,16 @@ Hash: SHA1
AUX wvdial-1.60-as-needed.patch 437 RMD160 a3aa7f65f6df8cc1bcb45c89d64cbcf813b8bb6f SHA1 6a60c58336cf4f11d8fceb7e4d868c69ab6f9ade SHA256 8490c5a19751af4c4858878b2546d836db94aab8f5e1594c4baa8ef79b6060ea
AUX wvdial-1.60-destdir.patch 455 RMD160 64974f8a7acc673e2869734e10096830ff2ba460 SHA1 48f77c1c2370c958f92c53269f927d8c883b8c6c SHA256 be2bb73e20076bc3e278d165459355bd809419326c152a8467a8fb7295519311
-AUX wvdial-1.60-dirent.patch 522 RMD160 114d836a09c8f6a5d4ba98b323633da6abfe99fd SHA1 62825a0c2b7f27ac2aaff226adf6f68f317dfcc3 SHA256 7dd9c25f011e3d58eabf5a9c308b755726569e577611dfe2cf97012dcd7b41ff
+AUX wvdial-1.60-dirent.patch 714 RMD160 8cef3b42dbbbbae4bf98703e8857bf2002d95e2f SHA1 dbce3651f63508f8b856b22ad876eaa4d91ed618 SHA256 7d9251eb1de40599979942452b530a5f13c9920135ebdc2b091435a64aedeb9c
DIST wvdial-1.60.tar.gz 100264 RMD160 3e8f46cf81082bb7c829e530b3f9922ff00de9c1 SHA1 d44914065258d316cff28494d4409cd27a07cfa6 SHA256 0c65ea807950fab32e659d1869a7167ff978502bd5d0159dbe9de90eb6c2e16b
EBUILD wvdial-1.60-r1.ebuild 1076 RMD160 a622e13934c3ec67b36504fef7ed8413111a8ade SHA1 418778e9bb51d05f991d5004a2636f0ce4608ec8 SHA256 dd10fff2946c3a46406ab77cd093535aa55bc3a4e280e88158c3568dacc1a0da
EBUILD wvdial-1.60.ebuild 1047 RMD160 11bb6057a485f8e51a822b6049a84ed27e7d26c8 SHA1 7f5b45baa9a255e22c19b55ba8a2dff3170cafb4 SHA256 297361b51342c696c0d032dfdfd6107ce6d389b21fa4108f3df63b9959d3f8c6
-MISC ChangeLog 7030 RMD160 0ecc7670bb7e026a164a72161a68c9e947711385 SHA1 8abaad902d49420ed85ece72022d7739a172e8a9 SHA256 9fe82ae2bde74abd8658e1e3815662776add8642eac8adce73a6e2a26125a04d
+MISC ChangeLog 7178 RMD160 f79e8b79e0554b84415b2fd735091103aa6c3c60 SHA1 37e517ac0bc944e3dd63f61fd8a61ab6f48f1bcb SHA256 df209d86a6387ea0f9bf90297841c1156cfa272832c16d03bfe973f883c35351
MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAko8rrYACgkQts85UDFmaOVQxACfRQdplIuZQjhrT7vgBmr3/xzj
-+o0An39Wu+Nc7dmtOZX1QiUjw8emn5/p
-=cXUj
+iEYEARECAAYFAko9TUgACgkQts85UDFmaOWycgCbBGAxgs8yOKdhgGIgJjK4UOw1
+YtAAnjtWSlt4VjZzDij+h32wKXTW0sUa
+=/cD4
-----END PGP SIGNATURE-----
diff --git a/net-dialup/wvdial/files/wvdial-1.60-dirent.patch b/net-dialup/wvdial/files/wvdial-1.60-dirent.patch
index 86f26df41780..d840d0a232a4 100644
--- a/net-dialup/wvdial/files/wvdial-1.60-dirent.patch
+++ b/net-dialup/wvdial/files/wvdial-1.60-dirent.patch
@@ -1,15 +1,21 @@
-diff -Nru wvdial-1.60.orig/wvmodemscan.cc wvdial-1.60/wvmodemscan.cc
---- wvdial-1.60.orig/wvmodemscan.cc 2007-07-19 23:22:26.000000000 +0200
-+++ wvdial-1.60/wvmodemscan.cc 2009-06-20 11:36:15.000000000 +0200
-@@ -496,10 +496,8 @@
+diff -Nru a/wvdial-1.60/wvmodemscan.cc b/wvdial-1.60/wvmodemscan.cc
+--- a/wvdial-1.60/wvmodemscan.cc 2007-07-20 00:22:03.000000000 +0300
++++ b/wvdial-1.60/wvmodemscan.cc 2009-06-20 21:43:58.000000000 +0300
+@@ -495,11 +495,16 @@
+ // (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4);
}
-
--static int filesort(const void *_e1, const void *_e2)
+-
++#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)
+static int filesort(const dirent **e1, const dirent **e2)
++#else
+ static int filesort(const void *_e1, const void *_e2)
++#endif
{
-- dirent const * const *e1 = (dirent const * const *)_e1;
-- dirent const * const *e2 = (dirent const * const *)_e2;
++#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))
+ dirent const * const *e1 = (dirent const * const *)_e1;
+ dirent const * const *e2 = (dirent const * const *)_e2;
++#endif
const char *p1, *p2;
int diff;