[packages/krb5] - up to 1.12.1 - updated manpages,ksu-access,ksu-path,ktany,enospc,kprop-mktemp,tests,config,trunk-d
qboosh
qboosh at pld-linux.org
Fri Mar 14 20:48:42 CET 2014
commit d321cc6464eb22a6386ed0d0643e2734ba976b2d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Mar 14 20:37:18 2014 +0100
- up to 1.12.1
- updated manpages,ksu-access,ksu-path,ktany,enospc,kprop-mktemp,tests,config,trunk-doublelog patches
- removed obsolete autoconf,doc,trunk-kpasswd_tcp patch
krb5-autoconf.patch | 20 -----
krb5-config.patch | 4 +-
krb5-doc.patch | 177 ------------------------------------------
krb5-enospc.patch | 22 +++---
krb5-kprop-mktemp.patch | 18 ++---
krb5-ksu-access.patch | 12 +--
krb5-ksu-path.patch | 13 ++--
krb5-ktany.patch | 22 +++---
krb5-manpages.patch | 108 +++++++-------------------
krb5-tests.patch | 159 ++++++++++++++++++++++++++-----------
krb5-trunk-doublelog.patch | 24 +++---
krb5-trunk-kpasswd_tcp.patch | 35 ---------
krb5.spec | 181 ++++++++++++++++++++++++++-----------------
13 files changed, 302 insertions(+), 493 deletions(-)
---
diff --git a/krb5.spec b/krb5.spec
index f566a82..43fc0eb 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -15,12 +15,12 @@
Summary: Kerberos V5 System
Summary(pl.UTF-8): System Kerberos V5
Name: krb5
-Version: 1.9.2
-Release: 1
+Version: 1.12.1
+Release: 0.1
License: MIT
Group: Networking
-Source0: http://web.mit.edu/kerberos/dist/krb5/1.9/%{name}-%{version}-signed.tar
-# Source0-md5: 8de1e9111612f0af0b0560789ae11cb9
+Source0: http://web.mit.edu/kerberos/dist/krb5/1.12/%{name}-%{version}-signed.tar
+# Source0-md5: 524b1067b619cb5bf780759b6884c3f5
Source2: %{name}kdc.init
Source4: kadm5.acl
Source5: kerberos.logrotate
@@ -38,18 +38,15 @@ Patch3: %{name}-ksu-access.patch
Patch4: %{name}-ksu-path.patch
# http://lite.mit.edu/
Patch6: %{name}-ktany.patch
-Patch10: %{name}-autoconf.patch
Patch11: %{name}-brokenrev.patch
Patch12: %{name}-dns.patch
Patch13: %{name}-enospc.patch
Patch15: %{name}-kprop-mktemp.patch
Patch19: %{name}-send-pr-tempfile.patch
-Patch22: %{name}-doc.patch
Patch23: %{name}-tests.patch
Patch24: %{name}-config.patch
Patch29: %{name}-selinux-label.patch
Patch200: %{name}-trunk-doublelog.patch
-Patch202: %{name}-trunk-kpasswd_tcp.patch
URL: http://web.mit.edu/kerberos/www/
BuildRequires: /bin/csh
BuildRequires: autoconf
@@ -66,21 +63,11 @@ BuildRequires: openssl-devel >= 0.9.8
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: rpmbuild(macros) >= 1.268
%{?with_tcl:BuildRequires: tcl-devel}
+BuildRequires: words
%if %{with doc}
-BuildRequires: texinfo
-%if "%{pld_release}" == "ti"
-BuildRequires: tetex-format-latex
-BuildRequires: tetex-format-pdflatex
-BuildRequires: tetex-latex
-BuildRequires: tetex-makeindex
-%else
-BuildRequires: texlive-latex
-BuildRequires: texlive-format-pdflatex
-BuildRequires: texlive-makeindex
-BuildRequires: texlive-xetex
-%endif
+BuildRequires: doxygen
+BuildRequires: sphinx-pdg
%endif
-BuildRequires: words
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _localstatedir /var/lib/kerberos
@@ -366,6 +353,17 @@ Static Kerberos V5 libraries.
%description static -l pl.UTF-8
Biblioteki statyczne Kerberosa V5.
+%package doc
+Summary: MIT Kerberos V5 documentation in HTML format
+Summary(pl.UTF-8): Dokumentacja systemu MIT Kerberos V5 w formacie HTML
+Group: Documentation
+
+%description doc
+MIT Kerberos V5 documentation in HTML format.
+
+%description doc -l pl.UTF-8
+Dokumentacja systemu MIT Kerberos V5 w formacie HTML.
+
%prep
%setup -q -c
tar xf %{name}-%{version}.tar.gz
@@ -374,19 +372,15 @@ mv %{name}-%{version}/* .
%patch3 -p1
%patch4 -p1
%patch6 -p1
-%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch15 -p1
%patch19 -p1
-%patch22 -p1
%patch23 -p1
%patch24 -p1
%{?with_selinux:%patch29 -p1}
-
-%patch200 -p0
-%patch202 -p0
+%patch200 -p1
%build
cd src
@@ -429,16 +423,12 @@ done
%{__make} \
TCL_LIBPATH="-L%{_libdir}"
-cd ../doc
%if %{with doc}
-%{__make}
-%{__make} -C api
-%{__make} -C implement
-%{__make} -C kadm5
+%{__make} -C doc
%endif
%if %{with tests}
-%{__make} -C ../src check \
+%{__make} check \
OFFLINE=yes \
TCL_LIBPATH="-L%{_libdir}" \
PYTESTFLAGS="-v"
@@ -474,14 +464,30 @@ install src/plugins/kdb/ldap/libkdb_ldap/kerberos.{schema,ldif} $RPM_BUILD_ROOT%
ln -sf %{_datadir}/dict/words $RPM_BUILD_ROOT%{_localstatedir}/krb5kdc/kadm5.dict
touch $RPM_BUILD_ROOT/etc/krb5.keytab
-echo .so kadmin.8 > $RPM_BUILD_ROOT%{_mandir}/man8/kadmin.local.8
+echo '.so man1/kadmin.1' > $RPM_BUILD_ROOT%{_mandir}/man8/kadmin.local.8
# fix permissions for deps generation
find $RPM_BUILD_ROOT -type f -name '*.so*' | xargs chmod +x
+# the only translation is empty (as of 1.12.1)
+#find_lang mit-krb5
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post server-ldap -p /sbin/ldconfig
+%postun server-ldap -p /sbin/ldconfig
+
+%post -n openldap-schema-krb5
+%openldap_schema_register %{schemadir}/kerberos.schema
+%service -q ldap restart
+
+%postun -n openldap-schema-krb5
+if [ "$1" = "0" ]; then
+ %openldap_schema_unregister %{schemadir}/kerberos.schema
+ %service -q ldap restart
+fi
+
%post server-kdc
/sbin/chkconfig --add krb5kdc
%service krb5kdc restart "krb5kdc daemon"
@@ -512,18 +518,8 @@ if [ "$1" = 0 ]; then
/sbin/chkconfig --del kpropd
fi
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%post -n openldap-schema-krb5
-%openldap_schema_register %{schemadir}/kerberos.schema
-%service -q ldap restart
-
-%postun -n openldap-schema-krb5
-if [ "$1" = "0" ]; then
- %openldap_schema_unregister %{schemadir}/kerberos.schema
- %service -q ldap restart
-fi
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%triggerpostun server -- krb5-server < 1.7
for f in principal .k5.* krb5_adm.acl kadm_old.acl kadm5.keytab; do
@@ -570,9 +566,8 @@ fi
%files server
%defattr(644,root,root,755)
-%doc doc/krb5-{admin,install}.html %{?with_doc:doc/{admin,install}-guide.pdf}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/kerberos
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kerberos
%attr(750,root,root) %dir /var/log/kerberos
@@ -608,15 +603,16 @@ fi
%files server-ldap
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/krb5/plugins/kdb/kldap.so
+%attr(755,root,root) %{_libdir}/libkdb_ldap.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdb_ldap.so.1
%attr(755,root,root) %{_libdir}/libkdb_ldap.so
-%attr(755,root,root) %{_libdir}/libkdb_ldap.so.*
%attr(755,root,root) %{_sbindir}/kdb5_ldap_util
%{_mandir}/man8/kdb5_ldap_util.8*
%files -n openldap-schema-krb5
%defattr(644,root,root,755)
-%{schemadir}/*.ldif
-%{schemadir}/*.schema
+%{schemadir}/kerberos.ldif
+%{schemadir}/kerberos.schema
%endif
%files server-kdc
@@ -629,8 +625,8 @@ fi
%dir %{_libdir}/krb5/plugins/kdb
%attr(755,root,root) %{_libdir}/krb5/plugins/kdb/db2.so
%dir %{_libdir}/krb5/plugins/preauth
+%attr(755,root,root) %{_libdir}/krb5/plugins/preauth/otp.so
%attr(755,root,root) %{_libdir}/krb5/plugins/preauth/pkinit.so
-%attr(755,root,root) %{_libdir}/krb5/plugins/preauth/encrypted_challenge.so
%{_mandir}/man5/kdc.conf.5*
%{_mandir}/man8/krb5kdc.8*
@@ -640,6 +636,7 @@ fi
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_localstatedir}/krb5kdc/kadm5.acl
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_localstatedir}/krb5kdc/kadm5.dict
%attr(755,root,root) %{_sbindir}/kadmind
+%{_mandir}/man5/kadm5.acl.5*
%{_mandir}/man8/kadmind.8*
%files server-kpropd
@@ -651,30 +648,32 @@ fi
%files client
%defattr(644,root,root,755)
-%doc doc/krb5-user.html %{?with_doc:doc/user-guide.pdf}
%attr(755,root,root) /etc/shrc.d/kerberos.*
+%attr(755,root,root) %{_bindir}/gss-client
%attr(755,root,root) %{_bindir}/kdestroy
%attr(755,root,root) %{_bindir}/kinit
%attr(755,root,root) %{_bindir}/klist
-%attr(755,root,root) %{_bindir}/gss-client
-%attr(755,root,root) %{_bindir}/sim_client
-%attr(755,root,root) %{_bindir}/uuclient
-%attr(4755,root,root) %{_bindir}/ksu
-
%attr(755,root,root) %{_bindir}/kpasswd
-%attr(755,root,root) %{_bindir}/sclient
+%attr(4755,root,root) %{_bindir}/ksu
+%attr(755,root,root) %{_bindir}/kswitch
%attr(755,root,root) %{_bindir}/kvno
+%attr(755,root,root) %{_bindir}/sclient
+%attr(755,root,root) %{_bindir}/sim_client
+%attr(755,root,root) %{_bindir}/uuclient
-%{_mandir}/man1/kerberos.1*
%{_mandir}/man1/kdestroy.1*
%{_mandir}/man1/kinit.1*
%{_mandir}/man1/klist.1*
-%{_mandir}/man1/ksu.1*
%{_mandir}/man1/kpasswd.1*
-%{_mandir}/man1/sclient.1*
+%{_mandir}/man1/ksu.1*
+%{_mandir}/man1/kswitch.1*
%{_mandir}/man1/kvno.1*
+%{_mandir}/man1/sclient.1*
+%{_mandir}/man5/.k5identity.5*
%{_mandir}/man5/.k5login.5*
+%{_mandir}/man5/k5identity.5*
+%{_mandir}/man5/k5login.5*
%files common
%defattr(644,root,root,755)
@@ -683,32 +682,64 @@ fi
%{_mandir}/man5/krb5.conf.5*
%files libs
+# -f mit-krb5.lang
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgss*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgss*.so.?
+%doc NOTICE README doc/CHANGES
+%attr(755,root,root) %{_libdir}/libgssapi_krb5.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgssapi_krb5.so.2
+%attr(755,root,root) %{_libdir}/libgssrpc.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgssrpc.so.4
%attr(755,root,root) %{_libdir}/libk5crypto.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libk5crypto.so.?
-%attr(755,root,root) %{_libdir}/libkadm*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkadm*.so.?
+%attr(755,root,root) %ghost %{_libdir}/libk5crypto.so.3
+%attr(755,root,root) %{_libdir}/libkadm5clnt_mit.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkadm5clnt_mit.so.9
+%attr(755,root,root) %{_libdir}/libkadm5srv_mit.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkadm5srv_mit.so.9
%attr(755,root,root) %{_libdir}/libkdb5.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkdb5.so.?
-%attr(755,root,root) %{_libdir}/libkrb5*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkrb5*.so.?
+%attr(755,root,root) %ghost %{_libdir}/libkdb5.so.7
+%attr(755,root,root) %{_libdir}/libkrad.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkrad.so.0
+%attr(755,root,root) %{_libdir}/libkrb5.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkrb5.so.3
+%attr(755,root,root) %{_libdir}/libkrb5support.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkrb5support.so.0
+%attr(755,root,root) %{_libdir}/libverto.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libverto.so.0
%files devel
%defattr(644,root,root,755)
-%doc doc/{kadmin,krb5-protocol} %{?with_doc:doc/{api,implement,kadm5}/*.pdf}
%attr(755,root,root) %{_bindir}/krb5-config
-%attr(755,root,root) %{_libdir}/libgss*.so
+%attr(755,root,root) %{_libdir}/libgssapi_krb5.so
+%attr(755,root,root) %{_libdir}/libgssrpc.so
%attr(755,root,root) %{_libdir}/libk5crypto.so
-%attr(755,root,root) %{_libdir}/libkadm*.so
+%attr(755,root,root) %{_libdir}/libkadm5clnt_mit.so
+%attr(755,root,root) %{_libdir}/libkadm5clnt.so
+%attr(755,root,root) %{_libdir}/libkadm5srv_mit.so
+%attr(755,root,root) %{_libdir}/libkadm5srv.so
%attr(755,root,root) %{_libdir}/libkdb5.so
-%attr(755,root,root) %{_libdir}/libkrb5*.so
+%attr(755,root,root) %{_libdir}/libkrad.so
+%attr(755,root,root) %{_libdir}/libkrb5.so
+%attr(755,root,root) %{_libdir}/libkrb5support.so
+%attr(755,root,root) %{_libdir}/libverto.so
%{_includedir}/gssapi
%{_includedir}/gssrpc
%{_includedir}/kadm5
%{_includedir}/krb5
-%{_includedir}/*.h
+%{_includedir}/gssapi.h
+%{_includedir}/kdb.h
+%{_includedir}/krad.h
+%{_includedir}/krb5.h
+%{_includedir}/profile.h
+%{_includedir}/verto.h
+%{_includedir}/verto-module.h
+%{_pkgconfigdir}/gssrpc.pc
+%{_pkgconfigdir}/kadm-client.pc
+%{_pkgconfigdir}/kadm-server.pc
+%{_pkgconfigdir}/kdb.pc
+%{_pkgconfigdir}/krb5.pc
+%{_pkgconfigdir}/krb5-gssapi.pc
+%{_pkgconfigdir}/mit-krb5.pc
+%{_pkgconfigdir}/mit-krb5-gssapi.pc
%{_mandir}/man1/krb5-config.1*
%if 0
@@ -717,3 +748,7 @@ configure: error: Sorry, static libraries do not work in this release.
%defattr(644,root,root,755)
%{_libdir}/*.a
%endif
+
+%files doc
+%defattr(644,root,root,755)
+%doc doc/html/*
diff --git a/krb5-autoconf.patch b/krb5-autoconf.patch
deleted file mode 100644
index d668907..0000000
--- a/krb5-autoconf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur krb5-1.3.1.ori/src/configure.in krb5-1.3.1.mod/src/configure.in
---- krb5-1.3.1.ori/src/configure.in 2003-01-11 00:18:53.000000000 +0100
-+++ krb5-1.3.1.mod/src/configure.in 2006-11-04 01:25:20.000000000 +0100
-@@ -3,10 +3,12 @@
- #
- # autoconf 2.49 defaults to a /dev/null cache file, which is what we
- # do not want for performance reasons.
--if test "x$cache_file" = "x/dev/null"; then
-- cache_file=./config.cache
-- AC_CACHE_LOAD
--fi
-+# but using that trick makes many problems when there are spaces inside
-+# FLAGS (ie rpmflags)
-+# if test "x$cache_file" = "x/dev/null"; then
-+# cache_file=./config.cache
-+# AC_CACHE_LOAD
-+# fi
-
- CONFIG_RULES
-
diff --git a/krb5-config.patch b/krb5-config.patch
index eb01486..ca1b7f2 100644
--- a/krb5-config.patch
+++ b/krb5-config.patch
@@ -1,5 +1,5 @@
---- krb5-1.6/src/krb5-config.in.orig 2007-06-24 18:32:29.495026000 +0200
-+++ krb5-1.6/src/krb5-config.in 2007-06-24 18:34:33.354085216 +0200
+--- krb5-1.12.1/src/build-tools/krb5-config.in.orig 2007-06-24 18:32:29.495026000 +0200
++++ krb5-1.12.1/src/build-tools/krb5-config.in 2007-06-24 18:34:33.354085216 +0200
@@ -35,7 +35,8 @@
KRB4_LIB=@KRB4_LIB@
DES425_LIB=@DES425_LIB@
diff --git a/krb5-doc.patch b/krb5-doc.patch
deleted file mode 100644
index cb56e50..0000000
--- a/krb5-doc.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -urN krb5-1.6/doc/Makefile krb5-1.6.doc/doc/Makefile
---- krb5-1.6/doc/Makefile 2006-12-21 23:07:10.000000000 +0100
-+++ krb5-1.6.doc/doc/Makefile 2007-03-30 21:53:16.554101078 +0200
-@@ -36,7 +36,7 @@
- admin-guide-full:: admin-guide admin-guide-info admin-guide-html
-
- .PHONY: admin-guide
--admin-guide:: admin-guide.ps
-+admin-guide:: admin-guide.pdf
-
- admin-guide.ps: $(ADMIN_DEPS)
- $(DVI) admin.texinfo
-@@ -61,7 +61,7 @@
- install-guide-full:: install-guide install-guide-info install-guide-html
-
- .PHONY: install-guide
--install-guide:: install-guide.ps
-+install-guide:: install-guide.pdf
-
- install-guide.ps: $(INSTALL_DEPS)
- $(DVI) install.texinfo
-@@ -86,7 +86,7 @@
- user-guide-full:: user-guide user-guide-info user-guide-html
-
- .PHONY: user-guide
--user-guide:: user-guide.ps
-+user-guide:: user-guide.pdf
-
- user-guide.ps: $(USER_GUIDE_DEPS)
- $(DVI) user-guide.texinfo
-diff -urN krb5-1.6/doc/api/Makefile krb5-1.6.doc/doc/api/Makefile
---- krb5-1.6/doc/api/Makefile 2005-08-29 21:22:52.000000000 +0200
-+++ krb5-1.6.doc/doc/api/Makefile 2007-03-30 21:16:19.067733731 +0200
-@@ -1,4 +1,4 @@
--.SUFFIXES: .tex .dvi .ps
-+.SUFFIXES: .tex .dvi .ps .pdf
-
- SHELL=/bin/sh
-
-@@ -8,7 +8,7 @@
-
- DESTEX= libdes.tex
-
--all: library.ps libdes.ps
-+all: library.pdf libdes.pdf
-
-
- libdes.dvi: $(DESTEX) $(STYLES)
-@@ -19,7 +19,7 @@
- rm -f *.toc *.log *.idx *.ind *.aux *.ilg lib1.stamp
-
- really-clean: clean
-- rm -f *.dvi *.ps
-+ rm -f *.dvi *.ps *.pdf
-
-
- library.dvi: lib1.stamp $(LIBTEX) $(STYLES)
-@@ -31,10 +31,22 @@
- makeindex -s krb5.ist library.idx
- date > lib1.stamp
-
-+libdes.pdf: $(DESTEX) $(STYLES)
-+ touch libdes.ind
-+ pdflatex libdes.tex
-+ pdflatex libdes.tex
-+ pdflatex libdes.tex
-+
-+library.pdf: $(LIBTEX) $(STYLES)
-+ touch library.ind
-+ pdflatex library.tex
-+ makeindex -s krb5.ist library.idx
-+ pdflatex library.tex
-+ pdflatex library.tex
-+
- .tex.dvi:
- latex $*
-
-
- .dvi.ps:
- dvips $*.dvi -o
--
-diff -urN krb5-1.6/doc/api/library.tex krb5-1.6.doc/doc/api/library.tex
---- krb5-1.6/doc/api/library.tex 2005-08-29 21:22:52.000000000 +0200
-+++ krb5-1.6.doc/doc/api/library.tex 2007-03-30 20:32:44.646235755 +0200
-@@ -1,7 +1,7 @@
--\documentclass[twoside]{article}
-+\documentclass{article}
- \usepackage{fixunder,functions,fancyheadings}
- \usepackage{krb5idx}
--%\usepackage{hyperref}
-+\usepackage{hyperref}
-
- %\hypersetup{letterpaper,
- % bookmarks=true,
-diff -urN krb5-1.6/doc/implement/Makefile krb5-1.6.doc/doc/implement/Makefile
---- krb5-1.6/doc/implement/Makefile 2005-08-29 21:22:52.000000000 +0200
-+++ krb5-1.6.doc/doc/implement/Makefile 2007-03-30 21:15:21.716465469 +0200
-@@ -5,7 +5,7 @@
- kdb-i.tex encrypt-i.tex cksum-i.tex crc-32-i.tex implement.ind
-
-
--all: implement.ps
-+all: implement.pdf
-
-
- implement.ps: implement.dvi
-@@ -20,6 +20,13 @@
- latex implement.tex
- rm implement.ind
-
-+implement.pdf: $(LIBTEX) $(STYLES)
-+ touch implement.ind
-+ pdflatex implement.tex
-+ makeindex implement.idx
-+ pdflatex implement.tex
-+ pdflatex implement.tex
-+
- clean:
- rm -f *.toc *.log *.idx *.ind *.aux *.ilg
-
-diff -urN krb5-1.6/doc/implement/implement.tex krb5-1.6.doc/doc/implement/implement.tex
---- krb5-1.6/doc/implement/implement.tex 2005-08-29 21:22:52.000000000 +0200
-+++ krb5-1.6.doc/doc/implement/implement.tex 2007-03-30 20:32:44.646235755 +0200
-@@ -1,4 +1,8 @@
--\documentstyle[fixunder,functions,twoside,fancyheadings]{article}
-+\documentclass{article}
-+\usepackage{fixunder}
-+\usepackage{functions}
-+\usepackage{fancyheadings}
-+\usepackage{hyperref}
- \setlength{\oddsidemargin}{0in}
- \setlength{\evensidemargin}{2.00in}
- \setlength{\marginparsep}{0.05in}
-diff -urN krb5-1.6/doc/kadm5/Makefile krb5-1.6.doc/doc/kadm5/Makefile
---- krb5-1.6/doc/kadm5/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ krb5-1.6.doc/doc/kadm5/Makefile 2007-03-30 21:38:08.254340024 +0200
-@@ -0,0 +1,31 @@
-+.SUFFIXES: .tex .dvi .ps
-+
-+STYLES= fullpage.sty rcsid.sty
-+
-+all: adb-unit-test.pdf api-funcspec.pdf api-server-design.pdf api-unit-test.pdf
-+
-+adb-unit-test.pdf: adb-unit-test.tex $(STYLES)
-+ pdflatex adb-unit-test.tex
-+ pdflatex adb-unit-test.tex
-+ pdflatex adb-unit-test.tex
-+
-+api-funcspec.pdf: api-funcspec.tex $(STYLES)
-+ pdflatex api-funcspec.tex
-+ pdflatex api-funcspec.tex
-+ pdflatex api-funcspec.tex
-+
-+api-server-design.pdf: api-server-design.tex $(STYLES)
-+ pdflatex api-server-design.tex
-+ pdflatex api-server-design.tex
-+ pdflatex api-server-design.tex
-+
-+api-unit-test.pdf: api-unit-test.tex $(STYLES)
-+ pdflatex api-unit-test.tex
-+ pdflatex api-unit-test.tex
-+ pdflatex api-unit-test.tex
-+
-+clean:
-+ rm -f *.toc *.log *.idx *.ind *.aux *.ilg
-+
-+really-clean: clean
-+ rm -f *.dvi *.ps
-diff -urN krb5-1.6/doc/man2html krb5-1.6.doc/doc/man2html
---- krb5-1.6/doc/man2html 2005-08-26 01:15:24.000000000 +0200
-+++ krb5-1.6.doc/doc/man2html 2007-03-30 21:18:01.713583185 +0200
-@@ -1,4 +1,4 @@
--#!/usr/athena/bin/perl
-+#!/usr/bin/perl
- #!/usr/local/bin/perl
- ##---------------------------------------------------------------------------##
- ## File:
diff --git a/krb5-enospc.patch b/krb5-enospc.patch
index 94495a8..03f33a5 100644
--- a/krb5-enospc.patch
+++ b/krb5-enospc.patch
@@ -1,22 +1,20 @@
If the error message is going to be ambiguous, try to give the user some clue
by returning the last error reported by the OS.
---- krb5-1.4.3/src/clients/kinit/kinit.c 2006-02-06 13:50:06.000000000 -0500
-+++ krb5-1.4.3/src/clients/kinit/kinit.c 2006-02-06 13:49:41.000000000 -0500
-@@ -846,8 +847,14 @@
- code = krb5_cc_initialize(k5->ctx, k5->cc, opts->canonicalize ?
+--- krb5-1.12.1/src/clients/kinit/kinit.c.orig 2014-03-13 16:59:01.573794523 +0100
++++ krb5-1.12.1/src/clients/kinit/kinit.c 2014-03-13 17:03:50.860449052 +0100
+@@ -851,8 +851,14 @@
+ code = krb5_cc_initialize(k5->ctx, k5->out_cc, opts->canonicalize ?
my_creds.client : k5->me);
if (code) {
-- com_err(progname, code, "when initializing cache %s",
-- opts->k5_cache_name?opts->k5_cache_name:"");
-+ if ((code == KRB5_CC_IO) && (errno != 0)) {
++ if ((code == KRB5_CC_IO) && (errno != 0)) {
+ com_err(progname, code, "when initializing cache %s: %s",
-+ opts->k5_cache_name?opts->k5_cache_name:"",
++ opts->k5_out_cache_name?opts->k5_out_cache_name:"",
+ strerror(errno));
-+ } else {
-+ com_err(progname, code, "when initializing cache %s",
-+ opts->k5_cache_name?opts->k5_cache_name:"");
-+ }
++ } else {
+ com_err(progname, code, _("when initializing cache %s"),
+ opts->k5_out_cache_name?opts->k5_out_cache_name:"");
++ }
goto cleanup;
}
if (opts->verbose)
diff --git a/krb5-kprop-mktemp.patch b/krb5-kprop-mktemp.patch
index d09a869..b2fd775 100644
--- a/krb5-kprop-mktemp.patch
+++ b/krb5-kprop-mktemp.patch
@@ -1,7 +1,7 @@
Use an in-memory ccache to silence a compiler warning.
---- krb5-1.3.5/src/slave/kprop.c 2004-11-17 12:18:48.000000000 -0500
-+++ krb5-1.3.5/src/slave/kprop.c 2004-11-17 13:42:31.926487217 -0500
-@@ -211,9 +211,9 @@
+--- krb5-1.12.1/src/slave/kprop.c.orig 2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/slave/kprop.c 2014-03-13 17:07:46.637105824 +0100
+@@ -187,9 +187,9 @@
void get_tickets(context)
krb5_context context;
{
@@ -13,7 +13,7 @@ Use an in-memory ccache to silence a compiler warning.
krb5_keytab keytab = NULL;
/*
-@@ -238,22 +237,19 @@
+@@ -230,20 +230,17 @@
#endif
/*
@@ -26,17 +26,15 @@ Use an in-memory ccache to silence a compiler warning.
- retval = krb5_cc_resolve(context, buf, &ccache);
+ retval = krb5_cc_resolve(context, tkstring, &ccache);
if (retval) {
- com_err(progname, retval, "while opening credential cache %s",
-- buf);
-+ tkstring);
+- com_err(progname, retval, _("while opening credential cache %s"), buf);
++ com_err(progname, retval, _("while opening credential cache %s"), tkstring);
exit(1);
}
retval = krb5_cc_initialize(context, ccache, my_principal);
if (retval) {
- com_err (progname, retval, "when initializing cache %s",
-- buf);
-+ tkstring);
+- com_err(progname, retval, _("when initializing cache %s"), buf);
++ com_err(progname, retval, _("when initializing cache %s"), tkstring);
exit(1);
}
diff --git a/krb5-ksu-access.patch b/krb5-ksu-access.patch
index 89faeda..dcfadae 100644
--- a/krb5-ksu-access.patch
+++ b/krb5-ksu-access.patch
@@ -32,14 +32,14 @@ not. Still needs work, I think.
retval = krb5_cc_get_principal(context, cc_source, &cc_def_princ);
if (retval)
return retval;
---- krb5-1.3/src/clients/ksu/main.c
-+++ krb5-1.3/src/clients/ksu/main.c
-@@ -263,7 +263,7 @@
+--- krb5-1.12.1/src/clients/ksu/main.c.orig 2014-03-13 16:45:48.897161122 +0100
++++ krb5-1.12.1/src/clients/ksu/main.c 2014-03-13 16:46:56.597158281 +0100
+@@ -265,7 +265,7 @@
if ( strchr(cc_source_tag, ':')){
cc_source_tag_tmp = strchr(cc_source_tag, ':') + 1;
- if( stat( cc_source_tag_tmp, &st_temp)){
+ if( access( cc_source_tag_tmp, F_OK | R_OK) || stat( cc_source_tag_tmp, &st_temp)){
- com_err (prog_name, errno,
- "while looking for credentials file %s",
- cc_source_tag_tmp);
+ com_err(prog_name, errno,
+ _("while looking for credentials file %s"),
+ cc_source_tag_tmp);
diff --git a/krb5-ksu-path.patch b/krb5-ksu-path.patch
index ba95777..1bf8446 100644
--- a/krb5-ksu-path.patch
+++ b/krb5-ksu-path.patch
@@ -1,13 +1,12 @@
-Set the default PATH to the one set by login, with the addition of the
-/usr/X11R6/bin to the end of the list.
+Set the default PATH to the one set by login.
---- krb5-1.5/src/clients/ksu/Makefile.in 2006-05-24 17:19:23.000000000 -0400
-+++ krb5-1.5/src/clients/ksu/Makefile.in 2006-07-05 14:24:41.000000000 -0400
+--- krb5-1.12.1/src/clients/ksu/Makefile.in.orig 2014-03-13 16:48:03.317155478 +0100
++++ krb5-1.12.1/src/clients/ksu/Makefile.in 2014-03-13 16:54:13.940473258 +0100
@@ -1,6 +1,6 @@
mydir=clients$(S)ksu
BUILDTOP=$(REL)..$(S)..
-DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
-+DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/sbin /usr/sbin /bin /usr/bin /usr/X11R6/bin"'
- DEFS=
++DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/sbin /usr/sbin /bin /usr/bin"'
+
+ KSU_LIBS=@KSU_LIBS@
- PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/krb5-ktany.patch b/krb5-ktany.patch
index 475956d..4044c67 100644
--- a/krb5-ktany.patch
+++ b/krb5-ktany.patch
@@ -131,7 +131,7 @@
+ if ((data = (krb5_ktany_data *)malloc(sizeof(krb5_ktany_data))) == NULL)
+ return(ENOMEM);
+ if ((data->name = (char *)malloc(strlen(name) + 1)) == NULL) {
-+ krb5_xfree(data);
++ free(data);
+ return(ENOMEM);
+ }
+ strcpy(data->name, name);
@@ -142,8 +142,8 @@
+ data->nchoices++;
+ if ((data->choices = (krb5_keytab *)
+ malloc(data->nchoices * sizeof(krb5_keytab))) == NULL) {
-+ krb5_xfree(data->name);
-+ krb5_xfree(data);
++ free(data->name);
++ free(data);
+ return(ENOMEM);
+ }
+
@@ -160,7 +160,7 @@
+
+ /* Try resolving the choice name. */
+ kerror = krb5_kt_resolve(context, copy, &data->choices[i]);
-+ krb5_xfree(copy);
++ free(copy);
+ if (kerror) {
+ cleanup(context, data, i);
+ return(kerror);
@@ -208,7 +208,7 @@
+
+ cleanup(context, data, data->nchoices);
+ id->ops = 0;
-+ krb5_xfree(id);
++ free(id);
+ return(0);
+}
+
@@ -254,14 +254,14 @@
+ &cdata->cursor)) == 0)
+ break;
+ else if (kerror != ENOENT) {
-+ krb5_xfree(cdata);
++ free(cdata);
+ return(kerror);
+ }
+ }
+
+ if (i == data->nchoices) {
+ /* Everyone returned ENOENT, so no go. */
-+ krb5_xfree(cdata);
++ free(cdata);
+ return(kerror);
+ }
+
@@ -298,7 +298,7 @@
+
+ choice_id = data->choices[cdata->which];
+ kerror = krb5_kt_end_seq_get(context, choice_id, &cdata->cursor);
-+ krb5_xfree(cdata);
++ free(cdata);
+ return(kerror);
+}
+
@@ -310,11 +310,11 @@
+{
+ int i;
+
-+ krb5_xfree(data->name);
++ free(data->name);
+ for (i = 0; i < nchoices; i++)
+ krb5_kt_close(context, data->choices[i]);
-+ krb5_xfree(data->choices);
-+ krb5_xfree(data);
++ free(data->choices);
++ free(data);
+}
--- krb5-1.4/src/lib/krb5/keytab/Makefile.in.ktany 2004-05-27 23:44:32.000000000 -0400
+++ krb5-1.4/src/lib/krb5/keytab/Makefile.in 2005-02-18 10:38:09.000000000 -0500
diff --git a/krb5-manpages.patch b/krb5-manpages.patch
index 82b54e6..2a24d61 100644
--- a/krb5-manpages.patch
+++ b/krb5-manpages.patch
@@ -1,83 +1,31 @@
---- krb5-1.3/src/appl/sample/sserver/sserver.M
-+++ krb5-1.3/src/appl/sample/sserver/sserver.M
+--- krb5-1.12.1/src/man/sserver.man.orig 2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/man/sserver.man 2014-03-13 16:34:04.903857332 +0100
@@ -59,7 +59,7 @@
- using a line in
- /etc/inetd.conf that looks like this:
- .PP
--sample stream tcp nowait root /usr/local/sbin/sserver sserver
-+sample stream tcp nowait root /usr/sbin/sserver sserver
- .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:
---- krb5-1.3/src/config-files/kdc.conf.M
-+++ krb5-1.3/src/config-files/kdc.conf.M
-@@ -235,7 +235,7 @@
- realm names and the [capaths] section of its krb5.conf file
-
- .SH FILES
--/usr/local/var/krb5kdc/kdc.conf
-+/etc/kerberos/kdc.conf
-
- .SH SEE ALSO
- krb5.conf(5), krb5kdc(8)
---- krb5-1.3/src/kadmin/cli/kadmin.M
-+++ krb5-1.3/src/kadmin/cli/kadmin.M
-@@ -733,9 +733,9 @@
- .RS
- .TP
- EXAMPLE:
--kadmin: ktremove -k /usr/local/var/krb5kdc/kadmind.keytab kadmin/admin
-+kadmin: ktremove -k /var/lib/kerberos/kadm5.keytab kadmin/admin
- Entry for principal kadmin/admin with kvno 3 removed
-- from keytab WRFILE:/usr/local/var/krb5kdc/kadmind.keytab.
-+ from keytab WRFILE:/var/lib/kerberos/kadm5.keytab.
- kadmin:
- .RE
+ .sp
+ .nf
+ .ft C
+-sample stream tcp nowait root /usr/local/sbin/sserver sserver
++sample stream tcp nowait root /usr/sbin/sserver sserver
+ .ft P
.fi
---- krb5-1.3/src/slave/kprop.M
-+++ krb5-1.3/src/slave/kprop.M
-@@ -39,7 +39,7 @@
- This is done by transmitting the dumped database file to the slave
- server over an encrypted, secure channel. The dump file must be created
- by kdb5_util, and is normally KPROP_DEFAULT_FILE
--(/usr/local/var/krb5kdc/slave_datatrans).
-+(/var/lib/kerberos/slave_datatrans).
- .SH OPTIONS
- .TP
- \fB\-r\fP \fIrealm\fP
-@@ -51,7 +51,7 @@
- \fB\-f\fP \fIfile\fP
- specifies the filename where the dumped principal database file is to be
- found; by default the dumped database file is KPROP_DEFAULT_FILE
--(normally /usr/local/var/krb5kdc/slave_datatrans).
-+(normally /var/lib/kerberos/slave_datatrans).
- .TP
- \fB\-P\fP \fIport\fP
- specifies the port to use to contact the
---- krb5-1.3/src/slave/kpropd.M
-+++ krb5-1.3/src/slave/kpropd.M
-@@ -69,7 +69,7 @@
- This is done by adding a line to the inetd.conf file which looks like
- this:
-
--kprop stream tcp nowait root /usr/local/sbin/kpropd kpropd
-+kprop stream tcp nowait root /usr/sbin/kpropd kpropd
-
- However, kpropd can also run as a standalone deamon, if the
- .B \-S
-@@ -87,13 +87,13 @@
- \fB\-f\fP \fIfile\fP
- specifies the filename where the dumped principal database file is to be
- stored; by default the dumped database file is KPROPD_DEFAULT_FILE
--(normally /usr/local/var/krb5kdc/from_master).
-+(normally /var/lib/kerberos/from_master).
- .TP
- .B \-p
- allows the user to specify the pathname to the
- .IR kdb5_util (8)
- program; by default the pathname used is KPROPD_DEFAULT_KDB5_UTIL
--(normally /usr/local/sbin/kdb5_util).
-+(normally /usr/sbin/kdb5_util).
+ .UNINDENT
+--- krb5-1.12.1/src/man/kpropd.man.orig 2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/man/kpropd.man 2014-03-13 16:45:10.723829391 +0100
+@@ -63,7 +63,7 @@
+ .sp
+ .nf
+ .ft C
+-kprop stream tcp nowait root /usr/local/sbin/kpropd kpropd
++kprop stream tcp nowait root /usr/sbin/kpropd kpropd
+ .ft P
+ .fi
+ .UNINDENT
+@@ -134,7 +134,7 @@
.TP
- .B \-S
- turn on standalone mode. Normally, kpropd is invoked out of
+ .B kpropd.acl
+ Access file for kpropd; the default location is
+-\fB/usr/local/var/krb5kdc/kpropd.acl\fP. Each entry is a line
++\fB/var/lib/kerberos/krb5kdc/kpropd.acl\fP. Each entry is a line
+ containing the principal of a host from which the local machine
+ will allow Kerberos database propagation via \fIkprop(8)\fP.
+ .UNINDENT
diff --git a/krb5-tests.patch b/krb5-tests.patch
index 62beb56..b7c95c5 100644
--- a/krb5-tests.patch
+++ b/krb5-tests.patch
@@ -34,28 +34,34 @@
DICT=`cd $srcdir/../test && pwd`/dictionary
else
echo 'run.test: no dictionary'
---- krb5-1.9.1/src/lib/krb5/krb/Makefile.in~ 2010-12-03 01:05:44.000000000 +0100
-+++ krb5-1.9.1/src/lib/krb5/krb/Makefile.in 2011-08-03 00:38:37.538243651 +0200
-@@ -431,7 +431,9 @@
- $(RUN_SETUP) $(VALGRIND) ./t_etypes
+--- krb5-1.12.1/src/lib/krb5/krb/Makefile.in.orig 2014-03-13 17:10:07.517099910 +0100
++++ krb5-1.12.1/src/lib/krb5/krb/Makefile.in 2014-03-13 17:48:55.017002233 +0100
+@@ -481,9 +481,11 @@
+ $(RUN_SETUP) $(VALGRIND) ./t_copy_context
- check-pytests:: t_expire_warn
+ check-pytests:: t_expire_warn t_vfy_increds
- $(RUNPYTEST) $(srcdir)/t_expire_warn.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_vfy_increds.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_in_ccache_patypes.py $(PYTESTFLAGS)
+ if [ "$(OFFLINE)" = no ]; then \
-+ $(RUNPYTEST) $(srcdir)/t_expire_warn.py $(PYTESTFLAGS) ; \
++ $(RUNPYTEST) $(srcdir)/t_expire_warn.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_vfy_increds.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_in_ccache_patypes.py $(PYTESTFLAGS) ; \
+ fi
clean::
$(RM) $(OUTPRE)t_walk_rtree$(EXEEXT) $(OUTPRE)t_walk_rtree.$(OBJEXT) \
---- krb5-1.9.1/src/kdc/Makefile.in~ 2010-11-01 20:49:29.000000000 +0100
-+++ krb5-1.9.1/src/kdc/Makefile.in 2011-08-03 00:50:14.395525895 +0200
-@@ -66,7 +66,9 @@
+--- krb5-1.12.1/src/kdc/Makefile.in.orig 2014-03-13 17:10:07.517099910 +0100
++++ krb5-1.12.1/src/kdc/Makefile.in 2014-03-13 17:52:29.930326550 +0100
+@@ -69,8 +69,10 @@
$(RM) test.out
check-pytests::
- $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
+ if [ "$(OFFLINE)" = no ]; then \
-+ $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) ; \
++ $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) ; \
+ fi
install::
@@ -73,42 +79,29 @@
install-unix::
$(INSTALL_PROGRAM) gss-client $(DESTDIR)$(CLIENT_BINDIR)/gss-client
---- krb5-1.9.1/src/tests/Makefile.in~ 2010-12-15 00:10:42.000000000 +0100
-+++ krb5-1.9.1/src/tests/Makefile.in 2011-08-03 01:13:45.330962610 +0200
-@@ -61,12 +61,14 @@
- $(RM) $(TEST_DB)* stash_file
-
- check-pytests::
-- $(RUNPYTEST) $(srcdir)/t_general.py $(PYTESTFLAGS)
-- $(RUNPYTEST) $(srcdir)/t_anonpkinit.py $(PYTESTFLAGS)
-- $(RUNPYTEST) $(srcdir)/t_lockout.py $(PYTESTFLAGS)
-- $(RUNPYTEST) $(srcdir)/t_kadm5_hook.py $(PYTESTFLAGS)
-- $(RUNPYTEST) $(srcdir)/t_keyrollover.py $(PYTESTFLAGS)
-- $(RUNPYTEST) $(srcdir)/t_renew.py $(PYTESTFLAGS)
-+ if [ "$(OFFLINE)" = no ]; then \
-+ $(RUNPYTEST) $(srcdir)/t_general.py $(PYTESTFLAGS) && \
-+ $(RUNPYTEST) $(srcdir)/t_anonpkinit.py $(PYTESTFLAGS) && \
-+ $(RUNPYTEST) $(srcdir)/t_lockout.py $(PYTESTFLAGS) && \
-+ $(RUNPYTEST) $(srcdir)/t_kadm5_hook.py $(PYTESTFLAGS) && \
-+ $(RUNPYTEST) $(srcdir)/t_keyrollover.py $(PYTESTFLAGS) && \
-+ $(RUNPYTEST) $(srcdir)/t_renew.py $(PYTESTFLAGS) ; \
-+ fi
-
- clean::
- $(RM) kdc.conf
---- krb5-1.9.1/src/tests/gssapi/Makefile.in~ 2010-12-03 01:05:44.000000000 +0100
-+++ krb5-1.9.1/src/tests/gssapi/Makefile.in 2011-08-03 01:15:11.187294436 +0200
-@@ -11,7 +11,9 @@
- all:: t_imp_name t_s4u t_namingexts t_gssexts t_spnego t_saslname
-
- check-pytests:: t_spnego
+--- krb5-1.12.1/src/tests/gssapi/Makefile.in.orig 2014-03-13 18:30:36.910230571 +0100
++++ krb5-1.12.1/src/tests/gssapi/Makefile.in 2014-03-13 18:43:46.143530790 +0100
+@@ -32,12 +32,14 @@
+ check-pytests:: ccinit ccrefresh t_accname t_ccselect t_credstore t_enctypes \
+ t_err t_export_cred t_export_name t_imp_cred t_inq_cred \
+ t_inq_mechs_name t_iov t_s4u t_s4u2proxy_krb5 t_spnego
- $(RUNPYTEST) $(srcdir)/t_gssapi.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_ccselect.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_client_keytab.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_enctypes.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_export_cred.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_s4u.py $(PYTESTFLAGS)
+ if [ "$(OFFLINE)" = no ]; then \
-+ $(RUNPYTEST) $(srcdir)/t_gssapi.py $(PYTESTFLAGS) ; \
++ $(RUNPYTEST) $(srcdir)/t_gssapi.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_ccselect.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_client_keytab.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_enctypes.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_export_cred.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_s4u.py $(PYTESTFLAGS) ; \
+ fi
- t_imp_name: t_imp_name.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
- $(CC_LINK) -o t_imp_name t_imp_name.o $(GSS_LIBS) $(KRB5_BASE_LIBS)
+ ccinit: ccinit.o $(KRB5_BASE_DEPLIBS)
+ $(CC_LINK) -o ccinit ccinit.o $(KRB5_BASE_LIBS)
--- krb5-1.9.1/src/tests/mkeystash_compat/Makefile.in~ 2010-12-03 01:05:44.000000000 +0100
+++ krb5-1.9.1/src/tests/mkeystash_compat/Makefile.in 2011-08-03 12:55:23.507781811 +0200
@@ -37,14 +37,16 @@
@@ -136,9 +129,9 @@
clean::
$(RM) kdc.conf krb5.conf bigendian.$(OBJEXT) bigendian
---- krb5-1.9.1/src/tests/Makefile.in~ 2011-08-03 12:52:47.476781846 +0200
-+++ krb5-1.9.1/src/tests/Makefile.in 2011-08-03 12:56:18.963781798 +0200
-@@ -34,31 +34,33 @@
+--- krb5-1.12.1/src/tests/Makefile.in.orig 2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/tests/Makefile.in 2014-03-13 18:29:22.833567017 +0100
+@@ -61,68 +61,72 @@
mv krb5.new krb5.conf
kdb_check: kdc.conf krb5.conf
@@ -195,5 +188,77 @@
+ $(RM) $(TEST_DB)* stash_file ;\
+ fi
- check-pytests::
- if [ "$(OFFLINE)" = no ]; then \
+ check-pytests:: gcred hist hrealm kdbtest plugorder responder
+ check-pytests:: t_init_creds t_localauth
+- $(RUNPYTEST) $(srcdir)/t_general.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_dump.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_iprop.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_kprop.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_policy.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_pkinit.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_otp.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_localauth.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_kadm5_hook.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_pwqual.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_hostrealm.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_kdb_locking.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_keyrollover.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_renew.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_renprinc.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_ccache.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_stringattr.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_sesskeynego.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_crossrealm.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_referral.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_skew.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_keytab.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_kadmin_acl.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_kdb.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_keydata.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_cve-2012-1014.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_cve-2012-1015.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_cve-2013-1416.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_cve-2013-1417.py $(PYTESTFLAGS)
+- $(RM) au.log
+- $(RUNPYTEST) $(srcdir)/t_audit.py $(PYTESTFLAGS)
++ if [ "$(OFFLINE)" = no ]; then \
++ $(RUNPYTEST) $(srcdir)/t_general.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_dump.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_iprop.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_kprop.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_policy.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_pkinit.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_otp.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_localauth.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_kadm5_hook.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_pwqual.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_hostrealm.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_kdb_locking.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_keyrollover.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_renew.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_renprinc.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_ccache.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_stringattr.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_sesskeynego.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_crossrealm.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_referral.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_skew.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_keytab.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_kadmin_acl.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_kdb.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_keydata.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_cve-2012-1014.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_cve-2012-1015.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_cve-2013-1416.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_cve-2013-1417.py $(PYTESTFLAGS) && \
++ $(RM) au.log && \
++ $(RUNPYTEST) $(srcdir)/t_audit.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/jsonwalker.py -d $(srcdir)/au_dict.json \
+- -i au.log
+- $(RUNPYTEST) $(srcdir)/t_bogus_kdc_req.py $(PYTESTFLAGS)
++ -i au.log && \
++ $(RUNPYTEST) $(srcdir)/t_bogus_kdc_req.py $(PYTESTFLAGS) ; \
++ fi
+
+ clean::
+ $(RM) gcred hist hrealm kdbtest plugorder responder
diff --git a/krb5-trunk-doublelog.patch b/krb5-trunk-doublelog.patch
index dd60feb..9cfe79f 100644
--- a/krb5-trunk-doublelog.patch
+++ b/krb5-trunk-doublelog.patch
@@ -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: src/include/Makefile.in
-===================================================================
---- src/include/Makefile.in (revision 20235)
-+++ src/include/Makefile.in (working copy)
-@@ -61,7 +61,9 @@
- -e "s+ at SBINDIR+$(SBINDIR)+" \
- -e "s+ at MODULEDIR+$(MODULE_DIR)+" \
- -e 's+ at LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
-- -e 's+ at SYSCONFDIR+$(SYSCONFDIR)+'
-+ -e 's+ at SYSCONFDIR+$(SYSCONFDIR)+' \
-+ -e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \
-+ -e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+'
+--- krb5-1.12.1/src/include/Makefile.in.orig 2014-03-13 19:19:48.720106696 +0100
++++ krb5-1.12.1/src/include/Makefile.in 2014-03-13 19:28:05.226752528 +0100
+@@ -67,7 +67,9 @@
+ -e "s+ at GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
+ -e 's+ at LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
+ -e 's+ at SYSCONFDIR+$(SYSCONFDIR)+' \
+- -e 's+ at DYNOBJEXT+$(DYNOBJEXT)+'
++ -e 's+ at DYNOBJEXT+$(DYNOBJEXT)+' \
++ -e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \
++ -e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+'
- OSCONFSRC = $(srcdir)/stock/osconf.h
+ OSCONFSRC = $(srcdir)/osconf.hin
diff --git a/krb5-trunk-kpasswd_tcp.patch b/krb5-trunk-kpasswd_tcp.patch
deleted file mode 100644
index 53c4c23..0000000
--- a/krb5-trunk-kpasswd_tcp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-===================================================================
---- src/lib/krb5/os/changepw.c (revision 20199)
-+++ src/lib/krb5/os/changepw.c (working copy)
-@@ -251,11 +251,22 @@
- NULL,
- NULL
- ))) {
--
-- /*
-- * Here we may want to switch to TCP on some errors.
-- * right?
-- */
-+ /* 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) {
-+ 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;
-+ continue;
-+ default:
-+ break;
-+ }
-+ }
- break;
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/krb5.git/commitdiff/d321cc6464eb22a6386ed0d0643e2734ba976b2d
More information about the pld-cvs-commit
mailing list