Updated to 1.0.2k

.abf.yml

@@ -1,3 +1,3 @@
 sources:
-  openssl-1.0.2j.tar.gz: bdfbdb416942f666865fa48fe13c2d0e588df54f
+  openssl-1.0.2k.tar.gz: 5f26a624479c51847ebd2f22bb9f84b3b44dcb44
-  openssl-1.0.2j.tar.gz.asc: 111eb6befb4561c14137b1b36db0ba8988c0ee87
+  openssl-1.0.2k.tar.gz.asc: 8a0e10287f55529f1bbe582ea634b3f414b42eb5

openssl-0.9.8a-link-krb5.patch

@@ -1,11 +0,0 @@
---- openssl-0.9.8a/Makefile.org.link-krb5	2005-07-05 07:14:21.000000000 +0200
-+++ openssl-0.9.8a/Makefile.org	2005-11-07 18:00:08.000000000 +0100
-@@ -266,7 +266,7 @@
- 
- do_$(SHLIB_TARGET):
- 	@ set -e; libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
--		if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
-+		if [ "$$i" = "ssl" -a -n "$(LIBKRB5)" ]; then \
- 			libs="$(LIBKRB5) $$libs"; \
- 		fi; \
- 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \

openssl.spec

@@ -14,8 +14,8 @@
 
 Summary:	Secure Sockets Layer communications libs & utils
 Name:		openssl
-Version:	1.0.2j
+Version:	1.0.2k
-Release:	5
+Release:	1
 License:	BSD-like
 Group:		System/Libraries
 Url:		https://www.openssl.org
@@ -37,7 +37,6 @@ Patch3:		openssl-1.0.1c-fix-perlpath.pl
 # http://www.iti.gov.br/resolucoes/RESOLU__O_13_DE_26_04_2002.PDF
 Patch6:		openssl-1.0.2-icpbrasil.patch
 Patch7:		openssl-1.0.2-defaults.patch
-Patch8:		openssl-0.9.8a-link-krb5.patch
 Patch12:	openssl-1.0.2-x509.patch
 Patch13:	openssl-1.0.2-add-engines.patch
 Patch302:	openssl-1.0.2-enginesdir.patch
@@ -58,7 +57,7 @@ various encryption and decription algorithms and protocols, including DES, RC4,
 RSA and SSL.
 
 %files
-%doc FAQ INSTALL LICENSE NEWS PROBLEMS main-doc-info/README*
+%doc FAQ LICENSE NEWS PROBLEMS main-doc-info/README*
 %doc README README.ASN1 README.ENGINE
 %dir %{_sysconfdir}/pki
 %dir %{_sysconfdir}/pki/CA
@@ -101,7 +100,7 @@ The libraries files are needed for various cryptographic algorithms
 and protocols, including DES, RC4, RSA and SSL.
 
 %files -n %{libcrypto}
-%doc FAQ INSTALL LICENSE NEWS PROBLEMS README*
+%doc FAQ LICENSE NEWS PROBLEMS README*
 %{_libdir}/libcrypto.so.%{major}*
 
 #----------------------------------------------------------------------------
@@ -122,7 +121,7 @@ The libraries files are needed for various cryptographic algorithms
 and protocols, including DES, RC4, RSA and SSL.
 
 %files -n %{libssl}
-%doc FAQ INSTALL LICENSE NEWS PROBLEMS README*
+%doc FAQ LICENSE NEWS PROBLEMS README*
 %{_libdir}/libssl.so.%{major}*
 
 #----------------------------------------------------------------------------
@@ -204,23 +203,22 @@ sslarch=%{_os}-%{_arch}
 %ifarch %{ix86}
 sslarch=linux-elf
 if ! echo %{_target} | grep -q i[56]86 ; then
-    sslflags="no-asm"
+	sslflags="no-asm"
 fi
 %endif
 %ifarch %{arm}
 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 \
-    --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
+	--openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
-    --enginesdir=%{_libdir}/openssl-%{version}/engines \
+	--enginesdir=%{_libdir}/openssl-%{version}/engines \
-    --prefix=%{_prefix} --libdir=%{_lib}/ %{?_with_krb5:--with-krb5-flavor=MIT -I%{_prefix}/kerberos/include -L%{_prefix}/kerberos/%{_lib}} \
+	--prefix=%{_prefix} --libdir=%{_lib}/ %{?_with_krb5:--with-krb5-flavor=MIT -I%{_prefix}/kerberos/include -L%{_prefix}/kerberos/%{_lib}} \
-    zlib no-idea no-rc5 enable-camellia enable-seed enable-tlsext enable-rfc3779 enable-cms sctp shared ${sslarch}
+	zlib no-idea no-rc5 enable-camellia enable-seed enable-tlsext enable-rfc3779 enable-cms sctp shared ${sslarch}
 
 # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 # marked as not requiring an executable stack.
@@ -239,22 +237,22 @@ export LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 make -C test apps tests
 
 gcc -o openssl-thread-test \
-    %{?_with_krb5:`krb5-config --cflags`} \
+	%{?_with_krb5:`krb5-config --cflags`} \
-    -I./include \
+	-I./include \
-    %{optflags} \
+	%{optflags} \
-    openssl-thread-test.c \
+	openssl-thread-test.c \
-    -L. -lssl -lcrypto \
+	-L. -lssl -lcrypto \
-    %{?_with_krb5:`krb5-config --libs`} \
+	%{?_with_krb5:`krb5-config --libs`} \
-    -lpthread -lz -ldl
+	-lpthread -lz -ldl
 
 ./openssl-thread-test --threads %{thread_test_threads}
 
 %install
 
 %makeinstall \
-    INSTALL_PREFIX=%{buildroot} \
+	INSTALL_PREFIX=%{buildroot} \
-    MANDIR=%{_mandir} \
+	MANDIR=%{_mandir} \
-    build-shared
+	build-shared
 
 # the makefiles is too borked...
 install -d %{buildroot}%{_libdir}/openssl-%{version}
@@ -284,8 +282,8 @@ mv %{buildroot}%{_mandir}/man1/passwd.1 %{buildroot}%{_mandir}/man1/ssl-passwd.1
 ln -sf ssl-passwd.1%{_extension} %{buildroot}%{_mandir}/man1/openssl-passwd.1%{_extension}
 
 for i in rand err; do
-    mv %{buildroot}%{_mandir}/man3/$i.3 %{buildroot}%{_mandir}/man3/ssl-$i.3
+	mv %{buildroot}%{_mandir}/man3/$i.3 %{buildroot}%{_mandir}/man3/ssl-$i.3
-    ln -snf ssl-$i.3%{_extension} %{buildroot}%{_mandir}/man3/openssl-$i.3%{_extension}
+	ln -snf ssl-$i.3%{_extension} %{buildroot}%{_mandir}/man3/openssl-$i.3%{_extension}
 done
 
 rm -rf {main,devel}-doc-info
@@ -318,12 +316,12 @@ rm -f %{buildroot}%{_mandir}/man3/.3
 
 # Fix libdir.
 pushd %{buildroot}%{_libdir}/pkgconfig
-    for i in *.pc ; do
+	for i in *.pc ; do
-	sed 's,^libdir=${exec_prefix}/lib$,libdir=${exec_prefix}/%{_lib},g' \
+		sed 's,^libdir=${exec_prefix}/lib$,libdir=${exec_prefix}/%{_lib},g' \
-	    $i >$i.tmp && \
+			$i >$i.tmp && \
-	    cat $i.tmp >$i && \
+			cat $i.tmp >$i && \
-	    rm -f $i.tmp
+			rm -f $i.tmp
-    done
+	done
 popd
 
 # adjust ssldir