clean up the patch directory so that they match the actual shipped tree

3 files changed, 15 insertions, 91 deletions

diff --git a/patches-applied/019_pam_listfile_quiet b/patches-applied/019_pam_listfile_quiet
index 8d3705a8..f87f08c3 100644
--- a/patches-applied/019_pam_listfile_quiet
+++ b/patches-applied/019_pam_listfile_quiet
@@ -68,61 +68,3 @@ diff -u -r1.4 pam_listfile.c
  	return PAM_AUTH_ERR;
      }
  }
-Index: debian/patches-applied/019_pam_listfile_quiet
-===================================================================
-RCS file: /afs/sipb/project/debian/cvs/pam/debian/patches-applied/019_pam_listfile_quiet,v
-retrieving revision 1.1
-diff -u -r1.1 019_pam_listfile_quiet
---- debian/patches-applied/019_pam_listfile_quiet	25 May 2002 21:25:35 -0000	1.1
-+++ debian/patches-applied/019_pam_listfile_quiet	21 Sep 2002 18:22:14 -0000
-@@ -1,10 +1,10 @@
- Index: Linux-PAM/modules/pam_listfile/pam_listfile.c
- ===================================================================
- RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/modules/pam_listfile/pam_listfile.c,v
--retrieving revision 1.2
--diff -u -r1.2 pam_listfile.c
----- Linux-PAM/modules/pam_listfile/pam_listfile.c	25 May 2002 19:35:22 -0000	1.2
--+++ Linux-PAM/modules/pam_listfile/pam_listfile.c	25 May 2002 21:19:19 -0000
-+retrieving revision 1.4
-+diff -u -r1.4 pam_listfile.c
-+--- Linux-PAM/modules/pam_listfile/pam_listfile.c	15 Sep 2002 20:18:00 -0000	1.4
-++++ Linux-PAM/modules/pam_listfile/pam_listfile.c	21 Sep 2002 18:19:35 -0000
- @@ -39,6 +39,8 @@
-  #include <security/pam_modules.h>
-  #include <security/_pam_macros.h>
-@@ -14,7 +14,7 @@
-  /* some syslogging */
-  
-  #define LOCAL_LOG_PREFIX "PAM-listfile: "
--@@ -202,7 +204,9 @@
-+@@ -199,7 +201,9 @@
-  		    apply_type=APPLY_TYPE_USER;
-  		    strncpy(apply_val,myval,sizeof(apply_val)-1);
-  		}
-@@ -25,7 +25,7 @@
-  		_pam_log(LOG_ERR,LOCAL_LOG_PREFIX "Unknown option: %s",mybuf);
-  		return onerr;
-  	    }
--@@ -333,7 +337,8 @@
-+@@ -340,7 +344,8 @@
-  	     ifname, citem, citemp, sense);
-  #endif
-      if(lstat(ifname,&fileinfo)) {
-@@ -35,7 +35,7 @@
-  	return onerr;
-      }
-  
--@@ -341,15 +346,16 @@
-+@@ -348,15 +353,16 @@
-         || !S_ISREG(fileinfo.st_mode)) {
-  	/* If the file is world writable or is not a
-  	   normal file, return error */
-@@ -56,7 +56,7 @@
-  	    /* Only report if it's an error... */
-  	    _pam_log(LOG_ERR,LOCAL_LOG_PREFIX  "Error opening %s", ifname);
-  	}
--@@ -400,8 +406,9 @@
-+@@ -407,8 +413,9 @@
-  #endif
-  	(void) pam_get_item(pamh, PAM_SERVICE, (const void **)&service);
-  	(void) pam_get_user(pamh, &user_name, NULL);
diff --git a/patches-applied/031_pam_include b/patches-applied/031_pam_include
index 545b9ed6..d2491f85 100644
--- a/patches-applied/031_pam_include
+++ b/patches-applied/031_pam_include
@@ -75,21 +75,3 @@ diff -u -r1.1.1.2 pam_handlers.c
      }
  
      return ( (x < 0) ? PAM_ABORT:PAM_SUCCESS );
-Index: debian/changelog
-===================================================================
-RCS file: /afs/sipb/project/debian/cvs/pam/debian/changelog,v
-retrieving revision 1.9
-diff -u -r1.9 changelog
---- debian/changelog	22 Sep 2002 21:25:27 -0000	1.9
-+++ debian/changelog	30 Sep 2002 03:39:24 -0000
-@@ -1,3 +1,10 @@
-+pam (0.76-2) experimental; urgency=low
-+
-+  * Link against appropriate libraries so we find  the symbols we need,
-+    Closes: #162175
-+
-+ --
-+
- pam (0.76-1) experimental; urgency=low
- 
-   * New upstream version
diff --git a/patches-applied/055_pam_unix_nullok_secure b/patches-applied/055_pam_unix_nullok_secure
index 7f059743..dda1f6b3 100644
--- a/patches-applied/055_pam_unix_nullok_secure
+++ b/patches-applied/055_pam_unix_nullok_secure
@@ -1,7 +1,7 @@
-=== pam_unix/Makefile
+=== modules/pam_unix/Makefile
 ==================================================================
---- pam_unix/Makefile  (revision 247)
-+++ pam_unix/Makefile  (local)
+--- modules/pam_unix/Makefile  (revision 247)
++++ modules/pam_unix/Makefile  (local)
 @@ -38,11 +38,12 @@
  CHKPWD=unix_chkpwd
  
@@ -16,10 +16,10 @@
  
  ifdef USE_CRACKLIB
  CRACKLIB = -lcrack
-=== pam_unix/pam_unix_auth.c
+=== modules/pam_unix/pam_unix_auth.c
 ==================================================================
---- pam_unix/pam_unix_auth.c  (revision 247)
-+++ pam_unix/pam_unix_auth.c  (local)
+--- modules/pam_unix/pam_unix_auth.c  (revision 247)
++++ modules/pam_unix/pam_unix_auth.c  (local)
 @@ -148,7 +148,7 @@
  
  	/* if this user does not have a password... */
@@ -29,10 +29,10 @@
  		D(("user '%s' has blank passwd", name));
  		name = NULL;
  		retval = PAM_SUCCESS;
-=== pam_unix/pam_unix_passwd.c
+=== modules/pam_unix/pam_unix_passwd.c
 ==================================================================
---- pam_unix/pam_unix_passwd.c  (revision 247)
-+++ pam_unix/pam_unix_passwd.c  (local)
+--- modules/pam_unix/pam_unix_passwd.c  (revision 247)
++++ modules/pam_unix/pam_unix_passwd.c  (local)
 @@ -781,7 +781,7 @@
  
  		D(("prelim check"));
@@ -42,10 +42,10 @@
  			return PAM_SUCCESS;
  		} else if (off(UNIX__IAMROOT, ctrl) || on(UNIX_NIS, ctrl)) {
  
-=== pam_unix/support.c
+=== modules/pam_unix/support.c
 ==================================================================
---- pam_unix/support.c  (revision 247)
-+++ pam_unix/support.c  (local)
+--- modules/pam_unix/support.c  (revision 247)
++++ modules/pam_unix/support.c  (local)
 @@ -23,6 +23,7 @@
  #include "md5.h"
  #include "support.h"
@@ -125,10 +125,10 @@
  		    D(("user has empty password - access granted"));
  		    retval = PAM_SUCCESS;
  		} else {
-=== pam_unix/support.h
+=== modules/pam_unix/support.h
 ==================================================================
---- pam_unix/support.h  (revision 247)
-+++ pam_unix/support.h  (local)
+--- modules/pam_unix/support.h  (revision 247)
++++ modules/pam_unix/support.h  (local)
 @@ -84,8 +84,9 @@
  #define UNIX_MIN_PASS_LEN        22	/* Min length for password */
  #define UNIX_NOOBSCURE_CHECKS    23     /* internal */