summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/autofs/Manifest3
-rw-r--r--net-fs/autofs/autofs-5.1.6-r2.ebuild2
-rw-r--r--net-fs/autofs/autofs-5.1.8-r1.ebuild (renamed from net-fs/autofs/autofs-5.1.7-r1.ebuild)17
-rw-r--r--net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch107
-rw-r--r--net-fs/autofs/files/autofs-5.1.7-glibc.patch97
-rw-r--r--net-fs/autofs/files/autofs-5.1.8-dmalloc.patch53
-rw-r--r--net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch88
-rw-r--r--net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild2
-rw-r--r--net-fs/cvmfs/Manifest1
-rw-r--r--net-fs/cvmfs/cvmfs-2.9.0.ebuild103
-rw-r--r--net-fs/docker-volume-netshare/Manifest12
-rw-r--r--net-fs/docker-volume-netshare/docker-volume-netshare-0.35.ebuild51
-rw-r--r--net-fs/docker-volume-netshare/files/docker-volume-netshare.confd2
-rw-r--r--net-fs/docker-volume-netshare/files/docker-volume-netshare.initd11
-rw-r--r--net-fs/docker-volume-netshare/metadata.xml8
-rw-r--r--net-fs/ksmbd-tools/Manifest1
-rw-r--r--net-fs/ksmbd-tools/files/confd5
-rw-r--r--net-fs/ksmbd-tools/files/initd32
-rw-r--r--net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild60
-rw-r--r--net-fs/ksmbd-tools/metadata.xml16
-rw-r--r--net-fs/nfs-utils/Manifest1
-rw-r--r--net-fs/nfs-utils/files/nfs.initd2
-rw-r--r--net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild204
-rw-r--r--net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild (renamed from net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild)7
-rw-r--r--net-fs/openafs-legacy/metadata.xml5
-rw-r--r--net-fs/openafs-legacy/openafs-legacy-0.1.ebuild70
-rw-r--r--net-fs/openafs/Manifest3
-rw-r--r--net-fs/openafs/openafs-1.8.7.ebuild9
-rw-r--r--net-fs/openafs/openafs-1.8.8.1-r1.ebuild335
-rw-r--r--net-fs/s3backer/Manifest2
-rw-r--r--net-fs/s3backer/metadata.xml9
-rw-r--r--net-fs/s3backer/s3backer-1.6.3.ebuild (renamed from net-fs/s3backer/s3backer-1.4.5.ebuild)14
-rw-r--r--net-fs/samba/Manifest9
-rw-r--r--net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch42
-rw-r--r--net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch42
-rw-r--r--net-fs/samba/samba-4.13.10-r2.ebuild335
-rw-r--r--net-fs/samba/samba-4.13.11-r1.ebuild335
-rw-r--r--net-fs/samba/samba-4.13.9-r3.ebuild335
-rw-r--r--net-fs/samba/samba-4.14.10-r2.ebuild (renamed from net-fs/samba/samba-4.14.7-r1.ebuild)20
-rw-r--r--net-fs/samba/samba-4.15.2-r2.ebuild (renamed from net-fs/samba/samba-4.15.0-r1.ebuild)20
-rw-r--r--net-fs/samba/samba-4.15.3-r1.ebuild (renamed from net-fs/samba/samba-4.14.6-r2.ebuild)51
-rw-r--r--net-fs/sshfs/sshfs-3.7.1.ebuild4
42 files changed, 879 insertions, 1646 deletions
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 2dd24948a6b..503d31c3823 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,2 +1,3 @@
DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
-DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc SHA512 cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
+DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff7b569f4dc0e829103ae67ced6d04e110331d320ff429f6e6af03b7265a068ee648738691cd637080cf976f441fe10444 SHA512 73023735bf269e3214e38a4841b6b3a1edff30e5d925a62d3ca9e841726835793c1e242804233e696e946e63720f522ceeb82f78449d3597d3d39b727f4b8d24
+DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223
diff --git a/net-fs/autofs/autofs-5.1.6-r2.ebuild b/net-fs/autofs/autofs-5.1.6-r2.ebuild
index 616efb49c33..c532b488d52 100644
--- a/net-fs/autofs/autofs-5.1.6-r2.ebuild
+++ b/net-fs/autofs/autofs-5.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-fs/autofs/autofs-5.1.7-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild
index dc05275932e..2081b5d2a5c 100644
--- a/net-fs/autofs/autofs-5.1.7-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,11 +7,12 @@ inherit linux-info systemd toolchain-funcs
DESCRIPTION="Kernel based automounter"
HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz
+ https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-0.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
# currently, sasl code assumes the presence of kerberosV
@@ -40,10 +41,9 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-glibc.patch"
- "${FILESDIR}/${PN}-5.1.6-musl.patch"
- "${FILESDIR}/${PN}-5.1.6-pid.patch"
- "${FILESDIR}/${PN}-5.1.7-glibc-2.34.patch"
+ "${WORKDIR}"/${P}-patches/
+ "${FILESDIR}/${P}-dmalloc.patch"
+ "${FILESDIR}/${P}-nfsv4-mount.patch"
)
pkg_setup() {
@@ -96,8 +96,7 @@ src_configure() {
}
src_compile() {
- export DONTSTRIP=1
- default
+ emake STRIP=: DONTSTRIP=1
}
src_install() {
diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch b/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch
deleted file mode 100644
index 8b0ddd75eb2..00000000000
--- a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-https://src.fedoraproject.org/rpms/autofs/raw/rawhide/f/autofs-5.1.7-use-default-stack-size-for-threads.patch
-https://bugzilla.redhat.com/show_bug.cgi?id=1984813
-https://bugs.gentoo.org/803938
-
-autofs-5.1.7 - use default stack size for threads
-
-From: Ian Kent <raven@themaw.net>
-
-autofs uses PTHREAD_STACK_MIN to set the stack size for threads it
-creates.
-
-In two cases it is used to reduce the stack size for long running
-service threads while it's used to allocate a larger stack for worker
-threads that can have larger memory requirements.
-
-In recent glibc releases PTHREAD_STACK_MIN is no longer a constant
-which can lead to unexpectedly different stack sizes on different
-architectures and the autofs assumption it's a constant causes a
-compile failure.
-
-The need to alter the stack size was due to observed stack overflow
-which was thought to be due the thread stack being too small for autofs
-and glibc alloca(3) usage.
-
-Quite a bit of that alloca(3) usage has been eliminated from autofs now,
-particularly those that might be allocating largish amounts of storage,
-and there has been a lot of change in glibc too so using the thread
-default stack should be ok.
-
-Signed-off-by: Ian Kent <raven@themaw.net>
---- a/daemon/automount.c
-+++ b/daemon/automount.c
-@@ -84,7 +84,6 @@ static size_t kpkt_len;
- /* Attributes for creating detached and joinable threads */
- pthread_attr_t th_attr;
- pthread_attr_t th_attr_detached;
--size_t detached_thread_stack_size = PTHREAD_STACK_MIN * 144;
-
- struct master_readmap_cond mrc = {
- PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0};
-@@ -2620,34 +2619,6 @@ int main(int argc, char *argv[])
- exit(1);
- }
-
--#ifdef _POSIX_THREAD_ATTR_STACKSIZE
-- if (pthread_attr_setstacksize(
-- &th_attr_detached, detached_thread_stack_size)) {
-- logerr("%s: failed to set stack size thread attribute!",
-- program);
-- if (start_pipefd[1] != -1) {
-- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
-- close(start_pipefd[1]);
-- }
-- release_flag_file();
-- macro_free_global_table();
-- exit(1);
-- }
--#endif
--
-- if (pthread_attr_getstacksize(
-- &th_attr_detached, &detached_thread_stack_size)) {
-- logerr("%s: failed to get detached thread stack size!",
-- program);
-- if (start_pipefd[1] != -1) {
-- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
-- close(start_pipefd[1]);
-- }
-- release_flag_file();
-- macro_free_global_table();
-- exit(1);
-- }
--
- info(logging, "Starting automounter version %s, master map %s",
- version, master_list->name);
- info(logging, "using kernel protocol version %d.%02d",
---- a/daemon/state.c
-+++ b/daemon/state.c
-@@ -1177,12 +1177,8 @@ int st_start_handler(void)
- status = pthread_attr_init(pattrs);
- if (status)
- pattrs = NULL;
-- else {
-+ else
- pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
--#ifdef _POSIX_THREAD_ATTR_STACKSIZE
-- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
--#endif
-- }
-
- status = pthread_create(&thid, pattrs, st_queue_handler, NULL);
-
---- a/lib/alarm.c
-+++ b/lib/alarm.c
-@@ -270,12 +270,8 @@ int alarm_start_handler(void)
- status = pthread_attr_init(pattrs);
- if (status)
- pattrs = NULL;
-- else {
-+ else
- pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
--#ifdef _POSIX_THREAD_ATTR_STACKSIZE
-- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
--#endif
-- }
-
- status = pthread_condattr_init(&condattrs);
- if (status)
diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc.patch b/net-fs/autofs/files/autofs-5.1.7-glibc.patch
deleted file mode 100644
index 2a0f415fbee..00000000000
--- a/net-fs/autofs/files/autofs-5.1.7-glibc.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/daemon/lookup.c b/daemon/lookup.c
-index 2fea0c0..3b3aa3e 100644
---- a/daemon/lookup.c
-+++ b/daemon/lookup.c
-@@ -397,7 +397,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
- return NSS_STATUS_NOTFOUND;
- }
-
-- if (st.st_mode & __S_IEXEC)
-+ if (st.st_mode & S_IEXEC)
- type = src_prog;
- else
- type = src_file;
-@@ -930,7 +930,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
- return NSS_STATUS_NOTFOUND;
- }
-
-- if (st.st_mode & __S_IEXEC)
-+ if (st.st_mode & S_IEXEC)
- type = src_prog;
- else
- type = src_file;
-@@ -1077,7 +1077,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 1ae4078..c2e8dba 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>
-@@ -42,6 +43,16 @@
- #include <dmalloc.h>
- #endif
-
-+#ifndef __SWORD_TYPE
-+#if __WORDSIZE == 32
-+# define __SWORD_TYPE int
-+#elif __WORDSIZE == 64
-+# define __SWORD_TYPE long int
-+#else
-+#error
-+#endif
-+#endif
-+
- #define ENABLE_CORES 1
-
- /* We MUST have the paths to mount(8) and umount(8) */
-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/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.8-dmalloc.patch b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
new file mode 100644
index 00000000000..e2ed58fb176
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
@@ -0,0 +1,53 @@
+diff --git a/include/mounts.h b/include/mounts.h
+index ddb7e4c..854e1fb 100644
+--- a/include/mounts.h
++++ b/include/mounts.h
+@@ -84,7 +84,7 @@ typedef void (*tree_free_t) (struct tree_node *n);
+ struct tree_ops {
+ tree_new_t new;
+ tree_cmp_t cmp;
+- tree_free_t free;
++ tree_free_t set_free;
+ };
+
+ typedef int (*tree_work_fn_t) (struct tree_node *n, void *ptr);
+diff --git a/lib/mounts.c b/lib/mounts.c
+index 4c86688..1e54a33 100644
+--- a/lib/mounts.c
++++ b/lib/mounts.c
+@@ -75,7 +75,7 @@ static void tree_mnt_free(struct tree_node *n);
+ static struct tree_ops mnt_ops = {
+ .new = tree_mnt_new,
+ .cmp = tree_mnt_cmp,
+- .free = tree_mnt_free,
++ .set_free = tree_mnt_free,
+ };
+ static struct tree_ops *tree_mnt_ops = &mnt_ops;
+
+@@ -86,7 +86,7 @@ static void tree_host_free(struct tree_node *n);
+ static struct tree_ops host_ops = {
+ .new = tree_host_new,
+ .cmp = tree_host_cmp,
+- .free = tree_host_free,
++ .set_free = tree_host_free,
+ };
+ static struct tree_ops *tree_host_ops = &host_ops;
+
+@@ -97,7 +97,7 @@ static void tree_mapent_free(struct tree_node *n);
+ static struct tree_ops mapent_ops = {
+ .new = tree_mapent_new,
+ .cmp = tree_mapent_cmp,
+- .free = tree_mapent_free,
++ .set_free = tree_mapent_free,
+ };
+ static struct tree_ops *tree_mapent_ops = &mapent_ops;
+
+@@ -1360,7 +1360,7 @@ void tree_free(struct tree_node *root)
+ tree_free(root->right);
+ if (root->left)
+ tree_free(root->left);
+- ops->free(root);
++ ops->set_free(root);
+ }
+
+ int tree_traverse_inorder(struct tree_node *n, tree_work_fn_t work, void *ptr)
diff --git a/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch b/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch
new file mode 100644
index 00000000000..eb1bc6cb424
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch
@@ -0,0 +1,88 @@
+autofs-5.1.8 - fix nfsv4 only mounts should not use rpcbind
+
+From: Ian Kent <raven@xxxxxxxxxx>
+
+Commit 606795ecfaa1 ("autofs-5.1.7 - also require TCP_REQUESTED when
+setting NFS port" together with commit 26fb6b5408be) caused NFSv4 only
+mounts to also use rpcbind to probe availability which breaks the
+requirememt that this type of mount not use rpcbind at all.
+
+Fix this by treating fstype=nfs4 mounts as a special case which doesn't
+use rpcbind.
+---
+ CHANGELOG | 1 +
+ include/replicated.h | 2 ++
+ modules/mount_nfs.c | 13 +++++++------
+ modules/replicated.c | 4 ++--
+ 4 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/include/replicated.h b/include/replicated.h
+index 95ff1f0d..f889a56a 100644
+--- a/include/replicated.h
++++ b/include/replicated.h
+@@ -35,6 +35,8 @@
+ #define NFS3_REQUESTED NFS3_SUPPORTED
+ #define NFS4_REQUESTED NFS4_SUPPORTED
+
++#define NFS4_ONLY_REQUESTED 0x0800
++
+ #define TCP_SUPPORTED 0x0001
+ #define UDP_SUPPORTED 0x0002
+ #define TCP_REQUESTED TCP_SUPPORTED
+diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
+index 0ab87dcf..feb5afcd 100644
+--- a/modules/mount_nfs.c
++++ b/modules/mount_nfs.c
+@@ -92,7 +92,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
+ mount_default_proto = defaults_get_mount_nfs_default_proto();
+ vers = NFS_VERS_DEFAULT | NFS_PROTO_DEFAULT;
+ if (strcmp(fstype, "nfs4") == 0)
+- vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED;
++ vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED | NFS4_ONLY_REQUESTED;
+ else if (mount_default_proto == 4)
+ vers = vers | NFS4_VERS_DEFAULT;
+
+@@ -157,15 +157,16 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
+ } else {
+ /* Is any version of NFSv4 in the options */
+ if (_strncmp("vers=4", cp, 6) == 0 ||
+- _strncmp("nfsvers=4", cp, 9) == 0)
+- vers = NFS4_VERS_MASK | TCP_SUPPORTED;
+- else if (_strncmp("vers=3", cp, o_len) == 0 ||
++ _strncmp("nfsvers=4", cp, 9) == 0) {
++ vers &= ~(NFS_VERS_MASK);
++ vers |= NFS4_VERS_MASK | TCP_SUPPORTED | NFS4_ONLY_REQUESTED;
++ } else if (_strncmp("vers=3", cp, o_len) == 0 ||
+ _strncmp("nfsvers=3", cp, o_len) == 0) {
+- vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK);
++ vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED);
+ vers |= NFS3_REQUESTED;
+ } else if (_strncmp("vers=2", cp, o_len) == 0 ||
+ _strncmp("nfsvers=2", cp, o_len) == 0) {
+- vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK);
++ vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED);
+ vers |= NFS2_REQUESTED;
+ } else if (strstr(cp, "port=") == cp &&
+ o_len - 5 < 25) {
+diff --git a/modules/replicated.c b/modules/replicated.c
+index 09075dd0..cdb7c617 100644
+--- a/modules/replicated.c
++++ b/modules/replicated.c
+@@ -291,7 +291,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
+
+ rpc_info->proto = proto;
+ if (port < 0) {
+- if ((version & NFS4_REQUESTED) && (version & TCP_REQUESTED))
++ if (version & NFS4_REQUESTED && (version & NFS4_ONLY_REQUESTED))
+ rpc_info->port = NFS_PORT;
+ else
+ port = 0;
+@@ -525,7 +525,7 @@ static int get_vers_and_cost(unsigned logopt, struct host *host,
+ {
+ struct conn_info pm_info, rpc_info;
+ time_t timeout = RPC_TIMEOUT;
+- unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK);
++ unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK | NFS4_ONLY_REQUESTED);
+ int ret = 0;
+
+ if (!check_address_proto(logopt, host, version))
diff --git a/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
index 559bfa43ea7..89c9623e16c 100644
--- a/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit autotools bash-completion-r1 linux-info multilib pam python-single-r1
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 5bcbd2ff645..9cf351dcd24 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,2 +1,3 @@
DIST cvmfs-2.8.1.tar.gz 44117247 BLAKE2B 3505747833779463df79e40c03359c8458d51d2e4635ce6bc7ac080112ca4e81ca914dc6866afc28094e656acf8e3051749ec278e00b8357a50dd530fc2b65be SHA512 3ca4a45e24e06e4ea46a708b3e47fafc4c6eae172c296b091c8d0fb6b2d21c64d4b8975baf7f055101a9d68ada1e3082e7ec808da3fdaf68b5a3a3b5c4ed7731
DIST cvmfs-2.8.2.tar.gz 44130007 BLAKE2B 3c15c3549971deb418ee142bbec0db8ae272d0fe5371e618460e31bd2c083ff1d1c00e5bc3520b199fdf3297cad278185617f51a217f75120dd71ea792a7a8a8 SHA512 a3a1a6d4eb36248744145393d6ebe5015f8f1d4506bb9adca13b19f68a2e57cdf77fc0e7202ff4e8a927bff3a6e1808f9c740755145b860f2915a31ec9dd5fa3
+DIST cvmfs-2.9.0.tar.gz 48042721 BLAKE2B 614fcacbcc142c22f871e511db951c826245651ce29760f05c132dffc7920c1232c96a51a70d65cae6f48d8e6564d4ed3a30b4c460dce0b37ad24994571b32f1 SHA512 9ff5ba0ff2fe917403e9f7a5139c28c861e95a93d96bf8ff5a7fb7f36dca3b8ddf0d8b2763396a70950f98b032d34d6c0f1ea093e53bf950c5370c933abc22b5
diff --git a/net-fs/cvmfs/cvmfs-2.9.0.ebuild b/net-fs/cvmfs/cvmfs-2.9.0.ebuild
new file mode 100644
index 00000000000..05bf7f55363
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.9.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="https://cernvm.cern.ch/fs/"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+CDEPEND="
+ acct-group/cvmfs
+ acct-user/cvmfs
+ app-arch/libarchive
+ dev-cpp/gtest
+ dev-cpp/sparsehash
+ dev-db/sqlite:3=
+ <dev-libs/leveldb-1.23:0=
+ dev-libs/openssl:0=
+ dev-libs/protobuf:0=
+ net-dns/c-ares:0=
+ net-libs/pacparser:0=
+ net-misc/curl:0[adns]
+ sys-apps/attr
+ sys-fs/fuse:0=
+ sys-fs/fuse:3=
+ sys-libs/libcap:0=
+ sys-libs/zlib:0=
+"
+
+RDEPEND="${CDEPEND}
+ app-admin/sudo
+ net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.7.2-builtins.patch
+ "${FILESDIR}"/${PN}-2.7.2-find-package.patch
+)
+
+pkg_setup() {
+ if use server; then
+ CONFIG_CHECK="~OVERLAY_FS"
+ ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+ # gentoo stuff
+ rm bootstrap.sh || die
+ sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
+ sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+ CMakeLists.txt || die
+ eapply_user
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILTIN_EXTERNALS=OFF
+ -DBUILD_CVMFS=ON
+ -DBUILD_LIBCVMFS=OFF # static library used only for development
+ -DBUILD_DOCUMENTATION=OFF
+ -DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+ -DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+ -DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+ -DBUILD_RECEIVER=OFF # for distributed publishers only
+ -DBUILD_SERVER=$(usex server)
+ -DINSTALL_BASH_COMPLETION=OFF
+ -DINSTALL_MOUNT_SCRIPTS=ON
+ -DINSTALL_PUBLIC_KEYS=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
+ bashcomp_alias cvmfs_config cvmfs_server
+ dodoc doc/*.md
+ keepdir /var/lib/cvmfs
+ use server && keepdir /var/lib/cvmfs-server
+}
+
+pkg_config() {
+ einfo "Setting up CernVM-FS client"
+ cvmfs_config setup
+ einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
+ einfo "and restart the autofs service"
+}
diff --git a/net-fs/docker-volume-netshare/Manifest b/net-fs/docker-volume-netshare/Manifest
deleted file mode 100644
index fef83b04786..00000000000
--- a/net-fs/docker-volume-netshare/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST docker-volume-netshare-0.35.tar.gz 18874 BLAKE2B 5d165b04014743cf4bf3bcdc7aab4d2d8c71906f21c7c6254b164fd92a935f4d806b7486a18bcba158c830a378237a07c8ef24d4f2704deab221fe5b97ea1ea6 SHA512 b1cc165b11d97d649b2d15cdc97888916ca6824b9a6206668b41e28ece977ec7b2f5e59664a1a618996d63c0645976315e3f7353eca370b4881f3412e9fed521
-DIST github.com-Sirupsen-logrus-8c0189d9f6bbf301e5d055d34268156b317016af.tar.gz 28679 BLAKE2B 47127a7f53db13bcb4977f21b7faaaccc1aa23b8adb94ce1a97196ffe430f4a3241d72e1c5a4861c7bcf2787e027a907e9fcf8405a98fe37547f5dcba8efaf10 SHA512 2f096d0e55c5debeb50b56905702b2a5b37b2b4dc35f08e303ee4c8c449473b3cd4aa776f23598785c1667b7a64af525c6f0696089b0b9c31214eb3e3a9af192
-DIST github.com-coreos-go-systemd-25fe332a900022d06a189ce01108392854c59df1.tar.gz 59314 BLAKE2B 4538ec89eb7386ac9d978b34c2372ec65ed16f3a4c32abdbd7c8b2e820eecf3fd958aab967e7ad7b06a2798b34e0db812f2bfbc7ee3f7859e5721bfdf0ef6662 SHA512 a7a666f36aa14b2de3026fb1509a39c519864f456992f3b2b82753e239422897e0aaa2646313693e0a0731e78cb58135b7a6d9a435db1a7e178e2f303807daa1
-DIST github.com-dickeyxxx-netrc-e1a19c977509b96a5c76996dec63ab5aac67c38c.tar.gz 5936 BLAKE2B f739f764d1bba5d5745280aa7f390f6ddc9cbdcb8d00a0845884624dc1cc1e3e85a916e561c949c28ec8535a4a1ffa5d91e8d3e097c9b80fc521cec98116dc79 SHA512 1a4d29c41c987d5c4d2fbd91b22cc3e0b11b6db6208cb38f2a03d0a91b85450e6895787c0c2e96e7dd67d11f9c742af3a80472517faa4cc49e7165b005b0d5fb
-DIST github.com-docker-go-connections-7beb39f0b969b075d1325fecb092faf27fd357b6.tar.gz 30766 BLAKE2B c0c2b70e16341d95f5a7b99280833c8775c5c25e4b7d646dea8cc750cb12d2fd0105dc17794c74f6f983d2747a96b61ec70a35c7aa2f2b874205b4cf8f9af082 SHA512 dc3f44c94030b3ce1f4a9cac15d7f5c70bca2c8e535ed5581f128e5ce520a47d006d3776bf78c8faa2ac899e202fca272806ee6e8c9d23da76f1e1d964169a14
-DIST github.com-docker-go-plugins-helpers-61cb8e2334204460162c8bd2417cd43cb71da66f.tar.gz 26117 BLAKE2B 41337898be01f7fe0e8e819163884281eed9a77804241f741b1c833ace8d9f8df211a3238be2b8cd544b50e9d920123ed5aaf70725d77cf3077e11d795081e7c SHA512 44a1661dc3ca5e5262153a62702a4944cfa41d2925f735b79208e78837e9144e32801ded6af80c69a70d0b4eba367c59b2fb3bada18adfb374820a0ac82ba7b5
-DIST github.com-golang-crypto-432090b8f568c018896cd8a0fb0345872bbac6ce.tar.gz 1451209 BLAKE2B bef38d2cd606eaa06ca8fb226ba7ac0f1078df1232428c868fcc1ceaaeba1b781b1152747a6f92a0a40cda67b07fddf091d70fd28abb7b40028884d1a2a8c9f0 SHA512 97ebc686dfdf17d3887485063f2f808c041cbecd78fd8b6285fde2c22c8f0059c1b70eccdc4353b20d55902bc8c199edc53c564368c1ff4aed65ef534dc8b9f3
-DIST github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz 936963 BLAKE2B 19f9996d10bd9f5aecd2bba512301519c65acd6d1c11e97617e69c4fe810f3558b05e1a3d546d3ee75c6eda96d310f63906a9217505d16d35438ca8544de4f68 SHA512 48e12282dc20ee3c614a7622ea10d986071976e3c3ea04eae01469d5e50495f9b22ccc70f0dc1ac00a5a8fda86ecb350acc6708d9467fc588a0aafc9e3641f7c
-DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
-DIST github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz 2517679 BLAKE2B ad17feb9fe826f84d65e6fe85f10cf6cf901bc6cf593d9e44a02edce72e399b0184a29617cb67f38b2fb0278ffa46d872c32f997c3facc2154a23cceec046bdd SHA512 d4f6709e2c20a3d639b167c0d0e7f987cd2e2d849899460ed26cc7e7f4ce682b45eb3be59a4be91e872a9eea29130f72a7de4f3c1006d99449c6f762f993b9bb
-DIST github.com-spf13-cobra-be77323fc05148ef091e83b3866c0d47c8e74a8b.tar.gz 100452 BLAKE2B 921b681489b620c626ecdc112b20e45cd0a424d6a1088c1b45e4a3339e7645d9a29154c6fcb341af6e3d80750bc8a89aec837d8a3741b9665ab065526e1188b0 SHA512 81edc5080eba62c58766597d3e1e02779eeb1ee578d7d3fd36cd38c725d58e02300960f311cb4cf1713127ef3ccbe16d581399e2bd7e20f2e37fee7a68dcbf15
-DIST github.com-spf13-pflag-ee5fd03fd6acfd43e44aea0b4135958546ed8e73.tar.gz 41039 BLAKE2B 1dae2f35f0f165c94b3477cf853126cd7c3a9171bbfa639b505936c6ec495a27f99d2c69b34cdf09641959ada6559b5d707cca808069eb4dae20ac4a5443fc89 SHA512 4b5ed5c08f08f347be1832ea5bb8b8ea4ca7b5c5fc8aff2a08dfe667e0c8c0bc1a55ade7ebe83d68746a10af317eec3e8053d2d63a3e24caf437eff7405e719c
diff --git a/net-fs/docker-volume-netshare/docker-volume-netshare-0.35.ebuild b/net-fs/docker-volume-netshare/docker-volume-netshare-0.35.ebuild
deleted file mode 100644
index 5e6cf0daa46..00000000000
--- a/net-fs/docker-volume-netshare/docker-volume-netshare-0.35.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ContainX/docker-volume-netshare"
-EGIT_COMMIT="v${PV}"
-
-EGO_VENDOR=( "github.com/Sirupsen/logrus 8c0189d9f6bbf301e5d055d34268156b317016af"
- "github.com/dickeyxxx/netrc e1a19c977509b96a5c76996dec63ab5aac67c38c"
- "github.com/docker/go-plugins-helpers 61cb8e2334204460162c8bd2417cd43cb71da66f"
- "github.com/coreos/go-systemd 25fe332a900022d06a189ce01108392854c59df1"
- "github.com/docker/go-connections 7beb39f0b969b075d1325fecb092faf27fd357b6"
- "github.com/miekg/dns 5364553f1ee9cddc7ac8b62dce148309c386695b"
- "github.com/spf13/cobra be77323fc05148ef091e83b3866c0d47c8e74a8b"
- "github.com/spf13/pflag ee5fd03fd6acfd43e44aea0b4135958546ed8e73"
- "golang.org/x/net cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb github.com/golang/net"
- "golang.org/x/crypto 432090b8f568c018896cd8a0fb0345872bbac6ce github.com/golang/crypto"
- "golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd github.com/golang/sys"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-DESCRIPTION="Docker NFS, AWS EFS, Ceph & Samba/CIFS Volume Plugin"
-HOMEPAGE="https://github.com/ContainX/docker-volume-netshare"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm64"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
- default
- sed -i -e "s/dmaj/ContainX/" -e "s/VERSION string = \"\"/VERSION string =\"${PV}\"/" src/${EGO_PN}/main.go || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- CGO_LDFLAGS="-fno-PIC" GOPATH="${S}" go build || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin ${PN}
- dodoc README.md
- popd || die
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-fs/docker-volume-netshare/files/docker-volume-netshare.confd b/net-fs/docker-volume-netshare/files/docker-volume-netshare.confd
deleted file mode 100644
index a8a88debb29..00000000000
--- a/net-fs/docker-volume-netshare/files/docker-volume-netshare.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for docker-volume-netshare plugin
-command_args="nfs -o nolock"
diff --git a/net-fs/docker-volume-netshare/files/docker-volume-netshare.initd b/net-fs/docker-volume-netshare/files/docker-volume-netshare.initd
deleted file mode 100644
index d80b7be9484..00000000000
--- a/net-fs/docker-volume-netshare/files/docker-volume-netshare.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Docker Volume Netshare plugin"
-pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
-command="/usr/bin/docker-volume-netshare"
-command_args="${command_args:nfs}"
-command_background="true"
-start_stop_daemon_args="--stdout /var/log/${SVCNAME}.log \
- --stderr /var/log/${SVCNAME}.log"
diff --git a/net-fs/docker-volume-netshare/metadata.xml b/net-fs/docker-volume-netshare/metadata.xml
deleted file mode 100644
index 474d1933e1e..00000000000
--- a/net-fs/docker-volume-netshare/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">ContainX/docker-volume-netshare</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-fs/ksmbd-tools/Manifest b/net-fs/ksmbd-tools/Manifest
new file mode 100644
index 00000000000..9a76c136209
--- /dev/null
+++ b/net-fs/ksmbd-tools/Manifest
@@ -0,0 +1 @@
+DIST ksmbd-tools-3.4.4.tar.gz 75481 BLAKE2B 84c215b0ccad01956185d42b858eb0de6a3407fc32c59628964ab38a2946fe5123fc73cc06cb04e8864199751f26e509ae5f6ebf6f5e7eb5f1fb8f21a4452a48 SHA512 b7be00e38eb126a0d5b8b3d9dde7c997b4012b29604d899a5f2fe3a77a3c30ac5d4bf00b7fc88d57150fd574af38bd2823c736d272a2cd596d40ccbe14a15320
diff --git a/net-fs/ksmbd-tools/files/confd b/net-fs/ksmbd-tools/files/confd
new file mode 100644
index 00000000000..81248468d53
--- /dev/null
+++ b/net-fs/ksmbd-tools/files/confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/ksmbd: config file for /etc/init.d/ksmbd
+#
+
+# Full path to config file. /etc/ksmbd/smb.conf is default if not set.
+#KSMBD_CONF="/etc/ksmbd/smb.conf"
diff --git a/net-fs/ksmbd-tools/files/initd b/net-fs/ksmbd-tools/files/initd
new file mode 100644
index 00000000000..f65770ed44c
--- /dev/null
+++ b/net-fs/ksmbd-tools/files/initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+KSMBD_CONF="${KSMBD_CONF:-/etc/ksmbd/smb.conf}"
+
+depend() {
+ need localmount
+ use net
+}
+
+description="ksmbd userspace daemon"
+
+command="/sbin/ksmbd.mountd"
+command_control="/sbin/ksmbd.control"
+command_args="-s"
+
+required_files="${KSMBD_CONF}"
+
+start_pre() {
+ /sbin/modprobe ksmbd || return 1
+}
+
+stop() {
+ ebegin "Stopping ${RC_SVCNAME}"
+ "${command_control}" -s
+ eend $?
+}
+
+stop_post() {
+ /sbin/modprobe -r -q ksmbd || return 0
+}
diff --git a/net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild
new file mode 100644
index 00000000000..727d4cd275f
--- /dev/null
+++ b/net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="cifsd/ksmbd kernel server userspace utilities"
+HOMEPAGE="https://github.com/cifsd-team/ksmbd-tools"
+SRC_URI="https://github.com/cifsd-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/libnl:3
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+ # we don't want to die() here to be able to build binpkgs
+ kernel_is -lt 5 15 && eerror "kernel >= 5.15 required for ${PN}"
+ CONFIG_CHECK="~SMB_SERVER"
+ ERROR_SMB_SERVER="CONFIG_SMB_SERVER is not set: ksmbd is not enabled in kernel, ${PN} will not work"
+ # use krb5 && CONFIG_CHECK+=" ~SMB_SERVER_KERBEROS5"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ eautoreconf
+ default
+}
+
+src_configure() {
+ # TODO: add kerberos support, explicitly disable for now
+ # tools are expected to recide in /sbin, not /usr/sbin
+ econf --prefix="${EPREFIX}/" --enable-krb5=no
+}
+
+src_install() {
+ default
+
+ local DOCS=( README README.md Documentation/configuration.txt smb.conf.example )
+ einstalldocs
+
+ insinto /etc/ksmbd
+ doins smb.conf.example
+
+ newinitd "${FILESDIR}/initd" ksmbd
+ newconfd "${FILESDIR}/confd" ksmbd
+
+ dosym ksmbd.addshare /sbin/smbshareadd
+ dosym ksmbd.adduser /sbin/smbuseradd
+
+ systemd_dounit ksmbd.service
+}
diff --git a/net-fs/ksmbd-tools/metadata.xml b/net-fs/ksmbd-tools/metadata.xml
new file mode 100644
index 00000000000..191c21a4e98
--- /dev/null
+++ b/net-fs/ksmbd-tools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gyakovlev@gentoo.org</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">cifsd-team/ksmbd-tools</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ KSMBD is a linux kernel server which implements SMB3 protocol in kernel space for sharing files over network.
+ ksmbd.mountd is userspace process to transfer user account and password that are registered using ksmbd.adduser (part of this package).
+ Further it allows sharing information parameters that parsed from smb.conf to ksmbd in kernel.
+ </longdescription>
+</pkgmetadata>
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 51da327ce84..c36c94e4db6 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,2 +1 @@
-DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f SHA512 3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732
DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c SHA512 b1395c5b06a06246666c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index da81e6d6684..6540c9f9207 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -51,7 +51,7 @@ mount_nfsd() {
fi
# Restart idmapd if needed #220747
if grep -qs nfsd /proc/modules ; then
- killall -q -HUP rpc.idmapd
+ killall -q --signal=HUP rpc.idmapd
fi
fi
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
deleted file mode 100644
index 75b24ff6761..00000000000
--- a/net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
- MY_PV="$(ver_rs 1- -)"
- SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
- SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND="
- >=dev-db/sqlite-3.3
- dev-libs/libxml2
- net-libs/libtirpc:=
- >=net-nds/rpcbind-0.2.4
- sys-fs/e2fsprogs
- caps? ( sys-libs/libcap )
- ldap? ( net-nds/openldap )
- libmount? ( sys-apps/util-linux )
- nfsv4? (
- dev-libs/libevent:=
- >=sys-apps/keyutils-1.5.9:=
- kerberos? (
- >=net-libs/libtirpc-0.2.4-r1[kerberos]
- app-crypt/mit-krb5
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- tcpd? ( sys-apps/tcp-wrappers )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
- !net-libs/libnfsidmap
- !net-nds/portmap
- !<sys-apps/openrc-0.13.9
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )
-"
-BDEPEND="
- net-libs/rpcsvc-proto
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.5.2-no-werror.patch )
-
-pkg_setup() {
- linux-info_pkg_setup
- if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
- ewarn "Your NFS server will be unable to track clients across server restarts!"
- ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
- ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
- ewarn "support the legacy, in-kernel client tracker."
- fi
-}
-
-src_prepare() {
- default
-
- sed \
- -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
- -i utils/*/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- local myeconfargs=(
- --disable-static
- --with-statedir="${EPREFIX}"/var/lib/nfs
- --enable-tirpc
- --with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
- --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
- --with-rpcgen
- --with-systemd="$(systemd_get_systemunitdir)"
- --without-gssglue
- $(use_enable caps)
- $(use_enable ipv6)
- $(use_enable junction)
- $(use_enable kerberos gss)
- $(use_enable kerberos svcgss)
- $(use_enable ldap)
- $(use_enable libmount libmount-mount)
- $(use_enable nfsdcld nfsdcltrack)
- $(use_enable nfsv4)
- $(use_enable nfsv41)
- $(use_enable uuid)
- $(use_with tcpd tcp-wrappers)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # remove compiled files bundled in the tarball
- emake clean
- default
-}
-
-src_install() {
- default
- rm linux-nfs/Makefile* || die
- dodoc -r linux-nfs README
-
- # Don't overwrite existing xtab/etab, install the original
- # versions somewhere safe... more info in pkg_postinst
- keepdir /var/lib/nfs/{,sm,sm.bak}
- mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
- if use nfsv4 && use nfsidmap ; then
- insinto /etc
- doins support/nfsidmap/idmapd.conf
-
- # Install a config file for idmappers in newer kernels. #415625
- insinto /etc/request-key.d
- echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
- doins id_resolver.conf
- fi
-
- insinto /etc
- doins "${FILESDIR}"/exports
- keepdir /etc/exports.d
-
- local f list=() opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list+=( rpc.idmapd rpc.pipefs )
- use kerberos && list+=( rpc.gssd rpc.svcgssd )
- fi
- for f in nfs nfsclient rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
- for f in nfs nfsclient ; do
- newconfd "${FILESDIR}"/${f}.confd ${f}
- done
- sed -i \
- -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
- "${ED}"/etc/conf.d/nfs || die #234132
-
- local systemd_systemunitdir="$(systemd_get_systemunitdir)"
- sed -i \
- -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
- "${ED}${systemd_systemunitdir}"/* || die
-
- keepdir /var/lib/nfs #368505
- keepdir /var/lib/nfs/v4recovery #603628
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- # Install default xtab and friends if there's none existing. In
- # src_install we put them in /usr/lib/nfs for safe-keeping, but
- # the daemons actually use the files in /var/lib/nfs. #30486
- local f
- for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
- cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
- done
-
- if systemd_is_booted; then
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt 1.3.0; then
- ewarn "We have switched to upstream systemd unit files. Since"
- ewarn "they got renamed, you should probably enable the new ones."
- ewarn "You can run 'equery files nfs-utils | grep systemd'"
- ewarn "to know what services you need to enable now."
- fi
- done
- else
- ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
- ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
- ewarn "same runlevel as nfsmount."
- fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
index 704a37b9d64..0f2697c1283 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
@@ -27,7 +27,7 @@ RESTRICT="test" #315573
# files, and nfs-utils doesn't build against heimdal either,
# so don't depend on virtual/krb.
# (04 Feb 2005 agriffis)
-DEPEND="
+COMMON_DEPEND="
dev-db/sqlite:3
dev-libs/libxml2
net-libs/libtirpc:=
@@ -55,7 +55,10 @@ DEPEND="
)
tcpd? ( sys-apps/tcp-wrappers )
uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="${COMMON_DEPEND}
!net-libs/libnfsidmap
!net-nds/portmap
!<sys-apps/openrc-0.13.9
diff --git a/net-fs/openafs-legacy/metadata.xml b/net-fs/openafs-legacy/metadata.xml
deleted file mode 100644
index 85e4ed814fa..00000000000
--- a/net-fs/openafs-legacy/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild b/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
deleted file mode 100644
index 5ad939b711b..00000000000
--- a/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Legacy path symlinks to access FHS-compliant OpenAFS installation"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/baselayout"
-RDEPEND="${DEPEND}"
-PDEPEND="net-fs/openafs"
-
-S="${WORKDIR}"
-
-# As a guide for these links, acinclude.m4 from the openafs package was
-# used. A README file exists as well, but at the time of writing, the
-# afsbosserver-variable was inaccurately described.
-
-src_install() {
- # some basenames for FHS paths
- sysconfdir=/etc
- libexecdir=/usr/libexec
- localstatedir=/var/lib
- sbindir=/usr/sbin
-
- # create parent directories for Transarc mode
- dodir /usr/{vice,afs}
-
- # viceetcdir
- viceetcdir=${sysconfdir}/openafs
- dosym ${viceetcdir} /usr/vice/etc
-
- # afssrvdir
- afssrvbindir=${libexecdir}/openafs
- dosym ${afssrvbindir} /usr/afs/bin
-
- # afsconfdir
- afsconfdir=${sysconfdir}/openafs/server
- dosym ${afsconfdir} /usr/afs/etc
-
- # afslocaldir
- afslocaldir=${localstatedir}/openafs
- dosym ${afslocaldir} /usr/afs/local
-
- # afsdbdir
- afsdbdir=${localstatedir}/openafs/db
- dosym ${afsdbdir} /usr/afs/db
-
- # afslogdir
- afslogdir=${localstatedir}/openafs/logs
- dosym ${afslogdir} /usr/afs/logs
-
- # afsbosconfig
- dodir ${afslocaldir}
- dosym ${viceetcdir}/BosConfig ${afslocaldir}/BosConfig
-
- # afsbosserver
- dodir ${afssrvbindir}
- dosym ${sbindir}/bosserver ${afssrvbindir}/bosserver
-}
-
-pkg_prerm() {
- ewarn "It is recommended to remove this package AFTER removing openafs"
- ewarn "This way there will be no dead links left lying around"
-}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 80a8020f345..a5e32ac409a 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,3 +1,6 @@
DIST openafs-1.8.7-doc.tar.bz2 3808045 BLAKE2B 8ded75239dd59633297ee4208a0f3f018486b5b5b71fda91229583fd2d6a7743bbbeba280e61ff91d602617fc47944105b06a5c0610b0c89c808ecba38af7f9c SHA512 6d087320ab6681686b6afb78621b21eaec26b91dbd03a13df447ad9f0ce897332ac378b38bf1abc590575d82d8cb22757249e60a2407e4ad498d46c083632e0d
DIST openafs-1.8.7-src.tar.bz2 15059909 BLAKE2B 89aacc48100d3eabbec45acca3911fbd823c029a30e79ad16564dcc3646b9bbadb60a528f142fc907de0d4eb2831d922d8146cdba72c02f4e8db9ab806c84d86 SHA512 12d5aa9177dde10e504f71b4b1ae19be0b0c52e8031e0f5afacce4a2c3f2321970af65591edab6145f7400f6276acd7e8624aa66e816d2394324e2ef5c403c01
+DIST openafs-1.8.8.1-doc.tar.bz2 3770278 BLAKE2B 4d10c96f05190a71b8d7aa89557946d0b95774ca77f40d8e9ca81f5d5bacff1966e637f3bd066181f2dcf182dbfffdf93521981745fe4dbfea142e6b17fcf574 SHA512 c229636ca4c7245d37fa25b02805982e3f667163ae312e14678117c60320ccce50230bf09e081167e789a76bad8fa39a88638cb439ab87954c93b6108004efa8
+DIST openafs-1.8.8.1-src.tar.bz2 14866119 BLAKE2B ae58a1d30fc8d72b4487700203c03e62fc15d0034a03516d4ea5b52c33970e8d9954e6b3c812a4633910c512d283c11431abbcb3868569d8d5ced1a69585263e SHA512 fb181e0989e9bae714af26de916a96946eea20f98b47154f2de7b5e296cb4f42af5df037ef7b603073e97eafe52d7c401666f03130c1e0c9a6ae1a6c2707c384
DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5 SHA512 06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007
+DIST openafs-patches-20211212.tar.xz 13892 BLAKE2B 64582135ff3b81725cf0510d1157785b112f76197b8f50a947d22a82b8b55bebd163f2288b19d68a994f22c78bd90b6bfdad5f75383df1cac06d40feb72e8de8 SHA512 40a1a0d126ae194609da8a264c26b278b6081d95020bcbdb3a809952a70535fa551d1983e811e4ab9deaec06f061075906c2bbaf91e4354bff3520584e3fd336
diff --git a/net-fs/openafs/openafs-1.8.7.ebuild b/net-fs/openafs/openafs-1.8.7.ebuild
index f2f6237fddc..8d42811d43c 100644
--- a/net-fs/openafs/openafs-1.8.7.ebuild
+++ b/net-fs/openafs/openafs-1.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -127,8 +127,6 @@ src_configure() {
fi
myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
--with-linux-kernel-build="${KV_OUT_DIR}" )
- elif use kernel_FreeBSD; then
- myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
fi
fi
@@ -187,9 +185,6 @@ src_install() {
MODULE_NAMES="libafs(fs/openafs:${srcdir})"
linux-mod_src_install
- elif use kernel_FreeBSD; then
- insinto /boot/modules
- doins "${S}"/src/libafs/MODLOAD/libafs.ko
fi
fi
@@ -286,7 +281,6 @@ pkg_preinst() {
pkg_postinst() {
if use modules; then
# Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
use kernel_linux && linux-mod_pkg_postinst
fi
@@ -309,7 +303,6 @@ pkg_postinst() {
pkg_postrm() {
if use modules; then
# Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
use kernel_linux && linux-mod_pkg_postrm
fi
}
diff --git a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild
new file mode 100644
index 00000000000..bedbe27e50a
--- /dev/null
+++ b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="modules"
+inherit autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+PVER=20211212
+KERNEL_LIMIT=5.17
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="https://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+ https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+ https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
+ https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
+ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
+
+BDEPEND="
+ dev-lang/perl
+ sys-devel/flex
+ virtual/yacc
+ apidoc? (
+ app-doc/doxygen[dot]
+ media-gfx/graphviz
+ )
+ doc? (
+ dev-libs/libxslt
+ || (
+ dev-java/fop
+ app-text/dblatex
+ app-text/docbook-sgml-utils[jadetex]
+ )
+ )
+ perl? ( dev-lang/swig )"
+DEPEND="
+ !net-fs/openafs-kernel
+ virtual/libcrypt:=
+ virtual/libintl
+ amd64? ( tsm? ( app-backup/tsm ) )
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.3
+ )
+ fuse? ( sys-fs/fuse:0= )
+ kauth? ( sys-libs/pam )
+ kerberos? ( virtual/krb5 )
+ ncurses? ( sys-libs/ncurses:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+CONFIG_CHECK="~!AFS_FS KEYS"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+pkg_pretend() {
+ if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then
+ ewarn "Gentoo supports kernels which are supported by OpenAFS"
+ ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}"
+ ewarn ""
+ ewarn "You are free to utilize epatch_user to provide whatever"
+ ewarn "support you feel is appropriate, but will not receive"
+ ewarn "support as a result of those changes."
+ ewarn ""
+ ewarn "Please do not file a bug report about this."
+ ewarn ""
+ ewarn "Alternatively, you may:"
+ ewarn "1. Use OpenAFS FUSE client, build OpenAFS with USE=fuse to enable it."
+ ewarn "2. Use native kernel AFS client: configure your kernel with CONFIG_AFS_FS."
+ ewarn "net-fs/openafs is not required in this case, but client's functionality will be limited."
+ fi
+}
+
+pkg_setup() {
+ use kernel_linux && linux-mod_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # fixing 2-nd level makefiles to honor flags
+ sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+ src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+ # build system is very delicate, so we can't run eautoreconf
+ # run autotools commands based on what is listed in regen.sh
+ _elibtoolize -c -f -i
+ eaclocal -I src/cf -I src/external/rra-c-util/m4
+ eautoconf
+ eautoconf -o configure-libafs configure-libafs.ac
+ eautoheader
+ einfo "Deleting autom4te.cache directory"
+ rm -rf autom4te.cache || die
+}
+
+src_configure() {
+ local -a myconf
+
+ if use debug; then
+ use kauth && myconf+=( --enable-debug-pam )
+ use modules && myconf+=( --enable-debug-kernel )
+ fi
+
+ if use modules; then
+ if use kernel_linux; then
+ if kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+ myconf+=( --enable-linux-d_splice_alias-extra-iput )
+ fi
+ myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
+ --with-linux-kernel-build="${KV_OUT_DIR}" )
+ fi
+ fi
+
+ use amd64 && use tsm && myconf+=( --enable-tivoli-tsm )
+
+ local ARCH="$(tc-arch-kernel)"
+ local MY_ARCH="$(tc-arch)"
+ local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+ AFS_SYSKVERS=26 \
+ econf \
+ --disable-strip-binaries \
+ $(use_enable bitmap-later) \
+ $(use_enable debug) \
+ $(use_enable debug debug-locks) \
+ $(use_enable debug debug-lwp) \
+ $(use_enable fuse fuse-client) \
+ $(use_enable kauth) \
+ $(use_enable modules kernel-module) \
+ $(use_enable namei namei-fileserver) \
+ $(use_enable ncurses gtx) \
+ $(use_enable pthreaded-ubik) \
+ $(use_enable supergroups) \
+ $(use_enable ubik-read-while-write) \
+ $(use_with apidoc dot) \
+ $(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets) \
+ $(use_with kerberos krb5) \
+ $(use_with kerberos gssapi) \
+ $(use_with perl swig) \
+ "${myconf[@]}"
+}
+
+src_compile() {
+ ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1
+ local d
+ if use doc; then
+ emake -C doc/xml/AdminGuide auagd000.pdf
+ emake -C doc/xml/AdminRef auarf000.pdf
+ emake -C doc/xml/QuickStartUnix auqbg000.pdf
+ emake -C doc/xml/UserGuide auusg000.pdf
+ fi
+ use apidoc && doxygen doc/doxygen/Doxyfile
+}
+
+src_install() {
+ local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+ local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+ emake DESTDIR="${ED}" install_nolibafs
+
+ if use modules; then
+ if use kernel_linux; then
+ local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+ [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
+
+ MODULE_NAMES="libafs(fs/openafs:${srcdir})"
+
+ linux-mod_src_install
+ fi
+ fi
+
+ insinto /etc/openafs
+ doins src/afsd/CellServDB
+ echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+ echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+ # pam_afs and pam_afs.krb have been installed in irregular locations, fix
+ if use kauth; then
+ dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+ fi
+ rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+ # remove kdump stuff provided by kexec-tools #222455
+ rm -rf "${ED}"/usr/sbin/kdump* || die
+
+ # avoid collision with mit_krb5's version of kpasswd
+ if use kauth; then
+ mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+ mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+ fi
+
+ # avoid collision with heimdal's pagsh
+ if has_version app-crypt/heimdal; then
+ mv "${ED}"/usr/bin/pagsh{,_afs} || die
+ mv "${ED}"/usr/share/man/man1/pagsh{,_afs}.1 || die
+ fi
+
+ # move lwp stuff around #200674 #330061
+ mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+ mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+ # update paths to the relocated lwp headers
+ sed -ri \
+ -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+ "${ED}"/usr/include/*.h \
+ "${ED}"/usr/include/*/*.h \
+ || die
+
+ # minimal documentation
+ use kauth && doman src/pam/pam_afs.5
+ DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
+ src/afsd/CellServDB NEWS README )
+
+ # documentation package
+ rm -rf doc/txt/winnotes || die # unneeded docs
+ if use doc; then
+ DOCS+=( doc/{pdf,protocol,txt} CODING CONTRIBUTING )
+ newdoc doc/xml/AdminGuide/auagd000.pdf AdminGuide.pdf
+ newdoc doc/xml/AdminRef/auarf000.pdf AdminRef.pdf
+ newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf
+ newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf
+ fi
+ use apidoc && DOCS+=( doc/doxygen/output/html )
+ einstalldocs
+
+ # Gentoo related scripts
+ newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+ newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+ newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+ newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+ dotmpfiles "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+ systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+ systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+ systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
+ systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
+
+ # used directories: client
+ keepdir /etc/openafs
+
+ # used directories: server
+ keepdir /etc/openafs/server
+ diropts -m0700
+ keepdir /var/lib/openafs
+ keepdir /var/lib/openafs/db
+ diropts -m0755
+ keepdir /var/lib/openafs/logs
+
+ # link logfiles to /var/log
+ dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+ ## Somewhat intelligently install default configuration files
+ ## (when they are not present)
+ local x
+ for x in cacheinfo CellServDB ThisCell ; do
+ if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
+ cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+ fi
+ done
+}
+
+pkg_postinst() {
+ if use modules; then
+ # Update linker.hints file
+ use kernel_linux && linux-mod_pkg_postinst
+ fi
+
+ tmpfiles_process openafs-client.conf
+
+ elog "This installation should work out of the box (at least the"
+ elog "client part doing global afs-cell browsing, unless you had"
+ elog "a previous and different configuration). If you want to"
+ elog "set up your own cell or modify the standard config,"
+ elog "please have a look at the Gentoo OpenAFS documentation"
+ elog "(warning: it is not yet up to date wrt the new file locations)"
+ elog
+ elog "The documentation can be found at:"
+ elog " https://wiki.gentoo.org/wiki/OpenAFS"
+ elog
+ elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
+ elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
+}
+
+pkg_postrm() {
+ if use modules; then
+ # Update linker.hints file
+ use kernel_linux && linux-mod_pkg_postrm
+ fi
+}
+
+pkg_config() {
+ elog "Setting cache options for systemd."
+
+ SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
+ [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
+
+ CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
+ [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
+
+ if [ ${CACHESIZE} -lt 131070 ]; then
+ AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
+ elif [ ${CACHESIZE} -lt 524288 ]; then
+ AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
+ elif [ ${CACHESIZE} -lt 1048576 ]; then
+ AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
+ elif [ ${CACHESIZE} -lt 2209715 ]; then
+ AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
+ else
+ AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
+ fi
+
+ # Replace existing env var if exists, else append line
+ grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
+ sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
+ sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
+ die "Updating ${SERVICED_FILE} failed."
+}
diff --git a/net-fs/s3backer/Manifest b/net-fs/s3backer/Manifest
index d789d0772f4..207855b6c68 100644
--- a/net-fs/s3backer/Manifest
+++ b/net-fs/s3backer/Manifest
@@ -1,2 +1,2 @@
-DIST s3backer-1.4.5.tar.gz 103318 BLAKE2B 0fb93418ddf0fe295002fe0335f8ea626b8d0cb584f0fab6bcd60964b8dc14b883b35c2e2a973d542715732efe3afb3f7e214b96208a6f33aa991915a4a9ccdc SHA512 9feb42266639981e6f7da5618ec356a5c87fdc3c26fe17b27773509d161df62dcf4e42efbc4bb5d55e2f1cd9ea4cef563274ed5fd4119cf1fb3924e91180f589
DIST s3backer-1.6.1.tar.gz 119768 BLAKE2B 135d5da2e77286d444964b0fca7f152270b4dd1f9e64e4a6d09f50308647add132ce23936f236bcaf9979d75165bc2aa83b3b0f7ddddf03697a275d17ae6836a SHA512 ac75958f15cdbb57b11a829a365bf476b616a9ca596df33dca0d0aff8777e457dd6b15597fe3d2dfc13373304efb8b7cc5ad5d31db9d4760b6fff6981b81a1e4
+DIST s3backer-1.6.3.tar.gz 129742 BLAKE2B 05f8b94e9b5e6ffd11b20d5945a9705f1830f3f358c2777695d0c5066bb044bd314d65259ecde299a51288908fcd869b8c516b30b0fbf66975b46a021d4d5bd6 SHA512 f7db1d733a0426df22c1b7d9c1150f8dbfedd0ba2e9120bd61026a481ed52a16f7f09e9e4fcd072cb656da0536cf98472f369eec0195a03b3f105fb3c9a8ba99
diff --git a/net-fs/s3backer/metadata.xml b/net-fs/s3backer/metadata.xml
index 3acb689e9c4..f18a0fb25a1 100644
--- a/net-fs/s3backer/metadata.xml
+++ b/net-fs/s3backer/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>kaikaikai@yandex.ru</email>
+ <name>Alexey Korepanov</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">s3backer</remote-id>
<remote-id type="github">archiecobbs/s3backer</remote-id>
diff --git a/net-fs/s3backer/s3backer-1.4.5.ebuild b/net-fs/s3backer/s3backer-1.6.3.ebuild
index 8a6fa70538e..8ed0433a296 100644
--- a/net-fs/s3backer/s3backer-1.4.5.ebuild
+++ b/net-fs/s3backer/s3backer-1.6.3.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools
DESCRIPTION="FUSE-based single file backing store via Amazon S3"
HOMEPAGE="https://github.com/archiecobbs/s3backer"
-SRC_URI="https://github.com/archiecobbs/s3backer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/archiecobbs/s3backer/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-DEPEND="net-misc/curl
+DEPEND="dev-libs/expat
+ dev-libs/openssl:0=
+ net-misc/curl
sys-fs/fuse:0
- sys-libs/zlib
- dev-libs/expat
- dev-libs/openssl:0="
+ sys-libs/zlib"
RDEPEND="${DEPEND}"
src_prepare() {
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 8c2a94ee095..175769810b8 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,3 @@
-DIST samba-4.13.10.tar.gz 18450805 BLAKE2B 3e9e1c951efe45b1954428c479aefc715b1fff6264d3735873710ca35a6b28320dd82a21e6abb5d75d500dc93514730f88907f51c601b68dceb1261b13163bf2 SHA512 dc4ad2dabc630575150d7b6db7818cd62827bdd9cc955c856bf0ba1684a1258d6306acd6e373aff1893255ad42d97fe8bf67c6fc30c5cffb1624fbfe4a238865
-DIST samba-4.13.11.tar.gz 18476158 BLAKE2B 43bf88a62078c980e274ad978be0e7de46afbb35a873b0f32638bde20a92cf22a27ea6d3da87b2c79fff76bbc932505aac7e7a5aff04ddbada220f019b7ebb44 SHA512 d22da31ebbea4c4fb33827b47ab0d21e7753802ab310b68fb5edc48a2419f419737f4df6cc138488f28b70142734e68865ad63944445ede921ea09ebc83fbce7
-DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 24046586f666e9db02e1dd71d7eb854691f39e6b575b9652a8b7c1aa5569c856dfd48911e3f221de74f9deec5808152fa2836d03bb9810d55d4f526f1567574b SHA512 35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
-DIST samba-4.14.6.tar.gz 18661572 BLAKE2B d3bd9ba13c89afab1a2d119cbd0488240802710b24c6f681ba962804c6f5097003ed939da8747582aab710405f09ca90eded06eeddd3dd42a5aaa2a99be6be1b SHA512 0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2
-DIST samba-4.14.7.tar.gz 18668592 BLAKE2B 3cd8c806c6af85eecafa93ba10562544815f3d73aaa6152774d2443971e8c46e4c12c3097f82d04d1560410e796d60d681ce6b1a637a09f0262b39a1fe28cbea SHA512 155621b44232f696f389b8e01fd7d8a5ef8d4aa6b3de54090589268cf377c09714715a05e6198ee7e168ead71c08b5b20cd63a71811ef7d9bc9746c0d05ae9a6
-DIST samba-4.15.0.tar.gz 18895040 BLAKE2B ac560e280d5fbea6499547de480f973bf1987558ce6b832fe0f6e5bad8cd58180731e7d1a37f85fce82c52bf735106aedec3ccfda09fa430a5c435e2437994f9 SHA512 5fcd8797f0ac2821f1bb213c9a39c0928847905f701003618f9f160eaa98f3fea25e3d8d4047658b0bd164f3e6a2a63fd7b0133317e536997c764acf7803950d
+DIST samba-4.14.10.tar.gz 19134066 BLAKE2B c6daebc7abbf2ed371ed694e4478d05875d55f7c5a9f83461932eebd7fe9089ff15e0530555d468e64f897d4cadab86e8c0acbfbd20938b3be842cb4324486e2 SHA512 0e1dd386d185cf77a2be4155646e98b3218316b5c290358684ec8eed747ffea67aa7db0937edc971fb791dc47f0f51306db33eb3b8cb65cca8787f18fd4b7f1c
+DIST samba-4.15.2.tar.gz 19252338 BLAKE2B aded33cbefce69c9b20148de1be224514de5cc825404e8188fb0a96022d0fdc6595256f74a5e295fd2e1062e8520775b6c59c1d6a7bf80a52ed9fa9db412dcdd SHA512 6fdf9db0da90332afe527703066cca4ec5b0ec6bf6a5979443953f9fbc18b870a7e2445a41c9ae3d63f7738c9c0282e7ca82f6066aa68e151eec248615ea7b21
+DIST samba-4.15.3.tar.gz 19272345 BLAKE2B ada18904ee7889209488f022daacc34ce1f41c12f9c8c48515cc24aa158072da499cc6ec484cf2b9108c6b2d4074ad734d1850063a354000aa90091faba6f7a6 SHA512 1c30cfa6cd927f4d822dd7227b89542d05d7ab4e50c2d9717eea4fcf1af5120b55d66ec628acd5c887e9bffc732c1d37ab084db953534a2b3987531b10fef63c
diff --git a/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch b/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch
new file mode 100644
index 00000000000..23411dad6be
--- /dev/null
+++ b/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch
@@ -0,0 +1,42 @@
+From bc07c3b70702100975f8921e56cf9b733ec3b826 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze@samba.org>
+Date: Tue, 9 Nov 2021 20:50:20 +0100
+Subject: [PATCH] s3:winbindd: fix "allow trusted domains = no" regression
+
+add_trusted_domain() should only reject domains
+based on is_allowed_domain(), which now also
+checks "allow trusted domains = no", if we don't
+have an explicit trust to the domain (SEC_CHAN_NULL).
+
+We use at least SEC_CHAN_LOCAL for local domains like
+BUILTIN.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899
+
+Signed-off-by: Stefan Metzmacher <metze@samba.org>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+
+Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
+Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184
+
+(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935)
+---
+ source3/winbindd/winbindd_util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
+index 42ddbfd2f44e..9d54e462c425 100644
+--- a/source3/winbindd/winbindd_util.c
++++ b/source3/winbindd/winbindd_util.c
+@@ -134,7 +134,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name,
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+- if (!is_allowed_domain(domain_name)) {
++ if (secure_channel_type == SEC_CHAN_NULL && !is_allowed_domain(domain_name)) {
+ return NT_STATUS_NO_SUCH_DOMAIN;
+ }
+
+--
+2.25.1
+
diff --git a/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch b/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch
new file mode 100644
index 00000000000..457bad16a6e
--- /dev/null
+++ b/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch
@@ -0,0 +1,42 @@
+From 9f73f8a784f2de9211601f92729a47aaa3e51a1a Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze@samba.org>
+Date: Tue, 9 Nov 2021 20:50:20 +0100
+Subject: [PATCH] s3:winbindd: fix "allow trusted domains = no" regression
+
+add_trusted_domain() should only reject domains
+based on is_allowed_domain(), which now also
+checks "allow trusted domains = no", if we don't
+have an explicit trust to the domain (SEC_CHAN_NULL).
+
+We use at least SEC_CHAN_LOCAL for local domains like
+BUILTIN.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899
+
+Signed-off-by: Stefan Metzmacher <metze@samba.org>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+
+Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
+Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184
+
+(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935)
+---
+ source3/winbindd/winbindd_util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
+index fe68adec534a..a8c510fafc67 100644
+--- a/source3/winbindd/winbindd_util.c
++++ b/source3/winbindd/winbindd_util.c
+@@ -135,7 +135,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name,
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+- if (!is_allowed_domain(domain_name)) {
++ if (secure_channel_type == SEC_CHAN_NULL && !is_allowed_domain(domain_name)) {
+ return NT_STATUS_NO_SUCH_DOMAIN;
+ }
+
+--
+2.25.1
+
diff --git a/net-fs/samba/samba-4.13.10-r2.ebuild b/net-fs/samba/samba-4.13.10-r2.ebuild
deleted file mode 100644
index ca82cc436a8..00000000000
--- a/net-fs/samba/samba-4.13.10-r2.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
- SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
- SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- ntvfs? ( addc )
- spotlight? ( json )
- test? ( python )
- !ads? ( !addc )
- ?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/icu:=[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-perl/Parse-Yapp
- >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
- <sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
- sys-libs/libcap[${MULTILIB_USEDEP}]
- sys-libs/liburing:=[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- virtual/libiconv
- $(python_gen_cond_dep "
- addns? (
- dev-python/dnspython:=[\${PYTHON_USEDEP}]
- net-dns/bind-tools[gssapi]
- )
- ")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
- acl? ( virtual/acl )
- ceph? ( sys-cluster/ceph )
- cluster? ( net-libs/rpcsvc-proto )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson:= )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- pam? ( sys-libs/pam )
- python? (
- sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
- )
- snapper? ( sys-apps/dbus )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- || (
- net-libs/rpcsvc-proto
- <sys-libs/glibc-2.26[rpc(+)]
- )
- spotlight? ( dev-libs/glib )
- test? (
- $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
- !system-mitkrb5? (
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/nss_wrapper-1.1.3
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${COMMON_DEPEND}
- client? ( net-fs/cifs-utils[ads?] )
- python? ( ${PYTHON_DEPS} )
- selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- # Package fails to build with distcc
- export DISTCC_DISABLE=1
-
- python-single-r1_pkg_setup
-
- SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
- if use cluster ; then
- SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS+=",idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_enable glusterfs)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with ntvfs ntvfs-fileserver)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with regedit)
- $(multilib_native_use_enable spotlight)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- if multilib_is_native_abi ; then
- myconf+=( --with-shared-modules=${SHAREDMODS} )
- else
- myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
- fi
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- dotmpfiles "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
- keepdir /var/log/samba
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process samba.conf
-
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "Be aware that this release contains the best of all of Samba's"
- elog "technology parts, both a file server (that you can reasonably expect"
- elog "to upgrade existing Samba 3.x releases to) and the AD domain"
- elog "controller work previously known as 'samba4'."
- elog
- fi
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.13.11-r1.ebuild b/net-fs/samba/samba-4.13.11-r1.ebuild
deleted file mode 100644
index ca82cc436a8..00000000000
--- a/net-fs/samba/samba-4.13.11-r1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
- SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
- SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- ntvfs? ( addc )
- spotlight? ( json )
- test? ( python )
- !ads? ( !addc )
- ?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/icu:=[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-perl/Parse-Yapp
- >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
- <sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
- sys-libs/libcap[${MULTILIB_USEDEP}]
- sys-libs/liburing:=[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- virtual/libiconv
- $(python_gen_cond_dep "
- addns? (
- dev-python/dnspython:=[\${PYTHON_USEDEP}]
- net-dns/bind-tools[gssapi]
- )
- ")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
- acl? ( virtual/acl )
- ceph? ( sys-cluster/ceph )
- cluster? ( net-libs/rpcsvc-proto )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson:= )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- pam? ( sys-libs/pam )
- python? (
- sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
- )
- snapper? ( sys-apps/dbus )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- || (
- net-libs/rpcsvc-proto
- <sys-libs/glibc-2.26[rpc(+)]
- )
- spotlight? ( dev-libs/glib )
- test? (
- $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
- !system-mitkrb5? (
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/nss_wrapper-1.1.3
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${COMMON_DEPEND}
- client? ( net-fs/cifs-utils[ads?] )
- python? ( ${PYTHON_DEPS} )
- selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- # Package fails to build with distcc
- export DISTCC_DISABLE=1
-
- python-single-r1_pkg_setup
-
- SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
- if use cluster ; then
- SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS+=",idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_enable glusterfs)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with ntvfs ntvfs-fileserver)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with regedit)
- $(multilib_native_use_enable spotlight)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- if multilib_is_native_abi ; then
- myconf+=( --with-shared-modules=${SHAREDMODS} )
- else
- myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
- fi
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- dotmpfiles "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
- keepdir /var/log/samba
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process samba.conf
-
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "Be aware that this release contains the best of all of Samba's"
- elog "technology parts, both a file server (that you can reasonably expect"
- elog "to upgrade existing Samba 3.x releases to) and the AD domain"
- elog "controller work previously known as 'samba4'."
- elog
- fi
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.13.9-r3.ebuild b/net-fs/samba/samba-4.13.9-r3.ebuild
deleted file mode 100644
index 5ae6e673876..00000000000
--- a/net-fs/samba/samba-4.13.9-r3.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
- SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
- SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- ntvfs? ( addc )
- spotlight? ( json )
- test? ( python )
- !ads? ( !addc )
- ?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/icu:=[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-perl/Parse-Yapp
- >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
- <sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
- sys-libs/libcap[${MULTILIB_USEDEP}]
- sys-libs/liburing:=[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- virtual/libiconv
- $(python_gen_cond_dep "
- addns? (
- dev-python/dnspython:=[\${PYTHON_USEDEP}]
- net-dns/bind-tools[gssapi]
- )
- ")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
- acl? ( virtual/acl )
- ceph? ( sys-cluster/ceph )
- cluster? ( net-libs/rpcsvc-proto )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson:= )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- pam? ( sys-libs/pam )
- python? (
- sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
- )
- snapper? ( sys-apps/dbus )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- || (
- net-libs/rpcsvc-proto
- <sys-libs/glibc-2.26[rpc(+)]
- )
- spotlight? ( dev-libs/glib )
- test? (
- $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
- !system-mitkrb5? (
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/nss_wrapper-1.1.3
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${COMMON_DEPEND}
- client? ( net-fs/cifs-utils[ads?] )
- python? ( ${PYTHON_DEPS} )
- selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- # Package fails to build with distcc
- export DISTCC_DISABLE=1
-
- python-single-r1_pkg_setup
-
- SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
- if use cluster ; then
- SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS+=",idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_enable glusterfs)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with ntvfs ntvfs-fileserver)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with regedit)
- $(multilib_native_use_enable spotlight)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- if multilib_is_native_abi ; then
- myconf+=( --with-shared-modules=${SHAREDMODS} )
- else
- myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
- fi
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- dotmpfiles "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
- keepdir /var/log/samba
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process samba.conf
-
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "Be aware that this release contains the best of all of Samba's"
- elog "technology parts, both a file server (that you can reasonably expect"
- elog "to upgrade existing Samba 3.x releases to) and the AD domain"
- elog "controller work previously known as 'samba4'."
- elog
- fi
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.14.7-r1.ebuild b/net-fs/samba/samba-4.14.10-r2.ebuild
index 3ca6d2708a4..a89e3d9692c 100644
--- a/net-fs/samba/samba-4.14.7-r1.ebuild
+++ b/net-fs/samba/samba-4.14.10-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then
SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
else
SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
fi
S="${WORKDIR}/${MY_P}"
@@ -67,8 +67,11 @@ COMMON_DEPEND="
dev-perl/Parse-Yapp
>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+ || (
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+ sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+ )
+ >=sys-libs/ldb-2.3.2[ldap(+)?,${MULTILIB_USEDEP}]
<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
sys-libs/libcap[${MULTILIB_USEDEP}]
sys-libs/liburing:=[${MULTILIB_USEDEP}]
@@ -144,6 +147,9 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
+
+ # https://bugs.gentoo.org/828063
+ "${FILESDIR}/${P}-winbindd_regression_fix.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -274,7 +280,8 @@ multilib_src_install() {
# create symlink for cups (bug #552310)
if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+ dosym ../../../bin/smbspool \
+ /usr/libexec/cups/backend/smb
fi
# install example config file
@@ -295,7 +302,10 @@ multilib_src_install() {
newconfd "${CONFDIR}/samba4.confd" samba
dotmpfiles "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+ if ! use addc ; then
+ rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+ || die
+ fi
# Preserve functionality for old gentoo-specific unit names
dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
diff --git a/net-fs/samba/samba-4.15.0-r1.ebuild b/net-fs/samba/samba-4.15.2-r2.ebuild
index 16078c10971..20decb463cd 100644
--- a/net-fs/samba/samba-4.15.0-r1.ebuild
+++ b/net-fs/samba/samba-4.15.2-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml(+)"
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
@@ -64,8 +64,11 @@ COMMON_DEPEND="
dev-libs/popt[${MULTILIB_USEDEP}]
dev-perl/Parse-Yapp
>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+ || (
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+ sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+ )
+ >=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
sys-libs/libcap[${MULTILIB_USEDEP}]
sys-libs/liburing:=[${MULTILIB_USEDEP}]
@@ -141,6 +144,9 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
+
+ # https://bugs.gentoo.org/828063
+ "${FILESDIR}/${P}-winbindd_regression_fix.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -269,7 +275,8 @@ multilib_src_install() {
# create symlink for cups (bug #552310)
if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+ dosym ../../../bin/smbspool \
+ /usr/libexec/cups/backend/smb
fi
# install example config file
@@ -290,7 +297,10 @@ multilib_src_install() {
newconfd "${CONFDIR}/samba4.confd" samba
dotmpfiles "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+ if ! use addc ; then
+ rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+ || die
+ fi
# Preserve functionality for old gentoo-specific unit names
dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
diff --git a/net-fs/samba/samba-4.14.6-r2.ebuild b/net-fs/samba/samba-4.15.3-r1.ebuild
index 3ca6d2708a4..498c1edbf41 100644
--- a/net-fs/samba/samba-4.14.6-r2.ebuild
+++ b/net-fs/samba/samba-4.15.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml(+)"
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
@@ -16,24 +16,22 @@ if [[ ${PV} = *_rc* ]]; then
SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
else
SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam
+glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
+ ads? ( acl ldap python winbind )
cluster? ( ads )
gpg? ( addc )
- ntvfs? ( addc )
spotlight? ( json )
test? ( python )
!ads? ( !addc )
@@ -66,17 +64,19 @@ COMMON_DEPEND="
dev-libs/popt[${MULTILIB_USEDEP}]
dev-perl/Parse-Yapp
>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
- <sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+ || (
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+ sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+ )
+ >=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
+ <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
sys-libs/libcap[${MULTILIB_USEDEP}]
sys-libs/liburing:=[${MULTILIB_USEDEP}]
sys-libs/ncurses:0=
sys-libs/readline:0=
- >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+ >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
virtual/libcrypt:=[${MULTILIB_USEDEP}]
virtual/libiconv
@@ -85,7 +85,7 @@ COMMON_DEPEND="
dev-python/dnspython:=[\${PYTHON_USEDEP}]
dev-python/markdown[\${PYTHON_USEDEP}]
)
- addns? (
+ ads? (
dev-python/dnspython:=[\${PYTHON_USEDEP}]
net-dns/bind-tools[gssapi]
)
@@ -210,9 +210,9 @@ multilib_src_configure() {
--nopyc
--nopyo
--without-winexe
+ --accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
$(multilib_native_use_with acl acl-support)
$(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
$(multilib_native_use_with ads)
$(multilib_native_use_enable ceph cephfs)
$(multilib_native_use_with cluster cluster-support)
@@ -223,7 +223,6 @@ multilib_src_configure() {
$(multilib_native_use_with gpg gpgme)
$(multilib_native_use_with json)
$(multilib_native_use_enable iprint)
- $(multilib_native_use_with ntvfs ntvfs-fileserver)
$(multilib_native_use_with pam)
$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
$(multilib_native_use_with quota quotas)
@@ -274,7 +273,8 @@ multilib_src_install() {
# create symlink for cups (bug #552310)
if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+ dosym ../../../bin/smbspool \
+ /usr/libexec/cups/backend/smb
fi
# install example config file
@@ -295,7 +295,10 @@ multilib_src_install() {
newconfd "${CONFDIR}/samba4.confd" samba
dotmpfiles "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+ if ! use addc ; then
+ rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+ || die
+ fi
# Preserve functionality for old gentoo-specific unit names
dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
@@ -333,7 +336,9 @@ pkg_postinst() {
elog "controller work previously known as 'samba4'."
elog
fi
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+ if [[ "${PV}" != *_rc* ]] ; then
+ elog "For further information and migration steps make sure to read "
+ elog "https://samba.org/samba/history/${P}.html "
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+ fi
}
diff --git a/net-fs/sshfs/sshfs-3.7.1.ebuild b/net-fs/sshfs/sshfs-3.7.1.ebuild
index 8fbd75eb7ea..cf05641d5ac 100644
--- a/net-fs/sshfs/sshfs-3.7.1.ebuild
+++ b/net-fs/sshfs/sshfs-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
DEPEND=">=sys-fs/fuse-3.1.0:3