Browse Source

update: openssl 0.9.8m-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@676 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 15 years ago
parent
commit
b0abd46f93
1 changed files with 16 additions and 10 deletions
  1. 16 10
      o/openssl/openssl-vl.spec

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

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define soversion 6
-%define version 0.9.8k
-%define release 5%{_dist_release}
+%define version 0.9.8m
+%define release 1%{_dist_release}
 
 Summary: Secure Sockets Layer Toolkit
 Name: openssl
@@ -14,18 +14,16 @@ Source5: make-dummy-cert
 Source6: openssl-%{version}.pc
 Patch0: openssl-0.9.8b-soversion.patch
 Patch2: openssl-0.9.8e-rpm_opt.patch
-Patch4: openssl-0.9.8a-enginesdir.patch
+Patch4: openssl-0.9.8m-enginesdir.patch
 
 # security fix
-Patch10: openssl-0.9.8k-dtls-dos.patch
-Patch11: openssl-0.9.8-CVE-2009-4355.patch
-Patch12: openssl-0.9.8k_CVE-2009-3555.patch
+# nothing ;-)
 
 License: BSDish
 Group: System Environment/Libraries
 URL: http://www.openssl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPreReq: perl, sed
+BuildRequires: perl, sed
 Requires: mktemp
 Packager: Daisuke SUZUKI <daisuke@linux.or.jp>
 Vendor: Project Vine
@@ -85,9 +83,7 @@ supported by OpenSSL.
 %patch4 -p1 -b .enginesdir
 
 # security fix
-%patch10 -p1 -b .dtls-dos
-%patch11 -p1 -b .CVE-2009-4355
-%patch12 -p1 -b .CVE-2009-3555
+# nothing ;-)
 
 chmod 644 FAQ LICENSE CHANGES NEWS INSTALL README
 chmod 644 doc/README doc/c-indentation.el doc/openssl.txt
@@ -296,6 +292,16 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 %changelog
+* Thu Mar 18 2010 IWAI, Masaharu <iwai@alib.jp> 0.9.8m-1
+- new upstream release
+- update enginsdir patch (Patch4)
+- drop unnecessary patch: upstream fixed
+  - dtls dos patch (Patch10)
+  - CVE-2009-4355 (memory leak) patch (Patch11)
+  - CVE-2009-3555 (renegotiation) patch (Patch12)
+- update SOURCE6 for pkgconfig
+- replace BuildPreReq to BuildRequires
+
 * Sun Jan 17 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8k-5
 - add patch12 for fix CVE-2009-3555 (renegotiation)