Attachment #81923 for bug #117240

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

Lines 6-11 Link Here

(-)/usr/ports/net-mgmt/send/Makefile (-2 / +7 lines)
6		6
7	PORTNAME= send	7	PORTNAME= send
8	PORTVERSION= 0.2	8	PORTVERSION= 0.2
		9	PORTREVISION= 1
9	CATEGORIES= net-mgmt ipv6	10	CATEGORIES= net-mgmt ipv6
10	MASTER_SITES= #http://www.docomolabs-usa.com/lab_osrc_guide.html	11	MASTER_SITES= #http://www.docomolabs-usa.com/lab_osrc_guide.html
11	DISTNAME= ${PORTNAME}_${PORTVERSION}	12	DISTNAME= ${PORTNAME}_${PORTVERSION}
Lines 25-32 Link Here
25		26
26	.include <bsd.port.pre.mk>	27	.include <bsd.port.pre.mk>
27		28
28	.if ${OSVERSION} > 600000	29	.if ${OSVERSION} < 600000
29	BROKEN= doesn't compile in FreeBSD > 6.0	30	BROKEN= doesn't compile in FreeBSD < 6.0
		31	.endif
		32
		33	.if ${OSVERSION} > 700000
		34	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_pkixip__ext__asn.h
30	.endif	35	.endif
31		36
32	.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})	37	.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})





$FreeBSD: ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h,v 1.1 2007/09/23 06:39:06 edwin Exp $

--- include/pkixip_ext_asn.h.orig
+++ include/pkixip_ext_asn.h
@@ -45,6 +45,7 @@
 #define	IANA_SAFI_BOTH		3
 #define	IANA_SAFI_MPLS		4
 
+/*
 typedef struct IPAddressRange_st {
 	ASN1_BIT_STRING		*min;
 	ASN1_BIT_STRING		*max;
@@ -52,9 +53,6 @@
 
 typedef struct IPAddressOrRange_st {
 
-#define	IP_AOR_PREFIX		0
-#define	IP_AOR_RANGE		1
-
 	int 			type;
 	union {
 		ASN1_BIT_STRING	*addressPrefix;
@@ -64,8 +62,6 @@
 
 typedef struct IPAddressChoice_st {
 
-#define	IPA_CHOICE_INHERIT	0
-#define	IPA_CHOICE_AOR		1
 
 	int 			type;
 	union {
@@ -78,6 +74,12 @@
 	ASN1_OCTET_STRING	*addressFamily;
 	IPAddressChoice		*ipAddressChoice;
 } IPAddressFamily;
+*/
+
+#define	IP_AOR_PREFIX		0
+#define	IP_AOR_RANGE		1
+#define	IPA_CHOICE_INHERIT	0
+#define	IPA_CHOICE_AOR		1
 
 typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
 





$FreeBSD: ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h,v 1.1 2007/09/23 06:39:06 edwin Exp $

--- include/pkixip_ext_asn.h.orig
+++ include/pkixip_ext_asn.h
@@ -45,6 +45,7 @@
 #define	IANA_SAFI_BOTH		3
 #define	IANA_SAFI_MPLS		4
 
+/*
 typedef struct IPAddressRange_st {
 	ASN1_BIT_STRING		*min;
 	ASN1_BIT_STRING		*max;
@@ -52,9 +53,6 @@
 
 typedef struct IPAddressOrRange_st {
 
-#define	IP_AOR_PREFIX		0
-#define	IP_AOR_RANGE		1
-
 	int 			type;
 	union {
 		ASN1_BIT_STRING	*addressPrefix;
@@ -64,8 +62,6 @@
 
 typedef struct IPAddressChoice_st {
 
-#define	IPA_CHOICE_INHERIT	0
-#define	IPA_CHOICE_AOR		1
 
 	int 			type;
 	union {
@@ -78,6 +74,12 @@
 	ASN1_OCTET_STRING	*addressFamily;
 	IPAddressChoice		*ipAddressChoice;
 } IPAddressFamily;
+*/
+
+#define	IP_AOR_PREFIX		0
+#define	IP_AOR_RANGE		1
+#define	IPA_CHOICE_INHERIT	0
+#define	IPA_CHOICE_AOR		1
 
 typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
 

Return to bug 117240

Line 0 Link Here

(-)/usr/ports/net-mgmt/send/files/extra-patch-include_pkixip__ext__asn.h (+45 lines)
	1
	2	$FreeBSD: ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h,v 1.1 2007/09/23 06:39:06 edwin Exp $
	3
	4	--- include/pkixip_ext_asn.h.orig
	5	+++ include/pkixip_ext_asn.h
	6	@@ -45,6 +45,7 @@
	7	#define IANA_SAFI_BOTH 3
	8	#define IANA_SAFI_MPLS 4
	9
	10	+/*
	11	typedef struct IPAddressRange_st {
	12	ASN1_BIT_STRING *min;
	13	ASN1_BIT_STRING *max;
	14	@@ -52,9 +53,6 @@
	15
	16	typedef struct IPAddressOrRange_st {
	17
	18	-#define IP_AOR_PREFIX 0
	19	-#define IP_AOR_RANGE 1
	20	-
	21	int type;
	22	union {
	23	ASN1_BIT_STRING *addressPrefix;
	24	@@ -64,8 +62,6 @@
	25
	26	typedef struct IPAddressChoice_st {
	27
	28	-#define IPA_CHOICE_INHERIT 0
	29	-#define IPA_CHOICE_AOR 1
	30
	31	int type;
	32	union {
	33	@@ -78,6 +74,12 @@
	34	ASN1_OCTET_STRING *addressFamily;
	35	IPAddressChoice *ipAddressChoice;
	36	} IPAddressFamily;
	37	+*/
	38	+
	39	+#define IP_AOR_PREFIX 0
	40	+#define IP_AOR_RANGE 1
	41	+#define IPA_CHOICE_INHERIT 0
	42	+#define IPA_CHOICE_AOR 1
	43
	44	typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
	45

Lines 1-45 Link Here

(-)/usr/ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h (-45 lines)
1
2	$FreeBSD: ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h,v 1.1 2007/09/23 06:39:06 edwin Exp $
3
4	--- include/pkixip_ext_asn.h.orig
5	+++ include/pkixip_ext_asn.h
6	@@ -45,6 +45,7 @@
7	#define IANA_SAFI_BOTH 3
8	#define IANA_SAFI_MPLS 4
9
10	+/*
11	typedef struct IPAddressRange_st {
12	ASN1_BIT_STRING *min;
13	ASN1_BIT_STRING *max;
14	@@ -52,9 +53,6 @@
15
16	typedef struct IPAddressOrRange_st {
17
18	-#define IP_AOR_PREFIX 0
19	-#define IP_AOR_RANGE 1
20	-
21	int type;
22	union {
23	ASN1_BIT_STRING *addressPrefix;
24	@@ -64,8 +62,6 @@
25
26	typedef struct IPAddressChoice_st {
27
28	-#define IPA_CHOICE_INHERIT 0
29	-#define IPA_CHOICE_AOR 1
30
31	int type;
32	union {
33	@@ -78,6 +74,12 @@
34	ASN1_OCTET_STRING *addressFamily;
35	IPAddressChoice *ipAddressChoice;
36	} IPAddressFamily;
37	+*/
38	+
39	+#define IP_AOR_PREFIX 0
40	+#define IP_AOR_RANGE 1
41	+#define IPA_CHOICE_INHERIT 0
42	+#define IPA_CHOICE_AOR 1
43
44	typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
45