diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/lsof/patches | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/lsof/patches')
| -rw-r--r-- | package/lsof/patches/patch-Configure | 6 | ||||
| -rw-r--r-- | package/lsof/patches/patch-dialects_linux_dlsof_h | 16 | ||||
| -rw-r--r-- | package/lsof/patches/patch-dialects_linux_machine_h | 6 |
3 files changed, 22 insertions, 6 deletions
diff --git a/package/lsof/patches/patch-Configure b/package/lsof/patches/patch-Configure index a539da5d5..e99001293 100644 --- a/package/lsof/patches/patch-Configure +++ b/package/lsof/patches/patch-Configure @@ -1,6 +1,6 @@ ---- lsof_4.83_src.orig/Configure 2010-01-18 20:01:14.000000000 +0100 -+++ lsof_4.83_src/Configure 2010-07-28 18:36:48.364508572 +0200 -@@ -2735,27 +2735,6 @@ return(0); } +--- lsof_4.84_src.orig/Configure 2010-07-29 17:59:32.000000000 +0200 ++++ lsof_4.84_src/Configure 2010-10-07 20:03:14.000000000 +0200 +@@ -2739,27 +2739,6 @@ return(0); } then LSOF_CFGF="$LSOF_CFGF -DHASIPv6" fi # } diff --git a/package/lsof/patches/patch-dialects_linux_dlsof_h b/package/lsof/patches/patch-dialects_linux_dlsof_h new file mode 100644 index 000000000..1b6314849 --- /dev/null +++ b/package/lsof/patches/patch-dialects_linux_dlsof_h @@ -0,0 +1,16 @@ +--- lsof_4.84_src.orig/dialects/linux/dlsof.h 2010-01-18 20:03:19.000000000 +0100 ++++ lsof_4.84_src/dialects/linux/dlsof.h 2010-10-07 20:35:57.000000000 +0200 +@@ -49,13 +49,7 @@ + #include <setjmp.h> + #include <unistd.h> + #include <netinet/in.h> +- +-# if defined(GLIBCV) || defined(__UCLIBC__) + #include <netinet/tcp.h> +-# else /* !defined(GLIBCV) && !defined(__UCLIBC__) */ +-#include <linux/tcp.h> +-# endif /* defined(GLIBCV) || defined(__UCLIBC__) */ +- + #include <rpc/rpc.h> + #include <rpc/pmap_prot.h> + diff --git a/package/lsof/patches/patch-dialects_linux_machine_h b/package/lsof/patches/patch-dialects_linux_machine_h index 76b08a670..011144644 100644 --- a/package/lsof/patches/patch-dialects_linux_machine_h +++ b/package/lsof/patches/patch-dialects_linux_machine_h @@ -1,6 +1,6 @@ ---- lsof_4.83_src.orig/dialects/linux/machine.h 2008-10-21 18:17:26.000000000 +0200 -+++ lsof_4.83_src/dialects/linux/machine.h 2010-07-28 18:39:34.252738199 +0200 -@@ -625,6 +625,6 @@ +--- lsof_4.84_src.orig/dialects/linux/machine.h 2010-07-29 18:02:52.000000000 +0200 ++++ lsof_4.84_src/dialects/linux/machine.h 2010-10-07 20:03:14.000000000 +0200 +@@ -632,6 +632,6 @@ * zeromem is a macro that uses bzero or memset. */ |