make: Update to 4.2.1

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

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 4c27b89f00d28f1aca7536639242d8898a25a354..aaf6b5388bee2a9dc57f5209927b267985e08f5c 100644 (file)
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = openssl
-version    = 1.0.0f
-release    = 2
+version    = 1.0.2d
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -30,13 +30,16 @@ build
                zlib-devel
        end
 
+       CFLAGS += -DPURIFY
+       export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS}
+
        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 {} \;
 
-               # # Modify the various perl scripts to reference perl in the right location.
-               perl util/perlpath.pl /usr/bin
-
                # Generate a table with the compile settings for my perusal.
                touch Makefile
                make TABLE PERL=/usr/bin/perl
@@ -51,7 +54,11 @@ build
        end
 
        if "%{DISTRO_ARCH}" == "armv5tel"
-               ssl_arch = linux-generic32
+               ssl_arch = linux-armv4
+       end
+
+       if "%{DISTRO_ARCH}" == "armv7hl"
+               ssl_arch = linux-armv4
        end
 
        build
@@ -69,35 +76,37 @@ build
                        no-idea \
                        no-mdc2 \
                        no-rc5 \
-                       no-ec no-ecdh no-ecdsa \
+                       no-ec2m \
+                       no-srp \
                        -DSSL_FORBID_ENULL \
                         %{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
+               # Revert ca-dir patch. Otherwise the tests will fail.
+               patch -Np1 -R < %{DIR_PATCHES}/openssl-1.0.0-beta4-ca-dir.patch
+
                make test
        end
 
        install
                make install build-shared INSTALL_PREFIX=%{BUILDROOT}
 
-               mkdir -pv %{BUILDROOT}/%{lib}
-               mv -vf %{BUILDROOT}%{libdir}/lib{crypto,ssl}.so.* %{BUILDROOT}/%{lib}
-               ln -svf ../../%{lib}/libcrypto.so.10 %{BUILDROOT}%{libdir}/libcrypto.so
-               ln -svf ../../%{lib}/libssl.so.10 %{BUILDROOT}%{libdir}/libssl.so
-
                # Install manpages do right place
                mkdir -pv %{BUILDROOT}/usr/share
                mv -v %{BUILDROOT}/etc/pki/tls/man %{BUILDROOT}/usr/share/
 
-               mkdir -pv %{BUILDROOT}%{libdir}/openssl
-               mv -v %{BUILDROOT}%{libdir}/engines %{BUILDROOT}%{libdir}/openssl
+               if [ -d "%{BUILDROOT}%{libdir}/engines" ]; then
+                       mkdir -pv %{BUILDROOT}%{libdir}/openssl
+                       mv -v %{BUILDROOT}%{libdir}/engines %{BUILDROOT}%{libdir}/openssl
+               fi
 
                mkdir -pv %{BUILDROOT}/etc/pki/CA/private
                chmod -v 700 -R %{BUILDROOT}/etc/pki/CA
@@ -107,25 +116,48 @@ 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
-               for manpage in man*/*; do
-                       if [ -L ${manpage} ]; then
-                               TARGET=`ls -l ${manpage} | awk '{ print $NF }'`
-                               ln -snf ${TARGET}ssl ${manpage}ssl
-                               rm -f ${manpage}
-                       else
-                               mv ${manpage} ${manpage}ssl
-                       fi
+               pushd %{BUILDROOT}%{mandir}
+               for m in $(find . -type f | xargs grep -L '#include'); do
+                       d="${m%/*}"
+                       d="${d#./}"
+                       m="${m##*/}"
+                       [[ ${m} == openssl.1* ]] && continue
+                       [[ -n "$(find -L "${d}" -type l)" ]] && exit 1
+                       mv ${d}/{,ssl-}${m}
+
+                       # fix up references to renamed man pages
+                       sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' "${d}/ssl-${m}"
+                       ln -s "ssl-${m}" "${d}/openssl-${m}"
+
+                       # locate any symlinks that point to this man page ... we assume
+                       # that any broken links are due to the above renaming
+                       for s in $(find -L "${d}" -type l); do
+                               s="${s##*/}"
+                               rm -f "${d}/${s}"
+                               ln -s "ssl-${m}" "${d}/ssl-${s}"
+                               ln -s "ssl-${s}" "${d}/openssl-${s}"
+                       done
                done
 
-               mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}passwd.1
-               mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}rand.1
+               [[ -n "$(find -L "${d}" -type l)" ]] && exit 1 # "broken manpage links found :("
                popd
        end
 end
 
 packages
        package %{name}
+               requires += %{name}-libs = %{thisver}
+       end
+
+       package %{name}-libs
+               template LIBS
+
+               requires += ca-certificates
+
+               conflicts += %{name} < %{thisver}
+
+               files += %{libdir}/openssl
+       end
 
        package %{name}-devel
                template DEVEL