Date: Wednesday, November 16, 2022 @ 06:16:05
Author: tpowa
Revision: 461865
archrelease: copy trunk to extra-x86_64
Added:
samba/repos/extra-x86_64/PKGBUILD
(from rev 461864, samba/trunk/PKGBUILD)
samba/repos/extra-x86_64/keys/
samba/repos/extra-x86_64/samba-4.17.0-15195.patch
(from rev 461864, samba/trunk/samba-4.17.0-15195.patch)
samba/repos/extra-x86_64/samba-glibc-2.36.patch
(from rev 461864, samba/trunk/samba-glibc-2.36.patch)
samba/repos/extra-x86_64/samba.conf
(from rev 461864, samba/trunk/samba.conf)
samba/repos/extra-x86_64/samba.install
(from rev 461864, samba/trunk/samba.install)
samba/repos/extra-x86_64/samba.logrotate
(from rev 461864, samba/trunk/samba.logrotate)
samba/repos/extra-x86_64/samba.pam
(from rev 461864, samba/trunk/samba.pam)
Deleted:
samba/repos/extra-x86_64/PKGBUILD
samba/repos/extra-x86_64/keys/
samba/repos/extra-x86_64/samba-4.17.0-15195.patch
samba/repos/extra-x86_64/samba-glibc-2.36.patch
samba/repos/extra-x86_64/samba.conf
samba/repos/extra-x86_64/samba.install
samba/repos/extra-x86_64/samba.logrotate
samba/repos/extra-x86_64/samba.pam
--------------------------+
PKGBUILD | 400 ++++++++++++++++++++++-----------------------
samba-4.17.0-15195.patch | 172 +++++++++----------
samba-glibc-2.36.patch | 114 ++++++------
samba.conf | 4
samba.install | 20 +-
samba.logrotate | 10 -
samba.pam | 6
7 files changed, 363 insertions(+), 363 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-16 06:15:50 UTC (rev 461864)
+++ PKGBUILD 2022-11-16 06:16:05 UTC (rev 461865)
@@ -1,200 +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=('smbclient' 'samba')
-pkgver=4.17.2
-pkgrel=2
-arch=(x86_64)
-url="https://www.samba.org";
-license=('GPL3')
-makedepends=('python' 'python-markdown' 'python-dnspython' 'docbook-xsl'
'pkg-config' 'libbsd' 'db' 'popt' 'libcups'
- 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb' 'krb5' 'pam'
- 'systemd' 'gnutls' 'talloc' 'tdb' 'dbus'
- 'perl-parse-yapp' 'libnsl' 'libtirpc' 'rpcsvc-proto' 'jansson'
- 'liburing' 'perl-json' 'glusterfs')
-optdepends=(
- 'python-dnspython: samba_dnsupdate and samba_upgradedns in AD
setup'
- 'python-markdown: for samba-tool domain schemeupgrade'
- 'glusterfs: for vfs_glusterfs support'
-)
-source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc}
- samba.logrotate
- samba.pam
- samba.conf)
-validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution
Verification Key <samba-b...@samba.org>
-sha512sums=('31d52d3366e39048a02550ee53d4e0956eedfda0d7d8dcb8f1f23b2435852023eb0eb8c1252aa2780ce8e7dd81f402e84ab8c17156dd18fe80d8b763eb83ce79'
- '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},vfs_io_uring
\
- --disable-rpath-install \
- --with-profiling-data
-
- # 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_smbclient() {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('popt' 'cifs-utils' 'tdb' 'ldb'
- 'tevent' 'libgcrypt' 'python' 'talloc' 'readline' 'gnutls'
- 'libbsd' 'libldap' 'libcups' 'libarchive' 'libnsl' 'jansson'
- 'libldb.so' 'libtdb.so' 'libtevent.so' 'libreadline.so' 'icu'
'libunwind')
-replaces=('libwbclient')
-provides=('libwbclient')
-
- _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/
- mv "${_pkgsrc}"/usr/lib/pkgconfig/wbclient.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/
- mv "${_pkgsrc}"/usr/include/samba-4.0/wbclient.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' 'perl-parse-yapp'
"smbclient>=$pkgver" 'gpgme'
- 'libldb.so' 'libtdb.so' 'libtevent.so' 'liburing' 'libunwind')
-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}"/run
- 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
-}
-
-# vim: ts=2 sw=2 et:
Copied: samba/repos/extra-x86_64/PKGBUILD (from rev 461864,
samba/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-16 06:16:05 UTC (rev 461865)
@@ -0,0 +1,200 @@
+
+# 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=('smbclient' 'samba')
+pkgver=4.17.3
+pkgrel=1
+arch=(x86_64)
+url="https://www.samba.org";
+license=('GPL3')
+makedepends=('python' 'python-markdown' 'python-dnspython' 'docbook-xsl'
'pkg-config' 'libbsd' 'db' 'popt' 'libcups'
+ 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb' 'krb5' 'pam'
+ 'systemd' 'gnutls' 'talloc' 'tdb' 'dbus'
+ 'perl-parse-yapp' 'libnsl' 'libtirpc' 'rpcsvc-proto' 'jansson'
+ 'liburing' 'perl-json' 'glusterfs')
+optdepends=(
+ 'python-dnspython: samba_dnsupdate and samba_upgradedns in AD
setup'
+ 'python-markdown: for samba-tool domain schemeupgrade'
+ 'glusterfs: for vfs_glusterfs support'
+)
+source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc}
+ samba.logrotate
+ samba.pam
+ samba.conf)
+validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution
Verification Key <samba-b...@samba.org>
+sha512sums=('a5482bfe66f7f34fdf855e69b7b0fc2a4f9e756947357201651af70f3b10e236474c1b4ae4d9367b122e2d4565601659c373d3b17717a3c5c66aa9258eb58ff0'
+ '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},vfs_io_uring
\
+ --disable-rpath-install \
+ --with-profiling-data
+
+ # 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_smbclient() {
+pkgdesc="Tools to access a server's filespace and printers via SMB"
+depends=('popt' 'cifs-utils' 'tdb' 'ldb'
+ 'tevent' 'libgcrypt' 'python' 'talloc' 'readline' 'gnutls'
+ 'libbsd' 'libldap' 'libcups' 'libarchive' 'libnsl' 'jansson'
+ 'libldb.so' 'libtdb.so' 'libtevent.so' 'libreadline.so' 'icu'
'libunwind')
+replaces=('libwbclient')
+provides=('libwbclient')
+
+ _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/
+ mv "${_pkgsrc}"/usr/lib/pkgconfig/wbclient.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/
+ mv "${_pkgsrc}"/usr/include/samba-4.0/wbclient.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' 'perl-parse-yapp'
"smbclient>=$pkgver" 'gpgme'
+ 'libldb.so' 'libtdb.so' 'libtevent.so' 'liburing' 'libunwind')
+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}"/run
+ 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
+}
+
+# vim: ts=2 sw=2 et:
Deleted: samba-4.17.0-15195.patch
===================================================================
--- samba-4.17.0-15195.patch 2022-11-16 06:15:50 UTC (rev 461864)
+++ samba-4.17.0-15195.patch 2022-11-16 06:16:05 UTC (rev 461865)
@@ -1,86 +0,0 @@
-diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
-index fa301b9fa18..98750754036 100644
---- a/source3/libsmb/libsmb_file.c
-+++ b/source3/libsmb/libsmb_file.c
-@@ -464,6 +464,7 @@ SMBC_getatr(SMBCCTX * context,
- struct timespec access_time_ts = {0};
- struct timespec write_time_ts = {0};
- struct timespec change_time_ts = {0};
-+ struct timespec w_time_ts = {0};
- time_t write_time = 0;
- SMB_INO_T ino = 0;
- struct cli_credentials *creds = NULL;
-@@ -506,6 +507,7 @@ SMBC_getatr(SMBCCTX * context,
- }
-
- if (!srv->no_pathinfo2) {
-+ bool not_supported_error = false;
- status = cli_qpathinfo2(targetcli,
- targetpath,
- &create_time_ts,
-@@ -518,11 +520,21 @@ SMBC_getatr(SMBCCTX * context,
- if (NT_STATUS_IS_OK(status)) {
- goto setup_stat;
- }
-+ if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL) ||
-+ NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
-+ not_supported_error = true;
-+ }
-+ if (!not_supported_error) {
-+ /* "Normal error". Just return it to caller. */
-+ TALLOC_FREE(frame);
-+ return status;
-+ }
- }
-
- srv->no_pathinfo2 = True;
-
- if (!srv->no_pathinfo3) {
-+ bool not_supported_error = false;
- status = cli_qpathinfo3(targetcli,
- targetpath,
- &create_time_ts,
-@@ -535,6 +547,15 @@ SMBC_getatr(SMBCCTX * context,
- if (NT_STATUS_IS_OK(status)) {
- goto setup_stat;
- }
-+ if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL) ||
-+ NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
-+ not_supported_error = true;
-+ }
-+ if (!not_supported_error) {
-+ /* "Normal error". Just return it to caller. */
-+ TALLOC_FREE(frame);
-+ return status;
-+ }
- }
-
- srv->no_pathinfo3 = True;
-@@ -545,14 +566,11 @@ SMBC_getatr(SMBCCTX * context,
- }
-
- status = cli_getatr(targetcli, targetpath, &attr, &size, &write_time);
-- if (NT_STATUS_IS_OK(status)) {
-- struct timespec w_time_ts =
-- convert_time_t_to_timespec(write_time);
--
-- access_time_ts = change_time_ts = write_time_ts = w_time_ts;
--
-- goto setup_stat;
-+ if (!NT_STATUS_IS_OK(status)) {
-+ goto all_failed;
- }
-+ w_time_ts = convert_time_t_to_timespec(write_time);
-+ access_time_ts = change_time_ts = write_time_ts = w_time_ts;
-
- setup_stat:
- setup_stat(sb,
-@@ -573,7 +591,7 @@ all_failed:
- srv->no_pathinfo3 = False;
-
- TALLOC_FREE(frame);
-- return NT_STATUS_ACCESS_DENIED;
-+ return status;
- }
-
- /*
Copied: samba/repos/extra-x86_64/samba-4.17.0-15195.patch (from rev 461864,
samba/trunk/samba-4.17.0-15195.patch)
===================================================================
--- samba-4.17.0-15195.patch (rev 0)
+++ samba-4.17.0-15195.patch 2022-11-16 06:16:05 UTC (rev 461865)
@@ -0,0 +1,86 @@
+diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
+index fa301b9fa18..98750754036 100644
+--- a/source3/libsmb/libsmb_file.c
++++ b/source3/libsmb/libsmb_file.c
+@@ -464,6 +464,7 @@ SMBC_getatr(SMBCCTX * context,
+ struct timespec access_time_ts = {0};
+ struct timespec write_time_ts = {0};
+ struct timespec change_time_ts = {0};
++ struct timespec w_time_ts = {0};
+ time_t write_time = 0;
+ SMB_INO_T ino = 0;
+ struct cli_credentials *creds = NULL;
+@@ -506,6 +507,7 @@ SMBC_getatr(SMBCCTX * context,
+ }
+
+ if (!srv->no_pathinfo2) {
++ bool not_supported_error = false;
+ status = cli_qpathinfo2(targetcli,
+ targetpath,
+ &create_time_ts,
+@@ -518,11 +520,21 @@ SMBC_getatr(SMBCCTX * context,
+ if (NT_STATUS_IS_OK(status)) {
+ goto setup_stat;
+ }
++ if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL) ||
++ NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
++ not_supported_error = true;
++ }
++ if (!not_supported_error) {
++ /* "Normal error". Just return it to caller. */
++ TALLOC_FREE(frame);
++ return status;
++ }
+ }
+
+ srv->no_pathinfo2 = True;
+
+ if (!srv->no_pathinfo3) {
++ bool not_supported_error = false;
+ status = cli_qpathinfo3(targetcli,
+ targetpath,
+ &create_time_ts,
+@@ -535,6 +547,15 @@ SMBC_getatr(SMBCCTX * context,
+ if (NT_STATUS_IS_OK(status)) {
+ goto setup_stat;
+ }
++ if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL) ||
++ NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
++ not_supported_error = true;
++ }
++ if (!not_supported_error) {
++ /* "Normal error". Just return it to caller. */
++ TALLOC_FREE(frame);
++ return status;
++ }
+ }
+
+ srv->no_pathinfo3 = True;
+@@ -545,14 +566,11 @@ SMBC_getatr(SMBCCTX * context,
+ }
+
+ status = cli_getatr(targetcli, targetpath, &attr, &size, &write_time);
+- if (NT_STATUS_IS_OK(status)) {
+- struct timespec w_time_ts =
+- convert_time_t_to_timespec(write_time);
+-
+- access_time_ts = change_time_ts = write_time_ts = w_time_ts;
+-
+- goto setup_stat;
++ if (!NT_STATUS_IS_OK(status)) {
++ goto all_failed;
+ }
++ w_time_ts = convert_time_t_to_timespec(write_time);
++ access_time_ts = change_time_ts = write_time_ts = w_time_ts;
+
+ setup_stat:
+ setup_stat(sb,
+@@ -573,7 +591,7 @@ all_failed:
+ srv->no_pathinfo3 = False;
+
+ TALLOC_FREE(frame);
+- return NT_STATUS_ACCESS_DENIED;
++ return status;
+ }
+
+ /*
Deleted: samba-glibc-2.36.patch
===================================================================
--- samba-glibc-2.36.patch 2022-11-16 06:15:50 UTC (rev 461864)
+++ samba-glibc-2.36.patch 2022-11-16 06:16:05 UTC (rev 461865)
@@ -1,57 +0,0 @@
-From eee9ff0228f52008bfc565241f6dfe07ae7a7044 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <a...@samba.org>
-Date: Tue, 2 Aug 2022 07:55:46 +0200
-Subject: [PATCH] lib:replace: Only include <sys/mount.h> on non-Linux systems
-
-Details at:
-https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132
-
-Signed-off-by: Andreas Schneider <a...@samba.org>
-Reviewed-by: Ralph Boehme <s...@samba.org>
-(cherry picked from commit 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0)
----
- lib/replace/system/filesys.h | 4 +++-
- lib/replace/wscript | 3 +++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h
-index 034e5d5886c..bb9482c69af 100644
---- a/lib/replace/system/filesys.h
-+++ b/lib/replace/system/filesys.h
-@@ -36,7 +36,8 @@
- #include <sys/param.h>
- #endif
-
--#ifdef HAVE_SYS_MOUNT_H
-+/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */
-+#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H)
- #include <sys/mount.h>
- #endif
-
-@@ -44,6 +45,7 @@
- #include <mntent.h>
- #endif
-
-+/* This include is required on Linux for statfs() */
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-diff --git a/lib/replace/wscript b/lib/replace/wscript
-index e4c2d513076..0db93d8caf1 100644
---- a/lib/replace/wscript
-+++ b/lib/replace/wscript
-@@ -31,6 +31,9 @@ def configure(conf):
-
- conf.env.standalone_replace = conf.IN_LAUNCH_DIR()
-
-+ if sys.platform.rfind('linux') > -1:
-+ conf.DEFINE('LINUX', '1')
-+
- conf.DEFINE('BOOL_DEFINED', 1)
- conf.DEFINE('HAVE_LIBREPLACE', 1)
- conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
---
-2.37.1
-
Copied: samba/repos/extra-x86_64/samba-glibc-2.36.patch (from rev 461864,
samba/trunk/samba-glibc-2.36.patch)
===================================================================
--- samba-glibc-2.36.patch (rev 0)
+++ samba-glibc-2.36.patch 2022-11-16 06:16:05 UTC (rev 461865)
@@ -0,0 +1,57 @@
+From eee9ff0228f52008bfc565241f6dfe07ae7a7044 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <a...@samba.org>
+Date: Tue, 2 Aug 2022 07:55:46 +0200
+Subject: [PATCH] lib:replace: Only include <sys/mount.h> on non-Linux systems
+
+Details at:
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132
+
+Signed-off-by: Andreas Schneider <a...@samba.org>
+Reviewed-by: Ralph Boehme <s...@samba.org>
+(cherry picked from commit 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0)
+---
+ lib/replace/system/filesys.h | 4 +++-
+ lib/replace/wscript | 3 +++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h
+index 034e5d5886c..bb9482c69af 100644
+--- a/lib/replace/system/filesys.h
++++ b/lib/replace/system/filesys.h
+@@ -36,7 +36,8 @@
+ #include <sys/param.h>
+ #endif
+
+-#ifdef HAVE_SYS_MOUNT_H
++/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */
++#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H)
+ #include <sys/mount.h>
+ #endif
+
+@@ -44,6 +45,7 @@
+ #include <mntent.h>
+ #endif
+
++/* This include is required on Linux for statfs() */
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+diff --git a/lib/replace/wscript b/lib/replace/wscript
+index e4c2d513076..0db93d8caf1 100644
+--- a/lib/replace/wscript
++++ b/lib/replace/wscript
+@@ -31,6 +31,9 @@ def configure(conf):
+
+ conf.env.standalone_replace = conf.IN_LAUNCH_DIR()
+
++ if sys.platform.rfind('linux') > -1:
++ conf.DEFINE('LINUX', '1')
++
+ conf.DEFINE('BOOL_DEFINED', 1)
+ conf.DEFINE('HAVE_LIBREPLACE', 1)
+ conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
+--
+2.37.1
+
Deleted: samba.conf
===================================================================
--- samba.conf 2022-11-16 06:15:50 UTC (rev 461864)
+++ samba.conf 2022-11-16 06:16:05 UTC (rev 461865)
@@ -1,2 +0,0 @@
-D /run/samba 0755 - - -
-d /var/log/samba 0755 - - -
\ No newline at end of file
Copied: samba/repos/extra-x86_64/samba.conf (from rev 461864,
samba/trunk/samba.conf)
===================================================================
--- samba.conf (rev 0)
+++ samba.conf 2022-11-16 06:16:05 UTC (rev 461865)
@@ -0,0 +1,2 @@
+D /run/samba 0755 - - -
+d /var/log/samba 0755 - - -
\ No newline at end of file
Deleted: samba.install
===================================================================
--- samba.install 2022-11-16 06:15:50 UTC (rev 461864)
+++ samba.install 2022-11-16 06:16:05 UTC (rev 461865)
@@ -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/extra-x86_64/samba.install (from rev 461864,
samba/trunk/samba.install)
===================================================================
--- samba.install (rev 0)
+++ samba.install 2022-11-16 06:16:05 UTC (rev 461865)
@@ -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 2022-11-16 06:15:50 UTC (rev 461864)
+++ samba.logrotate 2022-11-16 06:16:05 UTC (rev 461865)
@@ -1,5 +0,0 @@
-/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log {
- notifempty
- missingok
- copytruncate
-}
Copied: samba/repos/extra-x86_64/samba.logrotate (from rev 461864,
samba/trunk/samba.logrotate)
===================================================================
--- samba.logrotate (rev 0)
+++ samba.logrotate 2022-11-16 06:16:05 UTC (rev 461865)
@@ -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 2022-11-16 06:15:50 UTC (rev 461864)
+++ samba.pam 2022-11-16 06:16:05 UTC (rev 461865)
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
Copied: samba/repos/extra-x86_64/samba.pam (from rev 461864,
samba/trunk/samba.pam)
===================================================================
--- samba.pam (rev 0)
+++ samba.pam 2022-11-16 06:16:05 UTC (rev 461865)
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
