updated to 0.9.5

Changed files:
    openssl-perl.patch -> 1.4
    openssl.spec -> 1.22

diff --git a/openssl-perl.patch b/openssl-perl.patch
index 68ba33d640f86c951c0da6aae5fc3b1eb6c2e04d..41a9976d9e4b2cb653acf3251f3c9dba716cd1df 100644 (file)
--- a/openssl-perl.patch
+++ b/openssl-perl.patch
@@ -1,17 +1,23 @@
-diff -urN openssl-0.9.3a/apps/CA.pl openssl-0.9.3a.new/apps/CA.pl
---- openssl-0.9.4/apps/CA.pl   Thu May 20 04:09:46 1999
-+++ openssl-0.9.4.new/apps/CA.pl       Wed Jul 21 13:04:11 1999
+--- openssl-0.9.5/apps/CA.pl.wiget     Mon Feb 28 15:30:31 2000
++++ openssl-0.9.5/apps/CA.pl   Fri Mar  3 10:09:56 2000
 @@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
+-#!/sw/bin/perl
 +#!/usr/bin/perl
  #
  # CA - wrapper around ca to make it easier to use ... basically ca requires
  #      some setup stuff to be done before you can use it and this makes
-diff -urN openssl-0.9.3a/apps/der_chop openssl-0.9.3a.new/apps/der_chop
---- openssl-0.9.4/apps/der_chop        Sat May 29 16:17:16 1999
-+++ openssl-0.9.4.new/apps/der_chop    Wed Jul 21 13:05:07 1999
+--- openssl-0.9.5/apps/der_chop.wiget  Mon Feb 28 15:30:31 2000
++++ openssl-0.9.5/apps/der_chop        Fri Mar  3 10:10:38 2000
 @@ -1,4 +1,4 @@
--#!/usr/local/bin/perl5
+-#!/sw/bin/perl
++#!/usr/bin/perl
+ #
+ # der_chop ... this is one total hack that Eric is really not proud of
+ #              so don't look at it and don't ask for support
+--- openssl-0.9.5/apps/der_chop.in.wiget       Wed May 26 00:31:49 1999
++++ openssl-0.9.5/apps/der_chop.in     Fri Mar  3 10:10:29 2000
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
 +#!/usr/bin/perl
  #
  # der_chop ... this is one total hack that Eric is really not proud of

diff --git a/openssl.spec b/openssl.spec
index ff8a4e0412a74cf6227f98cc18d14ae4f7ead9a1..c8e1f414f9566477804b1f409afcc1da88f20213 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,9 +1,10 @@
+%include       /usr/lib/rpm/macros.perl
 Summary:       Library and toolkit for the "Secure Sockets Layer" (SSL v2/v3)
 Summary(de):   Secure Sockets Layer (SSL)-Kommunikationslibrary & Utilities
 Summary(fr):   Utilitaires et librairies de communication SSL (Secure Sockets Layer)
 Name:          openssl
-Version:       0.9.4
-Release:       2
+Version:       0.9.5
+Release:       1
 Group:                 Libraries
 Group(pl):     Biblioteki
 Source:        ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -77,25 +78,24 @@ Statyczna wersja biblioteki OpenSSL.
 
 %prep
 %setup -q 
-%patch -p1
+%patch -p1 
 
 %build
-for i in ` echo Configure Makefile.org `; do
-        sed -e 's#-m486##g' \
-               -e 's#-O3 -fomit-frame-pointer#%{optflags}#g' \
-               <$i >$i.work
-        mv $i.work $i
+for i in Configure Makefile.org ; do
+        perl -pi -e 's#-m486##g' $i
+       perl -pi -e 's#-O3 -fomit-frame-pointer#%{optflags}#g' $i
 done
 
 perl util/perlpath.pl %{_bindir}
 
-ln -s crypto sslcrypto
-
 ./config --openssldir=%{openssldir}
 
 make OPT_FLAGS="$RPM_OPT_FLAGS" linux-shared
 make INSTALLTOP=%{_prefix} OPT_FLAGS="$RPM_OPT_FLAGS"
 make rehash
+#cd perl
+#perl Makefile.PL
+#make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -110,6 +110,9 @@ install libRSAglue.a        $RPM_BUILD_ROOT%{_libdir}
 install lib*.so.*.*    $RPM_BUILD_ROOT%{_libdir}
 cp -d  lib*.so         $RPM_BUILD_ROOT%{_libdir}
 
+#cd perl
+#make install DESTDIR=$RPM_BUILD_ROOT
+#cd ..
 
 mv $RPM_BUILD_ROOT%{openssldir}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}
 ln -s %{_sysconfdir}/openssl.cnf \
@@ -123,7 +126,7 @@ strip $RPM_BUILD_ROOT%{_bindir}/* || :
 strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* || :
 
 gzip -9fn CHANGES CHANGES.SSLeay LICENSE NEWS README \
-       doc/*.pod doc/*.txt
+       doc/*.txt doc/*/*pod
 
 %post
 %{_bindir}/c_rehash certs
@@ -137,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc {CHANGES,CHANGES.SSLeay,LICENSE,NEWS,README}.gz
-%doc doc/*.pod.gz doc/*.txt.gz
+%doc doc/*.txt.gz doc/apps 
 %doc doc/openssl_button.gif doc/openssl_button.html
 
 %attr(755,root,root) %{_bindir}/*
@@ -151,6 +154,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/ssl doc/crypto
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_pkgincludedir}