pool/openssl
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 485219 from Base:System

Browse Source 
- Remove O3 from optflags, no need to not rely on distro wide settings
- Remove conditions for sle10 and sle11, we care only about sle12+
- USE SUSE instead of SuSE in readme
- Pass over with spec-cleaner (forwarded request 485192 from scarabeus_iv)

OBS-URL: https://build.opensuse.org/request/show/485219
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=137
This commit is contained in:
Yuchen Lin 2017-04-11 07:29:32 +00:00 committed by Git OBS Bridge
parent de4d1be4ab
commit 491c541700
3 changed files with 68 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.SUSE
View File

@ -6,4 +6,4 @@ documentation or sample C programs.
The C header files and static libraries have also been extracted, they The C header files and static libraries have also been extracted, they
can now be found in the openssl-devel package. can now be found in the openssl-devel package.
Your SuSE Team. Your SUSE Team.

8
openssl.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Apr 4 11:41:40 UTC 2017 - tchvatal@suse.com
- Remove O3 from optflags, no need to not rely on distro wide settings
- Remove conditions for sle10 and sle11, we care only about sle12+
- USE SUSE instead of SuSE in readme
- Pass over with spec-cleaner
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 2 15:19:15 UTC 2017 - vcizek@suse.com Thu Feb 2 15:19:15 UTC 2017 - vcizek@suse.com

137
openssl.spec
View File

@ -16,19 +16,10 @@
# #
Name: openssl
BuildRequires: bc
BuildRequires: ed
BuildRequires: pkg-config
BuildRequires: zlib-devel
%define ssletcdir %{_sysconfdir}/ssl %define ssletcdir %{_sysconfdir}/ssl
#%define num_version %(echo "%{version}" | sed -e "s+[a-zA-Z]++g; s+_.*++g") #%define num_version %(echo "%{version}" | sed -e "s+[a-zA-Z]++g; s+_.*++g")
%define num_version 1.0.0 %define num_version 1.0.0
Provides: ssl Name: openssl
# bug437293
%ifarch ppc64
Obsoletes: openssl-64bit
%endif
Version: 1.0.2k Version: 1.0.2k
Release: 0 Release: 0
Summary: Secure Sockets and Transport Layer Security Summary: Secure Sockets and Transport Layer Security
@ -36,21 +27,19 @@ License: OpenSSL
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Url: https://www.openssl.org/ Url: https://www.openssl.org/
Source: https://www.%{name}.org/source/%{name}-%{version}.tar.gz Source: https://www.%{name}.org/source/%{name}-%{version}.tar.gz
Source42: https://www.%{name}.org/source/%{name}-%{version}.tar.gz.asc
# https://www.openssl.org/about/
# http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xA2D29B7BF295C759#/%name.keyring
Source43: %name.keyring
# to get mtime of file: # to get mtime of file:
Source1: openssl.changes Source1: openssl.changes
Source2: baselibs.conf Source2: baselibs.conf
Source10: README.SUSE Source10: README.SUSE
Source11: README-FIPS.txt Source11: README-FIPS.txt
Source42: https://www.%{name}.org/source/%{name}-%{version}.tar.gz.asc
# https://www.openssl.org/about/
# http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xA2D29B7BF295C759#/%name.keyring
Source43: %{name}.keyring
Patch0: merge_from_0.9.8k.patch Patch0: merge_from_0.9.8k.patch
Patch1: openssl-1.0.0-c_rehash-compat.diff Patch1: openssl-1.0.0-c_rehash-compat.diff
Patch2: bug610223.patch Patch2: bug610223.patch
%if 0%{?suse_version} >= 1120
Patch3: openssl-ocloexec.patch Patch3: openssl-ocloexec.patch
%endif
Patch4: openssl-1.0.2a-padlock64.patch Patch4: openssl-1.0.2a-padlock64.patch
# PATCH-FIX-UPSTREAM http://rt.openssl.org/Ticket/Attachment/WithHeaders/20049 # PATCH-FIX-UPSTREAM http://rt.openssl.org/Ticket/Attachment/WithHeaders/20049
Patch5: openssl-fix-pod-syntax.diff Patch5: openssl-fix-pod-syntax.diff
@ -84,11 +73,14 @@ Patch56: openssl-fips-selftests_in_nonfips_mode.patch
Patch57: openssl-fips-fix-odd-rsakeybits.patch Patch57: openssl-fips-fix-odd-rsakeybits.patch
Patch58: openssl-fips-clearerror.patch Patch58: openssl-fips-clearerror.patch
Patch59: openssl-fips-dont-fall-back-to-default-digest.patch Patch59: openssl-fips-dont-fall-back-to-default-digest.patch
Patch61: openssl-fipslocking.patch Patch61: openssl-fipslocking.patch
Patch62: openssl-print_notice-NULL_crash.patch Patch62: openssl-print_notice-NULL_crash.patch
Patch63: openssl-randfile_fread_interrupt.patch Patch63: openssl-randfile_fread_interrupt.patch
BuildRequires: bc
BuildRequires: ed
BuildRequires: pkgconfig
BuildRequires: pkgconfig(zlib)
Provides: ssl
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -112,11 +104,6 @@ Summary: Secure Sockets and Transport Layer Security
License: OpenSSL License: OpenSSL
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Recommends: ca-certificates-mozilla Recommends: ca-certificates-mozilla
# bug437293
%ifarch ppc64
Obsoletes: openssl-64bit
%endif
#
%description -n libopenssl1_0_0 %description -n libopenssl1_0_0
The OpenSSL Project is a collaborative effort to develop a robust, The OpenSSL Project is a collaborative effort to develop a robust,
@ -138,16 +125,11 @@ and to use it for commercial and noncommercial purposes.
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
License: OpenSSL License: OpenSSL
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Obsoletes: openssl-devel < %{version} Requires: %{name} = %{version}
Requires: %name = %version
Requires: libopenssl1_0_0 = %{version} Requires: libopenssl1_0_0 = %{version}
Requires: zlib-devel Requires: pkgconfig(zlib)
Obsoletes: openssl-devel < %{version}
Provides: openssl-devel = %{version} Provides: openssl-devel = %{version}
# bug437293
%ifarch ppc64
Obsoletes: openssl-devel-64bit
%endif
#
%description -n libopenssl-devel %description -n libopenssl-devel
This package contains all necessary include files and libraries needed This package contains all necessary include files and libraries needed
@ -167,9 +149,7 @@ possible without the HMAC hashes contained in this package!
Summary: Additional Package Documentation Summary: Additional Package Documentation
License: OpenSSL License: OpenSSL
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
%if 0%{?suse_version} >= 1140
BuildArch: noarch BuildArch: noarch
%endif
%description doc %description doc
This package contains optional documentation provided in addition to This package contains optional documentation provided in addition to
@ -211,13 +191,11 @@ this package's base documentation.
%patch61 -p1 %patch61 -p1
%patch62 -p1 %patch62 -p1
%patch63 -p1 %patch63 -p1
%if 0%{?suse_version} >= 1120
%patch3 %patch3
%endif
%patch8 -p1 %patch8 -p1
%patch14 -p1 %patch14 -p1
cp -p %{S:10} . cp -p %{SOURCE10} .
cp -p %{S:11} . cp -p %{SOURCE11} .
echo "adding/overwriting some entries in the 'table' hash in Configure" echo "adding/overwriting some entries in the 'table' hash in Configure"
# $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags # $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags
export DSO_SCHEME='dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::' export DSO_SCHEME='dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::'
@ -247,11 +225,11 @@ i
wq wq
EOF_ED EOF_ED
# fix ENGINESDIR path # fix ENGINESDIR path
sed -i 's,/lib/engines,/%_lib/engines,' Configure sed -i 's,/lib/engines,/%{_lib}/engines,' Configure
%build %build
%if 0%{suse_version} >= 1230 %if 0%{?suse_version} >= 1230
find -type f -name "*.c" -exec sed -i -e "s@getenv@secure_getenv@g" {} + find -type f -name "*.c" -exec sed -i -e "s@getenv@secure_getenv@g" {} +
%endif %endif
@ -265,23 +243,19 @@ export MACHINE=armv6l
# #
config_flags="threads shared no-rc5 no-idea \ config_flags="threads shared no-rc5 no-idea \
fips \ fips \
%if 0%{suse_version} > 1310
no-ssl2 \ no-ssl2 \
no-ssl3 \ no-ssl3 \
enable-rfc3779 \ enable-rfc3779 \
%endif
%ifarch x86_64 aarch64 ppc64le %ifarch x86_64 aarch64 ppc64le
%if 0%{?suse_version} < 1010 || 0%{?suse_version} > 1020
enable-ec_nistp_64_gcc_128 \ enable-ec_nistp_64_gcc_128 \
%endif %endif
%endif
enable-camellia \ enable-camellia \
zlib \ zlib \
no-ec2m \ no-ec2m \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libdir=%{_lib} \ --libdir=%{_lib} \
--openssldir=%{ssletcdir} \ --openssldir=%{ssletcdir} \
$RPM_OPT_FLAGS -O3 -std=gnu99 \ %{optflags} -std=gnu99 \
-Wa,--noexecstack \ -Wa,--noexecstack \
-Wl,-z,relro,-z,now \ -Wl,-z,relro,-z,now \
-fno-common \ -fno-common \
@ -321,7 +295,7 @@ $(getconf LFS_CFLAGS) \
# Record mtime of changes file instead of build time to make build-compare work # Record mtime of changes file instead of build time to make build-compare work
make PERL=perl -C crypto buildinf.h make PERL=perl -C crypto buildinf.h
CHANGES=`stat --format="%y" %SOURCE1` CHANGES=`stat --format="%{y}" %{SOURCE1}`
cat crypto/buildinf.h cat crypto/buildinf.h
sed -i -e "s|#define DATE .*|#define DATE \"built on: $CHANGES\"|" crypto/buildinf.h sed -i -e "s|#define DATE .*|#define DATE \"built on: $CHANGES\"|" crypto/buildinf.h
cat crypto/buildinf.h cat crypto/buildinf.h
@ -337,30 +311,29 @@ crypto/fips/fips_standalone_hmac libssl.so.1.0.0 > .libssl.so.1.0.0.hmac
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
LD_LIBRARY_PATH=`pwd` make test FIPSCANLIB="" LD_LIBRARY_PATH=`pwd` make test FIPSCANLIB=""
%ifnarch armv4l %ifnarch armv4l
LD_LIBRARY_PATH=`pwd` make test LD_LIBRARY_PATH=`pwd` make test
%endif %endif
#%endif #%endif
# show settings # show settings
make TABLE make %{?_smp_mflags} TABLE
echo $RPM_OPT_FLAGS echo %{optflags}
eval $(egrep PLATFORM='[[:alnum:]]' Makefile) eval $(egrep PLATFORM='[[:alnum:]]' Makefile)
grep -B1 -A22 "^\*\*\* $PLATFORM$" TABLE grep -B1 -A22 "^\*\*\* $PLATFORM$" TABLE
%install %install
rm -rf $RPM_BUILD_ROOT make MANDIR=%{_mandir} INSTALL_PREFIX=%{buildroot} install
make MANDIR=%{_mandir} INSTALL_PREFIX=$RPM_BUILD_ROOT install cp -a crypto/fips/fips_standalone_hmac %{buildroot}%{_bindir}/fips_standalone_hmac
cp -a crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT/usr/bin/fips_standalone_hmac ln -sf ./%{name} %{buildroot}/%{_includedir}/ssl
ln -sf ./%{name} $RPM_BUILD_ROOT/%{_includedir}/ssl mkdir %{buildroot}/%{_datadir}/ssl
mkdir $RPM_BUILD_ROOT/%{_datadir}/ssl mv %{buildroot}/%{ssletcdir}/misc %{buildroot}/%{_datadir}/ssl/
mv $RPM_BUILD_ROOT/%{ssletcdir}/misc $RPM_BUILD_ROOT/%{_datadir}/ssl/
# ln -s %{ssletcdir}/private $RPM_BUILD_ROOT/%{_datadir}/ssl/private # ln -s %{ssletcdir}/private $RPM_BUILD_ROOT/%{_datadir}/ssl/private
# ln -s %{ssletcdir}/openssl.cnf $RPM_BUILD_ROOT/%{_datadir}/ssl/openssl.cnf # ln -s %{ssletcdir}/openssl.cnf $RPM_BUILD_ROOT/%{_datadir}/ssl/openssl.cnf
# #
# avoid file conflicts with man pages from other packages # avoid file conflicts with man pages from other packages
# #
pushd $RPM_BUILD_ROOT/%{_mandir} pushd %{buildroot}/%{_mandir}
# some man pages now contain spaces. This makes several scripts go havoc, among them /usr/sbin/Check. # some man pages now contain spaces. This makes several scripts go havoc, among them /usr/sbin/Check.
# replace spaces by underscores # replace spaces by underscores
#for i in man?/*\ *; do mv -v "$i" "${i// /_}"; done #for i in man?/*\ *; do mv -v "$i" "${i// /_}"; done
@ -386,11 +359,11 @@ popd
# #
# check wether some shared library has been installed # check wether some shared library has been installed
# #
ls -l $RPM_BUILD_ROOT%{_libdir} ls -l %{buildroot}%{_libdir}
test -f $RPM_BUILD_ROOT%{_libdir}/libssl.so.%{num_version} test -f %{buildroot}%{_libdir}/libssl.so.%{num_version}
test -f $RPM_BUILD_ROOT%{_libdir}/libcrypto.so.%{num_version} test -f %{buildroot}%{_libdir}/libcrypto.so.%{num_version}
test -L $RPM_BUILD_ROOT%{_libdir}/libssl.so test -L %{buildroot}%{_libdir}/libssl.so
test -L $RPM_BUILD_ROOT%{_libdir}/libcrypto.so test -L %{buildroot}%{_libdir}/libcrypto.so
# #
# see what we've got # see what we've got
# #
@ -414,14 +387,14 @@ SSL_METHOD *meth;
sc = (meth->get_cipher)(i); sc = (meth->get_cipher)(i);
if (!sc) break; if (!sc) break;
k = SSL_CIPHER_get_bits(sc, &j); k = SSL_CIPHER_get_bits(sc, &j);
printf("%s\n", sc->name); printf("%{s}\n", sc->name);
} }
return 0; return 0;
}; };
EOF EOF
gcc $RPM_OPT_FLAGS -I${RPM_BUILD_ROOT}%{_includedir} -c showciphers.c gcc %{optflags} -I%{buildroot}%{_includedir} -c showciphers.c
gcc -o showciphers showciphers.o -L${RPM_BUILD_ROOT}%{_libdir} -lssl -lcrypto gcc -o showciphers showciphers.o -L%{buildroot}%{_libdir} -lssl -lcrypto
LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir} ./showciphers > AVAILABLE_CIPHERS || true LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./showciphers > AVAILABLE_CIPHERS || true
cat AVAILABLE_CIPHERS cat AVAILABLE_CIPHERS
# Do not install demo scripts executable under /usr/share/doc # Do not install demo scripts executable under /usr/share/doc
find demos -type f -perm /111 -exec chmod 644 {} \; find demos -type f -perm /111 -exec chmod 644 {} \;
@ -439,22 +412,22 @@ find demos -type f -perm /111 -exec chmod 644 {} \;
# openssl dgst -sha256 -hmac 'ppaksykemnsecgtsttplmamstKMEs' # openssl dgst -sha256 -hmac 'ppaksykemnsecgtsttplmamstKMEs'
%{expand:%%global __os_install_post {%__os_install_post %{expand:%%global __os_install_post {%__os_install_post
$RPM_BUILD_ROOT/usr/bin/fips_standalone_hmac \ %{buildroot}%{_bindir}/fips_standalone_hmac \
$RPM_BUILD_ROOT/%{_lib}/libssl.so.%{num_version} > \ %{buildroot}/%{_lib}/libssl.so.%{num_version} > \
$RPM_BUILD_ROOT/%{_lib}/.libssl.so.%{num_version}.hmac %{buildroot}/%{_lib}/.libssl.so.%{num_version}.hmac
$RPM_BUILD_ROOT/usr/bin/fips_standalone_hmac \ %{buildroot}%{_bindir}/fips_standalone_hmac \
$RPM_BUILD_ROOT/%{_lib}/libcrypto.so.%{num_version} > \ %{buildroot}/%{_lib}/libcrypto.so.%{num_version} > \
$RPM_BUILD_ROOT/%{_lib}/.libcrypto.so.%{num_version}.hmac %{buildroot}/%{_lib}/.libcrypto.so.%{num_version}.hmac
}} }}
#process openssllib #process openssllib
mkdir $RPM_BUILD_ROOT/%{_lib} mkdir %{buildroot}/%{_lib}
mv $RPM_BUILD_ROOT%{_libdir}/libssl.so.%{num_version} $RPM_BUILD_ROOT/%{_lib}/ mv %{buildroot}%{_libdir}/libssl.so.%{num_version} %{buildroot}/%{_lib}/
mv $RPM_BUILD_ROOT%{_libdir}/libcrypto.so.%{num_version} $RPM_BUILD_ROOT/%{_lib}/ mv %{buildroot}%{_libdir}/libcrypto.so.%{num_version} %{buildroot}/%{_lib}/
mv $RPM_BUILD_ROOT%{_libdir}/engines $RPM_BUILD_ROOT/%{_lib}/ mv %{buildroot}%{_libdir}/engines %{buildroot}/%{_lib}/
cd $RPM_BUILD_ROOT%{_libdir}/ cd %{buildroot}%{_libdir}/
ln -sf /%{_lib}/libssl.so.%{num_version} ./libssl.so ln -sf /%{_lib}/libssl.so.%{num_version} ./libssl.so
ln -sf /%{_lib}/libcrypto.so.%{num_version} ./libcrypto.so ln -sf /%{_lib}/libcrypto.so.%{num_version} ./libcrypto.so
@ -466,11 +439,7 @@ done
rm %{buildroot}/%{_lib}/engines/libpadlock.so rm %{buildroot}/%{_lib}/engines/libpadlock.so
%endif %endif
%clean
if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%post -n libopenssl1_0_0 -p /sbin/ldconfig %post -n libopenssl1_0_0 -p /sbin/ldconfig
%postun -n libopenssl1_0_0 -p /sbin/ldconfig %postun -n libopenssl1_0_0 -p /sbin/ldconfig
%files -n libopenssl1_0_0 %files -n libopenssl1_0_0
@ -492,9 +461,9 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%exclude %{_libdir}/libssl.a %exclude %{_libdir}/libssl.a
%{_libdir}/libssl.so %{_libdir}/libssl.so
%{_libdir}/libcrypto.so %{_libdir}/libcrypto.so
%_libdir/pkgconfig/libcrypto.pc %{_libdir}/pkgconfig/libcrypto.pc
%_libdir/pkgconfig/libssl.pc %{_libdir}/pkgconfig/libssl.pc
%_libdir/pkgconfig/openssl.pc %{_libdir}/pkgconfig/openssl.pc
%files doc -f filelist.doc %files doc -f filelist.doc
%defattr(-, root, root) %defattr(-, root, root)