From 8a21b99afe9587ab043fcc8ee6b7a28c7d435a55 Mon Sep 17 00:00:00 2001 From: Jan Lentfer Date: Sat, 16 Jun 2012 12:24:32 +0200 Subject: [PATCH] pam: Update 0.99.10.0. The prior verion in base system did not build with the new version of bison and flex. Signed-off-by: Michael Tremer --- config/rootfiles/common/pam | 68 +++++++++++++++++++++---- lfs/pam | 9 ++-- src/patches/pam-0.99.3.0-hostname.patch | 50 ------------------ 3 files changed, 63 insertions(+), 64 deletions(-) delete mode 100644 src/patches/pam-0.99.3.0-hostname.patch diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam index 3472453fcb..a14302aab8 100644 --- a/config/rootfiles/common/pam +++ b/config/rootfiles/common/pam @@ -1,3 +1,4 @@ +#etc/environment etc/pam.d #etc/pam.d/ftp #etc/pam.d/imap @@ -9,12 +10,14 @@ etc/security #etc/security/access.conf #etc/security/group.conf #etc/security/limits.conf +#etc/security/limits.d +#etc/security/namespace.d #etc/security/pam_env.conf #etc/security/time.conf lib/libpam.so.0 -lib/libpam.so.0.81.3 +lib/libpam.so.0.81.10 lib/libpam_misc.so.0 -lib/libpam_misc.so.0.81.2 +lib/libpam_misc.so.0.81.3 lib/libpamc.so.0 lib/libpamc.so.0.81.0 #lib/security @@ -30,6 +33,8 @@ lib/security/pam_deny.so lib/security/pam_env.so #lib/security/pam_exec.la lib/security/pam_exec.so +#lib/security/pam_faildelay.la +lib/security/pam_faildelay.so #lib/security/pam_filter #lib/security/pam_filter.la #lib/security/pam_filter.so @@ -40,6 +45,8 @@ lib/security/pam_exec.so lib/security/pam_group.so #lib/security/pam_issue.la lib/security/pam_issue.so +#lib/security/pam_keyinit.la +lib/security/pam_keyinit.so #lib/security/pam_lastlog.la #lib/security/pam_lastlog.so #lib/security/pam_limits.la @@ -48,6 +55,8 @@ lib/security/pam_limits.so #lib/security/pam_listfile.so #lib/security/pam_localuser.la #lib/security/pam_localuser.so +#lib/security/pam_loginuid.la +lib/security/pam_loginuid.so #lib/security/pam_mail.la lib/security/pam_mail.so #lib/security/pam_mkhomedir.la @@ -58,8 +67,8 @@ lib/security/pam_mail.so lib/security/pam_nologin.so #lib/security/pam_permit.la lib/security/pam_permit.so -#lib/security/pam_rhosts_auth.la -#lib/security/pam_rhosts_auth.so +#lib/security/pam_rhosts.la +lib/security/pam_rhosts.so #lib/security/pam_rootok.la #lib/security/pam_rootok.so #lib/security/pam_securetty.la @@ -87,6 +96,7 @@ lib/security/pam_unix.so #lib/security/pam_xauth.la #lib/security/pam_xauth.so lib/security/unix_chkpwd +lib/security/unix_update #sbin/pam_tally #usr/include/security #usr/include/security/_pam_compat.h @@ -96,7 +106,6 @@ lib/security/unix_chkpwd #usr/include/security/pam_client.h #usr/include/security/pam_ext.h #usr/include/security/pam_filter.h -#usr/include/security/pam_malloc.h #usr/include/security/pam_misc.h #usr/include/security/pam_modules.h #usr/include/security/pam_modutil.h @@ -106,10 +115,11 @@ usr/lib/libpam.so usr/lib/libpam_misc.so #usr/lib/libpamc.la usr/lib/libpamc.so -#usr/share/doc/Linux-PAM-0.99.4.0 -#usr/share/doc/Linux-PAM-0.99.4.0/spec -#usr/share/doc/Linux-PAM-0.99.4.0/spec/draft-morgan-pam-current.txt -#usr/share/doc/Linux-PAM-0.99.4.0/spec/rfc86.0.txt +#usr/share/doc/Linux-PAM +#usr/share/doc/Linux-PAM/draft-morgan-pam-current.txt +#usr/share/doc/Linux-PAM/index.html +#usr/share/doc/Linux-PAM/rfc86.0.txt +#usr/share/man/man3/misc_conv.3 #usr/share/man/man3/pam.3 #usr/share/man/man3/pam_acct_mgmt.3 #usr/share/man/man3/pam_authenticate.3 @@ -125,6 +135,9 @@ usr/lib/libpamc.so #usr/share/man/man3/pam_getenv.3 #usr/share/man/man3/pam_getenvlist.3 #usr/share/man/man3/pam_info.3 +#usr/share/man/man3/pam_misc_drop_env.3 +#usr/share/man/man3/pam_misc_paste_env.3 +#usr/share/man/man3/pam_misc_setenv.3 #usr/share/man/man3/pam_open_session.3 #usr/share/man/man3/pam_prompt.3 #usr/share/man/man3/pam_putenv.3 @@ -132,6 +145,11 @@ usr/lib/libpamc.so #usr/share/man/man3/pam_set_item.3 #usr/share/man/man3/pam_setcred.3 #usr/share/man/man3/pam_sm_acct_mgmt.3 +#usr/share/man/man3/pam_sm_authenticate.3 +#usr/share/man/man3/pam_sm_chauthtok.3 +#usr/share/man/man3/pam_sm_close_session.3 +#usr/share/man/man3/pam_sm_open_session.3 +#usr/share/man/man3/pam_sm_setcred.3 #usr/share/man/man3/pam_start.3 #usr/share/man/man3/pam_strerror.3 #usr/share/man/man3/pam_syslog.3 @@ -139,21 +157,53 @@ usr/lib/libpamc.so #usr/share/man/man3/pam_vinfo.3 #usr/share/man/man3/pam_vprompt.3 #usr/share/man/man3/pam_vsyslog.3 +#usr/share/man/man3/pam_xauth_data.3 #usr/share/man/man5/access.conf.5 +#usr/share/man/man5/group.conf.5 +#usr/share/man/man5/limits.conf.5 #usr/share/man/man5/pam.conf.5 #usr/share/man/man5/pam.d.5 #usr/share/man/man5/pam_env.conf.5 +#usr/share/man/man5/time.conf.5 #usr/share/man/man8/PAM.8 #usr/share/man/man8/pam.8 #usr/share/man/man8/pam_access.8 #usr/share/man/man8/pam_cracklib.8 +#usr/share/man/man8/pam_debug.8 #usr/share/man/man8/pam_deny.8 #usr/share/man/man8/pam_echo.8 #usr/share/man/man8/pam_env.8 #usr/share/man/man8/pam_exec.8 +#usr/share/man/man8/pam_faildelay.8 +#usr/share/man/man8/pam_filter.8 +#usr/share/man/man8/pam_ftp.8 +#usr/share/man/man8/pam_group.8 +#usr/share/man/man8/pam_issue.8 +#usr/share/man/man8/pam_keyinit.8 +#usr/share/man/man8/pam_lastlog.8 +#usr/share/man/man8/pam_limits.8 +#usr/share/man/man8/pam_listfile.8 #usr/share/man/man8/pam_localuser.8 +#usr/share/man/man8/pam_loginuid.8 +#usr/share/man/man8/pam_mail.8 +#usr/share/man/man8/pam_mkhomedir.8 +#usr/share/man/man8/pam_motd.8 #usr/share/man/man8/pam_nologin.8 +#usr/share/man/man8/pam_permit.8 +#usr/share/man/man8/pam_rhosts.8 +#usr/share/man/man8/pam_rootok.8 #usr/share/man/man8/pam_securetty.8 +#usr/share/man/man8/pam_shells.8 #usr/share/man/man8/pam_succeed_if.8 +#usr/share/man/man8/pam_tally.8 +#usr/share/man/man8/pam_time.8 +#usr/share/man/man8/pam_tty_audit.8 +#usr/share/man/man8/pam_umask.8 +#usr/share/man/man8/pam_unix.8 +#usr/share/man/man8/pam_userdb.8 +#usr/share/man/man8/pam_warn.8 +#usr/share/man/man8/pam_wheel.8 #usr/share/man/man8/pam_xauth.8 #usr/share/man/man8/unix_chkpwd.8 +#usr/share/man/man8/unix_update.8 +#var/run/sepermit diff --git a/lfs/pam b/lfs/pam index 6daca32f92..75557a4996 100644 --- a/lfs/pam +++ b/lfs/pam @@ -24,7 +24,7 @@ include Config -VER = 0.99.4.0 +VER = 0.99.10.0 THISAPP = Linux-PAM-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 267ea71253615342261f9fc486d06647 +$(DL_FILE)_MD5 = be4dd1d34ac5933408e13e48f3eb710a install : $(TARGET) @@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pam-0.99.3.0-hostname.patch cd $(DIR_APP) && ./configure --libdir=/usr/lib \ --sbindir=/lib/security \ --enable-securedir=/lib/security \ @@ -81,9 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod -v 4755 /lib/security/unix_chkpwd mv -v /lib/security/pam_tally /sbin mv -v /usr/lib/libpam*.so.0* /lib - ln -v -sf ../../lib/libpam.so.0.81.3 /usr/lib/libpam.so + ln -v -sf ../../lib/libpam.so.0.81.10 /usr/lib/libpam.so ln -v -sf ../../lib/libpamc.so.0.81.0 /usr/lib/libpamc.so - ln -v -sf ../../lib/libpam_misc.so.0.81.2 /usr/lib/libpam_misc.so + ln -v -sf ../../lib/libpam_misc.so.0.81.3 /usr/lib/libpam_misc.so -mkdir -p /etc/pam.d cp $(DIR_SRC)/config/pam/* /etc/pam.d chown root.root -R /etc/pam.d diff --git a/src/patches/pam-0.99.3.0-hostname.patch b/src/patches/pam-0.99.3.0-hostname.patch deleted file mode 100644 index 119de2c0ac..0000000000 --- a/src/patches/pam-0.99.3.0-hostname.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- Linux-PAM-0.99.3.0/configure.in.host-name-max 2005-12-12 19:56:27.000000000 +0300 -+++ Linux-PAM-0.99.3.0/configure.in 2006-01-28 01:31:58.000000000 +0300 -@@ -395,6 +395,46 @@ - AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) - AC_CHECK_FUNCS(getgrouplist getline getdelim) - -+AH_BOTTOM([#ifndef HAVE_HOST_NAME_MAX -+ #ifdef HAVE_MAXHOSTNAME -+ #include -+ #define HOST_NAME_MAX MAXHOSTNAME -+ #else -+ #define HOST_NAME_MAX 64 -+ #endif -+#endif]) -+ac_cv_maxhostname_defined=no -+AC_CACHE_CHECK([[whether HOST_NAME_MAX is defined in limits.h]], -+[ac_cv_host_name_max_defined], -+[AC_COMPILE_IFELSE([[#include -+ -+char name[HOST_NAME_MAX]; -+ -+int main() -+{ -+ return 0; -+}]], [ac_cv_host_name_max_defined=yes -+ AC_MSG_RESULT([ac_cv_host_name_max_defined])], -+[ac_cv_host_name_max_defined=no -+AC_MSG_RESULT([ac_cv_host_name_max_defined]) -+AC_CACHE_CHECK([[whether MAXHOSTNAME is defined in sys/param.h]], -+[ac_cv_maxhostname_defined], -+[AC_COMPILE_IFELSE([[#include -+ -+char name[MAXHOSTNAME]; -+ -+int main() -+{ -+return 0; -+}]], [ac_cv_maxhostname_defined=yes], [ac_cv_maxhostname_defined=no])]) -+AC_MSG_RESULT([ac_cv_maxhostname_defined])])]) -+if test $ac_cv_host_name_max_defined = yes; then -+AC_DEFINE([HAVE_HOST_NAME_MAX], 1, [Define if system header limits.h defines HOST_NAME_MAX]) -+fi -+if test $ac_cv_maxhostname_defined = yes; then -+AC_DEFINE([HAVE_MAXHOSTNAME], 1, [Define if system header sys/param.h defines MAXHOSTNAME]) -+fi -+ - dnl Checks for programs/utilities - AC_CHECK_PROG(SGML2PS, sgml2ps, yes, no) - AC_CHECK_PROG(SGML2TXT, sgml2txt, yes, no) - -- 2.39.2