From 4b2ee11293b4718143748a45bd36fa10063b72757d030b131707c9f95707dcbb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 5 Mar 2010 10:54:32 +0000 Subject: [PATCH] Accepting request 34011 from Linux-PAM Copy from Linux-PAM/pam_krb5 based on submit request 34011 from user mcalmer OBS-URL: https://build.opensuse.org/request/show/34011 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_krb5?expand=0&rev=37 --- pam_krb5-2.2.0-0.5-configure_ac.dif | 2 +- pam_krb5-2.2.3-1-setcred-assume-establish.dif | 8 ++++--- pam_krb5-2.3.1-switch-perms-on-refresh.dif | 22 +++++++++---------- pam_krb5-2.3.10-3.tar.bz2 | 3 +++ pam_krb5-2.3.7-1.tar.bz2 | 3 --- pam_krb5-LINGUAS.dif | 8 ++++--- pam_krb5.changes | 15 +++++++++++++ pam_krb5.spec | 11 +++++----- 8 files changed, 46 insertions(+), 26 deletions(-) create mode 100644 pam_krb5-2.3.10-3.tar.bz2 delete mode 100644 pam_krb5-2.3.7-1.tar.bz2 diff --git a/pam_krb5-2.2.0-0.5-configure_ac.dif b/pam_krb5-2.2.0-0.5-configure_ac.dif index 7cfd910..08c7661 100644 --- a/pam_krb5-2.2.0-0.5-configure_ac.dif +++ b/pam_krb5-2.2.0-0.5-configure_ac.dif @@ -2,7 +2,7 @@ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac -@@ -95,14 +95,14 @@ AC_SUBST(KRB5_BINDIR) +@@ -109,14 +109,14 @@ AC_SUBST(KRB5_BINDIR) AC_CHECK_LIB(resolv,main) KRB5_CFLAGS=`$KRB5_CONFIG --cflags krb5` KRB5_LIBS=`$KRB5_CONFIG --libs krb5` 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 36fbccd..18bb651 100644 --- a/pam_krb5-2.2.3-1-setcred-assume-establish.dif +++ b/pam_krb5-2.2.3-1-setcred-assume-establish.dif @@ -1,6 +1,8 @@ ---- src/auth.c -+++ src/auth.c 2009/01/29 11:44:07 -@@ -419,6 +419,6 @@ +Index: src/auth.c +=================================================================== +--- src/auth.c.orig ++++ src/auth.c +@@ -554,6 +554,6 @@ pam_sm_setcred(pam_handle_t *pamh, int f if (flags & PAM_DELETE_CRED) { return pam_sm_close_session(pamh, flags, argc, argv); } 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 7bd385f..886d9f1 100644 --- a/pam_krb5-2.3.1-switch-perms-on-refresh.dif +++ b/pam_krb5-2.3.1-switch-perms-on-refresh.dif @@ -1,7 +1,7 @@ -Index: pam_krb5-2.3.1-1/src/auth.c +Index: pam_krb5-2.3.10-3/src/auth.c =================================================================== ---- pam_krb5-2.3.1-1.orig/src/auth.c -+++ pam_krb5-2.3.1-1/src/auth.c +--- pam_krb5-2.3.10-3.orig/src/auth.c ++++ pam_krb5-2.3.10-3/src/auth.c @@ -62,6 +62,7 @@ #include "items.h" #include "kuserok.h" @@ -10,7 +10,7 @@ Index: pam_krb5-2.3.1-1/src/auth.c #include "options.h" #include "prompter.h" #include "sly.h" -@@ -477,6 +478,7 @@ int +@@ -521,6 +522,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.1-1/src/auth.c notice("pam_setcred (%s) called", (flags & PAM_ESTABLISH_CRED)?"establish credential": (flags & PAM_REINITIALIZE_CRED)?"reinitialize credential": -@@ -486,10 +488,22 @@ pam_sm_setcred(pam_handle_t *pamh, int f +@@ -530,10 +532,22 @@ pam_sm_setcred(pam_handle_t *pamh, int f return pam_sm_open_session(pamh, flags, argc, argv); } if (flags & (PAM_REINITIALIZE_CRED | PAM_REFRESH_CRED)) { @@ -43,10 +43,10 @@ Index: pam_krb5-2.3.1-1/src/auth.c return PAM_IGNORE; } } -Index: pam_krb5-2.3.1-1/src/perms.c +Index: pam_krb5-2.3.10-3/src/perms.c =================================================================== ---- pam_krb5-2.3.1-1.orig/src/perms.c -+++ pam_krb5-2.3.1-1/src/perms.c +--- pam_krb5-2.3.10-3.orig/src/perms.c ++++ pam_krb5-2.3.10-3/src/perms.c @@ -87,3 +87,49 @@ _pam_krb5_restore_perms(struct _pam_krb5 } return ret; @@ -97,10 +97,10 @@ Index: pam_krb5-2.3.1-1/src/perms.c + } + return ret; +} -Index: pam_krb5-2.3.1-1/src/perms.h +Index: pam_krb5-2.3.10-3/src/perms.h =================================================================== ---- pam_krb5-2.3.1-1.orig/src/perms.h -+++ pam_krb5-2.3.1-1/src/perms.h +--- pam_krb5-2.3.10-3.orig/src/perms.h ++++ pam_krb5-2.3.10-3/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.10-3.tar.bz2 b/pam_krb5-2.3.10-3.tar.bz2 new file mode 100644 index 0000000..6528e75 --- /dev/null +++ b/pam_krb5-2.3.10-3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a880ca3ce6f3015fc40be0fd98772218afe237fa8a4cf3adfe6173bee9e557d4 +size 430273 diff --git a/pam_krb5-2.3.7-1.tar.bz2 b/pam_krb5-2.3.7-1.tar.bz2 deleted file mode 100644 index 0081d01..0000000 --- a/pam_krb5-2.3.7-1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e55d8a04b296f6ba837aae3d0087b2df4b12aa3a42ab328e7a789b6c69b85c5c -size 419491 diff --git a/pam_krb5-LINGUAS.dif b/pam_krb5-LINGUAS.dif index 2f8fe72..136c7ce 100644 --- a/pam_krb5-LINGUAS.dif +++ b/pam_krb5-LINGUAS.dif @@ -1,6 +1,8 @@ ---- po/LINGUAS -+++ po/LINGUAS 2009/05/20 10:30:47 -@@ -14,3 +14,21 @@ +Index: po/LINGUAS +=================================================================== +--- po/LINGUAS.orig ++++ po/LINGUAS +@@ -15,3 +15,21 @@ ro sr sr@latin sv diff --git a/pam_krb5.changes b/pam_krb5.changes index f8d0d15..5649ad1 100644 --- a/pam_krb5.changes +++ b/pam_krb5.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Mar 4 12:22:27 CET 2010 - mc@suse.de + +- update to version 2.3.10-3 + * add a "chpw_prompt" option + * add a "multiple_ccaches" option + * fine-tune the logic for selecting which key we use for + validating credentials + * fixes + +------------------------------------------------------------------- +Mon Feb 1 12:17:08 UTC 2010 - jengelh@medozas.de + +- package baselibs.conf + ------------------------------------------------------------------- Tue Nov 3 19:09:36 UTC 2009 - coolo@novell.com diff --git a/pam_krb5.spec b/pam_krb5.spec index 46559c6..04bb5a0 100644 --- a/pam_krb5.spec +++ b/pam_krb5.spec @@ -1,7 +1,7 @@ # -# spec file for package pam_krb5 (Version 2.3.7) +# spec file for package pam_krb5 (Version 2.3.10) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: pam_krb5 BuildRequires: krb5-client krb5-devel krb5-server openssl-devel pam-devel -%define PAM_RELEASE 1 +%define PAM_RELEASE 3 License: BSD3c(or similar) ; LGPLv2.0+ Group: Productivity/Networking/Security Provides: pam_krb @@ -30,12 +30,13 @@ AutoReqProv: on Obsoletes: pam_krb5-64bit %endif # -Version: 2.3.7 -Release: 2 +Version: 2.3.10 +Release: 1 Summary: PAM Module for Kerberos Authentication Url: http://sourceforge.net/projects/pam-krb5/ Source: pam_krb5-%{version}-%{PAM_RELEASE}.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