Upgrade to GateD v3.6 and remove BROKEN
This commit is contained in:
jakob
parent
5bd074b327
commit
ba72fc24d9
@ -1,24 +1,30 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2000/04/09 17:37:22 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2000/08/07 12:14:07 jakob Exp $
|
||||
# Original from: Ejovi Nuwere <ejovi@ejovi.net>
|
||||
|
||||
# http://www.freebsd.org/cgi-bin/cvsweb.cgi/ports/net/gated/Makefile
|
||||
# see commit message for rev 1.22 of the Makefile
|
||||
|
||||
BROKEN= "Security hole (buffer overflow possibly yielding root)"
|
||||
|
||||
DISTNAME= gated-3-5-11
|
||||
PKGNAME= gated-3.5.11
|
||||
DISTNAME= gated-3-6
|
||||
PKGNAME= gated-3.6
|
||||
CATEGORIES= net
|
||||
FAKE=No
|
||||
NEED_VERSION= 1.302
|
||||
|
||||
MASTER_SITES= ftp://ftp.gated.merit.edu/net-research/gated/
|
||||
|
||||
MAINTAINER= ports@openbsd.org
|
||||
HOMEPAGE= http://www.gated.org/
|
||||
|
||||
MAINTAINER= jakob@openbsd.org
|
||||
|
||||
PERMIT_PACKAGE_CDROM= "commercial software"
|
||||
PERMIT_PACKAGE_FTP= "commercial software"
|
||||
PERMIT_DISTFILES_CDROM= "commercial software"
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
ALL_TARGET= gated
|
||||
WRKDIST= ${WRKDIR}/gated-public-3_6
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
SEPARATE_BUILD= Yes
|
||||
|
||||
post-install:
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/src/gdc/gdc ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/src/ospf_monitor/ospf_monitor ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/src/ripquery/ripquery ${PREFIX}/bin
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (gated-3-5-11.tar.gz) = 6b192df3bdbda6d4f2222c93ac725e75
|
||||
RMD160 (gated-3-5-11.tar.gz) = 16624c1e2229fb783dd3bbc5759945e5e368c1f3
|
||||
SHA1 (gated-3-5-11.tar.gz) = a6abdc59beb881dee06c9433b690fa6eab99fe07
|
||||
MD5 (gated-3-6.tar.gz) = 7435b61dfc7a3c15577459ad5ca4f9f5
|
||||
RMD160 (gated-3-6.tar.gz) = ae5ed443e50dc6edad8e08060be42ba975ba3313
|
||||
SHA1 (gated-3-6.tar.gz) = de96b3f4423f924e61fc0dd5d0957100dd3433ae
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
--- src/configs/freebsd.orig Tue Apr 20 18:09:34 1999
|
||||
+++ src/configs/freebsd Tue Apr 20 18:13:06 1999
|
||||
@@ -1,27 +1,29 @@
|
||||
#
|
||||
# $Id: patch-aa,v 1.3 1999/04/20 22:26:32 brad Exp $
|
||||
-# Configuration for freebsd-2.0 alpha (i386)
|
||||
+# Configuration for FreeBSD-3.0 (and hopefully 2.2)
|
||||
#
|
||||
|
||||
bindir /usr/local/bin
|
||||
sbindir /usr/local/sbin
|
||||
mandir /usr/local/man
|
||||
-mantype bsd44
|
||||
+mantype bsd42
|
||||
|
||||
cc cc
|
||||
#cflags -g
|
||||
-cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow
|
||||
-cflags -O
|
||||
+cwflags -Wreturn-type -Wpointer-arith -Wwrite-strings -Wswitch
|
||||
+cflags -O -g
|
||||
|
||||
ldflags -lkvm
|
||||
|
||||
lex lex
|
||||
-lflags -p -C -I
|
||||
+lflags -p -Cfe
|
||||
+
|
||||
+yflags -d -v
|
||||
|
||||
mkdep mkdep -flag -MM
|
||||
|
||||
-options INCLUDE_UNISTD INCLUDE_PATHS GID_T=int
|
||||
-options POSIX_SIGNALS HAVE_WAITPID
|
||||
+options INCLUDE_UNISTD INCLUDE_PATHS INCLUDE_IF_NEEDS_TIME GID_T=int
|
||||
+options POSIX_SIGNALS HAVE_WAITPID USE_SETSID
|
||||
options VARIABLE_MASKS SOCKET_LENGTHS SOCKADDR_DL INCLUDE_IF_DL
|
||||
options KRT_RTREAD_KINFO KRT_IFREAD_KINFO KRT_RT_SOCK USE_SYSCTL
|
||||
options KRT_LLADDR_NONE KRT_SYMBOLS_SYSCTL KVM_TYPE_BSD44 KSYM_VERSION=VRS_SYM
|
||||
@@ -38,4 +40,4 @@
|
||||
path_version /var/run/%s.version
|
||||
|
||||
#protocols bgp egp icmp rip ospf iso slsp isis rdisc
|
||||
-protocols icmp rip ospf
|
||||
+protocols bgp icmp rip ospf rdisc
|
||||
@ -1,42 +0,0 @@
|
||||
--- src/task.c.orig Wed Feb 17 18:32:18 1999
|
||||
+++ src/task.c Tue Apr 20 18:16:01 1999
|
||||
@@ -5903,12 +5903,20 @@
|
||||
}
|
||||
|
||||
/* Remove our association with a controling tty */
|
||||
-#ifdef USE_SETPGRP
|
||||
+#if defined(USE_SETPGRP) || defined(USE_SETSID)
|
||||
+#if defined(USE_SETPGRP)
|
||||
t = setpgrp();
|
||||
if (t < 0) {
|
||||
perror("task_daemonize: setpgrp");
|
||||
exit(1);
|
||||
}
|
||||
+#else /* USE_SETPGRP */
|
||||
+ t = setsid();
|
||||
+ if (t < 0) {
|
||||
+ perror("task_daemonize: setsid");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+#endif /* USE_SETPGRP */
|
||||
|
||||
task_signal_ignore(SIGHUP);
|
||||
|
||||
@@ -5927,7 +5935,7 @@
|
||||
/* Parent */
|
||||
exit(0);
|
||||
}
|
||||
-#else /* USE_SETPGRP */
|
||||
+#else /* defined(USE_SETPGRP) || defined(USE_SETSID) */
|
||||
t = setpgrp(0, getpid());
|
||||
if (t < 0) {
|
||||
perror("task_daemonize: setpgrp");
|
||||
@@ -5942,7 +5950,7 @@
|
||||
}
|
||||
(void) close(t);
|
||||
}
|
||||
-#endif /* USE_SETPGRP */
|
||||
+#endif /* defined(USE_SETPGRP) || defined(USE_SETSID) */
|
||||
}
|
||||
|
||||
/* Close all open files */
|
||||
@ -1,11 +0,0 @@
|
||||
--- src/include.h.orig Fri Jul 18 06:41:51 1997
|
||||
+++ src/include.h Wed Oct 1 21:40:45 1997
|
||||
@@ -126,7 +126,7 @@
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
-#ifdef INCLUDE_TIME
|
||||
+#if defined(INCLUDE_TIME) || (defined(INCLUDE_IF) && defined(INCLUDE_IF_NEEDS_TIME))
|
||||
#ifndef NO_INCLUDE_TIME
|
||||
#include <time.h>
|
||||
#endif
|
||||
@ -1,10 +0,0 @@
|
||||
--- src/sockaddr.h.orig Wed Oct 1 21:55:58 1997
|
||||
+++ src/sockaddr.h Wed Oct 1 21:55:13 1997
|
||||
@@ -126,6 +126,7 @@
|
||||
} sockaddr_un;
|
||||
|
||||
/* The maximum possible address length */
|
||||
+#undef SOCK_MAXADDRLEN /* override BSD4.4's 255 due to memory cost */
|
||||
#define SOCK_MAXADDRLEN 20
|
||||
|
||||
#define AF_LL 253 /* Link level address */
|
||||
@ -1,15 +0,0 @@
|
||||
diff -ur _work/gated-3-5-9/src/if.c work/gated-3-5-9/src/if.c
|
||||
--- src/if.c Sun Dec 13 19:16:41 1998
|
||||
+++ src/if.c Fri Jul 18 00:41:47 1997
|
||||
@@ -2061,9 +2061,10 @@
|
||||
case IFS_LOOPBACK:
|
||||
/* Add a host route to the loopback interface */
|
||||
|
||||
- BIT_SET(int_rtparms.rtp_state, RTS_NOADVISE);
|
||||
int_rtparms.rtp_dest = ifap->ifa_addr;
|
||||
int_rtparms.rtp_dest_mask = sockhostmask(ifap->ifa_addr);
|
||||
+ if (sock2ip(ifap->ifa_addr) == htonl(INADDR_LOOPBACK))
|
||||
+ BIT_SET(int_rtparms.rtp_state, RTS_NOADVISE);
|
||||
|
||||
ifap->ifa_rt = rt_add(&int_rtparms);
|
||||
break;
|
||||
@ -1,8 +1,4 @@
|
||||
bin/ripquery
|
||||
bin/ospf_monitor
|
||||
bin/gdc
|
||||
man/man8/gated.8
|
||||
man/man8/ripquery.8
|
||||
man/man8/ospf_monitor.8
|
||||
man/man8/gdc.8
|
||||
sbin/gated
|
||||
|
||||
Loading…
Reference in New Issue
Block a user