Index: head/net-mgmt/snmp++/Makefile =================================================================== --- head/net-mgmt/snmp++/Makefile (revision 421895) +++ head/net-mgmt/snmp++/Makefile (revision 421896) @@ -1,27 +1,27 @@ # Created by: nicolai@catpipe.net # $FreeBSD$ PORTNAME= snmp++ PORTVERSION= 3.3.0 CATEGORIES= net-mgmt MASTER_SITES= http://www.agentpp.com/ DISTNAME= ${PORTNAME}v${PORTVERSION} MAINTAINER= nicolai@petri.dk COMMENT= SNMP C++ library with V3 support MAKEFILE= Makefile.FreeBSD WRKSRC= ${WRKDIR}/${PORTNAME}/src -USES= gmake +USES= gmake ssl:build USE_LDCONFIG= yes -MAKE_ARGS= CC="${CXX}" +MAKE_ARGS= CC="${CXX}" PORTOPTS="-I${OPENSSLINC} -L${OPENSSLLIB}" post-extract: ${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC} post-install: ${LN} -sf ${PREFIX}/lib/libsnmp++.so.3.3.0 ${STAGEDIR}${PREFIX}/lib/libsnmp++.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsnmp++.so.3.3.0 .include Index: head/net-mgmt/snmp++/files/Makefile.FreeBSD =================================================================== --- head/net-mgmt/snmp++/files/Makefile.FreeBSD (revision 421895) +++ head/net-mgmt/snmp++/files/Makefile.FreeBSD (revision 421896) @@ -1,42 +1,42 @@ ############################################################################ ## ## Makefile.FreeBSD ## ## SNMP++v3.2.22 ## ----------------------------------------------- ## Copyright (c) 2001-2006 Jochen Katz, Frank Fock ## ## This software is based on SNMP++2.6 from Hewlett Packard: ## ## Copyright (c) 1996 ## Hewlett-Packard Company ## ## ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. ## Permission to use, copy, modify, distribute andor sell this software ## andor its documentation is hereby granted without fee. User agrees ## to display the above copyright notice and this license notice in all ## copies of the software and any documentation of the software. User ## agrees to assume all liability for the use of the software; ## Hewlett-Packard and Jochen Katz make no representations about the ## suitability of this software for any purpose. It is provided ## "AS-IS" without warranty of any kind, either express or implied. User ## hereby grants a royalty-free license to any and all derivatives based ## upon this software code base. ## ## Stuttgart, Germany, Tue Nov 21 22:12:16 CET 2006 ## ##########################################################################* # # Flags: compiler options, search paths # COPTIONS = -D_XPG4_EXTENDED -D__unix -Wall -D_USE_OPENSSL# -DHEADER_DES_LOCL_H # -D_DEBUG TEMPOPTS = -I. USEROPTS = -g -CFLAGS = $(COPTIONS) $(CINCDIRS) $(USEROPTS) +CFLAGS = $(COPTIONS) $(CINCDIRS) $(USEROPTS) $(PORTOPTS) LDFLAGS = $(CFLAGS) SHARED = -fPIC -shared include common.mk Index: head/net-mgmt/snmp++/files/patch-auth__priv.cpp =================================================================== --- head/net-mgmt/snmp++/files/patch-auth__priv.cpp (nonexistent) +++ head/net-mgmt/snmp++/files/patch-auth__priv.cpp (revision 421896) @@ -0,0 +1,125 @@ +--- auth_priv.cpp.orig 2016-04-15 19:57:59 UTC ++++ auth_priv.cpp +@@ -89,34 +89,34 @@ typedef MD5_CTX MD5HashSta + #define MD5_PROCESS(s, p, l) MD5_Update(s, p, l) + #define MD5_DONE(s, k) MD5_Final(k, s) + +-typedef des_key_schedule DESCBCType; ++typedef DES_key_schedule DESCBCType; + #define DES_CBC_START_ENCRYPT(c, iv, k, kl, r, s) \ +- if (des_key_sched((C_Block*)(k), s) < 0) \ ++ if (DES_key_sched((DES_cblock*)(k), &s) < 0) \ + { \ + debugprintf(0, "Starting DES encryption failed."); \ + return SNMPv3_USM_ERROR; \ + } + #define DES_CBC_START_DECRYPT(c, iv, k, kl, r, s) \ +- if (des_key_sched((C_Block*)(k), s) < 0) \ ++ if (DES_key_sched((DES_cblock*)(k), &s) < 0) \ + { \ + debugprintf(0, "Starting DES decryption failed."); \ + return SNMPv3_USM_ERROR; \ + } + + #define DES_CBC_ENCRYPT(pt, ct, s, iv, l) \ +- des_ncbc_encrypt(pt, ct, l, \ +- s, (C_Block*)(iv), DES_ENCRYPT) ++ DES_ncbc_encrypt(pt, ct, l, \ ++ &s, (DES_cblock*)(iv), DES_ENCRYPT) + #define DES_CBC_DECRYPT(ct, pt, s, iv, l) \ +- des_ncbc_encrypt(ct, pt, l, \ +- s, (C_Block*)(iv), DES_DECRYPT) ++ DES_ncbc_encrypt(ct, pt, l, \ ++ &s, (DES_cblock*)(iv), DES_DECRYPT) + + #define DES_EDE3_CBC_ENCRYPT(pt, ct, l, k1, k2, k3, iv) \ +- des_ede3_cbc_encrypt(pt, ct, l, \ +- k1, k2, k3, (C_Block*)(iv), DES_ENCRYPT) ++ DES_ede3_cbc_encrypt(pt, ct, l, \ ++ k1, k2, k3, (DES_cblock*)(iv), DES_ENCRYPT) + + #define DES_EDE3_CBC_DECRYPT(ct, pt, l, k1, k2, k3, iv) \ +- des_ede3_cbc_encrypt(ct, pt, l, \ +- k1, k2, k3, (C_Block*)(iv), DES_DECRYPT) ++ DES_ede3_cbc_encrypt(ct, pt, l, \ ++ k1, k2, k3, (DES_cblock*)(iv), DES_DECRYPT) + + #define DES_MEMSET(s, c, l) memset(&(s), c, l) + +@@ -182,12 +182,12 @@ typedef MD5_CTX MD5HashSta + #define MD5_DONE(s, k) MD5Final(k, s) + + #define DES_EDE3_CBC_ENCRYPT(pt, ct, l, k1, k2, k3, iv) \ +- des_ede3_cbc_encrypt((C_Block*)(pt), (C_Block*)(ct), l, \ +- k1, k2, k3, (C_Block*)(iv), DES_ENCRYPT) ++ DES_ede3_cbc_encrypt((DES_cblock*)(pt), (DES_cblock*)(ct), l, \ ++ k1, k2, k3, (DES_cblock*)(iv), DES_ENCRYPT) + + #define DES_EDE3_CBC_DECRYPT(ct, pt, l, k1, k2, k3, iv) \ +- des_ede3_cbc_encrypt((C_Block*)(ct), (C_Block*)(pt), l, \ +- k1, k2, k3, (C_Block*)(iv), DES_DECRYPT) ++ DES_ede3_cbc_encrypt((DES_cblock*)(ct), (DES_cblock*)(pt), l, \ ++ k1, k2, k3, (DES_cblock*)(iv), DES_DECRYPT) + + #ifdef RSAEURO + +@@ -205,26 +205,26 @@ typedef DES_CBC_CTX DESCBCType + + #else // RSAEURO + +-typedef des_key_schedule DESCBCType; ++typedef DES_key_schedule DESCBCType; + #define DES_CBC_START_ENCRYPT(c, iv, k, kl, r, s) \ +- if (des_key_sched((C_Block*)(k), s) < 0) \ ++ if (DES_key_sched((DES_cblock*)(k), &s) < 0) \ + { \ + debugprintf(0, "Starting DES encryption failed."); \ + return SNMPv3_USM_ERROR; \ + } + #define DES_CBC_START_DECRYPT(c, iv, k, kl, r, s) \ +- if (des_key_sched((C_Block*)(k), s) < 0) \ ++ if (DES_key_sched((DES_cblock*)(k), &s) < 0) \ + { \ + debugprintf(0, "Starting DES decryption failed."); \ + return SNMPv3_USM_ERROR; \ + } + + #define DES_CBC_ENCRYPT(pt, ct, s, iv, l) \ +- des_ncbc_encrypt((C_Block*)(pt), (C_Block*)(ct), l, \ +- s, (C_Block*)(iv), DES_ENCRYPT) ++ DES_ncbc_encrypt((DES_cblock*)(pt), (DES_cblock*)(ct), l, \ ++ &s, (DES_cblock*)(iv), DES_ENCRYPT) + #define DES_CBC_DECRYPT(ct, pt, s, iv, l) \ +- des_ncbc_encrypt((C_Block*)(ct), (C_Block*)(pt), l, \ +- s, (C_Block*)(iv), DES_DECRYPT) ++ DES_ncbc_encrypt((DES_cblock*)(ct), (DES_cblock*)(pt), l, \ ++ &s, (DES_cblock*)(iv), DES_DECRYPT) + #define DES_MEMSET(s, c, l) memset(&(s), c, l) + + /* -- END: Defines for libdes -- */ +@@ -1939,9 +1939,9 @@ Priv3DES_EDE::encrypt(const unsigned cha + #else + DESCBCType ks1, ks2, ks3; + +- if ((des_key_sched((C_Block*)(key), ks1) < 0) || +- (des_key_sched((C_Block*)(key +8), ks2) < 0) || +- (des_key_sched((C_Block*)(key +16), ks3) < 0)) ++ if ((DES_key_sched((DES_cblock*)(key), &ks1) < 0) || ++ (DES_key_sched((DES_cblock*)(key +8), &ks2) < 0) || ++ (DES_key_sched((DES_cblock*)(key +16), &ks3) < 0)) + { + debugprintf(0, "Starting 3DES-EDE encryption failed."); + return SNMPv3_USM_ERROR; +@@ -2028,9 +2028,9 @@ Priv3DES_EDE::decrypt(const unsigned cha + #else + DESCBCType ks1, ks2, ks3; + +- if ((des_key_sched((C_Block*)(key), ks1) < 0) || +- (des_key_sched((C_Block*)(key+8), ks2) < 0) || +- (des_key_sched((C_Block*)(key+16), ks3) < 0)) ++ if ((DES_key_sched((C_Block*)(key), &ks1) < 0) || ++ (DES_key_sched((C_Block*)(key+8), &ks2) < 0) || ++ (DES_key_sched((C_Block*)(key+16), &ks3) < 0)) + { + debugprintf(0, "Starting 3DES-EDE decryption failed."); + return SNMPv3_USM_ERROR; Property changes on: head/net-mgmt/snmp++/files/patch-auth__priv.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property