merge into Vine6

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

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.1k
+%define version 1.0.1m
 %define release 1%{_dist_release}
 
 Summary: Secure Sockets Layer Toolkit
@@ -13,9 +13,9 @@ Source6: make-dummy-cert
 Source7: renew-dummy-cert
 
 Patch0: openssl-1.0.0-soversion.patch
-Patch2: openssl-1.0.0-rpm_opt.patch
+Patch2: openssl-1.0.1-rpm_opt.patch
 Patch4: openssl-1.0.0-enginesdir.patch
-Patch5: openssl-0.9.8j-version-add-engines.patch
+Patch5: openssl-1.0.1m-version-add-engines.patch
 Patch8: openssl-1.0.1c-perlfind.patch
 
 # security fix
@@ -329,6 +329,12 @@ touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/openssl.cnf
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 %changelog
+* Sun Apr 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.1m-1
+- merged into Vine6
+  * Fri Mar 20 2015 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.1m-1
+  - new upstream release with security fixes  
+  - update Patch2,5
+
 * Mon Jan 12 2015 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.1k-1
 - new upstream release with security fixes  
 

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.8r
+%define version 0.9.8zf
 %define release 1%{_dist_release}
 
 Summary: Secure Sockets Layer Toolkit
@@ -15,6 +15,7 @@ Source5: make-dummy-cert
 Patch0: openssl-0.9.8b-soversion.patch
 Patch2: openssl-0.9.8e-rpm_opt.patch
 Patch4: openssl-0.9.8p-enginesdir.patch
+Patch8: openssl-0.9.8zf-perlfind.patch
 
 # security fix
 # nothing ;-)
@@ -49,6 +50,7 @@ provide various cryptographic algorithms and protocols.
 %patch0 -p1 -b .soversion
 %patch2 -p1 -b .rpm_opt
 %patch4 -p1 -b .enginesdir
+%patch8 -p1 -b .perlfind
 
 # security fix
 # nothing ;-)
@@ -237,6 +239,20 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 %changelog
+* Sun Apr 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.8zf-1
+- merge into Vine6
+  * Fri Mar 20 2015 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8zf-1
+  - new upstream release with security fix 
+  * Sat Jan 10 2015 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8zd-1
+  - new upstream release with security fix
+  * Thu Oct 23 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8zc-1
+  - new upstream release with security fix
+  * Thu Aug  7 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8zb-1
+  - new upstream release with security fix   
+  * Sat Jun  7 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8za-1
+  - new upstream release with security fix  
+- add Patch8: openssl-0.9.8zf-perlfind.patch
+
 * Fri Feb 11 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8r-1
 - new upstream release with security fix 
 
@@ -286,7 +302,7 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
 - new upstream release
 - new versioning policy
 
-* Fri Oct 27 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.9.8g-0vl1
+* Sat Oct 27 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.9.8g-0vl1
 - new upstream release
 - drop patch10,20 which is merged in upstream
 
@@ -302,7 +318,7 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
 * Tue May 15 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.9.8e-0vl1
 - new upstream release
 
-* Sat Dec 24 2006 Satosh IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.7l-0vl2
+* Sun Dec 24 2006 Satosh IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.7l-0vl2
 - update (fix) openssl.pc <BTS:437>
 
 * Fri Sep 29 2006 Satosh IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.7l-0vl1
@@ -356,7 +372,7 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
 * Wed Jun 04 2003 HOTTA Michihide <hotta@net-newbie.com> 0.9.6j-0vl2
 - add openssl.pc for pkgconfig
 
-* Fri Mar 11 2003 Satoshi MACHINO <machino@vinelinux.org> 0.9.6j-0vl1
+* Tue Mar 11 2003 Satoshi MACHINO <machino@vinelinux.org> 0.9.6j-0vl1
 - New upstream version
 - dropped patch10, 11
 	-- merged upstream version
@@ -446,7 +462,7 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
 - adjust the hobble script to not disturb symlinks in include/ (fix from
   Joe Orton)
 
-* Fri Apr 26 2001 Nalin Dahyabhai <nalin@redhat.com>
+* Thu Apr 26 2001 Nalin Dahyabhai <nalin@redhat.com>
 - drop the m2crypo patch we weren't using
 
 * Tue Apr 24 2001 Nalin Dahyabhai <nalin@redhat.com>