openssl/openssl098: new upstream release with security fix

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2673 ec354946-7b23-47d6-9f5a-488ba84defc7

o/openssl/openssl-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define soversion 10
-%define version 1.0.0c
-%define release 4%{_dist_release}
+%define version 1.0.0d
+%define release 1%{_dist_release}
 
 Summary: Secure Sockets Layer Toolkit
 Name: openssl
@@ -11,7 +11,7 @@ Source: openssl-%{version}.tar.gz
 Source2: Makefile.certificate
 Source3: ca-bundle.crt
 Source5: make-dummy-cert
-Source6: openssl-%{version}.pc
+# Source6: openssl-%{version}.pc
 Patch0: openssl-1.0.0-soversion.patch
 Patch2: openssl-1.0.0-rpm_opt.patch
 Patch4: openssl-1.0.0-enginesdir.patch
@@ -315,6 +315,9 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 11 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0d-1
+- new upstream release with security fix
+
 * Sat Jan 15 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0c-4
 - use upstream openssl.pc instead of vine original one (SOURCE6)
 

o/openssl098/openssl098-vl.spec

@@ -1,6 +1,6 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define soversion 6
-%define version 0.9.8q
+%define version 0.9.8r
 %define release 1%{_dist_release}
 
 Summary: Secure Sockets Layer Toolkit
@@ -11,7 +11,7 @@ Source: openssl-%{version}.tar.gz
 Source2: Makefile.certificate
 Source3: ca-bundle.crt
 Source5: make-dummy-cert
-Source6: openssl-%{version}.pc
+# Source6: openssl-%{version}.pc
 Patch0: openssl-0.9.8b-soversion.patch
 Patch2: openssl-0.9.8e-rpm_opt.patch
 Patch4: openssl-0.9.8p-enginesdir.patch
@@ -149,7 +149,7 @@ for lib in $RPM_BUILD_ROOT/%{_lib}/*.so.%{version} ; do
 	ln -s -f ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`
         ln -s -f `basename ${lib}` $RPM_BUILD_ROOT/%{_lib}/`basename ${lib} .%{version}`.%{soversion}
 done
-install -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/openssl.pc
+# install -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/openssl.pc
 
 # Install a makefile for generating keys and self-signed certs, and a script
 # for generating them on the fly.
@@ -187,12 +187,12 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
 
 # Fix libdir.
 #sed 's,^libdir=${exec_prefix}/lib,libdir=${exec_prefix}/%{_lib},g' \
-sed 's,^libdir=/usr/lib,libdir=%{_libdir},g' \
-        $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc > \
-        $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp && \
-cat $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp > \
-        $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc && \
-rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
+# sed 's,^libdir=/usr/lib,libdir=%{_libdir},g' \
+#         $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc > \
+#         $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp && \
+# cat $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp > \
+#         $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc && \
+# rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -237,6 +237,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 11 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8r-1
+- new upstream release with security fix 
+
 * Thu Dec 30 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8q-1
 - new upstream release with security fix
 - update patch4