[Pkg-openssl-changes] r144 - in openssl/trunk: . apps debian engines
Kurt Roeckx
kroeckx at costa.debian.org
Thu May 4 19:13:45 UTC 2006
Author: kroeckx
Date: 2006-05-04 19:13:44 +0000 (Thu, 04 May 2006)
New Revision: 144
Modified:
openssl/trunk/Configure
openssl/trunk/Makefile.org
openssl/trunk/apps/CA.pl
openssl/trunk/apps/CA.pl.in
openssl/trunk/config
openssl/trunk/debian/changelog
openssl/trunk/engines/Makefile
Log:
Merge upstream changes from 0.9.8a.
Modified: openssl/trunk/Configure
===================================================================
--- openssl/trunk/Configure 2006-05-04 18:39:39 UTC (rev 143)
+++ openssl/trunk/Configure 2006-05-04 19:13:44 UTC (rev 144)
@@ -444,6 +444,7 @@
#### IBM's AIX.
"aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:",
+"aix64-gcc","gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn::::::-X64",
# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
# at build time. $OBJECT_MODE is respected at ./config stage!
"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
@@ -539,9 +540,9 @@
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
-"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o:::::::::::darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -fno-common -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::darwin-shared:-fPIC:-dunamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o:::::::::::darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
##### A/UX
"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
@@ -736,7 +737,7 @@
{
while (<IN>)
{
- chop;
+ chomp;
if (/^CONFIGURE_ARGS=(.*)/)
{
$argvstring=$1;
@@ -787,6 +788,14 @@
{
$withargs{"krb5-".$1}=$2;
}
+ elsif (/^--with-zlib-lib=(.*)$/)
+ {
+ $withargs{"zlib-lib"}=$1;
+ }
+ elsif (/^--with-zlib-include=(.*)$/)
+ {
+ $withargs{"zlib-include"}="-I$1";
+ }
else
{
print STDERR $usage;
@@ -905,6 +914,8 @@
{ $no_shared = 1; }
elsif (/^zlib$/)
{ $zlib = 0; }
+ elsif (/^static-engine$/)
+ { }
elsif (/^zlib-dynamic$/)
{ }
elsif (/^symlinks$/)
@@ -1163,14 +1174,17 @@
}
}
-if ($no_shared)
+if (!$IsMK1MF)
{
- $openssl_other_defines.="#define OPENSSL_NO_DYNAMIC_ENGINE\n";
+ if ($no_shared)
+ {
+ $openssl_other_defines.="#define OPENSSL_NO_DYNAMIC_ENGINE\n";
+ }
+ else
+ {
+ $openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n";
+ }
}
-else
- {
- $openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n";
- }
$cpuid_obj.=" uplink.o uplink-cof.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
# Compiler fix-ups
@@ -1292,7 +1306,7 @@
my $sdirs=0;
while (<IN>)
{
- chop;
+ chomp;
$sdirs = 1 if /^SDIRS=/;
if ($sdirs) {
my $dir;
@@ -1338,6 +1352,8 @@
s/^PERL=.*/PERL= $perl/;
s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/;
s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
+ s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
+ s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
Modified: openssl/trunk/Makefile.org
===================================================================
--- openssl/trunk/Makefile.org 2006-05-04 18:39:39 UTC (rev 143)
+++ openssl/trunk/Makefile.org 2006-05-04 19:13:44 UTC (rev 144)
@@ -100,6 +100,10 @@
KRB5_INCLUDES=
LIBKRB5=
+# Zlib stuff
+ZLIB_INCLUDE=
+LIBZLIB=
+
DIRS= crypto ssl engines apps tools
SHLIBDIRS= crypto ssl
@@ -192,12 +196,29 @@
# MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
# which in turn eliminates ambiguities in variable treatment with -e.
+# BUILD_CMD is a generic macro to build a given target in a given
+# subdirectory. The target must be given through the shell variable
+# `target' and the subdirectory to build in must be given through `dir'.
+# This macro shouldn't be used directly, use RECURSIVE_BUILD_CMD or
+# BUILD_ONE_CMD instead.
+#
+# BUILD_ONE_CMD is a macro to build a given target in a given
+# subdirectory if that subdirectory is part of $(DIRS). It requires
+# exactly the same shell variables as BUILD_CMD.
+#
+# RECURSIVE_BUILD_CMD is a macro to build a given target in all
+# subdirectories defined in $(DIRS). It requires that the target
+# is given through the shell variable `target'.
BUILD_CMD= if [ -d "$$dir" ]; then \
( cd $$dir && echo "making $$target in $$dir..." && \
$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \
) || exit 1; \
fi
RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done
+BUILD_ONE_CMD=\
+ if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
+ $(BUILD_CMD); \
+ fi
reflect:
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
@@ -208,21 +229,21 @@
build_libs: build_crypto build_ssl build_engines
build_crypto:
- @dir=crypto; target=all; $(BUILD_CMD)
+ @dir=crypto; target=all; $(BUILD_ONE_CMD)
build_ssl:
- @dir=ssl; target=all; $(BUILD_CMD)
+ @dir=ssl; target=all; $(BUILD_ONE_CMD)
build_engines:
- @dir=engines; target=all; $(BUILD_CMD)
+ @dir=engines; target=all; $(BUILD_ONE_CMD)
build_apps:
- @dir=apps; target=all; $(BUILD_CMD)
+ @dir=apps; target=all; $(BUILD_ONE_CMD)
build_tests:
- @dir=test; target=all; $(BUILD_CMD)
+ @dir=test; target=all; $(BUILD_ONE_CMD)
build_tools:
- @dir=tools; target=all; $(BUILD_CMD)
+ @dir=tools; target=all; $(BUILD_ONE_CMD)
all_testapps: build_libs build_testapps
build_testapps:
- @dir=crypto; target=testapps; $(BUILD_CMD)
+ @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
libcrypto$(SHLIB_EXT): libcrypto.a
@if [ "$(SHLIB_TARGET)" != "" ]; then \
@@ -256,7 +277,7 @@
link-shared:
@ set -e; for i in ${SHLIBDIRS}; do \
- $(MAKE) -f $(HERE)/Makefile.shared \
+ $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
symlink.$(SHLIB_TARGET); \
Modified: openssl/trunk/apps/CA.pl
===================================================================
--- openssl/trunk/apps/CA.pl 2006-05-04 18:39:39 UTC (rev 143)
+++ openssl/trunk/apps/CA.pl 2006-05-04 19:13:44 UTC (rev 144)
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# CA - wrapper around ca to make it easier to use ... basically ca requires
# some setup stuff to be done before you can use it and this makes
@@ -95,6 +95,9 @@
mkdir "${CATOP}/private", $DIRMODE;
open OUT, ">${CATOP}/index.txt";
close OUT;
+ open OUT, ">${CATOP}/crlnumber";
+ print OUT "01\n";
+ close OUT;
}
if ( ! -f "${CATOP}/private/$CAKEY" ) {
print "CA certificate filename (or enter to create)\n";
@@ -114,6 +117,7 @@
system ("$CA -create_serial " .
"-out ${CATOP}/$CACERT $CADAYS -batch " .
"-keyfile ${CATOP}/private/$CAKEY -selfsign " .
+ "-extensions v3_ca " .
"-infiles ${CATOP}/$CAREQ ");
$RET=$?;
}
Modified: openssl/trunk/apps/CA.pl.in
===================================================================
--- openssl/trunk/apps/CA.pl.in 2006-05-04 18:39:39 UTC (rev 143)
+++ openssl/trunk/apps/CA.pl.in 2006-05-04 19:13:44 UTC (rev 144)
@@ -95,6 +95,9 @@
mkdir "${CATOP}/private", $DIRMODE;
open OUT, ">${CATOP}/index.txt";
close OUT;
+ open OUT, ">${CATOP}/crlnumber";
+ print OUT "01\n";
+ close OUT;
}
if ( ! -f "${CATOP}/private/$CAKEY" ) {
print "CA certificate filename (or enter to create)\n";
@@ -114,6 +117,7 @@
system ("$CA -create_serial " .
"-out ${CATOP}/$CACERT $CADAYS -batch " .
"-keyfile ${CATOP}/private/$CAKEY -selfsign " .
+ "-extensions v3_ca " .
"-infiles ${CATOP}/$CAREQ ");
$RET=$?;
}
Modified: openssl/trunk/config
===================================================================
--- openssl/trunk/config 2006-05-04 18:39:39 UTC (rev 143)
+++ openssl/trunk/config 2006-05-04 19:13:44 UTC (rev 144)
@@ -406,7 +406,7 @@
CC=gcc
# then strip off whatever prefix egcs prepends the number with...
# Hopefully, this will work for any future prefixes as well.
- GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'`
+ GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
# Since gcc 3.1 gcc --version behaviour has changed. gcc -dumpversion
# does give us what we want though, so we use that. We just just the
# major and minor version numbers.
Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog 2006-05-04 18:39:39 UTC (rev 143)
+++ openssl/trunk/debian/changelog 2006-05-04 19:13:44 UTC (rev 144)
@@ -1,5 +1,6 @@
-openssl (0.9.8a-9) unstable; urgency=low
+openssl (0.9.8b-1) UNRELEASED; urgency=low
+ * New upstream release
* Run debconf-updatepo, which really already was in the -8 version
as it was uploaded.
* Add Galician debconf translation. Patch from
@@ -27,7 +28,7 @@
valgrind from giving error messages in unrelated code.
(Closes: #363516)
- -- Kurt Roeckx <kurt at roeckx.be> Thu, 6 Apr 2006 20:34:07 +0200
+ -- Kurt Roeckx <kurt at roeckx.be> Thu, 4 May 2006 20:40:03 +0200
openssl (0.9.8a-8) unstable; urgency=low
Modified: openssl/trunk/engines/Makefile
===================================================================
--- openssl/trunk/engines/Makefile 2006-05-04 18:39:39 UTC (rev 143)
+++ openssl/trunk/engines/Makefile 2006-05-04 19:13:44 UTC (rev 144)
@@ -1,5 +1,5 @@
#
-# SSLeay/engines/Makefile
+# OpenSSL/engines/Makefile
#
DIR= engines
@@ -84,6 +84,7 @@
# XXXXX This currently only works on systems that use .so as suffix
# for shared libraries as well as for Cygwin which uses the
# dlfcn_name_converter and therefore stores the engines with .so suffix, too.
+# XXXXX This was extended to HP-UX dl targets, which use .sl suffix.
install:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@if [ -n "$(SHARED_LIBS)" ]; then \
@@ -91,12 +92,18 @@
for l in $(LIBNAMES); do \
( echo installing $$l; \
if [ "$(PLATFORM)" != "Cygwin" ]; then \
- cp lib$$l.so $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.so.new; \
+ case "$(CFLAGS)" in \
+ *DSO_DLFCN*) sfx="so";; \
+ *DSO_DL*) sfx="sl";; \
+ *) sfx="bad";; \
+ esac; \
+ cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \
else \
- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
+ sfx="so"; \
+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
fi; \
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.so.new; \
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.so.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.so ); \
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new; \
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/ssl/engines/lib$$l.$$sfx ); \
done; \
fi
More information about the Pkg-openssl-changes
mailing list