diff --git a/bug-641008_pam_krb5-2.3.11-setcred-log.diff b/bug-641008_pam_krb5-2.3.11-setcred-log.diff index 0acc9af..eb3823b 100644 --- a/bug-641008_pam_krb5-2.3.11-setcred-log.diff +++ b/bug-641008_pam_krb5-2.3.11-setcred-log.diff @@ -1,8 +1,8 @@ -Index: pam_krb5-2.3.13-1/src/auth.c +Index: pam_krb5-2.4.4/src/auth.c =================================================================== ---- pam_krb5-2.3.13-1.orig/src/auth.c -+++ pam_krb5-2.3.13-1/src/auth.c -@@ -532,13 +532,32 @@ int +--- pam_krb5-2.4.4.orig/src/auth.c ++++ pam_krb5-2.4.4/src/auth.c +@@ -434,13 +434,32 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, PAM_KRB5_MAYBE_CONST char **argv) { @@ -40,7 +40,7 @@ Index: pam_krb5-2.3.13-1/src/auth.c return _pam_krb5_open_session(pamh, flags, argc, argv, "pam_setcred(PAM_ESTABLISH_CRED)", _pam_krb5_session_caller_setcred); -@@ -553,21 +572,31 @@ pam_sm_setcred(pam_handle_t *pamh, int f +@@ -455,21 +474,31 @@ pam_sm_setcred(pam_handle_t *pamh, int f } saved_perms = NULL; diff --git a/pam_krb5-2.2.0-0.5-configure_ac.dif b/pam_krb5-2.2.0-0.5-configure_ac.dif deleted file mode 100644 index 2805f2f..0000000 --- a/pam_krb5-2.2.0-0.5-configure_ac.dif +++ /dev/null @@ -1,23 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -157,14 +157,14 @@ AC_SUBST(KRB5_BINDIR) - AC_CHECK_LIB(resolv,main) - KRB5_CFLAGS=`$KRB5_CONFIG --cflags krb5` - KRB5_LIBS=`$KRB5_CONFIG --libs krb5` --KRB5_LDFLAGS="`$KRB5_CONFIG --libs | sed s,'-l[[^ ]]*',,g`" --LIBS="$LIBS `$KRB5_CONFIG --libs | sed s,'-l[[^ ]]*',,g`" -+KRB5_LDFLAGS="`$KRB5_CONFIG --libs`" -+LIBS="$LIBS `$KRB5_CONFIG --libs`" - LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" - if test x$krb4 != xno ; then - KRB4_CFLAGS=`$KRB4_CONFIG --cflags krb4` - KRB4_LIBS=`$KRB4_CONFIG --libs krb4` -- KRB4_LDFLAGS="`$KRB4_CONFIG --libs | sed s,'-l[[^ ]]*',,g`" -- LIBS="$LIBS `$KRB4_CONFIG --libs | sed s,'-l[[^ ]]*',,g`" -+ KRB4_LDFLAGS="`$KRB4_CONFIG --libs`" -+ LIBS="$LIBS `$KRB4_CONFIG --libs`" - LDFLAGS="$LDFLAGS $KRB4_LDFLAGS" - fi - diff --git a/pam_krb5-2.2.3-1-setcred-assume-establish.dif b/pam_krb5-2.2.3-1-setcred-assume-establish.dif index cc91f40..a99e013 100644 --- a/pam_krb5-2.2.3-1-setcred-assume-establish.dif +++ b/pam_krb5-2.2.3-1-setcred-assume-establish.dif @@ -2,7 +2,7 @@ Index: src/auth.c =================================================================== --- src/auth.c.orig +++ src/auth.c -@@ -568,6 +568,6 @@ pam_sm_setcred(pam_handle_t *pamh, int f +@@ -470,6 +470,6 @@ pam_sm_setcred(pam_handle_t *pamh, int f "pam_setcred(PAM_DELETE_CRED)", _pam_krb5_session_caller_setcred); } diff --git a/pam_krb5-2.3.1-log-choise.dif b/pam_krb5-2.3.1-log-choise.dif index 55b60f1..5041673 100644 --- a/pam_krb5-2.3.1-log-choise.dif +++ b/pam_krb5-2.3.1-log-choise.dif @@ -1,9 +1,9 @@ -Index: pam_krb5-2.3.13-1/src/acct.c +Index: pam_krb5-2.4.4/src/acct.c =================================================================== ---- pam_krb5-2.3.13-1.orig/src/acct.c -+++ pam_krb5-2.3.13-1/src/acct.c -@@ -96,6 +96,10 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int - krb5_free_context(ctx); +--- pam_krb5-2.4.4.orig/src/acct.c ++++ pam_krb5-2.4.4/src/acct.c +@@ -89,6 +89,10 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int + _pam_krb5_free_ctx(ctx); return PAM_SERVICE_ERR; } + if (options->debug) { @@ -13,11 +13,11 @@ Index: pam_krb5-2.3.13-1/src/acct.c /* Get information about the user and the user's principal name. */ userinfo = _pam_krb5_user_info_init(ctx, user, options); -Index: pam_krb5-2.3.13-1/src/auth.c +Index: pam_krb5-2.4.4/src/auth.c =================================================================== ---- pam_krb5-2.3.13-1.orig/src/auth.c -+++ pam_krb5-2.3.13-1/src/auth.c -@@ -115,9 +115,10 @@ pam_sm_authenticate(pam_handle_t *pamh, +--- pam_krb5-2.4.4.orig/src/auth.c ++++ pam_krb5-2.4.4/src/auth.c +@@ -108,9 +108,10 @@ pam_sm_authenticate(pam_handle_t *pamh, return PAM_SERVICE_ERR; } if (options->debug) { @@ -30,7 +30,7 @@ Index: pam_krb5-2.3.13-1/src/auth.c _pam_krb5_set_init_opts(ctx, gic_options, options); /* Prompt for the password, as we might need to. */ -@@ -530,6 +531,11 @@ int +@@ -432,6 +433,11 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, PAM_KRB5_MAYBE_CONST char **argv) { @@ -42,12 +42,12 @@ Index: pam_krb5-2.3.13-1/src/auth.c if (flags & PAM_ESTABLISH_CRED) { return _pam_krb5_open_session(pamh, flags, argc, argv, "pam_setcred(PAM_ESTABLISH_CRED)", -Index: pam_krb5-2.3.13-1/src/password.c +Index: pam_krb5-2.4.4/src/password.c =================================================================== ---- pam_krb5-2.3.13-1.orig/src/password.c -+++ pam_krb5-2.3.13-1/src/password.c -@@ -116,6 +116,16 @@ pam_sm_chauthtok(pam_handle_t *pamh, int - krb5_free_context(ctx); +--- pam_krb5-2.4.4.orig/src/password.c ++++ pam_krb5-2.4.4/src/password.c +@@ -110,6 +110,16 @@ pam_sm_chauthtok(pam_handle_t *pamh, int + _pam_krb5_free_ctx(ctx); return PAM_SERVICE_ERR; } + if (options->debug) { @@ -63,12 +63,12 @@ Index: pam_krb5-2.3.13-1/src/password.c _pam_krb5_set_init_opts(ctx, gic_options, options); /* Get information about the user and the user's principal name. */ -Index: pam_krb5-2.3.13-1/src/session.c +Index: pam_krb5-2.4.4/src/session.c =================================================================== ---- pam_krb5-2.3.13-1.orig/src/session.c -+++ pam_krb5-2.3.13-1/src/session.c -@@ -104,6 +104,10 @@ _pam_krb5_open_session(pam_handle_t *pam - krb5_free_context(ctx); +--- pam_krb5-2.4.4.orig/src/session.c ++++ pam_krb5-2.4.4/src/session.c +@@ -97,6 +97,10 @@ _pam_krb5_open_session(pam_handle_t *pam + _pam_krb5_free_ctx(ctx); return PAM_SERVICE_ERR; } + if (options->debug) { @@ -78,8 +78,8 @@ Index: pam_krb5-2.3.13-1/src/session.c /* If we're in a no-cred-session situation, return. */ if ((!options->cred_session) && -@@ -358,7 +362,10 @@ _pam_krb5_close_session(pam_handle_t *pa - krb5_free_context(ctx); +@@ -301,7 +305,10 @@ _pam_krb5_close_session(pam_handle_t *pa + _pam_krb5_free_ctx(ctx); return PAM_SUCCESS; } - diff --git a/pam_krb5-2.3.1-switch-perms-on-refresh.dif b/pam_krb5-2.3.1-switch-perms-on-refresh.dif index c0edf48..92882a3 100644 --- a/pam_krb5-2.3.1-switch-perms-on-refresh.dif +++ b/pam_krb5-2.3.1-switch-perms-on-refresh.dif @@ -1,8 +1,8 @@ -Index: pam_krb5-2.3.13-1/src/auth.c +Index: pam_krb5-2.4.4/src/auth.c =================================================================== ---- pam_krb5-2.3.13-1.orig/src/auth.c -+++ pam_krb5-2.3.13-1/src/auth.c -@@ -62,6 +62,7 @@ +--- pam_krb5-2.4.4.orig/src/auth.c ++++ pam_krb5-2.4.4/src/auth.c +@@ -56,6 +56,7 @@ #include "items.h" #include "kuserok.h" #include "log.h" @@ -10,7 +10,7 @@ Index: pam_krb5-2.3.13-1/src/auth.c #include "options.h" #include "prompter.h" #include "session.h" -@@ -531,6 +532,7 @@ int +@@ -433,6 +434,7 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, PAM_KRB5_MAYBE_CONST char **argv) { @@ -18,7 +18,7 @@ Index: pam_krb5-2.3.13-1/src/auth.c notice("pam_setcred (%s) called", (flags & PAM_ESTABLISH_CRED)?"establish credential": (flags & PAM_REINITIALIZE_CRED)?"reinitialize credential": -@@ -542,10 +544,22 @@ pam_sm_setcred(pam_handle_t *pamh, int f +@@ -444,10 +446,22 @@ pam_sm_setcred(pam_handle_t *pamh, int f _pam_krb5_session_caller_setcred); } if (flags & (PAM_REINITIALIZE_CRED | PAM_REFRESH_CRED)) { @@ -43,11 +43,11 @@ Index: pam_krb5-2.3.13-1/src/auth.c return PAM_IGNORE; } } -Index: pam_krb5-2.3.13-1/src/perms.c +Index: pam_krb5-2.4.4/src/perms.c =================================================================== ---- pam_krb5-2.3.13-1.orig/src/perms.c -+++ pam_krb5-2.3.13-1/src/perms.c -@@ -87,3 +87,49 @@ _pam_krb5_restore_perms(struct _pam_krb5 +--- pam_krb5-2.4.4.orig/src/perms.c ++++ pam_krb5-2.4.4/src/perms.c +@@ -89,3 +89,49 @@ _pam_krb5_restore_perms(struct _pam_krb5 } return ret; } @@ -97,10 +97,10 @@ Index: pam_krb5-2.3.13-1/src/perms.c + } + return ret; +} -Index: pam_krb5-2.3.13-1/src/perms.h +Index: pam_krb5-2.4.4/src/perms.h =================================================================== ---- pam_krb5-2.3.13-1.orig/src/perms.h -+++ pam_krb5-2.3.13-1/src/perms.h +--- pam_krb5-2.4.4.orig/src/perms.h ++++ pam_krb5-2.4.4/src/perms.h @@ -37,4 +37,7 @@ struct _pam_krb5_perms; struct _pam_krb5_perms *_pam_krb5_switch_perms(void); int _pam_krb5_restore_perms(struct _pam_krb5_perms *saved); diff --git a/pam_krb5-2.3.13-1.tar.bz2 b/pam_krb5-2.3.13-1.tar.bz2 deleted file mode 100644 index df03733..0000000 --- a/pam_krb5-2.3.13-1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcb8fd3a440a07738851bb5f726ccdf618d95ddf4dd57e026de6718b7b1ac157 -size 432029 diff --git a/pam_krb5-2.4.4.tar.bz2 b/pam_krb5-2.4.4.tar.bz2 new file mode 100644 index 0000000..d9162ef --- /dev/null +++ b/pam_krb5-2.4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82d2cd1b5460b061e849a60bdea5d30d70054cc3d4f24f98132b9af73b15323d +size 443085 diff --git a/pam_krb5.changes b/pam_krb5.changes index 172fae2..26d8fe6 100644 --- a/pam_krb5.changes +++ b/pam_krb5.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Apr 16 11:06:38 CEST 2013 - mc@suse.de + +- update to version 2.4.4 + * drop configuration settings that duplicated library settings + * drop the existing_ticket option + * drop krb4 support + * add support for preserving configuration information in ccaches + * add support for creating and cleaning up DIR: ccaches + * finish cleaning up KEYRING: ccaches + * add experimental "armor" and "armor_strategy" options + * handle creation of /run/user/XXX for FILE: and DIR: caches + * handle different function signatures for krb5_trace_callback + * avoid overriding the primary when updating DIR: caches +- obsolets patches (upstream): + * pam_krb5-2.2.0-0.5-configure_ac.dif + * use-urandom-for-tests.dif + ------------------------------------------------------------------- Thu Mar 7 13:38:09 UTC 2013 - cfarrell@suse.com diff --git a/pam_krb5.spec b/pam_krb5.spec index d032b59..cb36b1b 100644 --- a/pam_krb5.spec +++ b/pam_krb5.spec @@ -30,22 +30,20 @@ Provides: pam_krb Obsoletes: pam_krb5-64bit %endif # -Version: 2.3.13 +Version: 2.4.4 Release: 0 Summary: PAM Module for Kerberos Authentication License: BSD-3-Clause or LGPL-2.1+ Group: Productivity/Networking/Security Url: http://sourceforge.net/projects/pam-krb5/ -Source: pam_krb5-%{version}-%{PAM_RELEASE}.tar.bz2 +Source: pam_krb5-%{version}.tar.bz2 Source2: pam_krb5-po.tar.gz Source3: baselibs.conf -Patch1: pam_krb5-2.2.0-0.5-configure_ac.dif -Patch2: pam_krb5-2.3.1-log-choise.dif -Patch3: pam_krb5-LINGUAS.dif -Patch4: pam_krb5-2.3.1-switch-perms-on-refresh.dif -Patch5: pam_krb5-2.2.3-1-setcred-assume-establish.dif -Patch6: bug-641008_pam_krb5-2.3.11-setcred-log.diff -Patch7: use-urandom-for-tests.dif +Patch1: pam_krb5-2.3.1-log-choise.dif +Patch2: pam_krb5-LINGUAS.dif +Patch3: pam_krb5-2.3.1-switch-perms-on-refresh.dif +Patch4: pam_krb5-2.2.3-1-setcred-assume-establish.dif +Patch5: bug-641008_pam_krb5-2.3.11-setcred-log.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,15 +51,13 @@ This PAM module supports authentication against a Kerberos KDC. It also supports updating your Kerberos password. %prep -%setup -q -n pam_krb5-%{version}-%{PAM_RELEASE} -%setup -a 2 -T -D -n pam_krb5-%{version}-%{PAM_RELEASE} -%patch1 -%patch2 -p1 -%patch3 -%patch4 -p1 -%patch5 -%patch6 -p1 -%patch7 -p1 +%setup -q -n pam_krb5-%{version} +%setup -a 2 -T -D -n pam_krb5-%{version} +%patch1 -p1 +%patch2 +%patch3 -p1 +%patch4 +%patch5 -p1 %build CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE " \ diff --git a/use-urandom-for-tests.dif b/use-urandom-for-tests.dif deleted file mode 100644 index 4f01e4c..0000000 --- a/use-urandom-for-tests.dif +++ /dev/null @@ -1,13 +0,0 @@ -Index: pam_krb5-2.3.13-1/tests/testenv.sh.in -=================================================================== ---- pam_krb5-2.3.13-1.orig/tests/testenv.sh.in -+++ pam_krb5-2.3.13-1/tests/testenv.sh.in -@@ -72,7 +72,7 @@ fi - test_kdcinitdb() { - test -d @abs_builddir@/kdc || mkdir -p @abs_builddir@/kdc - kdb5_util destroy -f 2> /dev/null > /dev/null -- (echo .; echo .; echo .) | kdb5_util create -s 2> /dev/null > /dev/null -+ (echo .; echo .; echo .) | kdb5_util create -s -W 2> /dev/null > /dev/null - - $kadmin -q 'addpol -minlength 6 minimum_six' 2> /dev/null > /dev/null - $kadmin -q 'ank -pw foo '$test_principal 2> /dev/null > /dev/null