svn commit: r317237 - in head/net/v6eval: . files
Hiroki Sato
hrs at FreeBSD.org
Fri May 3 20:28:17 UTC 2013
Author: hrs
Date: Fri May 3 20:28:15 2013
New Revision: 317237
URL: http://svnweb.freebsd.org/changeset/ports/317237
Log:
- Update to 3.3.2.
- Add LICENSE.
- Mark MAKE_JOBS_SAFE.
Added:
head/net/v6eval/files/patch-lib_pkt_Makefile (contents, props changed)
Deleted:
head/net/v6eval/files/patch-Bpfilter.h
head/net/v6eval/files/patch-McIKE.h
head/net/v6eval/files/patch-MvFunction.cc
head/net/v6eval/files/patch-RAFControl.h
head/net/v6eval/files/patch-hmac.c
head/net/v6eval/files/patch-lib_Cm_BtObject.cc
head/net/v6eval/files/patch-sigcomp.c
head/net/v6eval/files/patch-x509dec.c
Modified:
head/net/v6eval/Makefile
head/net/v6eval/distinfo
head/net/v6eval/files/patch-lib_Cm_CmMain.cc
head/net/v6eval/pkg-plist
Modified: head/net/v6eval/Makefile
==============================================================================
--- head/net/v6eval/Makefile Fri May 3 20:26:49 2013 (r317236)
+++ head/net/v6eval/Makefile Fri May 3 20:28:15 2013 (r317237)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= v6eval
-PORTVERSION= 3.0.1
-PORTREVISION= 3
+PORTVERSION= 3.3.2
PORTEPOCH= 1
CATEGORIES= net ipv6
MASTER_SITES= http://www.tahi.org/release/v6eval/
@@ -11,17 +10,21 @@ MASTER_SITES= http://www.tahi.org/releas
MAINTAINER= hrs at FreeBSD.org
COMMENT= IPv6 Conformance Test Platform
+LICENSE= BSD
+LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+
RUN_DEPENDS= ${SITE_PERL}/Expect.pm:${PORTSDIR}/lang/p5-Expect
USE_PERL5= yes
USE_OPENSSL= yes
+MAKE_JOBS_SAFE= yes
+SUB_FILES= pkg-message
+
NO_MANCOMPRESS= yes
MAN1PREFIX= ${PREFIX}/v6eval
-MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX= ${LOCALBASE}/lib/perl5/${PERL_VERSION}
MAN1= pktctl.1.gz pktsend.1.gz
MAN3= V6evalRemote.3 V6evalTool.3
-MAKE_JOBS_UNSAFE= yes
-SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
@@ -29,10 +32,6 @@ SUB_FILES= pkg-message
RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5
.endif
-#.if ${OSVERSION} > 900007
-#BROKEN= fails to build with new utmpx
-#.endif
-
post-install:
@${CAT} ${PKGMESSAGE}
Modified: head/net/v6eval/distinfo
==============================================================================
--- head/net/v6eval/distinfo Fri May 3 20:26:49 2013 (r317236)
+++ head/net/v6eval/distinfo Fri May 3 20:28:15 2013 (r317237)
@@ -1,2 +1,2 @@
-SHA256 (v6eval-3.0.1.tar.gz) = 839594793ef9c41929449d6b92a5375775e5c6196bf3394b1043d3d9e6170332
-SIZE (v6eval-3.0.1.tar.gz) = 407851
+SHA256 (v6eval-3.3.2.tar.gz) = bb9ba46631917c2b95d490c4248238145d6df743dfadbb3862daa68e7fb712f4
+SIZE (v6eval-3.3.2.tar.gz) = 426871
Modified: head/net/v6eval/files/patch-lib_Cm_CmMain.cc
==============================================================================
--- head/net/v6eval/files/patch-lib_Cm_CmMain.cc Fri May 3 20:26:49 2013 (r317236)
+++ head/net/v6eval/files/patch-lib_Cm_CmMain.cc Fri May 3 20:28:15 2013 (r317237)
@@ -1,9 +1,10 @@
---- lib/Cm/CmMain.cc.orig 2003-10-23 13:37:30.000000000 +0900
-+++ lib/Cm/CmMain.cc 2013-03-06 04:38:49.000000000 +0900
-@@ -47,7 +47,11 @@
+--- lib/Cm/CmMain.cc.orig 2009-08-27 09:10:04.000000000 +0900
++++ lib/Cm/CmMain.cc 2013-05-04 04:59:43.000000000 +0900
+@@ -48,13 +48,17 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
++#include <sys/param.h>
+#if __FreeBSD_version <= 900006
#include <utmp.h>
+#else
@@ -12,12 +13,49 @@
#include <time.h>
#include <pwd.h>
#include <sys/time.h>
-@@ -129,7 +133,7 @@
+ #include <sys/types.h>
+ #include <sys/resource.h>
+-#include <sys/param.h>
+ extern int causeStopSignals[];
+ static int stopSingals[]={SIGINT,SIGQUIT,SIGTERM,0};
+ extern void applicationMain(CmMain*);
+@@ -129,21 +133,37 @@
+
//----------------------------------------------------------------------
// ¾ã³²²òÀϾðÊóºîÀ®
++#if __FreeBSD_version <= 900006
static struct utmp *myUtmpEnt(FILE *in,struct utmp *u) {
- int s=ttyslot();
+ int s = 0;
if(s<0||fseek(in,sizeof(struct utmp)*s,0)<0||
fread(u,sizeof(struct utmp),1,in)==0) {return 0;}
return u;}
+ void CmMain::makeCatch2Eye(STR p) {
+ static char catch2[]=" on %*.*s:%-*.*s from %*.*s";
+ struct utmp ux[1], *u; FILE *in;
+- if((in=fopen("/etc/utmp","r"))==NULL) {return;}
++ if((in=fopen(_PATH_UTMP,"r"))==NULL) {return;}
+ u=myUtmpEnt(in,ux); fclose(in);
+ if(!u) {return;}
+ #define A(a)sizeof(a),sizeof(a),a
+ sprintf(p,catch2,A(u->ut_line),A(u->ut_name),A(u->ut_host));
+ #undef A
+ return;}
++#else
++void CmMain::makeCatch2Eye(STR p) {
++static char catch2[]=" on %*.*s:%-*.*s from %*.*s";
++ struct utmpx ux, *u;
++ memset(&ux, 0, sizeof(ux));
++ ux.ut_type = USER_PROCESS;
++ snprintf(ux.ut_user, sizeof(ux.ut_user), "%d", getuid());
++ u = getutxuser(ux.ut_user);
++ if (u == NULL)
++ return;
++#define A(a)sizeof(a),sizeof(a),a
++ sprintf(p, catch2, A(u->ut_line), A(u->ut_user), A(u->ut_host));
++#undef A
++ return;}
++#endif
+ void CmMain::makeCatchEye(const STR pgmName) {
+ static char catch1[]="@(#) %02d/%02d/%02d %02d:%02d:%02d %s STARTED by %s@%s";
+ time_t now=time(0); struct tm *m=localtime(&now);
Added: head/net/v6eval/files/patch-lib_pkt_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_pkt_Makefile Fri May 3 20:28:15 2013 (r317237)
@@ -0,0 +1,12 @@
+--- lib/pkt/Makefile.orig 2013-05-04 05:06:29.000000000 +0900
++++ lib/pkt/Makefile 2013-05-04 05:06:32.000000000 +0900
+@@ -5,6 +5,9 @@
+ BpfAgent.cc Bpfilter.cc Ringbuf.cc RunEnv.cc PktCtlClient.cc \
+ PktSndClient.cc PktRcvClient.cc PktBuf.cc PktQueue.cc bufStat.cc
+
++LxLexer.o: PzParse.h
++PzParse.h: PzParse.cc
++
+ CXXFLAGS+= -I. -I$(Cm) -I$(Pz) -DHAVE_BPF_HDRCMPLT -I/usr/include
+ # CXXFLAGS+= -DVCLEAR_DBG
+
Modified: head/net/v6eval/pkg-plist
==============================================================================
--- head/net/v6eval/pkg-plist Fri May 3 20:26:49 2013 (r317236)
+++ head/net/v6eval/pkg-plist Fri May 3 20:28:15 2013 (r317237)
@@ -5,6 +5,7 @@ v6eval/bin/checker
v6eval/bin/dhcomp
v6eval/bin/dhgen
v6eval/bin/file2hex
+v6eval/bin/indexgen
v6eval/bin/ivcomp
v6eval/bin/manual/cleardefr.rmt
v6eval/bin/manual/clearmtu.rmt
@@ -12,6 +13,7 @@ v6eval/bin/manual/clearnc.rmt
v6eval/bin/manual/clearprefix.rmt
v6eval/bin/manual/clearroute.rmt
v6eval/bin/manual/dhcp6c.rmt
+v6eval/bin/manual/dhcp6r.rmt
v6eval/bin/manual/dhcp6s.rmt
v6eval/bin/manual/igmpv3.rmt
v6eval/bin/manual/igmpv3config.rmt
@@ -36,6 +38,13 @@ v6eval/bin/manual/mip6EnableCN.rmt
v6eval/bin/manual/mip6EnableHA.rmt
v6eval/bin/manual/mip6EnableMN.rmt
v6eval/bin/manual/mldv2.rmt
+v6eval/bin/manual/mldv2DisableHUT.rmt
+v6eval/bin/manual/mldv2DisableRUT.rmt
+v6eval/bin/manual/mldv2EnableHUT.rmt
+v6eval/bin/manual/mldv2EnableRUT.rmt
+v6eval/bin/manual/mldv2ListenerAPI.rmt
+v6eval/bin/manual/mldv2SetHUT.rmt
+v6eval/bin/manual/mldv2SetRUT.rmt
v6eval/bin/manual/mldv2config.rmt
v6eval/bin/manual/mtuconfig.rmt
v6eval/bin/manual/multicastConfig.rmt
@@ -62,12 +71,14 @@ v6eval/bin/pktrecv
v6eval/bin/pktsend
v6eval/bin/prfcomp
v6eval/bin/sigcomp
+v6eval/bin/x509dec
v6eval/bin/unknown/cleardefr.rmt
v6eval/bin/unknown/clearmtu.rmt
v6eval/bin/unknown/clearnc.rmt
v6eval/bin/unknown/clearprefix.rmt
v6eval/bin/unknown/clearroute.rmt
v6eval/bin/unknown/dhcp6c.rmt
+v6eval/bin/unknown/dhcp6r.rmt
v6eval/bin/unknown/dhcp6s.rmt
v6eval/bin/unknown/igmpv3.rmt
v6eval/bin/unknown/igmpv3config.rmt
@@ -111,7 +122,6 @@ v6eval/bin/unknown/sysctl.rmt
v6eval/bin/unknown/tcp6.rmt
v6eval/bin/unknown/tunnel.rmt
v6eval/bin/unknown/useTempAddr.rmt
-v6eval/bin/x509dec
v6eval/doc/00README
v6eval/doc/00README.v6eval
v6eval/doc/CHANGELOG
@@ -128,12 +138,12 @@ v6eval/include/stdpacket.def
@dirrm v6eval/bin/manual
@dirrm v6eval/bin/unknown
@dirrm v6eval/bin
- at dirrm v6eval/doc
+ at dirrmtry v6eval/doc
@dirrm v6eval/include
@dirrm v6eval/man/man1
@dirrm v6eval/man
@dirrmtry v6eval/etc
- at dirrm v6eval
+ at dirrmtry v6eval
%%SITE_PERL%%/V6evalCommon.pm
%%SITE_PERL%%/V6evalRemote.pm
%%SITE_PERL%%/V6evalTool.pm
More information about the svn-ports-all
mailing list