cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*) install documentation

Browse Source 
*) rename patches
*) bump NEED_VERSION

ok kevlo@
This commit is contained in:
reinhard 2001-04-20 07:53:01 +00:00
parent a703f91031
commit 61e4fc1199
11 changed files with 159 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/arpcatch/Makefile
View File

@ -1,10 +1,14 @@
# $OpenBSD: Makefile,v 1.7 2001/04/19 10:41:17 wilfried Exp $
# $OpenBSD: Makefile,v 1.8 2001/04/20 07:53:01 reinhard Exp $
COMMENT= userland arp-proxy daemon
DISTNAME= arpcatch
PKGNAME= ${DISTNAME}-19970824
CATEGORIES= net
NEED_VERSION= 1.191
MASTER_SITES= http://www.enteract.com/~tqbf/
NEED_VERSION= 1.397
MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://skoda.sockpuppet.org/tqbf/
MAINTAINER= ports@openbsd.org
@ -13,12 +17,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WRKDIST= ${WRKDIR}/${PKGNAME}
WRKDIST= ${WRKDIR}/${DISTNAME}
ALL_TARGET=
INSTALL_TARGET= install
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/aproxyd ${PREFIX}/sbin/aproxyd
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/arpcatch
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/arpcatch
.include <bsd.port.mk>

9
net/arpcatch/patches/patch-Makefile Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-Makefile,v 1.1 2001/04/20 07:53:02 reinhard Exp $
--- Makefile.orig Mon Aug 18 22:54:00 1997
+++ Makefile Tue Apr 17 16:00:13 2001
@@ -1,5 +1,3 @@
-CFLAGS= -g
-LDFLAGS=
LIBS= -lpcap
TARGET= aproxyd

145
net/arpcatch/patches/patch-aa
View File

@ -1,145 +0,0 @@
diff -u Makefile.orig Makefile
--- Makefile.orig Mon Aug 18 22:54:00 1997
+++ Makefile Mon Mar 12 17:02:06 2001
@@ -1,5 +1,3 @@
-CFLAGS= -g
-LDFLAGS=
LIBS= -lpcap
TARGET= aproxyd
diff -u arpcatch.c.orig arpcatch.c
--- arpcatch.c.orig Fri Aug 22 06:57:01 1997
+++ arpcatch.c Fri Jan 21 07:12:04 2000
@@ -37,6 +37,7 @@
}
}
+ printf("Starting on %s interface\n",device);
if(!(at = read_config(configfile))) {
perror("config file read");
exit(errno);
@@ -50,6 +51,7 @@
read_loop(fd, at);
perror("read");
+return 1;
}
/* needs cleaning up */
@@ -63,7 +65,6 @@
struct ether_addr *ea;
struct ether_arp *ah;
- struct in_addr foo;
for(;;) {
struct in_addr ia;
@@ -129,7 +130,7 @@
fd = bpf_open(device);
if(fd < 0) {
- perror("bpf open");
+ fprintf(stderr,"Error initializing bpf filter\nExiting..\n");
exit(errno);
}
diff -u arpcatch.h.orig arpcatch.h
--- arpcatch.h.orig Tue Aug 19 03:51:02 1997
+++ arpcatch.h Fri Jan 21 07:08:36 2000
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <syslog.h>
@@ -12,6 +13,7 @@
#include <limits.h>
#include <fcntl.h>
#include <assert.h>
+#include <ctype.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/param.h>
@@ -25,8 +27,6 @@
#include <net/bpf.h>
#include <net/if.h>
-#include <net/ethernet.h>
-#include <net/if_arp.h>
#include <netinet/if_ether.h>
#include "list.h"
@@ -76,5 +76,12 @@
int bpf_promisc(int, int);
table_t *read_config(char *);
+void chop(char *);
+void *NEW(const int);
+u_long resolve(char *);
+
+int arp_send(int, u_long *, u_long *, struct ether_addr *, struct ether_addr *);
+
+
#endif
diff -u bpf.c.orig bpf.c
--- bpf.c.orig Tue Aug 19 03:38:20 1997
+++ bpf.c Fri Jan 21 06:53:13 2000
@@ -47,21 +47,26 @@
do {
snprintf(file, PATH_MAX, "/dev/bpf%d", i++);
- if((fd = open(file, O_RDWR)) < 0)
- continue;
- } while(errno == EBUSY && fd < 0);
+ fd = open(file, O_RDWR);
+ } while(fd < 0 && errno == EBUSY);
- if(fd < 0)
+ if(fd < 0) {
+ perror("bpf open");
return(-1);
+ }
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, device, 15);
- if(bpf_setbuf(fd, DEFAULT_BUFLEN) < 0)
+ if(bpf_setbuf(fd, DEFAULT_BUFLEN) < 0) {
+ perror("bpf setbuf");
return(-2);
+ }
- if(ioctl(fd, BIOCSETIF, (char *) &ifr) < 0)
+ if(ioctl(fd, BIOCSETIF, (char *) &ifr) < 0) {
+ perror("bpf ioctl");
return(-3);
+ }
return(fd);
}
diff -u config.c.orig arpcatch/config.c
--- config.c.orig Mon Nov 24 16:18:54 1997
+++ config.c Fri Jan 21 06:07:06 2000
@@ -1,7 +1,6 @@
#include "arpcatch.h"
#include <sys/types.h>
#include <sys/socket.h>
-#include <net/ethernet.h>
static list_t *add_host(char *buffer, list_t *hosts);
static int add_proxy(char *buffer, table_t *at);
diff -u libtqbf.c.orig arpcatch/libtqbf.c
--- libtqbf.c.orig Tue Aug 19 02:02:13 1997
+++ libtqbf.c Fri Jan 21 06:55:56 2000
@@ -349,8 +349,6 @@
int jday (int month, int day, int year) {
int c, ya, jd;
- int brit_jd = 2361222;
-
if (month > 2)
month -= 3;
else

36
net/arpcatch/patches/patch-arpcatch_c Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-arpcatch_c,v 1.1 2001/04/20 07:53:02 reinhard Exp $
--- arpcatch.c.orig Fri Aug 22 02:57:01 1997
+++ arpcatch.c Tue Apr 17 16:00:13 2001
@@ -37,6 +37,7 @@ int main(int argc, char **argv) {
}
}
+ printf("Starting on %s interface\n",device);
if(!(at = read_config(configfile))) {
perror("config file read");
exit(errno);
@@ -50,6 +51,7 @@ int main(int argc, char **argv) {
read_loop(fd, at);
perror("read");
+return 1;
}
/* needs cleaning up */
@@ -63,7 +65,6 @@ int read_loop(int fd, table_t *at) {
struct ether_addr *ea;
struct ether_arp *ah;
- struct in_addr foo;
for(;;) {
struct in_addr ia;
@@ -129,7 +130,7 @@ int init_bpf(char *device) {
fd = bpf_open(device);
if(fd < 0) {
- perror("bpf open");
+ fprintf(stderr,"Error initializing bpf filter\nExiting..\n");
exit(errno);
}

41
net/arpcatch/patches/patch-arpcatch_h Normal file
View File

@ -0,0 +1,41 @@
$OpenBSD: patch-arpcatch_h,v 1.1 2001/04/20 07:53:02 reinhard Exp $
--- arpcatch.h.orig Mon Aug 18 23:51:02 1997
+++ arpcatch.h Tue Apr 17 16:00:13 2001
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <syslog.h>
@@ -12,6 +13,7 @@
#include <limits.h>
#include <fcntl.h>
#include <assert.h>
+#include <ctype.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/param.h>
@@ -25,8 +27,6 @@
#include <net/bpf.h>
#include <net/if.h>
-#include <net/ethernet.h>
-#include <net/if_arp.h>
#include <netinet/if_ether.h>
#include "list.h"
@@ -76,5 +76,12 @@ int bpf_immediate(int, int);
int bpf_promisc(int, int);
table_t *read_config(char *);
+void chop(char *);
+void *NEW(const int);
+u_long resolve(char *);
+
+int arp_send(int, u_long *, u_long *, struct ether_addr *, struct ether_addr *);
+
+
#endif

36
net/arpcatch/patches/patch-bpf_c Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-bpf_c,v 1.1 2001/04/20 07:53:02 reinhard Exp $
--- bpf.c.orig Mon Aug 18 23:38:20 1997
+++ bpf.c Tue Apr 17 16:00:13 2001
@@ -47,21 +47,26 @@ int bpf_open(char *device) {
do {
snprintf(file, PATH_MAX, "/dev/bpf%d", i++);
- if((fd = open(file, O_RDWR)) < 0)
- continue;
- } while(errno == EBUSY && fd < 0);
+ fd = open(file, O_RDWR);
+ } while(fd < 0 && errno == EBUSY);
- if(fd < 0)
+ if(fd < 0) {
+ perror("bpf open");
return(-1);
+ }
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, device, 15);
- if(bpf_setbuf(fd, DEFAULT_BUFLEN) < 0)
+ if(bpf_setbuf(fd, DEFAULT_BUFLEN) < 0) {
+ perror("bpf setbuf");
return(-2);
+ }
- if(ioctl(fd, BIOCSETIF, (char *) &ifr) < 0)
+ if(ioctl(fd, BIOCSETIF, (char *) &ifr) < 0) {
+ perror("bpf ioctl");
return(-3);
+ }
return(fd);
}

11
net/arpcatch/patches/patch-config_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-config_c,v 1.1 2001/04/20 07:53:02 reinhard Exp $
--- config.c.orig Mon Nov 24 12:18:54 1997
+++ config.c Tue Apr 17 16:00:13 2001
@@ -1,7 +1,6 @@
#include "arpcatch.h"
#include <sys/types.h>
#include <sys/socket.h>
-#include <net/ethernet.h>
static list_t *add_host(char *buffer, list_t *hosts);
static int add_proxy(char *buffer, table_t *at);

12
net/arpcatch/patches/patch-libtqbf_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libtqbf_c,v 1.1 2001/04/20 07:53:02 reinhard Exp $
--- libtqbf.c.orig Mon Aug 18 22:02:13 1997
+++ libtqbf.c Tue Apr 17 16:00:13 2001
@@ -349,8 +349,6 @@ u_long resolve(char *address) {
int jday (int month, int day, int year) {
int c, ya, jd;
- int brit_jd = 2361222;
-
if (month > 2)
month -= 3;
else

1
net/arpcatch/pkg/COMMENT
View File

@ -1 +0,0 @@
Userland arp-proxy daemon

2
net/arpcatch/pkg/DESCR
View File

@ -33,4 +33,4 @@ If you have problems, questions, comments, bitches, etc, feel free to mail
me at <tqbf@secnet.com>
WWW: ${HOMEPAGE}

3
net/arpcatch/pkg/PLIST
View File

@ -1 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2001/04/20 07:53:03 reinhard Exp $
sbin/aproxyd
share/doc/arpcatch/README
@dirrm share/doc/arpcatch