summaryrefslogtreecommitdiff
path: root/package/arpd/patches
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-04-13 22:20:15 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-04-13 22:20:15 +0000
commit737022a15e9e7b872ffd8220604f29c6e4bc399d (patch)
tree94118554cd257124b0bf579ac85441270645b86f /package/arpd/patches
parent589cbb3338e9e85dc482b76f35f735cddfa7c572 (diff)
remove lots of non-essential packages
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3641 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/arpd/patches')
-rw-r--r--package/arpd/patches/configure-no-bpf.patch12
-rw-r--r--package/arpd/patches/function-string.patch42
-rw-r--r--package/arpd/patches/pcap-and-arg.patch75
3 files changed, 0 insertions, 129 deletions
diff --git a/package/arpd/patches/configure-no-bpf.patch b/package/arpd/patches/configure-no-bpf.patch
deleted file mode 100644
index fb8037807a..0000000000
--- a/package/arpd/patches/configure-no-bpf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- arpd/configure.orig Sun Feb 9 19:31:28 2003
-+++ arpd/configure Thu Jul 21 16:05:16 2005
-@@ -2258,8 +2258,7 @@
- if cd $withval; then withval=`pwd`; cd $owd; fi
- PCAPINC="-I$withval -I$withval/bpf"
- PCAPLIB="-L$withval -lpcap"
-- elif test -f $withval/include/pcap.h -a \
-- -f $withval/include/net/bpf.h; then
-+ elif test -f $withval/include/pcap.h; then
- owd=`pwd`
- if cd $withval; then withval=`pwd`; cd $owd; fi
- PCAPINC="-I$withval/include"
diff --git a/package/arpd/patches/function-string.patch b/package/arpd/patches/function-string.patch
deleted file mode 100644
index 452b810e91..0000000000
--- a/package/arpd/patches/function-string.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- arpd/arpd.c.orig Sun Feb 9 05:20:40 2003
-+++ arpd/arpd.c Thu Jul 21 17:05:40 2005
-@@ -265,7 +265,7 @@
- spa->addr_ip, tha->addr_eth, tpa->addr_ip);
-
- if (op == ARP_OP_REQUEST) {
-- syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s",
-+ syslog(LOG_DEBUG, "%s: who-has %s tell %s", __FUNCTION__,
- addr_ntoa(tpa), addr_ntoa(spa));
- } else if (op == ARP_OP_REPLY) {
- syslog(LOG_INFO, "arp reply %s is-at %s",
-@@ -282,7 +282,7 @@
- int error;
-
- if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
-- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
-+ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
- addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
- return (0);
- }
-@@ -291,10 +291,10 @@
- error = arp_get(arpd_arp, &arpent);
-
- if (error == -1) {
-- syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s",
-+ syslog(LOG_DEBUG, "%s: no entry for %s", __FUNCTION__,
- addr_ntoa(addr));
- } else {
-- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
-+ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
- addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
- }
- return (error);
-@@ -423,7 +423,7 @@
- if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
- addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
- ethip->ar_sha, ETH_ADDR_LEN);
-- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
-+ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
- addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
-
- /* This address is claimed */
diff --git a/package/arpd/patches/pcap-and-arg.patch b/package/arpd/patches/pcap-and-arg.patch
deleted file mode 100644
index 7750e2928c..0000000000
--- a/package/arpd/patches/pcap-and-arg.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- arpd/arpd.c Sun Feb 9 05:20:40 2003
-+++ arpd/arpd.c.new Mon Aug 1 00:50:40 2005
-@@ -70,7 +70,7 @@
- static void
- usage(void)
- {
-- fprintf(stderr, "Usage: arpd [-d] [-i interface] [net]\n");
-+ fprintf(stderr, "Usage: arpd [-d] [-i interface] [-a 'pcap_expr'] [{host|net|range} ...]\n");
- exit(1);
- }
-
-@@ -182,7 +182,7 @@
- }
-
- static void
--arpd_init(char *dev, int naddresses, char **addresses)
-+arpd_init(char *dev, char *and_pcap_exp, int naddresses, char **addresses)
- {
- struct bpf_program fcode;
- char filter[1024], ebuf[PCAP_ERRBUF_SIZE], *dst;
-@@ -214,9 +214,13 @@
- errx(1, "bad interface configuration: not IP or Ethernet");
- arpd_ifent.intf_addr.addr_bits = IP_ADDR_BITS;
-
-- snprintf(filter, sizeof(filter), "arp %s%s%s and not ether src %s",
-+ snprintf(filter, sizeof(filter), "arp %s%s%s and not ether src %s%s%s%s",
- dst ? "and (" : "", dst ? dst : "", dst ? ")" : "",
-- addr_ntoa(&arpd_ifent.intf_link_addr));
-+ addr_ntoa(&arpd_ifent.intf_link_addr),
-+ and_pcap_exp ? " and (" : "",
-+ and_pcap_exp ? and_pcap_exp : "",
-+ and_pcap_exp ? ")" : ""
-+ );
-
- if ((arpd_pcap = pcap_open_live(dev, 128, 0, 500, ebuf)) == NULL)
- errx(1, "pcap_open_live: %s", ebuf);
-@@ -465,14 +469,14 @@
- {
- struct event recv_ev;
- extern int (*event_sigcb)(void);
-- char *dev;
-+ char *dev, *and_pcap_exp;
- int c, debug;
- FILE *fp;
-
- dev = NULL;
- debug = 0;
-
-- while ((c = getopt(argc, argv, "di:h?")) != -1) {
-+ while ((c = getopt(argc, argv, "a:di:h?")) != -1) {
- switch (c) {
- case 'd':
- debug = 1;
-@@ -480,6 +484,9 @@
- case 'i':
- dev = optarg;
- break;
-+ case 'a':
-+ and_pcap_exp = optarg;
-+ break;
- default:
- usage();
- break;
-@@ -489,9 +496,9 @@
- argv += optind;
-
- if (argc == 0)
-- arpd_init(dev, 0, NULL);
-+ arpd_init(dev, and_pcap_exp, 0, NULL);
- else
-- arpd_init(dev, argc, argv);
-+ arpd_init(dev, and_pcap_exp, argc, argv);
-
- if ((fp = fopen(PIDFILE, "w")) == NULL)
- err(1, "fopen");