svn commit: r321022 - in head/net/v6eval: . files
Hiroki Sato
hrs at FreeBSD.org
Sun Jun 16 02:37:50 UTC 2013
Author: hrs
Date: Sun Jun 16 02:37:46 2013
New Revision: 321022
URL: http://svnweb.freebsd.org/changeset/ports/321022
Log:
- Add patches to fix type mismatch. Bump PORTREVISION becuase some affect
the result binaries.
- Fix build on head after byacc 20130304.
Added:
head/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc (contents, props changed)
head/net/v6eval/files/patch-bin_dhgen_dhgen.cc (contents, props changed)
head/net/v6eval/files/patch-bin_sigcomp_sigcomp.c (contents, props changed)
head/net/v6eval/files/patch-lib_Cm_CmAgent.h (contents, props changed)
head/net/v6eval/files/patch-lib_Cm_CmLexer.h (contents, props changed)
head/net/v6eval/files/patch-lib_Cm_CmMain.h (contents, props changed)
head/net/v6eval/files/patch-lib_Cm_CmSocket.h (contents, props changed)
head/net/v6eval/files/patch-lib_Pz_McIKE.cc (contents, props changed)
head/net/v6eval/files/patch-lib_Pz_McSNMP.cc (contents, props changed)
head/net/v6eval/files/patch-lib_Pz_MvFunction.cc (contents, props changed)
head/net/v6eval/files/patch-lib_Pz_PvAction.cc (contents, props changed)
head/net/v6eval/files/patch-lib_pkt_PktClient.h (contents, props changed)
Modified:
head/net/v6eval/Makefile
Modified: head/net/v6eval/Makefile
==============================================================================
--- head/net/v6eval/Makefile Sat Jun 15 23:19:53 2013 (r321021)
+++ head/net/v6eval/Makefile Sun Jun 16 02:37:46 2013 (r321022)
@@ -3,6 +3,7 @@
PORTNAME= v6eval
PORTVERSION= 3.3.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net ipv6
MASTER_SITES= http://www.tahi.org/release/v6eval/
Added: head/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-bin_dhcomp_dhcomp.cc Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,23 @@
+--- 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
+
Added: head/net/v6eval/files/patch-bin_dhgen_dhgen.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-bin_dhgen_dhgen.cc Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,47 @@
+--- 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);
Added: head/net/v6eval/files/patch-bin_sigcomp_sigcomp.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-bin_sigcomp_sigcomp.c Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,12 @@
+--- 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
Added: head/net/v6eval/files/patch-lib_Cm_CmAgent.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_Cm_CmAgent.h Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,17 @@
+--- 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_;
Added: head/net/v6eval/files/patch-lib_Cm_CmLexer.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_Cm_CmLexer.h Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,15 @@
+--- 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;
Added: head/net/v6eval/files/patch-lib_Cm_CmMain.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_Cm_CmMain.h Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,11 @@
+--- 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]; // ¾ã³²²òÀϾðÊó
Added: head/net/v6eval/files/patch-lib_Cm_CmSocket.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_Cm_CmSocket.h Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,62 @@
+--- 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.
Added: head/net/v6eval/files/patch-lib_Pz_McIKE.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_Pz_McIKE.cc Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,20 @@
+--- 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);
+
Added: head/net/v6eval/files/patch-lib_Pz_McSNMP.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_Pz_McSNMP.cc Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,11 @@
+--- 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 */
Added: head/net/v6eval/files/patch-lib_Pz_MvFunction.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_Pz_MvFunction.cc Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,15 @@
+--- 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;
+ }
+ }
Added: head/net/v6eval/files/patch-lib_Pz_PvAction.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_Pz_PvAction.cc Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,11 @@
+--- 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){}
Added: head/net/v6eval/files/patch-lib_pkt_PktClient.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/v6eval/files/patch-lib_pkt_PktClient.h Sun Jun 16 02:37:46 2013 (r321022)
@@ -0,0 +1,13 @@
+--- 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:
More information about the svn-ports-head
mailing list