From 82a4045cf0e1ad44a7db019df8f14a2789d5dc38 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Oct 2021 22:58:03 +0100 Subject: net-fs/samba && net-fs/sambacfg : drop --- net-fs/samba/Manifest | 1 - net-fs/samba/files/4.4/samba4.confd | 45 ---- net-fs/samba/files/4.4/samba4.initd-r1 | 54 ---- net-fs/samba/files/4.4/system-auth-winbind.pam | 18 -- net-fs/samba/files/samba-4.4.0-pam.patch | 29 --- net-fs/samba/files/samba.conf | 3 - net-fs/samba/samba-4.14.7-r10.ebuild | 340 ------------------------- net-fs/sambacfg/files/redcore-smb.conf | 20 -- net-fs/sambacfg/sambacfg-1337-r1.ebuild | 31 --- 9 files changed, 541 deletions(-) delete mode 100644 net-fs/samba/Manifest delete mode 100644 net-fs/samba/files/4.4/samba4.confd delete mode 100644 net-fs/samba/files/4.4/samba4.initd-r1 delete mode 100644 net-fs/samba/files/4.4/system-auth-winbind.pam delete mode 100644 net-fs/samba/files/samba-4.4.0-pam.patch delete mode 100644 net-fs/samba/files/samba.conf delete mode 100644 net-fs/samba/samba-4.14.7-r10.ebuild delete mode 100644 net-fs/sambacfg/files/redcore-smb.conf delete mode 100644 net-fs/sambacfg/sambacfg-1337-r1.ebuild (limited to 'net-fs') diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest deleted file mode 100644 index 15ed1637..00000000 --- a/net-fs/samba/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST samba-4.14.7.tar.gz 18668592 BLAKE2B 3cd8c806c6af85eecafa93ba10562544815f3d73aaa6152774d2443971e8c46e4c12c3097f82d04d1560410e796d60d681ce6b1a637a09f0262b39a1fe28cbea SHA512 155621b44232f696f389b8e01fd7d8a5ef8d4aa6b3de54090589268cf377c09714715a05e6198ee7e168ead71c08b5b20cd63a71811ef7d9bc9746c0d05ae9a6 diff --git a/net-fs/samba/files/4.4/samba4.confd b/net-fs/samba/files/4.4/samba4.confd deleted file mode 100644 index 629a6050..00000000 --- a/net-fs/samba/files/4.4/samba4.confd +++ /dev/null @@ -1,45 +0,0 @@ -# Add "winbind" to the daemon_list if you also want winbind to start. -# Replace "smbd nmbd" by "samba4" if you want the active directory domain controller part or the ntvfs -# file server part or the rpc proxy to start. -# Note that samba4 controls 'smbd' by itself, thus it can't be started manually. You can, however, -# tweak the behaviour of a samba4-controlled smbd by modifying your '/etc/samba/smb.conf' file -# accordingly. -daemon_list="smbd nmbd" - -piddir="/run/samba" - -#---------------------------------------------------------------------------- -# Daemons calls: _ -#---------------------------------------------------------------------------- -my_service_name="samba" -my_service_PRE="unset TMP TMPDIR" -my_service_POST="" - -#---------------------------------------------------------------------------- -# Daemons calls: _ -#---------------------------------------------------------------------------- -smbd_start_options="-D" -smbd_command="/usr/sbin/smbd" -smbd_start="start-stop-daemon --start --exec ${smbd_command} -- ${smbd_start_options}" -smbd_stop="start-stop-daemon --stop --exec ${smbd_command}" -smbd_reload="killall -HUP smbd" - -nmbd_start_options="-D" -nmbd_command="/usr/sbin/nmbd" -nmbd_start="start-stop-daemon --start --exec ${nmbd_command} -- ${nmbd_start_options}" -nmbd_stop="start-stop-daemon --stop --exec ${nmbd_command}" -nmbd_reload="killall -HUP nmbd" - -samba4_start_options="" -samba4_command="/usr/sbin/samba" -samba4_pidfile="${piddir}/samba.pid" -samba4_start="start-stop-daemon --start --exec ${samba4_command} --pidfile ${samba4_pidfile} -- ${samba4_start_options}" -samba4_stop="start-stop-daemon --stop --exec ${samba4_command} --pidfile ${samba4_pidfile}" -samba4_reload="killall -HUP samba" - -winbind_start_options="" -winbind_command="/usr/sbin/winbindd" -winbind_start="start-stop-daemon --start --exec ${winbind_command} -- ${winbind_start_options}" -winbind_stop="start-stop-daemon --stop --exec ${winbind_command}" -winbind_reload="killall -HUP winbindd" - diff --git a/net-fs/samba/files/4.4/samba4.initd-r1 b/net-fs/samba/files/4.4/samba4.initd-r1 deleted file mode 100644 index 0a528982..00000000 --- a/net-fs/samba/files/4.4/samba4.initd-r1 +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 or later - -extra_started_commands="reload" -[ -z "${piddir}" ] && piddir="/run/samba" - -depend() { - after slapd - use cupsd -} - -DAEMONNAME="${SVCNAME##samba.}" -[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME} - -signal_do() { - local signal="$1" - [ -z "${signal}" ] && return 0 - - local result=0 last_result=0 daemon= cmd_exec= - for daemon in ${daemon_list} ; do - eval cmd_exec=\$${daemon}_${signal} - if [ -n "${cmd_exec}" ]; then - ebegin "${my_service_name} -> ${signal}: ${daemon}" - #echo ${cmd} '->' ${!cmd} - ${cmd_exec} > /dev/null - last_result=$? - eend ${last_result} - fi - result=$(( ${result} + ${last_result} )) - done - return ${result} -} - -start() { - ${my_service_PRE} - [ -d "${piddir}" ] || mkdir -p "${piddir}" - signal_do start && return 0 - - eerror "Error: starting services (see system logs)" - signal_do stop - return 1 -} -stop() { - ${my_service_PRE} - if signal_do stop ; then - ${my_service_POST} - return 0 - fi -} -reload() { - ${my_service_PRE} - signal_do reload -} diff --git a/net-fs/samba/files/4.4/system-auth-winbind.pam b/net-fs/samba/files/4.4/system-auth-winbind.pam deleted file mode 100644 index 8d6746b7..00000000 --- a/net-fs/samba/files/4.4/system-auth-winbind.pam +++ /dev/null @@ -1,18 +0,0 @@ -#%PAM-1.0 -# $Id$ - -auth required pam_env.so -auth sufficient pam_winbind.so -auth sufficient pam_unix.so likeauth nullok use_first_pass -auth required pam_deny.so - -account sufficient pam_winbind.so -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok use_authtok md5 shadow -password required pam_deny.so - -session required pam_mkhomedir.so skel=/etc/skel/ umask=0022 -session required pam_limits.so -session required pam_unix.so diff --git a/net-fs/samba/files/samba-4.4.0-pam.patch b/net-fs/samba/files/samba-4.4.0-pam.patch deleted file mode 100644 index 45160138..00000000 --- a/net-fs/samba/files/samba-4.4.0-pam.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- samba-4.4.0rc2/source3/wscript -+++ samba-4.4.0rc2/source3/wscript -@@ -870,7 +870,7 @@ - if conf.env.with_iconv: - conf.DEFINE('HAVE_ICONV', 1) - -- if Options.options.with_pam: -+ if Options.options.with_pam != False: - use_pam=True - conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') - if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -943,6 +943,17 @@ - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) - -+ else: -+ Logs.warn("PAM disabled") -+ use_pam=False -+ conf.undefine('WITH_PAM') -+ conf.undefine('WITH_PAM_MODULES') -+ conf.undefine('HAVE_SECURITY_PAM_APPL_H') -+ conf.undefine('PAM_RHOST') -+ conf.undefine('PAM_TTY') -+ conf.undefine('HAVE_PAM_PAM_APPL_H') -+ -+ - seteuid = False - - # diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf deleted file mode 100644 index a7f4946f..00000000 --- a/net-fs/samba/files/samba.conf +++ /dev/null @@ -1,3 +0,0 @@ -D /run/samba 0755 root root -D /run/ctdb 0755 root root -D /run/lock/samba 0755 root root diff --git a/net-fs/samba/samba-4.14.7-r10.ebuild b/net-fs/samba/samba-4.14.7-r10.ebuild deleted file mode 100644 index 4872cae9..00000000 --- a/net-fs/samba/samba-4.14.7-r10.ebuild +++ /dev/null @@ -1,340 +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 ~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 -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.3.0[ldap(+)?,${MULTILIB_USEDEP}] - =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/zlib[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - virtual/libiconv - $(python_gen_cond_dep " - addc? ( - dev-python/dnspython:=[\${PYTHON_USEDEP}] - dev-python/markdown[\${PYTHON_USEDEP}] - ) - addns? ( - dev-python/dnspython:=[\${PYTHON_USEDEP}] - net-dns/bind-tools[gssapi] - ) - ") - !alpha? ( !sparc? ( !riscv? ( 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 - =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 ) - net-fs/sambacfg -" -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:::' \ - -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/sambacfg/files/redcore-smb.conf b/net-fs/sambacfg/files/redcore-smb.conf deleted file mode 100644 index 09276f94..00000000 --- a/net-fs/sambacfg/files/redcore-smb.conf +++ /dev/null @@ -1,20 +0,0 @@ -[global] - workgroup = WORKGROUP - server string = Samba Server - server role = standalone server - log file = /var/log/samba/log.%m - max log size = 50 - dns proxy = no - usershare path = /var/lib/samba/usershare - usershare max shares = 100 - usershare allow guests = yes - usershare owner only = yes - client max protocol = NT1 -[tmp] - comment = Temporary file space - path = /var/tmp - public = yes - writeable = yes - read only = no - printable = no - guest ok = yes diff --git a/net-fs/sambacfg/sambacfg-1337-r1.ebuild b/net-fs/sambacfg/sambacfg-1337-r1.ebuild deleted file mode 100644 index f8be2659..00000000 --- a/net-fs/sambacfg/sambacfg-1337-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user - -DESCRIPTION="Redcore Linux Samba configuration files" -HOMEPAGE="https://redcorelinux.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64" -IUSE="" - -DEPEND="acct-group/smbshare" -RDEPEND="${DEPEND}" - -S=${FILESDIR} - -src_install() { - dodir etc/samba - insinto etc/samba - newins redcore-smb.conf smb.conf - keepdir var/lib/samba/usershare -} - -pkg_postinst() { - chown root:smbshare /var/lib/samba/usershare - chmod 1770 /var/lib/samba/usershare -} -- cgit v1.2.3