diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /testing/net-tools/net-tools-1.60-2.6-compilefix.patch | |
parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'testing/net-tools/net-tools-1.60-2.6-compilefix.patch')
-rw-r--r-- | testing/net-tools/net-tools-1.60-2.6-compilefix.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/testing/net-tools/net-tools-1.60-2.6-compilefix.patch b/testing/net-tools/net-tools-1.60-2.6-compilefix.patch new file mode 100644 index 000000000..92ce90128 --- /dev/null +++ b/testing/net-tools/net-tools-1.60-2.6-compilefix.patch @@ -0,0 +1,23 @@ +diff -ruN net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c +--- net-tools-1.60.orig/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200 ++++ net-tools-1.60/lib/x25_sr.c 2003-10-18 20:33:31.927574928 +0200 +@@ -22,6 +22,7 @@ + #include <sys/socket.h> + #include <sys/ioctl.h> + #include <linux/x25.h> ++#include <linux/version.h> + #include <ctype.h> + #include <errno.h> + #include <netdb.h> +@@ -77,7 +78,11 @@ + rt.sigdigits=sigdigits; + + /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) + memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); ++#else ++ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address)); ++#endif + + while (*args) { + if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { |