diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-04-07 15:49:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-04-07 15:49:47 +0000 |
| commit | 2fc90762c2e1418fbd51f73d3ef635e67f5fb325 (patch) | |
| tree | df5e090b9b4e818b4bdae6ec3abddbdfa8cd15f4 /core/openssl | |
| parent | 4c23918658d01f7b66657021185a976a17a4a2d7 (diff) | |
| download | aports-2fc90762c2e1418fbd51f73d3ef635e67f5fb325.tar.bz2 aports-2fc90762c2e1418fbd51f73d3ef635e67f5fb325.tar.xz | |
core/openssl: upgrade to 0.9.8k
Diffstat (limited to 'core/openssl')
| -rw-r--r-- | core/openssl/APKBUILD | 17 | ||||
| -rw-r--r-- | core/openssl/openssl-0.9.8k-quote-cc.patch | 72 |
2 files changed, 83 insertions, 6 deletions
diff --git a/core/openssl/APKBUILD b/core/openssl/APKBUILD index 67bce486fe..7f2dc27650 100644 --- a/core/openssl/APKBUILD +++ b/core/openssl/APKBUILD @@ -1,5 +1,6 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openssl -pkgver=0.9.8j +pkgver=0.9.8k pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url=http://openssl.org @@ -12,19 +13,23 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz http://www.linuxfromscratch.org/patches/blfs/svn/openssl-0.9.8g-fix_manpages-1.patch openssl-bb-basename.patch + openssl-0.9.8k-quote-cc.patch " build() { - cd $startdir/src/$pkgname-$pkgver + cd "$startdir"/src/$pkgname-$pkgver + for i in ../*.patch; do + msg "Applying $i..." + patch -p1 < $i || return 1 + done - patch -p1 -i ../openssl-0.9.8g-fix_manpages-1.patch || return 1 - patch -p1 -i ../openssl-bb-basename.patch || return 1 ./config --prefix=/usr --openssldir=/etc/ssl shared make -j1 || return 1 make INSTALL_PREFIX=$startdir/pkg MANDIR=/usr/share/man install } -md5sums="a5cb5f6c3d11affb387ecf7a997cac0c openssl-0.9.8j.tar.gz +md5sums="e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz 04a6a88c2ee4badd4f8649792b73eaf3 openssl-0.9.8g-fix_manpages-1.patch -c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch" +c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch +c838eb8488896cfeb7de957a0cbe04ae openssl-0.9.8k-quote-cc.patch" diff --git a/core/openssl/openssl-0.9.8k-quote-cc.patch b/core/openssl/openssl-0.9.8k-quote-cc.patch new file mode 100644 index 0000000000..5a61662886 --- /dev/null +++ b/core/openssl/openssl-0.9.8k-quote-cc.patch @@ -0,0 +1,72 @@ +--- openssl-0.9.8k/Makefile.orig 2009-04-07 12:28:31.000000000 +0000 ++++ openssl-0.9.8k/Makefile 2009-04-07 12:30:13.000000000 +0000 +@@ -359,7 +359,7 @@ + $(AR) libcrypto.a fips/fipscanister.o ; \ + else \ + if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ +- FIPSLD_CC=$(CC); CC=fips/fipsld; \ ++ FIPSLD_CC="$(CC)"; CC=fips/fipsld; \ + export CC FIPSLD_CC; \ + fi; \ + $(MAKE) -e SHLIBDIRS='crypto' build-shared; \ +@@ -382,9 +382,9 @@ + fips/fipscanister.o: build_fips + libfips$(SHLIB_EXT): fips/fipscanister.o + @if [ "$(SHLIB_TARGET)" != "" ]; then \ +- FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \ + $(MAKE) -f Makefile.shared -e $(BUILDENV) \ +- CC=$${CC} LIBNAME=fips THIS=$@ \ ++ CC="$${CC}" LIBNAME=fips THIS=$@ \ + LIBEXTRAS=fips/fipscanister.o \ + LIBDEPS="$(EX_LIBS)" \ + LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \ +--- openssl-0.9.8k/apps/Makefile.orig 2009-04-07 12:35:30.000000000 +0000 ++++ openssl-0.9.8k/apps/Makefile 2009-04-07 12:56:53.000000000 +0000 +@@ -153,12 +153,12 @@ + shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ + shlib_target="$(SHLIB_TARGET)"; \ + elif [ -n "$(FIPSCANLIB)" ]; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + fi; \ + LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ + [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ ++ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + -(cd ..; \ +--- openssl-0.9.8k/test/Makefile.orig 2009-04-07 13:26:06.000000000 +0000 ++++ openssl-0.9.8k/test/Makefile 2009-04-07 13:26:38.000000000 +0000 +@@ -402,13 +402,13 @@ + if [ "$(FIPSCANLIB)" = "libfips" ]; then \ + LIBRARIES="-L$(TOP) -lfips"; \ + elif [ -n "$(FIPSCANLIB)" ]; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \ + else \ + LIBRARIES="$(LIBCRYPTO)"; \ + fi; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ ++ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + +@@ -417,11 +417,11 @@ + fi; \ + LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ + if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + fi; \ + [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ ++ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + |