polarssl: Update to 1.3.9

[people/ms/ipfire-3.x.git] / openssl / openssl.nm

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 0cbe7f99416b0102850fd4b8a4a43d4d4a5a5d4a..3aefd05688a31df586ea5280a7dc0c21ed86bbae 100644 (file)
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = openssl
-version    = 1.0.1
+version    = 1.0.1h
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -31,8 +31,12 @@ build
        end
 
        CFLAGS += -DPURIFY
+       export RPM_OPT_FLAGS = %{CFLAGS}
 
        prepare_cmds
+               sed -e 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' \
+                       -i crypto/opensslv.h
+
                find crypto/ -name Makefile -exec \
                        sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \;
 
@@ -75,17 +79,17 @@ build
                        no-idea \
                        no-mdc2 \
                        no-rc5 \
-                       no-ec no-ecdh no-ecdsa \
+                       no-ec no-ec2m no-ecdh no-ecdsa \
                        no-srp \
                        -DSSL_FORBID_ENULL \
-                        %{ssl_arch} \
-                       fips
+                        %{ssl_arch}
 
                # Build.
-               make depend all build-shared RPM_OPT_FLAGS="%{CFLAGS}" #%{PARALLELISMFLAGS}
+               make depend
+               make all
 
                # Generate hashes for the included certs.
-               make rehash build-shared
+               make rehash
        end
 
        test
@@ -113,7 +117,7 @@ build
                cp -v -r certs %{BUILDROOT}/etc/pki/tls
 
                # Rename man pages so that they don't conflict with other system man pages.
-               pushd ${BUILDROOT}/usr/share/man
+               pushd %{BUILDROOT}%{mandir}
                for manpage in man*/*; do
                        if [ -L ${manpage} ]; then
                                TARGET=`ls -l ${manpage} | awk '{ print $NF }'`
@@ -123,23 +127,23 @@ build
                                mv ${manpage} ${manpage}ssl
                        fi
                done
-
-               mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}passwd.1
-               mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}rand.1
                popd
        end
 end
 
 packages
        package %{name}
+               requires += %{name}-libs = %{thisver}
+       end
 
        package %{name}-libs
                template LIBS
 
                requires += ca-certificates
 
-               provides += libcrypto.so.10(libcrypto.so.10)
-               provides += libssl.so.10(libssl.so.10)
+               conflicts += %{name} < %{thisver}
+
+               files += %{libdir}/openssl
        end
 
        package %{name}-devel