Преглед изворни кода

openssl: update to 1.0.0c

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2472 ec354946-7b23-47d6-9f5a-488ba84defc7
iwamoto пре 14 година
родитељ
комит
fbc9e40d65
1 измењених фајлова са 49 додато и 15 уклоњено
  1. 49 15
      o/openssl/openssl-vl.spec

+ 49 - 15
o/openssl/openssl-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-%define soversion 6
-%define version 0.9.8q
-%define release 2%{_dist_release}
+%define soversion 10
+%define version 1.0.0c
+%define release 3%{_dist_release}
 
 
 Summary: Secure Sockets Layer Toolkit
 Summary: Secure Sockets Layer Toolkit
 Name: openssl
 Name: openssl
@@ -12,20 +12,19 @@ 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
-Patch2: openssl-0.9.8e-rpm_opt.patch
-Patch4: openssl-0.9.8p-enginesdir.patch
+Patch0: openssl-1.0.0-soversion.patch
+Patch2: openssl-1.0.0-rpm_opt.patch
+Patch4: openssl-1.0.0-enginesdir.patch
 
 
 # security fix
 # 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
 License: BSDish
 Group: System Environment/Libraries
 Group: System Environment/Libraries
 URL: http://www.openssl.org/
 URL: http://www.openssl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPreReq: perl, sed
+BuildRequires: perl, sed
+BuildRequires: zlib-devel, krb5-devel
 Requires: mktemp
 Requires: mktemp
 Packager: Daisuke SUZUKI <daisuke@linux.or.jp>
 Packager: Daisuke SUZUKI <daisuke@linux.or.jp>
 Vendor: Project Vine
 Vendor: Project Vine
@@ -41,6 +40,7 @@ provide various cryptographic algorithms and protocols.
 Summary: OpenSSL libraries and development headers.
 Summary: OpenSSL libraries and development headers.
 Group: Development/Libraries
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
+Requires: krb5-devel
 
 
 %description devel
 %description devel
 The static libraries and include files needed to compile apps
 The static libraries and include files needed to compile apps
@@ -50,6 +50,17 @@ supported by OpenSSL.
 Patches for many networking apps can be found at:
 Patches for many networking apps can be found at:
 ftp://ftp.psy.uq.oz.au/pub/Crypto/SSLapps/
 ftp://ftp.psy.uq.oz.au/pub/Crypto/SSLapps/
 
 
+%package static
+Summary:  Libraries for static linking of applications which will use OpenSSL
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+OpenSSL is a toolkit for supporting cryptography. The openssl-static
+package contains static libraries needed for static linking of
+applications which support various cryptographic algorithms and
+protocols.
+
 %package perl
 %package perl
 Summary: OpenSSL scripts which require Perl.
 Summary: OpenSSL scripts which require Perl.
 Group: Applications/Internet
 Group: Applications/Internet
@@ -73,6 +84,7 @@ provide various cryptographic algorithms and protocols.
 Summary: OpenSSL libraries and development headers.
 Summary: OpenSSL libraries and development headers.
 Group: Development/Libraries
 Group: Development/Libraries
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
+Requires: compat32-krb5-devel
 %description -n compat32-%{name}-devel
 %description -n compat32-%{name}-devel
 The static libraries and include files needed to compile apps
 The static libraries and include files needed to compile apps
 with support for various the cryptographic algorithms and protocols
 with support for various the cryptographic algorithms and protocols
@@ -85,9 +97,7 @@ supported by OpenSSL.
 %patch4 -p1 -b .enginesdir
 %patch4 -p1 -b .enginesdir
 
 
 # security fix
 # 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 FAQ LICENSE CHANGES NEWS INSTALL README
 chmod 644 doc/README doc/c-indentation.el doc/openssl.txt
 chmod 644 doc/README doc/c-indentation.el doc/openssl.txt
@@ -146,7 +156,9 @@ sslflags=no-asm
 # RPM_OPT_FLAGS, so we can skip specifiying them here.
 # RPM_OPT_FLAGS, so we can skip specifiying them here.
 ./Configure  \
 ./Configure  \
 	 --prefix=%{_prefix} --openssldir=%{_datadir}/ssl ${sslflags} \
 	 --prefix=%{_prefix} --openssldir=%{_datadir}/ssl ${sslflags} \
+	 zlib-dynamic enable-rfc3779 \
 	 --enginesdir=%{_libdir}/openssl/engines \
 	 --enginesdir=%{_libdir}/openssl/engines \
+	--with-krb5-flavor=MIT 	--with-krb5-dir=/usr \
 	 shared ${sslarch}
 	 shared ${sslarch}
 
 
 # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
@@ -174,8 +186,9 @@ install -d $RPM_BUILD_ROOT/{%{_lib},%{_bindir},%{_includedir},%{_libdir},%{_mand
 make INSTALL_PREFIX=$RPM_BUILD_ROOT install build-shared
 make INSTALL_PREFIX=$RPM_BUILD_ROOT install build-shared
 install -m 755 *.so.* $RPM_BUILD_ROOT%{_libdir}
 install -m 755 *.so.* $RPM_BUILD_ROOT%{_libdir}
 # added for lib64
 # added for lib64
-mv $RPM_BUILD_ROOT/usr/lib/engines $RPM_BUILD_ROOT%{_libdir}/openssl || :
-mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}/ || :
+# mv $RPM_BUILD_ROOT/usr/lib/engines $RPM_BUILD_ROOT%{_libdir}/openssl || :
+mv $RPM_BUILD_ROOT%{_libdir}/engines $RPM_BUILD_ROOT%{_libdir}/openssl
+# mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}/ || :
 mv $RPM_BUILD_ROOT%{_libdir}/lib*.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}/
 mv $RPM_BUILD_ROOT%{_libdir}/lib*.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}/
 mv $RPM_BUILD_ROOT%{_datadir}/ssl/man/* $RPM_BUILD_ROOT%{_mandir}
 mv $RPM_BUILD_ROOT%{_datadir}/ssl/man/* $RPM_BUILD_ROOT%{_mandir}
 rmdir $RPM_BUILD_ROOT%{_datadir}/ssl/man
 rmdir $RPM_BUILD_ROOT%{_datadir}/ssl/man
@@ -267,12 +280,18 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
 %attr(0644,root,root) %{_mandir}/man3*/*
 %attr(0644,root,root) %{_mandir}/man3*/*
 %attr(0644,root,root) %{_libdir}/pkgconfig/*.pc
 %attr(0644,root,root) %{_libdir}/pkgconfig/*.pc
 
 
+%files static
+%defattr(-,root,root)
+%attr(0644,root,root) %{_libdir}/*.a
+
 %files perl
 %files perl
 %defattr(-,root,root)
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/c_rehash
 %attr(0755,root,root) %{_bindir}/c_rehash
 %attr(0755,root,root) %dir %{_mandir}/man1*
 %attr(0755,root,root) %dir %{_mandir}/man1*
 %attr(0644,root,root) %{_mandir}/man1*/*.pl*
 %attr(0644,root,root) %{_mandir}/man1*/*.pl*
 %{_datadir}/ssl/misc/*.pl
 %{_datadir}/ssl/misc/*.pl
+# %{_datadir}/ssl/misc/tsget
+%doc apps/tsget
 
 
 ## to build compat32 for x86_64 architecture support
 ## to build compat32 for x86_64 architecture support
 %if %{build_compat32}
 %if %{build_compat32}
@@ -296,6 +315,21 @@ 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
+* Sun Jan  9 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0c-3
+- move tsget to docs to delete dependency perl(WWW::Curl::Easy)
+
+* Sat Jan  1 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0c-2
+- add R: krb5-devel into devel pkg
+- add R: compat32-krb5-devel into compat32-devel pkg
+
+* Fri Dec 31 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0c-1
+- new upstream release 1.0.0x
+- separate static libs into static package
+- change configure options
+- change so version 10
+- add tsget into perl package
+- update all patches
+
 * Thu Dec 30 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8q-2
 * Thu Dec 30 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.9.8q-2
 - fix changelog typo...
 - fix changelog typo...