From owner-p4-projects@FreeBSD.ORG  Mon Jun  1 11:05:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 529761065675; Mon,  1 Jun 2009 11:05:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13A2F1065673
	for <perforce@FreeBSD.org>; Mon,  1 Jun 2009 11:05:13 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DB0738FC1C
	for <perforce@FreeBSD.org>; Mon,  1 Jun 2009 11:05:12 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51B5C9F058493
	for <perforce@FreeBSD.org>; Mon, 1 Jun 2009 11:05:12 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51B5COA058491
	for perforce@freebsd.org; Mon, 1 Jun 2009 11:05:12 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Mon, 1 Jun 2009 11:05:12 GMT
Message-Id: <200906011105.n51B5COA058491@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec <anchie@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 163249 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2009 11:05:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=163249

Change 163249 by anchie@anchie_malimis on 2009/06/01 11:04:48

		Patched, ready for compiling.		

Affected files ...

.. //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#2 edit
.. //depot/projects/soc2009/anchie_send/send_0.2/include/pkixip_ext_asn.h#2 edit
.. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#2 edit
.. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/sendd#2 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#2 (text+ko) ====

@@ -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=/usr/local
 
 # Set to "y" to build MT versions of sendd and cgatool
 USE_THREADS=n
@@ -40,8 +40,8 @@
 USE_CONSOLE=y
 
 # Enable for debugging
-#DEBUG_POLICY= DEBUG
-DEBUG_POLICY= NO_DEBUG
+DEBUG_POLICY= DEBUG
+#DEBUG_POLICY= NO_DEBUG
 
 # enable for timestamp output on some crypto operations
 LOG_TIMESTAMP=n

==== //depot/projects/soc2009/anchie_send/send_0.2/include/pkixip_ext_asn.h#2 (text+ko) ====

@@ -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;
@@ -78,6 +79,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;
 

==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#2 (text+ko) ====

@@ -1,7 +1,8 @@
 
 OBJS += os/addr.o os/snd_freebsd.o os/netgraph.o os-linux/rand.o
+CPPFLAGS +=	-I/usr/local/include
 
-OSLIBS= -lnetgraph -l$(DNET)
+OSLIBS= -lnetgraph -L/usr/local/lib -l$(DNET)
 
 OSEXTRA= os/sendd
 EXTRAINSTALL= /etc/rc.d/sendd

==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/sendd#2 (text+ko) ====

@@ -37,8 +37,8 @@
 
 name="sendd"
 rcvar=`set_rcvar`
-command="/usr/sbin/${name}"
-required_files="/etc/${name}.conf"
+command="/usr/local/sbin/${name}"
+required_files="/usr/local/etc/${name}.conf"
 
 load_rc_config $name
 run_rc_command "$1"