From 65f311aa1584aa22ec14774f7fcc7d01d160489d0cedad08e9823aaf498f5120 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 9 Apr 2008 19:26:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krb5?expand=0&rev=31 --- krb5-doc.spec | 2 +- krb5-plugins.spec | 3 ++- krb5.changes | 6 ++++++ krb5.spec | 12 +++++++++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/krb5-doc.spec b/krb5-doc.spec index 622b4e6..c53ab9c 100644 --- a/krb5-doc.spec +++ b/krb5-doc.spec @@ -14,7 +14,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.6.3 -Release: 55 +Release: 62 %define srcRoot krb5-1.6.3 Summary: MIT Kerberos5 Implementation--Documentation License: X11/MIT diff --git a/krb5-plugins.spec b/krb5-plugins.spec index ef2df08..1f116e1 100644 --- a/krb5-plugins.spec +++ b/krb5-plugins.spec @@ -14,7 +14,7 @@ Name: krb5-plugins Version: 1.6.3 -Release: 5 +Release: 6 BuildRequires: bison krb5-devel ncurses-devel openldap2-devel %define srcRoot krb5-1.6.3 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ @@ -94,6 +94,7 @@ Authors: Tom Yu %package -n krb5-plugin-preauth-pkinit +License: X11/MIT Summary: MIT Kerberos5 Implementation--PKINIT preauth Plugin Group: Productivity/Networking/Security Conflicts: krb5-plugin-preauth-pkinit-nss diff --git a/krb5.changes b/krb5.changes index 8399298..e1afaed 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 9 12:04:48 CEST 2008 - mc@suse.de + +- modify krb5-config to not output rpath and cflags in --libs + (bnc#378270) + ------------------------------------------------------------------- Fri Mar 14 11:27:55 CET 2008 - mc@suse.de diff --git a/krb5.spec b/krb5.spec index f5d7b94..1b805c5 100644 --- a/krb5.spec +++ b/krb5.spec @@ -13,7 +13,7 @@ Name: krb5 Version: 1.6.3 -Release: 34 +Release: 39 BuildRequires: bison libcom_err-devel ncurses-devel %if %{suse_version} > 1010 BuildRequires: keyutils keyutils-devel @@ -77,6 +77,7 @@ Authors: Tom Yu %package client +License: X11/MIT Summary: MIT Kerberos5 implementation - client programs Group: Productivity/Networking/Security Provides: heimdal-tools, heimdal-x11 @@ -98,6 +99,7 @@ Authors: Tom Yu %package server +License: X11/MIT Summary: MIT Kerberos5 implementation - server Group: Productivity/Networking/Security Provides: heimdal @@ -121,6 +123,7 @@ Authors: Tom Yu %package devel +License: X11/MIT Summary: MIT Kerberos5 - Include Files and Libraries Group: Development/Libraries/C and C++ PreReq: %{name} = %{version} @@ -147,6 +150,7 @@ Authors: Tom Yu %package apps-servers +License: X11/MIT Summary: MIT Kerberos5 server applications Group: Productivity/Networking/Security @@ -166,6 +170,7 @@ Authors: Tom Yu %package apps-clients +License: X11/MIT Summary: MIT Kerberos5 client applications Group: Productivity/Networking/Security @@ -253,6 +258,8 @@ make %{?jobs:-j%jobs} cd src make DESTDIR=%{buildroot} install cd .. +# Munge the krb5-config script to remove rpaths and CFLAGS. +sed "s|^CC_LINK=.*|CC_LINK='\$(CC) \$(PROG_LIBPATH)'|g" src/krb5-config > $RPM_BUILD_ROOT/usr/lib/mit/bin/krb5-config # install sample config files # I'll probably do something about this later on mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir}/lib/kerberos/krb5kdc @@ -535,6 +542,9 @@ rm -rf %{buildroot} %{_mandir}/man1/krb5-config.1* %changelog +* Wed Apr 09 2008 mc@suse.de +- modify krb5-config to not output rpath and cflags in --libs + (bnc#378270) * Fri Mar 14 2008 mc@suse.de - fix two security bugs: * MITKRB5-SA-2008-001(CVE-2008-0062, CVE-2008-0063)