rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update patch for 1.12

Browse Source
This commit is contained in:
Nalin Dahyabhai 2013-10-15 11:06:11 -04:00
parent 15dceb5da6
commit daca172770
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
krb5-1.11-pam.patch → krb5-1.12-pam.patch
View File

@ -11,9 +11,9 @@ When enabled, ksu gains a dependency on libpam.
Originally RT#5939, though it's changed since then to perform the account Originally RT#5939, though it's changed since then to perform the account
and session management before dropping privileges. and session management before dropping privileges.
diff -up krb5-1.8/src/aclocal.m4.pam krb5-1.8/src/aclocal.m4 diff -up krb5/src/aclocal.m4.pam krb5/src/aclocal.m4
--- krb5-1.8/src/aclocal.m4.pam 2009-11-22 12:00:45.000000000 -0500 --- krb5/src/aclocal.m4.pam 2009-11-22 12:00:45.000000000 -0500
+++ krb5-1.8/src/aclocal.m4 2010-03-05 10:48:08.000000000 -0500 +++ krb5/src/aclocal.m4 2010-03-05 10:48:08.000000000 -0500
@@ -1703,3 +1703,70 @@ AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[ @@ -1703,3 +1703,70 @@ AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[
])) ]))
])dnl ])dnl
@ -85,9 +85,9 @@ diff -up krb5-1.8/src/aclocal.m4.pam krb5-1.8/src/aclocal.m4
+AC_SUBST(PAM_MAN) +AC_SUBST(PAM_MAN)
+AC_SUBST(NON_PAM_MAN) +AC_SUBST(NON_PAM_MAN)
+])dnl +])dnl
diff -up krb5-1.8/src/clients/ksu/main.c.pam krb5-1.8/src/clients/ksu/main.c diff -up krb5/src/clients/ksu/main.c.pam krb5/src/clients/ksu/main.c
--- krb5-1.8/src/clients/ksu/main.c.pam 2009-11-02 22:27:56.000000000 -0500 --- krb5/src/clients/ksu/main.c.pam 2009-11-02 22:27:56.000000000 -0500
+++ krb5-1.8/src/clients/ksu/main.c 2010-03-05 10:48:08.000000000 -0500 +++ krb5/src/clients/ksu/main.c 2010-03-05 10:48:08.000000000 -0500
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
* KSU was writen by: Ari Medvinsky, ari@isi.edu * KSU was writen by: Ari Medvinsky, ari@isi.edu
*/ */
@ -247,11 +247,11 @@ diff -up krb5-1.8/src/clients/ksu/main.c.pam krb5-1.8/src/clients/ksu/main.c
exit (1); exit (1);
} }
} }
diff -up krb5-1.8/src/clients/ksu/Makefile.in.pam krb5-1.8/src/clients/ksu/Makefile.in diff -up krb5/src/clients/ksu/Makefile.in.pam krb5/src/clients/ksu/Makefile.in
--- krb5-1.8/src/clients/ksu/Makefile.in.pam 2009-11-22 13:13:29.000000000 -0500 --- krb5/src/clients/ksu/Makefile.in.pam 2009-11-22 13:13:29.000000000 -0500
+++ krb5-1.8/src/clients/ksu/Makefile.in 2010-03-05 11:55:14.000000000 -0500 +++ krb5/src/clients/ksu/Makefile.in 2010-03-05 11:55:14.000000000 -0500
@@ -7,12 +7,14 @@ @@ -7,12 +7,14 @@
PROG_RPATH=$(KRB5_LIBDIR) DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
KSU_LIBS=@KSU_LIBS@ KSU_LIBS=@KSU_LIBS@
+PAM_LIBS=@PAM_LIBS@ +PAM_LIBS=@PAM_LIBS@
@ -284,9 +284,9 @@ diff -up krb5-1.8/src/clients/ksu/Makefile.in.pam krb5-1.8/src/clients/ksu/Makef
clean:: clean::
$(RM) ksu $(RM) ksu
diff -up krb5-1.8/src/clients/ksu/pam.c.pam krb5-1.8/src/clients/ksu/pam.c diff -up krb5/src/clients/ksu/pam.c.pam krb5/src/clients/ksu/pam.c
--- krb5-1.8/src/clients/ksu/pam.c.pam 2010-03-05 10:48:08.000000000 -0500 --- krb5/src/clients/ksu/pam.c.pam 2010-03-05 10:48:08.000000000 -0500
+++ krb5-1.8/src/clients/ksu/pam.c 2010-03-05 10:48:08.000000000 -0500 +++ krb5/src/clients/ksu/pam.c 2010-03-05 10:48:08.000000000 -0500
@@ -0,0 +1,389 @@ @@ -0,0 +1,389 @@
+/* +/*
+ * src/clients/ksu/pam.c + * src/clients/ksu/pam.c
@ -677,9 +677,9 @@ diff -up krb5-1.8/src/clients/ksu/pam.c.pam krb5-1.8/src/clients/ksu/pam.c
+ return ret; + return ret;
+} +}
+#endif +#endif
diff -up krb5-1.8/src/clients/ksu/pam.h.pam krb5-1.8/src/clients/ksu/pam.h diff -up krb5/src/clients/ksu/pam.h.pam krb5/src/clients/ksu/pam.h
--- krb5-1.8/src/clients/ksu/pam.h.pam 2010-03-05 10:48:08.000000000 -0500 --- krb5/src/clients/ksu/pam.h.pam 2010-03-05 10:48:08.000000000 -0500
+++ krb5-1.8/src/clients/ksu/pam.h 2010-03-05 10:48:08.000000000 -0500 +++ krb5/src/clients/ksu/pam.h 2010-03-05 10:48:08.000000000 -0500
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
+/* +/*
+ * src/clients/ksu/pam.h + * src/clients/ksu/pam.h
@ -738,9 +738,9 @@ diff -up krb5-1.8/src/clients/ksu/pam.h.pam krb5-1.8/src/clients/ksu/pam.h
+int appl_pam_cred_init(void); +int appl_pam_cred_init(void);
+void appl_pam_cleanup(void); +void appl_pam_cleanup(void);
+#endif +#endif
diff -up krb5-1.8/src/configure.in.pam krb5-1.8/src/configure.in diff -up krb5/src/configure.in.pam krb5/src/configure.in
--- krb5-1.8/src/configure.in.pam 2009-12-31 18:13:56.000000000 -0500 --- krb5/src/configure.in.pam 2009-12-31 18:13:56.000000000 -0500
+++ krb5-1.8/src/configure.in 2010-03-05 10:48:08.000000000 -0500 +++ krb5/src/configure.in 2010-03-05 10:48:08.000000000 -0500
@@ -1051,6 +1051,8 @@ if test "$ac_cv_lib_socket" = "yes" -a " @@ -1051,6 +1051,8 @@ if test "$ac_cv_lib_socket" = "yes" -a "
AC_PATH_PROG(GROFF, groff) AC_PATH_PROG(GROFF, groff)

2
krb5.spec
View File

@ -83,7 +83,7 @@ Patch30: krb5-1.3.4-send-pr-tempfile.patch
Patch39: krb5-1.8-api.patch Patch39: krb5-1.8-api.patch
Patch56: krb5-1.10-doublelog.patch Patch56: krb5-1.10-doublelog.patch
Patch59: krb5-1.10-kpasswd_tcp.patch Patch59: krb5-1.10-kpasswd_tcp.patch
Patch60: krb5-1.11-pam.patch Patch60: krb5-1.12-pam.patch
Patch63: krb5-1.11-selinux-label.patch Patch63: krb5-1.11-selinux-label.patch
Patch71: krb5-1.11-dirsrv-accountlock.patch Patch71: krb5-1.11-dirsrv-accountlock.patch
Patch86: krb5-1.9-debuginfo.patch Patch86: krb5-1.9-debuginfo.patch