X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=openssl%2Fopenssl.nm;h=aaf6b5388bee2a9dc57f5209927b267985e08f5c;hb=0c9ce6ca2b207bf98dc8571ef0677c7bdb0ca636;hp=7ddb8e1359d51cce4c2fcfce1eb065f3ab6454e2;hpb=c3cb7c9724db1649aac420bec4859e210623a131;p=ipfire-3.x.git

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 7ddb8e135..aaf6b5388 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = openssl
-version    = 1.0.1h
-release    = 2
+version    = 1.0.2d
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -31,7 +31,7 @@ build
 	end
 
 	CFLAGS += -DPURIFY
-	export RPM_OPT_FLAGS = %{CFLAGS}
+	export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS}
 
 	prepare_cmds
 		sed -e 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' \
@@ -40,9 +40,6 @@ build
 		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
@@ -57,11 +54,11 @@ build
 	end
 
 	if "%{DISTRO_ARCH}" == "armv5tel"
-		ssl_arch = linux-generic32
+		ssl_arch = linux-armv4
 	end
 
 	if "%{DISTRO_ARCH}" == "armv7hl"
-		ssl_arch = linux-generic32
+		ssl_arch = linux-armv4
 	end
 
 	build
@@ -106,8 +103,10 @@ build
 		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
@@ -118,15 +117,29 @@ build
 
 		# Rename man pages so that they don't conflict with other system man pages.
 		pushd %{BUILDROOT}%{mandir}
-		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
+		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
+
+		[[ -n "$(find -L "${d}" -type l)" ]] && exit 1 # "broken manpage links found :("
 		popd
 	end
 end