net-fs/samba: Drop package
authorKristian Fiskerstrand <kf@sumptuouscapital.com>
Sun, 25 Jan 2015 19:56:05 +0000 (20:56 +0100)
committerKristian Fiskerstrand <kf@sumptuouscapital.com>
Sun, 25 Jan 2015 19:56:05 +0000 (20:56 +0100)
Debugging is over, dropping old package

21 files changed:
net-fs/samba/Manifest [deleted file]
net-fs/samba/files/3.6/lmhosts [deleted file]
net-fs/samba/files/3.6/samba.confd [deleted file]
net-fs/samba/files/3.6/samba.initd [deleted file]
net-fs/samba/files/3.6/samba.pam [deleted file]
net-fs/samba/files/3.6/smb.conf.default.patch [deleted file]
net-fs/samba/files/3.6/smbusers [deleted file]
net-fs/samba/files/3.6/swat.xinetd [deleted file]
net-fs/samba/files/3.6/system-auth-winbind.pam [deleted file]
net-fs/samba/files/named.conf.dlz.patch [deleted file]
net-fs/samba/files/nmbd.service [deleted file]
net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch [deleted file]
net-fs/samba/files/samba-4.1.14-libsystemd.patch [deleted file]
net-fs/samba/files/samba-4.1.14-named.conf.dlz.patch [deleted file]
net-fs/samba/files/samba.conf [deleted file]
net-fs/samba/files/samba.service [deleted file]
net-fs/samba/files/smbd.service [deleted file]
net-fs/samba/files/smbd.socket [deleted file]
net-fs/samba/files/smbd_at.service [deleted file]
net-fs/samba/files/winbindd.service [deleted file]
net-fs/samba/samba-3.6.23-r1.ebuild [deleted file]

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
deleted file mode 100644 (file)
index 67b8819..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX 3.6/lmhosts 125 SHA256 0bcbc9c3cfb44e31ccdc0930a1bcacc4e2b0fd96e5d38a56234a5133707a1826 SHA512 a742544341c0d452452d55a34f0740dc80d6e21a4ff8793e62e4d69626d5e2629ce607cb938d655e35a3585c8e0f796f4c73455c841b066d8392890f05b163f8 WHIRLPOOL 2d4aa96b24a74d6dd932f784b180575500eefe3f39e5e14512626a48bc1a9e90754b2ed75615e161a47c0624db3b1c156809991a54c4501abe6c8bcf746d6f64
-AUX 3.6/samba.confd 1210 SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3 SHA512 34326cde9fa6c072d9b948692b292531e60a05043767ec8be78329d6e99793a16dfe134797d90da2a48e240ea5ad6e4e8ea57046732d02f71f2f4dd5316bd313 WHIRLPOOL 8e1633095d0f1540c4ead736e68b36c196b9fd760ba7f80c945be71918ce5436d64679c0314c2f58c9ef88d7be0432d8c2b75c29f3201857beb729a9c8ff5726
-AUX 3.6/samba.initd 1266 SHA256 88e1c26ee39840f055c66fb59161c33497cc71883286fb61d5a6fac47836b97a SHA512 1e0430cca96e478dc7cc722954d77cdbe11d5569ee56ee3a307b75cc5a0c14402711a828e34ad264e725cba5bf3b25b32a68bb49ca85058ca2ed707580432183 WHIRLPOOL 27f74c4b53a3ea6c334114db9f161f3446d1500dce701a877278ddd1db3d84851c8c05423cc730a0cc0678ba4bfd78e102ac0e44dfe5a82ca7fb64832fb71bee
-AUX 3.6/samba.pam 397 SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38 SHA512 cdf91112dbd4a632da13abb16bc6450a5e43cc6d0f6ccab4bd62a880855824e80b779d7e9b017680669d23f2d9c88e7ce0848ccf7e3eb7eb73c3fd3e6a6eafa4 WHIRLPOOL 8c223dfbe4a122d8d641a52209ca7d5c09b964ad7dc3d203da468df32e58bcf94e11b3eb7c3aaa69ad343a8d5f6c0bde0bbd18dedc8cea998db24e532f08fd93
-AUX 3.6/smb.conf.default.patch 2385 SHA256 2140436e553e5dfc0b472e3a09a597de61f15847f23e8f92b9f561a6b9164034 SHA512 c321782ed148217fc43fe71664ace833e3127b4dc0517ebc898ceb2c04946d159efceb91251112f39a4aa84dadd99964e13192d020ce4f46ad0efb84378674a7 WHIRLPOOL 317fce352f6f2aae6e41927f526264f747f8d0dbff25d88878aed4ea21afff4bffa86de55112c363710c190de9eb600c355e46eb65de4d5550b9f71c29a9bdbd
-AUX 3.6/smbusers 217 SHA256 c4e808dc0d0a397e777225c6f2b4008d52979b2a4969ceee3211a8bd9d58703f SHA512 6f4b5e2bffda390e08f376db0d61e1917c2a9c493d1365a54d672b07eff9d48c56cbf37c268e19c335b4c0598f0b5e1f3403bded467cd6e47a7cccdc3ae3abdc WHIRLPOOL bd53dde668eca5b03632dd2938829f184cc6b97850c4e483e999acd4e3dcf960bb392ce42ddf411bc07bc615a4ff641797bb37a0f3b66343bdf04a60910f4357
-AUX 3.6/swat.xinetd 526 SHA256 59dbb1e4669cfd5c72dacc8d8aed269f169e827338e6d6e92fa2a8e445a3ceac SHA512 37f8ac63f7eacf69b2610c2036ff9af3fcab46a1e74eaa50203db66c550c122337a19c2d87be955cd8c8a02ccb659af7ac1be35f49ab8add128601eef5c5ad72 WHIRLPOOL 89daaaa72a101112dcb2b2f007c10128f647846b509159770d6ff6726d22ccc66b2a2f03c09f2af9691ec956f59f1b43e499f1239a3a407db1d9029f3e920a8f
-AUX 3.6/system-auth-winbind.pam 704 SHA256 42c80d953da2472d789c3de1311045285428a15562f7ad2371ef214d8ea7bf56 SHA512 a93a491736299a67ec39eb06fa6b14e48038f618a4812ef9b2b46bf20ef9600ca4e0f44997d8e7c7e838760c3c53a739ebcdf1bb017a5f49b005b4470afb65f6 WHIRLPOOL 0601c6866bb15779bb7f5d7286902b1a5137435a92963a60734de98ca9ce95d220dfa456dfd4a229176e3a2be7afb9097bcffcfbd8b98be9bf206dded8054ad4
-DIST samba-3.6.23.tar.gz 34122387 SHA256 25bbfa81b9a26609a0be744240b63e1f5030bbcfab684cf7aea3b86ed0db2dd0 SHA512 54189079a4f65f1e9c818f9edc9d862c4261c3a4925146f3ab19603052d2c08d32b59ddc243422683338dc4f1192b22f02acaa719e11aa44146c5d3bb11fdcb0 WHIRLPOOL 4919b8911bab8182456ba5bcdc264ca028dea0300bce409bcad338965936849c61695bc99af6e006f373a0c502cc3bf1a596d52d706181674ca2b7bc5aeb19fc
-EBUILD samba-3.6.23-r1.ebuild 13528 SHA256 30af1e3c30718d1e4d68744d9a8b3872df86b87f7493631374485301f309a0d1 SHA512 f9520be1c791ce15ae250dd4e067204cca1f0d031d6b3699159bedc21aaed67804d5e951b12c2848c129e13c84c14b8b2538e37be8b37978cc791c8c979b34d0 WHIRLPOOL ea0d8966f2924beb1049ba275c62c42e568e928df2e791b411e5dbbbbbfb8151a6bedf26a36e35d8cb4d26e7e4356a9027d6538d396e03e331c2a3ec7ce5e474
diff --git a/net-fs/samba/files/3.6/lmhosts b/net-fs/samba/files/3.6/lmhosts
deleted file mode 100644 (file)
index 3e3428e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/lmhosts,v 1.1 2011/06/30 15:50:28 dagger Exp $
-127.0.0.1 localhost
diff --git a/net-fs/samba/files/3.6/samba.confd b/net-fs/samba/files/3.6/samba.confd
deleted file mode 100644 (file)
index 1b329da..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#add "winbind" to the daemon_list if you also want winbind to start
-daemon_list="smbd nmbd"
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-my_service_name="samba"
-my_service_PRE="unset TMP TMPDIR"
-my_service_POST=""
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-smbd_start_options="-D"
-smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
-smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
-smbd_reload="killall -HUP smbd"
-
-nmbd_start_options="-D"
-nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
-nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
-nmbd_reload="killall -HUP nmbd"
-
-winbind_start_options=""
-winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
-winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
-winbind_reload="killall -HUP winbindd"
-
diff --git a/net-fs/samba/files/3.6/samba.initd b/net-fs/samba/files/3.6/samba.initd
deleted file mode 100644 (file)
index 96bb94e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.4 2014/03/14 09:30:41 polynomial-c Exp $
-
-extra_started_commands="reload"
-piddir="/var/run/samba"
-
-depend() {
-       after slapd
-       need net
-       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}
-}
-
-mkdir_sambadirs() {
-       [ -d "${piddir}" ] || mkdir -p ${piddir}
-}
-
-start() {
-       ${my_service_PRE}
-       mkdir_sambadirs
-       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/3.6/samba.pam b/net-fs/samba/files/3.6/samba.pam
deleted file mode 100644 (file)
index 91beadd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-# * pam_smbpass.so authenticates against the smbpasswd file
-# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility
-#    (Diego "Flameeyes" Petteno'): enable with pam>=0.78 only
-auth       required     pam_smbpass.so nodelay
-account    include      system-auth
-session    include      system-auth
-password   required     pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf
diff --git a/net-fs/samba/files/3.6/smb.conf.default.patch b/net-fs/samba/files/3.6/smb.conf.default.patch
deleted file mode 100644 (file)
index c2a9a72..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
---- samba-3.6.0rc2/examples/smb.conf.default~  2011-06-07 19:13:47.000000000 +0100
-+++ samba-3.6.0rc2/examples/smb.conf.default   2011-06-30 16:12:42.388102480 +0100
-@@ -63,7 +63,7 @@
- # this tells Samba to use a separate log file for each machine
- # that connects
--   log file = /usr/local/samba/var/log.%m
-+   log file = /var/log/samba/log.%m
- # Put a capping on the size of the log files (in Kb).
-    max log size = 50
-@@ -81,7 +81,10 @@
- # Backend to store user information in. New installations should 
- # use either tdbsam or ldapsam. smbpasswd is available for backwards 
--# compatibility. tdbsam requires no further configuration.
-+# compatibility. tdbsam requires no further configuration. If you're 
-+# migrating from < samba 3.4, you'll have to convert your old user 
-+# passwords to the new backend with the command:
-+# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e
- ;   passdb backend = tdbsam
- # Using the following line enables you to customise your configuration
-@@ -89,7 +92,7 @@
- # of the machine that is connecting.
- # Note: Consider carefully the location in the configuration file of
- #       this line.  The included file is read at that point.
--;   include = /usr/local/samba/lib/smb.conf.%m
-+;   include = /etc/samba/smb.conf.%m
- # Configure Samba to use multiple interfaces
- # If you have multiple network interfaces then you must list them
-@@ -166,7 +169,7 @@
- # Un-comment the following and create the netlogon directory for Domain Logons
- ; [netlogon]
- ;   comment = Network Logon Service
--;   path = /usr/local/samba/lib/netlogon
-+;   path = /var/lib/samba/netlogon
- ;   guest ok = yes
- ;   writable = no
- ;   share modes = no
-@@ -175,7 +178,7 @@
- # Un-comment the following to provide a specific roving profile share
- # the default is to use the user's home directory
- ;[Profiles]
--;    path = /usr/local/samba/profiles
-+;    path = /var/lib/samba/profiles
- ;    browseable = no
- ;    guest ok = yes
-@@ -184,7 +187,7 @@
- # specifically define each individual printer
- [printers]
-    comment = All Printers
--   path = /usr/spool/samba
-+   path = /var/spool/samba
-    browseable = no
- # Set public = yes to allow user 'guest account' to print
-    guest ok = no
-@@ -204,7 +207,7 @@
- ;   comment = Public Stuff
- ;   path = /home/samba
- ;   public = yes
--;   writable = no
-+;   writable = yes
- ;   printable = no
- ;   write list = @staff
diff --git a/net-fs/samba/files/3.6/smbusers b/net-fs/samba/files/3.6/smbusers
deleted file mode 100644 (file)
index b3c59f2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/smbusers,v 1.1 2011/06/30 15:50:28 dagger Exp $
-
-# Syntax:
-#   Unix_name = SMB_name1 SMB_name2 ...
-
-root = Administrator admin
-nobody = guest pcguest smbguest
diff --git a/net-fs/samba/files/3.6/swat.xinetd b/net-fs/samba/files/3.6/swat.xinetd
deleted file mode 100644 (file)
index 55c7cff..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# default: off
-# description: SWAT is the Samba Web Admin Tool. Use swat \
-#             to configure your Samba server. To use SWAT, \
-#             connect to port 901 with your favorite web browser.
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/swat.xinetd,v 1.1 2011/06/30 15:50:28 dagger Exp $
-
-service swat
-{
-       port            = 901
-       socket_type     = stream
-       wait            = no
-       only_from       = localhost
-       user            = root
-       server          = /usr/sbin/swat
-       log_on_failure += USERID
-       disable         = yes
-}
diff --git a/net-fs/samba/files/3.6/system-auth-winbind.pam b/net-fs/samba/files/3.6/system-auth-winbind.pam
deleted file mode 100644 (file)
index 454b94d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/system-auth-winbind.pam,v 1.1 2011/06/30 15:50:28 dagger Exp $
-
-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/named.conf.dlz.patch b/net-fs/samba/files/named.conf.dlz.patch
deleted file mode 100644 (file)
index ad8486c..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz
-index be20a57..d86f766 100644
---- a/source4/setup/named.conf.dlz
-+++ b/source4/setup/named.conf.dlz
-@@ -11,9 +11,9 @@
- #
- dlz "AD DNS Zone" {
-     # For BIND 9.8.0
--    database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
-+    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
-
-     # For BIND 9.9.0
--    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
-+    database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
- };
diff --git a/net-fs/samba/files/nmbd.service b/net-fs/samba/files/nmbd.service
deleted file mode 100644 (file)
index 44b4ffb..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba NetBIOS name server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/samba/nmbd.pid
-ExecStart=/usr/sbin/nmbd -D 
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch b/net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch
deleted file mode 100644 (file)
index ec351db..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugzilla.samba.org/show_bug.cgi?id=10370
-
---- samba-4.0.19/source3/wscript
-+++ samba-4.0.19/source3/wscript
-@@ -507,9 +507,10 @@
-     else:
-         conf.DEFINE('HAVE_NO_AIO', '1')
--    if host_os.rfind('linux') > -1:
--      conf.CHECK_FUNCS_IN('io_submit', 'aio')
--      conf.CHECK_CODE('''
-+    if Options.options.with_aio_support != False:
-+      if host_os.rfind('linux') > -1:
-+          conf.CHECK_FUNCS_IN('io_submit', 'aio')
-+          conf.CHECK_CODE('''
- struct io_event ioev;
- struct iocb *ioc;
- io_context_t ctx;
-@@ -526,11 +527,11 @@
- io_getevents(ctx, 1, 1, &ioev, &ts);
- ''',
-                       'HAVE_LINUX_KERNEL_AIO',
--                      msg='Checking for linux kernel asynchronous io support',
--                      headers='unistd.h stdlib.h sys/types.h fcntl.h sys/eventfd.h libaio.h',
--                      lib='aio')
-+                              msg='Checking for linux kernel asynchronous io support',
-+                              headers='unistd.h stdlib.h sys/types.h fcntl.h sys/eventfd.h libaio.h',
-+                              lib='aio')
--    conf.CHECK_CODE('''
-+          conf.CHECK_CODE('''
- struct msghdr msg;
- union {
-         struct cmsghdr cm;
-@@ -540,17 +541,17 @@
- msg.msg_controllen = sizeof(control_un.control);
- ''',
-         'HAVE_MSGHDR_MSG_CONTROL',
--        msg='Checking if we can use msg_control for passing file descriptors',
--        headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
--    conf.CHECK_CODE('''
-+              msg='Checking if we can use msg_control for passing file descriptors',
-+              headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
-+          conf.CHECK_CODE('''
- struct msghdr msg;
- int fd;
- msg.msg_acctrights = (caddr_t) &fd;
- msg.msg_acctrightslen = sizeof(fd);
- ''',
-         'HAVE_MSGHDR_MSG_ACCTRIGHTS',
--        msg='Checking if we can use msg_acctrights for passing file descriptors',
--        headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
-+              msg='Checking if we can use msg_acctrights for passing file descriptors',
-+              headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
-     if Options.options.with_winbind:
-         conf.env.build_winbind = True
diff --git a/net-fs/samba/files/samba-4.1.14-libsystemd.patch b/net-fs/samba/files/samba-4.1.14-libsystemd.patch
deleted file mode 100644 (file)
index 94b30c0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0f9b06ade820ce165015526220569db81e00150b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 3 Jan 2015 18:59:48 +0100
-Subject: [PATCH] Support libsystemd, renamed from libsystemd-daemon
-
----
- lib/util/wscript_build | 2 +-
- wscript                | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/util/wscript_build b/lib/util/wscript_build
-index f161f96..6b6b511 100755
---- a/lib/util/wscript_build
-+++ b/lib/util/wscript_build
-@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba-util',
-                     server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
-                     tevent_debug.c util_process.c memcache.c''',
-                   deps='DYNCONFIG',
--                  public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid systemd-daemon',
-+                  public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid systemd systemd-daemon',
-                   public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
-                   header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
-                   local_include=False,
-diff --git a/wscript b/wscript
-index f389f90..3c4fa21 100644
---- a/wscript
-+++ b/wscript
-@@ -183,9 +183,12 @@ def configure(conf):
-               conf.env['ENABLE_PIE'] = True
-     if Options.options.enable_systemd != False:
-+        conf.check_cfg(package='libsystemd', args='--cflags --libs',
-+                       msg='Checking for libsystemd', uselib_store="SYSTEMD")
-         conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
-                        msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON")
-         conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
-+        conf.CHECK_LIB('systemd', shlib=True)
-         conf.CHECK_LIB('systemd-daemon', shlib=True)
-     if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H'):
-@@ -193,6 +196,7 @@ def configure(conf):
-         conf.env['ENABLE_SYSTEMD'] = True
-     else:
-         conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY')
-+        conf.SET_TARGET_TYPE('systemd', 'EMPTY')
-         conf.undefine('HAVE_SYSTEMD')
-     conf.SAMBA_CONFIG_H('include/config.h')
--- 
-2.2.1
-
diff --git a/net-fs/samba/files/samba-4.1.14-named.conf.dlz.patch b/net-fs/samba/files/samba-4.1.14-named.conf.dlz.patch
deleted file mode 100644 (file)
index 9f1ebb8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- samba-4.1.14/source4/setup/named.conf.dlz
-+++ samba-4.1.14/source4/setup/named.conf.dlz
-@@ -11,10 +11,10 @@
- #
- dlz "AD DNS Zone" {
-     # For BIND 9.8.x
--    database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
-+    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
-     # For BIND 9.9.x
--    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
-+    database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
-     # For BIND 9.10.x
-     # database "dlopen ${MODULESDIR}/bind9/dlz_bind9_10.so";
diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf
deleted file mode 100644 (file)
index fce6812..0000000
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/samba 0755 root root
diff --git a/net-fs/samba/files/samba.service b/net-fs/samba/files/samba.service
deleted file mode 100644 (file)
index 8214ff8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Samba AD server
-After=network.target winbindd.service
-Conflicts=nmbd.service smbd.service
-
-[Service]
-ExecStart=/usr/sbin/samba --interactive 
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/samba/files/smbd.service b/net-fs/samba/files/smbd.service
deleted file mode 100644 (file)
index 5c006a4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server
-After=network.target nmbd.service winbindd.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/samba/smbd.pid
-ExecStart=/usr/sbin/smbd -D 
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/samba/files/smbd.socket b/net-fs/samba/files/smbd.socket
deleted file mode 100644 (file)
index 833bf43..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server socket
-
-[Socket]
-ListenStream=445
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/net-fs/samba/files/smbd_at.service b/net-fs/samba/files/smbd_at.service
deleted file mode 100644 (file)
index e1f71be..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server instance
-
-[Service]
-ExecStart=/usr/sbin/smbd -F
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
diff --git a/net-fs/samba/files/winbindd.service b/net-fs/samba/files/winbindd.service
deleted file mode 100644 (file)
index 67a778f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba Winbind daemon
-After=network.target nmbd.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/samba/winbindd.pid
-ExecStart=/usr/sbin/winbindd -D 
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/samba/samba-3.6.23-r1.ebuild b/net-fs/samba/samba-3.6.23-r1.ebuild
deleted file mode 100644 (file)
index 313f55d..0000000
+++ /dev/null
@@ -1,483 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/Attic/samba-3.6.23-r1.ebuild,v 1.12 2014/11/02 12:33:27 swift Exp $
-
-EAPI=5
-
-inherit pam versionator multilib multilib-minimal eutils flag-o-matic systemd
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
-       ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes
-       swat syslog +winbind"
-
-DEPEND="dev-libs/popt
-       >=sys-libs/talloc-2.0.8-r1[${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.2.13[${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}]
-       >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-       ads? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] sys-fs/e2fsprogs
-               client? ( sys-apps/keyutils ) )
-       avahi? ( net-dns/avahi[dbus] )
-       caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-       client? ( !net-fs/mount-cifs
-               >=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] )
-       cluster? ( >=dev-db/ctdb-1.13 )
-       cups? ( net-print/cups )
-       debug? ( dev-libs/dmalloc )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-       ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-       ldb? ( sys-libs/ldb )
-       pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}]
-               winbind? ( >=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] )
-       )
-       readline? ( >=sys-libs/readline-5.2 )
-       syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}
-       kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
-                       client? ( net-fs/cifs-utils ) )
-       selinux? ( sec-policy/selinux-samba )
-"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-KRBPLUGIN=""
-PLUGINEXT=".so"
-SHAREDMODS=""
-
-S=${WORKDIR}/${MY_P}
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-# - AFS?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-REQUIRED_USE="
-       ads? ( ldap )
-       swat? ( server )
-"
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use winbind &&
-                       [[ $(tc-getCC)$ == *gcc* ]] &&
-                       [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
-               then
-                       eerror "It is a known issue that ${P} will not build with "
-                       eerror "winbind use flag enabled when using gcc < 4.3 ."
-                       eerror "Please use at least the latest stable gcc version."
-                       die "Using sys-devel/gcc < 4.3 with winbind use flag."
-               fi
-       fi
-}
-
-pkg_setup() {
-       if use server ; then
-               SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
-               BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-                       bin/profiles bin/sharesec bin/eventlogadm bin/smbta-util
-                       $(usex client "" "bin/smbclient")"
-
-               use swat && SBINPROGS="${SBINPROGS} bin/swat"
-               use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-               use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
-       fi
-
-       if use client ; then
-               BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
-                       bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
-                       bin/ntlm_auth"
-
-       fi
-
-       use cups && BINPROGS="${BINPROGS} bin/smbspool"
-#      use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-
-       if use winbind ; then
-               BINPROGS="${BINPROGS} bin/wbinfo"
-               SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
-               use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
-               use cluster && SHAREDMODS="${SHAREDMODS},idmap_tdb2"
-               use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
-       fi
-}
-
-src_prepare() {
-       cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-       # ensure that winbind has correct ldflags (QA notice)
-       sed -i \
-               -e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-               source3/configure || die "sed failed"
-       epatch "${CONFDIR}"/smb.conf.default.patch
-
-       #bug #399141 wrap newer iniparser version
-       has_version ">=dev-libs/iniparser-3.0.0" && \
-               append-cppflags "-Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
-
-       multilib_copy_sources
-}
-
-multilib_src_configure() {
-       local myconf=()
-
-       # we can't alter S since build system writes to '../' and therefore
-       # we need to duplicate the whole structure
-       cd source3 || die
-
-       # Filter out -fPIE
-       [[ ${CHOST} == *-*bsd* ]] && myconf+=( --disable-pie )
-
-       #Allowing alpha/s390/sh to build
-       if use alpha || [[ ${ABI} == s390 ]] || use sh ; then
-               local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-               replace-flags -O? -O1
-       fi
-
-       # http://wiki.samba.org/index.php/CTDB_Setup
-       use cluster && myconf+=( --disable-pie )
-
-       # Upstream refuses to make this configurable
-       myconf+=( ac_cv_header_sys_capability_h=$(usex caps) )
-
-       # Notes:
-       # - automount is only needed in conjunction with NIS and we don't have that
-       # anymore => LDAP?
-       # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-       econf "${myconf[@]}" \
-               --with-piddir="${EPREFIX}"/var/run/samba \
-               --sysconfdir="${EPREFIX}"/etc/samba \
-               --localstatedir="${EPREFIX}"/var \
-               $(multilib_native_use_enable debug developer) \
-               --enable-largefile \
-               --enable-socket-wrapper \
-               --enable-nss-wrapper \
-               $(multilib_native_use_enable swat) \
-               $(multilib_native_use_enable debug dmalloc) \
-               $(multilib_native_use_enable cups) \
-               --disable-iprint \
-               $(use_enable fam) \
-               --enable-shared-libs \
-               --disable-dnssd \
-               $(multilib_native_use_enable avahi) \
-               --with-fhs \
-               --with-privatedir="${EPREFIX}"/var/lib/samba/private \
-               --with-rootsbindir="${EPREFIX}"/var/cache/samba \
-               --with-lockdir="${EPREFIX}"/var/cache/samba \
-               --with-swatdir="${EPREFIX}"/usr/share/doc/${PF}/swat \
-               --with-configdir="${EPREFIX}"/etc/samba \
-               --with-logfilebase="${EPREFIX}"/var/log/samba \
-               --with-pammodulesdir=$(getpam_mod_dir) \
-               $(multilib_native_use_with dmapi) \
-               --without-afs \
-               --without-fake-kaserver \
-               --without-vfs-afsacl \
-               $(use_with ldap) \
-               $(use_with ads) \
-               $(use_with ads krb5 "${EPREFIX}"/usr) \
-               $(use_with ads dnsupdate) \
-               --without-automount \
-               $(use_with pam) \
-               $(use_with pam pam_smbpass) \
-               $(use_with syslog) \
-               $(use_with quota quotas) \
-               $(use_with quota sys-quotas) \
-               --without-utmp \
-               --without-lib{talloc,tdb} \
-               $(use_with netapi libnetapi) \
-               $(use_with smbclient libsmbclient) \
-               $(use_with smbsharemodes libsmbsharemodes) \
-               $(use_with addns libaddns) \
-               $(use_with cluster ctdb "${EPREFIX}"/usr) \
-               $(use_with cluster cluster-support) \
-               $(multilib_native_use_with acl acl-support) \
-               $(use_with aio aio-support) \
-               --with-sendfile-support \
-               $(use_with winbind) \
-               --with-shared-modules=${SHAREDMODS} \
-               --without-included-popt \
-               --without-included-iniparser
-}
-
-multilib_src_compile() {
-       cd source3 || die
-
-       # compile libs
-       if use addns ; then
-               einfo "make addns library"
-               emake libaddns
-       fi
-       if use netapi ; then
-               einfo "make netapi library"
-               emake libnetapi
-       fi
-       if use smbclient ; then
-               einfo "make smbclient library"
-               emake libsmbclient
-       fi
-       if use smbsharemodes ; then
-               einfo "make smbsharemodes library"
-               emake libsmbsharemodes
-       fi
-
-       # compile modules
-       emake modules
-
-       # compile pam moudles
-       if use pam ; then
-               einfo "make pam modules"
-               emake pam_modules
-       fi
-
-       # compile winbind nss modules
-       if use winbind ; then
-               einfo "make nss modules"
-               emake nss_modules
-       fi
-
-       # compile utilities
-       if multilib_is_native_abi; then
-               if [ -n "${BINPROGS}" ] ; then
-                       einfo "make binprogs"
-                       emake ${BINPROGS}
-               fi
-               if [ -n "${SBINPROGS}" ] ; then
-                       einfo "make sbinprogs"
-                       emake ${SBINPROGS}
-               fi
-       fi
-
-       if [ -n "${KRBPLUGIN}" ] ; then
-               einfo "make krbplugin"
-               emake ${KRBPLUGIN}${PLUGINEXT}
-       fi
-}
-
-multilib_src_install() {
-       cd source3 || die
-
-       # pkgconfig files installation needed, bug #464818
-       local pkgconfigdir=/usr/$(get_libdir)/pkgconfig
-
-       # install libs
-       if use addns ; then
-               einfo "install addns library"
-               emake installlibaddns DESTDIR="${D}"
-       fi
-       if use netapi ; then
-               einfo "install netapi library"
-               emake installlibnetapi DESTDIR="${D}"
-               insinto $pkgconfigdir
-               doins pkgconfig/netapi.pc
-       fi
-       if use smbclient ; then
-               einfo "install smbclient library"
-               emake installlibsmbclient DESTDIR="${D}"
-               insinto $pkgconfigdir
-               doins pkgconfig/smbclient.pc
-       fi
-       if use smbsharemodes ; then
-               einfo "install smbsharemodes library"
-               emake installlibsmbsharemodes DESTDIR="${D}"
-               insinto $pkgconfigdir
-               doins pkgconfig/smbsharemodes.pc
-       fi
-
-       # install modules
-       emake installmodules DESTDIR="${D}"
-
-       if use pam ; then
-               einfo "install pam modules"
-               emake installpammodules DESTDIR="${D}"
-
-               if use winbind ; then
-                       newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-                       doman ../docs/manpages/pam_winbind.8
-                       # bug #376853
-                       insinto /etc/security
-                       doins ../examples/pam_winbind/pam_winbind.conf || die
-               fi
-
-               newpamd "${CONFDIR}/samba.pam" samba
-               dodoc pam_smbpass/README
-       fi
-
-       # Nsswitch extensions. Make link for wins and winbind resolvers
-       if use winbind ; then
-               einfo "install libwbclient"
-               emake installlibwbclient DESTDIR="${D}"
-               dolib.so ../nsswitch/libnss_wins.so
-               dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-               dolib.so ../nsswitch/libnss_winbind.so
-               dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-               insinto $pkgconfigdir
-               doins pkgconfig/wbclient.pc
-               einfo "install libwbclient related manpages"
-               doman ../docs/manpages/idmap_rid.8
-               doman ../docs/manpages/idmap_hash.8
-               if use ldap ; then
-                       doman ../docs/manpages/idmap_adex.8
-                       doman ../docs/manpages/idmap_ldap.8
-               fi
-               if use ads ; then
-                       doman ../docs/manpages/idmap_ad.8
-               fi
-       fi
-
-       # install binaries
-       if multilib_is_native_abi; then
-               insinto /usr
-               for prog in ${SBINPROGS} ; do
-                       dosbin ${prog}
-                       doman ../docs/manpages/${prog/bin\/}*
-               done
-
-               for prog in ${BINPROGS} ; do
-                       dobin ${prog}
-                       doman ../docs/manpages/${prog/bin\/}*
-               done
-
-               # install scripts
-               if use client ; then
-                       dobin script/findsmb
-                       doman ../docs/manpages/findsmb.1
-               fi
-       fi
-
-       # install krbplugin
-       if [ -n "${KRBPLUGIN}" ] ; then
-               if has_version app-crypt/mit-krb5 ; then
-                       insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-                       doins ${KRBPLUGIN}${PLUGINEXT}
-               elif has_version app-crypt/heimdal ; then
-                       insinto /usr/$(get_libdir)/plugin/krb5
-                       doins ${KRBPLUGIN}${PLUGINEXT}
-               fi
-               insinto /usr
-               for prog in ${KRBPLUGIN} ; do
-                       doman ../docs/manpages/${prog/bin\/}*
-               done
-       fi
-}
-
-multilib_src_install_all() {
-       # install server components
-       if use server ; then
-               doman docs/manpages/vfs* docs/manpages/samba.7
-
-               diropts -m0700
-               keepdir /var/lib/samba/private
-
-               diropts -m1777
-               keepdir /var/spool/samba
-
-               diropts -m0755
-               keepdir /var/{cache,log}/samba
-               keepdir /var/lib/samba/{netlogon,profiles}
-               keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-               keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-               newconfd "${CONFDIR}/samba.confd" samba
-               newinitd "${CONFDIR}/samba.initd" samba
-
-               insinto /etc/samba
-               doins "${CONFDIR}"/{smbusers,lmhosts}
-
-               if use ldap ; then
-                       insinto /etc/openldap/schema
-                       doins examples/LDAP/samba.schema
-               fi
-
-               if use swat ; then
-                       insinto /etc/xinetd.d
-                       newins "${CONFDIR}/swat.xinetd" swat
-                       script/installswat.sh "${ED}" "${EROOT}/usr/share/doc/${PF}/swat" "${S}"
-               fi
-
-               dodoc MAINTAINERS.txt README* Roadmap WHATSNEW.txt docs/THANKS
-       fi
-
-       # install the spooler to cups
-       if use cups ; then
-               dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-       fi
-
-       # install misc files
-       insinto /etc/samba
-       doins examples/smb.conf.default
-       doman docs/manpages/smb.conf.5
-
-       insinto /usr/"$(get_libdir)"/samba
-       doins codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-       # install docs
-       if use doc ; then
-               dohtml -r docs/htmldocs/.
-               dodoc docs/*.pdf
-       fi
-
-       # install examples
-       if use examples ; then
-               insinto /usr/share/doc/${PF}/examples
-
-               if use smbclient ; then
-                       doins -r examples/libsmbclient
-               fi
-
-               if use winbind ; then
-                       doins -r examples/pam_winbind examples/nss
-               fi
-
-               if use server ; then
-                       cd examples || die
-                       doins -r auth autofs dce-dfs LDAP logon misc pdb \
-                               perfcounter printer-accounting printing scripts tridge \
-                               validchars VFS
-               fi
-       fi
-
-       # Remove empty installation directories
-       rmdir --ignore-fail-on-non-empty \
-               "${ED}/usr/$(get_libdir)/samba" \
-               "${ED}/usr"/{sbin,bin} \
-               "${ED}/usr/share"/{man,locale,} \
-               "${ED}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-       #       || die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-
-       systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-       systemd_dounit "${FILESDIR}"/nmbd.service
-       systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-       systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-       systemd_dounit "${FILESDIR}"/winbindd.service
-}
-
-pkg_postinst() {
-       elog "Samba 3.6 has adopted a number of improved security defaults that"
-       elog "will impact on existing users of Samba."
-       elog "                  client ntlmv2 auth = yes"
-       elog "                  client use spnego principal = no"
-       elog "                  send spnego principal = no"
-       elog ""
-       elog "SMB2 protocol support in 3.6.0 is fully functional and can be "
-       elog "enabled by setting 'max protocol = smb2'. SMB2 is a new "
-       elog "implementation of the SMB protocol used by Windows Vista and higher"
-       elog ""
-       elog "For further information make sure to read the release notes at"
-       elog "http://samba.org/samba/history/${P}.html and "
-       elog "http://samba.org/samba/history/${PN}-3.6.0.html"
-}