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/ipcad | |
| 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/ipcad')
| -rw-r--r-- | package/ipcad/patches/patch-configure | 1 | ||||
| -rw-r--r-- | package/ipcad/patches/patch-headers_h | 19 | ||||
| -rw-r--r-- | package/ipcad/patches/patch-loop-ipq_c | 1 |
3 files changed, 19 insertions, 2 deletions
diff --git a/package/ipcad/patches/patch-configure b/package/ipcad/patches/patch-configure index dfcf87cea..2a3b354fc 100644 --- a/package/ipcad/patches/patch-configure +++ b/package/ipcad/patches/patch-configure @@ -1,4 +1,3 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- ipcad-3.7.3.orig/configure 2007-04-22 10:08:45.000000000 +0200 +++ ipcad-3.7.3/configure 2008-12-22 15:49:17.000000000 +0100 @@ -2691,10 +2691,6 @@ fi diff --git a/package/ipcad/patches/patch-headers_h b/package/ipcad/patches/patch-headers_h new file mode 100644 index 000000000..d8110cd1f --- /dev/null +++ b/package/ipcad/patches/patch-headers_h @@ -0,0 +1,19 @@ +--- ipcad-3.7.3.orig/headers.h 2007-04-22 10:08:45.000000000 +0200 ++++ ipcad-3.7.3/headers.h 2010-10-06 22:27:28.000000000 +0200 +@@ -28,6 +28,8 @@ + #ifndef __HEADERS_H__ + #define __HEADERS_H__ + ++#include <signal.h> ++ + #ifndef __need_sig_atomic_t + #define __need_sig_atomic_t 1 + #endif +@@ -143,7 +145,6 @@ + #endif + + #include <poll.h> +-#include <signal.h> + #include <fnmatch.h> + + #include <assert.h> diff --git a/package/ipcad/patches/patch-loop-ipq_c b/package/ipcad/patches/patch-loop-ipq_c index ca1c8e98e..bfa1104ce 100644 --- a/package/ipcad/patches/patch-loop-ipq_c +++ b/package/ipcad/patches/patch-loop-ipq_c @@ -1,4 +1,3 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- ipcad-3.7.3.orig/loop-ipq.c 2007-04-22 10:08:45.000000000 +0200 +++ ipcad-3.7.3/loop-ipq.c 2008-10-09 16:47:02.000000000 +0200 @@ -29,6 +29,7 @@ |