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 d484818cd16595abc34efa20b16d6fb966b58db1..3aefd05688a31df586ea5280a7dc0c21ed86bbae 100644 (file)
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = openssl
-version    = 1.0.1b
-release    = 2
+version    = 1.0.1h
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -34,6 +34,9 @@ build
        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 {} \;
 
@@ -79,8 +82,7 @@ build
                        no-ec no-ec2m no-ecdh no-ecdsa \
                        no-srp \
                        -DSSL_FORBID_ENULL \
-                        %{ssl_arch} \
-                       fips
+                        %{ssl_arch}
 
                # Build.
                make depend
@@ -131,12 +133,16 @@ end
 
 packages
        package %{name}
+               requires += %{name}-libs = %{thisver}
+       end
 
        package %{name}-libs
                template LIBS
 
                requires += ca-certificates
 
+               conflicts += %{name} < %{thisver}
+
                files += %{libdir}/openssl
        end