Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2012-06-10 20:20:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krb5", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5-doc.changes 2011-09-23 02:07:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-doc.changes 2012-06-10 21:52:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 6 17:34:26 CEST 2012 - [email protected] + +- update to version 1.10.2 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes 2012-02-15 16:16:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-mini.changes 2012-06-10 21:52:56.000000000 +0200 @@ -2 +2 @@ -Tue Jan 31 15:32:51 CET 2012 - [email protected] +Thu Jun 7 11:39:18 UTC 2012 - [email protected] @@ -4 +4,61 @@ -- fix License in krb5-mini +- fix gcc47 issues + +------------------------------------------------------------------- +Wed Jun 6 16:25:41 CEST 2012 - [email protected] + +- update to version 1.10.2 + obsolte patches: + * krb5-1.7-nodeplibs.patch + * krb5-1.9.1-ai_addrconfig.patch + * krb5-1.9.1-ai_addrconfig2.patch + * krb5-1.9.1-sendto_poll.patch + * krb5-1.9-canonicalize-fallback.patch + * krb5-1.9-paren.patch + * krb5-klist_s.patch + * krb5-pkinit-cms2.patch + * krb5-trunk-chpw-err.patch + * krb5-trunk-gss_delete_sec.patch + * krb5-trunk-kadmin-oldproto.patch + * krb5-1.9-MITKRB5-SA-2011-006.dif + * krb5-1.9-gss_display_status-iakerb.patch + * krb5-1.9.1-sendto_poll2.patch + * krb5-1.9.1-sendto_poll3.patch + * krb5-1.9-MITKRB5-SA-2011-007.dif +- Fix an interop issue with Windows Server 2008 R2 Read-Only Domain + Controllers. +- Update a workaround for a glibc bug that would cause DNS PTR queries + to occur even when rdns = false. +- Fix a kadmind denial of service issue (null pointer dereference), + which could only be triggered by an administrator with the "create" + privilege. [CVE-2012-1013] +- Fix access controls for KDB string attributes [CVE-2012-1012] +- Make the ASN.1 encoding of key version numbers interoperate with + Windows Read-Only Domain Controllers +- Avoid generating spurious password expiry warnings in cases where + the KDC sends an account expiry time without a password expiry time +- Make PKINIT work with FAST in the client library. +- Add the DIR credential cache type, which can hold a collection of + credential caches. +- Enhance kinit, klist, and kdestroy to support credential cache + collections if the cache type supports it. +- Add the kswitch command, which changes the selected default cache + within a collection. +- Add heuristic support for choosing client credentials based on + the service realm. +- Add support for $HOME/.k5identity, which allows credential + choice based on configured rules. + +------------------------------------------------------------------- +Sun Feb 26 22:23:15 UTC 2012 - [email protected] + +- add autoconf macro to devel subpackage + +------------------------------------------------------------------- +Tue Jan 31 15:33:05 CET 2012 - [email protected] + +- fix license in krb5-mini + +------------------------------------------------------------------- +Tue Dec 20 20:57:26 UTC 2011 - [email protected] + +- add autoconf as buildrequire to avoid implicit dependency --- /work/SRC/openSUSE:Factory/krb5/krb5.changes 2012-03-01 07:25:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5.changes 2012-06-10 21:52:56.000000000 +0200 @@ -1,0 +2,50 @@ +Thu Jun 7 11:39:18 UTC 2012 - [email protected] + +- fix gcc47 issues + +------------------------------------------------------------------- +Wed Jun 6 16:25:41 CEST 2012 - [email protected] + +- update to version 1.10.2 + obsolte patches: + * krb5-1.7-nodeplibs.patch + * krb5-1.9.1-ai_addrconfig.patch + * krb5-1.9.1-ai_addrconfig2.patch + * krb5-1.9.1-sendto_poll.patch + * krb5-1.9-canonicalize-fallback.patch + * krb5-1.9-paren.patch + * krb5-klist_s.patch + * krb5-pkinit-cms2.patch + * krb5-trunk-chpw-err.patch + * krb5-trunk-gss_delete_sec.patch + * krb5-trunk-kadmin-oldproto.patch + * krb5-1.9-MITKRB5-SA-2011-006.dif + * krb5-1.9-gss_display_status-iakerb.patch + * krb5-1.9.1-sendto_poll2.patch + * krb5-1.9.1-sendto_poll3.patch + * krb5-1.9-MITKRB5-SA-2011-007.dif +- Fix an interop issue with Windows Server 2008 R2 Read-Only Domain + Controllers. +- Update a workaround for a glibc bug that would cause DNS PTR queries + to occur even when rdns = false. +- Fix a kadmind denial of service issue (null pointer dereference), + which could only be triggered by an administrator with the "create" + privilege. [CVE-2012-1013] +- Fix access controls for KDB string attributes [CVE-2012-1012] +- Make the ASN.1 encoding of key version numbers interoperate with + Windows Read-Only Domain Controllers +- Avoid generating spurious password expiry warnings in cases where + the KDC sends an account expiry time without a password expiry time +- Make PKINIT work with FAST in the client library. +- Add the DIR credential cache type, which can hold a collection of + credential caches. +- Enhance kinit, klist, and kdestroy to support credential cache + collections if the cache type supports it. +- Add the kswitch command, which changes the selected default cache + within a collection. +- Add heuristic support for choosing client credentials based on + the service realm. +- Add support for $HOME/.k5identity, which allows credential + choice based on configured rules. + +------------------------------------------------------------------- Old: ---- krb5-1.6.3-kpasswd_tcp.patch krb5-1.6.3-texi2dvi-fix.dif krb5-1.7-nodeplibs.patch krb5-1.9-MITKRB5-SA-2011-006.dif krb5-1.9-MITKRB5-SA-2011-007.dif krb5-1.9-buildconf.patch krb5-1.9-canonicalize-fallback.patch krb5-1.9-gss_display_status-iakerb.patch krb5-1.9-paren.patch krb5-1.9-selinux-label.patch krb5-1.9.1-ai_addrconfig.patch krb5-1.9.1-ai_addrconfig2.patch krb5-1.9.1-sendto_poll.patch krb5-1.9.1-sendto_poll2.patch krb5-1.9.1-sendto_poll3.patch krb5-1.9.1.tar.bz2 krb5-klist_s.patch krb5-pkinit-cms2.patch krb5-trunk-chpw-err.patch krb5-trunk-gss_delete_sec.patch krb5-trunk-kadmin-oldproto.patch New: ---- krb5-1.10-buildconf.patch krb5-1.10-gcc47.patch krb5-1.10-kpasswd_tcp.patch krb5-1.10-selinux-label.patch krb5-1.10.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-doc.spec ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -16,14 +16,13 @@ # - Name: krb5-doc BuildRequires: ghostscript-library BuildRequires: latex2html BuildRequires: texlive -Version: 1.9.1 +Version: 1.10.2 Release: 0 -%define srcRoot krb5-1.9.1 +%define srcRoot krb5-1.10.2 Summary: MIT Kerberos5 Implementation--Documentation License: MIT Group: Documentation/Other @@ -31,7 +30,6 @@ Source: krb5-%{version}.tar.bz2 Source3: %{name}-rpmlintrc Patch0: krb5-1.3.5-perlfix.dif -Patch1: krb5-1.6.3-texi2dvi-fix.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -53,9 +51,15 @@ %prep %setup -n %{srcRoot} %patch0 -%patch1 %build +sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex +sed -i -e '1c\ +\\documentclass{article}\ +\\usepackage{fixunder}\ +\\usepackage{functions}\ +\\usepackage{fancyheadings}\ +\\usepackage{hyperref}' doc/implement/implement.tex %install cd doc @@ -64,13 +68,6 @@ make implementor.ps make -C api make -C implement -#make -C kadm5 -#cd api -#latex2html -dir ../html/library -mkdir library.tex -#latex2html -dir ../html/libdes -mkdir libdes.tex -#cd ../implement -#latex2html -dir ../html/implement -mkdir implement.tex -#cd .. mv *.html html/ cd .. find . -type f -name '*.ps' -exec gzip -9 {} \; @@ -81,26 +78,6 @@ rm -f /usr/share/man/man1/tmac.doc* rm -rf /usr/lib/mit/share rm -rf %{buildroot}/usr/lib/mit/share -#rm -f doc/html/*/WARNINGS -#rm -f doc/html/*/images.aux -#rm -f doc/html/*/labels.pl -#### check for duplicate files and replace them with a link -#cd doc/html/library -#if cmp --quiet library.html index.html ; then -# rm -f index.html -# ln -s library.html index.html -#fi -#cd ../libdes -#if cmp --quiet libdes.html index.html ; then -# rm -f index.html -# ln -s libdes.html index.html -#fi -#cd ../implement -#if cmp --quiet implement.html index.html ; then -# rm -f index.html -# ln -s implement.html index.html -#fi -#cd ../.. %clean rm -rf %{buildroot} ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -17,7 +17,7 @@ %define build_mini 1 -%define srcRoot krb5-1.9.1 +%define srcRoot krb5-1.10.2 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ %define krb5docdir %{_defaultdocdir}/krb5 @@ -30,7 +30,7 @@ BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -Version: 1.9.1 +Version: 1.10.2 Release: 0 Summary: MIT Kerberos5 Implementation--Libraries License: MIT @@ -45,38 +45,23 @@ %endif # %endif -Source: krb5-1.9.1.tar.bz2 +Source: krb5-%{version}.tar.bz2 Source1: vendor-files.tar.bz2 Source2: baselibs.conf Source5: krb5-rpmlintrc Source10: krb5-1.8-manpaths.txt -Patch1: krb5-1.9-buildconf.patch +Patch1: krb5-1.10-buildconf.patch Patch3: krb5-1.9-manpaths.dif Patch5: krb5-1.6.3-gssapi_improve_errormessages.dif -Patch6: krb5-1.6.3-kpasswd_tcp.patch +Patch6: krb5-1.10-kpasswd_tcp.patch Patch7: krb5-1.6.3-ktutil-manpage.dif Patch10: krb5-1.7-doublelog.patch -Patch11: krb5-1.7-nodeplibs.patch Patch12: krb5-1.8-api.patch Patch13: krb5-1.8-pam.patch -Patch14: krb5-1.9.1-ai_addrconfig.patch -Patch15: krb5-1.9.1-ai_addrconfig2.patch -Patch16: krb5-1.9.1-sendto_poll.patch -Patch17: krb5-1.9-canonicalize-fallback.patch Patch18: krb5-1.9-kprop-mktemp.patch Patch19: krb5-1.9-ksu-path.patch -Patch20: krb5-1.9-paren.patch -Patch21: krb5-1.9-selinux-label.patch -Patch22: krb5-klist_s.patch -Patch23: krb5-pkinit-cms2.patch -Patch24: krb5-trunk-chpw-err.patch -Patch25: krb5-trunk-gss_delete_sec.patch -Patch26: krb5-trunk-kadmin-oldproto.patch -Patch30: krb5-1.9-MITKRB5-SA-2011-006.dif -Patch31: krb5-1.9-gss_display_status-iakerb.patch -Patch32: krb5-1.9.1-sendto_poll2.patch -Patch33: krb5-1.9.1-sendto_poll3.patch -Patch34: krb5-1.9-MITKRB5-SA-2011-007.dif +Patch20: krb5-1.10-gcc47.patch +Patch21: krb5-1.10-selinux-label.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %insserv_prereq %fillup_prereq @@ -119,8 +104,9 @@ %package server Summary: MIT Kerberos5 implementation - server Group: Productivity/Networking/Security +Requires: cron +Requires: logrotate Requires: perl-Date-Calc -Requires: logrotate cron PreReq: %insserv_prereq %fillup_prereq %description server @@ -182,8 +168,8 @@ Summary: MIT Kerberos5 - Include Files and Libraries Group: Development/Libraries/C and C++ PreReq: %{name} = %{version} -Requires: libcom_err-devel Requires: keyutils-devel +Requires: libcom_err-devel # bug437293 %ifarch ppc64 Obsoletes: krb5-devel-64bit @@ -216,28 +202,13 @@ %patch21 -p1 %patch1 -p1 %patch5 -p1 -%patch6 +%patch6 -p1 %patch7 -p1 %patch10 -p1 -%patch11 -p1 %patch12 -p1 -%patch14 -%patch15 -%patch16 -%patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -%patch25 -p1 -%patch26 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 +%patch20 # Rename the man pages so that they'll get generated correctly. pushd src cat %{SOURCE10} | while read manpage ; do @@ -246,6 +217,8 @@ popd %build +# needs to be re-generated +rm -f src/lib/krb5/krb/deltat.c cd src ./util/reconf CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC " \ @@ -282,6 +255,9 @@ 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 autoconf macro +mkdir -p %{buildroot}/%{_datadir}/aclocal +install -m 644 src/util/ac_check_krb5.m4 %{buildroot}%{_datadir}/aclocal/ # install sample config files # I'll probably do something about this later on mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir}/lib/kerberos/krb5kdc @@ -389,6 +365,7 @@ %dir /usr/lib/mit %dir /usr/lib/mit/bin %dir /usr/lib/mit/sbin +%dir %{_datadir}/aclocal %{_libdir}/libgssrpc.so %{_libdir}/libk5crypto.so %{_libdir}/libkadm5clnt_mit.so @@ -398,11 +375,14 @@ %{_libdir}/libkdb5.so %{_libdir}/libkrb5.so %{_libdir}/libkrb5support.so +%{_libdir}/libverto.so +%{_libdir}/libverto-k5ev.so %{_includedir}/* /usr/lib/mit/bin/krb5-config /usr/lib/mit/sbin/krb5-send-pr %{_mandir}/man1/krb5-send-pr.1* %{_mandir}/man1/krb5-config.1* +%{_datadir}/aclocal/ac_check_krb5.m4 %if %{build_mini} %files @@ -437,6 +417,8 @@ %{_libdir}/libkdb5.so.* %{_libdir}/libkrb5.so.* %{_libdir}/libkrb5support.so.* +%{_libdir}/libverto.so.* +%{_libdir}/libverto-k5ev.so.* %{_libdir}/krb5/plugins/kdb/* %{_libdir}/krb5/plugins/preauth/* #/usr/lib/mit/sbin/* @@ -459,6 +441,7 @@ /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 @@ -479,6 +462,7 @@ %{_mandir}/man1/kadmin.1* %{_mandir}/man1/ktutil.1* %{_mandir}/man1/k5srvutil.1* +%{_mandir}/man1/kswitch.1* %{_mandir}/man5/* %{_mandir}/man5/.k5login.5.gz %{_mandir}/man8/* @@ -506,7 +490,8 @@ %{_libdir}/libkdb5.so.* %{_libdir}/libkrb5.so.* %{_libdir}/libkrb5support.so.* -%{_libdir}/krb5/plugins/preauth/encrypted_challenge.so +%{_libdir}/libverto.so.* +%{_libdir}/libverto-k5ev.so.* %files server %defattr(-,root,root) @@ -567,6 +552,7 @@ /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* @@ -578,8 +564,12 @@ %{_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 ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -17,7 +17,7 @@ %define build_mini 0 -%define srcRoot krb5-1.9.1 +%define srcRoot krb5-1.10.2 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ %define krb5docdir %{_defaultdocdir}/krb5 @@ -30,7 +30,7 @@ BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -Version: 1.9.1 +Version: 1.10.2 Release: 0 Summary: MIT Kerberos5 Implementation--Libraries License: MIT @@ -45,38 +45,23 @@ %endif # %endif -Source: krb5-1.9.1.tar.bz2 +Source: krb5-%{version}.tar.bz2 Source1: vendor-files.tar.bz2 Source2: baselibs.conf Source5: krb5-rpmlintrc Source10: krb5-1.8-manpaths.txt -Patch1: krb5-1.9-buildconf.patch +Patch1: krb5-1.10-buildconf.patch Patch3: krb5-1.9-manpaths.dif Patch5: krb5-1.6.3-gssapi_improve_errormessages.dif -Patch6: krb5-1.6.3-kpasswd_tcp.patch +Patch6: krb5-1.10-kpasswd_tcp.patch Patch7: krb5-1.6.3-ktutil-manpage.dif Patch10: krb5-1.7-doublelog.patch -Patch11: krb5-1.7-nodeplibs.patch Patch12: krb5-1.8-api.patch Patch13: krb5-1.8-pam.patch -Patch14: krb5-1.9.1-ai_addrconfig.patch -Patch15: krb5-1.9.1-ai_addrconfig2.patch -Patch16: krb5-1.9.1-sendto_poll.patch -Patch17: krb5-1.9-canonicalize-fallback.patch Patch18: krb5-1.9-kprop-mktemp.patch Patch19: krb5-1.9-ksu-path.patch -Patch20: krb5-1.9-paren.patch -Patch21: krb5-1.9-selinux-label.patch -Patch22: krb5-klist_s.patch -Patch23: krb5-pkinit-cms2.patch -Patch24: krb5-trunk-chpw-err.patch -Patch25: krb5-trunk-gss_delete_sec.patch -Patch26: krb5-trunk-kadmin-oldproto.patch -Patch30: krb5-1.9-MITKRB5-SA-2011-006.dif -Patch31: krb5-1.9-gss_display_status-iakerb.patch -Patch32: krb5-1.9.1-sendto_poll2.patch -Patch33: krb5-1.9.1-sendto_poll3.patch -Patch34: krb5-1.9-MITKRB5-SA-2011-007.dif +Patch20: krb5-1.10-gcc47.patch +Patch21: krb5-1.10-selinux-label.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %insserv_prereq %fillup_prereq @@ -119,8 +104,9 @@ %package server Summary: MIT Kerberos5 implementation - server Group: Productivity/Networking/Security +Requires: cron +Requires: logrotate Requires: perl-Date-Calc -Requires: logrotate cron PreReq: %insserv_prereq %fillup_prereq %description server @@ -182,8 +168,8 @@ Summary: MIT Kerberos5 - Include Files and Libraries Group: Development/Libraries/C and C++ PreReq: %{name} = %{version} -Requires: libcom_err-devel Requires: keyutils-devel +Requires: libcom_err-devel # bug437293 %ifarch ppc64 Obsoletes: krb5-devel-64bit @@ -216,28 +202,13 @@ %patch21 -p1 %patch1 -p1 %patch5 -p1 -%patch6 +%patch6 -p1 %patch7 -p1 %patch10 -p1 -%patch11 -p1 %patch12 -p1 -%patch14 -%patch15 -%patch16 -%patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -%patch25 -p1 -%patch26 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 +%patch20 # Rename the man pages so that they'll get generated correctly. pushd src cat %{SOURCE10} | while read manpage ; do @@ -246,6 +217,8 @@ popd %build +# needs to be re-generated +rm -f src/lib/krb5/krb/deltat.c cd src ./util/reconf CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC " \ @@ -402,6 +375,8 @@ %{_libdir}/libkdb5.so %{_libdir}/libkrb5.so %{_libdir}/libkrb5support.so +%{_libdir}/libverto.so +%{_libdir}/libverto-k5ev.so %{_includedir}/* /usr/lib/mit/bin/krb5-config /usr/lib/mit/sbin/krb5-send-pr @@ -442,6 +417,8 @@ %{_libdir}/libkdb5.so.* %{_libdir}/libkrb5.so.* %{_libdir}/libkrb5support.so.* +%{_libdir}/libverto.so.* +%{_libdir}/libverto-k5ev.so.* %{_libdir}/krb5/plugins/kdb/* %{_libdir}/krb5/plugins/preauth/* #/usr/lib/mit/sbin/* @@ -464,6 +441,7 @@ /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 @@ -484,6 +462,7 @@ %{_mandir}/man1/kadmin.1* %{_mandir}/man1/ktutil.1* %{_mandir}/man1/k5srvutil.1* +%{_mandir}/man1/kswitch.1* %{_mandir}/man5/* %{_mandir}/man5/.k5login.5.gz %{_mandir}/man8/* @@ -511,7 +490,8 @@ %{_libdir}/libkdb5.so.* %{_libdir}/libkrb5.so.* %{_libdir}/libkrb5support.so.* -%{_libdir}/krb5/plugins/preauth/encrypted_challenge.so +%{_libdir}/libverto.so.* +%{_libdir}/libverto-k5ev.so.* %files server %defattr(-,root,root) @@ -572,6 +552,7 @@ /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* @@ -583,8 +564,12 @@ %{_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 ++++++ krb5-1.9-buildconf.patch -> krb5-1.10-buildconf.patch ++++++ --- /work/SRC/openSUSE:Factory/krb5/krb5-1.9-buildconf.patch 2011-09-23 02:07:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-1.10-buildconf.patch 2012-06-10 21:52:55.000000000 +0200 @@ -1,38 +1,60 @@ -Build binaries in this package as RELRO PIEs and install shared libraries with -the execute bit set on them. Prune out the -L/usr/lib*, PIE flags, and CFLAGS -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. +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. -diff -up krb5-1.9/src/config/shlib.conf krb5-1.9/src/config/shlib.conf ---- krb5-1.9/src/config/shlib.conf 2008-12-08 17:33:07.000000000 -0500 -+++ krb5-1.9/src/config/shlib.conf 2009-06-04 14:01:28.000000000 -0400 -@@ -430,7 +430,8 @@ +Index: krb5-1.10.2/src/config/shlib.conf +=================================================================== +--- krb5-1.10.2.orig/src/config/shlib.conf ++++ krb5-1.10.2/src/config/shlib.conf +@@ -419,7 +419,7 @@ mips-*-netbsd*) + SHLIBEXT=.so + # Linux ld doesn't default to stuffing the SONAME field... + # Use objdump -x to examine the fields of the library +- LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT),--no-undefined' ++ LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT),--no-undefined -Wl,-z,relro' + # + LDCOMBINE_TAIL='-Wl,--version-script binutils.versions && $(PERL) -w $(top_srcdir)/util/export-check.pl $(SHLIB_EXPORT_FILE) $@' + SHLIB_EXPORT_FILE_DEP=binutils.versions +@@ -430,7 +430,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,-z,now $(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)' -diff -up krb5-1.9/src/krb5-config.in krb5-1.9/src/krb5-config.in ---- krb5-1.9/src/krb5-config.in 2009-06-04 14:01:28.000000000 -0400 -+++ krb5-1.9/src/krb5-config.in 2009-06-04 14:01:28.000000000 -0400 -@@ -187,8 +187,14 @@ if test -n "$do_libs"; then - -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ - -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ +Index: krb5-1.10.2/src/krb5-config.in +=================================================================== +--- krb5-1.10.2.orig/src/krb5-config.in ++++ krb5-1.10.2/src/krb5-config.in +@@ -189,6 +189,13 @@ if test -n "$do_libs"; then -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ -- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` -+ -e 's#\$(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##" -e "s#-pie##"` -+ lib_flags=`echo $lib_flags | sed -e "s#-Wl,-z,relro,-z,now##"` ++ 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 +Index: krb5-1.10.2/src/config/pre.in +=================================================================== +--- krb5-1.10.2.orig/src/config/pre.in ++++ krb5-1.10.2/src/config/pre.in +@@ -190,7 +190,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INST + 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@ ++++++ krb5-1.10-gcc47.patch ++++++ This file also triggers the maybe-uninitialized warning/error. RT#7080 --- src/lib/krb5/krb/x-deltat.y +++ src/lib/krb5/krb/x-deltat.y @@ -44,6 +44,7 @@ #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wuninitialized" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif #include <ctype.h> ++++++ krb5-1.6.3-kpasswd_tcp.patch -> krb5-1.10-kpasswd_tcp.patch ++++++ --- /work/SRC/openSUSE:Factory/krb5/krb5-1.6.3-kpasswd_tcp.patch 2011-09-23 02:07:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-1.10-kpasswd_tcp.patch 2012-06-10 21:52:55.000000000 +0200 @@ -1,14 +1,14 @@ Fall back to TCP on kdc-unresolvable/unreachable errors. We still have to wait for UDP to fail, so this might not be ideal. RT #5868. -Index: src/lib/krb5/os/changepw.c +Index: krb5-1.10.2/src/lib/krb5/os/changepw.c =================================================================== ---- src/lib/krb5/os/changepw.c.orig -+++ src/lib/krb5/os/changepw.c -@@ -282,10 +282,22 @@ change_set_password(krb5_context context - NULL - ))) { - +--- krb5-1.10.2.orig/src/lib/krb5/os/changepw.c ++++ krb5-1.10.2/src/lib/krb5/os/changepw.c +@@ -274,10 +274,22 @@ change_set_password(krb5_context context + &callback_info, &chpw_rep, ss2sa(&remote_addr), + &addrlen, NULL, NULL, NULL); + if (code) { - /* - * Here we may want to switch to TCP on some errors. - * right? @@ -16,14 +16,14 @@ + /* if we're not using a stream socket, and it's an error which + * might reasonably be specific to a datagram "connection", try + * again with a stream socket */ -+ if (!useTcp) { ++ if (!use_tcp) { + switch (code) { + case KRB5_KDC_UNREACH: + case KRB5_REALM_CANT_RESOLVE: + case KRB5KRB_ERR_RESPONSE_TOO_BIG: + /* should we do this for more result codes than these? */ -+ krb5int_free_addrlist (&al); -+ useTcp = 1; ++ k5_free_serverlist (&sl); ++ use_tcp = 1; + continue; + default: + break; ++++++ krb5-1.9-selinux-label.patch -> krb5-1.10-selinux-label.patch ++++++ ++++ 654 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/krb5/krb5-1.9-selinux-label.patch ++++ and /work/SRC/openSUSE:Factory/.krb5.new/krb5-1.10-selinux-label.patch ++++++ krb5-1.9.1.tar.bz2 -> krb5-1.10.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/krb5/krb5-1.9.1.tar.bz2 /work/SRC/openSUSE:Factory/.krb5.new/krb5-1.10.2.tar.bz2 differ: char 11, line 1 ++++++ krb5-1.6.3-gssapi_improve_errormessages.dif ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -1,8 +1,8 @@ -Index: trunk/src/lib/gssapi/generic/disp_com_err_status.c +Index: krb5-1.10.2/src/lib/gssapi/generic/disp_com_err_status.c =================================================================== ---- trunk.orig/src/lib/gssapi/generic/disp_com_err_status.c -+++ trunk/src/lib/gssapi/generic/disp_com_err_status.c -@@ -54,7 +54,7 @@ g_display_com_err_status(minor_status, s +--- krb5-1.10.2.orig/src/lib/gssapi/generic/disp_com_err_status.c ++++ krb5-1.10.2/src/lib/gssapi/generic/disp_com_err_status.c +@@ -52,7 +52,7 @@ g_display_com_err_status(OM_uint32 *mino status_string->value = NULL; if (! g_make_string_buffer(((status_value == 0)?no_error: ++++++ krb5-1.7-doublelog.patch ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -1,18 +1,16 @@ Don't double-log (actually, don't process /etc/krb5.conf twice) just because we built with --sysconfdir=/etc. RT#3277 -Index: krb5-1.9.1/src/include/Makefile.in +Index: krb5-1.10.2/src/include/Makefile.in =================================================================== ---- krb5-1.9.1.orig/src/include/Makefile.in -+++ krb5-1.9.1/src/include/Makefile.in -@@ -66,7 +66,9 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$( - -e "s+@MODULEDIR+$(MODULE_DIR)+" \ +--- krb5-1.10.2.orig/src/include/Makefile.in ++++ krb5-1.10.2/src/include/Makefile.in +@@ -67,6 +67,8 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$( -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \ - -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ -- -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' -+ -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \ -+ -e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \ -+ -e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+' + -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ + -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \ ++ -e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \ ++ -e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+' \ + -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' OSCONFSRC = $(srcdir)/osconf.hin - ++++++ krb5-1.8-api.patch ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -2,10 +2,11 @@ malformed krb5_principal structures. Define a behavior which keeps it from crashing if applications don't check ahead of time. -diff -up krb5-1.8/src/lib/krb5/krb/princ_comp.c.api krb5-1.8/src/lib/krb5/krb/princ_comp.c ---- krb5-1.8/src/lib/krb5/krb/princ_comp.c.api 2009-10-30 20:48:38.000000000 -0400 -+++ krb5-1.8/src/lib/krb5/krb/princ_comp.c 2010-03-05 11:00:55.000000000 -0500 -@@ -41,6 +41,12 @@ realm_compare_flags(krb5_context context +Index: krb5-1.10.2/src/lib/krb5/krb/princ_comp.c +=================================================================== +--- krb5-1.10.2.orig/src/lib/krb5/krb/princ_comp.c ++++ krb5-1.10.2/src/lib/krb5/krb/princ_comp.c +@@ -36,6 +36,12 @@ realm_compare_flags(krb5_context context const krb5_data *realm1 = krb5_princ_realm(context, princ1); const krb5_data *realm2 = krb5_princ_realm(context, princ2); @@ -18,7 +19,7 @@ if (realm1->length != realm2->length) return FALSE; -@@ -92,6 +98,9 @@ krb5_principal_compare_flags(krb5_contex +@@ -87,6 +93,9 @@ krb5_principal_compare_flags(krb5_contex krb5_principal upn2 = NULL; krb5_boolean ret = FALSE; ++++++ krb5-1.8-manpaths.txt ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -1,6 +1,7 @@ appl/sample/sserver/sserver.M config-files/kdc.conf.M config-files/krb5.conf.M +gen-manpages/kerberos.M kadmin/cli/kadmin.M slave/kpropd.M slave/kprop.M ++++++ krb5-1.8-pam.patch ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -11,11 +11,11 @@ Originally RT#5939, though it's changed since then to perform the account and session management before dropping privileges. -Index: krb5-1.9.1/src/aclocal.m4 +Index: krb5-1.10.2/src/aclocal.m4 =================================================================== ---- krb5-1.9.1.orig/src/aclocal.m4 -+++ krb5-1.9.1/src/aclocal.m4 -@@ -1715,3 +1715,70 @@ AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[ +--- krb5-1.10.2.orig/src/aclocal.m4 ++++ krb5-1.10.2/src/aclocal.m4 +@@ -1676,3 +1676,70 @@ AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[ ])) ])dnl dnl @@ -86,10 +86,10 @@ +AC_SUBST(PAM_MAN) +AC_SUBST(NON_PAM_MAN) +])dnl -Index: krb5-1.9.1/src/clients/ksu/main.c +Index: krb5-1.10.2/src/clients/ksu/main.c =================================================================== ---- krb5-1.9.1.orig/src/clients/ksu/main.c -+++ krb5-1.9.1/src/clients/ksu/main.c +--- krb5-1.10.2.orig/src/clients/ksu/main.c ++++ krb5-1.10.2/src/clients/ksu/main.c @@ -26,6 +26,7 @@ * KSU was writen by: Ari Medvinsky, [email protected] */ @@ -117,7 +117,7 @@ /***********/ #define _DEF_CSH "/bin/csh" -@@ -586,6 +592,25 @@ main (argc, argv) +@@ -584,6 +590,25 @@ main (argc, argv) prog_name,target_user,client_name, source_user,ontty()); @@ -142,8 +142,8 @@ + /* Run authorization as target.*/ if (krb5_seteuid(target_uid)) { - com_err(prog_name, errno, "while switching to target for authorization check"); -@@ -651,6 +676,26 @@ main (argc, argv) + com_err(prog_name, errno, _("while switching to target for " +@@ -648,6 +673,26 @@ main (argc, argv) sweep_up(ksu_context, cc_target); exit(1); } @@ -170,7 +170,7 @@ } if( some_rest_copy){ -@@ -720,6 +765,32 @@ main (argc, argv) +@@ -717,6 +762,32 @@ main (argc, argv) exit(1); } @@ -203,18 +203,18 @@ /* set permissions */ if (setgid(target_pwd->pw_gid) < 0) { perror("ksu: setgid"); -@@ -792,7 +863,7 @@ main (argc, argv) +@@ -789,7 +860,7 @@ main (argc, argv) fprintf(stderr, "program to be execed %s\n",params[0]); } - if( keep_target_cache ) { + if( keep_target_cache && !force_fork ) { execv(params[0], params); - com_err(prog_name, errno, "while trying to execv %s", - params[0]); -@@ -823,15 +894,34 @@ main (argc, argv) + com_err(prog_name, errno, _("while trying to execv %s"), params[0]); + sweep_up(ksu_context, cc_target); +@@ -819,16 +890,35 @@ main (argc, argv) if (ret_pid == -1) { - com_err(prog_name, errno, "while calling waitpid"); + com_err(prog_name, errno, _("while calling waitpid")); } - sweep_up(ksu_context, cc_target); + if( !keep_target_cache ) { @@ -222,7 +222,7 @@ + } exit (statusp); case -1: - com_err(prog_name, errno, "while trying to fork."); + com_err(prog_name, errno, _("while trying to fork.")); sweep_up(ksu_context, cc_target); exit (1); case 0: @@ -241,17 +241,18 @@ + } +#endif execv(params[0], params); - com_err(prog_name, errno, "while trying to execv %s", params[0]); + com_err(prog_name, errno, _("while trying to execv %s"), + params[0]); + if( keep_target_cache ) { + sweep_up(ksu_context, cc_target); + } exit (1); } } -Index: krb5-1.9.1/src/clients/ksu/Makefile.in +Index: krb5-1.10.2/src/clients/ksu/Makefile.in =================================================================== ---- krb5-1.9.1.orig/src/clients/ksu/Makefile.in -+++ krb5-1.9.1/src/clients/ksu/Makefile.in +--- krb5-1.10.2.orig/src/clients/ksu/Makefile.in ++++ krb5-1.10.2/src/clients/ksu/Makefile.in @@ -7,12 +7,14 @@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -286,10 +287,10 @@ clean:: $(RM) ksu -Index: krb5-1.9.1/src/clients/ksu/pam.c +Index: krb5-1.10.2/src/clients/ksu/pam.c =================================================================== --- /dev/null -+++ krb5-1.9.1/src/clients/ksu/pam.c ++++ krb5-1.10.2/src/clients/ksu/pam.c @@ -0,0 +1,389 @@ +/* + * src/clients/ksu/pam.c @@ -680,10 +681,10 @@ + return ret; +} +#endif -Index: krb5-1.9.1/src/clients/ksu/pam.h +Index: krb5-1.10.2/src/clients/ksu/pam.h =================================================================== --- /dev/null -+++ krb5-1.9.1/src/clients/ksu/pam.h ++++ krb5-1.10.2/src/clients/ksu/pam.h @@ -0,0 +1,57 @@ +/* + * src/clients/ksu/pam.h @@ -742,13 +743,13 @@ +int appl_pam_cred_init(void); +void appl_pam_cleanup(void); +#endif -Index: krb5-1.9.1/src/configure.in +Index: krb5-1.10.2/src/configure.in =================================================================== ---- krb5-1.9.1.orig/src/configure.in -+++ krb5-1.9.1/src/configure.in -@@ -1125,6 +1125,8 @@ if test "$ac_cv_lib_socket" = "yes" -a " - AC_DEFINE(BROKEN_STREAMS_SOCKETS,1,[Define if socket can't be bound to 0.0.0.0]) +--- krb5-1.10.2.orig/src/configure.in ++++ krb5-1.10.2/src/configure.in +@@ -1246,6 +1246,8 @@ if test "${localedir+set}" != set; then fi + AC_SUBST(localedir) +KRB5_WITH_PAM + ++++++ krb5-1.9-kprop-mktemp.patch ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -1,10 +1,10 @@ Use an in-memory ccache to silence a compiler warning, for RT#6414. -Index: krb5-1.9.1/src/slave/kprop.c +Index: krb5-1.10.2/src/slave/kprop.c =================================================================== ---- krb5-1.9.1.orig/src/slave/kprop.c -+++ krb5-1.9.1/src/slave/kprop.c -@@ -188,9 +188,8 @@ void PRS(argc, argv) +--- krb5-1.10.2.orig/src/slave/kprop.c ++++ krb5-1.10.2/src/slave/kprop.c +@@ -186,9 +186,8 @@ void PRS(argc, argv) void get_tickets(context) krb5_context context; { @@ -27,4 +27,4 @@ - retval = krb5_cc_resolve(context, buf, &ccache); if (retval) { - com_err(progname, retval, "while opening credential cache %s", + com_err(progname, retval, _("while opening credential cache %s"), buf); ++++++ krb5-1.9-manpaths.dif ++++++ --- /var/tmp/diff_new_pack.zSfhgh/_old 2012-06-10 21:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zSfhgh/_new 2012-06-10 21:52:58.000000000 +0200 @@ -3,11 +3,11 @@ these files should be renamed to their ".in" counterparts, and then the configure scripts should be rebuilt. Originally RT#6525 -Index: krb5-1.9.1/src/aclocal.m4 +Index: krb5-1.10.2/src/aclocal.m4 =================================================================== ---- krb5-1.9.1.orig/src/aclocal.m4 -+++ krb5-1.9.1/src/aclocal.m4 -@@ -1782,3 +1782,24 @@ AC_SUBST(PAM_LIBS) +--- krb5-1.10.2.orig/src/aclocal.m4 ++++ krb5-1.10.2/src/aclocal.m4 +@@ -1743,3 +1743,24 @@ AC_SUBST(PAM_LIBS) AC_SUBST(PAM_MAN) AC_SUBST(NON_PAM_MAN) ])dnl @@ -32,10 +32,32 @@ +AC_SUBST(manlibexecdir) +AC_CONFIG_FILES($1) +]) -Index: krb5-1.9.1/src/appl/sample/sserver/sserver.M +Index: krb5-1.10.2/src/configure.in =================================================================== ---- krb5-1.9.1.orig/src/appl/sample/sserver/sserver.M -+++ krb5-1.9.1/src/appl/sample/sserver/sserver.M +--- krb5-1.10.2.orig/src/configure.in ++++ krb5-1.10.2/src/configure.in +@@ -1249,6 +1249,17 @@ AC_SUBST(localedir) + KRB5_WITH_PAM + + AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) ++ ++V5_AC_OUTPUT_MANPAGE([ ++ appl/sample/sserver/sserver.M ++ config-files/kdc.conf.M ++ config-files/krb5.conf.M ++ gen-manpages/kerberos.M ++ kadmin/cli/kadmin.M ++ slave/kpropd.M ++ slave/kprop.M ++]) ++ + V5_AC_OUTPUT_MAKEFILE(. + + util util/support util/profile util/profile/testmod util/send-pr +Index: krb5-1.10.2/src/appl/sample/sserver/sserver.M +=================================================================== +--- krb5-1.10.2.orig/src/appl/sample/sserver/sserver.M ++++ krb5-1.10.2/src/appl/sample/sserver/sserver.M @@ -59,7 +59,7 @@ option allows for a different keytab tha using a line in /etc/inetd.conf that looks like this: @@ -45,10 +67,10 @@ .PP Since \fBsample\fP is normally not a port defined in /etc/services, you will usually have to add a line to /etc/services which looks like this: -Index: krb5-1.9.1/src/config-files/kdc.conf.M +Index: krb5-1.10.2/src/config-files/kdc.conf.M =================================================================== ---- krb5-1.9.1.orig/src/config-files/kdc.conf.M -+++ krb5-1.9.1/src/config-files/kdc.conf.M +--- krb5-1.10.2.orig/src/config-files/kdc.conf.M ++++ krb5-1.10.2/src/config-files/kdc.conf.M @@ -92,14 +92,14 @@ This .B string specifies the location of the access control list (acl) file that @@ -75,44 +97,36 @@ .SH SEE ALSO krb5.conf(5), krb5kdc(8) -Index: krb5-1.9.1/src/config-files/krb5.conf.M +Index: krb5-1.10.2/src/config-files/krb5.conf.M =================================================================== ---- krb5-1.9.1.orig/src/config-files/krb5.conf.M -+++ krb5-1.9.1/src/config-files/krb5.conf.M -@@ -768,6 +768,6 @@ with another database such as Active Dir - in for this interface. +--- krb5-1.10.2.orig/src/config-files/krb5.conf.M ++++ krb5-1.10.2/src/config-files/krb5.conf.M +@@ -808,6 +808,6 @@ This module implements the encrypted cha + This module implements the encrypted timestamp mechanism. .SH FILES -/etc/krb5.conf +@mansysconfdir@/krb5.conf .SH SEE ALSO syslog(3) -Index: krb5-1.9.1/src/configure.in -=================================================================== ---- krb5-1.9.1.orig/src/configure.in -+++ krb5-1.9.1/src/configure.in -@@ -1128,6 +1128,16 @@ fi - KRB5_WITH_PAM - - AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) -+ -+V5_AC_OUTPUT_MANPAGE([ -+ appl/sample/sserver/sserver.M -+ config-files/kdc.conf.M -+ config-files/krb5.conf.M -+ kadmin/cli/kadmin.M -+ slave/kpropd.M -+ slave/kprop.M -+]) -+ - V5_AC_OUTPUT_MAKEFILE(. - - util util/support util/profile util/send-pr -Index: krb5-1.9.1/src/kadmin/cli/kadmin.M +Index: krb5-1.10.2/src/gen-manpages/kerberos.M =================================================================== ---- krb5-1.9.1.orig/src/kadmin/cli/kadmin.M -+++ krb5-1.9.1/src/kadmin/cli/kadmin.M -@@ -880,9 +880,9 @@ option is specified, less verbose status +--- krb5-1.10.2.orig/src/gen-manpages/kerberos.M ++++ krb5-1.10.2/src/gen-manpages/kerberos.M +@@ -125,7 +125,7 @@ default is /etc/krb5.conf. + Specifies the location of the KDC configuration file, which contains + additional configuration directives for the Key Distribution Center + daemon and associated programs. The default is +-/usr/local/var/krb5kdc/kdc.conf. ++@manlocalstatedir@/krb5kdc/kdc.conf. + .TP + .B KRB5RCACHETYPE + Specifies the default type of replay cache to use for servers. Valid +Index: krb5-1.10.2/src/kadmin/cli/kadmin.M +=================================================================== +--- krb5-1.10.2.orig/src/kadmin/cli/kadmin.M ++++ krb5-1.10.2/src/kadmin/cli/kadmin.M +@@ -924,9 +924,9 @@ option is specified, less verbose status .RS .TP EXAMPLE: @@ -124,19 +138,10 @@ kadmin: .RE .fi -@@ -924,7 +924,7 @@ passwords. - .SH HISTORY - The - .B kadmin --prorgam was originally written by Tom Yu at MIT, as an interface to the -+program was originally written by Tom Yu at MIT, as an interface to the - OpenVision Kerberos administration program. - .SH SEE ALSO - .IR kerberos (1), -Index: krb5-1.9.1/src/slave/kpropd.M +Index: krb5-1.10.2/src/slave/kpropd.M =================================================================== ---- krb5-1.9.1.orig/src/slave/kpropd.M -+++ krb5-1.9.1/src/slave/kpropd.M +--- krb5-1.10.2.orig/src/slave/kpropd.M ++++ krb5-1.10.2/src/slave/kpropd.M @@ -74,7 +74,7 @@ Normally, kpropd is invoked out of This is done by adding a line to the inetd.conf file which looks like this: @@ -179,10 +184,10 @@ Each entry is a line containing the principal of a host from which the local machine will allow Kerberos database propagation via kprop. .SH SEE ALSO -Index: krb5-1.9.1/src/slave/kprop.M +Index: krb5-1.10.2/src/slave/kprop.M =================================================================== ---- krb5-1.9.1.orig/src/slave/kprop.M -+++ krb5-1.9.1/src/slave/kprop.M +--- krb5-1.10.2.orig/src/slave/kprop.M ++++ krb5-1.10.2/src/slave/kprop.M @@ -39,7 +39,7 @@ Kerberos server to a slave Kerberos serv This is done by transmitting the dumped database file to the slave server over an encrypted, secure channel. The dump file must be created -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
