pool/pam_krb5
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to version 2.4.4

Browse Source 
* 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

OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_krb5?expand=0&rev=26
This commit is contained in:
Michael Calmer 2013-04-16 09:12:50 +00:00 committed by Git OBS Bridge
parent d1157da9ab
commit c4c1d3c115
10 changed files with 76 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bug-641008_pam_krb5-2.3.11-setcred-log.diff
View File

@ -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.4.4.orig/src/auth.c
+++ pam_krb5-2.3.13-1/src/auth.c +++ pam_krb5-2.4.4/src/auth.c
@@ -532,13 +532,32 @@ int @@ -434,13 +434,32 @@ int
pam_sm_setcred(pam_handle_t *pamh, int flags, pam_sm_setcred(pam_handle_t *pamh, int flags,
int argc, PAM_KRB5_MAYBE_CONST char **argv) 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, return _pam_krb5_open_session(pamh, flags, argc, argv,
"pam_setcred(PAM_ESTABLISH_CRED)", "pam_setcred(PAM_ESTABLISH_CRED)",
_pam_krb5_session_caller_setcred); _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; saved_perms = NULL;

23
pam_krb5-2.2.0-0.5-configure_ac.dif
View File

@ -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

2
pam_krb5-2.2.3-1-setcred-assume-establish.dif
View File

@ -2,7 +2,7 @@ Index: src/auth.c
=================================================================== ===================================================================
--- src/auth.c.orig --- src/auth.c.orig
+++ src/auth.c +++ 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_setcred(PAM_DELETE_CRED)",
_pam_krb5_session_caller_setcred); _pam_krb5_session_caller_setcred);
} }

44
pam_krb5-2.3.1-log-choise.dif
View File

@ -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.4.4.orig/src/acct.c
+++ pam_krb5-2.3.13-1/src/acct.c +++ pam_krb5-2.4.4/src/acct.c
@@ -96,6 +96,10 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int @@ -89,6 +89,10 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int
krb5_free_context(ctx); _pam_krb5_free_ctx(ctx);
return PAM_SERVICE_ERR; return PAM_SERVICE_ERR;
} }
+ if (options->debug) { + 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. */ /* Get information about the user and the user's principal name. */
userinfo = _pam_krb5_user_info_init(ctx, user, options); 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.4.4.orig/src/auth.c
+++ pam_krb5-2.3.13-1/src/auth.c +++ pam_krb5-2.4.4/src/auth.c
@@ -115,9 +115,10 @@ pam_sm_authenticate(pam_handle_t *pamh, @@ -108,9 +108,10 @@ pam_sm_authenticate(pam_handle_t *pamh,
return PAM_SERVICE_ERR; return PAM_SERVICE_ERR;
} }
if (options->debug) { 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); _pam_krb5_set_init_opts(ctx, gic_options, options);
/* Prompt for the password, as we might need to. */ /* 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, pam_sm_setcred(pam_handle_t *pamh, int flags,
int argc, PAM_KRB5_MAYBE_CONST char **argv) 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) { if (flags & PAM_ESTABLISH_CRED) {
return _pam_krb5_open_session(pamh, flags, argc, argv, return _pam_krb5_open_session(pamh, flags, argc, argv,
"pam_setcred(PAM_ESTABLISH_CRED)", "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.4.4.orig/src/password.c
+++ pam_krb5-2.3.13-1/src/password.c +++ pam_krb5-2.4.4/src/password.c
@@ -116,6 +116,16 @@ pam_sm_chauthtok(pam_handle_t *pamh, int @@ -110,6 +110,16 @@ pam_sm_chauthtok(pam_handle_t *pamh, int
krb5_free_context(ctx); _pam_krb5_free_ctx(ctx);
return PAM_SERVICE_ERR; return PAM_SERVICE_ERR;
} }
+ if (options->debug) { + 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); _pam_krb5_set_init_opts(ctx, gic_options, options);
/* Get information about the user and the user's principal name. */ /* 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.4.4.orig/src/session.c
+++ pam_krb5-2.3.13-1/src/session.c +++ pam_krb5-2.4.4/src/session.c
@@ -104,6 +104,10 @@ _pam_krb5_open_session(pam_handle_t *pam @@ -97,6 +97,10 @@ _pam_krb5_open_session(pam_handle_t *pam
krb5_free_context(ctx); _pam_krb5_free_ctx(ctx);
return PAM_SERVICE_ERR; return PAM_SERVICE_ERR;
} }
+ if (options->debug) { + 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 we're in a no-cred-session situation, return. */
if ((!options->cred_session) && if ((!options->cred_session) &&
@@ -358,7 +362,10 @@ _pam_krb5_close_session(pam_handle_t *pa @@ -301,7 +305,10 @@ _pam_krb5_close_session(pam_handle_t *pa
krb5_free_context(ctx); _pam_krb5_free_ctx(ctx);
return PAM_SUCCESS; return PAM_SUCCESS;
} }
- -

26
pam_krb5-2.3.1-switch-perms-on-refresh.dif
View File

@ -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.4.4.orig/src/auth.c
+++ pam_krb5-2.3.13-1/src/auth.c +++ pam_krb5-2.4.4/src/auth.c
@@ -62,6 +62,7 @@ @@ -56,6 +56,7 @@
#include "items.h" #include "items.h"
#include "kuserok.h" #include "kuserok.h"
#include "log.h" #include "log.h"
@ -10,7 +10,7 @@ Index: pam_krb5-2.3.13-1/src/auth.c
#include "options.h" #include "options.h"
#include "prompter.h" #include "prompter.h"
#include "session.h" #include "session.h"
@@ -531,6 +532,7 @@ int @@ -433,6 +434,7 @@ int
pam_sm_setcred(pam_handle_t *pamh, int flags, pam_sm_setcred(pam_handle_t *pamh, int flags,
int argc, PAM_KRB5_MAYBE_CONST char **argv) 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", notice("pam_setcred (%s) called",
(flags & PAM_ESTABLISH_CRED)?"establish credential": (flags & PAM_ESTABLISH_CRED)?"establish credential":
(flags & PAM_REINITIALIZE_CRED)?"reinitialize 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); _pam_krb5_session_caller_setcred);
} }
if (flags & (PAM_REINITIALIZE_CRED | PAM_REFRESH_CRED)) { 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; 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.4.4.orig/src/perms.c
+++ pam_krb5-2.3.13-1/src/perms.c +++ pam_krb5-2.4.4/src/perms.c
@@ -87,3 +87,49 @@ _pam_krb5_restore_perms(struct _pam_krb5 @@ -89,3 +89,49 @@ _pam_krb5_restore_perms(struct _pam_krb5
} }
return ret; return ret;
} }
@ -97,10 +97,10 @@ Index: pam_krb5-2.3.13-1/src/perms.c
+ } + }
+ return ret; + 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.4.4.orig/src/perms.h
+++ pam_krb5-2.3.13-1/src/perms.h +++ pam_krb5-2.4.4/src/perms.h
@@ -37,4 +37,7 @@ struct _pam_krb5_perms; @@ -37,4 +37,7 @@ struct _pam_krb5_perms;
struct _pam_krb5_perms *_pam_krb5_switch_perms(void); struct _pam_krb5_perms *_pam_krb5_switch_perms(void);
int _pam_krb5_restore_perms(struct _pam_krb5_perms *saved); int _pam_krb5_restore_perms(struct _pam_krb5_perms *saved);

3
pam_krb5-2.3.13-1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bcb8fd3a440a07738851bb5f726ccdf618d95ddf4dd57e026de6718b7b1ac157
size 432029

3
pam_krb5-2.4.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82d2cd1b5460b061e849a60bdea5d30d70054cc3d4f24f98132b9af73b15323d
size 443085

18
pam_krb5.changes
View File

@ -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 Thu Mar 7 13:38:09 UTC 2013 - cfarrell@suse.com

32
pam_krb5.spec
View File

@ -30,22 +30,20 @@ Provides: pam_krb
Obsoletes: pam_krb5-64bit Obsoletes: pam_krb5-64bit
%endif %endif
# #
Version: 2.3.13 Version: 2.4.4
Release: 0 Release: 0
Summary: PAM Module for Kerberos Authentication Summary: PAM Module for Kerberos Authentication
License: BSD-3-Clause or LGPL-2.1+ License: BSD-3-Clause or LGPL-2.1+
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Url: http://sourceforge.net/projects/pam-krb5/ 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 Source2: pam_krb5-po.tar.gz
Source3: baselibs.conf Source3: baselibs.conf
Patch1: pam_krb5-2.2.0-0.5-configure_ac.dif Patch1: pam_krb5-2.3.1-log-choise.dif
Patch2: pam_krb5-2.3.1-log-choise.dif Patch2: pam_krb5-LINGUAS.dif
Patch3: pam_krb5-LINGUAS.dif Patch3: pam_krb5-2.3.1-switch-perms-on-refresh.dif
Patch4: pam_krb5-2.3.1-switch-perms-on-refresh.dif Patch4: pam_krb5-2.2.3-1-setcred-assume-establish.dif
Patch5: pam_krb5-2.2.3-1-setcred-assume-establish.dif Patch5: bug-641008_pam_krb5-2.3.11-setcred-log.diff
Patch6: bug-641008_pam_krb5-2.3.11-setcred-log.diff
Patch7: use-urandom-for-tests.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -53,15 +51,13 @@ This PAM module supports authentication against a Kerberos KDC. It also
supports updating your Kerberos password. supports updating your Kerberos password.
%prep %prep
%setup -q -n pam_krb5-%{version}-%{PAM_RELEASE} %setup -q -n pam_krb5-%{version}
%setup -a 2 -T -D -n pam_krb5-%{version}-%{PAM_RELEASE} %setup -a 2 -T -D -n pam_krb5-%{version}
%patch1 %patch1 -p1
%patch2 -p1 %patch2
%patch3 %patch3 -p1
%patch4 -p1 %patch4
%patch5 %patch5 -p1
%patch6 -p1
%patch7 -p1
%build %build
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE " \ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE " \

13
use-urandom-for-tests.dif
View File

@ -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