SPECS: openssl.spec - added man-namespace patch, use openssl_ namespace for...

[qboosh]

Author: qboosh                       Date: Wed Oct  1 18:27:08 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added man-namespace patch, use openssl_ namespace for man links too
- added asflag patch, pass --noexecstack in ASFLAG without tampering CFLAGS;
  it's sufficient to get non-exec stack with proper gcc/binutils

---- Files affected:
SPECS:
   openssl.spec (1.188 -> 1.189) 

---- Diffs:

================================================================
Index: SPECS/openssl.spec
diff -u SPECS/openssl.spec:1.188 SPECS/openssl.spec:1.189
--- SPECS/openssl.spec:1.188	Tue Sep 30 00:06:03 2008
+++ SPECS/openssl.spec	Wed Oct  1 20:27:03 2008
@@ -29,6 +29,8 @@
 Patch2:		%{name}-globalCA.diff
 Patch3:		%{name}-include.patch
 Patch4:		%{name}-libvar.patch
+Patch5:		%{name}-man-namespace.patch
+Patch6:		%{name}-asflag.patch
 URL:		http://www.openssl.org/
 BuildRequires:	bc
 BuildRequires:	perl-devel >= 1:5.6.1
@@ -192,6 +194,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
 	`grep -l -r "%{_prefix}/local/bin/perl" *`
@@ -201,9 +205,7 @@
 
 %{__perl} util/perlpath.pl %{__perl}
 
-OPTFLAGS="-Wa,--noexecstack %{rpmcflags} %{?with_purify:-DPURIFY}"
-LDFLAGS="-Wl,-z,noexecstack %{rpmldflags}"
-export OPTFLAGS LDFLAGS
+OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
 ./Configure \
 	--openssldir=%{_var}/lib/%{name} \
 	--lib=%{_lib} \
@@ -244,10 +246,11 @@
 
 %{__make} -j1 all rehash %{?with_tests:tests} \
 	CC="%{__cc}" \
+	ASFLAG='$(CFLAG) -Wa,--noexecstack' \
 	INSTALLTOP=%{_prefix}
 
-# Conv PODs to man pages. "openssl_" prefix is added to each manpage
-# to avoid potential conflicts with others packages.
+# Rename POD sources of man pages. "openssl_" prefix is added to each
+# manpage to avoid potential conflicts with other packages.
 
 for dir in doc/{apps,ssl,crypto}; do
 	cd $dir || exit 1;
@@ -266,7 +269,6 @@
 	$RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %{__make} install \
-	CC="%{__cc}" \
 	INSTALLTOP=%{_prefix} \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT \
 	MANDIR=%{_mandir}
@@ -284,14 +286,12 @@
 mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
 rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc
 
+# not installed as individual utilities (see openssl dgst instead)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{md2,md4,md5,mdc2,ripemd160,sha,sha1}.1
+
 install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
 install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
 
-rm $RPM_BUILD_ROOT%{_mandir}/{man7/des_modes.7,man5/config.5,man5/x509v3_config.5}
-echo ".so openssl_des_modes.7" > $RPM_BUILD_ROOT%{_mandir}/man7/des_modes.7
-echo ".so openssl_config.5" > $RPM_BUILD_ROOT%{_mandir}/man5/config.5
-echo ".so openssl_x509v3_config.5" > $RPM_BUILD_ROOT%{_mandir}/man5/x509v3_config.5
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -365,7 +365,8 @@
 %{_mandir}/man1/openssl_verify.1*
 %{_mandir}/man1/openssl_version.1*
 %{_mandir}/man1/openssl_x509.1*
-%{_mandir}/man5/*.5*
+%{_mandir}/man5/openssl_config.5*
+%{_mandir}/man5/openssl_x509v3_config.5*
 %lang(pl) %{_mandir}/pl/man1/openssl.1*
 
 %files tools-perl
@@ -383,7 +384,7 @@
 %{_pkgconfigdir}/libssl.pc
 %{_pkgconfigdir}/openssl.pc
 %{_mandir}/man3/openssl*.3*
-%{_mandir}/man7/*.7*
+%{_mandir}/man7/openssl_des_modes.7*
 
 %files static
 %defattr(644,root,root,755)
@@ -395,6 +396,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.189  2008/10/01 18:27:03  qboosh
+- added man-namespace patch, use openssl_ namespace for man links too
+- added asflag patch, pass --noexecstack in ASFLAG without tampering CFLAGS;
+  it's sufficient to get non-exec stack with proper gcc/binutils
+
 Revision 1.188  2008/09/29 22:06:03  pawelz
 - decrease rel (I forgot to do it in last commit)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssl.spec?r1=1.188&r2=1.189&f=u