summaryrefslogtreecommitdiff
path: root/debian/patches-applied/015_hurd_portability
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 16:11:36 -0800
committerSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 16:11:36 -0800
commit23962fab57727030a1d2d01f0c4b43a9075681c1 (patch)
tree1e660fdf50e1bdaf0e1543f6aaf38df1b8ae5914 /debian/patches-applied/015_hurd_portability
parentcccf6eb73fb02c8c7cf93e18b49ce1d9e697052a (diff)
parent3df8bf43bb3e239563ebabab30836279d0d1e1f2 (diff)
merge
Diffstat (limited to 'debian/patches-applied/015_hurd_portability')
-rw-r--r--debian/patches-applied/015_hurd_portability60
1 files changed, 0 insertions, 60 deletions
diff --git a/debian/patches-applied/015_hurd_portability b/debian/patches-applied/015_hurd_portability
deleted file mode 100644
index 16510318..00000000
--- a/debian/patches-applied/015_hurd_portability
+++ /dev/null
@@ -1,60 +0,0 @@
-Patch from Debian bug #76119
-Authors: Igor Khavkine <i_khavki@alcor.concordia.ca>
-
-Upstream status: committed to CVS
-
-Index: Linux-PAM/configure.in
-===================================================================
---- Linux-PAM/configure.in.orig
-+++ Linux-PAM/configure.in
-@@ -389,7 +389,7 @@
- AC_HEADER_DIRENT
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h termio.h unistd.h sys/fsuid.h inittypes.h)
-+AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h)
-
- AC_CHECK_HEADERS(crypt.h)
-
-Index: Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c
-===================================================================
---- Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c.orig
-+++ Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c
-@@ -64,11 +64,10 @@
- #include <sys/fsuid.h>
- #endif /* HAVE_SYS_FSUID_H */
- #ifdef HAVE_NET_IF_H
--#include <sys/if.h>
-+#include <net/if.h>
- #endif
- #include <sys/types.h>
- #include <sys/uio.h>
--#include <net/if.h>
- #include <netinet/in.h>
-
- #ifndef MAXDNAME
-Index: Linux-PAM/modules/pam_limits/pam_limits.c
-===================================================================
---- Linux-PAM/modules/pam_limits/pam_limits.c.orig
-+++ Linux-PAM/modules/pam_limits/pam_limits.c
-@@ -280,8 +280,10 @@
- limit_item = RLIMIT_NOFILE;
- else if (strcmp(lim_item, "memlock") == 0)
- limit_item = RLIMIT_MEMLOCK;
-+#ifdef RLIMIT_AS
- else if (strcmp(lim_item, "as") == 0)
- limit_item = RLIMIT_AS;
-+#endif /*RLIMIT_AS*/
- #ifdef RLIMIT_LOCKS
- else if (strcmp(lim_item, "locks") == 0)
- limit_item = RLIMIT_LOCKS;
-@@ -385,7 +387,9 @@
- case RLIMIT_CORE:
- case RLIMIT_RSS:
- case RLIMIT_MEMLOCK:
-+#ifdef RLIMIT_AS
- case RLIMIT_AS:
-+#endif
- if (rlimit_value != RLIM_INFINITY)
- rlimit_value *= 1024;
- break;