Date: Wednesday, March 11, 2020 @ 23:47:02 Author: felixonmars Revision: 377400
archrelease: copy trunk to testing-x86_64 Added: samba/repos/testing-x86_64/PKGBUILD (from rev 377399, samba/trunk/PKGBUILD) samba/repos/testing-x86_64/nmbd.service (from rev 377399, samba/trunk/nmbd.service) samba/repos/testing-x86_64/samba.conf (from rev 377399, samba/trunk/samba.conf) samba/repos/testing-x86_64/samba.conf.d (from rev 377399, samba/trunk/samba.conf.d) samba/repos/testing-x86_64/samba.install (from rev 377399, samba/trunk/samba.install) samba/repos/testing-x86_64/samba.logrotate (from rev 377399, samba/trunk/samba.logrotate) samba/repos/testing-x86_64/samba.pam (from rev 377399, samba/trunk/samba.pam) samba/repos/testing-x86_64/samba.service (from rev 377399, samba/trunk/samba.service) samba/repos/testing-x86_64/smbd.service (from rev 377399, samba/trunk/smbd.service) samba/repos/testing-x86_64/smbd.socket (from rev 377399, samba/trunk/smbd.socket) samba/repos/testing-x86_64/smbd@.service (from rev 377399, samba/trunk/smbd@.service) samba/repos/testing-x86_64/winbindd.service (from rev 377399, samba/trunk/winbindd.service) Deleted: samba/repos/testing-x86_64/PKGBUILD samba/repos/testing-x86_64/nmbd.service samba/repos/testing-x86_64/samba.conf samba/repos/testing-x86_64/samba.conf.d samba/repos/testing-x86_64/samba.install samba/repos/testing-x86_64/samba.logrotate samba/repos/testing-x86_64/samba.pam samba/repos/testing-x86_64/samba.service samba/repos/testing-x86_64/smbd.service samba/repos/testing-x86_64/smbd.socket samba/repos/testing-x86_64/smbd@.service samba/repos/testing-x86_64/winbindd.service ------------------+ PKGBUILD | 417 ++++++++++++++++++++++++++--------------------------- nmbd.service | 24 +-- samba.conf | 4 samba.conf.d | 36 ++-- samba.install | 20 +- samba.logrotate | 10 - samba.pam | 6 samba.service | 28 +-- smbd.service | 24 +-- smbd.socket | 18 +- smbd@.service | 14 - winbindd.service | 24 +-- 12 files changed, 311 insertions(+), 314 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-11 23:46:07 UTC (rev 377399) +++ PKGBUILD 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,210 +0,0 @@ - -# 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.11.2 -pkgrel=2 -arch=(x86_64) -url="https://www.samba.org" -license=('GPL3') -makedepends=('python' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' - 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' - 'systemd' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus' 'libaio' - 'perl-parse-yapp' 'libnsl' 'libtirpc' 'rpcsvc-proto' 'jansson') -source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.gz - https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.asc - samba.logrotate - samba.pam - samba.conf) -validpgpkeys=('52FBC0B86D954B0843324CDC6F33915B6568B7EA') #Samba Distribution Verification Key <samba-b...@samba.org> -### 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-${pkgver} -_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-${pkgver} - ./configure --enable-fhs \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib/samba \ - --localstatedir=/var \ - --with-configdir=/etc/samba \ - --with-lockdir=/var/cache/samba \ - --with-sockets-dir=/run/samba \ - --with-piddir=/run \ - --with-ads \ - --with-ldap \ - --with-winbind \ - --with-acl-support \ - --with-systemd \ - --systemd-install-services \ - --with-pam \ - --with-pammodulesdir=/usr/lib/security \ - --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util \ - --with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \ - --disable-rpath-install \ - --with-system-mitkrb5 --with-experimental-mit-ad-dc - - # 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-${pkgver}/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-samba4.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' 'python' 'talloc' 'readline' 'gnutls' - 'libbsd' 'libldap' 'libcups' 'libarchive' 'libnsl' 'jansson') - - _smbclient_bins=('smbclient' 'rpcclient' 'smbspool' - 'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net' - 'nmblookup' '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/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' 'gnutls>=2.4.1' - 'talloc' 'ldb' 'libbsd' 'python' 'iniparser' 'tdb' 'libaio' 'perl-parse-yapp' "smbclient>=$pkgver" 'gpgme') -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} - - # 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 - - # packaging/wscript_build to use /etc/conf.d - sed -i -e '/^EnvironmentFile/ s/sysconfig/conf.d/' "${pkgdir}"/usr/lib/systemd/system/*.service - install -d -m755 "${pkgdir}"/etc/conf.d - install -m644 "${srcdir}"/samba-${pkgver}/packaging/systemd/samba.sysconfig "${pkgdir}"/etc/conf.d/samba - - # create ephemeral dirs via tmpfiles rather than shipping them in package - install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf - # create config dir - install -d -m755 ${pkgdir}/etc/samba - - 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 - - # spool directory - install -d -m1777 ${pkgdir}/var/spool/samba - - rm -rf ${pkgdir}/var/run - rm -rf ${pkgdir}/etc/sysconfig - - # copy ldap example - install -D -m644 ${srcdir}/samba-${pkgver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema -} -md5sums=('8f4fb25c13be88f23b4eebe8715ba3c1' - 'SKIP' - '995621522c6ec9b68c1b858ceed627ed' - '96f82c38f3f540b53f3e5144900acf17' - '49abd7b719e3713a3f75a8a50958e381') Copied: samba/repos/testing-x86_64/PKGBUILD (from rev 377399, samba/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-11 23:47:02 UTC (rev 377400) @@ -0,0 +1,207 @@ + +# 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.11.3 +pkgrel=1 +arch=(x86_64) +url="https://www.samba.org" +license=('GPL3') +makedepends=('python' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' + 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' + 'systemd' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus' 'libaio' + 'perl-parse-yapp' 'libnsl' 'libtirpc' 'rpcsvc-proto' 'jansson') +source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.gz + https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.asc + samba.logrotate + samba.pam + samba.conf) +validpgpkeys=('52FBC0B86D954B0843324CDC6F33915B6568B7EA') #Samba Distribution Verification Key <samba-b...@samba.org> +sha512sums=('11882791cf7c4e3155e50732c8b0858312caf9ce90767fa2703cb3bbe41e981035a0e14e658e9f51b67bdf1882cb9bc987a32f4515ae8a9ad0da3270629abe8b' + 'SKIP' + '2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858' + '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67' + 'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc') +### 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} +_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 samba-${pkgver} + ./configure --enable-fhs \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib/samba \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/cache/samba \ + --with-sockets-dir=/run/samba \ + --with-piddir=/run \ + --with-ads \ + --with-ldap \ + --with-winbind \ + --with-acl-support \ + --with-systemd \ + --systemd-install-services \ + --with-pam \ + --with-pammodulesdir=/usr/lib/security \ + --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util \ + --with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \ + --disable-rpath-install \ + --with-system-mitkrb5 --with-experimental-mit-ad-dc + + # 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-${pkgver}/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-samba4.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' 'python' 'talloc' 'readline' 'gnutls' + 'libbsd' 'libldap' 'libcups' 'libarchive' 'libnsl' 'jansson') + + _smbclient_bins=('smbclient' 'rpcclient' 'smbspool' + 'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net' + 'nmblookup' '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/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' 'gnutls>=2.4.1' + 'talloc' 'ldb' 'libbsd' 'python' 'iniparser' 'tdb' 'libaio' 'perl-parse-yapp' "smbclient>=$pkgver" 'gpgme') +backup=(etc/logrotate.d/samba + etc/pam.d/samba + 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}" + + # 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 + + # packaging/wscript_build to use /etc/conf.d + sed -i -e '/^EnvironmentFile/ s/sysconfig/conf.d/' "${pkgdir}"/usr/lib/systemd/system/*.service + install -d -m755 "${pkgdir}"/etc/conf.d + install -m644 "${srcdir}"/samba-${pkgver}/packaging/systemd/samba.sysconfig "${pkgdir}"/etc/conf.d/samba + + # create ephemeral dirs via tmpfiles rather than shipping them in package + install -D -m644 "${srcdir}"/samba.conf "${pkgdir}"/usr/lib/tmpfiles.d/samba.conf + # create config dir + install -d -m755 "${pkgdir}"/etc/samba + + 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 + + # spool directory + install -d -m1777 "${pkgdir}"/var/spool/samba + + rm -rf "${pkgdir}"/var/run + rm -rf "${pkgdir}"/etc/sysconfig + + # copy ldap example + install -D -m644 "${srcdir}"/samba-${pkgver}/examples/LDAP/samba.schema "${pkgdir}"/usr/share/doc/samba/examples/LDAP/samba.schema +} Deleted: nmbd.service =================================================================== --- nmbd.service 2020-03-11 23:46:07 UTC (rev 377399) +++ nmbd.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,12 +0,0 @@ -[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/nmbd.service (from rev 377399, samba/trunk/nmbd.service) =================================================================== --- nmbd.service (rev 0) +++ nmbd.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -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 Deleted: samba.conf =================================================================== --- samba.conf 2020-03-11 23:46:07 UTC (rev 377399) +++ samba.conf 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,2 +0,0 @@ -D /run/samba 0755 - - - -d /var/log/samba 0755 - - - \ No newline at end of file Copied: samba/repos/testing-x86_64/samba.conf (from rev 377399, samba/trunk/samba.conf) =================================================================== --- samba.conf (rev 0) +++ samba.conf 2020-03-11 23:47:02 UTC (rev 377400) @@ -0,0 +1,2 @@ +D /run/samba 0755 - - - +d /var/log/samba 0755 - - - \ No newline at end of file Deleted: samba.conf.d =================================================================== --- samba.conf.d 2020-03-11 23:46:07 UTC (rev 377399) +++ samba.conf.d 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,18 +0,0 @@ -## 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.conf.d (from rev 377399, samba/trunk/samba.conf.d) =================================================================== --- samba.conf.d (rev 0) +++ samba.conf.d 2020-03-11 23:47:02 UTC (rev 377400) @@ -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="" Deleted: samba.install =================================================================== --- samba.install 2020-03-11 23:46:07 UTC (rev 377399) +++ samba.install 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,10 +0,0 @@ -#!/bin/sh - -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.install (from rev 377399, samba/trunk/samba.install) =================================================================== --- samba.install (rev 0) +++ samba.install 2020-03-11 23:47:02 UTC (rev 377400) @@ -0,0 +1,10 @@ +#!/bin/sh + +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: Deleted: samba.logrotate =================================================================== --- samba.logrotate 2020-03-11 23:46:07 UTC (rev 377399) +++ samba.logrotate 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,5 +0,0 @@ -/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { - notifempty - missingok - copytruncate -} Copied: samba/repos/testing-x86_64/samba.logrotate (from rev 377399, samba/trunk/samba.logrotate) =================================================================== --- samba.logrotate (rev 0) +++ samba.logrotate 2020-03-11 23:47:02 UTC (rev 377400) @@ -0,0 +1,5 @@ +/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { + notifempty + missingok + copytruncate +} Deleted: samba.pam =================================================================== --- samba.pam 2020-03-11 23:46:07 UTC (rev 377399) +++ samba.pam 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so Copied: samba/repos/testing-x86_64/samba.pam (from rev 377399, samba/trunk/samba.pam) =================================================================== --- samba.pam (rev 0) +++ samba.pam 2020-03-11 23:47:02 UTC (rev 377400) @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so Deleted: samba.service =================================================================== --- samba.service 2020-03-11 23:46:07 UTC (rev 377399) +++ samba.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,14 +0,0 @@ -[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/samba.service (from rev 377399, samba/trunk/samba.service) =================================================================== --- samba.service (rev 0) +++ samba.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -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 Deleted: smbd.service =================================================================== --- smbd.service 2020-03-11 23:46:07 UTC (rev 377399) +++ smbd.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,12 +0,0 @@ -[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.service (from rev 377399, samba/trunk/smbd.service) =================================================================== --- smbd.service (rev 0) +++ smbd.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -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 Deleted: smbd.socket =================================================================== --- smbd.socket 2020-03-11 23:46:07 UTC (rev 377399) +++ smbd.socket 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,9 +0,0 @@ -[Unit] -Description=Samba SMB/CIFS server socket - -[Socket] -ListenStream=445 -Accept=yes - -[Install] -WantedBy=sockets.target Copied: samba/repos/testing-x86_64/smbd.socket (from rev 377399, samba/trunk/smbd.socket) =================================================================== --- smbd.socket (rev 0) +++ smbd.socket 2020-03-11 23:47:02 UTC (rev 377400) @@ -0,0 +1,9 @@ +[Unit] +Description=Samba SMB/CIFS server socket + +[Socket] +ListenStream=445 +Accept=yes + +[Install] +WantedBy=sockets.target Deleted: smbd@.service =================================================================== --- smbd@.service 2020-03-11 23:46:07 UTC (rev 377399) +++ smbd@.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,7 +0,0 @@ -[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/smbd@.service (from rev 377399, samba/trunk/smbd@.service) =================================================================== --- smbd@.service (rev 0) +++ smbd@.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -0,0 +1,7 @@ +[Unit] +Description=Samba SMB/CIFS server instance + +[Service] +ExecStart=/usr/bin/smbd -F +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket Deleted: winbindd.service =================================================================== --- winbindd.service 2020-03-11 23:46:07 UTC (rev 377399) +++ winbindd.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -1,12 +0,0 @@ -[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/winbindd.service (from rev 377399, samba/trunk/winbindd.service) =================================================================== --- winbindd.service (rev 0) +++ winbindd.service 2020-03-11 23:47:02 UTC (rev 377400) @@ -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