diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2009-06-20 20:57:34 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2009-06-20 20:57:34 +0000 |
| commit | 94f92c4abaf9cb1e16e0926479d58d185ad73c37 (patch) | |
| tree | e8588fa702e81a9ea2bf525b48928b8a066e1564 /net-dialup/wvdial | |
| parent | Bump so to enable pam_tall2 properly when building with Linux-PAM-1.1.0. (diff) | |
| download | gentoo-2-94f92c4abaf9cb1e16e0926479d58d185ad73c37.tar.gz gentoo-2-94f92c4abaf9cb1e16e0926479d58d185ad73c37.tar.bz2 gentoo-2-94f92c4abaf9cb1e16e0926479d58d185ad73c37.zip | |
Fix dirent patch for glibc versions prior to 2.10.1 (#271477).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'net-dialup/wvdial')
| -rw-r--r-- | net-dialup/wvdial/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dialup/wvdial/files/wvdial-1.60-dirent.patch | 22 |
2 files changed, 19 insertions, 9 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/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; |