Date: Mon, 11 Jul 2005 17:13:19 -0500 (CDT) From: Babak Farrokhi <babak@farrokhi.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/83301: Update port: net/openbgpd to 3.7 Message-ID: <20050711221319.BC0635643F@royalway.propagation.net> Resent-Message-ID: <200507112220.j6BMKA6c095491@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83301 >Category: ports >Synopsis: Update port: net/openbgpd to 3.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 11 22:20:09 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Babak Farrokhi >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD royalway.propagation.net 5.4-STABLE FreeBSD 5.4-STABLE #6: Thu Jun 30 05:11:17 CDT 2005 root@royalway.propagation.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: >How-To-Repeat: >Fix: Please fetch queue.h from ftp://ftp.openbsd.org/pub/OpenBSD/src/sys/sys/queue.h and put it next to if_media.h and pfkey_compat.c --- openbgpd37.patch begins here --- diff -ruN openbgpd.orig/Makefile openbgpd/Makefile --- openbgpd.orig/Makefile Sat May 21 23:09:18 2005 +++ openbgpd/Makefile Tue Jul 12 02:19:18 2005 @@ -6,13 +6,14 @@ # PORTNAME= openbgpd -PORTVERSION= 3.6 +PORTVERSION= 3.7 CATEGORIES= net MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenBGPD/:openbsd \ ${MASTER_SITE_LOCAL:S/$/:freebsd/g} MASTER_SITE_SUBDIR= flz/openbgpd/:freebsd DISTFILES= ${PORTNAME}-${PORTVERSION}.tgz:openbsd,freebsd \ - if_media.h:freebsd pfkey_compat.c:freebsd + if_media.h:freebsd pfkey_compat.c:freebsd \ + queue.h:freebsd DIST_SUBDIR= openbgpd EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tgz @@ -45,6 +46,7 @@ post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/bgpctl/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/pfkey_compat.c ${WRKSRC}/bgpd/ + @${CP} ${DISTDIR}/${DIST_SUBDIR}/queue.h ${WRKSRC}/bgpd/ post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ diff -ruN openbgpd.orig/distinfo openbgpd/distinfo --- openbgpd.orig/distinfo Tue May 17 19:16:41 2005 +++ openbgpd/distinfo Tue Jul 12 02:19:18 2005 @@ -1,6 +1,8 @@ -MD5 (openbgpd/openbgpd-3.6.tgz) = e40c5dce08c3c0e7fb232bdd5ea11523 -SIZE (openbgpd/openbgpd-3.6.tgz) = 109058 +MD5 (openbgpd/openbgpd-3.7.tgz) = 4d9d933a705a9b4154a86344e6eae437 +SIZE (openbgpd/openbgpd-3.7.tgz) = 114980 MD5 (openbgpd/if_media.h) = 4ff9297f5c133425dafe3ca565c0f811 SIZE (openbgpd/if_media.h) = 23762 MD5 (openbgpd/pfkey_compat.c) = 8c3bdf02fd308b327bd30e09674c1858 SIZE (openbgpd/pfkey_compat.c) = 360 +MD5 (openbgpd/queue.h) = 8f920ce880803f9c0ab1483b74878597 +SIZE (openbgpd/queue.h) = 17391 diff -ruN openbgpd.orig/files/patch-bgpctl_bgpctl.8 openbgpd/files/patch-bgpctl_bgpctl.8 --- openbgpd.orig/files/patch-bgpctl_bgpctl.8 Tue May 17 19:16:42 2005 +++ openbgpd/files/patch-bgpctl_bgpctl.8 Tue Jul 12 02:19:18 2005 @@ -1,9 +1,6 @@ - -$FreeBSD: ports/net/openbgpd/files/patch-bgpctl_bgpctl.8,v 1.1 2005/05/17 14:46:42 flz Exp $ - ---- bgpctl/bgpctl.8.orig -+++ bgpctl/bgpctl.8 -@@ -138,8 +138,8 @@ +--- bgpctl/bgpctl.8.orig Fri Dec 31 14:17:37 2004 ++++ bgpctl/bgpctl.8 Tue Jul 12 00:02:10 2005 +@@ -152,8 +152,8 @@ and message counters. .El .Sh FILES diff -ruN openbgpd.orig/files/patch-bgpctl_bgpctl.c openbgpd/files/patch-bgpctl_bgpctl.c --- openbgpd.orig/files/patch-bgpctl_bgpctl.c Tue May 17 19:16:42 2005 +++ openbgpd/files/patch-bgpctl_bgpctl.c Tue Jul 12 02:19:18 2005 @@ -1,5 +1,5 @@ ---- bgpctl/bgpctl.c.orig Fri Aug 20 17:49:35 2004 -+++ bgpctl/bgpctl.c Sun Mar 20 15:27:10 2005 +--- bgpctl/bgpctl.c.orig Mon Mar 14 16:06:27 2005 ++++ bgpctl/bgpctl.c Tue Jul 12 00:12:25 2005 @@ -20,7 +20,6 @@ #include <sys/socket.h> #include <sys/un.h> @@ -8,7 +8,7 @@ #include <net/if_types.h> #include <err.h> -@@ -35,6 +34,7 @@ +@@ -35,13 +34,15 @@ #include "rde.h" #include "log.h" #include "parser.h" @@ -16,3 +16,23 @@ enum neighbor_views { NV_DEFAULT, + NV_TIMERS + }; + +-__dead void usage(void); ++//__dead ++void usage(void); + int main(int, char *[]); + char *fmt_peer(const struct peer_config *, int); + void show_summary_head(void); +@@ -71,8 +72,8 @@ + + struct imsgbuf *ibuf; + +-__dead void +-usage(void) ++//__dead void ++void usage(void) + { + extern char *__progname; + diff -ruN openbgpd.orig/files/patch-bgpd_bgpd.c openbgpd/files/patch-bgpd_bgpd.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_bgpd.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,23 @@ +--- bgpd/bgpd.c.orig Wed Feb 9 14:26:28 2005 ++++ bgpd/bgpd.c Mon Jul 11 23:57:46 2005 +@@ -37,7 +37,8 @@ + #include "session.h" + + void sighdlr(int); +-__dead void usage(void); ++//__dead ++void usage(void); + int main(int, char *[]); + int check_child(pid_t, const char *); + int send_filterset(struct imsgbuf *, struct filter_set_head *, +@@ -75,8 +76,8 @@ + } + } + +-__dead void +-usage(void) ++//__dead void ++void usage(void) + { + extern char *__progname; + diff -ruN openbgpd.orig/files/patch-bgpd_bgpd.h openbgpd/files/patch-bgpd_bgpd.h --- openbgpd.orig/files/patch-bgpd_bgpd.h Tue May 17 19:16:42 2005 +++ openbgpd/files/patch-bgpd_bgpd.h Tue Jul 12 02:19:18 2005 @@ -1,8 +1,14 @@ - -$FreeBSD: ports/net/openbgpd/files/patch-bgpd_bgpd.h,v 1.1 2005/05/17 14:46:42 flz Exp $ - ---- bgpd/bgpd.h.orig -+++ bgpd/bgpd.h +--- bgpd/bgpd.h.orig Tue Mar 15 13:48:39 2005 ++++ bgpd/bgpd.h Tue Jul 12 00:05:48 2005 +@@ -20,7 +20,7 @@ + + #include <sys/types.h> + #include <sys/socket.h> +-#include <sys/queue.h> ++#include "queue.h" + #include <netinet/in.h> + #include <arpa/inet.h> + #include <net/if.h> @@ -31,7 +31,7 @@ #define BGP_VERSION 4 diff -ruN openbgpd.orig/files/patch-bgpd_kroute.c openbgpd/files/patch-bgpd_kroute.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_kroute.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,10 @@ +--- bgpd/kroute.c.orig Tue Mar 15 13:48:39 2005 ++++ bgpd/kroute.c Tue Jul 12 00:00:09 2005 +@@ -18,6 +18,7 @@ + + #include <sys/param.h> + #include <sys/types.h> ++#include "queue.h" + #include <sys/socket.h> + #include <sys/sysctl.h> + #include <sys/tree.h> diff -ruN openbgpd.orig/files/patch-bgpd_mrt.c openbgpd/files/patch-bgpd_mrt.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_mrt.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,11 @@ +--- bgpd/mrt.c.orig Thu Dec 23 19:39:26 2004 ++++ bgpd/mrt.c Mon Jul 11 23:53:51 2005 +@@ -17,7 +17,7 @@ + */ + + #include <sys/types.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <errno.h> + #include <fcntl.h> diff -ruN openbgpd.orig/files/patch-bgpd_pftable.c openbgpd/files/patch-bgpd_pftable.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_pftable.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,10 @@ +--- bgpd/pftable.c.orig Tue Nov 2 20:30:52 2004 ++++ bgpd/pftable.c Tue Jul 12 00:11:48 2005 +@@ -17,6 +17,7 @@ + */ + + #include <sys/types.h> ++#include "queue.h" + #include <sys/ioctl.h> + #include <sys/socket.h> + diff -ruN openbgpd.orig/files/patch-bgpd_rde.h openbgpd/files/patch-bgpd_rde.h --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_rde.h Tue Jul 12 02:19:18 2005 @@ -0,0 +1,11 @@ +--- bgpd/rde.h.orig Fri Mar 11 16:24:20 2005 ++++ bgpd/rde.h Mon Jul 11 23:54:04 2005 +@@ -20,7 +20,7 @@ + #define __RDE_H__ + + #include <sys/types.h> +-#include <sys/queue.h> ++#include "queue.h" + #include <sys/tree.h> + + #include "bgpd.h" diff -ruN openbgpd.orig/files/patch-bgpd_rde_attr.c openbgpd/files/patch-bgpd_rde_attr.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_rde_attr.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,11 @@ +--- bgpd/rde_attr.c.orig Wed Nov 10 18:48:11 2004 ++++ bgpd/rde_attr.c Mon Jul 11 23:55:57 2005 +@@ -17,7 +17,7 @@ + */ + + #include <sys/types.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <netinet/in.h> + diff -ruN openbgpd.orig/files/patch-bgpd_rde_decide.c openbgpd/files/patch-bgpd_rde_decide.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_rde_decide.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,11 @@ +--- bgpd/rde_decide.c.orig Thu Nov 11 14:05:15 2004 ++++ bgpd/rde_decide.c Mon Jul 11 23:56:14 2005 +@@ -18,7 +18,7 @@ + */ + + #include <sys/types.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <string.h> + diff -ruN openbgpd.orig/files/patch-bgpd_rde_filter.c openbgpd/files/patch-bgpd_rde_filter.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_rde_filter.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,12 @@ +--- bgpd/rde_filter.c.orig Mon Mar 14 21:02:04 2005 ++++ bgpd/rde_filter.c Tue Jul 12 00:11:24 2005 +@@ -16,7 +16,8 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #include <sys/types.h> +-#include <sys/queue.h> ++#include <sys/limits.h> ++#include "queue.h" + + #include <stdlib.h> + #include <string.h> diff -ruN openbgpd.orig/files/patch-bgpd_rde_prefix.c openbgpd/files/patch-bgpd_rde_prefix.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_rde_prefix.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,11 @@ +--- bgpd/rde_prefix.c.orig Thu Nov 11 20:23:01 2004 ++++ bgpd/rde_prefix.c Mon Jul 11 23:56:38 2005 +@@ -17,7 +17,7 @@ + */ + + #include <sys/types.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <errno.h> + #include <stdlib.h> diff -ruN openbgpd.orig/files/patch-bgpd_rde_rib.c openbgpd/files/patch-bgpd_rde_rib.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_rde_rib.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,11 @@ +--- bgpd/rde_rib.c.orig Fri Mar 11 16:24:20 2005 ++++ bgpd/rde_rib.c Mon Jul 11 23:57:01 2005 +@@ -17,7 +17,7 @@ + */ + + #include <sys/types.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <stdlib.h> + #include <string.h> diff -ruN openbgpd.orig/files/patch-bgpd_rde_update.c openbgpd/files/patch-bgpd_rde_update.c --- /dev/null Thu Jan 1 03:30:00 1970 +++ openbgpd/files/patch-bgpd_rde_update.c Tue Jul 12 02:19:18 2005 @@ -0,0 +1,11 @@ +--- bgpd/rde_update.c.orig Fri Mar 11 16:24:20 2005 ++++ bgpd/rde_update.c Mon Jul 11 23:56:48 2005 +@@ -16,7 +16,7 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #include <sys/types.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <stdlib.h> + #include <string.h> diff -ruN openbgpd.orig/files/patch-bgpd_session.c openbgpd/files/patch-bgpd_session.c --- openbgpd.orig/files/patch-bgpd_session.c Tue May 17 19:16:42 2005 +++ openbgpd/files/patch-bgpd_session.c Tue Jul 12 02:19:18 2005 @@ -1,6 +1,6 @@ ---- bgpd/session.c.orig Thu Sep 9 23:53:57 2004 -+++ bgpd/session.c Sun Mar 20 15:33:51 2005 -@@ -206,9 +206,12 @@ +--- bgpd/session.c.orig Fri Mar 11 21:16:11 2005 ++++ bgpd/session.c Tue Jul 12 00:06:16 2005 +@@ -207,9 +207,12 @@ setproctitle("session engine"); bgpd_process = PROC_SE; --- openbgpd37.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050711221319.BC0635643F>