[58077] trunk/dports/devel/cryptlib
jmr at macports.org
jmr at macports.org
Mon Sep 21 13:55:06 PDT 2009
Revision: 58077
http://trac.macports.org/changeset/58077
Author: jmr at macports.org
Date: 2009-09-21 13:55:06 -0700 (Mon, 21 Sep 2009)
Log Message:
-----------
cryptlib: udpate to 3.3.3 and fix a bunch of stuff (#21536), delete unused patches
Modified Paths:
--------------
trunk/dports/devel/cryptlib/Portfile
Added Paths:
-----------
trunk/dports/devel/cryptlib/files/lresolv.diff
trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h
Removed Paths:
-------------
trunk/dports/devel/cryptlib/files/patch-cert__certechk.c
trunk/dports/devel/cryptlib/files/patch-cert__certedef.c
trunk/dports/devel/cryptlib/files/patch-cryptcfg.c
trunk/dports/devel/cryptlib/files/patch-cryptkrn.c
trunk/dports/devel/cryptlib/files/patch-cryptusr.c
trunk/dports/devel/cryptlib/files/patch-device__dev_sys.c
trunk/dports/devel/cryptlib/files/patch-keyset__dbxdbms.c
trunk/dports/devel/cryptlib/files/patch-keyset__dbxdca.c
trunk/dports/devel/cryptlib/files/patch-keyset__dbxp15w.c
trunk/dports/devel/cryptlib/files/patch-keyset__dbxpgp.c
trunk/dports/devel/cryptlib/files/patch-makefile
trunk/dports/devel/cryptlib/files/patch-makefile.darwin7
trunk/dports/devel/cryptlib/files/patch-misc__net_http.c
trunk/dports/devel/cryptlib/files/patch-misc__net_tcp.c
trunk/dports/devel/cryptlib/files/patch-misc__stream.c
trunk/dports/devel/cryptlib/files/patch-session__cmp_rd.c
trunk/dports/devel/cryptlib/files/patch-session__scep.c
trunk/dports/devel/cryptlib/files/patch-session__ssh.c
Modified: trunk/dports/devel/cryptlib/Portfile
===================================================================
--- trunk/dports/devel/cryptlib/Portfile 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/Portfile 2009-09-21 20:55:06 UTC (rev 58077)
@@ -3,7 +3,7 @@
PortSystem 1.0
name cryptlib
-version 3.3.1
+version 3.3.3
categories devel security crypto
maintainers nomaintainer
description cryptlib is a powerful security toolkit (library)
@@ -20,10 +20,10 @@
homepage http://www.cs.auckland.ac.nz/~pgut001/cryptlib/
master_sites ftp://ftp.franken.de/pub/crypt/cryptlib/
-distname cl331
+distname cl[join [split $version .] ""]
use_zip yes
-checksums md5 3e93e5aa0b33fb1d5b05b099f01e0afe \
- sha1 892a891a52b946e86664909157a290e30e1b1fe3
+checksums md5 afdb94894f7f798702703f4a95a2e7ac \
+ sha1 128d24c98f1406cb4ba547617a73ec1e254caf33
worksrcdir cryptlib
pre-extract {
@@ -34,7 +34,9 @@
use_configure no
build.target default shared
-build.args LIBDIR=${prefix}/lib
+build.args LIBDIR="${prefix}/lib" \
+ CFLAGS="${configure.cflags} ${configure.cc_archflags} -c -D__UNIX__ -DNDEBUG -I." \
+ CC="${configure.cc}"
destroot {
set drprefix ${destroot}${prefix}
@@ -44,24 +46,24 @@
${drprefix}/lib
system "ln -s ${cryptlibDylib} ${drprefix}/lib/${cryptlibDylibLink}"
xinstall -m 644 ${worksrcpath}/cryptlib.h ${drprefix}/include
- xinstall -m 644 ${worksrcpath}/README ${drprefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/README ${drprefix}/share/doc/${name}
system "/bin/echo ${homepage} > ${drprefix}/share/doc/${name}/website"
}
-platform darwin 7 {
- patchfiles-append patch-makefile.darwin7
-}
-
platform darwin {
+ patchfiles-append patch-crypt_osconfig.h
global cryptlibDylib cryptlibDylibLink
set cryptlibDylib libcl.3.3.dylib
set cryptlibDylibLink libcl.dylib
}
+platform darwin 10 {
+ patchfiles-append lresolv.diff
+}
+
platform sunos {
global cryptlibDylib cryptlibDylibLink
patchfiles-append patch-makefile.sunos
set cryptlibDylib libcl.so.3.3
set cryptlibDylibLink libcl.so
}
-
Added: trunk/dports/devel/cryptlib/files/lresolv.diff
===================================================================
--- trunk/dports/devel/cryptlib/files/lresolv.diff (rev 0)
+++ trunk/dports/devel/cryptlib/files/lresolv.diff 2009-09-21 20:55:06 UTC (rev 58077)
@@ -0,0 +1,23 @@
+--- tools/getlibs.sh.orig 2009-01-07 04:29:54.000000000 +1100
++++ tools/getlibs.sh 2009-09-22 06:22:54.000000000 +1000
+@@ -104,6 +104,9 @@
+
+ 'CYGWIN_NT-5.0'|'CYGWIN_NT-5.1')
+ echo "" ;;
++
++ 'Darwin')
++ echo "-lresolv" ;;
+
+ 'FreeBSD'|'NetBSD')
+ echo "-lpthread" ;;
+--- makefile.orig 2009-07-21 01:02:22.000000000 +1000
++++ makefile 2009-09-22 06:38:58.000000000 +1000
+@@ -1409,7 +1409,7 @@
+ $(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
+ @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
+ -current_version $(MAJ).$(MIN).$(PLV) \
+- -o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS)
++ -o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS) `./tools/getlibs.sh autodetect`
+
+ # If installing cryptlib as a systemwide lib, run ldconfig (which normally
+ # reads /etc/ld.so.conf, sets up the appropriate symbolic links in the
Deleted: trunk/dports/devel/cryptlib/files/patch-cert__certechk.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-cert__certechk.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-cert__certechk.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,14 +0,0 @@
---- cert/certechk.c.orig 2005-04-04 05:26:06.000000000 -0400
-+++ cert/certechk.c 2005-04-04 05:26:54.000000000 -0400
-@@ -331,9 +331,10 @@
- return( CRYPT_OK );
- }
-
-+static int checkAttribute( ATTRIBUTE_CHECK_INFO *attributeCheckInfo );
-+
- static int checkAttributeEntry( ATTRIBUTE_CHECK_INFO *attributeCheckInfo )
- {
-- STATIC_FN int checkAttribute( ATTRIBUTE_CHECK_INFO *attributeCheckInfo );
- ATTRIBUTE_LIST *attributeListPtr = attributeCheckInfo->attributeListPtr;
- ATTRIBUTE_INFO *attributeInfoPtr = attributeCheckInfo->attributeInfoPtr;
- ATTRIBUTE_STACK *stack = attributeCheckInfo->stack;
Deleted: trunk/dports/devel/cryptlib/files/patch-cert__certedef.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-cert__certedef.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-cert__certedef.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,15 +0,0 @@
---- cert/certedef.c.orig 2005-04-04 05:28:40.000000000 -0400
-+++ cert/certedef.c 2005-04-04 05:30:02.000000000 -0400
-@@ -109,9 +109,9 @@
- tables. These are declared in a somewhat peculiar manner because there's
- no clean way in C to forward declare a static array */
-
--extern const ATTRIBUTE_INFO FAR_BSS generalNameInfo[];
--extern const ATTRIBUTE_INFO FAR_BSS holdInstructionInfo[];
--extern const ATTRIBUTE_INFO FAR_BSS contentTypeInfo[];
-+static const ATTRIBUTE_INFO FAR_BSS generalNameInfo[];
-+static const ATTRIBUTE_INFO FAR_BSS holdInstructionInfo[];
-+static const ATTRIBUTE_INFO FAR_BSS contentTypeInfo[];
-
- /****************************************************************************
- * *
Added: trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h (rev 0)
+++ trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h 2009-09-21 20:55:06 UTC (rev 58077)
@@ -0,0 +1,14 @@
+--- crypt/osconfig.h.orig 2009-05-07 02:07:36.000000000 +1000
++++ crypt/osconfig.h 2009-09-22 05:53:36.000000000 +1000
+@@ -231,7 +231,10 @@
+ #else
+ #define L_ENDIAN
+ #endif
+- #define B_ENDIAN
++ #if defined( __LP64__ )
++ #undef SIXTY_FOUR_BIT
++ #define SIXTY_FOUR_BIT_LONG
++ #endif
+ #define BN_LLONG
+ #define BF_PTR
+ #define DES_RISC1
Deleted: trunk/dports/devel/cryptlib/files/patch-cryptcfg.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-cryptcfg.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-cryptcfg.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,11 +0,0 @@
---- cryptcfg.c.orig 2005-04-04 05:48:18.000000000 -0400
-+++ cryptcfg.c 2005-04-04 05:49:25.000000000 -0400
-@@ -674,7 +674,7 @@
- sizeofObject( strlen( optionInfoPtr->strValue ) ) );
- writeShortInteger( &stream, fixedOptionInfoPtr->index,
- DEFAULT_TAG );
-- writeCharacterString( &stream, optionInfoPtr->strValue,
-+ writeCharacterString( &stream, (unsigned char *)optionInfoPtr->strValue,
- strlen( optionInfoPtr->strValue ),
- BER_STRING_UTF8 );
- continue;
Deleted: trunk/dports/devel/cryptlib/files/patch-cryptkrn.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-cryptkrn.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-cryptkrn.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,42 +0,0 @@
---- cryptkrn.c.orig 2005-04-04 05:49:55.000000000 -0400
-+++ cryptkrn.c 2005-04-04 05:51:35.000000000 -0400
-@@ -1108,6 +1108,10 @@
- return( currentPerm );
- }
-
-+static int setPropertyAttribute( const int objectHandle,
-+ const CRYPT_ATTRIBUTE_TYPE attribute,
-+ void *messageDataPtr );
-+
- /* Update the action permissions for an object based on the composite
- permissions for it and a dependent object. This is a special-case
- function because it has to operate with the object table unlocked. This
-@@ -1125,9 +1129,6 @@
- static int updateDependentObjectPerms( const CRYPT_HANDLE objectHandle,
- const CRYPT_HANDLE dependentObject )
- {
-- STATIC_FN int setPropertyAttribute( const int objectHandle,
-- const CRYPT_ATTRIBUTE_TYPE attribute,
-- void *messageDataPtr );
- const OBJECT_TYPE objectType = objectTable[ objectHandle ].type;
- const CRYPT_CONTEXT contextHandle = \
- ( objectType == OBJECT_TYPE_CONTEXT ) ? objectHandle : dependentObject;
-@@ -2101,6 +2102,9 @@
- FALSE : TRUE );
- }
-
-+static int cloneContext( const CRYPT_CONTEXT iDestContext,
-+ const CRYPT_CONTEXT iSrcContext );
-+
- /* Handle an object that has been cloned and is subject to copy-on-write */
-
- static int handleAliasedObject( const int objectHandle,
-@@ -2108,8 +2112,6 @@
- const void *messageDataPtr,
- const int messageValue )
- {
-- STATIC_FN int cloneContext( const CRYPT_CONTEXT iDestContext,
-- const CRYPT_CONTEXT iSrcContext );
- OBJECT_INFO *objectInfoPtr = &objectTable[ objectHandle ];
- CRYPT_CONTEXT originalObject = objectHandle;
- CRYPT_CONTEXT clonedObject = objectInfoPtr->clonedObject;
Deleted: trunk/dports/devel/cryptlib/files/patch-cryptusr.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-cryptusr.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-cryptusr.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,11 +0,0 @@
---- cryptusr.c.orig 2005-04-04 06:20:27.000000000 -0400
-+++ cryptusr.c 2005-04-04 06:20:29.000000000 -0400
-@@ -1523,7 +1523,7 @@
- cryptlib default user (actually we could and nothing bad would happen,
- but we reserve the use of this name just in case) */
- if( createInfo->strArgLen1 == defaultUserInfo.userNameLength && \
-- !strCompare( createInfo->strArg1, defaultUserInfo.userName,
-+ !strCompare( createInfo->strArg1, (char *)defaultUserInfo.userName,
- defaultUserInfo.userNameLength ) )
- return( CRYPT_ERROR_INITED );
-
Deleted: trunk/dports/devel/cryptlib/files/patch-device__dev_sys.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-device__dev_sys.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-device__dev_sys.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,17 +0,0 @@
---- device/dev_sys.c.orig 2005-04-04 05:31:49.000000000 -0400
-+++ device/dev_sys.c 2005-04-04 05:32:37.000000000 -0400
-@@ -1142,12 +1142,13 @@
- * *
- ****************************************************************************/
-
-+static void initCapabilities( void );
-+
- /* Initialise and shut down the system device */
-
- static int initFunction( DEVICE_INFO *deviceInfo, const char *name,
- const int nameLength )
- {
-- STATIC_FN void initCapabilities( void );
- int status;
-
- UNUSED( name );
Deleted: trunk/dports/devel/cryptlib/files/patch-keyset__dbxdbms.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-keyset__dbxdbms.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-keyset__dbxdbms.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,11 +0,0 @@
---- keyset/dbxdbms.c.orig 2005-04-04 05:34:42.000000000 -0400
-+++ keyset/dbxdbms.c 2005-04-04 05:37:07.000000000 -0400
-@@ -69,7 +69,7 @@
- /* Connect to the plugin */
- initNetConnectInfo( &connectInfo, DEFAULTUSER_OBJECT_HANDLE,
- CRYPT_ERROR, CRYPT_ERROR, NET_OPTION_HOSTNAME );
-- connectInfo.name = bufPtr;
-+ connectInfo.name = (char *)bufPtr;
- status = sNetConnect( &dbmsInfo->stream, STREAM_PROTOCOL_TCPIP,
- &connectInfo, dbmsInfo->errorMessage,
- &dbmsInfo->errorCode );
Deleted: trunk/dports/devel/cryptlib/files/patch-keyset__dbxdca.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-keyset__dbxdca.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-keyset__dbxdca.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,74 +0,0 @@
---- keyset/dbxdca.c.orig 2003-12-12 02:46:32.000000000 -0500
-+++ keyset/dbxdca.c 2005-04-04 06:33:18.000000000 -0400
-@@ -62,7 +62,7 @@
- "SELECT certID FROM certLog WHERE subjCertID = '$' "
- "AND action = " TEXT_CERTACTION_REQUEST_RENEWAL,
- certID );
-- status = dbmsQuery( sqlBuffer, certData, &certDataLength, 0,
-+ status = dbmsQuery( sqlBuffer, (unsigned char *)certData, &certDataLength, 0,
- DBMS_QUERY_NORMAL );
- if( cryptStatusError( status ) )
- return( status );
-@@ -74,7 +74,7 @@
- "SELECT certID FROM certLog WHERE reqCertID = '$' "
- "AND action = " TEXT_CERTACTION_CERT_CREATION,
- certID );
-- status = dbmsQuery( sqlBuffer, certData, &certDataLength, 0,
-+ status = dbmsQuery( sqlBuffer, (unsigned char *)certData, &certDataLength, 0,
- DBMS_QUERY_NORMAL );
- if( cryptStatusError( status ) )
- return( status );
-@@ -349,7 +349,7 @@
- writeSequence( &stream, sizeofShortInteger( -errorStatus ) + \
- ( int ) sizeofObject( errorStringLength ) );
- writeShortInteger( &stream, -errorStatus, DEFAULT_TAG );
-- writeCharacterString( &stream, errorString, errorStringLength,
-+ writeCharacterString( &stream, (unsigned char *)errorString, errorStringLength,
- BER_STRING_UTF8 );
- errorDataLength = stell( &stream );
- sMemDisconnect( &stream );
-@@ -440,6 +440,11 @@
- KEYMGMT_ITEM_PUBLICKEY, KEYMGMT_FLAG_NONE ) );
- }
-
-+static int caRevokeCert( DBMS_INFO *dbmsInfo,
-+ const CRYPT_CERTIFICATE iCertRequest,
-+ const CRYPT_CERTIFICATE iCertificate,
-+ const CRYPT_CERTACTION_TYPE action );
-+
- /* Handle an indirect cert revocation (one where we need to reverse a cert
- issue or otherwise remove the cert without obtaining a direct revocation
- request from the user). The various revocation situations are:
-@@ -467,10 +472,6 @@
- const CRYPT_CERTIFICATE iCertificate,
- const CRYPT_CERTACTION_TYPE action )
- {
-- STATIC_FN int caRevokeCert( DBMS_INFO *dbmsInfo,
-- const CRYPT_CERTIFICATE iCertRequest,
-- const CRYPT_CERTIFICATE iCertificate,
-- const CRYPT_CERTACTION_TYPE action );
- MESSAGE_CREATEOBJECT_INFO createInfo;
- time_t certDate;
- int status;
-@@ -1012,8 +1013,8 @@
- get the request that resulted in its creation */
- dbmsFormatSQL( sqlBuffer,
- "SELECT reqCertID FROM certLog WHERE certID = '$'",
-- certID );
-- status = dbmsQuery( sqlBuffer, requestTypeData, &requestTypeLength,
-+ (unsigned char *)certID );
-+ status = dbmsQuery( sqlBuffer, (char *)requestTypeData, &requestTypeLength,
- 0, DBMS_QUERY_NORMAL );
- if( cryptStatusOK( status ) )
- memcpy( certID, requestTypeData,
-@@ -1031,8 +1032,8 @@
- type */
- dbmsFormatSQL( sqlBuffer,
- "SELECT action FROM certLog WHERE certID = '$'",
-- certID );
-- status = dbmsQuery( sqlBuffer, requestTypeData, &requestTypeLength, 0,
-+ (unsigned char *)certID );
-+ status = dbmsQuery( sqlBuffer, (char *)requestTypeData, &requestTypeLength, 0,
- DBMS_QUERY_NORMAL );
- if( cryptStatusOK( status ) )
- switch( requestTypeData[ 0 ] )
Deleted: trunk/dports/devel/cryptlib/files/patch-keyset__dbxp15w.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-keyset__dbxp15w.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-keyset__dbxp15w.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,11 +0,0 @@
---- keyset/dbxp15w.c.orig 2005-04-04 05:45:23.000000000 -0400
-+++ keyset/dbxp15w.c 2005-04-04 05:46:28.000000000 -0400
-@@ -502,7 +502,7 @@
- sMemOpen( &stream, certAttributes, KEYATTR_BUFFER_SIZE );
- writeSequence( &stream, commonAttributeSize );
- if( commonAttributeSize )
-- writeCharacterString( &stream, pkcs15info->label,
-+ writeCharacterString( &stream, (unsigned char *)pkcs15info->label,
- pkcs15info->labelLength, BER_STRING_UTF8 );
- writeSequence( &stream, commonCertAttributeSize );
- writeOctetString( &stream, pkcs15info->iD, pkcs15info->iDlength,
Deleted: trunk/dports/devel/cryptlib/files/patch-keyset__dbxpgp.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-keyset__dbxpgp.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-keyset__dbxpgp.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,11 +0,0 @@
---- keyset/dbxpgp.c.orig 2005-04-04 05:43:12.000000000 -0400
-+++ keyset/dbxpgp.c 2005-04-04 05:43:51.000000000 -0400
-@@ -721,7 +721,7 @@
- status = pgpReadPacketHeader( stream, &ctb, &packetLength );
- if( cryptStatusError( status ) )
- return( status );
-- pgpInfo->userID[ pgpInfo->lastUserID ] = sMemBufPtr( stream );
-+ pgpInfo->userID[ pgpInfo->lastUserID ] = (char *)sMemBufPtr( stream );
- pgpInfo->userIDlen[ pgpInfo->lastUserID++ ] = ( int ) packetLength;
- status = sSkip( stream, packetLength );
- }
Deleted: trunk/dports/devel/cryptlib/files/patch-makefile
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-makefile 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-makefile 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,10 +0,0 @@
---- makefile Sat Dec 27 22:22:00 2003
-+++ ../../makefile Fri May 6 14:00:35 2005
-@@ -1213,6 +1213,7 @@
- $(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
- @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
- -current_version $(MAJ).$(MIN).$(PLV) \
-+ -install_name $(LIBDIR)/$(DYLIBNAME) \
- -o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS)
-
- # Link everything into the test programs. Some OS's require the linking of
Deleted: trunk/dports/devel/cryptlib/files/patch-makefile.darwin7
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-makefile.darwin7 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-makefile.darwin7 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,11 +0,0 @@
---- makefile.orig Tue Dec 16 03:01:22 2003
-+++ makefile Wed Dec 24 16:47:18 2003
-@@ -1556,7 +1556,7 @@
- # Mac OS X: BSD variant.
-
- Darwin:
-- @make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -O3" \
-+ @make $(DEFINES) CFLAGS="$(CFLAGS) -DBIND_8_COMPAT -fomit-frame-pointer -O3" \
- LDFLAGS="-object -s"
-
- # NCR MP-RAS 3.02: Using the NCR High Performance C Compiler R3.0c
Deleted: trunk/dports/devel/cryptlib/files/patch-misc__net_http.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-misc__net_http.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-misc__net_http.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,29 +0,0 @@
---- misc/net_http.c.orig 2005-04-04 06:21:03.000000000 -0400
-+++ misc/net_http.c 2005-04-04 06:21:54.000000000 -0400
-@@ -323,7 +323,7 @@
- length = sPrintf( headerBuffer, "%s %s %s\r\n\r\n",
- isHTTP10( stream ) ? "HTTP/1.0" : "HTTP/1.1",
- statusString, errorString );
-- return( stream->bufferedTransportWriteFunction( stream, headerBuffer, length,
-+ return( stream->bufferedTransportWriteFunction( stream, (unsigned char *)headerBuffer, length,
- TRANSPORT_FLAG_FLUSH ) );
- }
-
-@@ -750,7 +750,7 @@
- headerLength = stell( &headerStream );
- assert( sStatusOK( &headerStream ) );
- sMemDisconnect( &headerStream );
-- return( stream->bufferedTransportWriteFunction( stream, headerBuffer,
-+ return( stream->bufferedTransportWriteFunction( stream, (unsigned char *)headerBuffer,
- headerLength,
- transportFlag ) );
- }
-@@ -865,7 +865,7 @@
- if( isHTTP10( stream ) )
- strcat( headerBuffer + headerPos, "Pragma: no-cache\r\n" );
- strcat( headerBuffer + headerPos, "\r\n" );
-- return( stream->bufferedTransportWriteFunction( stream, headerBuffer,
-+ return( stream->bufferedTransportWriteFunction( stream, (unsigned char *)headerBuffer,
- strlen( headerBuffer ),
- TRANSPORT_FLAG_NONE ) );
- }
Deleted: trunk/dports/devel/cryptlib/files/patch-misc__net_tcp.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-misc__net_tcp.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-misc__net_tcp.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,88 +0,0 @@
---- misc/net_tcp.c.orig 2005-04-04 06:22:37.000000000 -0400
-+++ misc/net_tcp.c 2005-04-04 06:26:50.000000000 -0400
-@@ -1111,10 +1111,10 @@
- }
- #else
-
-+static int initSocketPool( void );
-+
- int netInitTCP( void )
- {
-- STATIC_FN int initSocketPool( void );
--
- #ifdef __SCO_VERSION__
- struct sigaction act, oact;
-
-@@ -1155,10 +1155,10 @@
- return( initSocketPool() );
- }
-
-+static void endSocketPool( void );
-+
- void netEndTCP( void )
- {
-- STATIC_FN void endSocketPool( void );
--
- /* Clean up the socket pool state information */
- endSocketPool();
-
-@@ -1795,11 +1795,11 @@
- CRYPT_ERROR_NOTFOUND, FALSE ) );
-
- /* Skip the queries */
-- namePtr = dnsQueryInfo.buffer + NS_HFIXEDSZ;
-- endPtr = dnsQueryInfo.buffer + resultLen;
-+ namePtr = (char *)dnsQueryInfo.buffer + NS_HFIXEDSZ;
-+ endPtr = (char *)dnsQueryInfo.buffer + resultLen;
- for( i = 0; i < qCount; i++ )
- {
-- nameLen = dn_skipname( namePtr, endPtr );
-+ nameLen = dn_skipname( (unsigned char *)namePtr, (unsigned char *)endPtr );
- if( nameLen <= 0 )
- return( setSocketError( stream, "RR contains invalid question",
- CRYPT_ERROR_BADDATA, FALSE ) );
-@@ -1814,7 +1814,7 @@
- {
- int priority, port;
-
-- nameLen = dn_skipname( namePtr, endPtr );
-+ nameLen = dn_skipname( (unsigned char *)namePtr, (unsigned char *)endPtr );
- if( nameLen <= 0 )
- return( setSocketError( stream, "RR contains invalid answer",
- CRYPT_ERROR_BADDATA, FALSE ) );
-@@ -1825,14 +1825,14 @@
- if( priority < minPriority )
- {
- /* We've got a new higher-priority host, use that */
-- nameLen = dn_expand( dnsQueryInfo.buffer, endPtr,
-- namePtr, hostName, MAX_URL_SIZE - 1 );
-+ nameLen = dn_expand( dnsQueryInfo.buffer, (unsigned char *)endPtr,
-+ (unsigned char *)namePtr, hostName, MAX_URL_SIZE - 1 );
- *hostPort = port;
- minPriority = priority;
- }
- else
- /* It's a lower-priority host, skip it */
-- nameLen = dn_skipname( namePtr, endPtr );
-+ nameLen = dn_skipname( (unsigned char *)namePtr, (unsigned char *)endPtr );
- if( nameLen <= 0 )
- return( setSocketError( stream, "RR contains invalid answer",
- CRYPT_ERROR_NOTFOUND, FALSE ) );
-@@ -2278,7 +2278,7 @@
- struct timeval tv;
- fd_set readfds, writefds;
- static const int trueValue = 1;
-- SIZE_TYPE intLength = sizeof( int );
-+ socklen_t intLength = sizeof( int );
- int value, status;
-
- /* Wait around until the connect completes. Some select()'s limit the
-@@ -2370,7 +2370,7 @@
- struct addrinfo *addrInfoPtr, *addrInfoCursor;
- char portBuf[ 32 ];
- static const int trueValue = 1;
-- SIZE_TYPE clientAddrLen = sizeof( SOCKADDR_STORAGE );
-+ socklen_t clientAddrLen = sizeof( SOCKADDR_STORAGE );
- int socketStatus, status;
-
- /* Clear return value */
Deleted: trunk/dports/devel/cryptlib/files/patch-misc__stream.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-misc__stream.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-misc__stream.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,10 +0,0 @@
---- misc/stream.c.orig 2005-04-04 06:36:15.000000000 -0400
-+++ misc/stream.c 2005-04-04 06:36:22.000000000 -0400
-@@ -7,6 +7,7 @@
-
- #include <stdarg.h>
- #include <stdlib.h>
-+#include <string.h>
- #if defined( INC_ALL )
- #include "stream.h"
- #elif defined( INC_CHILD )
Deleted: trunk/dports/devel/cryptlib/files/patch-session__cmp_rd.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-session__cmp_rd.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-session__cmp_rd.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,28 +0,0 @@
---- session/cmp_rd.c.orig 2005-04-04 06:37:07.000000000 -0400
-+++ session/cmp_rd.c 2005-04-04 06:38:08.000000000 -0400
-@@ -5,6 +5,7 @@
- * *
- ****************************************************************************/
-
-+#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #if defined( INC_ALL )
-@@ -421,7 +422,7 @@
- not much we can do with them in any case, so we skip them */
- readSequence( stream, &endPos );
- endPos += stell( stream );
-- status = readCharacterString( stream, string, &stringLength, maxLength,
-+ status = readCharacterString( stream, (unsigned char *)string, &stringLength, maxLength,
- BER_STRING_UTF8 );
- if( cryptStatusError( status ) )
- {
-@@ -1282,7 +1283,7 @@
- }
- else
- {
-- decodedValuePtr = sessionInfoPtr->password;
-+ decodedValuePtr = (unsigned char *)sessionInfoPtr->password;
- decodedValueLength = sessionInfoPtr->passwordLength;
- }
-
Deleted: trunk/dports/devel/cryptlib/files/patch-session__scep.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-session__scep.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-session__scep.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,29 +0,0 @@
---- session/scep.c.orig 2005-04-04 06:38:55.000000000 -0400
-+++ session/scep.c 2005-04-04 06:40:00.000000000 -0400
-@@ -135,7 +135,7 @@
- if( sessionInfoPtr->flags & SESSION_ISENCODEDUSERID )
- {
- keyIDsize = decodePKIUserValue( keyIDbuffer,
-- protocolInfo->transID, protocolInfo->transIDsize );
-+ (char *)protocolInfo->transID, protocolInfo->transIDsize );
- keyIDptr = keyIDbuffer;
- }
-
-@@ -214,7 +214,7 @@
- if( cryptStatusError( status ) )
- return( status );
- buffer[ msgData.length ] = '\0';
-- status = aToI( buffer );
-+ status = aToI( (char *)buffer );
- if( status == 0 && *buffer != '0' )
- /* atoi() can't really indicate an error except by returning 0,
- which is identical to an SCEP success status. In order to
-@@ -755,7 +755,7 @@
- protocolInfo->transIDsize );
- sessionInfoPtr->userNameLength = protocolInfo->transIDsize;
- if( protocolInfo->transIDsize == 17 && \
-- isPKIUserValue( protocolInfo->transID, protocolInfo->transIDsize ) )
-+ isPKIUserValue( (char *)protocolInfo->transID, protocolInfo->transIDsize ) )
- sessionInfoPtr->flags |= SESSION_ISENCODEDUSERID;
-
- /* Check that we've been sent the correct type of message */
Deleted: trunk/dports/devel/cryptlib/files/patch-session__ssh.c
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-session__ssh.c 2009-09-21 19:53:45 UTC (rev 58076)
+++ trunk/dports/devel/cryptlib/files/patch-session__ssh.c 2009-09-21 20:55:06 UTC (rev 58077)
@@ -1,20 +0,0 @@
---- session/ssh.c.orig 2005-04-04 06:41:01.000000000 -0400
-+++ session/ssh.c 2005-04-04 06:41:40.000000000 -0400
-@@ -214,7 +214,7 @@
-
- static int readVersionString( SESSION_INFO *sessionInfoPtr )
- {
-- const char *versionStringPtr = sessionInfoPtr->receiveBuffer + SSH_ID_SIZE;
-+ const char *versionStringPtr = (char *)sessionInfoPtr->receiveBuffer + SSH_ID_SIZE;
- int linesRead = 0, status;
-
- /* Read the server version info, with the format for the ID string being
-@@ -415,7 +415,7 @@
- int encodeString( BYTE *buffer, const BYTE *string, const int stringLength )
- {
- BYTE *bufPtr = buffer;
-- const int length = ( stringLength > 0 ) ? stringLength : strlen( string );
-+ const int length = ( stringLength > 0 ) ? stringLength : strlen( (char *)string );
-
- if( buffer != NULL )
- {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090921/20ff8b7e/attachment-0001.html>
More information about the macports-changes
mailing list