diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 11:09:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 11:09:07 +0100 |
| commit | 5a7e9dd4c28b17e1a0320cbf296cec6475bf1b0d (patch) | |
| tree | 5c73af98d030f82badd399487e8ffd8c867521d4 /package | |
| parent | bdaf2867cecc74259c0d48ed782e5333ebebb537 (diff) | |
| parent | 14b4c26668451078927c478d7f8bcb5993296466 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/arpd/Makefile | 2 | ||||
| -rw-r--r-- | package/arpd/patches/patch-arpd_c | 29 | ||||
| -rw-r--r-- | package/gpsd/Makefile | 2 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-gpsmon_c | 13 |
4 files changed, 39 insertions, 7 deletions
diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 32730f11d..c1294c368 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= arpd PKG_VERSION:= 0.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d PKG_DESCR:= Generates ARP responses for IP address ranges PKG_SECTION:= route diff --git a/package/arpd/patches/patch-arpd_c b/package/arpd/patches/patch-arpd_c index 857396d76..84dd457aa 100644 --- a/package/arpd/patches/patch-arpd_c +++ b/package/arpd/patches/patch-arpd_c @@ -1,5 +1,5 @@ --- arpd.orig/arpd.c 2003-02-09 05:20:40.000000000 +0100 -+++ arpd/arpd.c 2007-01-21 00:39:05.000000000 +0100 ++++ arpd/arpd.c 2014-03-16 08:11:53.000000000 +0100 @@ -70,7 +70,7 @@ static int arpd_sig; static void usage(void) @@ -74,10 +74,21 @@ addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha)); /* This address is claimed */ -@@ -465,14 +469,14 @@ main(int argc, char *argv[]) +@@ -445,9 +449,6 @@ arpd_recv(int fd, short type, void *ev) + void + terminate_handler(int sig) + { +- extern int event_gotsig; +- +- event_gotsig = 1; + arpd_sig = sig; + } + +@@ -464,15 +465,14 @@ int + main(int argc, char *argv[]) { struct event recv_ev; - extern int (*event_sigcb)(void); +- extern int (*event_sigcb)(void); - char *dev; + char *dev, *and_pcap_exp; int c, debug; @@ -91,7 +102,7 @@ switch (c) { case 'd': debug = 1; -@@ -480,6 +484,9 @@ main(int argc, char *argv[]) +@@ -480,6 +480,9 @@ main(int argc, char *argv[]) case 'i': dev = optarg; break; @@ -101,7 +112,7 @@ default: usage(); break; -@@ -489,9 +496,9 @@ main(int argc, char *argv[]) +@@ -489,9 +492,9 @@ main(int argc, char *argv[]) argv += optind; if (argc == 0) @@ -113,3 +124,11 @@ if ((fp = fopen(PIDFILE, "w")) == NULL) err(1, "fopen"); +@@ -524,7 +527,6 @@ main(int argc, char *argv[]) + perror("signal"); + return (-1); + } +- event_sigcb = arpd_signal; + + event_dispatch(); + diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index a161d860f..04547a9eb 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpsd PKG_VERSION:= 3.10 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= fc5b03aae38b9b5b6880b31924d0ace3 PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= misc diff --git a/package/gpsd/patches/patch-gpsmon_c b/package/gpsd/patches/patch-gpsmon_c new file mode 100644 index 000000000..ac52866d0 --- /dev/null +++ b/package/gpsd/patches/patch-gpsmon_c @@ -0,0 +1,13 @@ +--- gpsd-3.10.orig/gpsmon.c 2013-11-21 09:57:44.000000000 +0100 ++++ gpsd-3.10/gpsmon.c 2014-03-16 09:08:34.000000000 +0100 +@@ -505,6 +505,10 @@ static /*@null@*/ char *curses_get_comma + static char line[80]; + int c; + ++#ifndef __GLIBC__ ++#define CTRL(x) (x&037) ++#endif ++ + c = wgetch(cmdwin); + if (c == CTRL('L')) { + (void)clearok(stdscr, true); |