diff --git a/Linux-PAM-0.99.3.0-pbuild-rh.patch b/Linux-PAM-0.99.3.0-pbuild-rh.patch deleted file mode 100644 index 416f59f..0000000 --- a/Linux-PAM-0.99.3.0-pbuild-rh.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules/pam_console/Makefile.am b/modules/pam_console/Makefile.am -index 5aebea5..40d5b6c 100644 ---- a/modules/pam_console/Makefile.am -+++ b/modules/pam_console/Makefile.am -@@ -51,6 +51,8 @@ pam_console_apply_SOURCES = pam_console_apply.c pam_console.h chmod.c modechange - pam_console_la_CFLAGS = $(AM_CFLAGS) - pam_console_apply_CFLAGS = $(AM_CFLAGS) @EXE_CFLAGS@ - -+configfile.tab.h: configfile.tab.c -+ - configfile.tab.c: configfile.y - $(YACC) $(BISON_OPTS) -o $@ -p _pc_yy $< - sh $(srcdir)/sed-static $@ diff --git a/pam-0.74-loop.patch b/pam-0.74-loop.patch deleted file mode 100644 index a021a22..0000000 --- a/pam-0.74-loop.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- pam-0.74/modules/pam_console/chmod.c.fred Fri Mar 9 02:00:21 2001 -+++ pam-0.74/modules/pam_console/chmod.c Thu Mar 15 16:54:27 2001 -@@ -161,7 +161,8 @@ - { - if(mntent->mnt_dir && - mntent->mnt_fsname && -- (fnmatch(dir, mntent->mnt_dir, 0) == 0)) -+ (fnmatch(dir, mntent->mnt_dir, 0) == 0) && -+ strcmp(dir, mntent->mnt_fsname)) - { - errors |= change_file(mntent->mnt_fsname, changes, TRUE, user, group); - } diff --git a/pam.spec b/pam.spec index 90e3889..dd7126b 100644 --- a/pam.spec +++ b/pam.spec @@ -48,13 +48,9 @@ Patch9: pam-1.6.0-noflex.patch Patch33: https://src.fedoraproject.org/rpms/pam/raw/master/f/pam-1.3.0-unix-nomsg.patch # OpenMandriva specific sources/patches -# (fl) fix infinite loop -Patch507: pam-0.74-loop.patch # (fc) 0.75-29mdk don't complain when / is owned by root.adm Patch508: Linux-PAM-0.99.3.0-pamtimestampadm.patch -Patch509: Linux-PAM-0.99.3.0-pbuild-rh.patch -Patch700: pam_fix_static_pam_console.patch # (proyvind): add missing constant that went with rpc removal from glibc 2.14 Patch702: Linux-PAM-1.6.0-add-now-missing-nis-constant.patch # (akdengi> add user to default group users which need for Samba diff --git a/pam_fix_static_pam_console.patch b/pam_fix_static_pam_console.patch deleted file mode 100644 index cd29032..0000000 --- a/pam_fix_static_pam_console.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: Linux-PAM-0.99.7.1/modules/pam_console/configfile.h -=================================================================== ---- Linux-PAM-0.99.7.1.orig/modules/pam_console/configfile.h -+++ Linux-PAM-0.99.7.1/modules/pam_console/configfile.h -@@ -4,7 +4,7 @@ - */ - #ifndef _CONFIGFILE_H - #define _CONFIGFILE_H --#define STATIC static -+#define STATIC - - #ifndef FALSE - #define FALSE 0 -Index: Linux-PAM-0.99.7.1/modules/pam_console/pam_console_apply.c -=================================================================== ---- Linux-PAM-0.99.7.1.orig/modules/pam_console/pam_console_apply.c -+++ Linux-PAM-0.99.7.1/modules/pam_console/pam_console_apply.c -@@ -17,7 +17,7 @@ - #include - #include - #include --#define STATIC static -+#define STATIC - #include "configfile.h" - #include "chmod.h" - #include "pam_console.h"