Attachment #61786 for bug #92524

View | Details | Raw Unified | Return to bug 92524
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/ports/net/quagga.new/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= quagga	8	PORTNAME= quagga
9	PORTVERSION= 0.98.5	9	PORTVERSION= 0.99.3
10	PORTREVISION= 2	10	PORTREVISION= 0
11	CATEGORIES= net ipv6	11	CATEGORIES= net ipv6
12	MASTER_SITES= http://quagga.net/download/	12	MASTER_SITES= http://quagga.net/download/
13		13

Lines 1-2 Link Here

(-)/usr/ports/net/quagga.new/distinfo (-2 / +3 lines)
1	MD5 (quagga-0.98.5.tar.gz) = ec09c1ec624aea98e18aa19282666784	1	MD5 (quagga-0.99.3.tar.gz) = d11dfb2d0eb9fa93e1aca882541e45d8
2	SIZE (quagga-0.98.5.tar.gz) = 2018058	2	SHA256 (quagga-0.99.3.tar.gz) = 3e319fa854d84eaf6a57513256b903f0d068be85dbce27cb7ec3cbac08e26aac
		3	SIZE (quagga-0.99.3.tar.gz) = 2203788




--- bgpd/bgpd.h.orig	Wed Jan 11 03:10:10 2006
+++ bgpd/bgpd.h	Mon Jan 30 08:52:06 2006
@@ -347,6 +347,9 @@
 #define PEER_FLAG_DYNAMIC_CAPABILITY        (1 << 5) /* dynamic capability */
 #define PEER_FLAG_DISABLE_CONNECTED_CHECK   (1 << 6) /* disable-connected-check */
 #define PEER_FLAG_LOCAL_AS_NO_PREPEND       (1 << 7) /* local-as no-prepend */
+#ifdef QUAGGA_TCP_MD5SIG
+#define PEER_FLAG_TCP_SIGNATURE             (1 << 9) /* use TCP-MD5 digest */
+#endif /* QUAGGA_TCP_MD5SIG */
 
   /* NSF mode (graceful restart) */
   u_char nsf[AFI_MAX][SAFI_MAX];
@@ -522,6 +525,13 @@
 #define PEER_RMAP_TYPE_NOSET          (1 << 5) /* not allow to set commands */
 #define PEER_RMAP_TYPE_IMPORT         (1 << 6) /* neighbor route-map import */
 #define PEER_RMAP_TYPE_EXPORT         (1 << 7) /* neighbor route-map export */
+
+#ifdef QUAGGA_TCP_MD5SIG
+ /* TCP-MD5 Password Support -- bms */
+#define PEER_PASSWORD_MINLEN		1
+#define PEER_PASSWORD_MAXLEN		80	/* width of password field */
+ char password[PEER_PASSWORD_MAXLEN];

 };
 
 /* This structure's member directly points incoming packet data
@@ -904,6 +914,11 @@
 
 extern int peer_local_as_set (struct peer *, as_t, int);
 extern int peer_local_as_unset (struct peer *);
+
+#ifdef QUAGGA_TCP_MD5SIG
+extern int peer_password_set (struct peer *, char *);
+extern int peer_password_unset (struct peer *);
+#endif /* QUAGGA_TCP_MD5SIG */
 
 extern int peer_prefix_list_set (struct peer *, afi_t, safi_t, int, const char *);
 extern int peer_prefix_list_unset (struct peer *, afi_t, safi_t, int);




--- 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 @@
 
     case ${ac_snmp} in
-      /usr/include/net-snmp/*)
+      /usr/local/include/net-snmp/*)
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_NET_SNMP
+#define HAVE_NETSNMP
 #define UCD_COMPATIBLE
 _ACEOF
 
-                  CFLAGS="${CFLAGS} -I/usr/include/net-snmp -I/usr/include/net-snmp/library"
+                  CFLAGS="${CFLAGS} -I/usr/local/include/net-snmp -I/usr/local/include/net-snmp/library"
 		  if test "${HAVE_NETSNMP}" = "yes"; then
 		        LIBS="${LIBS} -lnetsnmp"
 		  else
 			LIBS="${LIBS} -lsnmp"
 		  fi
                   ;;
-      /usr/include/ucd-snmp/*)
+      /usr/local/include/ucd-snmp/*)
 
@@ -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




lib/libzebra.so
lib/libzebra.so.0
include/quagga/buffer.h
include/quagga/checksum.h
include/quagga/command.h
include/quagga/distribute.h
include/quagga/filter.h

include/quagga/keychain.h
include/quagga/linklist.h
include/quagga/log.h
include/quagga/md5.h
include/quagga/memory.h
include/quagga/memtypes.h
include/quagga/network.h
%%OSPFAPI_HEADER%%
include/quagga/ospfd/ospf_api.h

include/quagga/vector.h
include/quagga/version.h
include/quagga/vty.h
include/quagga/workqueue.h
include/quagga/zassert.h
include/quagga/zclient.h
include/quagga/zebra.h

Return to bug 92524

Lines 1-22 Link Here

(-)/usr/ports/net/quagga.new/files/extra-tcpmd5-patch-bgpd-bgpd.h (-18 / +18 lines)
1	--- bgpd/bgpd.h.orig Tue Oct 12 22:06:09 2004	1	--- bgpd/bgpd.h.orig Wed Jan 11 03:10:10 2006
2	+++ bgpd/bgpd.h Fri Jan 28 21:03:40 2005	2	+++ bgpd/bgpd.h Mon Jan 30 08:52:06 2006
3	@@ -335,6 +335,9 @@	3	@@ -347,6 +347,9 @@
4	#define PEER_FLAG_DYNAMIC_CAPABILITY (1 << 6) /* dynamic capability */	4	#define PEER_FLAG_DYNAMIC_CAPABILITY (1 << 5) /* dynamic capability */
5	#define PEER_FLAG_ENFORCE_MULTIHOP (1 << 7) /* enforce-multihop */	5	#define PEER_FLAG_DISABLE_CONNECTED_CHECK (1 << 6) /* disable-connected-check */
6	#define PEER_FLAG_LOCAL_AS_NO_PREPEND (1 << 8) /* local-as no-prepend */	6	#define PEER_FLAG_LOCAL_AS_NO_PREPEND (1 << 7) /* local-as no-prepend */
7	+#ifdef QUAGGA_TCP_MD5SIG /* XXX should move to AF_INET/SFI_UNICAST below */	7	+#ifdef QUAGGA_TCP_MD5SIG
8	+#define PEER_FLAG_TCP_SIGNATURE (1 << 9) /* use TCP-MD5 digest */	8	+#define PEER_FLAG_TCP_SIGNATURE (1 << 9) /* use TCP-MD5 digest */
9	+#endif /* QUAGGA_TCP_MD5SIG */	9	+#endif /* QUAGGA_TCP_MD5SIG */
10		10
11	/* Per AF configuration flags. */	11	/* NSF mode (graceful restart) */
12	u_int32_t af_flags[AFI_MAX][SAFI_MAX];	12	u_char nsf[AFI_MAX][SAFI_MAX];
13	@@ -496,6 +499,13 @@	13	@@ -522,6 +525,13 @@
14	#define PEER_RMAP_TYPE_NOSET (1 << 5) /* not allow to set commands */	14	#define PEER_RMAP_TYPE_NOSET (1 << 5) /* not allow to set commands */
15	#define PEER_RMAP_TYPE_IMPORT (1 << 6) /* neighbor route-map import */	15	#define PEER_RMAP_TYPE_IMPORT (1 << 6) /* neighbor route-map import */
16	#define PEER_RMAP_TYPE_EXPORT (1 << 7) /* neighbor route-map export */	16	#define PEER_RMAP_TYPE_EXPORT (1 << 7) /* neighbor route-map export */
17	+	17	+
18	+#ifdef QUAGGA_TCP_MD5SIG	18	+#ifdef QUAGGA_TCP_MD5SIG
19	+ /* TCP-MD5 Password Support -- bms */	19	+ /* TCP-MD5 Password Support -- bms */
20	+#define PEER_PASSWORD_MINLEN 1	20	+#define PEER_PASSWORD_MINLEN 1
21	+#define PEER_PASSWORD_MAXLEN 80 /* width of password field */	21	+#define PEER_PASSWORD_MAXLEN 80 /* width of password field */
22	+ char password[PEER_PASSWORD_MAXLEN];	22	+ char password[PEER_PASSWORD_MAXLEN];
Lines 24-38 Link Here
24	};	24	};
25		25
26	/* This structure's member directly points incoming packet data	26	/* This structure's member directly points incoming packet data
27	@@ -879,6 +889,11 @@	27	@@ -904,6 +914,11 @@
28		28
29	int peer_local_as_set (struct peer *, as_t, int);	29	extern int peer_local_as_set (struct peer *, as_t, int);
30	int peer_local_as_unset (struct peer *);	30	extern int peer_local_as_unset (struct peer *);
31	+	31	+
32	+#ifdef QUAGGA_TCP_MD5SIG	32	+#ifdef QUAGGA_TCP_MD5SIG
33	+int peer_password_set (struct peer , char );	33	+extern int peer_password_set (struct peer , char );
34	+int peer_password_unset (struct peer *);	34	+extern int peer_password_unset (struct peer *);
35	+#endif /* QUAGGA_TCP_MD5SIG */	35	+#endif /* QUAGGA_TCP_MD5SIG */
36		36
37	int peer_prefix_list_set (struct peer , afi_t, safi_t, int, const char );	37	extern int peer_prefix_list_set (struct peer , afi_t, safi_t, int, const char );
38	int peer_prefix_list_unset (struct peer *, afi_t, safi_t, int);	38	extern int peer_prefix_list_unset (struct peer *, afi_t, safi_t, int);

Lines 1-42 Link Here

(-)/usr/ports/net/quagga.new/files/patch-configure (-27 / +14 lines)
1	--- configure.orig Sun Aug 28 21:37:37 2005	1	--- configure.orig Fri Jan 20 07:24:48 2006
2	+++ configure Wed Sep 14 12:07:40 2005	2	+++ configure Mon Jan 30 09:36:38 2006
3	@@ -14751,13 +14751,13 @@	3	@@ -15056,7 +15056,7 @@
4	fi	4	fi
5		5
6	if test "${HAVE_SNMP}" = "yes"; then	6	if test "${HAVE_SNMP}" = "yes"; then
7	- 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	7	- 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
8	+ for ac_snmp in /usr/local/include/net-snmp/library/asn1.h /usr/local/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null	8	+ 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
9	do	9	do
10	test -f "${ac_snmp}" && break	10	test -f "${ac_snmp}" && break
11	done	11	done
		12	@@ -15111,7 +15111,7 @@
12		13
13	case ${ac_snmp} in
14	- /usr/include/net-snmp/*)
15	+ /usr/local/include/net-snmp/*)
16		14
17	cat >>confdefs.h <<\_ACEOF	15	cat >>confdefs.h <<\_ACEOF
18	#define HAVE_SNMP	16	-#define HAVE_NET_SNMP
19	@@ -14773,20 +14773,20 @@	17	+#define HAVE_NETSNMP
20	#define UCD_COMPATIBLE
21	_ACEOF	18	_ACEOF
22		19
23	- CFLAGS="${CFLAGS} -I/usr/include/net-snmp -I/usr/include/net-snmp/library"
24	+ CFLAGS="${CFLAGS} -I/usr/local/include/net-snmp -I/usr/local/include/net-snmp/library"
25	if test "${HAVE_NETSNMP}" = "yes"; then
26	LIBS="${LIBS} -lnetsnmp"
27	else
28	LIBS="${LIBS} -lsnmp"
29	fi
30	;;
31	- /usr/include/ucd-snmp/*)
32	+ /usr/local/include/ucd-snmp/*)
33		20
34	cat >>confdefs.h <<\_ACEOF	21	@@ -15119,7 +15119,7 @@
35	#define HAVE_SNMP	22	#define UCD_COMPATIBLE
36	_ACEOF	23	_ACEOF
37		24
38	- CFLAGS="${CFLAGS} -I/usr/include/ucd-snmp"	25	- SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/local/include/net-snmp"
39	+ CFLAGS="${CFLAGS} -I/usr/local/include/ucd-snmp"	26	+ SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/local/include/net-snmp -I/usr/local/include/net-snmp/library"
40	LIBS="${LIBS} -lsnmp"	27	LIBS="${LIBS} -L/usr/local/lib -lnetsnmp"
41	;;	28	;;
42	/usr/local/include/ucd-snmp/*)	29	esac

Lines 18-23 Link Here

(-)/usr/ports/net/quagga.new/pkg-plist (-1 / +4 lines)
18	lib/libzebra.so	18	lib/libzebra.so
19	lib/libzebra.so.0	19	lib/libzebra.so.0
20	include/quagga/buffer.h	20	include/quagga/buffer.h
		21	include/quagga/checksum.h
21	include/quagga/command.h	22	include/quagga/command.h
22	include/quagga/distribute.h	23	include/quagga/distribute.h
23	include/quagga/filter.h	24	include/quagga/filter.h
Lines 29-36 Link Here
29	include/quagga/keychain.h	30	include/quagga/keychain.h
30	include/quagga/linklist.h	31	include/quagga/linklist.h
31	include/quagga/log.h	32	include/quagga/log.h
32	include/quagga/md5-gnu.h	33	include/quagga/md5.h
33	include/quagga/memory.h	34	include/quagga/memory.h
		35	include/quagga/memtypes.h
34	include/quagga/network.h	36	include/quagga/network.h
35	%%OSPFAPI_HEADER%%	37	%%OSPFAPI_HEADER%%
36	include/quagga/ospfd/ospf_api.h	38	include/quagga/ospfd/ospf_api.h
Lines 58-63 Link Here
58	include/quagga/vector.h	60	include/quagga/vector.h
59	include/quagga/version.h	61	include/quagga/version.h
60	include/quagga/vty.h	62	include/quagga/vty.h
		63	include/quagga/workqueue.h
61	include/quagga/zassert.h	64	include/quagga/zassert.h
62	include/quagga/zclient.h	65	include/quagga/zclient.h
63	include/quagga/zebra.h	66	include/quagga/zebra.h