|
|
@@ -1,6 +1,6 @@
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
%define soversion 10
|
|
|
-%define version 1.0.0g
|
|
|
+%define version 1.0.1c
|
|
|
%define release 1%{_dist_release}
|
|
|
|
|
|
Summary: Secure Sockets Layer Toolkit
|
|
|
@@ -15,6 +15,7 @@ Source5: make-dummy-cert
|
|
|
Patch0: openssl-1.0.0-soversion.patch
|
|
|
Patch2: openssl-1.0.0-rpm_opt.patch
|
|
|
Patch4: openssl-1.0.0-enginesdir.patch
|
|
|
+Patch5: openssl-0.9.8j-version-add-engines.patch
|
|
|
|
|
|
# security fix
|
|
|
# nothing ;-)
|
|
|
@@ -26,9 +27,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: perl, sed
|
|
|
BuildRequires: zlib-devel, krb5-devel
|
|
|
Requires: mktemp
|
|
|
-Packager: Daisuke SUZUKI <daisuke@linux.or.jp>
|
|
|
+
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
+Packager: daisuke, iwamoto
|
|
|
|
|
|
%define solibbase %(echo %version | sed 's/[[:alpha:]]//g')
|
|
|
|
|
|
@@ -95,6 +97,7 @@ supported by OpenSSL.
|
|
|
%patch0 -p1 -b .soversion
|
|
|
%patch2 -p1 -b .rpm_opt
|
|
|
%patch4 -p1 -b .enginesdir
|
|
|
+%patch5 -p1 -b .version-add-engines
|
|
|
|
|
|
# security fix
|
|
|
# nothing ;-)
|
|
|
@@ -112,53 +115,54 @@ PATH=${PATH}:${PWD}/bin
|
|
|
TOPDIR=${PWD}
|
|
|
LD_LIBRARY_PATH=${TOPDIR}:${TOPDIR}/bin:${PATH} ; export LD_LIBRARY_PATH
|
|
|
|
|
|
-# Figure out which flags we want to use. Can't use assembler because it's
|
|
|
-# not lowest-common-denominator in most cases.
|
|
|
+# Modify the various perl scripts to reference perl in the right location.
|
|
|
perl util/perlpath.pl `dirname %{__perl}`
|
|
|
+
|
|
|
+# Generate a table with the compile settings for my perusal.
|
|
|
+touch Makefile
|
|
|
+make TABLE PERL=%{__perl}
|
|
|
+
|
|
|
+# Figure out which flags we want to use.
|
|
|
+# default
|
|
|
+sslarch=%{_os}-%{_target_cpu}
|
|
|
+#
|
|
|
%ifarch %ix86
|
|
|
sslarch=linux-elf
|
|
|
-sslflags="no-asm 386"
|
|
|
-%endif
|
|
|
-%ifarch ppc
|
|
|
-sslarch=linux-ppc
|
|
|
-sslflags=no-asm
|
|
|
+if ! echo %{_target} | grep -q i686 ; then
|
|
|
+ sslflags="no-asm 386"
|
|
|
+fi
|
|
|
%endif
|
|
|
-%ifarch sparc
|
|
|
+%ifarch sparcv9
|
|
|
sslarch=linux-sparcv9
|
|
|
sslflags=no-asm
|
|
|
%endif
|
|
|
-%ifarch ia64
|
|
|
-sslarch=linux-ia64
|
|
|
+%ifarch sparc64
|
|
|
+sslarch=linux64-sparcv9
|
|
|
sslflags=no-asm
|
|
|
%endif
|
|
|
-%ifarch alpha
|
|
|
+%ifarch alpha alphaev56 alphaev6 alphaev67
|
|
|
sslarch=linux-alpha-gcc
|
|
|
-sslflags=no-asm
|
|
|
%endif
|
|
|
-%ifarch s390
|
|
|
-sslarch=linux-s390
|
|
|
+%ifarch s390 sh3eb sh4eb
|
|
|
+sslarch="linux-generic32 -DB_ENDIAN"
|
|
|
%endif
|
|
|
%ifarch s390x
|
|
|
-sslarch=linux-s390x
|
|
|
+sslarch="linux64-s390x"
|
|
|
%endif
|
|
|
-%ifarch mipsel
|
|
|
-sslarch=linux-mips
|
|
|
-sslflags=no-asm
|
|
|
-%endif
|
|
|
-## to build for x86_64 architecture support
|
|
|
-%ifarch x86_64
|
|
|
-sslarch=linux-x86_64
|
|
|
-sslflags=no-asm
|
|
|
+%ifarch %{arm} sh3 sh4
|
|
|
+sslarch=linux-generic32
|
|
|
%endif
|
|
|
+# ia64/x86_64/ppc\ppc64 are OK by default.
|
|
|
|
|
|
# Configure the build tree. Override OpenSSL defaults with known-good defaults
|
|
|
# usable on all platforms. The Configure script already knows to use -fPIC and
|
|
|
# RPM_OPT_FLAGS, so we can skip specifiying them here.
|
|
|
./Configure \
|
|
|
--prefix=%{_prefix} --openssldir=%{_datadir}/ssl ${sslflags} \
|
|
|
- zlib-dynamic enable-rfc3779 \
|
|
|
+ zlib-dynamic enable-camellia enable-seed enable-tlsext \
|
|
|
+ enable-rfc3779 enable-cms enable-md2 \
|
|
|
--enginesdir=%{_libdir}/openssl/engines \
|
|
|
- --with-krb5-flavor=MIT --with-krb5-dir=/usr \
|
|
|
+ --with-krb5-flavor=MIT --with-krb5-dir=/usr \
|
|
|
shared ${sslarch}
|
|
|
|
|
|
# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
|
|
|
@@ -315,6 +319,14 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem
|
|
|
%postun -n compat32-%{name} -p /sbin/ldconfig
|
|
|
|
|
|
%changelog
|
|
|
+* Tue May 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.1c-1
|
|
|
+- update to 1.0.1c
|
|
|
+- enable configure options:
|
|
|
+ enable-camellia enable-seed enable-tlsext enable-rfc3779
|
|
|
+ enable-cms enable-md2
|
|
|
+- remove no-asm option from ai64/x86_64/ppc/ppc64/i686
|
|
|
+- generate a table with the compile settings before configure
|
|
|
+
|
|
|
* Fri Jan 20 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0g-1
|
|
|
- new upstream release with security fix (CVE-2012-0050)
|
|
|
|
daisuke