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