From 4c8f5ad6ee34b2f65e0a52a59a15af2ddef8b250 Mon Sep 17 00:00:00 2001
From: Kees Cook <kees@debian.org>
Date: Thu, 13 Oct 2011 12:55:42 -0700
Subject: 
 debian/patches-applied/{007_modules_pam_unix,055_pam_unix_nullok_secure}:
 drop unneeded no-op change to reduce delta from upstream.

---
 debian/patches-applied/007_modules_pam_unix | 58 +++++++++--------------------
 1 file changed, 18 insertions(+), 40 deletions(-)

(limited to 'debian/patches-applied/007_modules_pam_unix')

diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches-applied/007_modules_pam_unix
index 07f27629..1388556e 100644
--- a/debian/patches-applied/007_modules_pam_unix
+++ b/debian/patches-applied/007_modules_pam_unix
@@ -1,7 +1,7 @@
-Index: pam.deb/modules/pam_unix/pam_unix_passwd.c
+Index: pam-debian/modules/pam_unix/pam_unix_passwd.c
 ===================================================================
---- pam.deb.orig/modules/pam_unix/pam_unix_passwd.c
-+++ pam.deb/modules/pam_unix/pam_unix_passwd.c
+--- pam-debian.orig/modules/pam_unix/pam_unix_passwd.c	2011-10-10 16:22:05.790699739 -0700
++++ pam-debian/modules/pam_unix/pam_unix_passwd.c	2011-10-10 16:24:49.656776455 -0700
 @@ -87,6 +87,9 @@
  		      unsigned long versnum, unsigned int proto);
  #endif				/* GNU libc 2.1 */
@@ -33,32 +33,10 @@ Index: pam.deb/modules/pam_unix/pam_unix_passwd.c
  
  	/* <DO NOT free() THESE> */
  	const char *user;
-Index: pam.deb/modules/pam_unix/support.c
+Index: pam-debian/modules/pam_unix/support.h
 ===================================================================
---- pam.deb.orig/modules/pam_unix/support.c
-+++ pam.deb/modules/pam_unix/support.c
-@@ -81,6 +81,7 @@
- 		D(("SILENT"));
- 		set(UNIX__QUIET, ctrl);
- 	}
-+
- 	/* now parse the arguments to this module */
- 
- 	while (argc-- > 0) {
-@@ -90,7 +91,8 @@
- 
- 		for (j = 0; j < UNIX_CTRLS_; ++j) {
- 			if (unix_args[j].token
--			    && !strncmp(*argv, unix_args[j].token, strlen(unix_args[j].token))) {
-+			    && !strncmp(*argv, unix_args[j].token, strlen(unix_args[j].token)))
-+			{
- 				break;
- 			}
- 		}
-Index: pam.deb/modules/pam_unix/support.h
-===================================================================
---- pam.deb.orig/modules/pam_unix/support.h
-+++ pam.deb/modules/pam_unix/support.h
+--- pam-debian.orig/modules/pam_unix/support.h	2011-10-10 16:22:05.742699130 -0700
++++ pam-debian/modules/pam_unix/support.h	2011-10-10 16:24:49.656776455 -0700
 @@ -90,8 +90,9 @@
  					   password hash algorithms */
  #define UNIX_BLOWFISH_PASS       26	/* new password hashes will use blowfish */
@@ -134,10 +112,10 @@ Index: pam.deb/modules/pam_unix/support.h
  };
  
  #define UNIX_DEFAULTS  (unix_args[UNIX__NONULL].flag)
-Index: pam.deb/modules/pam_unix/pam_unix.8.xml
+Index: pam-debian/modules/pam_unix/pam_unix.8.xml
 ===================================================================
---- pam.deb.orig/modules/pam_unix/pam_unix.8.xml
-+++ pam.deb/modules/pam_unix/pam_unix.8.xml
+--- pam-debian.orig/modules/pam_unix/pam_unix.8.xml	2011-10-10 16:22:05.822700144 -0700
++++ pam-debian/modules/pam_unix/pam_unix.8.xml	2011-10-10 16:24:49.656776455 -0700
 @@ -333,8 +333,81 @@
          <listitem>
            <para>
@@ -222,10 +200,10 @@ Index: pam.deb/modules/pam_unix/pam_unix.8.xml
            </para>
          </listitem>
        </varlistentry>
-Index: pam.deb/modules/pam_unix/obscure.c
+Index: pam-debian/modules/pam_unix/obscure.c
 ===================================================================
---- /dev/null
-+++ pam.deb/modules/pam_unix/obscure.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ pam-debian/modules/pam_unix/obscure.c	2011-10-10 16:24:49.656776455 -0700
 @@ -0,0 +1,198 @@
 +/*
 + * Copyright 1989 - 1994, Julianne Frances Haugh
@@ -425,10 +403,10 @@ Index: pam.deb/modules/pam_unix/obscure.c
 +
 +	return msg;
 +}
-Index: pam.deb/modules/pam_unix/Makefile.am
+Index: pam-debian/modules/pam_unix/Makefile.am
 ===================================================================
---- pam.deb.orig/modules/pam_unix/Makefile.am
-+++ pam.deb/modules/pam_unix/Makefile.am
+--- pam-debian.orig/modules/pam_unix/Makefile.am	2011-10-10 16:22:05.754699282 -0700
++++ pam-debian/modules/pam_unix/Makefile.am	2011-10-10 16:24:49.656776455 -0700
 @@ -41,7 +41,7 @@
  
  pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \
@@ -438,10 +416,10 @@ Index: pam.deb/modules/pam_unix/Makefile.am
  
  bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
  bigcrypt_CFLAGS = $(AM_CFLAGS)
-Index: pam.deb/modules/pam_unix/pam_unix.8
+Index: pam-debian/modules/pam_unix/pam_unix.8
 ===================================================================
---- pam.deb.orig/modules/pam_unix/pam_unix.8
-+++ pam.deb/modules/pam_unix/pam_unix.8
+--- pam-debian.orig/modules/pam_unix/pam_unix.8	2011-10-10 16:22:05.802699891 -0700
++++ pam-debian/modules/pam_unix/pam_unix.8	2011-10-10 16:24:49.656776455 -0700
 @@ -1,161 +1,22 @@
 +'\" t
  .\"     Title: pam_unix
-- 
cgit v1.2.3