diff options
| author | Steve Langasek <vorlon@debian.org> | 2019-01-02 12:24:44 -0800 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-02 12:27:24 -0800 |
| commit | a6f4ab0bebc76acf85cc0244bd21c1036009c28c (patch) | |
| tree | df0d6a57d2b91ab9038e8d7b0d62f28c2daa66db /debian/patches-applied/015_hurd_portability | |
| parent | 10b6243f4664747e815372070142d6c5853176da (diff) | |
| download | pam-a6f4ab0bebc76acf85cc0244bd21c1036009c28c.tar.gz pam-a6f4ab0bebc76acf85cc0244bd21c1036009c28c.tar.bz2 pam-a6f4ab0bebc76acf85cc0244bd21c1036009c28c.zip | |
fix-up commit for grafting svn history onto git history
Diffstat (limited to 'debian/patches-applied/015_hurd_portability')
| -rw-r--r-- | debian/patches-applied/015_hurd_portability | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/debian/patches-applied/015_hurd_portability b/debian/patches-applied/015_hurd_portability new file mode 100644 index 00000000..16510318 --- /dev/null +++ b/debian/patches-applied/015_hurd_portability @@ -0,0 +1,60 @@ +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; |