Update to 0.3. This version supports SeND socket on FreeBSD 9.X

and later instead of Netgraph and BPF.

Submitted by:	anchie

15 files changed, 71 insertions, 249 deletions

diff --git a/net-mgmt/send/Makefile b/net-mgmt/send/Makefile
index 754d3feabb8d..e559f67613cd 100644
--- a/net-mgmt/send/Makefile
+++ b/net-mgmt/send/Makefile
@@ -5,56 +5,41 @@
 # $FreeBSD$
 
 PORTNAME=	send
-PORTVERSION=	0.2
-PORTREVISION=	1
+PORTVERSION=	0.3
 CATEGORIES=	net-mgmt ipv6
-MASTER_SITES=	#http://www.docomolabs-usa.com/lab_osrc_guide.html
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	anchie
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	anchie@freebsd.org
 COMMENT=	Secure Neighbor Discovery implementation for IPv6
 
 LIB_DEPENDS=	dnet.1:${PORTSDIR}/net/libdnet
 
-RESTRICTED=	not redistributable, license agreement required
-
-USE_ZIP=	yes
 USE_GMAKE=	yes
 SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+PORTDOCS=	README UserGuide.pdf
 
-PORTDOCS=	UserGuide.pdf
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 700000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_pkixip__ext__asn.h
-.endif
-
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=		needs you to sign the agreement on "http://www.docomolabs-usa.com/lab_osrc_downl.html", download it manually, place in ${DISTDIR} and then restart this build
+.if !exists(/usr/include/netinet6/send.h)
+IGNORE=		is supported only on 9.0 and later
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" -e "s|%%LOCALBASE%%|${LOCALBASE}|" \
-		${WRKSRC}/Makefile.config \
-		${WRKSRC}/sendd/sendd_local.h \
-		${WRKSRC}/sendd/os-freebsd/Makefile \
-		${WRKSRC}/sendd/os-freebsd/sendd \
-		${WRKSRC}/examples/sendd.conf \
-		${WRKSRC}/examples/params.conf \
-		${WRKSRC}/examples/ipext/ipext_verify.conf
-
 post-install:
 	${MKDIR} ${PREFIX}/etc/sendd/
-	${INSTALL_DATA} ${WRKSRC}/examples/sendd.conf ${PREFIX}/etc/sendd/sendd.conf-dist
-	${INSTALL_DATA} ${WRKSRC}/examples/params.conf ${PREFIX}/etc/sendd/params.conf-dist
-	${INSTALL_DATA} ${WRKSRC}/examples/ipext/ipext_verify.conf ${PREFIX}/etc/sendd/ipext.conf-dist
-	@${CAT} ${PKGMESSAGE}
-.ifndef(NOPORTDOCS)
+	${INSTALL_DATA} ${WRKSRC}/examples/ipext/ipext_verify.conf \
+		${WRKSRC}/examples/ipext/ca/ipext.conf \
+		${WRKSRC}/examples/
+	${INSTALL_DATA} ${WRKSRC}/docs/UserGuide.pdf \
+		${WRKSRC}/UserGuide.pdf
+	for F in sendd.conf params.conf ipext.conf ipext_verify.conf; do \
+		${INSTALL_DATA} ${WRKSRC}/examples/$$F \
+		${PREFIX}/etc/sendd/$${F}-dist; \
+	done
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-. for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${DOCSDIR}
-. endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/send/distinfo b/net-mgmt/send/distinfo
index b489a933e39a..5aa785c1a5b8 100644
--- a/net-mgmt/send/distinfo
+++ b/net-mgmt/send/distinfo
@@ -1,3 +1,3 @@
-MD5 (send_0.2.zip) = 292c8b861b7799aeb1b0166f97c12f08
-SHA256 (send_0.2.zip) = 3fc9be6d55a2cc7d0f40249351c29ef6c605ea6d77d8f3654785a744ea64c0b7
-SIZE (send_0.2.zip) = 387834
+MD5 (send_0.3.tar.gz) = a4a0c3b0618419633ad39838b985f1a9
+SHA256 (send_0.3.tar.gz) = abe217c24f8f711124da74eb24342ee27a195e8102bed3e60d426607532ff76b
+SIZE (send_0.3.tar.gz) = 1272983
diff --git a/net-mgmt/send/files/extra-patch-include_pkixip__ext__asn.h b/net-mgmt/send/files/extra-patch-include_pkixip__ext__asn.h
deleted file mode 100644
index eff0683ac1cf..000000000000
--- a/net-mgmt/send/files/extra-patch-include_pkixip__ext__asn.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/net-mgmt/send/files/Attic/extra-patch-include_pkixip__ext__asn.h,v 1.1 2007-10-17 11:06:46 miwi 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;
- 
diff --git a/net-mgmt/send/files/patch-Makefile.config b/net-mgmt/send/files/patch-Makefile.config
deleted file mode 100644
index 98912bf31b40..000000000000
--- a/net-mgmt/send/files/patch-Makefile.config
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.config.orig
-+++ Makefile.config
-@@ -4,8 +4,8 @@
- #
- 
- # Uncomment the line for your OS
--OS=linux
--#OS=freebsd
-+#OS=linux
-+OS=freebsd
- 
- # Linux only: Where is your linux kernel source?
- # Ignored for non-Linux
-@@ -19,7 +19,7 @@
- #CC=gcc-4.0
- 
- # Where to install
--prefix=/usr
-+prefix=%%PREFIX%%
- 
- # Set to "y" to build MT versions of sendd and cgatool
- USE_THREADS=n
diff --git a/net-mgmt/send/files/patch-examples_ipext_ipext__verify.conf b/net-mgmt/send/files/patch-examples_ipext_ipext__verify.conf
deleted file mode 100644
index d2fe9ebf5b0f..000000000000
--- a/net-mgmt/send/files/patch-examples_ipext_ipext__verify.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- examples/ipext/ipext_verify.conf.orig
-+++ examples/ipext/ipext_verify.conf
-@@ -5,7 +5,7 @@
-   }
- }
- files {
--  trustedcert /usr/src/send_0.1/examples/ipext/ca/cert_ipext.pem;
--  trustedcert /usr/src/send_0.1/examples/ipext/lvl1/cert_ipext.pem;
--  certfile /usr/src/send_0.1/examples/ipext/ar1/cert_ipext.pem;
-+  trustedcert %%PREFIX%%/etc/sendd/ca/cert_ipext.pem;
-+  trustedcert %%PREFIX%%/etc/sendd/lvl1/cert_ipext.pem;
-+  certfile %%PREFIX%%/etc/sendd/ar1/cert_ipext.pem;
- }
diff --git a/net-mgmt/send/files/patch-examples_params.conf b/net-mgmt/send/files/patch-examples_params.conf
deleted file mode 100644
index 0636f3378479..000000000000
--- a/net-mgmt/send/files/patch-examples_params.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- examples/params.conf.orig
-+++ examples/params.conf
-@@ -2,8 +2,8 @@
- # Some (somewhat nonsensical) examples
- 
- named default {
--	snd_cga_params /etc/sendd/cga.params;
--	snd_cga_priv /etc/sendd/key.pem;
-+	snd_cga_params %%PREFIX%%/etc/sendd/cga.params;
-+	snd_cga_priv %%PREFIX%%/etc/sendd/key.pem;
- 	snd_cga_sec 1;
- }
- 
-@@ -20,14 +20,14 @@
- }
- 
- named foo {
--	snd_cga_params /etc/sendd/cga.params;
--	snd_cga_priv /etc/sendd/key.pem;
-+	snd_cga_params %%PREFIX%%/etc/sendd/cga.params;
-+	snd_cga_priv %%PREFIX%%/etc/sendd/key.pem;
- 	snd_cga_sec 1;
- }
- 
- address fe80::2421:cd21:6930:22fb {
--	snd_cga_params /etc/sendd/cga.params;
--	snd_cga_priv /etc/sendd/key.pem;
-+	snd_cga_params %%PREFIX%%/etc/sendd/cga.params;
-+	snd_cga_priv %%PREFIX%%/etc/sendd/key.pem;
- 	snd_cga_sec 1;
- 	interface eth0;
- }
diff --git a/net-mgmt/send/files/patch-examples_sendd.conf b/net-mgmt/send/files/patch-examples_sendd.conf
deleted file mode 100644
index 93e4519c9627..000000000000
--- a/net-mgmt/send/files/patch-examples_sendd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- examples/sendd.conf.orig
-+++ examples/sendd.conf
-@@ -6,7 +6,7 @@
- # The path of the file containing this host's CGA parameters
- # configuration file
- # <no default>
--snd_cga_params=/etc/sendd/params.conf
-+snd_cga_params=%%PREFIX%%/etc/sendd/params.conf
- 
- #
- # Optional
-@@ -16,7 +16,7 @@
- # or a router) you must set this to the file containing certificate
- # information.
- # <no default>
--# snd_pkixip_conf=/etc/sendd/ipext.conf
-+# snd_pkixip_conf=%%PREFIX%%/etc/sendd/ipext.conf
- 
- # Accept secured RAs without PKIX IP extensions
- # <default = no>
diff --git a/net-mgmt/send/files/patch-sendd-os-Makefile b/net-mgmt/send/files/patch-sendd-os-Makefile
new file mode 100644
index 000000000000..d44f1ae2c623
--- /dev/null
+++ b/net-mgmt/send/files/patch-sendd-os-Makefile
@@ -0,0 +1,23 @@
+--- sendd/os/Makefile.orig	2010-08-28 17:58:04.000000000 +0900
++++ sendd/os/Makefile	2010-12-20 15:14:58.000000000 +0900
+@@ -1,13 +1,15 @@
+ 
+ OBJS += os/addr.o os/snd_freebsd.o os-linux/rand.o
+-CPPFLAGS +=	-I/usr/local/include
++CPPFLAGS +=	-I${LOCALBASE}/include
+ 
+-OSLIBS= -L/usr/local/lib -l$(DNET)
++OSLIBS= -L${LOCALBASE}/lib -l$(DNET)
+ 
+ OSEXTRA= os/sendd
+-EXTRAINSTALL= /usr/local/etc/rc.d/sendd
++EXTRAINSTALL= ${PREFIX}/etc/rc.d/sendd
+ EXTRAUNINSTALL=$(EXTRAINSTALL)
+ 
+ /usr/local/etc/rc.d/%: os/%
+-	install $< $@
+-
++	touch $@
++	chmod 0555 $@
++	chown root:wheel $@
++	sed -e s,%%PREFIX%%,${PREFIX},g < $< > $@
diff --git a/net-mgmt/send/files/patch-sendd-os-sendd b/net-mgmt/send/files/patch-sendd-os-sendd
new file mode 100644
index 000000000000..026b50774365
--- /dev/null
+++ b/net-mgmt/send/files/patch-sendd-os-sendd
@@ -0,0 +1,13 @@
+--- sendd/os/sendd.orig	2010-08-28 17:58:04.000000000 +0900
++++ sendd/os/sendd	2010-12-20 15:10:58.000000000 +0900
+@@ -37,8 +37,8 @@
+ 
+ name="sendd"
+ rcvar=`set_rcvar`
+-command="/usr/local/sbin/${name}"
+-required_files="/usr/local/etc/${name}.conf"
++command="%%PREFIX%%/sbin/${name}"
++required_files="%%PREFIX%%/etc/${name}/${name}.conf"
+ 
+ load_rc_config $name
+ run_rc_command "$1"
diff --git a/net-mgmt/send/files/patch-sendd_os-freebsd_Makefile b/net-mgmt/send/files/patch-sendd_os-freebsd_Makefile
deleted file mode 100644
index ef5130cb8253..000000000000
--- a/net-mgmt/send/files/patch-sendd_os-freebsd_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- sendd/os-freebsd/Makefile.orig
-+++ sendd/os-freebsd/Makefile
-@@ -1,12 +1,13 @@
- 
- OBJS += os/addr.o os/snd_freebsd.o os/netgraph.o os-linux/rand.o
-+CPPFLAGS +=	-I%%LOCALBASE%%/include
- 
--OSLIBS= -lnetgraph -l$(DNET)
-+OSLIBS= -lnetgraph -L%%LOCALBASE%%/lib -l$(DNET)
- 
- OSEXTRA= os/sendd
--EXTRAINSTALL= /etc/rc.d/sendd
-+EXTRAINSTALL= %%PREFIX%%/etc/rc.d/sendd
- EXTRAUNINSTALL=$(EXTRAINSTALL)
- 
--/etc/rc.d/%: os/%
-+%%PREFIX%%/etc/rc.d/%: os/%
- 	install $< $@
- 
diff --git a/net-mgmt/send/files/patch-sendd_os-freebsd_sendd b/net-mgmt/send/files/patch-sendd_os-freebsd_sendd
deleted file mode 100644
index 0d3700bff16d..000000000000
--- a/net-mgmt/send/files/patch-sendd_os-freebsd_sendd
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- sendd/os-freebsd/sendd.orig
-+++ sendd/os-freebsd/sendd
-@@ -37,8 +37,8 @@
- 
- name="sendd"
- rcvar=`set_rcvar`
--command="/usr/sbin/${name}"
--required_files="/etc/${name}.conf"
-+command="%%PREFIX%%/sbin/${name}"
-+required_files="%%PREFIX%%/etc/${name}.conf"
- 
- load_rc_config $name
- run_rc_command "$1"
diff --git a/net-mgmt/send/files/patch-sendd_sendd__local.h b/net-mgmt/send/files/patch-sendd_sendd__local.h
deleted file mode 100644
index 4ad425c6d32b..000000000000
--- a/net-mgmt/send/files/patch-sendd_sendd__local.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- sendd/sendd_local.h.orig
-+++ sendd/sendd_local.h
-@@ -41,7 +41,7 @@
- #include <openssl/sha.h>
- 
- #define	SENDD_NAME	"sendd"
--#define	SNDD_CONF_FILE	"/etc/sendd.conf"
-+#define	SNDD_CONF_FILE	"%%PREFIX%%/etc/sendd/sendd.conf"
- 
- #define	SND_HASH_SZ	7
- 
diff --git a/net-mgmt/send/files/pkg-message.in b/net-mgmt/send/files/pkg-message.in
index d00d51897c79..3191d44b9680 100644
--- a/net-mgmt/send/files/pkg-message.in
+++ b/net-mgmt/send/files/pkg-message.in
@@ -3,7 +3,3 @@ To run sendd from startup, add sendd_enable="YES"
 in your /etc/rc.conf.
 Configiration options can be found in %%PREFIX%%/etc/sendd
 -------------------------------------------------------------------------------
-In order to proper working of Secure Neighbor Discovery Daemon
-enable following kernel options:
-NETGRAPH, NETGRAPH_BPF, NETGRAPH_ETHER, NETGRAPH_SOCKET
--------------------------------------------------------------------------------
diff --git a/net-mgmt/send/pkg-descr b/net-mgmt/send/pkg-descr
index 9fe8e3af3e57..c0ea7d33747a 100644
--- a/net-mgmt/send/pkg-descr
+++ b/net-mgmt/send/pkg-descr
@@ -1,15 +1,14 @@
-DoCoMo's Open Source SEND project provides an implementation of
-RFC3971 Secure Neighbor Discovery (SEND). SEND cryptographically
-secures the IPv6 neighbor discovery protocol, countering the threats
-discussed in RFC3756 (IPv6 Neighbor Discovery (ND) Trust Models and
-Threats).
+SEND is the implementation of RFC3971 Secure Neighbor Discovery
+(SEND). SEND cryptographically secures the IPv6 neighbor discovery
+protocol, countering the threats discussed in RFC3756 (IPv6 Neighbor
+Discovery (ND) Trust Models and Threats).
 
-DoCoMo's SEND is implemented completely in user space, so it is
-portable and lends itself to experimentation. It currently runs on
-Linux (tested on 2.6 kernels) and FreeBSD (tested on 5.4).
+The implementation is a new version of DoCoMo's SEND (send_0.2) that
+was implemented completely in user space. Novelty in send_0.3 is the
+native SEND API that avoids the need for the use of netgraph and BPF,
+which makes send_0.3 portable over different BSD platforms and
+significantlly more efficient.
 
 Also included in the distribution are implementations of RFC3972
 Cryptographically Generated Addresses (CGAs) and RFC3779 X.509
 Extensions for IP Addresses and AS Identifiers.
-
-WWW: http://www.docomolabs-usa.com/lab_osrc_guide.html
diff --git a/net-mgmt/send/pkg-plist b/net-mgmt/send/pkg-plist
index 79eb1557a809..d725ebdc3a62 100644
--- a/net-mgmt/send/pkg-plist
+++ b/net-mgmt/send/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 sbin/cgatool
 sbin/ipexttool
 sbin/sendd
@@ -5,4 +6,5 @@ etc/rc.d/sendd
 etc/sendd/sendd.conf-dist
 etc/sendd/params.conf-dist
 etc/sendd/ipext.conf-dist
+etc/sendd/ipext_verify.conf-dist
 @dirrmtry etc/sendd