- mark stack as non-executable for PaX kernel.

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index e042233af08e7fac386be524d172a25f569363cb..0d16e33baba7b68238fb4fafb8aa679f7534183f 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -14,12 +14,12 @@ Summary(pt_BR.UTF-8):       Uma biblioteca C que fornece vários algoritmos e protocol
 Summary(ru.UTF-8):     Библиотеки и утилиты для соединений через Secure Sockets Layer
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
-Version:       0.9.8e
-Release:       1
-License:       Apache-style License
+Version:       0.9.8g
+Release:       2
+License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 3a7ff24f6ea5cd711984722ad654b927
+# Source0-md5: acf70a16359bf3658bdfb74bda1c4419
 Source1:       %{name}-ca-bundle.crt
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
@@ -41,6 +41,8 @@ Obsoletes:    SSLeay-perl
 Obsoletes:     libopenssl0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                specflags       -Wl,-z,noexecstack
+
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
 commercial-grade, full-featured, and Open Source toolkit implementing
@@ -249,57 +251,17 @@ export OPTFLAGS LDFLAGS
 
 # Conv PODs to man pages. "openssl_" prefix is added to each manpage
 # to avoid potential conflicts with others packages.
-center="OpenSSL 0.9.7"
-rel="OpenSSL 0.9.7"
-
-cd doc/apps || exit 1
-%{__perl} -pi -e 's/(\W)((?<!openssl_)\w+)(\(\d\))/$1openssl_$2$3/g; s/openssl_openssl/openssl/g;' *.pod;
-
-for pod in *.pod; do
-       if [ $pod != "openssl.pod" ]; then
-               mv -f $pod openssl_$pod;
-               pod=openssl_$pod;
-       fi
-
-       sec=1
-       if [ $pod = "openssl_config.pod" ]; then
-               sec=5
-       fi
-
-       manpage=`basename $pod .pod`.$sec;
-       pod2man --section="$sec" --release="$rel" --center="$center" \
-               $pod > $manpage;
-       echo "$manpage";
-done
-cd ..
 
-sec=3
-for dir in ssl crypto; do
+for dir in doc/{apps,ssl,crypto}; do
        cd $dir || exit 1;
-       if [ $dir = "ssl" ]; then
-               rel="OpenSSL SSL/TLS library"
-       elif [ $dir = "crypto" ]; then
-               rel="OpenSSL cryptographic library"
-       fi
-
        %{__perl} -pi -e 's/(\W)((?<!openssl_)\w+)(\(\d\))/$1openssl_$2$3/g; s/openssl_openssl/openssl/g;' *.pod;
 
-       for pod in *.pod; do
-               sec=`[ "$pod" = "des_modes.pod" ] && echo 7 || echo 3`;
+       for pod in !(openssl*).pod; do
                mv -f $pod openssl_$pod;
-               pod=openssl_$pod;
-               manpage=`basename $pod .pod`.$sec;
-               pod2man --section="$sec" --release="$rel" --center=" " $pod > $manpage;
-               echo "$manpage";
        done
-       cd ..
+       cd ../..
 done
 
-#cd perl
-#%%{__perl} Makefile.PL \
-#      INSTALLDIRS=vendor
-#%{__make}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
@@ -325,22 +287,13 @@ ln -s %{_sysconfdir}/%{name}/openssl.cnf \
 mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
 rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/c_rehash $RPM_BUILD_ROOT%{_libdir}/%{name}
-
-find $RPM_BUILD_ROOT%{_mandir} -type f | xargs rm -f
-install doc/apps/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install doc/apps/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
-install doc/ssl/*.3 doc/crypto/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
-install doc/crypto/*.7 $RPM_BUILD_ROOT%{_mandir}/man7
 install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
 install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
 
-rm $RPM_BUILD_ROOT%{_mandir}/man5/x509v3_config.5
-echo ".so openssl_x509v3_config.5" > $RPM_BUILD_ROOT%{_mandir}/man5/x509v3_config.5
-rm $RPM_BUILD_ROOT%{_mandir}/man5/config.5
+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
-rm $RPM_BUILD_ROOT%{_mandir}/man7/Modes_of_DES.7
-echo ".so openssl_des_modes.7" > $RPM_BUILD_ROOT%{_mandir}/man7/Modes_of_DES.7
+echo ".so openssl_x509v3_config.5" > $RPM_BUILD_ROOT%{_mandir}/man5/x509v3_config.5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -415,14 +368,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/openssl_verify.1*
 %{_mandir}/man1/openssl_version.1*
 %{_mandir}/man1/openssl_x509.1*
-%{_mandir}/man1/openssl_x509v3_config.1*
 %{_mandir}/man5/*.5*
 %lang(pl) %{_mandir}/pl/man1/openssl.1*
 
 %files tools-perl
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/c_rehash
 %attr(755,root,root) %{_libdir}/%{name}/CA.pl
-%attr(755,root,root) %{_libdir}/%{name}/c_rehash
 %{_mandir}/man1/openssl_CA.pl.1*
 
 %files devel