diff options
Diffstat (limited to 'extra/samba')
| -rw-r--r-- | extra/samba/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/samba/swat.socket | 9 | ||||
| -rw-r--r-- | extra/samba/swat.xinetd | 10 | ||||
| -rw-r--r-- | extra/samba/swat@.service | 7 |
4 files changed, 4 insertions, 38 deletions
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index f779c4aa2..6946dae64 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,11 +10,11 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.10 +pkgver=4.1.0 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.10 +_realver=4.1.0 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" @@ -24,7 +24,6 @@ makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate - swat.xinetd samba.pam samba.service samba.conf.d @@ -32,8 +31,6 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz smbd.socket nmbd.service smbd@.service - swat.socket - swat@.service winbindd.service samba.conf) ### UNINSTALL dmapi package before building!!! @@ -76,7 +73,6 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a --with-piddir=/var/run \ --with-ads \ --with-ldap \ - --with-swat \ --with-winbind \ --with-acl-support \ --enable-gnutls \ @@ -211,7 +207,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # install systemd files install -d -m755 ${pkgdir}/usr/lib/systemd/system - #for i in smbd nmbd swat winbindd; do + #for i in smbd nmbd winbindd; do install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/ install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/ install -d -m755 ${pkgdir}/etc/conf.d @@ -227,7 +223,6 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ chmod 700 ${pkgdir}/etc/samba/private install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ${srcdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba # winbind krb5 locator @@ -245,9 +240,8 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('220740f75035b2221e3b9a848e19d1ea' +md5sums=('f448d18ae678c72afb72e0510cd69710' '5697da77590ec092cc8a883bae06093c' - 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' 'ee4763a656cf00d92bfda31b6bb2c5cb' '6c447748a064d631435dbef0a3dcf32f' @@ -255,7 +249,5 @@ md5sums=('220740f75035b2221e3b9a848e19d1ea' 'a78b9aa93eb14b0ac445897395693225' 'df6380c73cb73163968eabc8650f7358' '70afd2db60a2e8eff7615dbdecd887ac' - '6db11f3dd2112a4b7a73007b189bef3f' - 'fd6be0cf1e5b3f0c3599fdb95455d19f' 'd5f56f43e1280bba20f6bbd88d16fa41' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/swat.socket b/extra/samba/swat.socket deleted file mode 100644 index e703413fc..000000000 --- a/extra/samba/swat.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SWAT Samba Web Admin Tool - -[Socket] -ListenStream=127.0.0.1:901 -Accept=true - -[Install] -WantedBy=sockets.target diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd deleted file mode 100644 index b083ad860..000000000 --- a/extra/samba/swat.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service swat -{ - socket_type = stream - wait = no - user = root - server = /usr/bin/swat - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service deleted file mode 100644 index ebbc31c47..000000000 --- a/extra/samba/swat@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=SWAT Samba Web Admin Tool -After=local-fs.target - -[Service] -ExecStart=/usr/bin/swat -StandardInput=socket |