From 1ba40631bfb86d3e7e49e505eecf41e5703804ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 28 Feb 2008 22:44:06 +0000 Subject: [PATCH] - update pam-redhat module tarball - update internal db4 --- .cvsignore | 4 +- pam-0.99.7.0-redhat-modules.patch | 5 +- pam-0.99.8.1-console-hal-handled.patch | 71 ------------------------- pam-0.99.8.1-console-mfd-scanners.patch | 12 ----- pam.spec | 22 ++++---- sources | 4 +- 6 files changed, 18 insertions(+), 100 deletions(-) delete mode 100644 pam-0.99.8.1-console-hal-handled.patch delete mode 100644 pam-0.99.8.1-console-mfd-scanners.patch diff --git a/.cvsignore b/.cvsignore index 7928361..bdb731a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1,5 @@ *.src.rpm *.tar.bz2 -pam-redhat-0.99.8-1.tar.bz2 -db-4.6.19.tar.gz Linux-PAM-0.99.10.0.tar.bz2 +pam-redhat-0.99.9-1.tar.bz2 +db-4.6.21.tar.gz diff --git a/pam-0.99.7.0-redhat-modules.patch b/pam-0.99.7.0-redhat-modules.patch index 7601ac6..5e7c83c 100644 --- a/pam-0.99.7.0-redhat-modules.patch +++ b/pam-0.99.7.0-redhat-modules.patch @@ -1,12 +1,11 @@ --- 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 @@ +@@ -492,6 +492,9 @@ libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \ po/Makefile.in \ modules/Makefile \ + modules/pam_chroot/Makefile modules/pam_console/Makefile \ + modules/pam_postgresok/Makefile \ -+ modules/pam_rps/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 \ @@ -17,7 +16,7 @@ # SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \ -+ pam_chroot pam_console pam_postgresok pam_rps \ ++ pam_chroot pam_console pam_postgresok \ + 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 \ diff --git a/pam-0.99.8.1-console-hal-handled.patch b/pam-0.99.8.1-console-hal-handled.patch deleted file mode 100644 index f20cbc4..0000000 --- a/pam-0.99.8.1-console-hal-handled.patch +++ /dev/null @@ -1,71 +0,0 @@ -Written-by: David Zeuthen -Reviewed-by: Tomas Mraz -diff -up Linux-PAM-0.99.8.1/modules/pam_console/50-default.perms.hal-handled Linux-PAM-0.99.8.1/modules/pam_console/50-default.perms ---- Linux-PAM-0.99.8.1/modules/pam_console/50-default.perms.hal-handled 2007-07-23 14:48:41.000000000 +0200 -+++ Linux-PAM-0.99.8.1/modules/pam_console/50-default.perms 2007-08-22 16:25:54.000000000 +0200 -@@ -1,65 +1,32 @@ - # device classes -- these are shell-style globs --=/dev/fd[0-1]* \ -- /dev/floppy* /mnt/floppy* --=/dev/dsp* /dev/audio* /dev/midi* \ -- /dev/mixer* /dev/sequencer* \ -- /dev/sound/* /dev/beep \ -- /dev/snd/* /dev/adsp* --=/dev/cdrom* /dev/cdroms/* /dev/cdwriter* /mnt/cdrom* - =/dev/pilot --=/mnt/jaz* --=/mnt/pocketzip* /mnt/zip* /dev/zip* --=/dev/ls120 /mnt/ls120* - =/dev/scanner* /dev/usb/scanner* - =/dev/usb/rio500 --=/mnt/camera* /dev/usb/dc2xx* /dev/usb/mdc800* --=/mnt/memstick* --=/mnt/flash* /dev/flash* --=/mnt/diskonkey* --=/mnt/microdrive* - =/dev/fb /dev/fb[0-9]* \ - /dev/fb/* - =/dev/kbd - =/dev/js[0-9]* --=/dev/video* /dev/radio* /dev/winradio* /dev/vtx* /dev/vbi* \ -- /dev/video/* - =/dev/gpmctl - =/dev/nvidia* /dev/3dfx* /dev/dri/card* - =/dev/apm_bios - =/dev/pmu - =/dev/rfcomm* --=/dev/raw1394 - =/dev/ircomm* - =/dev/dvb/adapter*/* --=/dev/iidc* /dev/vendorfw* /dev/avc* - - # permission definitions -- 0660 0660 root.floppy -- 0600 0600 root -- 0600 0660 root.disk - 0600 0660 root.uucp -- 0600 0660 root.disk -- 0600 0660 root.disk -- 0600 0660 root.disk - 0600 0600 root -- 0600 0600 root.disk -- 0600 0600 root.disk -- 0600 0600 root.disk -- 0600 0660 root.disk -- 0600 0660 root.disk - 0600 0600 root - 0600 0600 root - 0600 0600 root -- 0600 0600 root - 0700 0700 root - 0600 0600 root - 0600 0600 root - 0600 0600 root - 0600 0600 root -- 0600 0600 root - 0600 0600 root - 0600 0600 root -- 0600 0600 root - - 0600 /dev/console 0600 root.root - 0600 0600 root diff --git a/pam-0.99.8.1-console-mfd-scanners.patch b/pam-0.99.8.1-console-mfd-scanners.patch deleted file mode 100644 index dfab9e8..0000000 --- a/pam-0.99.8.1-console-mfd-scanners.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Linux-PAM-0.99.8.1/modules/pam_console/50-default.perms.multifunc Linux-PAM-0.99.8.1/modules/pam_console/50-default.perms ---- Linux-PAM-0.99.8.1/modules/pam_console/50-default.perms.multifunc 2007-08-22 18:45:17.000000000 +0200 -+++ Linux-PAM-0.99.8.1/modules/pam_console/50-default.perms 2007-08-22 21:26:16.000000000 +0200 -@@ -16,7 +16,7 @@ - - # permission definitions - 0600 0660 root.uucp -- 0600 0600 root -+ 0660 0660 root.lp - 0600 0600 root - 0600 0600 root - 0600 0600 root diff --git a/pam.spec b/pam.spec index c7b8a6c..0e3ee6e 100644 --- a/pam.spec +++ b/pam.spec @@ -1,11 +1,11 @@ -%define db_version 4.6.19 +%define db_version 4.6.21 %define db_conflicting_version 4.7.0 -%define pam_redhat_version 0.99.8-1 +%define pam_redhat_version 0.99.9-1 Summary: A security tool which provides authentication for applications Name: pam Version: 0.99.10.0 -Release: 2%{?dist} +Release: 3%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+, # pam_rhosts_auth module is BSD with advertising @@ -13,8 +13,8 @@ License: BSD and GPLv2+ and BSD with advertising Group: System Environment/Base Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2.sign -Source2: pam-redhat-%{pam_redhat_version}.tar.bz2 -Source4: db-%{db_version}.tar.gz +Source2: https://fedorahosted.org/releases/p/a/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2 +Source4: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz Source5: other.pamd Source6: system-auth.pamd Source7: config-util.pamd @@ -30,8 +30,6 @@ Patch20: pam-0.99.10.0-unix-any-user.patch Patch21: pam-0.99.10.0-unix-audit-failed.patch Patch31: pam-0.99.3.0-cracklib-try-first-pass.patch Patch32: pam-0.99.3.0-tally-fail-close.patch -Patch42: pam-0.99.8.1-console-hal-handled.patch -Patch43: pam-0.99.8.1-console-mfd-scanners.patch %define _sbindir /sbin %define _moduledir /%{_lib}/security @@ -96,6 +94,9 @@ PAM-aware applications and modules for use with PAM. %prep %setup -q -n Linux-PAM-%{version} -a 2 -a 4 +# Add custom modules. +mv pam-redhat-%{pam_redhat_version}/* modules + %patch1 -p1 -b .redhat-modules pushd db-%{db_version} %patch2 -p1 -b .db4-glibc @@ -106,8 +107,6 @@ popd %patch21 -p1 -b .audit-failed %patch31 -p1 -b .try-first-pass %patch32 -p1 -b .fail-close -%patch42 -p1 -b .hal-handled -%patch43 -p1 -b .mfd-scanners autoreconf @@ -315,7 +314,6 @@ fi %{_moduledir}/pam_postgresok.so %{_moduledir}/pam_rhosts.so %{_moduledir}/pam_rootok.so -%{_moduledir}/pam_rps.so %if %{WITH_SELINUX} %{_moduledir}/pam_selinux.so %{_moduledir}/pam_selinux_permit.so @@ -378,6 +376,10 @@ fi %doc doc/adg/*.txt doc/adg/html %changelog +* Thu Feb 28 2008 Tomas Mraz 0.99.10.0-3 +- update pam-redhat module tarball +- update internal db4 + * Fri Feb 22 2008 Tomas Mraz 0.99.10.0-2 - if shadow is readable for an user do not prevent him from authenticating any user with unix_chkpwd (#433459) diff --git a/sources b/sources index 60af30e..d925fb8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2a23dc703b550223206021ff03b1e434 pam-redhat-0.99.8-1.tar.bz2 -89c7390ff120d5ebf3eccc5f97249e79 db-4.6.19.tar.gz be4dd1d34ac5933408e13e48f3eb710a Linux-PAM-0.99.10.0.tar.bz2 +26152d9c691715756b514dbf9cab9cd8 pam-redhat-0.99.9-1.tar.bz2 +718082e7e35fc48478a2334b0bc4cd11 db-4.6.21.tar.gz