diff options
Diffstat (limited to 'net-fs/autofs')
| -rw-r--r-- | net-fs/autofs/Manifest | 5 | ||||
| -rw-r--r-- | net-fs/autofs/autofs-5.1.6-r1.ebuild (renamed from net-fs/autofs/autofs-5.1.5-r2.ebuild) | 7 | ||||
| -rw-r--r-- | net-fs/autofs/files/autofs-5.1.6-glibc.patch | 110 | ||||
| -rw-r--r-- | net-fs/autofs/files/autofs-5.1.6-pid.patch | 14 |
4 files changed, 133 insertions, 3 deletions
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index 9c0661ea9ff7..e71649abddfb 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -1,7 +1,8 @@ +AUX autofs-5.1.6-glibc.patch 2797 BLAKE2B b6ea2fc98c0634208103208fe562f77d3cd77e212215a0a346b2a1b9997fd1dc95bf8b42bd899884fd12d735219801308e0934a31553dfda275dc3eef9e07db0 SHA512 83d4808c4f5fe811d675372f7af59c6369d93818bfdb5aac26d5372baf1ef45f71208206fe6176b577294df8ce0dac145d7afe335f028f0a0cf3e6787dfb0bbc +AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf4409a9fc8215a3ba9987639381fa0ccc29b28f5fe794dc44c98ebc0177d3ecd28177ff6657201f8ba478febda SHA512 78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa -DIST autofs-5.1.5.tar.xz 313476 BLAKE2B 9822f6eb6294a0ee14b08f7982bf6008eb9ac8a79f89cdf3ffa0ed234b83c932db1646fc5591269000372dbfb95ce1b9ded040f0724a7eb4b3888caf20f56a20 SHA512 c8138929a9e2cfa7e0096c1d490b9d7275d1d43a50f5f87ad457bdd9a49c7dd13a4aa5d86ab1e028d66dae630e1a1342661844e5775625fe585867f0f4778898 DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2 -EBUILD autofs-5.1.5-r2.ebuild 2940 BLAKE2B b8b1eca82edae68a82bfc8ef366ecbd13c4506dce5070fb39a8e97c675a1938759645a673f3c56706e2ebbaa49e8c183f0e9e2ff7a52af2be7fbfa853fc707e6 SHA512 3fdf8a340ecf55787bf8bd20d200b0756c6813dbbf1bf6b7ba6c4ac56ca6c1c7496e130e08a28456beb956b44f9130e0dea373021d705d5a67293fdb69987ec6 +EBUILD autofs-5.1.6-r1.ebuild 3022 BLAKE2B 169fba6d34e7934f2ae768922f742f3019048c6ec78b9350551554b772bcaf42f3557c6ca9329686463274305fa2e20494213ce184b7a4e6a9f66a015e1f7575 SHA512 f3bae08c739a2026ba011e8feb7ee8961714c52e67ed6deedf7323ebec19cacc527974c001bccbbbb3beefb8e765c318552661cd3e45327c26352cf031a7ef19 EBUILD autofs-5.1.6.ebuild 2940 BLAKE2B b8b1eca82edae68a82bfc8ef366ecbd13c4506dce5070fb39a8e97c675a1938759645a673f3c56706e2ebbaa49e8c183f0e9e2ff7a52af2be7fbfa853fc707e6 SHA512 3fdf8a340ecf55787bf8bd20d200b0756c6813dbbf1bf6b7ba6c4ac56ca6c1c7496e130e08a28456beb956b44f9130e0dea373021d705d5a67293fdb69987ec6 MISC metadata.xml 976 BLAKE2B 4aa6e19a7966c42af8daca6be175f33769d75b6342a114d42b47e374f6b8df3ec0cc5c25d1c7a295f3d11f54555e4a2b1dc654aa335a89ee79bdb47fb796eaf1 SHA512 23aff908ddf72ab528f025b750bc48af90864c39c7ffb44537b87992d7b5d802d46f355ee7af38d57514a66894596a91a027b2db13940106d3a74ffa53d6758d diff --git a/net-fs/autofs/autofs-5.1.5-r2.ebuild b/net-fs/autofs/autofs-5.1.6-r1.ebuild index 31f4171af449..6e700965b9ce 100644 --- a/net-fs/autofs/autofs-5.1.5-r2.ebuild +++ b/net-fs/autofs/autofs-5.1.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd" # currently, sasl code assumes the presence of kerberosV @@ -36,6 +36,11 @@ BDEPEND=" virtual/yacc " +PATCHES=( + "${FILESDIR}/${P}-glibc.patch" + "${FILESDIR}/${P}-pid.patch" +) + pkg_setup() { linux-info_pkg_setup diff --git a/net-fs/autofs/files/autofs-5.1.6-glibc.patch b/net-fs/autofs/files/autofs-5.1.6-glibc.patch new file mode 100644 index 000000000000..338d885ae1e1 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.6-glibc.patch @@ -0,0 +1,110 @@ +diff --git a/daemon/lookup.c b/daemon/lookup.c +index 60a48f3..bbd65e0 100644 +--- a/daemon/lookup.c ++++ b/daemon/lookup.c +@@ -382,7 +382,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +@@ -937,7 +937,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +@@ -1113,7 +1113,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry) + if (!S_ISREG(st.st_mode)) + return NULL; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = "program"; + else + type = "file"; +diff --git a/include/automount.h b/include/automount.h +index 4fd0ba9..7b855a7 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -13,6 +13,7 @@ + #include <limits.h> + #include <time.h> + #include <syslog.h> ++#include <sys/procfs.h> + #include <sys/types.h> + #include <pthread.h> + #include <sched.h> +@@ -142,6 +143,16 @@ struct autofs_point; + #define UMOUNT_RETRIES 8 + #define EXPIRE_RETRIES 3 + ++#ifndef __SWORD_TYPE ++#if __WORDSIZE == 32 ++# define __SWORD_TYPE int ++#elif __WORDSIZE == 64 ++# define __SWORD_TYPE long int ++#else ++#error ++#endif ++#endif ++ + static u_int32_t inline hash(const char *key, unsigned int size) + { + u_int32_t hashval; +diff --git a/include/nsswitch.h b/include/nsswitch.h +index d3e4027..8376113 100644 +--- a/include/nsswitch.h ++++ b/include/nsswitch.h +@@ -24,6 +24,10 @@ + #include <netdb.h> + #include "list.h" + ++#ifndef _PATH_NSSWITCH_CONF ++#define _PATH_NSSWITCH_CONF "/dev/null" ++#endif ++ + #define NSSWITCH_FILE _PATH_NSSWITCH_CONF + + enum nsswitch_status { +diff --git a/include/rpc_subs.h b/include/rpc_subs.h +index 6e35eed..7ba4b93 100644 +--- a/include/rpc_subs.h ++++ b/include/rpc_subs.h +@@ -18,7 +18,7 @@ + + #include <rpc/rpc.h> + #include <rpc/pmap_prot.h> +-#include <nfs/nfs.h> ++#include <linux/nfs.h> + #include <linux/nfs2.h> + #include <linux/nfs3.h> + +diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c +index fadd2ea..cf109de 100644 +--- a/modules/lookup_multi.c ++++ b/modules/lookup_multi.c +@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch + continue; + } + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt, + continue; + } + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; diff --git a/net-fs/autofs/files/autofs-5.1.6-pid.patch b/net-fs/autofs/files/autofs-5.1.6-pid.patch new file mode 100644 index 000000000000..1766c34e989e --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.6-pid.patch @@ -0,0 +1,14 @@ +diff --git a/include/log.h b/include/log.h +index 69eed96..14051cc 100644 +--- a/include/log.h ++++ b/include/log.h +@@ -46,6 +46,8 @@ extern void log_crit(unsigned, const char* msg, ...); + extern void log_debug(unsigned int, const char* msg, ...); + extern void logmsg(const char* msg, ...); + ++#include <unistd.h> /* Required for pid_t */ ++ + extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label); + + #define debug(opt, msg, args...) \ + |