Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2020-02-28 15:18:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krb5" Fri Feb 28 15:18:59 2020 rev:143 rq:779310 version:1.18 Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes 2019-12-16 17:26:16.679962336 +0100 +++ /work/SRC/openSUSE:Factory/.krb5.new.26092/krb5-mini.changes 2020-02-28 15:19:02.473612162 +0100 @@ -1,0 +2,69 @@ +Tue Feb 25 08:36:37 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Remove cruft to support distributions older than SLE 12 +- Use macros where applicable +- Switch to pkgconfig style dependencies + +------------------------------------------------------------------- +Mon Feb 17 17:26:16 UTC 2020 - Samuel Cabrero <[email protected]> + +- Upgrade to 1.18 + Administrator experience: + * Remove support for single-DES encryption types. + * Change the replay cache format to be more efficient and robust. + Replay cache filenames using the new format end with ".rcache2" + by default. + * setuid programs will automatically ignore environment variables + that normally affect krb5 API functions, even if the caller does + not use krb5_init_secure_context(). + * Add an "enforce_ok_as_delegate" krb5.conf relation to disable + credential forwarding during GSSAPI authentication unless the KDC + sets the ok-as-delegate bit in the service ticket. + * Use the permitted_enctypes krb5.conf setting as the default value + for default_tkt_enctypes and default_tgs_enctypes. + Developer experience: + * Implement krb5_cc_remove_cred() for all credential cache types. + * Add the krb5_pac_get_client_info() API to get the client account + name from a PAC. + Protocol evolution: + * Add KDC support for S4U2Self requests where the user is identified + by X.509 certificate. (Requires support for certificate lookup from + a third-party KDB module.) + * Remove support for an old ("draft 9") variant of PKINIT. + * Add support for Microsoft NegoEx. (Requires one or more third-party + GSS modules implementing NegoEx mechanisms.) + User experience: + * Add support for "dns_canonicalize_hostname=fallback", causing + host-based principal names to be tried first without DNS + canonicalization, and again with DNS canonicalization if the + un-canonicalized server is not found. + * Expand single-component hostnames in host-based principal names + when DNS canonicalization is not used, adding the system's first DNS + search path as a suffix. Add a "qualify_shortname" krb5.conf relation + to override this suffix or disable expansion. + * Honor the transited-policy-checked ticket flag on application servers, + eliminating the requirement to configure capaths on servers in some + scenarios. + Code quality: + * The libkrb5 serialization code (used to export and import krb5 GSS + security contexts) has been simplified and made type-safe. + * The libkrb5 code for creating KRB-PRIV, KRB-SAFE, and KRB-CRED + messages has been revised to conform to current coding practices. + * The test suite has been modified to work with macOS System Integrity + Protection enabled. + * The test suite incorporates soft-pkcs11 so that PKINIT PKCS11 support + can always be tested. +- Updated patches: + * 0002-krb5-1.9-manpaths.patch + * 0004-krb5-1.6.3-gssapi_improve_errormessages.patch + * 0005-krb5-1.6.3-ktutil-manpage.patch + * 0006-krb5-1.12-api.patch +- Renamed patches: + * 0001-krb5-1.12-pam.patch => 0001-ksu-pam-integration.patch + * 0003-krb5-1.12-buildconf.patch => 0003-Adjust-build-configuration.patch + * 0008-krb5-1.12-selinux-label.patch => 0007-SELinux-integration.patch + * 0009-krb5-1.9-debuginfo.patch => 0008-krb5-1.9-debuginfo.patch +- Deleted patches: + * 0007-krb5-1.12-ksu-path.patch + +------------------------------------------------------------------- krb5.changes: same change Old: ---- 0001-krb5-1.12-pam.patch 0003-krb5-1.12-buildconf.patch 0007-krb5-1.12-ksu-path.patch 0008-krb5-1.12-selinux-label.patch 0009-krb5-1.9-debuginfo.patch krb5-1.17.1.tar.gz krb5-1.17.1.tar.gz.asc New: ---- 0001-ksu-pam-integration.patch 0003-Adjust-build-configuration.patch 0007-SELinux-integration.patch 0008-krb5-1.9-debuginfo.patch krb5-1.18.tar.gz krb5-1.18.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.mUCqXL/_old 2020-02-28 15:19:04.101615476 +0100 +++ /var/tmp/diff_new_pack.mUCqXL/_new 2020-02-28 15:19:04.105615484 +0100 @@ -1,7 +1,7 @@ # # spec file for package krb5-mini # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,60 +16,52 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif - %define srcRoot krb5-%{version} %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ %define krb5docdir %{_defaultdocdir}/krb5 - +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir %{_localstatedir}/adm/fillup-templates +%endif Name: krb5-mini -Version: 1.17.1 +Version: 1.18 Release: 0 Summary: MIT Kerberos5 implementation and libraries with minimal dependencies License: MIT -Group: Productivity/Networking/Security URL: https://web.mit.edu/kerberos/www/ -Obsoletes: krb5-plugin-preauth-pkinit-nss -BuildRequires: autoconf -BuildRequires: bison -BuildRequires: keyutils -BuildRequires: keyutils-devel -BuildRequires: libcom_err-devel -BuildRequires: libselinux-devel -BuildRequires: libverto-devel -BuildRequires: ncurses-devel -# bug437293 -%ifarch ppc64 -Obsoletes: krb5-64bit -%endif -Conflicts: krb5-mini -Conflicts: krb5 -Conflicts: krb5-client -Conflicts: krb5-server -Conflicts: krb5-plugin-kdb-ldap -Conflicts: krb5-plugin-preauth-pkinit -Conflicts: krb5-plugin-preauth-otp -Source0: https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-%{version}.tar.gz -Source1: https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-%{version}.tar.gz.asc +Source0: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}.tar.gz +Source1: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}.tar.gz.asc Source2: krb5.keyring Source3: vendor-files.tar.bz2 Source4: baselibs.conf Source5: krb5-rpmlintrc Source6: krb5.tmpfiles -Patch1: 0001-krb5-1.12-pam.patch +Patch1: 0001-ksu-pam-integration.patch Patch2: 0002-krb5-1.9-manpaths.patch -Patch3: 0003-krb5-1.12-buildconf.patch +Patch3: 0003-Adjust-build-configuration.patch Patch4: 0004-krb5-1.6.3-gssapi_improve_errormessages.patch Patch5: 0005-krb5-1.6.3-ktutil-manpage.patch Patch6: 0006-krb5-1.12-api.patch -Patch7: 0007-krb5-1.12-ksu-path.patch -Patch8: 0008-krb5-1.12-selinux-label.patch -Patch9: 0009-krb5-1.9-debuginfo.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq +Patch7: 0007-SELinux-integration.patch +Patch8: 0008-krb5-1.9-debuginfo.patch +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: keyutils +BuildRequires: keyutils-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(com_err) +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(libverto) +BuildRequires: pkgconfig(ncurses) +Requires(post): %fillup_prereq +Conflicts: krb5 +Conflicts: krb5-client +Conflicts: krb5-mini +Conflicts: krb5-plugin-kdb-ldap +Conflicts: krb5-plugin-preauth-otp +Conflicts: krb5-plugin-preauth-pkinit +Conflicts: krb5-server +Obsoletes: krb5-plugin-preauth-pkinit-nss %description Kerberos V5 is a trusted-third-party network authentication system, @@ -80,15 +72,11 @@ %package devel Summary: Development files for MIT Kerberos5 (openSUSE mini variant) -Group: Development/Libraries/C and C++ -PreReq: %{name} = %{version} +Requires: %{name} = %{version} Requires: keyutils-devel -Requires: libcom_err-devel -Requires: libverto-devel -# bug437293 -%ifarch ppc64 -Obsoletes: krb5-devel-64bit -%endif +Requires: pkgconfig(com_err) +Requires: pkgconfig(libverto) +Requires: pkgconfig(ss) Provides: krb5-devel = %{version} Conflicts: krb5-devel @@ -100,16 +88,8 @@ %prep %setup -q -n %{srcRoot} -%setup -a 3 -T -D -n %{srcRoot} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%setup -q -a 3 -T -D -n %{srcRoot} +%autopatch -p1 %build # needs to be re-generated @@ -117,16 +97,19 @@ cd src autoreconf -fi DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME -./configure \ - CC="%{__cc}" \ +# FIXME: you should use the %%configure macro +%configure \ CFLAGS="%{optflags} -I%{_includedir}/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC $(getconf LFS_CFLAGS)" \ CPPFLAGS="-I%{_includedir}/et " \ SS_LIB="-lss" \ - --prefix=/usr/lib/mit \ + --prefix=%{_prefix}/lib/mit \ --sysconfdir=%{_sysconfdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ - --libexecdir=/usr/lib/mit/sbin \ + --libexecdir=%{_prefix}/lib/mit/sbin \ + --bindir=%{_prefix}/lib/mit/bin \ + --sbindir=%{_prefix}/lib/mit/sbin \ + --datadir=%{_prefix}/lib/mit/share \ --libdir=%{_libdir} \ --includedir=%{_includedir} \ --localstatedir=%{_localstatedir}/lib/kerberos \ @@ -142,7 +125,7 @@ --with-system-ss \ --with-system-verto -make %{?_smp_mflags} +%make_build # Copy kadmin manual page into kadmin.local's due to the split between client and server package cp man/kadmin.man man/kadmin.local.8 @@ -153,7 +136,7 @@ # Munge krb5-config yet again. This is totally wrong for 64-bit, but chunks # of the buildconf patch already conspire to strip out /usr/<anything> from the # list of link flags, and it helps prevent file conflicts on multilib systems. -sed -r -i -e 's|^libdir=/usr/lib(64)?$|libdir=/usr/lib|g' %{buildroot}/usr/lib/mit/bin/krb5-config +sed -r -i -e 's|^libdir=%{_prefix}/lib(64)?$|libdir=%{_prefix}/lib|g' %{buildroot}%{_prefix}/lib/mit/bin/krb5-config # install autoconf macro mkdir -p %{buildroot}/%{_datadir}/aclocal @@ -162,21 +145,21 @@ # I'll probably do something about this later on mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/krb5.conf.d -mkdir -p %{buildroot}/etc/profile.d/ -mkdir -p %{buildroot}/var/log/krb5 +mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ +mkdir -p %{buildroot}%{_localstatedir}/log/krb5 # create plugin directories mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/kdb mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/preauth mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/libkrb5 mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/tls install -m 644 %{vendorFiles}/krb5.conf %{buildroot}%{_sysconfdir} -install -m 644 %{vendorFiles}/krb5.csh.profile %{buildroot}/etc/profile.d/krb5.csh -install -m 644 %{vendorFiles}/krb5.sh.profile %{buildroot}/etc/profile.d/krb5.sh +install -m 644 %{vendorFiles}/krb5.csh.profile %{buildroot}%{_sysconfdir}/profile.d/krb5.csh +install -m 644 %{vendorFiles}/krb5.sh.profile %{buildroot}%{_sysconfdir}/profile.d/krb5.sh # Do not write directly to /var/lib/kerberos anymore as it breaks transactional # updates. Use systemd-tmpfiles to copy the files there when it doesn't exist -install -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/ -install -m 644 %{SOURCE6} %{buildroot}/usr/lib/tmpfiles.d/krb5.conf +install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d/ +install -m 644 %{SOURCE6} %{buildroot}%{_prefix}/lib/tmpfiles.d/krb5.conf mkdir -p %{buildroot}/%{_datadir}/kerberos/krb5kdc # Where per-user keytabs live by default. mkdir -p %{buildroot}/%{_datadir}/kerberos/krb5/user @@ -190,20 +173,12 @@ chmod 0755 ${lib} done # and binaries too -chmod 0755 %{buildroot}/usr/lib/mit/bin/ksu +chmod 0755 %{buildroot}%{_prefix}/lib/mit/bin/ksu # install systemd files -%if 0%{?suse_version} >= 1210 mkdir -p %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir} -%else -# install init scripts -mkdir -p %{buildroot}%{_sysconfdir}/init.d -install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind -install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc -install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd -%endif # install sysconfig templates mkdir -p %{buildroot}/%{_fillupdir} install -m 644 %{vendorFiles}/sysconfig.kadmind %{buildroot}/%{_fillupdir}/ @@ -213,33 +188,21 @@ install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server find . -type f -name '*.ps' -exec gzip -9 {} \; # create rc* links -mkdir -p %{buildroot}/usr/bin/ -mkdir -p %{buildroot}/usr/sbin/ -%if 0%{?suse_version} >= 1210 -%if 0%{?suse_version} > 1220 -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckadmind -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckrb5kdc -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckpropd -%else -ln -s /sbin/service %{buildroot}%{_sbindir}/rckadmind -ln -s /sbin/service %{buildroot}%{_sbindir}/rckrb5kdc -ln -s /sbin/service %{buildroot}%{_sbindir}/rcpropd -%endif -%else -ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind -ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc -ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd -%endif +mkdir -p %{buildroot}%{_bindir}/ +mkdir -p %{buildroot}%{_sbindir}/ +ln -s service %{buildroot}%{_sbindir}/rckadmind +ln -s service %{buildroot}%{_sbindir}/rckrb5kdc +ln -s service %{buildroot}%{_sbindir}/rckpropd # create links for kinit and klist, because of the java ones -ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit -ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist +ln -sf ../..%{_prefix}/lib/mit/bin/kinit %{buildroot}%{_bindir}/kinit +ln -sf ../..%{_prefix}/lib/mit/bin/klist %{buildroot}%{_bindir}/klist # install doc install -d -m 755 %{buildroot}/%{krb5docdir} install -m 644 %{_builddir}/%{srcRoot}/README %{buildroot}/%{krb5docdir}/README # cleanup -rm -f %{buildroot}/usr/share/man/man1/tmac.doc* -rm -f /usr/share/man/man1/tmac.doc* -rm -rf %{buildroot}/usr/lib/mit/share/examples +rm -f %{buildroot}%{_mandir}/man1/tmac.doc* +rm -f %{_mandir}/man1/tmac.doc* +rm -rf %{buildroot}%{_prefix}/lib/mit/share/examples # manually remove otp, spake and test plugin for krb5-mini since configure # doesn't support disabling it at build time rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/otp.so @@ -275,11 +238,10 @@ ######################################################## %files devel -%defattr(-,root,root) -%dir /usr/lib/mit -%dir /usr/lib/mit/bin -%dir /usr/lib/mit/sbin -%dir /usr/lib/mit/share +%dir %{_prefix}/lib/mit +%dir %{_prefix}/lib/mit/bin +%dir %{_prefix}/lib/mit/sbin +%dir %{_prefix}/lib/mit/share %dir %{_datadir}/aclocal %{_libdir}/libgssrpc.so %{_libdir}/libk5crypto.so @@ -300,13 +262,12 @@ %{_libdir}/pkgconfig/mit-krb5-gssapi.pc %{_libdir}/pkgconfig/mit-krb5.pc %{_includedir}/* -/usr/lib/mit/bin/krb5-config -/usr/lib/mit/sbin/krb5-send-pr -%{_mandir}/man1/krb5-config.1* +%{_prefix}/lib/mit/bin/krb5-config +%{_prefix}/lib/mit/sbin/krb5-send-pr +%{_mandir}/man1/krb5-config.1%{?ext_man} %{_datadir}/aclocal/ac_check_krb5.m4 %files -f mit-krb5.lang -%defattr(-,root,root) %dir %{krb5docdir} # add directories %dir %{_libdir}/krb5 @@ -315,14 +276,14 @@ %dir %{_libdir}/krb5/plugins/preauth %dir %{_libdir}/krb5/plugins/libkrb5 %dir %{_libdir}/krb5/plugins/tls -%attr(0700,root,root) %dir /var/log/krb5 -%dir /usr/lib/mit -%dir /usr/lib/mit/sbin -%dir /usr/lib/mit/bin +%attr(0700,root,root) %dir %{_localstatedir}/log/krb5 +%dir %{_prefix}/lib/mit +%dir %{_prefix}/lib/mit/sbin +%dir %{_prefix}/lib/mit/bin %doc %{krb5docdir}/README %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf %dir %{_sysconfdir}/krb5.conf.d -%attr(0644,root,root) %config /etc/profile.d/krb5* +%attr(0644,root,root) %config %{_sysconfdir}/profile.d/krb5* %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server %{_fillupdir}/sysconfig.* %{_unitdir}/kadmind.service @@ -354,49 +315,49 @@ %ghost %attr(0600,root,root) %config(noreplace) %{_sharedstatedir}/kerberos/krb5kdc/kdc.conf %ghost %attr(0600,root,root) %config(noreplace) %{_sharedstatedir}/kerberos/krb5kdc/kadm5.acl %ghost %attr(0600,root,root) %config(noreplace) %{_sharedstatedir}/kerberos/krb5kdc/kadm5.dict -/usr/lib/mit/sbin/kadmin.local -/usr/lib/mit/sbin/kadmind -/usr/lib/mit/sbin/kpropd -/usr/lib/mit/sbin/kproplog -/usr/lib/mit/sbin/kprop -/usr/lib/mit/sbin/kdb5_util -/usr/lib/mit/sbin/krb5kdc -/usr/lib/mit/sbin/uuserver -/usr/lib/mit/sbin/sserver -/usr/lib/mit/sbin/gss-server -/usr/lib/mit/sbin/sim_server -/usr/lib/mit/bin/k5srvutil -/usr/lib/mit/bin/kvno -/usr/lib/mit/bin/kinit -/usr/lib/mit/bin/kdestroy -/usr/lib/mit/bin/kpasswd -/usr/lib/mit/bin/klist -/usr/lib/mit/bin/kadmin -/usr/lib/mit/bin/ktutil -/usr/lib/mit/bin/kswitch -%attr(0755,root,root) /usr/lib/mit/bin/ksu -/usr/lib/mit/bin/uuclient -/usr/lib/mit/bin/sclient -/usr/lib/mit/bin/gss-client -/usr/lib/mit/bin/sim_client -/usr/bin/kinit -/usr/bin/klist -/usr/sbin/rc* -%{_mandir}/man1/kvno.1* -%{_mandir}/man1/kinit.1* -%{_mandir}/man1/kdestroy.1* -%{_mandir}/man1/kpasswd.1* -%{_mandir}/man1/klist.1* -%{_mandir}/man1/ksu.1* -%{_mandir}/man1/sclient.1* -%{_mandir}/man1/kadmin.1* -%{_mandir}/man1/ktutil.1* -%{_mandir}/man1/k5srvutil.1* -%{_mandir}/man1/kswitch.1* +%{_prefix}/lib/mit/sbin/kadmin.local +%{_prefix}/lib/mit/sbin/kadmind +%{_prefix}/lib/mit/sbin/kpropd +%{_prefix}/lib/mit/sbin/kproplog +%{_prefix}/lib/mit/sbin/kprop +%{_prefix}/lib/mit/sbin/kdb5_util +%{_prefix}/lib/mit/sbin/krb5kdc +%{_prefix}/lib/mit/sbin/uuserver +%{_prefix}/lib/mit/sbin/sserver +%{_prefix}/lib/mit/sbin/gss-server +%{_prefix}/lib/mit/sbin/sim_server +%{_prefix}/lib/mit/bin/k5srvutil +%{_prefix}/lib/mit/bin/kvno +%{_prefix}/lib/mit/bin/kinit +%{_prefix}/lib/mit/bin/kdestroy +%{_prefix}/lib/mit/bin/kpasswd +%{_prefix}/lib/mit/bin/klist +%{_prefix}/lib/mit/bin/kadmin +%{_prefix}/lib/mit/bin/ktutil +%{_prefix}/lib/mit/bin/kswitch +%attr(0755,root,root) %{_prefix}/lib/mit/bin/ksu +%{_prefix}/lib/mit/bin/uuclient +%{_prefix}/lib/mit/bin/sclient +%{_prefix}/lib/mit/bin/gss-client +%{_prefix}/lib/mit/bin/sim_client +%{_bindir}/kinit +%{_bindir}/klist +%{_sbindir}/rc* +%{_mandir}/man1/kvno.1%{?ext_man} +%{_mandir}/man1/kinit.1%{?ext_man} +%{_mandir}/man1/kdestroy.1%{?ext_man} +%{_mandir}/man1/kpasswd.1%{?ext_man} +%{_mandir}/man1/klist.1%{?ext_man} +%{_mandir}/man1/ksu.1%{?ext_man} +%{_mandir}/man1/sclient.1%{?ext_man} +%{_mandir}/man1/kadmin.1%{?ext_man} +%{_mandir}/man1/ktutil.1%{?ext_man} +%{_mandir}/man1/k5srvutil.1%{?ext_man} +%{_mandir}/man1/kswitch.1%{?ext_man} %{_mandir}/man5/* -%{_mandir}/man5/.k5login.5.gz -%{_mandir}/man5/.k5identity.5* -%{_mandir}/man7/kerberos.7.gz +%{_mandir}/man5/.k5login.5%{?ext_man} +%{_mandir}/man5/.k5identity.5%{?ext_man} +%{_mandir}/man7/kerberos.7%{?ext_man} %{_mandir}/man8/* %changelog ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.mUCqXL/_old 2020-02-28 15:19:04.133615542 +0100 +++ /var/tmp/diff_new_pack.mUCqXL/_new 2020-02-28 15:19:04.133615542 +0100 @@ -1,7 +1,7 @@ # # spec file for package krb5 # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,52 +18,46 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - Name: krb5 -Version: 1.17.1 +Version: 1.18 Release: 0 Summary: MIT Kerberos5 implementation License: MIT -Group: Productivity/Networking/Security URL: https://web.mit.edu/kerberos/www/ -Obsoletes: krb5-plugin-preauth-pkinit-nss -BuildRequires: autoconf -BuildRequires: bison -BuildRequires: keyutils -BuildRequires: keyutils-devel -BuildRequires: libcom_err-devel -BuildRequires: libopenssl-devel -BuildRequires: libselinux-devel -BuildRequires: libverto-devel -BuildRequires: ncurses-devel -BuildRequires: openldap2-devel -BuildRequires: pam-devel -BuildRequires: pkgconfig(systemd) -# bug437293 -%ifarch ppc64 -Obsoletes: krb5-64bit -%endif -Conflicts: krb5-mini -Source0: https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-%{version}.tar.gz -Source1: https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-%{version}.tar.gz.asc +Source0: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}.tar.gz +Source1: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}.tar.gz.asc Source2: krb5.keyring Source3: vendor-files.tar.bz2 Source4: baselibs.conf Source5: krb5-rpmlintrc Source6: ksu-pam.d Source7: krb5.tmpfiles -Patch1: 0001-krb5-1.12-pam.patch +Patch1: 0001-ksu-pam-integration.patch Patch2: 0002-krb5-1.9-manpaths.patch -Patch3: 0003-krb5-1.12-buildconf.patch +Patch3: 0003-Adjust-build-configuration.patch Patch4: 0004-krb5-1.6.3-gssapi_improve_errormessages.patch Patch5: 0005-krb5-1.6.3-ktutil-manpage.patch Patch6: 0006-krb5-1.12-api.patch -Patch7: 0007-krb5-1.12-ksu-path.patch -Patch8: 0008-krb5-1.12-selinux-label.patch -Patch9: 0009-krb5-1.9-debuginfo.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch7: 0007-SELinux-integration.patch +Patch8: 0008-krb5-1.9-debuginfo.patch +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: keyutils +BuildRequires: keyutils-devel +BuildRequires: openldap2-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(com_err) +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(libverto) +BuildRequires: pkgconfig(ncurses) +BuildRequires: pkgconfig(ss) +BuildRequires: pkgconfig(systemd) +Conflicts: krb5-mini +Obsoletes: krb5-plugin-preauth-pkinit-nss %description Kerberos V5 is a trusted-third-party network authentication system, @@ -71,9 +65,8 @@ practice of clear text passwords. %package client -Conflicts: krb5-mini Summary: Client programs of the MIT Kerberos5 implementation -Group: Productivity/Networking/Security +Conflicts: krb5-mini %description client Kerberos V5 is a trusted-third-party network authentication system, @@ -83,17 +76,12 @@ %package server Summary: Server program of the MIT Kerberos5 implementation -Group: Productivity/Networking/Security Requires: cron Requires: libverto-libev1 Requires: logrotate Requires: perl-Date-Calc -%if 0%{?suse_version} >= 1210 +Requires(post): %fillup_prereq %{?systemd_requires} -%else -PreReq: %insserv_prereq -%endif -PreReq: %fillup_prereq %description server Kerberos V5 is a trusted-third-party network authentication system, @@ -103,7 +91,6 @@ %package plugin-kdb-ldap Summary: LDAP database plugin for MIT Kerberos5 -Group: Productivity/Networking/Security Requires: krb5-server = %{version} %description plugin-kdb-ldap @@ -114,7 +101,6 @@ %package plugin-preauth-pkinit Summary: PKINIT preauthentication plugin for MIT Kerberos5 -Group: Productivity/Networking/Security %description plugin-preauth-pkinit Kerberos V5 is a trusted-third-party network authentication system, @@ -123,7 +109,6 @@ %package plugin-preauth-otp Summary: OTP preauthentication plugin for MIT Kerberos5 -Group: Productivity/Networking/Security %description plugin-preauth-otp Kerberos V5 is a trusted-third-party network authentication system, @@ -132,7 +117,6 @@ %package plugin-preauth-spake Summary: SPAKE preauthentication plugin for MIT Kerberos5 -Group: Productivity/Networking/Security %description plugin-preauth-spake Kerberos V5 is a trusted-third-party network authentication system, @@ -141,7 +125,6 @@ %package doc Summary: Documentation for the MIT Kerberos5 implementation -Group: Documentation/Other %description doc Kerberos V5 is a trusted-third-party network authentication @@ -151,15 +134,11 @@ %package devel Summary: Development files for MIT Kerberos5 -Group: Development/Libraries/C and C++ -PreReq: %{name} = %{version} +Requires: %{name} = %{version} Requires: keyutils-devel -Requires: libcom_err-devel -Requires: libverto-devel -# bug437293 -%ifarch ppc64 -Obsoletes: krb5-devel-64bit -%endif +Requires: pkgconfig(com_err) +Requires: pkgconfig(libverto) +Requires: pkgconfig(ss) Conflicts: krb5-mini-devel %description devel @@ -174,7 +153,7 @@ %prep %setup -q -n %{srcRoot} -%setup -a 3 -T -D -n %{srcRoot} +%setup -q -a 3 -T -D -n %{srcRoot} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -183,7 +162,6 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %build # needs to be re-generated @@ -191,16 +169,18 @@ cd src autoreconf -fi DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME -./configure \ - CC="%{__cc}" \ +%configure \ CFLAGS="%{optflags} -I%{_includedir}/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC $(getconf LFS_CFLAGS)" \ CPPFLAGS="-I%{_includedir}/et " \ SS_LIB="-lss" \ - --prefix=/usr/lib/mit \ + --prefix=%{_prefix}/lib/mit \ --sysconfdir=%{_sysconfdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ - --libexecdir=/usr/lib/mit/sbin \ + --libexecdir=%{_prefix}/lib/mit/sbin \ + --bindir=%{_prefix}/lib/mit/bin \ + --sbindir=%{_prefix}/lib/mit/sbin \ + --datadir=%{_prefix}/lib/mit/share \ --libdir=%{_libdir} \ --includedir=%{_includedir} \ --localstatedir=%{_localstatedir}/lib/kerberos \ @@ -218,7 +198,7 @@ --with-system-ss \ --with-system-verto -make %{?_smp_mflags} +%make_build # Copy kadmin manual page into kadmin.local's due to the split between client and server package cp man/kadmin.man man/kadmin.local.8 @@ -229,7 +209,7 @@ # Munge krb5-config yet again. This is totally wrong for 64-bit, but chunks # of the buildconf patch already conspire to strip out /usr/<anything> from the # list of link flags, and it helps prevent file conflicts on multilib systems. -sed -r -i -e 's|^libdir=/usr/lib(64)?$|libdir=/usr/lib|g' %{buildroot}/usr/lib/mit/bin/krb5-config +sed -r -i -e 's|^libdir=%{_prefix}/lib(64)?$|libdir=%{_prefix}/lib|g' %{buildroot}%{_prefix}/lib/mit/bin/krb5-config # install autoconf macro mkdir -p %{buildroot}/%{_datadir}/aclocal @@ -238,21 +218,21 @@ # I'll probably do something about this later on mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/krb5.conf.d -mkdir -p %{buildroot}/etc/profile.d/ -mkdir -p %{buildroot}/var/log/krb5 +mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ +mkdir -p %{buildroot}%{_localstatedir}/log/krb5 # create plugin directories mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/kdb mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/preauth mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/libkrb5 mkdir -p %{buildroot}/%{_libdir}/krb5/plugins/tls install -m 644 %{vendorFiles}/krb5.conf %{buildroot}%{_sysconfdir} -install -m 644 %{vendorFiles}/krb5.csh.profile %{buildroot}/etc/profile.d/krb5.csh -install -m 644 %{vendorFiles}/krb5.sh.profile %{buildroot}/etc/profile.d/krb5.sh +install -m 644 %{vendorFiles}/krb5.csh.profile %{buildroot}%{_sysconfdir}/profile.d/krb5.csh +install -m 644 %{vendorFiles}/krb5.sh.profile %{buildroot}%{_sysconfdir}/profile.d/krb5.sh # Do not write directly to /var/lib/kerberos anymore as it breaks transactional # updates. Use systemd-tmpfiles to copy the files there when it doesn't exist -install -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/ -install -m 644 %{SOURCE7} %{buildroot}/usr/lib/tmpfiles.d/krb5.conf +install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d/ +install -m 644 %{SOURCE7} %{buildroot}%{_prefix}/lib/tmpfiles.d/krb5.conf mkdir -p %{buildroot}/%{_datadir}/kerberos/krb5kdc # Where per-user keytabs live by default. mkdir -p %{buildroot}/%{_datadir}/kerberos/krb5/user @@ -266,7 +246,7 @@ chmod 0755 ${lib} done # and binaries too -chmod 0755 %{buildroot}/usr/lib/mit/bin/ksu +chmod 0755 %{buildroot}%{_prefix}/lib/mit/bin/ksu # install systemd files %if 0%{?suse_version} >= 1210 mkdir -p %{buildroot}%{_unitdir} @@ -289,26 +269,14 @@ install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server find . -type f -name '*.ps' -exec gzip -9 {} + # create rc* links -mkdir -p %{buildroot}/usr/bin/ -mkdir -p %{buildroot}/usr/sbin/ -%if 0%{?suse_version} >= 1210 -%if 0%{?suse_version} > 1220 -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckadmind -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckrb5kdc -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckpropd -%else -ln -s /sbin/service %{buildroot}%{_sbindir}/rckadmind -ln -s /sbin/service %{buildroot}%{_sbindir}/rckrb5kdc -ln -s /sbin/service %{buildroot}%{_sbindir}/rcpropd -%endif -%else -ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind -ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc -ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd -%endif +mkdir -p %{buildroot}%{_bindir}/ +mkdir -p %{buildroot}%{_sbindir}/ +ln -s service %{buildroot}%{_sbindir}/rckadmind +ln -s service %{buildroot}%{_sbindir}/rckrb5kdc +ln -s service %{buildroot}%{_sbindir}/rckpropd # create links for kinit and klist, because of the java ones -ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit -ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist +ln -sf ../..%{_prefix}/lib/mit/bin/kinit %{buildroot}%{_bindir}/kinit +ln -sf ../..%{_prefix}/lib/mit/bin/klist %{buildroot}%{_bindir}/klist # install doc install -d -m 755 %{buildroot}/%{krb5docdir} install -m 644 %{_builddir}/%{srcRoot}/README %{buildroot}/%{krb5docdir}/README @@ -316,22 +284,20 @@ install -m 644 %{_builddir}/%{srcRoot}/src/plugins/kdb/ldap/libkdb_ldap/kerberos.schema %{buildroot}/%{_datadir}/kerberos/ldap/kerberos.schema install -m 644 %{_builddir}/%{srcRoot}/src/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif %{buildroot}/%{_datadir}/kerberos/ldap/kerberos.ldif # link pam-config for su to ksu -mkdir -p %{buildroot}/etc/pam.d/ -install -m 644 %{S:6} %{buildroot}/etc/pam.d/ksu +mkdir -p %{buildroot}%{_sysconfdir}/pam.d/ +install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/ksu # cleanup -rm -f %{buildroot}/usr/share/man/man1/tmac.doc* -rm -f /usr/share/man/man1/tmac.doc* html/.doctrees/environment.pickle -rm -rf %{buildroot}/usr/lib/mit/share/examples +rm -f %{buildroot}%{_mandir}/man1/tmac.doc* +rm -f %{_mandir}/man1/tmac.doc* html/.doctrees/environment.pickle +rm -rf %{buildroot}%{_prefix}/lib/mit/share/examples # manually remove test plugin since configure doesn't support disabling it at build time rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %find_lang mit-krb5 %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig - %preun server %service_del_preun krb5kdc.service kadmind.service kpropd.service @@ -349,15 +315,13 @@ %service_add_pre krb5kdc.service kadmind.service kpropd.service %post plugin-kdb-ldap -p /sbin/ldconfig - %postun plugin-kdb-ldap -p /sbin/ldconfig %files devel -%defattr(-,root,root) -%dir /usr/lib/mit -%dir /usr/lib/mit/bin -%dir /usr/lib/mit/sbin -%dir /usr/lib/mit/share +%dir %{_prefix}/lib/mit +%dir %{_prefix}/lib/mit/bin +%dir %{_prefix}/lib/mit/sbin +%dir %{_prefix}/lib/mit/share %dir %{_datadir}/aclocal %{_libdir}/libgssrpc.so %{_libdir}/libk5crypto.so @@ -378,13 +342,12 @@ %{_libdir}/pkgconfig/mit-krb5-gssapi.pc %{_libdir}/pkgconfig/mit-krb5.pc %{_includedir}/* -/usr/lib/mit/bin/krb5-config -/usr/lib/mit/sbin/krb5-send-pr -%{_mandir}/man1/krb5-config.1* +%{_prefix}/lib/mit/bin/krb5-config +%{_prefix}/lib/mit/sbin/krb5-send-pr +%{_mandir}/man1/krb5-config.1%{?ext_man} %{_datadir}/aclocal/ac_check_krb5.m4 %files -f mit-krb5.lang -%defattr(-,root,root) %dir %{krb5docdir} # add plugin directories %dir %{_libdir}/krb5 @@ -394,11 +357,11 @@ %dir %{_libdir}/krb5/plugins/libkrb5 %dir %{_libdir}/krb5/plugins/tls # add log directory -%attr(0700,root,root) %dir /var/log/krb5 +%attr(0700,root,root) %dir %{_localstatedir}/log/krb5 %doc %{krb5docdir}/README %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf %dir %{_sysconfdir}/krb5.conf.d -%attr(0644,root,root) %config /etc/profile.d/krb5* +%attr(0644,root,root) %config %{_sysconfdir}/profile.d/krb5* %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* %{_libdir}/libk5crypto.so.* @@ -411,22 +374,15 @@ %{_libdir}/krb5/plugins/tls/*.so %files server -%defattr(-,root,root) -%attr(0700,root,root) %dir /var/log/krb5 +%attr(0700,root,root) %dir %{_localstatedir}/log/krb5 %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server -%if 0%{?suse_version} >= 1210 %{_unitdir}/kadmind.service %{_unitdir}/krb5kdc.service %{_unitdir}/kpropd.service %{_libexecdir}/tmpfiles.d/krb5.conf -%else -%{_sysconfdir}/init.d/kadmind -%{_sysconfdir}/init.d/krb5kdc -%{_sysconfdir}/init.d/kpropd -%endif %dir %{krb5docdir} -%dir /usr/lib/mit -%dir /usr/lib/mit/sbin +%dir %{_prefix}/lib/mit +%dir %{_prefix}/lib/mit/sbin %dir %{_datadir}/kerberos/ %dir %{_datadir}/kerberos/krb5kdc %dir %{_datadir}/kerberos/krb5 @@ -446,101 +402,96 @@ %ghost %attr(0600,root,root) %config(noreplace) %{_sharedstatedir}/kerberos/krb5kdc/kadm5.acl %ghost %attr(0600,root,root) %config(noreplace) %{_sharedstatedir}/kerberos/krb5kdc/kadm5.dict %{_fillupdir}/sysconfig.* -/usr/sbin/rc* -/usr/lib/mit/sbin/kadmin.local -/usr/lib/mit/sbin/kadmind -/usr/lib/mit/sbin/kpropd -/usr/lib/mit/sbin/kproplog -/usr/lib/mit/sbin/kprop -/usr/lib/mit/sbin/kdb5_util -/usr/lib/mit/sbin/krb5kdc -/usr/lib/mit/sbin/gss-server -/usr/lib/mit/sbin/sim_server -/usr/lib/mit/sbin/sserver -/usr/lib/mit/sbin/uuserver +%{_sbindir}/rc* +%{_prefix}/lib/mit/sbin/kadmin.local +%{_prefix}/lib/mit/sbin/kadmind +%{_prefix}/lib/mit/sbin/kpropd +%{_prefix}/lib/mit/sbin/kproplog +%{_prefix}/lib/mit/sbin/kprop +%{_prefix}/lib/mit/sbin/kdb5_util +%{_prefix}/lib/mit/sbin/krb5kdc +%{_prefix}/lib/mit/sbin/gss-server +%{_prefix}/lib/mit/sbin/sim_server +%{_prefix}/lib/mit/sbin/sserver +%{_prefix}/lib/mit/sbin/uuserver %{_libdir}/krb5/plugins/kdb/db2.so -%{_mandir}/man5/kdc.conf.5* -%{_mandir}/man5/kadm5.acl.5* -%{_mandir}/man8/kadmind.8* -%{_mandir}/man8/kadmin.local.8* -%{_mandir}/man8/kpropd.8* -%{_mandir}/man8/kprop.8* -%{_mandir}/man8/kproplog.8.gz -%{_mandir}/man8/kdb5_util.8* -%{_mandir}/man8/krb5kdc.8* -%{_mandir}/man8/sserver.8* +%{_mandir}/man5/kdc.conf.5%{?ext_man} +%{_mandir}/man5/kadm5.acl.5%{?ext_man} +%{_mandir}/man8/kadmind.8%{?ext_man} +%{_mandir}/man8/kadmin.local.8%{?ext_man} +%{_mandir}/man8/kpropd.8%{?ext_man} +%{_mandir}/man8/kprop.8%{?ext_man} +%{_mandir}/man8/kproplog.8%{?ext_man} +%{_mandir}/man8/kdb5_util.8%{?ext_man} +%{_mandir}/man8/krb5kdc.8%{?ext_man} +%{_mandir}/man8/sserver.8%{?ext_man} %files client -%defattr(-,root,root) -%dir /usr/lib/mit -%dir /usr/lib/mit/bin -%dir /usr/lib/mit/sbin -%attr(0644,root,root) %config(noreplace) /etc/pam.d/ksu -/usr/lib/mit/bin/kvno -/usr/lib/mit/bin/kinit -/usr/lib/mit/bin/kdestroy -/usr/lib/mit/bin/kpasswd -/usr/lib/mit/bin/klist -/usr/lib/mit/bin/kadmin -/usr/lib/mit/bin/ktutil -/usr/lib/mit/bin/k5srvutil -/usr/lib/mit/bin/gss-client -/usr/lib/mit/bin/ksu -/usr/lib/mit/bin/sclient -/usr/lib/mit/bin/sim_client -/usr/lib/mit/bin/uuclient -/usr/lib/mit/bin/kswitch -/usr/bin/kinit -/usr/bin/klist -%{_mandir}/man1/kvno.1* -%{_mandir}/man1/kinit.1* -%{_mandir}/man1/kdestroy.1* -%{_mandir}/man1/kpasswd.1* -%{_mandir}/man1/klist.1* -%{_mandir}/man1/kadmin.1* -%{_mandir}/man1/ktutil.1* -%{_mandir}/man1/k5srvutil.1* -%{_mandir}/man1/kswitch.1* -%{_mandir}/man5/krb5.conf.5* -%{_mandir}/man5/.k5login.5* -%{_mandir}/man5/.k5identity.5* -%{_mandir}/man5/k5identity.5* -%{_mandir}/man5/k5login.5* -%{_mandir}/man1/ksu.1.gz -%{_mandir}/man1/sclient.1.gz -%{_mandir}/man7/kerberos.7.gz +%dir %{_prefix}/lib/mit +%dir %{_prefix}/lib/mit/bin +%dir %{_prefix}/lib/mit/sbin +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/ksu +%{_prefix}/lib/mit/bin/kvno +%{_prefix}/lib/mit/bin/kinit +%{_prefix}/lib/mit/bin/kdestroy +%{_prefix}/lib/mit/bin/kpasswd +%{_prefix}/lib/mit/bin/klist +%{_prefix}/lib/mit/bin/kadmin +%{_prefix}/lib/mit/bin/ktutil +%{_prefix}/lib/mit/bin/k5srvutil +%{_prefix}/lib/mit/bin/gss-client +%{_prefix}/lib/mit/bin/ksu +%{_prefix}/lib/mit/bin/sclient +%{_prefix}/lib/mit/bin/sim_client +%{_prefix}/lib/mit/bin/uuclient +%{_prefix}/lib/mit/bin/kswitch +%{_bindir}/kinit +%{_bindir}/klist +%{_mandir}/man1/kvno.1%{?ext_man} +%{_mandir}/man1/kinit.1%{?ext_man} +%{_mandir}/man1/kdestroy.1%{?ext_man} +%{_mandir}/man1/kpasswd.1%{?ext_man} +%{_mandir}/man1/klist.1%{?ext_man} +%{_mandir}/man1/kadmin.1%{?ext_man} +%{_mandir}/man1/ktutil.1%{?ext_man} +%{_mandir}/man1/k5srvutil.1%{?ext_man} +%{_mandir}/man1/kswitch.1%{?ext_man} +%{_mandir}/man5/krb5.conf.5%{?ext_man} +%{_mandir}/man5/.k5login.5%{?ext_man} +%{_mandir}/man5/.k5identity.5%{?ext_man} +%{_mandir}/man5/k5identity.5%{?ext_man} +%{_mandir}/man5/k5login.5%{?ext_man} +%{_mandir}/man1/ksu.1%{?ext_man} +%{_mandir}/man1/sclient.1%{?ext_man} +%{_mandir}/man7/kerberos.7%{?ext_man} %files plugin-kdb-ldap -%defattr(-,root,root) %dir %{_libdir}/krb5 %dir %{_libdir}/krb5/plugins %dir %{_libdir}/krb5/plugins/kdb -%dir /usr/lib/mit/sbin/ +%dir %{_prefix}/lib/mit/sbin/ %dir %{_datadir}/kerberos %dir %{_datadir}/kerberos/ldap %config %{_datadir}/kerberos/ldap/kerberos.schema %config %{_datadir}/kerberos/ldap/kerberos.ldif %{_libdir}/krb5/plugins/kdb/kldap.so -/usr/lib/mit/sbin/kdb5_ldap_util +%{_prefix}/lib/mit/sbin/kdb5_ldap_util %{_libdir}/libkdb_ldap* -%{_mandir}/man8/kdb5_ldap_util.8* +%{_mandir}/man8/kdb5_ldap_util.8%{?ext_man} %files plugin-preauth-pkinit -%defattr(-,root,root) %dir %{_libdir}/krb5 %dir %{_libdir}/krb5/plugins %dir %{_libdir}/krb5/plugins/preauth %{_libdir}/krb5/plugins/preauth/pkinit.so %files plugin-preauth-otp -%defattr(-,root,root) %dir %{_libdir}/krb5 %dir %{_libdir}/krb5/plugins %dir %{_libdir}/krb5/plugins/preauth %{_libdir}/krb5/plugins/preauth/otp.so %files plugin-preauth-spake -%defattr(-,root,root) %dir %{_libdir}/krb5 %dir %{_libdir}/krb5/plugins %dir %{_libdir}/krb5/plugins/preauth ++++++ 0001-ksu-pam-integration.patch ++++++ ++++ 776 lines (skipped) ++++++ 0002-krb5-1.9-manpaths.patch ++++++ --- /var/tmp/diff_new_pack.mUCqXL/_old 2020-02-28 15:19:04.157615590 +0100 +++ /var/tmp/diff_new_pack.mUCqXL/_new 2020-02-28 15:19:04.157615590 +0100 @@ -1,7 +1,7 @@ -From 84aceebf6f76934c5d8fa11b0f7cd662542c286a Mon Sep 17 00:00:00 2001 +From 852d6a0d81b21673bdcb80ff13bf60dd5a416dd4 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero <[email protected]> Date: Mon, 14 Jan 2019 13:06:55 +0100 -Subject: [PATCH 2/9] krb5-1.9-manpaths +Subject: [PATCH 2/8] krb5-1.9-manpaths Import krb5-1.9-manpaths.dif @@ -14,7 +14,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/man/kpropd.man b/src/man/kpropd.man -index 38daa5e79..a0106ec5f 100644 +index 66de36813..9988dcdf3 100644 --- a/src/man/kpropd.man +++ b/src/man/kpropd.man @@ -67,7 +67,7 @@ the \fB/etc/inetd.conf\fP file which looks like this: @@ -27,5 +27,5 @@ .fi .UNINDENT -- -2.20.1 +2.25.0 ++++++ 0003-Adjust-build-configuration.patch ++++++ >From 48abdf7c7b28611c1135b35dfa23ac61899e80b2 Mon Sep 17 00:00:00 2001 From: Robbie Harwood <[email protected]> Date: Tue, 23 Aug 2016 16:45:26 -0400 Subject: [PATCH 3/8] Adjust build configuration Build binaries in this package as RELRO PIEs, libraries as partial RELRO, and install shared libraries with the execute bit set on them. Prune out the -L/usr/lib* and PIE flags where they might leak out and affect apps which just want to link with the libraries. FIXME: needs to check and not just assume that the compiler supports using these flags. Last-updated: krb5-1.15-beta1 --- src/build-tools/krb5-config.in | 7 +++++++ src/config/pre.in | 2 +- src/config/shlib.conf | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in index f6184da3f..0edf6a1a5 100755 --- a/src/build-tools/krb5-config.in +++ b/src/build-tools/krb5-config.in @@ -225,6 +225,13 @@ if test -n "$do_libs"; then -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ -e 's#\$(CFLAGS)##'` + if test `dirname $libdir` = /usr ; then + lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##" -e "s#$RPATH_FLAG$libdir##"` + fi + lib_flags=`echo $lib_flags | sed -e "s#-fPIE##g" -e "s#-pie##g"` + lib_flags=`echo $lib_flags | sed -e "s#-Wl,-z,relro##g"` + lib_flags=`echo $lib_flags | sed -e "s#-Wl,-z,now##g"` + if test $library = 'kdb'; then lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" library=krb5 diff --git a/src/config/pre.in b/src/config/pre.in index ce87e21ca..164bf8301 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -184,7 +184,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) INSTALL_SCRIPT=@INSTALL_PROGRAM@ INSTALL_DATA=@INSTALL_DATA@ INSTALL_SHLIB=@INSTALL_SHLIB@ -INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root +INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 ## This is needed because autoconf will sometimes define @exec_prefix@ to be ## ${prefix}. prefix=@prefix@ diff --git a/src/config/shlib.conf b/src/config/shlib.conf index 3e4af6c02..2b20c3fda 100644 --- a/src/config/shlib.conf +++ b/src/config/shlib.conf @@ -423,7 +423,7 @@ mips-*-netbsd*) # Linux ld doesn't default to stuffing the SONAME field... # Use objdump -x to examine the fields of the library # UNDEF_CHECK is suppressed by --enable-asan - LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $(UNDEF_CHECK)' + LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $(UNDEF_CHECK) -Wl,-z,relro -Wl,--warn-shared-textrel' UNDEF_CHECK='-Wl,--no-undefined' # $(EXPORT_CHECK) runs export-check.pl when in maintainer mode. LDCOMBINE_TAIL='-Wl,--version-script binutils.versions $(EXPORT_CHECK)' @@ -435,7 +435,8 @@ mips-*-netbsd*) SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' PROFFLAGS=-pg PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) -pie -Wl,-z,relro -Wl,-z,now $(LDFLAGS)' + INSTALL_SHLIB='${INSTALL} -m755' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)' -- 2.25.0 ++++++ 0004-krb5-1.6.3-gssapi_improve_errormessages.patch ++++++ --- /var/tmp/diff_new_pack.mUCqXL/_old 2020-02-28 15:19:04.165615607 +0100 +++ /var/tmp/diff_new_pack.mUCqXL/_new 2020-02-28 15:19:04.165615607 +0100 @@ -1,7 +1,7 @@ -From 3cdd9863a1a7a9a004f3d75e32136bb0be26a32b Mon Sep 17 00:00:00 2001 +From c1b8aa3d8546453544fd659ef18b96709eb88e54 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero <[email protected]> Date: Mon, 14 Jan 2019 13:09:05 +0100 -Subject: [PATCH 4/9] krb5-1.6.3-gssapi_improve_errormessages +Subject: [PATCH 4/8] krb5-1.6.3-gssapi_improve_errormessages Import krb5-1.6.3-gssapi_improve_errormessages.dif --- @@ -22,5 +22,5 @@ *minor_status = ENOMEM; return(GSS_S_FAILURE); -- -2.20.1 +2.25.0 ++++++ 0005-krb5-1.6.3-ktutil-manpage.patch ++++++ --- /var/tmp/diff_new_pack.mUCqXL/_old 2020-02-28 15:19:04.173615623 +0100 +++ /var/tmp/diff_new_pack.mUCqXL/_new 2020-02-28 15:19:04.173615623 +0100 @@ -1,7 +1,7 @@ -From af0fe879800e72101b6d306c1b510880aec7cdaa Mon Sep 17 00:00:00 2001 +From 2a5b2877495384bbe5db8f3b66ac342f83cd45dc Mon Sep 17 00:00:00 2001 From: Samuel Cabrero <[email protected]> Date: Mon, 14 Jan 2019 13:14:47 +0100 -Subject: [PATCH 5/9] krb5-1.6.3-ktutil-manpage +Subject: [PATCH 5/8] krb5-1.6.3-ktutil-manpage Import krb5-1.6.3-ktutil-manpage.dif --- @@ -9,10 +9,10 @@ 1 file changed, 12 insertions(+) diff --git a/src/man/ktutil.man b/src/man/ktutil.man -index 4e174c0fe..f6d6ae814 100644 +index 233329468..915b41c6e 100644 --- a/src/man/ktutil.man +++ b/src/man/ktutil.man -@@ -171,6 +171,18 @@ ktutil: +@@ -151,6 +151,18 @@ ktutil: .sp See kerberos(7) for a description of Kerberos environment variables. @@ -32,5 +32,5 @@ .sp kadmin(1), kdb5_util(8), kerberos(7) -- -2.20.1 +2.25.0 ++++++ 0006-krb5-1.12-api.patch ++++++ --- /var/tmp/diff_new_pack.mUCqXL/_old 2020-02-28 15:19:04.181615640 +0100 +++ /var/tmp/diff_new_pack.mUCqXL/_new 2020-02-28 15:19:04.181615640 +0100 @@ -1,7 +1,7 @@ -From 70039109cc843f4958e89fd674d098c7c89affa8 Mon Sep 17 00:00:00 2001 +From b8544a75b273008042fadf51f0b49c00617ff275 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero <[email protected]> Date: Mon, 14 Jan 2019 13:15:50 +0100 -Subject: [PATCH 6/9] krb5-1.12-api +Subject: [PATCH 6/8] krb5-1.12-api Import krb5-1.12-api.patch @@ -38,5 +38,5 @@ /* Treat UPNs as if they were real principals */ if (princ1->type == KRB5_NT_ENTERPRISE_PRINCIPAL) { -- -2.20.1 +2.25.0 ++++++ 0007-SELinux-integration.patch ++++++ ++++ 1037 lines (skipped) ++++++ 0009-krb5-1.9-debuginfo.patch -> 0008-krb5-1.9-debuginfo.patch ++++++ --- /work/SRC/openSUSE:Factory/krb5/0009-krb5-1.9-debuginfo.patch 2019-02-19 13:54:59.156721383 +0100 +++ /work/SRC/openSUSE:Factory/.krb5.new.26092/0008-krb5-1.9-debuginfo.patch 2020-02-28 15:19:02.281611771 +0100 @@ -1,7 +1,7 @@ -From ea232e6646a96e0b1dff41b1b1e0b30f95214ebe Mon Sep 17 00:00:00 2001 +From f079a7f765dc76eb01ba80fb7214ee0d25116e59 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero <[email protected]> Date: Mon, 14 Jan 2019 13:18:16 +0100 -Subject: [PATCH 9/9] krb5-1.9-debuginfo +Subject: [PATCH 8/8] krb5-1.9-debuginfo Import krb5-1.9-debuginfo.patch @@ -14,7 +14,7 @@ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in -index adfea6e2b..d1327e400 100644 +index adfea6e2b..8e89cf03b 100644 --- a/src/kadmin/cli/Makefile.in +++ b/src/kadmin/cli/Makefile.in @@ -37,3 +37,8 @@ clean-unix:: @@ -24,7 +24,7 @@ + +%.c: %.y + $(RM) y.tab.c $@ -+ $(YACC.y) $< ++ $(YACC.y) $< + $(CP) y.tab.c $@ diff --git a/src/plugins/kdb/ldap/ldap_util/Makefile.in b/src/plugins/kdb/ldap/ldap_util/Makefile.in index 8669c2436..a22f23c02 100644 @@ -40,5 +40,5 @@ install: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) -- -2.20.1 +2.25.0 ++++++ krb5-1.17.1.tar.gz -> krb5-1.18.tar.gz ++++++ /work/SRC/openSUSE:Factory/krb5/krb5-1.17.1.tar.gz /work/SRC/openSUSE:Factory/.krb5.new.26092/krb5-1.18.tar.gz differ: char 5, line 1
