diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-05-09 03:29:17 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-05-09 03:29:17 +0000 |
| commit | c6a02b68985394d92dd283e3edc680935e78d91d (patch) | |
| tree | 196bd0927853690b7978d3d5baadfe455bcad186 /net-libs/libpcap/files | |
| parent | Old. (diff) | |
| download | historical-c6a02b68985394d92dd283e3edc680935e78d91d.tar.gz historical-c6a02b68985394d92dd283e3edc680935e78d91d.tar.bz2 historical-c6a02b68985394d92dd283e3edc680935e78d91d.zip | |
Old.
Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-libs/libpcap/files')
| -rw-r--r-- | net-libs/libpcap/files/libpcap-1.1-cross-linux.patch | 30 | ||||
| -rw-r--r-- | net-libs/libpcap/files/libpcap-1.1.1-ignore-ENODEV.patch | 36 |
2 files changed, 0 insertions, 66 deletions
diff --git a/net-libs/libpcap/files/libpcap-1.1-cross-linux.patch b/net-libs/libpcap/files/libpcap-1.1-cross-linux.patch deleted file mode 100644 index 5a35a89022d6..000000000000 --- a/net-libs/libpcap/files/libpcap-1.1-cross-linux.patch +++ /dev/null @@ -1,30 +0,0 @@ -=== modified file 'configure.in' ---- configure.in 2010-04-02 04:52:17 +0000 -+++ configure.in 2010-04-02 04:52:22 +0000 -@@ -291,7 +291,12 @@ - dnl XXX This could be done for cross-compiling, but for now it's not. - dnl - if test -z "$with_pcap" && test "$cross_compiling" = yes; then -- AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...) -+ if test -z "$with_pcap" ; then -+ case $host in -+ *-linux*) with_pcap="linux";; -+ *) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);; -+ esac -+ fi - fi - AC_ARG_WITH(pcap, - AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE])) -@@ -412,8 +417,10 @@ - linux) - AC_MSG_CHECKING(Linux kernel version) - if test "$cross_compiling" = yes; then -+ dnl we could check linux/version.h here, but who runs -+ dnl versions of linux older than 2.0.x anymore to bother ? - AC_CACHE_VAL(ac_cv_linux_vers, -- ac_cv_linux_vers=unknown) -+ ac_cv_linux_vers=2) - else - AC_CACHE_VAL(ac_cv_linux_vers, - ac_cv_linux_vers=`uname -r 2>&1 | \ - diff --git a/net-libs/libpcap/files/libpcap-1.1.1-ignore-ENODEV.patch b/net-libs/libpcap/files/libpcap-1.1.1-ignore-ENODEV.patch deleted file mode 100644 index 3dcbcae95210..000000000000 --- a/net-libs/libpcap/files/libpcap-1.1.1-ignore-ENODEV.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 073a8b37f97b684a34d29800400879e4e902ff63 -Author: andy-1 <andy-1@sourceforge.net> -Date: Tue Apr 27 23:33:23 2010 -0700 - - Ignore /sys/net/dev files if we get ENODEV for them, not just ENXIO. - - Both of them are indications that there's no such interface, so the file - probably corresponds to something other than a device. - - Reviewed-By: Guy Harris <guy@alum.mit.edu> - -diff --git a/CREDITS b/CREDITS -index 0d23783..6efc188 100644 ---- a/CREDITS -+++ b/CREDITS -@@ -15,6 +15,7 @@ Additional people who have contributed patches: - Alexey Kuznetsov <kuznet at ms2 dot inr dot ac dot ru> - Alon Bar-Lev <alonbl at sourceforge dot net> - Andrew Brown <atatat at atatdot dot net> -+ <andy-1 at sourceforge dot net> - Antti Kantee <pooka at netbsd dot org> - Arien Vijn <arienvijn at sourceforge dot net> - Arkadiusz Miskiewicz <misiek at pld dot org dot pl> -diff --git a/pcap-linux.c b/pcap-linux.c -index af12543..de3239a 100644 ---- a/pcap-linux.c -+++ b/pcap-linux.c -@@ -1883,7 +1883,7 @@ scan_sys_class_net(pcap_if_t **devlistp, char *errbuf) - */ - strncpy(ifrflags.ifr_name, name, sizeof(ifrflags.ifr_name)); - if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) { -- if (errno == ENXIO) -+ if (errno == ENXIO || errno == ENODEV) - continue; - (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, - "SIOCGIFFLAGS: %.*s: %s", |