[Lunar-commits] <moonbase> samba: Adding a few more mqueries to CONFIGURE. Fleshing out the DEPENDS and adding systemd
Dennis `stumbles` Veatch
stumbles at lunar-linux.org
Wed Aug 24 17:08:37 CEST 2011
commit dcc8644f423464ba1a698ee54be4da2102bf1f55
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date: Wed Aug 24 11:08:37 2011 -0400
samba: Adding a few more mqueries to CONFIGURE. Fleshing out the DEPENDS and adding systemd
as an optional_depends along with the needed systemd.d. Adjusting the BUILD to reflect some
changes/additions to CONFIGURE and DEPENDS.
---
net/samba/BUILD | 23 ++++++-----------------
net/samba/CONFIGURE | 6 ++++--
net/samba/DEPENDS | 15 ++++++++++++---
net/samba/init.d/nmbd | 11 -----------
net/samba/init.d/smbd | 11 -----------
net/samba/systemd.d/nmbd.service | 8 ++++++++
net/samba/systemd.d/smbd.service | 9 +++++++++
7 files changed, 39 insertions(+), 44 deletions(-)
diff --git a/net/samba/BUILD b/net/samba/BUILD
index 965669c..76035a8 100644
--- a/net/samba/BUILD
+++ b/net/samba/BUILD
@@ -6,36 +6,25 @@
export TALLOC=installed
fi &&
- unset WITH_PAM &&
- if module_installed Linux-PAM; then
- WITH_PAM="--with-pam --with-pam_smbpass"
- fi &&
-
cd source3 &&
- LDFLAGS+=" -Wl,--no-as-needed"
- ./configure --prefix=/usr \
+
+ LDFLAGS+=" -Wl,--no-as-needed" &&
+
+ ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--with-piddir=/var/run \
- --with-fhs \
--mandir=/usr/share/man \
- $WITH_PAM \
- --with-swatdir=/usr/share/samba/swat \
- $OPTS || exit 1
+ $OPTS &&
mkdir -p /etc/samba /usr/share/samba /var/log/samba &&
default_make &&
-# These do not seem to be needed anymore. If uncommented vlc, mplayer to name a
-# couple cannot find libsmbclient.so.
-# # these symlinks are still needed
-# ln -sf /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so.0 &&
-# ln -sf /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so &&
-
if module_installed cups ; then
ln -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
fi &&
+
mkdir -p $DOCUMENT_DIRECTORY/samba &&
cp -p $SOURCE_DIRECTORY/WHATSNEW.txt $DOCUMENT_DIRECTORY/samba
diff --git a/net/samba/CONFIGURE b/net/samba/CONFIGURE
index ceb589f..0a21e6b 100644
--- a/net/samba/CONFIGURE
+++ b/net/samba/CONFIGURE
@@ -1,2 +1,4 @@
-mquery AUTO_MOUNT "Configure samba with automount?" n "--with-automount" "--without-automount"
-
+mquery AUTO_MOUNT "Configure samba with automount?" y "--with-automount" "--without-automount"
+mquery WITH_SWAT "Build the SWAT Tool?" y "--enable-swat --with-swatdir=/usr/share/samba/swat" "--disable-swat"
+mquery WITH_FHS "Use FHS compliant paths?" y "--with-fhs" "--without-fhs"
+mquery DNS_UPDATE "Enable DNS Update support?" y "--with-dnsupdate" "--without-dnsupdate"
diff --git a/net/samba/DEPENDS b/net/samba/DEPENDS
index d416e9b..01287a5 100644
--- a/net/samba/DEPENDS
+++ b/net/samba/DEPENDS
@@ -2,6 +2,15 @@ depends chkconfig
depends ncurses
depends readline
-optional_depends "cups" "--enable-cups" "--disable-cups" "CUPS printing support"
-optional_depends "avahi" "--enable-avahi" "--disable-avahi" "for service discovery support"
-optional_depends "heimdal" "--with-dnsupdate" "--without-dnsupdate" "for Samba support of DNS updates"
+optional_depends "cups" "--enable-cups" "--disable-cups" "CUPS printing support"
+optional_depends "avahi" "--enable-avahi" "--disable-avahi" "for service discovery support"
+optional_depends "heimdal" "--with-dnsupdate" "--without-dnsupdate" "for Samba support of DNS updates"
+optional_depends "gamin" "--enable-fam" "--disable-fam" "for FAM support"
+optional_depends "gnutls" "--enable-gnutls" "--disable-gnutls" "for gnutls support"
+optional_depends "openldap" "--with-ldap" "--without-ldap" "for LDAP support"
+optional_depends "acl" "--with-acl-support" "--without-acl-support" "for access control list support"
+optional_depends "sqlite" "--with-sqlite3" "--without-sqlite" "for sqlite backend support"
+optional_depends "systemd" "" "" "for systemd init style support"
+
+optional_depends "Linux-PAM" "--with-pam --with-pam_smbpass" \
+ "--without-pam" "for PAM support"
diff --git a/net/samba/init.d/nmbd b/net/samba/init.d/nmbd
deleted file mode 100755
index 6de4cf2..0000000
--- a/net/samba/init.d/nmbd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 345 80 20
-# description: nmbd is the samba name serving daemon
-# processname: nmbd
-# config: /etc/samba/smb.conf
-
-ARGS="-D"
-
-. /lib/lsb/init-functions $1
-
diff --git a/net/samba/init.d/smbd b/net/samba/init.d/smbd
deleted file mode 100755
index ba624cb..0000000
--- a/net/samba/init.d/smbd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 345 80 20
-# description: smbd is the samba file serving daemon
-# processname: smbd
-# config: /etc/samba/smb.conf
-
-ARGS="-D"
-
-. /lib/lsb/init-functions $1
-
diff --git a/net/samba/systemd.d/nmbd.service b/net/samba/systemd.d/nmbd.service
new file mode 100644
index 0000000..6e22ef2
--- /dev/null
+++ b/net/samba/systemd.d/nmbd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Samba NetBIOS name server
+
+[Service]
+ExecStart=/usr/sbin/nmbd -F
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net/samba/systemd.d/smbd.service b/net/samba/systemd.d/smbd.service
new file mode 100644
index 0000000..beb9bfa
--- /dev/null
+++ b/net/samba/systemd.d/smbd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Samba SMB/CIFS server
+
+[Service]
+ExecStart=/usr/sbin/smbd -F
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
More information about the Lunar-commits
mailing list