diff options
Diffstat (limited to 'net/v6eval/files')
23 files changed, 0 insertions, 509 deletions
diff --git a/net/v6eval/files/patch-Makefile b/net/v6eval/files/patch-Makefile deleted file mode 100644 index 96ea06028b79..000000000000 --- a/net/v6eval/files/patch-Makefile +++ /dev/null @@ -1,38 +0,0 @@ ---- Makefile.orig 2005-05-25 11:46:16.000000000 +0900 -+++ Makefile 2013-06-17 02:10:06.000000000 +0900 -@@ -1,24 +1,26 @@ - SUBDIR=lib bin etc script include --PREFIX= /usr/local/v6eval -+PREFIX?= /usr/local - DOCFILES=00README INSTALL CHANGELOG \ -- 00README.v6eval INSTALL.v6eval CHANGELOG.v6eval \ -- COPYRIGHT -+ 00README.v6eval INSTALL.v6eval CHANGELOG.v6eval INSTALL.dummies - --DIRS= $(PREFIX) $(PREFIX)/bin $(PREFIX)/man $(PREFIX)/doc -+DIRS= $(PREFIX)/v6eval \ -+ $(PREFIX)/v6eval/bin \ -+ $(PREFIX)/v6eval/man \ -+ $(PREFIX)/v6eval/doc - #SECTIONS= 1 2 3 4 5 6 7 8 9 n - SECTIONS= 1 - .MAIN: depend all - beforeinstall: - for i in $(DIRS); do \ -- [ -d $$i ] || mkdir $$i; \ -+ [ -d $$i ] || install -d -m 555 $$i; \ - done - # for i in $(SECTIONS); do \ --# [ -d $(PREFIX)/man/man$$i ] || mkdir $(PREFIX)/man/man$$i; \ --# [ -d $(PREFIX)/man/cat$$i ] || mkdir $(PREFIX)/man/cat$$i; \ -+# [ -d $(PREFIX)/v6eval/man/man$$i ] || mkdir $(PREFIX)/v6eval/man/man$$i; \ -+# [ -d $(PREFIX)/v6eval/man/cat$$i ] || mkdir $(PREFIX)/v6eval/man/cat$$i; \ - # done - for i in $(SECTIONS); do \ -- [ -d $(PREFIX)/man/man$$i ] || mkdir $(PREFIX)/man/man$$i; \ -+ [ -d $(PREFIX)/v6eval/man/man$$i ] || mkdir $(PREFIX)/v6eval/man/man$$i; \ - done -- install -c -o bin -g bin -m 444 $(DOCFILES) $(PREFIX)/doc -+ ${BSD_INSTALL_DATA} $(DOCFILES) $(PREFIX)/v6eval/doc - - .include <bsd.subdir.mk> diff --git a/net/v6eval/files/patch-bin-remotes-Makefile b/net/v6eval/files/patch-bin-remotes-Makefile deleted file mode 100644 index 06aa2480ad93..000000000000 --- a/net/v6eval/files/patch-bin-remotes-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- bin/remotes/Makefile.orig 2013-06-17 00:08:29.000000000 +0900 -+++ bin/remotes/Makefile 2013-06-17 00:17:24.000000000 +0900 -@@ -46,13 +46,13 @@ - SUBDIR= unknown \ - manual - --PREFIX=/usr/local/v6eval -+PREFIX?=/usr/local - DOCFILES=00README - - depend: - - afterinstall: -- install -d -o bin -g bin -m 755 $(PREFIX)/bin -- install -c -o bin -g bin -m 444 $(DOCFILES) $(PREFIX)/bin/ -+ install -d -m 555 $(PREFIX)/v6eval/bin -+ ${BSD_INSTALL_DATA} $(DOCFILES) $(PREFIX)/v6eval/bin/ - - .include <bsd.subdir.mk> diff --git a/net/v6eval/files/patch-bin-remotes-manual-Makefile b/net/v6eval/files/patch-bin-remotes-manual-Makefile deleted file mode 100644 index 1454b0a858ce..000000000000 --- a/net/v6eval/files/patch-bin-remotes-manual-Makefile +++ /dev/null @@ -1,23 +0,0 @@ ---- bin/remotes/manual/Makefile.orig 2009-11-25 16:50:24.000000000 +0900 -+++ bin/remotes/manual/Makefile 2013-06-17 00:39:02.000000000 +0900 -@@ -41,8 +41,8 @@ - # THE POSSIBILITY OF SUCH DAMAGE. - # - --PREFIX=/usr/local/v6eval --RMTDIR=$(PREFIX)/bin/manual -+PREFIX?=/usr/local -+RMTDIR=$(PREFIX)/v6eval/bin/manual - REMOTES= cleardefr.rmt \ - clearmtu.rmt \ - clearnc.rmt \ -@@ -106,6 +106,6 @@ - clean: - - install: -- install -d -o bin -g bin -m 755 $(PREFIX)/bin -- install -d -o bin -g bin -m 755 $(RMTDIR) -- install -c -o bin -g bin -m 555 $(REMOTES) $(RMTDIR) -+ install -d -m 555 $(PREFIX)/v6eval/bin -+ install -d -m 555 $(RMTDIR) -+ ${BSD_INSTALL_SCRIPT} $(REMOTES) $(RMTDIR) diff --git a/net/v6eval/files/patch-bin-remotes-unknown-Makefile b/net/v6eval/files/patch-bin-remotes-unknown-Makefile deleted file mode 100644 index 180a6bd8988c..000000000000 --- a/net/v6eval/files/patch-bin-remotes-unknown-Makefile +++ /dev/null @@ -1,23 +0,0 @@ ---- bin/remotes/unknown/Makefile.orig 2005-11-10 12:54:12.000000000 +0900 -+++ bin/remotes/unknown/Makefile 2013-06-17 00:39:47.000000000 +0900 -@@ -43,8 +43,8 @@ - - PRODUCT=unknown - --PREFIX=/usr/local/v6eval --RMTDIR=$(PREFIX)/bin/$(PRODUCT) -+PREFIX?=/usr/local -+RMTDIR=$(PREFIX)/v6eval/bin/$(PRODUCT) - REMOTES= cleardefr.rmt \ - clearmtu.rmt \ - clearnc.rmt \ -@@ -101,6 +101,6 @@ - clean: - - install: -- install -d -o bin -g bin -m 755 $(PREFIX)/bin -- install -d -o bin -g bin -m 755 $(RMTDIR) -- install -c -o bin -g bin -m 555 $(REMOTES) $(RMTDIR) -+ install -d -m 555 $(PREFIX)/v6eval/bin -+ install -d -m 555 $(RMTDIR) -+ ${BSD_INSTALL_SCRIPT} $(REMOTES) $(RMTDIR) diff --git a/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc b/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc deleted file mode 100644 index 381f366b98a6..000000000000 --- a/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- bin/dhcomp/dhcomp.cc.orig 2013-06-16 10:59:39.000000000 +0900 -+++ bin/dhcomp/dhcomp.cc 2013-06-16 11:00:26.000000000 +0900 -@@ -315,14 +315,14 @@ - memcpy(&pSharedKey[iSharedKeyLen - l], pSharedKeyStock, l); - - #ifdef TAHI -- printf("log:DHComp_Results (length:%i)\n", -- xflag? iSharedKeyLen: strlen(pSharedKey)); -- printf("log:| Shared_Key (length:%i)\n", -- xflag? iSharedKeyLen: strlen(pSharedKey)); -+ printf("log:DHComp_Results (length:%zu)\n", -+ xflag? (size_t)iSharedKeyLen: strlen(pSharedKey)); -+ printf("log:| Shared_Key (length:%zu)\n", -+ xflag? (size_t)iSharedKeyLen: strlen(pSharedKey)); - xflag? xPrintResult(pSharedKey): PrintResult(pSharedKey); - #else // TAHI -- printf("log:DHComp_Results (length:%i)\n", strlen(pSharedKey)); -- printf("log:| Shared_Key (length:%i)\n", strlen(pSharedKey)); -+ printf("log:DHComp_Results (length:%zu)\n", strlen(pSharedKey)); -+ printf("log:| Shared_Key (length:%zu)\n", strlen(pSharedKey)); - PrintResult(pSharedKey); - #endif // TAHI - diff --git a/net/v6eval/files/patch-bin_dhgen_dhgen.cc b/net/v6eval/files/patch-bin_dhgen_dhgen.cc deleted file mode 100644 index 3e715de32e96..000000000000 --- a/net/v6eval/files/patch-bin_dhgen_dhgen.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- bin/dhgen/dhgen.cc.orig 2013-06-16 10:57:08.000000000 +0900 -+++ bin/dhgen/dhgen.cc 2013-06-16 10:59:01.000000000 +0900 -@@ -233,21 +233,21 @@ - } - - #ifdef TAHI -- printf("log:DHGen_Results (length:%i)\n", -+ printf("log:DHGen_Results (length:%zu)\n", - xflag? -- BN_num_bytes(pDH->pub_key) + -- BN_num_bytes(pDH->priv_key): -+ (size_t)(BN_num_bytes(pDH->pub_key) + -+ BN_num_bytes(pDH->priv_key)): - strlen(pPubKey) + strlen(pPrivKey)); - #else // TAHI -- printf("log:DHGen_Results (length:%i)\n", strlen(pPubKey) + strlen(pPrivKey)); -+ printf("log:DHGen_Results (length:%zu)\n", strlen(pPubKey) + strlen(pPrivKey)); - #endif // TAHI - #ifdef TAHI -- printf("log:| Public_Key (length:%i)\n", -+ printf("log:| Public_Key (length:%zu)\n", - xflag? -- BN_num_bytes(pDH->pub_key): -+ (size_t)BN_num_bytes(pDH->pub_key): - strlen(pPubKey)); - #else // TAHI -- printf("log:| Public_Key (length:%i)\n", strlen(pPubKey)); -+ printf("log:| Public_Key (length:%zu)\n", strlen(pPubKey)); - #endif // TAHI - #ifdef TAHI - xflag? xPrintResult(pPubKey): PrintResult(pPubKey); -@@ -255,12 +255,12 @@ - PrintResult(pPubKey); - #endif // TAHI - #ifdef TAHI -- printf("log:| Private_Key (length:%i)\n", -+ printf("log:| Private_Key (length:%zu)\n", - xflag? -- BN_num_bytes(pDH->priv_key): -+ (size_t)BN_num_bytes(pDH->priv_key): - strlen(pPrivKey)); - #else // TAHI -- printf("log:| Private_Key (length:%i)\n", strlen(pPrivKey)); -+ printf("log:| Private_Key (length:%zu)\n", strlen(pPrivKey)); - #endif // TAHI - #ifdef TAHI - xflag? xPrintResult(pPrivKey): PrintResult(pPrivKey); diff --git a/net/v6eval/files/patch-bin_sigcomp_sigcomp.c b/net/v6eval/files/patch-bin_sigcomp_sigcomp.c deleted file mode 100644 index 127af9bfbc5b..000000000000 --- a/net/v6eval/files/patch-bin_sigcomp_sigcomp.c +++ /dev/null @@ -1,12 +0,0 @@ ---- bin/sigcomp/sigcomp.c.orig 2008-04-03 09:34:43.000000000 +0900 -+++ bin/sigcomp/sigcomp.c 2013-06-16 11:06:24.000000000 +0900 -@@ -57,6 +57,9 @@ - - #include <openssl/rsa.h> - -+#ifdef OPENSSL_NO_MD2 -+const EVP_MD *EVP_md2(void); -+#endif - - #ifdef DEBUG - #ifndef dbg diff --git a/net/v6eval/files/patch-etc-Makefile b/net/v6eval/files/patch-etc-Makefile deleted file mode 100644 index 710e6dae8262..000000000000 --- a/net/v6eval/files/patch-etc-Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- etc/Makefile.orig 2013-06-17 00:07:30.000000000 +0900 -+++ etc/Makefile 2013-06-17 00:18:09.000000000 +0900 -@@ -43,15 +43,15 @@ - # Makefile for sample config file - # - --PREFIX=/usr/local/v6eval --ETCDIR=$(PREFIX)/etc -+PREFIX?=/usr/local -+ETCDIR=$(PREFIX)/v6eval/etc - SAMPLE=tn.def.sample nut.def.sample - - all: - - install: -- install -d -o bin -g bin -m 755 $(ETCDIR) -- install -c -o bin -g bin -m 644 $(SAMPLE) $(ETCDIR) -+ install -d -m 555 $(ETCDIR) -+ ${BSD_INSTALL_DATA} $(SAMPLE) $(ETCDIR) - - depend: - diff --git a/net/v6eval/files/patch-include-Makefile b/net/v6eval/files/patch-include-Makefile deleted file mode 100644 index ff80dac0e4d7..000000000000 --- a/net/v6eval/files/patch-include-Makefile +++ /dev/null @@ -1,27 +0,0 @@ ---- include/Makefile.orig 2013-06-17 00:06:14.000000000 +0900 -+++ include/Makefile 2013-06-17 00:18:39.000000000 +0900 -@@ -45,17 +45,17 @@ - # Makefile for standard definition file - # - --PREFIX=/usr/local/v6eval --INCLUDEDIR=$(PREFIX)/include/ -+PREFIX?=/usr/local -+INCLUDEDIR=$(PREFIX)/v6eval/include/ - - all: - - install: -- install -d -o bin -g bin -m 755 $(INCLUDEDIR) -- install -c -o bin -g bin -m 644 std.def $(INCLUDEDIR) -- install -c -o bin -g bin -m 644 stdaddr.def $(INCLUDEDIR) -- install -c -o bin -g bin -m 644 stdpacket.def $(INCLUDEDIR) -- install -c -o bin -g bin -m 644 stdconst.def $(INCLUDEDIR) -+ install -d -m 555 $(INCLUDEDIR) -+ ${BSD_INSTALL_DATA} std.def $(INCLUDEDIR) -+ ${BSD_INSTALL_DATA} stdaddr.def $(INCLUDEDIR) -+ ${BSD_INSTALL_DATA} stdpacket.def $(INCLUDEDIR) -+ ${BSD_INSTALL_DATA} stdconst.def $(INCLUDEDIR) - - depend: - clean: diff --git a/net/v6eval/files/patch-lib_Cm_CmAgent.h b/net/v6eval/files/patch-lib_Cm_CmAgent.h deleted file mode 100644 index 598a2c32bafe..000000000000 --- a/net/v6eval/files/patch-lib_Cm_CmAgent.h +++ /dev/null @@ -1,17 +0,0 @@ ---- lib/Cm/CmAgent.h.orig 2013-06-16 10:41:30.000000000 +0900 -+++ lib/Cm/CmAgent.h 2013-06-16 10:42:30.000000000 +0900 -@@ -46,11 +46,11 @@ - #define _Cm_CmAgent_h_ 1 - /* Interface Definition */ - #include "CmReceiver.h" --struct CmAgent; -+class CmAgent; - typedef int (CmAgent::*agentFunc)(int); - typedef int (CmAgent::*timerFunc)(time_t,uint32_t); --struct CmDispatch; --struct CmAgent:public CmReceiver { -+class CmDispatch; -+class CmAgent:public CmReceiver { - private: - agentFunc readAction_; - agentFunc writeAction_; diff --git a/net/v6eval/files/patch-lib_Cm_CmLexer.h b/net/v6eval/files/patch-lib_Cm_CmLexer.h deleted file mode 100644 index fd7f002c37ff..000000000000 --- a/net/v6eval/files/patch-lib_Cm_CmLexer.h +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/Cm/CmLexer.h.orig 2003-12-04 13:59:47.000000000 +0900 -+++ lib/Cm/CmLexer.h 2013-06-16 10:32:18.000000000 +0900 -@@ -49,10 +49,8 @@ - #include "CmToken.h" - #include <stdio.h> - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 4) -- --const int32_t YYERRCODE=256; -- -+#ifndef YYERRCODE -+#define YYERRCODE 256 - #endif - - class PObject; diff --git a/net/v6eval/files/patch-lib_Cm_CmMain.cc b/net/v6eval/files/patch-lib_Cm_CmMain.cc deleted file mode 100644 index d9f46e37fe09..000000000000 --- a/net/v6eval/files/patch-lib_Cm_CmMain.cc +++ /dev/null @@ -1,61 +0,0 @@ ---- 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 -+#include <utmpx.h> -+#endif - #include <time.h> - #include <pwd.h> - #include <sys/time.h> - #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); diff --git a/net/v6eval/files/patch-lib_Cm_CmMain.h b/net/v6eval/files/patch-lib_Cm_CmMain.h deleted file mode 100644 index 91629ade76a7..000000000000 --- a/net/v6eval/files/patch-lib_Cm_CmMain.h +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Cm/CmMain.h.orig 2013-06-16 10:53:42.000000000 +0900 -+++ lib/Cm/CmMain.h 2013-06-16 10:54:05.000000000 +0900 -@@ -100,7 +100,7 @@ - // 起動時刻 プログラム名 STARTED by 起動ユーザ@起動マシン on - // ttyname:ログインユーザ名 from リモートマシン名 - //---------------------------------------------------------------------- --struct CmMain { -+class CmMain { - private: - static STR applicationName_; // 起動コマンド名 - static char catchStart_[256]; // 障害解析情報 diff --git a/net/v6eval/files/patch-lib_Cm_CmSocket.h b/net/v6eval/files/patch-lib_Cm_CmSocket.h deleted file mode 100644 index 3459ec5e9806..000000000000 --- a/net/v6eval/files/patch-lib_Cm_CmSocket.h +++ /dev/null @@ -1,62 +0,0 @@ ---- lib/Cm/CmSocket.h.orig 2003-10-23 13:37:30.000000000 +0900 -+++ lib/Cm/CmSocket.h 2013-06-16 10:52:19.000000000 +0900 -@@ -147,9 +147,9 @@ - inline int CmSockAddr::length() const {return length_;} - inline sock* CmSockAddr::sockAddr() const {return addr_;} - --struct SocketSet; -+class SocketSet; - //====================================================================== --struct CmSocket:public CmSockAddr { -+class CmSocket:public CmSockAddr { - private: - int fileDesc_; - int syserrno_; -@@ -250,7 +250,7 @@ - - //====================================================================== - // Stream Specific Functions --struct CmStream:public CmSocket { -+class CmStream:public CmSocket { - private: - CmSockAddr* self_; - CmSockAddr* peer_; -@@ -284,7 +284,8 @@ - // Datagram Socket can be used with connect and send/receive, - // and can be specified the receiver when sending or can be given - // the sender when receiving. --struct CmDgram:public CmSocket { -+class CmDgram:public CmSocket { -+public: - CmDgram(int l,const sock* s=0,int fd=-1); - CmDgram(const inSock&,int fd=-1); - CmDgram(const in6Sock&,int fd=-1); -@@ -300,7 +301,8 @@ - - //====================================================================== - // Raw Specific Functions --struct CmRaw:public CmDgram { -+class CmRaw:public CmDgram { -+public: - CmRaw(int l,const sock* s=0,int fd=-1); - virtual int socket(); - virtual CmSocket* create(int,const sock*,int=-1); -@@ -310,7 +312,8 @@ - //====================================================================== - // for Unix Domain Socket - // It can be stream/datagram and any address or pathname. --struct UnixSocket { -+class UnixSocket { -+public: - static CmSocket* stream(); - static CmSocket* stream(CSTR aName); - static CmDgram* datagram(); -@@ -323,7 +326,7 @@ - // for Inet Domain Socket - // It can be stream/datagram and any address or service - // with/without hostname/ipaddress. --struct InetSocket { -+class InetSocket { - static int getService(CSTR serv); - //---------------------------------------------------------------------- - // defaultService is used for debugging. diff --git a/net/v6eval/files/patch-lib_Pz_McIKE.cc b/net/v6eval/files/patch-lib_Pz_McIKE.cc deleted file mode 100644 index 59f72c012389..000000000000 --- a/net/v6eval/files/patch-lib_Pz_McIKE.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/Pz/McIKE.cc.orig 2013-06-16 10:34:07.000000000 +0900 -+++ lib/Pz/McIKE.cc 2013-06-16 10:34:49.000000000 +0900 -@@ -380,7 +380,7 @@ - - if(padlen < sizeof(struct isakmp_gen)) { - fprintf(stderr, -- "err: ISAKMP Pld_ISAKMP decode(%d) " -+ "err: ISAKMP Pld_ISAKMP decode(%zu) " - "over remain size(%d)\n", - sizeof(struct isakmp_gen), padlen); - -@@ -390,7 +390,7 @@ - - if(plen < sizeof(struct isakmp_gen)) { - fprintf(stderr, -- "err: ISAKMP Pld_ISAKMP decode(%d) " -+ "err: ISAKMP Pld_ISAKMP decode(%zu) " - "over ISAKMP PayloadLength(%d)\n", - sizeof(struct isakmp_gen), plen); - diff --git a/net/v6eval/files/patch-lib_Pz_McSNMP.cc b/net/v6eval/files/patch-lib_Pz_McSNMP.cc deleted file mode 100644 index d66c17bc5293..000000000000 --- a/net/v6eval/files/patch-lib_Pz_McSNMP.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Pz/McSNMP.cc.orig 2013-06-16 10:35:43.000000000 +0900 -+++ lib/Pz/McSNMP.cc 2013-06-16 10:36:50.000000000 +0900 -@@ -563,7 +563,7 @@ - COCTSTR s=string(); - for(i=0;i<i9;i++) - printf("%02x",s[i]&0xff); -- printf((tag!=0&&length()>16)?tag:""); -+ printf("%s", (tag!=0&&length()>16)?tag:""); - int a=(int)(s[0]&0xff); - sprintf(tmp, "%d.%d.",(int)(a/40), (int)(a%40)); - /* ASN.1 decode */ diff --git a/net/v6eval/files/patch-lib_Pz_MvFunction.cc b/net/v6eval/files/patch-lib_Pz_MvFunction.cc deleted file mode 100644 index 20a6ba0340d7..000000000000 --- a/net/v6eval/files/patch-lib_Pz_MvFunction.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/Pz/MvFunction.cc.orig 2013-06-16 10:37:30.000000000 +0900 -+++ lib/Pz/MvFunction.cc 2013-06-16 10:38:07.000000000 +0900 -@@ -352,9 +352,9 @@ - uint32_t d = 0; - - for(d = 0; d < buflen; d ++) { -- if((buf[d] < '0') || (buf[d] > '9') && -- (buf[d] < 'A') || (buf[d] > 'F') && -- (buf[d] < 'a') || (buf[d] > 'f')) { -+ if(((buf[d] < '0') || (buf[d] > '9')) && -+ ((buf[d] < 'A') || (buf[d] > 'F')) && -+ ((buf[d] < 'a') || (buf[d] > 'f'))) { - return false; - } - } diff --git a/net/v6eval/files/patch-lib_Pz_PvAction.cc b/net/v6eval/files/patch-lib_Pz_PvAction.cc deleted file mode 100644 index 6f7ecd614328..000000000000 --- a/net/v6eval/files/patch-lib_Pz_PvAction.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Pz/PvAction.cc.orig 2013-06-16 10:39:01.000000000 +0900 -+++ lib/Pz/PvAction.cc 2013-06-16 10:39:29.000000000 +0900 -@@ -55,7 +55,7 @@ - PvAction::~PvAction() {} - void PvAction::print() const { - CSTR s=meta()->string(); -- printf(s);} -+ printf("%s", s);} - - //====================================================================== - PvAUTO::PvAUTO(const MObject* m,CSTR f,int l):PvAction(m,f,l){} diff --git a/net/v6eval/files/patch-lib_pkt_Makefile b/net/v6eval/files/patch-lib_pkt_Makefile deleted file mode 100644 index 624937bf99be..000000000000 --- a/net/v6eval/files/patch-lib_pkt_Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 - diff --git a/net/v6eval/files/patch-lib_pkt_PktClient.h b/net/v6eval/files/patch-lib_pkt_PktClient.h deleted file mode 100644 index 6ccee60436d3..000000000000 --- a/net/v6eval/files/patch-lib_pkt_PktClient.h +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/pkt/PktClient.h.orig 2013-06-16 10:55:15.000000000 +0900 -+++ lib/pkt/PktClient.h 2013-06-16 10:55:31.000000000 +0900 -@@ -46,8 +46,8 @@ - #define __PktClient_h__ 1 - #include "pktDefine.h" - #include "PktRecv.h" --struct CmDispatch; --struct PktClient:public PktReceiver { -+class CmDispatch; -+class PktClient:public PktReceiver { - private: - CmDispatch* dispatch_; - public: diff --git a/net/v6eval/files/patch-sample-Makefile b/net/v6eval/files/patch-sample-Makefile deleted file mode 100644 index 010ff1beb68c..000000000000 --- a/net/v6eval/files/patch-sample-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- sample/Makefile.orig 2013-06-16 23:58:56.000000000 +0900 -+++ sample/Makefile 2013-06-16 23:59:19.000000000 +0900 -@@ -2,7 +2,7 @@ - # Makefile - # - --AUTORUN=../bin/autorun/autorun -+AUTORUN= ${.CURDIR}/../bin/autorun - - check: - $(AUTORUN) -t INDEX diff --git a/net/v6eval/files/patch-script-pmod-V6evalCommon-V6evalCommon.pm b/net/v6eval/files/patch-script-pmod-V6evalCommon-V6evalCommon.pm deleted file mode 100644 index 1e552c6ad704..000000000000 --- a/net/v6eval/files/patch-script-pmod-V6evalCommon-V6evalCommon.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- script/pmod/V6evalCommon/V6evalCommon.pm.orig 2013-06-17 00:13:33.000000000 +0900 -+++ script/pmod/V6evalCommon/V6evalCommon.pm 2013-06-17 00:19:20.000000000 +0900 -@@ -70,7 +70,7 @@ - $path, # path - ) = @_; - ($SeqName,$SeqDir,$SeqSuffix) = fileparse($0,'.seq'); -- $V6EVALPREFIX= "/usr/local/v6eval"; -+ $V6EVALPREFIX= "%%PREFIX%%/v6eval"; - $V6EVALROOT = $path || $ENV{V6EVALROOT} || $V6EVALPREFIX; - $V6EVALBIN = $ENV{V6EVALBIN} || "$V6EVALROOT/bin/"; - $V6EVALETC = $ENV{V6EVALETC} || "./:$V6EVALROOT/etc/"; diff --git a/net/v6eval/files/pkg-message.in b/net/v6eval/files/pkg-message.in deleted file mode 100644 index dd33d696caac..000000000000 --- a/net/v6eval/files/pkg-message.in +++ /dev/null @@ -1,5 +0,0 @@ -=============================================== - - Please read %%PREFIX%%/v6eval/doc/00README. - -=============================================== |