From bb999cb4e877b6bfcc231a5b9b77add3509540cb Mon Sep 17 00:00:00 2001
From: Steve Langasek <vorlon@debian.org>
Date: Wed, 15 Jan 2014 02:53:57 +0000
Subject: Drop another couple of patches that are already upstream

---
 .../glibc-2_16-compilation-fix.patch               | 30 ----------------------
 debian/patches-applied/series                      |  2 --
 debian/patches-applied/sys-types-include.patch     | 21 ---------------
 3 files changed, 53 deletions(-)
 delete mode 100644 debian/patches-applied/glibc-2_16-compilation-fix.patch
 delete mode 100644 debian/patches-applied/sys-types-include.patch

(limited to 'debian/patches-applied')

diff --git a/debian/patches-applied/glibc-2_16-compilation-fix.patch b/debian/patches-applied/glibc-2_16-compilation-fix.patch
deleted file mode 100644
index aaf57a4b..00000000
--- a/debian/patches-applied/glibc-2_16-compilation-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Daniel Schepler <dschepler@gmail.com>
-Description: fix missing include causing build failure with eglibc 2.16
- eglibc 2.16 is more strict in its handling of <sys/resource.h>, so fix
- our includes here to address a build failure.
-Bug-Debian: http://bugs.debian.org/693450
-
-Index: pam.debian/modules/pam_unix/pam_unix_acct.c
-===================================================================
---- pam.debian.orig/modules/pam_unix/pam_unix_acct.c
-+++ pam.debian/modules/pam_unix/pam_unix_acct.c
-@@ -47,6 +47,7 @@
- #include <time.h>		/* for time() */
- #include <errno.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>
- 
- #include <security/_pam_macros.h>
- 
-Index: pam.debian/modules/pam_unix/pam_unix_passwd.c
-===================================================================
---- pam.debian.orig/modules/pam_unix/pam_unix_passwd.c
-+++ pam.debian/modules/pam_unix/pam_unix_passwd.c
-@@ -54,6 +54,7 @@
- #include <ctype.h>
- #include <sys/time.h>
- #include <sys/stat.h>
-+#include <sys/resource.h>
- 
- #include <signal.h>
- #include <errno.h>
diff --git a/debian/patches-applied/series b/debian/patches-applied/series
index 7d7c9610..676bb4c5 100644
--- a/debian/patches-applied/series
+++ b/debian/patches-applied/series
@@ -18,8 +18,6 @@ hurd_no_setfsuid
 cve-2011-4708.patch
 PAM-manpage-section 
 update-motd
-sys-types-include.patch
 no_PATH_MAX_on_hurd
 lib_security_multiarch_compat
-glibc-2_16-compilation-fix.patch
 pam-loginuid-in-containers
diff --git a/debian/patches-applied/sys-types-include.patch b/debian/patches-applied/sys-types-include.patch
deleted file mode 100644
index fbcb70d3..00000000
--- a/debian/patches-applied/sys-types-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Patch for Debian bug #556203
-
-pam_modutil.h should include sys/types.h, so that it stands alone without
-callers having to do additional busywork.
-
-Authors: Russ Allbery <rra@debian.org>
-
-Upstream status: not yet submitted
-
-Index: pam.debian/libpam/include/security/pam_modutil.h
-===================================================================
---- pam.debian.orig/libpam/include/security/pam_modutil.h
-+++ pam.debian/libpam/include/security/pam_modutil.h
-@@ -51,6 +51,7 @@
- extern "C" {
- #endif
- 
-+#include <sys/types.h>
- #include <security/_pam_types.h>
- 
- extern struct passwd * PAM_NONNULL((1,2))
-- 
cgit v1.2.3