Date: Thu, 11 May 2006 13:22:44 +0600 From: Boris Kovalenko <boris@tagnet.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/97122: [MAINTAINER UPDATE] net/quagga: update to 0.99.4 Message-ID: <E1Fe5VU-000OoB-Pp@boris.nikom.ru> Resent-Message-ID: <200605110730.k4B7UIjL009288@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97122
>Category: ports
>Synopsis: [MAINTAINER UPDATE] net/quagga: update to 0.99.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 11 07:30:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Boris Kovalenko
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
JSC "TAGNet"
>Environment:
System: FreeBSD boris.nikom.ru 6.1-RELEASE FreeBSD 6.1-RELEASE #1: Wed May 10 10:43:32 YEKST 2006
>Description:
- Update to 0.99.4
Changelog is too big to put it here. Also please put note to UPDATING:
20060511:
AFFECTS: users of net/quagga
AUTHOR: Boris Kovalenko <boris@tagnet.ru>
From version 0.99.4 quagga' port uses new rcorder(8) features introduced with
6.1-RELEASE. Main difference from older port version is that startup scripts
will be installed in /usr/local/etc/rc.d (or where your %%PREFIX%% is pointing to)
and users of older versions of FreeBSD should manually adjust proper startup order.
Added file(s):
- files/patch-doc-Makefile.in
- files/patch-memory.c
- files/patch-ripd-ripd.c
Removed file(s):
- files/patch-configure
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- quagga-0.99.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/quagga/Makefile /usr/ports/net/quagga.new/Makefile
--- /usr/ports/net/quagga/Makefile Thu Feb 23 15:38:26 2006
+++ /usr/ports/net/quagga.new/Makefile Thu May 11 13:02:48 2006
@@ -6,8 +6,7 @@
#
PORTNAME= quagga
-PORTVERSION= 0.99.3
-PORTREVISION= 2
+PORTVERSION= 0.99.4
CATEGORIES= net ipv6
MASTER_SITES= http://quagga.net/download/
@@ -21,14 +20,12 @@
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_PERL5_BUILD= yes
LIBTOOLFILES= configure
MAN1= vtysh.1
MAN8= bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
-INFO= quagga
OPTIONS= ISISD "Enable experimental ISIS daemon" off \
PAM "PAM authentication for vtysh" off \
@@ -115,18 +112,13 @@
.if defined(WITH_TCPMD5) && !defined(WITHOUT_TCPMD5)
.if ${OSVERSION} < 491000
-BROKEN= "This version of FreeBSD does not have TCP MD5 signature support"
+BROKEN=This version of FreeBSD does not have TCP MD5 signature support
.endif
EXTRA_PATCHES+=${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_network.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_vty.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.h ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.c ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.h
CFLAGS+= -DQUAGGA_TCP_MD5SIG
.endif
-USE_RC_SUBR= watchquagga.sh
-.if ${OSVERSION} < 500000
-USE_RC_SUBR+= quagga.sh
-.else
-USE_RCORDER= quagga.sh
-.endif
+USE_RC_SUBR= quagga.sh watchquagga.sh
SUB_LIST+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \
SYSCONF_DIR=${SYSCONF_DIR}
diff -ruN --exclude=CVS /usr/ports/net/quagga/distinfo /usr/ports/net/quagga.new/distinfo
--- /usr/ports/net/quagga/distinfo Fri Feb 3 16:39:37 2006
+++ /usr/ports/net/quagga.new/distinfo Thu May 11 09:39:47 2006
@@ -1,4 +1,3 @@
-MD5 (quagga-0.99.3.tar.gz) = d11dfb2d0eb9fa93e1aca882541e45d8
-SHA256 (quagga-0.99.3.tar.gz) = 3e319fa854d84eaf6a57513256b903f0d068be85dbce27cb7ec3cbac08e26aac
-SIZE (quagga-0.99.3.tar.gz) = 2203788
-SIZE (quagga-0.98.5.tar.gz) = 2018058
+MD5 (quagga-0.99.4.tar.gz) = a75d3f5ed0b3354274c28d195e3f6479
+SHA256 (quagga-0.99.4.tar.gz) = 4044bfacb44ec9fa9160b56aeb1e76e1ca62b17115ae38298065cbaad16491a7
+SIZE (quagga-0.99.4.tar.gz) = 2207774
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/extra-tcpmd5-patch-lib-sockopt.h /usr/ports/net/quagga.new/files/extra-tcpmd5-patch-lib-sockopt.h
--- /usr/ports/net/quagga/files/extra-tcpmd5-patch-lib-sockopt.h Tue Aug 30 18:36:47 2005
+++ /usr/ports/net/quagga.new/files/extra-tcpmd5-patch-lib-sockopt.h Thu May 11 10:09:05 2006
@@ -1,12 +1,13 @@
---- lib/sockopt.h.orig Mon Nov 15 10:51:15 2004
-+++ lib/sockopt.h Fri Jan 28 17:52:57 2005
-@@ -40,6 +40,9 @@
+--- lib/sockopt.h.orig Wed May 4 01:13:05 2005
++++ lib/sockopt.h Thu May 11 10:08:05 2006
+@@ -40,6 +40,10 @@
*/
#define SOPT_SIZE_CMSG_PKTINFO_IPV6() (sizeof (struct in6_pktinfo));
+#ifdef QUAGGA_TCP_MD5SIG
-+int sockopt_tcp_signature(int family, int sock, int enable);
++extern int sockopt_tcp_signature(int family, int sock, int enable);
+#endif /* QUAGGA_TCP_MD5SIG */
++
/*
* Size defines for control messages used to get ifindex. We define
* values for each method, and define a macro that can be used by code
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-configure /usr/ports/net/quagga.new/files/patch-configure
--- /usr/ports/net/quagga/files/patch-configure Fri Feb 3 16:39:37 2006
+++ /usr/ports/net/quagga.new/files/patch-configure Thu Jan 1 05:00:00 1970
@@ -1,29 +0,0 @@
---- configure.orig Fri Jan 20 07:24:48 2006
-+++ configure Mon Jan 30 09:36:38 2006
-@@ -15056,7 +15056,7 @@
- fi
-
- if test "${HAVE_SNMP}" = "yes"; then
-- for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null
-+ for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/include/ucd-snmp/asn1.h /usr/local/include/net-snmp/library/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null
- do
- test -f "${ac_snmp}" && break
- done
-@@ -15111,7 +15111,7 @@
-
-
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_NET_SNMP
-+#define HAVE_NETSNMP
- _ACEOF
-
-
-@@ -15119,7 +15119,7 @@
- #define UCD_COMPATIBLE
- _ACEOF
-
-- SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/local/include/net-snmp"
-+ SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/local/include/net-snmp -I/usr/local/include/net-snmp/library"
- LIBS="${LIBS} -L/usr/local/lib -lnetsnmp"
- ;;
- esac
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-doc-Makefile.in /usr/ports/net/quagga.new/files/patch-doc-Makefile.in
--- /usr/ports/net/quagga/files/patch-doc-Makefile.in Thu Jan 1 05:00:00 1970
+++ /usr/ports/net/quagga.new/files/patch-doc-Makefile.in Thu May 11 12:04:46 2006
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig Thu May 11 01:53:06 2006
++++ doc/Makefile.in Thu May 11 12:04:00 2006
+@@ -549,7 +549,7 @@
+ check-am: all-am
+ check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
+-all-am: Makefile $(INFO_DEPS) $(MANS)
++all-am: Makefile $(MANS)
+ installdirs:
+ for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-memory.c /usr/ports/net/quagga.new/files/patch-memory.c
--- /usr/ports/net/quagga/files/patch-memory.c Thu Jan 1 05:00:00 1970
+++ /usr/ports/net/quagga.new/files/patch-memory.c Thu May 11 10:19:09 2006
@@ -0,0 +1,11 @@
+--- lib/memory.c.orig Thu Mar 30 19:47:38 2006
++++ lib/memory.c Thu May 11 10:18:36 2006
+@@ -21,7 +21,7 @@
+ */
+
+ #include <zebra.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #include "log.h"
+ #include "memory.h"
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-ripd-ripd.c /usr/ports/net/quagga.new/files/patch-ripd-ripd.c
--- /usr/ports/net/quagga/files/patch-ripd-ripd.c Thu Jan 1 05:00:00 1970
+++ /usr/ports/net/quagga.new/files/patch-ripd-ripd.c Thu May 11 12:59:19 2006
@@ -0,0 +1,19 @@
+--- ripd/ripd.c.orig Thu May 4 13:33:44 2006
++++ ripd/ripd.c Thu May 11 12:58:35 2006
+@@ -1822,6 +1822,7 @@
+ struct interface *ifp;
+ struct connected *ifc;
+ struct rip_interface *ri;
++ int vrecv;
+
+ /* Fetch socket then register myself. */
+ sock = THREAD_FD (t);
+@@ -1937,7 +1938,7 @@
+ }
+
+ /* RIP Version check. RFC2453, 4.6 and 5.1 */
+- int vrecv = ((ri->ri_receive == RI_RIP_UNSPEC) ?
++ vrecv = ((ri->ri_receive == RI_RIP_UNSPEC) ?
+ rip->version_recv : ri->ri_receive);
+ if ((packet->version == RIPv1) && !(vrecv & RIPv1))
+ {
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/quagga.sh.in /usr/ports/net/quagga.new/files/quagga.sh.in
--- /usr/ports/net/quagga/files/quagga.sh.in Tue Feb 21 01:47:28 2006
+++ /usr/ports/net/quagga.new/files/quagga.sh.in Thu May 11 09:45:36 2006
@@ -4,7 +4,7 @@
# PROVIDE: quagga
# REQUIRE: netif routing mountcritlocal
# BEFORE: NETWORKING
-# KEYWORD: NetBSD
+# KEYWORD: shutdown
#
# Add the following line to /etc/rc.conf to enable quagga:
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/watchquagga.sh.in /usr/ports/net/quagga.new/files/watchquagga.sh.in
--- /usr/ports/net/quagga/files/watchquagga.sh.in Tue Feb 21 01:47:28 2006
+++ /usr/ports/net/quagga.new/files/watchquagga.sh.in Thu May 11 09:45:41 2006
@@ -4,7 +4,7 @@
# PROVIDE: watchquagga
# REQUIRE: netif routing mountcritlocal quagga
# BEFORE: NETWORKING
-# KEYWORD: NetBSD
+# KEYWORD: shutdown
#
# Add the following line to /etc/rc.conf to enable quagga:
diff -ruN --exclude=CVS /usr/ports/net/quagga/pkg-plist /usr/ports/net/quagga.new/pkg-plist
--- /usr/ports/net/quagga/pkg-plist Thu Feb 23 15:38:27 2006
+++ /usr/ports/net/quagga.new/pkg-plist Thu May 11 10:33:24 2006
@@ -81,4 +81,4 @@
@dirrm include/quagga
@dirrm share/examples/quagga
@dirrm etc/quagga
-@unexec rmdir %%LOCALSTATE_DIR%% 2>/dev/null || true
+@dirrmtry %%LOCALSTATE_DIR%%
--- quagga-0.99.4.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?E1Fe5VU-000OoB-Pp>