OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2007 22:51:16
Branch: HEAD Handle: 2007101121511501
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec openssl.patch
Log:
upgrade to OpenSSL 0.9.8f
Summary:
Revision Changes Path
1.477 +1 -0 openpkg-src/openpkg/HISTORY
1.613 +1 -1 openpkg-src/openpkg/openpkg.spec
1.8 +54 -561 openpkg-src/openpkg/openssl.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.476 -r1.477 HISTORY
--- openpkg-src/openpkg/HISTORY 11 Oct 2007 13:16:04 -0000 1.476
+++ openpkg-src/openpkg/HISTORY 11 Oct 2007 20:51:15 -0000 1.477
@@ -2,6 +2,7 @@
2007
====
+20071011 upgrade to OpenSSL 0.9.8f
20071011 add support for FreeBSD 8.0-CURRENT
20071010 upgrade to GNU tar 1.19
20070914 upgrade to cURL 7.17.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.612 -r1.613 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 11 Oct 2007 13:16:04 -0000 1.612
+++ openpkg-src/openpkg/openpkg.spec 11 Oct 2007 20:51:15 -0000 1.613
@@ -57,7 +57,7 @@
%define V_config 20060923
%define V_registry 1.1.3
%define V_perl 5.8.8
-%define V_openssl 0.9.8e
+%define V_openssl 0.9.8f
%define V_tools 1.4.5
%define V_exec 2.0.1-C
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openssl.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 openssl.patch
--- openpkg-src/openpkg/openssl.patch 15 Jun 2007 22:38:44 -0000 1.7
+++ openpkg-src/openpkg/openssl.patch 11 Oct 2007 20:51:16 -0000 1.8
@@ -1,49 +1,45 @@
Index: Configure
---- Configure.orig 2006-05-14 23:03:51 +0200
-+++ Configure 2006-05-14 23:05:46 +0200
-@@ -6,7 +6,6 @@
- ##
-
- require 5.000;
--use strict;
-
- # see INSTALL for instructions.
-
-Index: crypto/objects/obj_dat.pl
---- crypto/objects/obj_dat.pl.orig 2005-08-29 01:20:47 +0200
-+++ crypto/objects/obj_dat.pl 2006-05-15 08:03:44 +0200
-@@ -1,9 +1,5 @@
- #!/usr/local/bin/perl
-
--# fixes bug in floating point emulation on sparc64 when
--# this script produces off-by-one output on sparc64
--use integer;
--
- sub obj_cmp
- {
- local(@a,@b,$_,$r);
-Index: util/mklink.pl
---- util/mklink.pl.orig 2006-05-15 20:46:35 +0200
-+++ util/mklink.pl 2006-05-15 20:48:07 +0200
-@@ -15,13 +15,12 @@
- # Apart from this, this script should be able to handle even the most
- # pathological cases.
-
--use Cwd;
--
- my $from = shift;
- my @files = @ARGV;
-
- my @from_path = split(/[\\\/]/, $from);
--my $pwd = getcwd();
-+my $pwd = `pwd`;
-+$pwd =~ s/\n$//s;
- chomp($pwd);
- my @pwd_path = split(/[\\\/]/, $pwd);
+--- Configure.orig 2007-10-11 22:43:07 +0200
++++ Configure 2007-10-11 22:43:07 +0200
+@@ -33,6 +33,7 @@
+ # (Default: KRB5_DIR/include)
+ # --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
+ # supported values are "MIT" and "Heimdal". A value is required.
++# --with-cc compiler to use for $CC (useful if cc is a disguised gcc)
+ #
+ # --test-sanity Make a number of sanity checks on the data in this file.
+ # This is a debugging tool for OpenSSL developers.
+@@ -112,6 +113,7 @@
+ #$bits2="THIRTY_TWO_BIT ";
+ my $bits1="THIRTY_TWO_BIT ";
+ my $bits2="SIXTY_FOUR_BIT ";
++my $ccarg;
+ my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o:dx86-elf.o
yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o
s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o";
+ my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o
yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o
s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o";
+@@ -696,6 +698,10 @@
+ {
+ exit(&test_sanity());
+ }
++ elsif (/^--with-cc=(.*)$/)
++ {
++ $ccarg=$1
++ }
+ elsif (/^reconfigure/ || /^reconf/)
+ {
+ if (open(IN,"<$Makefile"))
+@@ -948,7 +954,7 @@
+ print "IsMK1MF=$IsMK1MF\n";
+
+ my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
+-my $cc = $fields[$idx_cc];
++my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
+ my $cflags = $fields[$idx_cflags];
+ my $unistd = $fields[$idx_unistd];
+ my $thread_cflag = $fields[$idx_thread_cflag];
Index: config
---- config.orig 2007-02-22 03:00:39.000000000 +0100
-+++ config 2007-06-16 00:06:32.527799000 +0200
+--- config.orig 2007-08-01 13:21:35 +0200
++++ config 2007-10-11 22:45:07 +0200
@@ -401,9 +401,9 @@
# figure out if gcc is available and if so we use it otherwise
@@ -152,10 +148,10 @@
- if [ "$CC" = "gcc" ]; then
+ if [ $GCCVER -gt 0 ]; then
case ${ISA:-generic} in
- EV5|EV45) options="$options -march=ev5";;
- EV56|PCA56) options="$options -march=ev56";;
-@@ -591,7 +596,7 @@
- s390*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN
-DNO_ASM" ;;
+ EV5|EV45) options="$options -mcpu=ev5";;
+ EV56|PCA56) options="$options -mcpu=ev56";;
+@@ -592,7 +597,7 @@
+ s390x-*-linux2) OUT="linux-generic64"; options="$options -DB_ENDIAN" ;;
x86_64-*-linux?) OUT="linux-x86_64" ;;
*86-*-linux2) OUT="linux-elf"
- if [ "$GCCVER" -gt 28 ]; then
@@ -163,10 +159,10 @@
if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
options="$options -march=pentium"
fi
-@@ -605,17 +610,17 @@
+@@ -606,17 +611,17 @@
*-*-linux1) OUT="linux-aout" ;;
*-*-linux2) OUT="linux-generic32" ;;
- sun4u*-*-solaris2)
+ sun4[uv]*-*-solaris2)
- OUT="solaris-sparcv9-$CC"
+ OUT="solaris-sparcv9-$SUFFIX"
ISA64=`(isalist) 2>/dev/null | grep sparcv9`
@@ -184,7 +180,7 @@
# $GCC_ARCH denotes default ABI chosen by compiler driver
# (first one found on the $PATH). I assume that user
# expects certain consistency with the rest of his builds
-@@ -638,21 +643,21 @@
+@@ -639,21 +644,21 @@
fi
fi
;;
@@ -212,8 +208,8 @@
+ *-*-sunos4) OUT="sunos-$SUFFIX" ;;
*86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2
-ldl" ;;
- alpha*-*-*bsd*) OUT="BSD-generic64; options="$options -DL_ENDIAN" ;;
-@@ -676,7 +681,7 @@
+ alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
+@@ -677,7 +682,7 @@
*-*-osf) OUT="osf1-alpha-cc" ;;
*-*-tru64) OUT="tru64-alpha-cc" ;;
*-*-[Uu]nix[Ww]are7)
@@ -222,7 +218,7 @@
OUT="unixware-7-gcc" ; options="$options no-sse2"
else
OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
-@@ -687,12 +692,12 @@
+@@ -688,12 +693,12 @@
*-*-vos)
options="$options no-threads no-shared no-asm no-dso"
EXE=".pm"
@@ -237,7 +233,7 @@
OUT="hpux64-parisc2-gcc"
fi
KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
-@@ -710,8 +715,8 @@
+@@ -711,8 +716,8 @@
fi
OUT="hpux64-ia64-cc"
elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU
@@ -248,7 +244,7 @@
echo "WARNING! If you wish to build 64-bit library then you
have to"
echo " invoke './Configure hpux64-parisc2-cc'
*manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
-@@ -720,19 +725,19 @@
+@@ -721,19 +726,19 @@
fi
fi
elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
@@ -273,7 +269,7 @@
OUT="aix-gcc"
elif [ $OBJECT_MODE -eq 64 ]; then
echo 'Your $OBJECT_MODE was found to be set to 64'
-@@ -827,7 +832,7 @@
+@@ -828,7 +833,7 @@
#fi
if [ -z "$OUT" ]; then
@@ -282,7 +278,7 @@
fi
if [ ".$PERL" = . ] ; then
-@@ -859,9 +864,9 @@
+@@ -860,9 +865,9 @@
# compiler for the platform ... in which case we add it on
# the end ... otherwise we leave it off
@@ -294,7 +290,7 @@
fi
OUT="$PREFIX$OUT"
-@@ -871,9 +876,9 @@
+@@ -872,9 +877,9 @@
echo Configuring for $OUT
if [ "$TEST" = "true" ]; then
@@ -306,506 +302,3 @@
fi
else
echo "This system ($OUT) is not supported. See file INSTALL for details."
-Index: Configure
---- Configure.orig 2007-06-15 23:44:18.587483000 +0200
-+++ Configure 2007-06-16 00:06:21.005165000 +0200
-@@ -34,6 +34,7 @@
- # (Default: KRB5_DIR/include)
- # --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
- # supported values are "MIT" and "Heimdal". A value is required.
-+# --with-cc compiler to use for $CC (useful if cc is a disguised gcc)
- #
- # --test-sanity Make a number of sanity checks on the data in this file.
- # This is a debugging tool for OpenSSL developers.
-@@ -113,6 +114,7 @@
- #$bits2="THIRTY_TWO_BIT ";
- my $bits1="THIRTY_TWO_BIT ";
- my $bits2="SIXTY_FOUR_BIT ";
-+my $ccarg;
-
- my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o:dx86-elf.o
yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o
s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o";
- my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o
yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o
s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o";
-@@ -694,6 +696,10 @@
- {
- exit(&test_sanity());
- }
-+ elsif (/^--with-cc=(.*)$/)
-+ {
-+ $ccarg=$1
-+ }
- elsif (/^reconfigure/ || /^reconf/)
- {
- if (open(IN,"<$Makefile"))
-@@ -942,7 +948,7 @@
- print "IsMK1MF=$IsMK1MF\n";
-
- my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
--my $cc = $fields[$idx_cc];
-+my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
- my $cflags = $fields[$idx_cflags];
- my $unistd = $fields[$idx_unistd];
- my $thread_cflag = $fields[$idx_thread_cflag];
-Index: doc/crypto/des_modes.pod
---- doc/crypto/des_modes.pod.orig 2004-11-25 18:47:30 +0100
-+++ doc/crypto/des_modes.pod 2006-04-07 19:15:27 +0200
-@@ -4,7 +4,7 @@
-
- =head1 NAME
-
--Modes of DES - the variants of DES and other crypto algorithms of OpenSSL
-+des_modes - the variants of DES and other crypto algorithms of OpenSSL
-
- =head1 DESCRIPTION
-
-Index: crypto/evp/evp_lib.c
---- crypto/evp/evp_lib.c.orig 2006-11-29 21:47:13 +0100
-+++ crypto/evp/evp_lib.c 2007-02-28 17:19:31 +0100
-@@ -225,7 +225,7 @@
-
- int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
- {
-- return ctx->cipher->key_len;
-+ return ctx->key_len;
- }
-
- int EVP_CIPHER_nid(const EVP_CIPHER *cipher)
-Index: crypto/rand/rand_lib.c
---- crypto/rand/rand_lib.c 30 Jan 2003 17:39:23 -0000 1.16
-+++ crypto/rand/rand_lib.c 2 Mar 2007 17:54:31 -0000 1.16.2.1
-@@ -154,6 +154,7 @@
- int RAND_bytes(unsigned char *buf, int num)
- {
- const RAND_METHOD *meth = RAND_get_rand_method();
-+ memset(buf, 0, num);
- if (meth && meth->bytes)
- return meth->bytes(buf,num);
- return(-1);
-@@ -162,6 +163,7 @@
- int RAND_pseudo_bytes(unsigned char *buf, int num)
- {
- const RAND_METHOD *meth = RAND_get_rand_method();
-+ memset(buf, 0, num);
- if (meth && meth->pseudorand)
- return meth->pseudorand(buf,num);
- return(-1);
-Index: crypto/rand/randfile.c
---- crypto/rand/randfile.c 21 May 2005 17:39:52 -0000 1.47.2.1
-+++ crypto/rand/randfile.c 2 Mar 2007 17:44:55 -0000 1.47.2.2
-@@ -102,10 +102,8 @@
-
- if (file == NULL) return(0);
-
-- i=stat(file,&sb);
-- /* If the state fails, put some crap in anyway */
-+ if (stat(file,&sb) < 0) return(0);
- RAND_add(&sb,sizeof(sb),0.0);
-- if (i < 0) return(0);
- if (bytes == 0) return(ret);
-
- in=fopen(file,"rb");
-Index: crypto/x509v3/v3_pci.c
---- crypto/x509v3/v3_pci.c.orig 2007-01-21 14:16:49 +0100
-+++ crypto/x509v3/v3_pci.c 2007-03-05 13:36:31 +0100
-@@ -286,12 +286,6 @@
- X509V3err(X509V3_F_R2I_PCI,ERR_R_MALLOC_FAILURE);
- goto err;
- }
-- pci->proxyPolicy = PROXY_POLICY_new();
-- if (!pci->proxyPolicy)
-- {
-- X509V3err(X509V3_F_R2I_PCI,ERR_R_MALLOC_FAILURE);
-- goto err;
-- }
-
- pci->proxyPolicy->policyLanguage = language; language = NULL;
- pci->proxyPolicy->policy = policy; policy = NULL;
-@@ -301,11 +295,6 @@
- if (language) { ASN1_OBJECT_free(language); language = NULL; }
- if (pathlen) { ASN1_INTEGER_free(pathlen); pathlen = NULL; }
- if (policy) { ASN1_OCTET_STRING_free(policy); policy = NULL; }
-- if (pci && pci->proxyPolicy)
-- {
-- PROXY_POLICY_free(pci->proxyPolicy);
-- pci->proxyPolicy = NULL;
-- }
- if (pci) { PROXY_CERT_INFO_EXTENSION_free(pci); pci = NULL; }
- end:
- sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
-
------------------------------------------------------------------------------
-
-Temporary fix for OpenSSL to work under GCC 4.2 world order. This
-especially fixes operations like "openssl genrsa" or "ssh-keygen" under
-some 64-bit platforms like FreeBSD/amd64. The OpenSSL team is already
-working on an official fix. -- rse 20070523
-
-Derived from:
http://dev.gentoo.org/~dirtyepic/patches/openssl-0.9.8e-gcc42.patch
-
-Index: crypto/asn1/a_d2i_fp.c
---- crypto/asn1/a_d2i_fp.c.orig 2005-05-09 02:27:32 +0200
-+++ crypto/asn1/a_d2i_fp.c 2007-05-23 11:35:26 +0200
-@@ -81,6 +81,7 @@
- BIO_free(b);
- return(ret);
- }
-+const void * __attribute__((unused)) __ASN1_d2i_fp=(const
void*)openssl_fcast(ASN1_d2i_fp);
- #endif
-
- void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
-@@ -99,6 +100,7 @@
- if (b != NULL) BUF_MEM_free(b);
- return(ret);
- }
-+const void * __attribute__((unused)) __ASN1_d2i_bio=(const
void*)openssl_fcast(ASN1_d2i_bio);
-
- #endif
-
-Index: crypto/asn1/a_dup.c
---- crypto/asn1/a_dup.c.orig 2005-05-09 02:27:32 +0200
-+++ crypto/asn1/a_dup.c 2007-05-23 11:35:26 +0200
-@@ -82,6 +82,7 @@
- OPENSSL_free(b);
- return(ret);
- }
-+const void * __attribute__((unused)) __ASN1_dup=(const
void*)openssl_fcast(ASN1_dup);
-
- #endif
-
-Index: crypto/asn1/a_i2d_fp.c
---- crypto/asn1/a_i2d_fp.c.orig 2005-05-09 02:27:32 +0200
-+++ crypto/asn1/a_i2d_fp.c 2007-05-23 11:35:26 +0200
-@@ -79,6 +79,7 @@
- BIO_free(b);
- return(ret);
- }
-+const void * __attribute__((unused)) __ASN1_i2d_fp=(const
void*)openssl_fcast(ASN1_i2d_fp);
- #endif
-
- int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x)
-@@ -113,6 +114,7 @@
- OPENSSL_free(b);
- return(ret);
- }
-+const void * __attribute__((unused)) __ASN1_i2d_bio=(const
void*)openssl_fcast(ASN1_i2d_bio);
-
- #endif
-
-Index: crypto/asn1/asn1.h
---- crypto/asn1/asn1.h.orig 2006-02-19 14:45:22 +0100
-+++ crypto/asn1/asn1.h 2007-05-23 11:35:26 +0200
-@@ -902,23 +902,26 @@
-
- /* Used to implement other functions */
- void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
-+extern const void *__ASN1_dup;
- #define ASN1_dup_of(type,i2d,d2i,x) \
-- ((type *(*)(I2D_OF(type),D2I_OF(type),type
*))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+ ((type *(*)(I2D_OF(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,x)
- #define ASN1_dup_of_const(type,i2d,d2i,x) \
-- ((type *(*)(I2D_OF_const(type),D2I_OF(type),type
*))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+ ((type *(*)(I2D_OF_const(type),D2I_OF(type),type
*))__ASN1_dup)(i2d,d2i,x)
-
- void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
-
- #ifndef OPENSSL_NO_FP_API
- void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void
**x);
-+extern const void *__ASN1_d2i_fp;
- #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
-- ((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type
**))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)
-+ ((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type
**))__ASN1_d2i_fp)(xnew,d2i,in,x)
- void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
- int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
-+extern const void *__ASN1_i2d_fp;
- #define ASN1_i2d_fp_of(type,i2d,out,x) \
-- ((int (*)(I2D_OF(type),FILE *,type
*))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+ ((int (*)(I2D_OF(type),FILE *,type *))__ASN1_i2d_fp)(i2d,out,x)
- #define ASN1_i2d_fp_of_const(type,i2d,out,x) \
-- ((int (*)(I2D_OF_const(type),FILE *,type
*))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+ ((int (*)(I2D_OF_const(type),FILE *,type *))__ASN1_i2d_fp)(i2d,out,x)
- int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
- int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long
flags);
- #endif
-@@ -927,14 +930,16 @@
-
- #ifndef OPENSSL_NO_BIO
- void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void
**x);
-+extern const void *__ASN1_d2i_bio;
- #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
-- ((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type
**))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)
-+ ((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type
**))__ASN1_d2i_bio)(xnew,d2i,in,x)
- void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
- int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
-+extern const void *__ASN1_i2d_bio;
- #define ASN1_i2d_bio_of(type,i2d,out,x) \
-- ((int (*)(I2D_OF(type),BIO *,type
*))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+ ((int (*)(I2D_OF(type),BIO *,type *))__ASN1_i2d_bio)(i2d,out,x)
- #define ASN1_i2d_bio_of_const(type,i2d,out,x) \
-- ((int (*)(I2D_OF_const(type),BIO *,const type
*))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+ ((int (*)(I2D_OF_const(type),BIO *,const type
*))__ASN1_i2d_bio)(i2d,out,x)
- int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
- int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
- int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
-@@ -977,8 +982,9 @@
- void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
- ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
- ASN1_OCTET_STRING **oct);
-+extern const void *__ASN1_pack_string;
- #define ASN1_pack_string_of(type,obj,i2d,oct) \
-- ((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING
**))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)
-+ ((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING
**))__ASN1_pack_string)(obj,i2d,oct)
- ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,
ASN1_OCTET_STRING **oct);
-
- void ASN1_STRING_set_default_mask(unsigned long mask);
-Index: crypto/asn1/asn_pack.c
---- crypto/asn1/asn_pack.c.orig 2005-05-09 02:27:32 +0200
-+++ crypto/asn1/asn_pack.c 2007-05-23 11:35:26 +0200
-@@ -144,6 +144,7 @@
- i2d (obj, &p);
- return octmp;
- }
-+const void * __attribute__((unused)) __ASN1_pack_string=(const
void*)openssl_fcast(ASN1_pack_string);
-
- #endif
-
-Index: crypto/ocsp/ocsp.h
---- crypto/ocsp/ocsp.h.orig 2005-05-13 01:01:43 +0200
-+++ crypto/ocsp/ocsp.h 2007-05-23 11:35:26 +0200
-@@ -468,8 +468,9 @@
-
- ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
- void *data, STACK_OF(ASN1_OBJECT) *sk);
-+extern const void *__ASN1_STRING_encode;
- #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
--((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT)
*))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)
-+((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT)
*))__ASN1_STRING_encode)(s,i2d,data,sk)
-
- X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
-
-Index: crypto/ocsp/ocsp_ext.c
---- crypto/ocsp/ocsp_ext.c.orig 2005-03-31 15:57:53 +0200
-+++ crypto/ocsp/ocsp_ext.c 2007-05-23 11:35:26 +0200
-@@ -305,6 +305,7 @@
- if (b) OPENSSL_free(b);
- return NULL;
- }
-+const void * __attribute__((unused)) __ASN1_STRING_encode=(const
void*)openssl_fcast(ASN1_STRING_encode);
-
- /* Nonce handling functions */
-
-Index: crypto/pem/pem.h
---- crypto/pem/pem.h.orig 2006-12-19 20:47:36 +0100
-+++ crypto/pem/pem.h 2007-05-23 11:35:26 +0200
-@@ -220,19 +220,19 @@
- #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
- type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
- { \
--return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb
*,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \
-+return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb
*,void *))__PEM_ASN1_read)(d2i_##asn1, str,fp,x,cb,u)); \
- }
-
- #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
- int PEM_write_##name(FILE *fp, type *x) \
- { \
--return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER
*,unsigned char *,int, pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER
*,unsigned char *,int, pem_password_cb *,void
*))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
- int PEM_write_##name(FILE *fp, const type *x) \
- { \
--return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *,
const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *,
const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void
*))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-@@ -240,7 +240,7 @@
- unsigned char *kstr, int klen, pem_password_cb *cb, \
- void *u) \
- { \
-- return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const
EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
-+ return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const
EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void
*))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
- }
-
- #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-@@ -248,7 +248,7 @@
- unsigned char *kstr, int klen, pem_password_cb *cb, \
- void *u) \
- { \
-- return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const
EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
-+ return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const
EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void
*))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
- }
-
- #endif
-@@ -256,33 +256,33 @@
- #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
- type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
- { \
--return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb
*,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \
-+return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb
*,void *))__PEM_ASN1_read_bio)(d2i_##asn1, str,bp,x,cb,u)); \
- }
-
- #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x) \
- { \
--return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER
*,unsigned char *,int, pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL));
\
-+return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER
*,unsigned char *,int, pem_password_cb *,void
*))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, const type *x) \
- { \
--return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const
EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL));
\
-+return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const
EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void
*))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
- }
-
- #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
- unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
- { \
-- return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const
EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u));
\
-+ return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const
EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void
*))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
- }
-
- #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
- unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
- { \
-- return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const
EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u));
\
-+ return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const
EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void
*))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
- }
-
- #define IMPLEMENT_PEM_write(name, type, str, asn1) \
-@@ -545,13 +545,15 @@
- pem_password_cb *cb, void *u);
- void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
- void **x, pem_password_cb *cb, void *u);
-+extern const void *__PEM_ASN1_read_bio;
- #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
--((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
-+((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void
*))__PEM_ASN1_read_bio)(d2i,name,bp,x,cb,u)
- int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
- const EVP_CIPHER *enc,unsigned char *kstr,int klen,
- pem_password_cb *cb, void *u);
-+extern const void *__PEM_ASN1_write_bio;
- #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
-- ((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER
*,unsigned char *,int, pem_password_cb *,void
*))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u)
-+ ((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER
*,unsigned char *,int, pem_password_cb *,void
*))__PEM_ASN1_write_bio)(i2d,name,bp,x,enc,kstr,klen,cb,u)
-
- STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp,
STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
- int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
-@@ -564,11 +566,13 @@
- int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
- void * PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void
**x,
- pem_password_cb *cb, void *u);
-+extern const void *__PEM_ASN1_read;
- int PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp,
- char *x,const EVP_CIPHER *enc,unsigned char *kstr,
- int klen,pem_password_cb *callback, void *u);
- STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp,
STACK_OF(X509_INFO) *sk,
- pem_password_cb *cb, void *u);
-+extern const void *__PEM_ASN1_write;
- #endif
-
- int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
-Index: crypto/pem/pem_lib.c
---- crypto/pem/pem_lib.c.orig 2007-02-21 14:48:49 +0100
-+++ crypto/pem/pem_lib.c 2007-05-23 11:35:26 +0200
-@@ -174,6 +174,7 @@
- BIO_free(b);
- return(ret);
- }
-+const void * __attribute__((unused)) __PEM_ASN1_read=(const
void*)openssl_fcast(PEM_ASN1_read);
- #endif
-
- static int check_pem(const char *nm, const char *name)
-@@ -277,6 +278,7 @@
- BIO_free(b);
- return(ret);
- }
-+const void * __attribute__((unused)) __PEM_ASN1_write=(const
void*)openssl_fcast(PEM_ASN1_write);
- #endif
-
- int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
-@@ -381,6 +383,7 @@
- }
- return(ret);
- }
-+const void * __attribute__((unused)) __PEM_ASN1_write_bio=(const
void*)openssl_fcast(PEM_ASN1_write_bio);
-
- int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
- pem_password_cb *callback,void *u)
-Index: crypto/pem/pem_oth.c
---- crypto/pem/pem_oth.c.orig 2005-03-31 15:57:54 +0200
-+++ crypto/pem/pem_oth.c 2007-05-23 11:35:26 +0200
-@@ -84,3 +84,4 @@
- OPENSSL_free(data);
- return(ret);
- }
-+const void * __attribute__((unused)) __PEM_ASN1_read_bio=(const
void*)openssl_fcast(PEM_ASN1_read_bio);
-
------------------------------------------------------------------------------
-
-Port to MacOS X.
-
-Index: Makefile.org
---- Makefile.org.orig 2006-06-09 17:42:08.000000000 +0200
-+++ Makefile.org 2007-05-28 17:25:21.000000000 +0200
-@@ -550,6 +550,9 @@
- if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o
"$(PLATFORM)" = "mingw" ]; then \
- filecase=-i; \
- fi; \
-+ if [ "`uname`" = "Darwin" ]; then \
-+ filecase=-i; \
-+ fi; \
- set -e; for i in doc/apps/*.pod; do \
- fn=`basename $$i .pod`; \
- sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
-Index: apps/Makefile
---- apps/Makefile.orig 2007-02-23 02:01:03.000000000 +0100
-+++ apps/Makefile 2007-05-28 17:56:48.000000000 +0200
-@@ -2,6 +2,9 @@
- # apps/Makefile
- #
-
-+# Case-insensitive HFS+
-+.PHONY: install
-+
- DIR= apps
- TOP= ..
- CC= cc
-@@ -153,7 +156,7 @@
- shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
- shlib_target="$(SHLIB_TARGET)"; \
- fi; \
-- if [ "$${shlib_target}" = "darwin-shared" ] ; then \
-+ if [ "$${shlib_target}" = "darwin-shared" -o "`uname`" = "Darwin" ] ;
then \
- LIBRARIES="$(DLIBSSL) $(LIBKRB5) $(DLIBCRYPTO)" ; \
- else \
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
-Index: crypto/bf/Makefile
---- crypto/bf/Makefile.orig 2005-09-28 16:51:37.000000000 -0700
-+++ crypto/bf/Makefile 2005-09-28 16:52:25.000000000 -0700
-@@ -2,6 +2,9 @@
- # OpenSSL/crypto/blowfish/Makefile
- #
-
-+# Case-insensitive HFS+
-+.PHONY: install
-+
- DIR= bf
- TOP= ../..
- CC= cc
-Index: crypto/des/Makefile
---- crypto/des/Makefile.orig 2005-09-28 16:51:42.000000000 -0700
-+++ crypto/des/Makefile 2005-09-28 16:52:15.000000000 -0700
-@@ -2,6 +2,9 @@
- # OpenSSL/crypto/des/Makefile
- #
-
-+# Case-insensitive HFS+
-+.PHONY: install
-+
- DIR= des
- TOP= ../..
- CC= cc
-
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
