Date: Friday, March 14, 2014 @ 18:08:39 Author: tpowa Revision: 207754
archrelease: copy trunk to testing-i686, testing-x86_64 Added: samba/repos/testing-i686/ samba/repos/testing-i686/PKGBUILD (from rev 207753, samba/trunk/PKGBUILD) samba/repos/testing-i686/nmbd.service (from rev 207753, samba/trunk/nmbd.service) samba/repos/testing-i686/samba-4.0.3-fix_pidl_with_gcc48.patch (from rev 207753, samba/trunk/samba-4.0.3-fix_pidl_with_gcc48.patch) samba/repos/testing-i686/samba.conf (from rev 207753, samba/trunk/samba.conf) samba/repos/testing-i686/samba.conf.d (from rev 207753, samba/trunk/samba.conf.d) samba/repos/testing-i686/samba.install (from rev 207753, samba/trunk/samba.install) samba/repos/testing-i686/samba.logrotate (from rev 207753, samba/trunk/samba.logrotate) samba/repos/testing-i686/samba.pam (from rev 207753, samba/trunk/samba.pam) samba/repos/testing-i686/samba.service (from rev 207753, samba/trunk/samba.service) samba/repos/testing-i686/smbd.service (from rev 207753, samba/trunk/smbd.service) samba/repos/testing-i686/smbd.socket (from rev 207753, samba/trunk/smbd.socket) samba/repos/testing-i686/smbd@.service (from rev 207753, samba/trunk/smbd@.service) samba/repos/testing-i686/winbindd.service (from rev 207753, samba/trunk/winbindd.service) samba/repos/testing-x86_64/ samba/repos/testing-x86_64/PKGBUILD (from rev 207753, samba/trunk/PKGBUILD) samba/repos/testing-x86_64/nmbd.service (from rev 207753, samba/trunk/nmbd.service) samba/repos/testing-x86_64/samba-4.0.3-fix_pidl_with_gcc48.patch (from rev 207753, samba/trunk/samba-4.0.3-fix_pidl_with_gcc48.patch) samba/repos/testing-x86_64/samba.conf (from rev 207753, samba/trunk/samba.conf) samba/repos/testing-x86_64/samba.conf.d (from rev 207753, samba/trunk/samba.conf.d) samba/repos/testing-x86_64/samba.install (from rev 207753, samba/trunk/samba.install) samba/repos/testing-x86_64/samba.logrotate (from rev 207753, samba/trunk/samba.logrotate) samba/repos/testing-x86_64/samba.pam (from rev 207753, samba/trunk/samba.pam) samba/repos/testing-x86_64/samba.service (from rev 207753, samba/trunk/samba.service) samba/repos/testing-x86_64/smbd.service (from rev 207753, samba/trunk/smbd.service) samba/repos/testing-x86_64/smbd.socket (from rev 207753, samba/trunk/smbd.socket) samba/repos/testing-x86_64/smbd@.service (from rev 207753, samba/trunk/smbd@.service) samba/repos/testing-x86_64/winbindd.service (from rev 207753, samba/trunk/winbindd.service) ------------------------------------------------------+ testing-i686/PKGBUILD | 267 +++++++++++++++++ testing-i686/nmbd.service | 12 testing-i686/samba-4.0.3-fix_pidl_with_gcc48.patch | 60 +++ testing-i686/samba.conf | 2 testing-i686/samba.conf.d | 18 + testing-i686/samba.install | 14 testing-i686/samba.logrotate | 9 testing-i686/samba.pam | 3 testing-i686/samba.service | 14 testing-i686/smbd.service | 12 testing-i686/smbd.socket | 9 testing-i686/smbd@.service | 7 testing-i686/winbindd.service | 12 testing-x86_64/PKGBUILD | 267 +++++++++++++++++ testing-x86_64/nmbd.service | 12 testing-x86_64/samba-4.0.3-fix_pidl_with_gcc48.patch | 60 +++ testing-x86_64/samba.conf | 2 testing-x86_64/samba.conf.d | 18 + testing-x86_64/samba.install | 14 testing-x86_64/samba.logrotate | 9 testing-x86_64/samba.pam | 3 testing-x86_64/samba.service | 14 testing-x86_64/smbd.service | 12 testing-x86_64/smbd.socket | 9 testing-x86_64/smbd@.service | 7 testing-x86_64/winbindd.service | 12 26 files changed, 878 insertions(+) Copied: samba/repos/testing-i686/PKGBUILD (from rev 207753, samba/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,267 @@ + +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> +# Contributor: Michael Hansen <zrax0111 gmail com> +# Contributor: Marco A Rojas <marquicus at gmail.com> +# Contributor: Netanel Shine <netanel at archlinux.org.il > +# Contributor: ngoonee <ngoonee.t...@gmail.com> +# Contributor: Adam Russell <adamlr6+a...@gmail.com> +# Contributor: Dhananjay Sathe <dhananjaysa...@gmail.com> + +pkgbase=samba +pkgname=('libwbclient' 'smbclient' 'samba') +pkgver=4.1.6 +# 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.1.6 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.samba.org" +license=('GPL3') +makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' + 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' + 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') +source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz + samba.logrotate + samba.pam + samba.service + samba.conf.d + smbd.service + smbd.socket + nmbd.service + smbd@.service + winbindd.service + samba.conf + readline-6.3.patch) +### UNINSTALL dmapi package before building!!! + +build() { + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + rm -rf ${_pkgsrc} + cd ${srcdir}/samba-${_realver} + # change to use python2 + SAVEIFS=${IFS} + IFS=$(echo -en "\n\b") + PYTHON_CALLERS="$(find ${srcdir}/samba-${_realver} -name '*.py') +$(find ${srcdir}/samba-${_realver} -name 'wscript*') +$(find ${srcdir}/samba-${_realver} -name 'configure.ac') +$(find ${srcdir}/samba-${_realver} -name 'upgrade_from_s3') +$(find ${srcdir}/samba-${_realver}/buildtools -type f) +$(find ${srcdir}/samba-${_realver}/source4/scripting -type f)" + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \ + -e "s|python-config|python2-config|" \ + -e "s|bin/python|bin/python2|" \ + ${PYTHON_CALLERS} + IFS=${SAVEIFS} + + export PYTHON=/usr/bin/python2 +_samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 +_samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 +_samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 + cd ${srcdir}/samba-${_realver} + patch -Np1 -i ${srcdir}/readline-6.3.patch + ./configure --enable-fhs \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libdir=/usr/lib \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/cache/samba \ + --with-sockets-dir=/var/run/samba \ + --with-piddir=/var/run \ + --with-ads \ + --with-ldap \ + --with-winbind \ + --with-acl-support \ + --enable-gnutls \ + --with-pam \ + --with-pammodulesdir=/usr/lib/security \ + --with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \ + --disable-rpath-install + + # Add this to the options once it's working... + #--with-system-mitkrb5 /opt/heimdal + make + make DESTDIR="${_pkgsrc}/" install + + # This gets skipped somehow + if [ ! -e ${_pkgsrc}/usr/bin/smbtar ]; then + install -m755 ${srcdir}/samba-${_realver}/source3/script/smbtar ${_pkgsrc}/usr/bin/ + fi +} + +package_libwbclient() { +pkgdesc="Samba winbind client library" +depends=('glibc' 'libbsd') + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + install -d -m755 ${pkgdir}/usr/lib + mv ${_pkgsrc}/usr/lib/libwbclient*.so* ${pkgdir}/usr/lib/ + + install -d -m755 ${pkgdir}/usr/lib/samba + mv ${_pkgsrc}/usr/lib/samba/libwinbind-client*.so* ${pkgdir}/usr/lib/samba/ + mv ${_pkgsrc}/usr/lib/samba/libreplace.so* ${pkgdir}/usr/lib/samba/ + + install -d -m755 ${pkgdir}/usr/lib/pkgconfig + mv ${_pkgsrc}/usr/lib/pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + + install -d -m755 ${pkgdir}/usr/include/samba-4.0 + mv ${_pkgsrc}/usr/include/samba-4.0/wbclient.h ${pkgdir}/usr/include/samba-4.0/ +} + +package_smbclient() { +pkgdesc="Tools to access a server's filespace and printers via SMB" +depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb' + 'tevent' 'libgcrypt' 'python2' 'talloc' 'readline' 'gnutls' + 'libbsd' 'libldap' 'libcups') + + _smbclient_bins=('smbclient' 'smbclient4' 'rpcclient' 'smbspool' + 'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net' + 'nmblookup' 'nmblookup4' 'smbtar') + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + install -d -m755 ${pkgdir}/usr/bin + for bin in ${_smbclient_bins[@]}; do + mv ${_pkgsrc}/usr/bin/${bin} ${pkgdir}/usr/bin/ + done + + # smbclient binaries link to the majority of the samba + # libs, so this is a shortcut instead of resolving the + # whole dependency tree by hand + install -d -m755 ${pkgdir}/usr/lib + for lib in ${_pkgsrc}/usr/lib/lib*.so*; do + mv ${lib} ${pkgdir}/usr/lib/ + done + + install -d -m755 ${pkgdir}/usr/lib/samba + for lib in ${_pkgsrc}/usr/lib/samba/lib*.so*; do + mv ${lib} ${pkgdir}/usr/lib/samba/ + done + + install -d -m755 ${pkgdir}/usr/lib/pkgconfig + mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient-raw.pc ${pkgdir}/usr/lib/pkgconfig/ + mv ${_pkgsrc}/usr/lib/pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ + + install -d -m755 ${pkgdir}/usr/share/man/man1 + install -d -m755 ${pkgdir}/usr/share/man/man7 + install -d -m755 ${pkgdir}/usr/share/man/man8 + for bin in ${_smbclient_bins[@]}; do + if [ -e ${_pkgsrc}/usr/share/man/man1/${bin}.1 ]; then + mv ${_pkgsrc}/usr/share/man/man1/${bin}.1 ${pkgdir}/usr/share/man/man1/ + fi + if [ -e ${_pkgsrc}/usr/share/man/man8/${bin}.8 ]; then + mv ${_pkgsrc}/usr/share/man/man8/${bin}.8 ${pkgdir}/usr/share/man/man8/ + fi + done + mv ${_pkgsrc}/usr/share/man/man7/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ + + install -d -m755 ${pkgdir}/usr/include/samba-4.0 + mv ${_pkgsrc}/usr/include/samba-4.0/libsmbclient.h ${pkgdir}/usr/include/samba-4.0/ + mv ${_pkgsrc}/usr/include/samba-4.0/netapi.h ${pkgdir}/usr/include/samba-4.0/ + + mkdir -p ${pkgdir}/usr/lib/cups/backend + ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb +} + +package_samba() { +pkgdesc="SMB Fileserver and AD Domain server" +depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gamin' 'gnutls>=2.4.1' + 'talloc' 'ldb' 'libbsd' 'python2' 'iniparser' 'tdb' 'libaio' "smbclient>=$pkgver") +backup=(etc/logrotate.d/samba + etc/pam.d/samba + etc/samba/smb.conf + etc/xinetd.d/swat + etc/conf.d/samba) +install=samba.install + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + # Everything that libwbclient and smbclient didn't install goes + # into the samba package... + mv ${_pkgsrc}/* ${pkgdir}/ + rmdir ${_pkgsrc} + + _pyver=`python2 -c 'import sys; print(sys.version[:3])'` + + find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + + # Make admin scripts look in the right place for the samba python module + for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \ + bin/samba_upgradedns bin/samba-tool + do + sed -i "/^sys\.path\.insert/ a\ +sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ + ${pkgdir}/usr/${script} + done + + # install systemd files + install -d -m755 ${pkgdir}/usr/lib/systemd/system + #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 + install -m644 ${srcdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba + #done + # create ephemeral dirs via tmpfiles rather than shipping them in package + install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf + # install sample smb.conf + install -d -m755 ${pkgdir}/etc/samba + install -m644 ${srcdir}/samba-${_realver}/packaging/LSB/smb.conf ${pkgdir}/etc/samba/smb.conf.default + + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + + install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba + + # winbind krb5 locator + mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + mv ${pkgdir}/usr/lib/*.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/ + + # fix logrotate + sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default + + # spool directory + install -d -m1777 ${pkgdir}/var/spool/samba + + rm -rf ${pkgdir}/var/run + + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema +} +md5sums=('9dc64658c0cc81e7637f9b975c19638c' + '5697da77590ec092cc8a883bae06093c' + '96f82c38f3f540b53f3e5144900acf17' + 'ee4763a656cf00d92bfda31b6bb2c5cb' + '6c447748a064d631435dbef0a3dcf32f' + 'e4ae6a3cac080602120aa151918c4a36' + 'a78b9aa93eb14b0ac445897395693225' + 'df6380c73cb73163968eabc8650f7358' + '70afd2db60a2e8eff7615dbdecd887ac' + 'd5f56f43e1280bba20f6bbd88d16fa41' + '49abd7b719e3713a3f75a8a50958e381') +md5sums=('9dc64658c0cc81e7637f9b975c19638c' + '5697da77590ec092cc8a883bae06093c' + '96f82c38f3f540b53f3e5144900acf17' + 'ee4763a656cf00d92bfda31b6bb2c5cb' + '6c447748a064d631435dbef0a3dcf32f' + 'e4ae6a3cac080602120aa151918c4a36' + 'a78b9aa93eb14b0ac445897395693225' + 'df6380c73cb73163968eabc8650f7358' + '70afd2db60a2e8eff7615dbdecd887ac' + 'd5f56f43e1280bba20f6bbd88d16fa41' + '49abd7b719e3713a3f75a8a50958e381' + '1179c1dcdb95f79b0d5813698d010d2c') Copied: samba/repos/testing-i686/nmbd.service (from rev 207753, samba/trunk/nmbd.service) =================================================================== --- testing-i686/nmbd.service (rev 0) +++ testing-i686/nmbd.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,12 @@ +[Unit] +Description=Samba NetBIOS name server +After=network.target + +[Service] +Type=forking +PIDFile=/var/run/nmbd.pid +ExecStart=/usr/bin/nmbd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Copied: samba/repos/testing-i686/samba-4.0.3-fix_pidl_with_gcc48.patch (from rev 207753, samba/trunk/samba-4.0.3-fix_pidl_with_gcc48.patch) =================================================================== --- testing-i686/samba-4.0.3-fix_pidl_with_gcc48.patch (rev 0) +++ testing-i686/samba-4.0.3-fix_pidl_with_gcc48.patch 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,60 @@ +From 1ac743a7d0d20e16fc325749d593edaaed89d706 Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy <a...@samba.org> +Date: Wed, 6 Feb 2013 10:17:57 +0200 +Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output + +When PIDL calls out to C preprocessor to expand IDL files +and parse the output, it filters out linemarkers and line control +information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html +and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control + +With gcc 4.8 stdc-predef.h is included automatically and linemarker for the +file has extended flags that PIDL couldn't parse ('system header that needs to +be extern "C" protected for C++') + +Thanks to Jakub Jelinek <ja...@redhat.com> for explanation of the linemarker format. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517 + +Reviewed-by: Andreas Schneider <a...@samba.org> +(cherry picked from commit 6ba7ab5c14801aecae96373d5a9db7ab82957526) + +Signed-off-by: Andreas Schneider <a...@samba.org> +--- + pidl/idl.yp | 4 +++- + pidl/lib/Parse/Pidl/IDL.pm | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/pidl/idl.yp b/pidl/idl.yp +index b5c5185..c8a65f6 100644 +--- a/pidl/idl.yp ++++ b/pidl/idl.yp +@@ -610,7 +610,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm +index d4820ff..6927c89 100644 +--- a/pidl/lib/Parse/Pidl/IDL.pm ++++ b/pidl/lib/Parse/Pidl/IDL.pm +@@ -2576,7 +2576,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +-- +1.8.1.1 + Copied: samba/repos/testing-i686/samba.conf (from rev 207753, samba/trunk/samba.conf) =================================================================== --- testing-i686/samba.conf (rev 0) +++ testing-i686/samba.conf 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,2 @@ +D /run/samba 0755 - - - +d /var/log/samba 0755 - - - \ No newline at end of file Copied: samba/repos/testing-i686/samba.conf.d (from rev 207753, samba/trunk/samba.conf.d) =================================================================== --- testing-i686/samba.conf.d (rev 0) +++ testing-i686/samba.conf.d 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,18 @@ +## Path: Network/Samba +## Description: Samba process options +## Type: string +## Default: "" +## ServiceRestart: samba +SAMBAOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: smb +SMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: nmb +NMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: winbind +WINBINDOPTIONS="" Copied: samba/repos/testing-i686/samba.install (from rev 207753, samba/trunk/samba.install) =================================================================== --- testing-i686/samba.install (rev 0) +++ testing-i686/samba.install 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,14 @@ +#!/bin/sh + +post_install() { + systemd-tmpfiles --create samba.conf +} + +post_upgrade() { + if [ "$(vercmp $2 4.0.4)" -lt 0 ]; then + echo "Major upgrade from samba 3.x to 4.x," + echo "please read the Samba4 migration guide:" + echo "http://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO" + fi +} +# vim:set ts=2 sw=2 et: Copied: samba/repos/testing-i686/samba.logrotate (from rev 207753, samba/trunk/samba.logrotate) =================================================================== --- testing-i686/samba.logrotate (rev 0) +++ testing-i686/samba.logrotate 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,9 @@ +/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { + notifempty + missingok + sharedscripts + copytruncate + postrotate + /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true + endscript +} Copied: samba/repos/testing-i686/samba.pam (from rev 207753, samba/trunk/samba.pam) =================================================================== --- testing-i686/samba.pam (rev 0) +++ testing-i686/samba.pam 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so Copied: samba/repos/testing-i686/samba.service (from rev 207753, samba/trunk/samba.service) =================================================================== --- testing-i686/samba.service (rev 0) +++ testing-i686/samba.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,14 @@ +[Unit] +Description=Samba AD Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/samba.pid +LimitNOFILE=16384 +EnvironmentFile=-/etc/conf.d/samba +ExecStart=/usr/bin/samba $SAMBAOPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Copied: samba/repos/testing-i686/smbd.service (from rev 207753, samba/trunk/smbd.service) =================================================================== --- testing-i686/smbd.service (rev 0) +++ testing-i686/smbd.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,12 @@ +[Unit] +Description=Samba SMB/CIFS server +After=network.target nmbd.service winbindd.service + +[Service] +Type=forking +PIDFile=/var/run/smbd.pid +ExecStart=/usr/bin/smbd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Copied: samba/repos/testing-i686/smbd.socket (from rev 207753, samba/trunk/smbd.socket) =================================================================== --- testing-i686/smbd.socket (rev 0) +++ testing-i686/smbd.socket 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,9 @@ +[Unit] +Description=Samba SMB/CIFS server socket + +[Socket] +ListenStream=445 +Accept=yes + +[Install] +WantedBy=sockets.target Copied: samba/repos/testing-i686/smbd@.service (from rev 207753, samba/trunk/smbd@.service) =================================================================== --- testing-i686/smbd@.service (rev 0) +++ testing-i686/smbd@.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,7 @@ +[Unit] +Description=Samba SMB/CIFS server instance + +[Service] +ExecStart=/usr/bin/smbd -F +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket Copied: samba/repos/testing-i686/winbindd.service (from rev 207753, samba/trunk/winbindd.service) =================================================================== --- testing-i686/winbindd.service (rev 0) +++ testing-i686/winbindd.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,12 @@ +[Unit] +Description=Samba Winbind daemon +After=network.target nmbd.service + +[Service] +Type=forking +PIDFile=/var/run/winbindd.pid +ExecStart=/usr/bin/winbindd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Copied: samba/repos/testing-x86_64/PKGBUILD (from rev 207753, samba/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,267 @@ + +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> +# Contributor: Michael Hansen <zrax0111 gmail com> +# Contributor: Marco A Rojas <marquicus at gmail.com> +# Contributor: Netanel Shine <netanel at archlinux.org.il > +# Contributor: ngoonee <ngoonee.t...@gmail.com> +# Contributor: Adam Russell <adamlr6+a...@gmail.com> +# Contributor: Dhananjay Sathe <dhananjaysa...@gmail.com> + +pkgbase=samba +pkgname=('libwbclient' 'smbclient' 'samba') +pkgver=4.1.6 +# 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.1.6 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.samba.org" +license=('GPL3') +makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' + 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' + 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') +source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz + samba.logrotate + samba.pam + samba.service + samba.conf.d + smbd.service + smbd.socket + nmbd.service + smbd@.service + winbindd.service + samba.conf + readline-6.3.patch) +### UNINSTALL dmapi package before building!!! + +build() { + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + rm -rf ${_pkgsrc} + cd ${srcdir}/samba-${_realver} + # change to use python2 + SAVEIFS=${IFS} + IFS=$(echo -en "\n\b") + PYTHON_CALLERS="$(find ${srcdir}/samba-${_realver} -name '*.py') +$(find ${srcdir}/samba-${_realver} -name 'wscript*') +$(find ${srcdir}/samba-${_realver} -name 'configure.ac') +$(find ${srcdir}/samba-${_realver} -name 'upgrade_from_s3') +$(find ${srcdir}/samba-${_realver}/buildtools -type f) +$(find ${srcdir}/samba-${_realver}/source4/scripting -type f)" + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \ + -e "s|python-config|python2-config|" \ + -e "s|bin/python|bin/python2|" \ + ${PYTHON_CALLERS} + IFS=${SAVEIFS} + + export PYTHON=/usr/bin/python2 +_samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 +_samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 +_samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 + cd ${srcdir}/samba-${_realver} + patch -Np1 -i ${srcdir}/readline-6.3.patch + ./configure --enable-fhs \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libdir=/usr/lib \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/cache/samba \ + --with-sockets-dir=/var/run/samba \ + --with-piddir=/var/run \ + --with-ads \ + --with-ldap \ + --with-winbind \ + --with-acl-support \ + --enable-gnutls \ + --with-pam \ + --with-pammodulesdir=/usr/lib/security \ + --with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \ + --disable-rpath-install + + # Add this to the options once it's working... + #--with-system-mitkrb5 /opt/heimdal + make + make DESTDIR="${_pkgsrc}/" install + + # This gets skipped somehow + if [ ! -e ${_pkgsrc}/usr/bin/smbtar ]; then + install -m755 ${srcdir}/samba-${_realver}/source3/script/smbtar ${_pkgsrc}/usr/bin/ + fi +} + +package_libwbclient() { +pkgdesc="Samba winbind client library" +depends=('glibc' 'libbsd') + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + install -d -m755 ${pkgdir}/usr/lib + mv ${_pkgsrc}/usr/lib/libwbclient*.so* ${pkgdir}/usr/lib/ + + install -d -m755 ${pkgdir}/usr/lib/samba + mv ${_pkgsrc}/usr/lib/samba/libwinbind-client*.so* ${pkgdir}/usr/lib/samba/ + mv ${_pkgsrc}/usr/lib/samba/libreplace.so* ${pkgdir}/usr/lib/samba/ + + install -d -m755 ${pkgdir}/usr/lib/pkgconfig + mv ${_pkgsrc}/usr/lib/pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + + install -d -m755 ${pkgdir}/usr/include/samba-4.0 + mv ${_pkgsrc}/usr/include/samba-4.0/wbclient.h ${pkgdir}/usr/include/samba-4.0/ +} + +package_smbclient() { +pkgdesc="Tools to access a server's filespace and printers via SMB" +depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb' + 'tevent' 'libgcrypt' 'python2' 'talloc' 'readline' 'gnutls' + 'libbsd' 'libldap' 'libcups') + + _smbclient_bins=('smbclient' 'smbclient4' 'rpcclient' 'smbspool' + 'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net' + 'nmblookup' 'nmblookup4' 'smbtar') + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + install -d -m755 ${pkgdir}/usr/bin + for bin in ${_smbclient_bins[@]}; do + mv ${_pkgsrc}/usr/bin/${bin} ${pkgdir}/usr/bin/ + done + + # smbclient binaries link to the majority of the samba + # libs, so this is a shortcut instead of resolving the + # whole dependency tree by hand + install -d -m755 ${pkgdir}/usr/lib + for lib in ${_pkgsrc}/usr/lib/lib*.so*; do + mv ${lib} ${pkgdir}/usr/lib/ + done + + install -d -m755 ${pkgdir}/usr/lib/samba + for lib in ${_pkgsrc}/usr/lib/samba/lib*.so*; do + mv ${lib} ${pkgdir}/usr/lib/samba/ + done + + install -d -m755 ${pkgdir}/usr/lib/pkgconfig + mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient-raw.pc ${pkgdir}/usr/lib/pkgconfig/ + mv ${_pkgsrc}/usr/lib/pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ + + install -d -m755 ${pkgdir}/usr/share/man/man1 + install -d -m755 ${pkgdir}/usr/share/man/man7 + install -d -m755 ${pkgdir}/usr/share/man/man8 + for bin in ${_smbclient_bins[@]}; do + if [ -e ${_pkgsrc}/usr/share/man/man1/${bin}.1 ]; then + mv ${_pkgsrc}/usr/share/man/man1/${bin}.1 ${pkgdir}/usr/share/man/man1/ + fi + if [ -e ${_pkgsrc}/usr/share/man/man8/${bin}.8 ]; then + mv ${_pkgsrc}/usr/share/man/man8/${bin}.8 ${pkgdir}/usr/share/man/man8/ + fi + done + mv ${_pkgsrc}/usr/share/man/man7/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ + + install -d -m755 ${pkgdir}/usr/include/samba-4.0 + mv ${_pkgsrc}/usr/include/samba-4.0/libsmbclient.h ${pkgdir}/usr/include/samba-4.0/ + mv ${_pkgsrc}/usr/include/samba-4.0/netapi.h ${pkgdir}/usr/include/samba-4.0/ + + mkdir -p ${pkgdir}/usr/lib/cups/backend + ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb +} + +package_samba() { +pkgdesc="SMB Fileserver and AD Domain server" +depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gamin' 'gnutls>=2.4.1' + 'talloc' 'ldb' 'libbsd' 'python2' 'iniparser' 'tdb' 'libaio' "smbclient>=$pkgver") +backup=(etc/logrotate.d/samba + etc/pam.d/samba + etc/samba/smb.conf + etc/xinetd.d/swat + etc/conf.d/samba) +install=samba.install + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + # Everything that libwbclient and smbclient didn't install goes + # into the samba package... + mv ${_pkgsrc}/* ${pkgdir}/ + rmdir ${_pkgsrc} + + _pyver=`python2 -c 'import sys; print(sys.version[:3])'` + + find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + + # Make admin scripts look in the right place for the samba python module + for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \ + bin/samba_upgradedns bin/samba-tool + do + sed -i "/^sys\.path\.insert/ a\ +sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ + ${pkgdir}/usr/${script} + done + + # install systemd files + install -d -m755 ${pkgdir}/usr/lib/systemd/system + #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 + install -m644 ${srcdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba + #done + # create ephemeral dirs via tmpfiles rather than shipping them in package + install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf + # install sample smb.conf + install -d -m755 ${pkgdir}/etc/samba + install -m644 ${srcdir}/samba-${_realver}/packaging/LSB/smb.conf ${pkgdir}/etc/samba/smb.conf.default + + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + + install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba + + # winbind krb5 locator + mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + mv ${pkgdir}/usr/lib/*.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/ + + # fix logrotate + sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default + + # spool directory + install -d -m1777 ${pkgdir}/var/spool/samba + + rm -rf ${pkgdir}/var/run + + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema +} +md5sums=('9dc64658c0cc81e7637f9b975c19638c' + '5697da77590ec092cc8a883bae06093c' + '96f82c38f3f540b53f3e5144900acf17' + 'ee4763a656cf00d92bfda31b6bb2c5cb' + '6c447748a064d631435dbef0a3dcf32f' + 'e4ae6a3cac080602120aa151918c4a36' + 'a78b9aa93eb14b0ac445897395693225' + 'df6380c73cb73163968eabc8650f7358' + '70afd2db60a2e8eff7615dbdecd887ac' + 'd5f56f43e1280bba20f6bbd88d16fa41' + '49abd7b719e3713a3f75a8a50958e381') +md5sums=('9dc64658c0cc81e7637f9b975c19638c' + '5697da77590ec092cc8a883bae06093c' + '96f82c38f3f540b53f3e5144900acf17' + 'ee4763a656cf00d92bfda31b6bb2c5cb' + '6c447748a064d631435dbef0a3dcf32f' + 'e4ae6a3cac080602120aa151918c4a36' + 'a78b9aa93eb14b0ac445897395693225' + 'df6380c73cb73163968eabc8650f7358' + '70afd2db60a2e8eff7615dbdecd887ac' + 'd5f56f43e1280bba20f6bbd88d16fa41' + '49abd7b719e3713a3f75a8a50958e381' + '1179c1dcdb95f79b0d5813698d010d2c') Copied: samba/repos/testing-x86_64/nmbd.service (from rev 207753, samba/trunk/nmbd.service) =================================================================== --- testing-x86_64/nmbd.service (rev 0) +++ testing-x86_64/nmbd.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,12 @@ +[Unit] +Description=Samba NetBIOS name server +After=network.target + +[Service] +Type=forking +PIDFile=/var/run/nmbd.pid +ExecStart=/usr/bin/nmbd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Copied: samba/repos/testing-x86_64/samba-4.0.3-fix_pidl_with_gcc48.patch (from rev 207753, samba/trunk/samba-4.0.3-fix_pidl_with_gcc48.patch) =================================================================== --- testing-x86_64/samba-4.0.3-fix_pidl_with_gcc48.patch (rev 0) +++ testing-x86_64/samba-4.0.3-fix_pidl_with_gcc48.patch 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,60 @@ +From 1ac743a7d0d20e16fc325749d593edaaed89d706 Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy <a...@samba.org> +Date: Wed, 6 Feb 2013 10:17:57 +0200 +Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output + +When PIDL calls out to C preprocessor to expand IDL files +and parse the output, it filters out linemarkers and line control +information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html +and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control + +With gcc 4.8 stdc-predef.h is included automatically and linemarker for the +file has extended flags that PIDL couldn't parse ('system header that needs to +be extern "C" protected for C++') + +Thanks to Jakub Jelinek <ja...@redhat.com> for explanation of the linemarker format. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517 + +Reviewed-by: Andreas Schneider <a...@samba.org> +(cherry picked from commit 6ba7ab5c14801aecae96373d5a9db7ab82957526) + +Signed-off-by: Andreas Schneider <a...@samba.org> +--- + pidl/idl.yp | 4 +++- + pidl/lib/Parse/Pidl/IDL.pm | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/pidl/idl.yp b/pidl/idl.yp +index b5c5185..c8a65f6 100644 +--- a/pidl/idl.yp ++++ b/pidl/idl.yp +@@ -610,7 +610,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm +index d4820ff..6927c89 100644 +--- a/pidl/lib/Parse/Pidl/IDL.pm ++++ b/pidl/lib/Parse/Pidl/IDL.pm +@@ -2576,7 +2576,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +-- +1.8.1.1 + Copied: samba/repos/testing-x86_64/samba.conf (from rev 207753, samba/trunk/samba.conf) =================================================================== --- testing-x86_64/samba.conf (rev 0) +++ testing-x86_64/samba.conf 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,2 @@ +D /run/samba 0755 - - - +d /var/log/samba 0755 - - - \ No newline at end of file Copied: samba/repos/testing-x86_64/samba.conf.d (from rev 207753, samba/trunk/samba.conf.d) =================================================================== --- testing-x86_64/samba.conf.d (rev 0) +++ testing-x86_64/samba.conf.d 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,18 @@ +## Path: Network/Samba +## Description: Samba process options +## Type: string +## Default: "" +## ServiceRestart: samba +SAMBAOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: smb +SMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: nmb +NMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: winbind +WINBINDOPTIONS="" Copied: samba/repos/testing-x86_64/samba.install (from rev 207753, samba/trunk/samba.install) =================================================================== --- testing-x86_64/samba.install (rev 0) +++ testing-x86_64/samba.install 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,14 @@ +#!/bin/sh + +post_install() { + systemd-tmpfiles --create samba.conf +} + +post_upgrade() { + if [ "$(vercmp $2 4.0.4)" -lt 0 ]; then + echo "Major upgrade from samba 3.x to 4.x," + echo "please read the Samba4 migration guide:" + echo "http://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO" + fi +} +# vim:set ts=2 sw=2 et: Copied: samba/repos/testing-x86_64/samba.logrotate (from rev 207753, samba/trunk/samba.logrotate) =================================================================== --- testing-x86_64/samba.logrotate (rev 0) +++ testing-x86_64/samba.logrotate 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,9 @@ +/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { + notifempty + missingok + sharedscripts + copytruncate + postrotate + /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true + endscript +} Copied: samba/repos/testing-x86_64/samba.pam (from rev 207753, samba/trunk/samba.pam) =================================================================== --- testing-x86_64/samba.pam (rev 0) +++ testing-x86_64/samba.pam 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so Copied: samba/repos/testing-x86_64/samba.service (from rev 207753, samba/trunk/samba.service) =================================================================== --- testing-x86_64/samba.service (rev 0) +++ testing-x86_64/samba.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,14 @@ +[Unit] +Description=Samba AD Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/samba.pid +LimitNOFILE=16384 +EnvironmentFile=-/etc/conf.d/samba +ExecStart=/usr/bin/samba $SAMBAOPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Copied: samba/repos/testing-x86_64/smbd.service (from rev 207753, samba/trunk/smbd.service) =================================================================== --- testing-x86_64/smbd.service (rev 0) +++ testing-x86_64/smbd.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,12 @@ +[Unit] +Description=Samba SMB/CIFS server +After=network.target nmbd.service winbindd.service + +[Service] +Type=forking +PIDFile=/var/run/smbd.pid +ExecStart=/usr/bin/smbd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target Copied: samba/repos/testing-x86_64/smbd.socket (from rev 207753, samba/trunk/smbd.socket) =================================================================== --- testing-x86_64/smbd.socket (rev 0) +++ testing-x86_64/smbd.socket 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,9 @@ +[Unit] +Description=Samba SMB/CIFS server socket + +[Socket] +ListenStream=445 +Accept=yes + +[Install] +WantedBy=sockets.target Copied: samba/repos/testing-x86_64/smbd@.service (from rev 207753, samba/trunk/smbd@.service) =================================================================== --- testing-x86_64/smbd@.service (rev 0) +++ testing-x86_64/smbd@.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,7 @@ +[Unit] +Description=Samba SMB/CIFS server instance + +[Service] +ExecStart=/usr/bin/smbd -F +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket Copied: samba/repos/testing-x86_64/winbindd.service (from rev 207753, samba/trunk/winbindd.service) =================================================================== --- testing-x86_64/winbindd.service (rev 0) +++ testing-x86_64/winbindd.service 2014-03-14 17:08:39 UTC (rev 207754) @@ -0,0 +1,12 @@ +[Unit] +Description=Samba Winbind daemon +After=network.target nmbd.service + +[Service] +Type=forking +PIDFile=/var/run/winbindd.pid +ExecStart=/usr/bin/winbindd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target