diff --git a/openssl-1.0.1-pkgconfig-krb5.patch b/openssl-1.0.1-pkgconfig-krb5.patch new file mode 100644 index 0000000..14a17bf --- /dev/null +++ b/openssl-1.0.1-pkgconfig-krb5.patch @@ -0,0 +1,30 @@ +diff -up openssl-1.0.1/Makefile.org.krb5 openssl-1.0.1/Makefile.org +--- openssl-1.0.1/Makefile.org.krb5 2012-03-14 21:15:04.000000000 +0100 ++++ openssl-1.0.1/Makefile.org 2012-04-11 16:28:31.254725422 +0200 +@@ -370,7 +370,7 @@ libcrypto.pc: Makefile + echo 'Requires: '; \ + echo 'Libs: -L$${libdir} -lcrypto'; \ + echo 'Libs.private: $(EX_LIBS)'; \ +- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc ++ echo 'Cflags: -I$${includedir}' ) > libcrypto.pc + + libssl.pc: Makefile + @ ( echo 'prefix=$(INSTALLTOP)'; \ +@@ -383,7 +383,7 @@ libssl.pc: Makefile + echo 'Version: '$(VERSION); \ + echo 'Requires: '; \ + echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ +- echo 'Libs.private: $(EX_LIBS)'; \ ++ echo 'Libs.private: $(EX_LIBS) $(LIBKRB5)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc + + openssl.pc: Makefile +@@ -397,7 +397,7 @@ openssl.pc: Makefile + echo 'Version: '$(VERSION); \ + echo 'Requires: '; \ + echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ +- echo 'Libs.private: $(EX_LIBS)'; \ ++ echo 'Libs.private: $(EX_LIBS) $(LIBKRB5)'; \ + echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc + + Makefile: Makefile.org Configure config diff --git a/openssl.spec b/openssl.spec index 67d5f7a..d821b7e 100644 --- a/openssl.spec +++ b/openssl.spec @@ -21,7 +21,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 # We have to remove certain patented algorithms from the openssl source # tarball with the hobble-openssl script which is included below. @@ -62,6 +62,7 @@ Patch58: openssl-1.0.1-beta2-fips-md5-allow.patch Patch60: openssl-1.0.0d-apps-dgst.patch Patch63: openssl-1.0.0d-xmpp-starttls.patch Patch65: openssl-1.0.0e-chil-fixes.patch +Patch66: openssl-1.0.1-pkgconfig-krb5.patch # Backported fixes including security fixes Patch81: openssl-1.0.1-beta2-padlock64.patch Patch82: openssl-1.0.1-backport.patch @@ -160,6 +161,7 @@ from other formats to the formats used by the OpenSSL toolkit. %patch60 -p1 -b .dgst %patch63 -p1 -b .starttls %patch65 -p1 -b .chil +%patch66 -p1 -b .krb5 %patch81 -p1 -b .padlock64 %patch82 -p1 -b .backport @@ -417,6 +419,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.* %postun libs -p /sbin/ldconfig %changelog +* Wed Apr 11 2012 Tomas Mraz 1.0.1-3 +- add Kerberos 5 libraries to pkgconfig for static linking (#807050) + * Thu Apr 5 2012 Tomas Mraz 1.0.1-2 - backports from upstream CVS - fix segfault when /dev/urandom is not available (#809586)