rpms/pam/devel pam-0.99.5.0-redhat-modules.patch, NONE, 1.1 pam-0.99.5.0-selinux-drop-multiple.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 pam.spec, 1.118, 1.119 sources, 1.38, 1.39 pam-0.99.2.1-selinux-drop-multiple.patch, 1.1, NONE pam-0.99.4.0-console-no-var-access.patch, 1.1, NONE pam-0.99.4.0-redhat-modules.patch, 1.1, NONE pam-0.99.4.0-timestamp-no-hmactest.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jun 30 09:20:36 UTC 2006
Author: tmraz
Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3093
Modified Files:
.cvsignore pam.spec sources
Added Files:
pam-0.99.5.0-redhat-modules.patch
pam-0.99.5.0-selinux-drop-multiple.patch
Removed Files:
pam-0.99.2.1-selinux-drop-multiple.patch
pam-0.99.4.0-console-no-var-access.patch
pam-0.99.4.0-redhat-modules.patch
pam-0.99.4.0-timestamp-no-hmactest.patch
Log Message:
* Fri Jun 30 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-1
- updated to a new upstream release
- added service as value to be matched and list matching to
pam_succeed_if
pam-0.99.5.0-redhat-modules.patch:
configure.in | 4 ++++
libpam/libpam.map | 11 +++++++++++
modules/Makefile.am | 2 ++
3 files changed, 17 insertions(+)
--- NEW FILE pam-0.99.5.0-redhat-modules.patch ---
--- Linux-PAM-0.99.5.0/configure.in.redhat-modules 2006-06-28 09:25:02.000000000 +0200
+++ Linux-PAM-0.99.5.0/configure.in 2006-06-30 10:24:35.000000000 +0200
@@ -492,6 +492,10 @@
libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \
po/Makefile.in \
modules/Makefile \
+ modules/pam_chroot/Makefile modules/pam_console/Makefile \
+ modules/pam_loginuid/Makefile modules/pam_postgresok/Makefile \
+ modules/pam_rps/Makefile modules/pam_stack/Makefile \
+ modules/pam_timestamp/Makefile modules/pam_tally2/Makefile \
modules/pam_access/Makefile modules/pam_cracklib/Makefile \
modules/pam_debug/Makefile modules/pam_deny/Makefile \
modules/pam_echo/Makefile modules/pam_env/Makefile \
--- Linux-PAM-0.99.5.0/libpam/libpam.map.redhat-modules 2006-06-14 13:49:10.000000000 +0200
+++ Linux-PAM-0.99.5.0/libpam/libpam.map 2006-06-30 10:24:35.000000000 +0200
@@ -45,3 +45,14 @@
pam_modutil_read;
pam_modutil_write;
};
+
+LIBPAM_INTERNAL_DONTUSE_1.0 {
+ global:
+ _pam_dispatch;
+ _pam_drop_env;
+ _pam_free_handlers;
+ _pam_init_handlers;
+ _pam_make_env;
+ _pam_start_handlers;
+ _pam_strdup;
+};
--- Linux-PAM-0.99.5.0/modules/Makefile.am.redhat-modules 2006-06-27 16:21:08.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/Makefile.am 2006-06-30 10:27:02.000000000 +0200
@@ -3,6 +3,8 @@
#
SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
+ pam_chroot pam_console pam_loginuid pam_postgresok pam_rps \
+ pam_stack pam_timestamp pam_tally2 \
pam_env pam_filter pam_ftp pam_group pam_issue pam_keyinit \
pam_lastlog pam_limits pam_listfile pam_localuser pam_mail \
pam_mkhomedir pam_motd pam_nologin pam_permit pam_rhosts pam_rootok \
pam-0.99.5.0-selinux-drop-multiple.patch:
pam_selinux.8.xml | 12 ----------
pam_selinux.c | 64 ++----------------------------------------------------
2 files changed, 3 insertions(+), 73 deletions(-)
--- NEW FILE pam-0.99.5.0-selinux-drop-multiple.patch ---
--- Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.8.xml.drop-multiple 2006-06-18 10:26:59.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.8.xml 2006-06-30 10:29:59.000000000 +0200
@@ -93,18 +93,6 @@
</varlistentry>
<varlistentry>
<term>
- <option>multiple</option>
- </term>
- <listitem>
- <para>
- Tells pam_selinux.so to allow the user to select the
- security context they will login with, if the user has
- more than one role.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
<option>open</option>
</term>
<listitem>
--- Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c.drop-multiple 2006-06-30 10:28:37.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c 2006-06-30 10:28:37.000000000 +0200
@@ -89,56 +89,6 @@
}
static security_context_t
-select_context (pam_handle_t *pamh, security_context_t* contextlist,
- int debug)
-{
- char *responses;
- char *text=calloc(PATH_MAX,1);
-
- if (text == NULL)
- return (security_context_t) strdup(contextlist[0]);
-
- snprintf(text, PATH_MAX,
- _("Your default context is %s. \n"), contextlist[0]);
- send_text(pamh,text,debug);
- free(text);
- query_response(pamh,_("Do you want to choose a different one? [n]"),
- &responses,debug);
- if (responses && ((responses[0] == 'y') ||
- (responses[0] == 'Y')))
- {
- int choice=0;
- int i;
- const char *prompt=_("Enter number of choice: ");
- int len=strlen(prompt);
- char buf[PATH_MAX];
-
- _pam_drop(responses);
- for (i = 0; contextlist[i]; i++) {
- len+=strlen(contextlist[i]) + 10;
- }
- text=calloc(len,1);
- for (i = 0; contextlist[i]; i++) {
- snprintf(buf, PATH_MAX,
- "[%d] %s\n", i+1, contextlist[i]);
- strncat(text,buf,len);
- }
- strcat(text,prompt);
- while ((choice < 1) || (choice > i)) {
- query_response(pamh,text,&responses,debug);
- choice = strtol (responses, NULL, 10);
- _pam_drop(responses);
- }
- free(text);
- return (security_context_t) strdup(contextlist[choice-1]);
- }
- else if (responses)
- _pam_drop(responses);
-
- return (security_context_t) strdup(contextlist[0]);
-}
-
-static security_context_t
manual_context (pam_handle_t *pamh, const char *user, int debug)
{
security_context_t newcon;
@@ -321,7 +271,7 @@
int argc, const char **argv)
{
int i, debug = 0, ttys=1, has_tty=isatty(0);
- int verbose=0, multiple=0, close_session=0;
+ int verbose=0, close_session=0;
int ret = 0;
security_context_t* contextlist = NULL;
int num_contexts = 0;
@@ -341,9 +291,6 @@
if (strcmp(argv[i], "verbose") == 0) {
verbose = 1;
}
- if (strcmp(argv[i], "multiple") == 0) {
- multiple = 1;
- }
if (strcmp(argv[i], "close") == 0) {
close_session = 1;
}
@@ -376,13 +323,8 @@
free(level);
}
if (num_contexts > 0) {
- if (multiple && (num_contexts > 1) && has_tty) {
- user_context = select_context(pamh,contextlist, debug);
- freeconary(contextlist);
- } else {
- user_context = (security_context_t) strdup(contextlist[0]);
- freeconary(contextlist);
- }
+ user_context = (security_context_t) strdup(contextlist[0]);
+ freeconary(contextlist);
} else {
if (has_tty) {
user_context = manual_context(pamh,username,debug);
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 10 May 2006 14:16:34 -0000 1.36
+++ .cvsignore 30 Jun 2006 09:20:33 -0000 1.37
@@ -1,3 +1,3 @@
db-4.3.29.tar.gz
-pam-redhat-0.99.5-1.tar.bz2
-Linux-PAM-0.99.4.0.tar.bz2
+Linux-PAM-0.99.5.0.tar.bz2
+pam-redhat-0.99.6-1.tar.bz2
Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- pam.spec 8 Jun 2006 21:18:21 -0000 1.118
+++ pam.spec 30 Jun 2006 09:20:33 -0000 1.119
@@ -6,12 +6,12 @@
%define pwdb_version 0.62
%define db_version 4.3.29
%define db_conflicting_version 4.4.0
-%define pam_redhat_version 0.99.5-1
+%define pam_redhat_version 0.99.6-1
Summary: A security tool which provides authentication for applications
Name: pam
-Version: 0.99.4.0
-Release: 5
+Version: 0.99.5.0
+Release: 1%{?dist}
License: GPL or BSD
Group: System Environment/Base
Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -24,18 +24,15 @@
Source8: dlopen.sh
Source9: system-auth.5
Source10: config-util.5
-Patch1: pam-0.99.4.0-redhat-modules.patch
+Patch1: pam-0.99.5.0-redhat-modules.patch
Patch21: pam-0.78-unix-hpux-aging.patch
Patch28: pam-0.75-sgml2latex.patch
Patch34: pam-0.99.4.0-dbpam.patch
Patch70: pam-0.99.2.1-selinux-nofail.patch
-Patch80: pam-0.99.2.1-selinux-drop-multiple.patch
+Patch80: pam-0.99.5.0-selinux-drop-multiple.patch
Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch
Patch82: pam-0.99.3.0-tally-fail-close.patch
-Patch83: pam-0.99.4.0-tally-large-uid.patch
-Patch84: pam-0.99.4.0-console-no-var-access.patch
-Patch85: pam-0.99.4.0-timestamp-no-hmactest.patch
-Patch90: pam_namespace-10.patch
+Patch83: pam-0.99.4.0-succif-service.patch
BuildRoot: %{_tmppath}/%{name}-root
Requires: cracklib, cracklib-dicts >= 2.8
@@ -95,10 +92,7 @@
%patch80 -p1 -b .drop-multiple
%patch81 -p1 -b .try-first-pass
%patch82 -p1 -b .fail-close
-%patch83 -p1 -b .large-uid
-%patch84 -p1 -b .no-var-access
-%patch85 -p1 -b .no-hmactest
-%patch90 -p1 -b .namespace
+%patch83 -p1 -b .service
for readme in modules/pam_*/README ; do
cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -299,6 +293,7 @@
/%{_lib}/security/pam_ftp.so
/%{_lib}/security/pam_group.so
/%{_lib}/security/pam_issue.so
+/%{_lib}/security/pam_keyinit.so
/%{_lib}/security/pam_lastlog.so
/%{_lib}/security/pam_limits.so
/%{_lib}/security/pam_listfile.so
@@ -311,6 +306,7 @@
/%{_lib}/security/pam_nologin.so
/%{_lib}/security/pam_permit.so
/%{_lib}/security/pam_postgresok.so
+/%{_lib}/security/pam_rhosts.so
/%{_lib}/security/pam_rhosts_auth.so
/%{_lib}/security/pam_rootok.so
/%{_lib}/security/pam_rps.so
@@ -363,6 +359,11 @@
%{_libdir}/libpam_misc.so
%changelog
+* Fri Jun 30 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-1
+- updated to a new upstream release
+- added service as value to be matched and list matching to
+ pam_succeed_if
+
* Thu Jun 8 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-5
- updated pam_namespace with latest patch by Janak Desai
- merged pam_namespace patches
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 10 May 2006 14:16:34 -0000 1.38
+++ sources 30 Jun 2006 09:20:33 -0000 1.39
@@ -1,3 +1,3 @@
13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz
-e2edde7861c48195728bc531e5a277e0 pam-redhat-0.99.5-1.tar.bz2
-267ea71253615342261f9fc486d06647 Linux-PAM-0.99.4.0.tar.bz2
+dbc8608b2a9bc6b8cf50dd1fbc68cf3b Linux-PAM-0.99.5.0.tar.bz2
+2dc76a335ddf9e4259aa4e00e5ebaf61 pam-redhat-0.99.6-1.tar.bz2
--- pam-0.99.2.1-selinux-drop-multiple.patch DELETED ---
--- pam-0.99.4.0-console-no-var-access.patch DELETED ---
--- pam-0.99.4.0-redhat-modules.patch DELETED ---
--- pam-0.99.4.0-timestamp-no-hmactest.patch DELETED ---
More information about the fedora-cvs-commits
mailing list