Browse Source

openssl: update to 1.0.2g with security fixes

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10063 ec354946-7b23-47d6-9f5a-488ba84defc7
iwamoto 8 years ago
parent
commit
5fe4f19ce4
1 changed files with 12 additions and 10 deletions
  1. 12 10
      o/openssl/openssl-vl.spec

+ 12 - 10
o/openssl/openssl-vl.spec

@@ -1,6 +1,6 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define soversion 10
-%define version 1.0.1q
+%define version 1.0.2g
 %define release 1%{_dist_release}
 
 Summary: Secure Sockets Layer Toolkit
@@ -12,10 +12,11 @@ Source2: Makefile.certificate
 Source6: make-dummy-cert
 Source7: renew-dummy-cert
 
-Patch0: openssl-1.0.0-soversion.patch
-Patch2: openssl-1.0.1-rpm_opt.patch
-Patch4: openssl-1.0.0-enginesdir.patch
-Patch5: openssl-1.0.1m-version-add-engines.patch
+# Patch0: openssl-1.0.2-soversion.patch
+# Patch2: openssl-1.0.1-rpm_opt.patch
+Patch0: openssl-1.0.2g-rpmbuild.patch
+Patch4: openssl-1.0.2g-enginesdir.patch
+Patch5: openssl-1.0.2a-version-add-engines.patch
 Patch8: openssl-1.0.1c-perlfind.patch
 
 # security fix
@@ -98,8 +99,8 @@ supported by OpenSSL.
 
 %prep
 %setup -q -n openssl-%{version}
+
 %patch0 -p1 -b .soversion
-%patch2 -p1 -b .rpm_opt
 %patch4 -p1 -b .enginesdir
 %patch5 -p1 -b .version-add-engines
 %patch8 -p1 -b .perlfind
@@ -109,12 +110,9 @@ supported by OpenSSL.
 
 chmod 644 FAQ LICENSE CHANGES NEWS INSTALL README
 chmod 644 doc/README doc/c-indentation.el doc/openssl.txt
-chmod 644 doc/openssl_button.html doc/openssl_button.gif
+# chmod 644 doc/openssl_button.html doc/openssl_button.gif
 chmod 644 doc/ssleay.txt
 
-# Link the configuration header to the one we're going to make.
-# ln -sf ../../crypto/opensslconf.h include/openssl/
-
 %build 
 PATH=${PATH}:${PWD}/bin
 TOPDIR=${PWD}
@@ -329,6 +327,10 @@ touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/openssl.cnf
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 %changelog
+* Wed Mar  9 2016 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.2g-1
+- new upstream release 1.0.2 with security fixes
+- Patch2 is merged into Patch0
+
 * Mon Dec 28 2015 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.1q-1
 - new upstream release with security fixes