[arch-commits] Commit in samba/repos/extra-x86_64 (12 files)

Tobias Powalowski tpowa at gemini.archlinux.org
Tue May 3 06:35:32 UTC 2022


    Date: Tuesday, May 3, 2022 @ 06:35:31
  Author: tpowa
Revision: 444434

archrelease: copy trunk to extra-x86_64

Added:
  samba/repos/extra-x86_64/34771e1931587807d0395c7ac7f4be18654997f4.patch
    (from rev 444433, samba/trunk/34771e1931587807d0395c7ac7f4be18654997f4.patch)
  samba/repos/extra-x86_64/PKGBUILD
    (from rev 444433, samba/trunk/PKGBUILD)
  samba/repos/extra-x86_64/samba.conf
    (from rev 444433, samba/trunk/samba.conf)
  samba/repos/extra-x86_64/samba.install
    (from rev 444433, samba/trunk/samba.install)
  samba/repos/extra-x86_64/samba.logrotate
    (from rev 444433, samba/trunk/samba.logrotate)
  samba/repos/extra-x86_64/samba.pam
    (from rev 444433, samba/trunk/samba.pam)
Deleted:
  samba/repos/extra-x86_64/34771e1931587807d0395c7ac7f4be18654997f4.patch
  samba/repos/extra-x86_64/PKGBUILD
  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

------------------------------------------------+
 34771e1931587807d0395c7ac7f4be18654997f4.patch |   86 ++--
 PKGBUILD                                       |  430 +++++++++++------------
 samba.conf                                     |    4 
 samba.install                                  |   20 -
 samba.logrotate                                |   10 
 samba.pam                                      |    6 
 6 files changed, 278 insertions(+), 278 deletions(-)

Deleted: 34771e1931587807d0395c7ac7f4be18654997f4.patch
===================================================================
--- 34771e1931587807d0395c7ac7f4be18654997f4.patch	2022-05-03 06:35:16 UTC (rev 444433)
+++ 34771e1931587807d0395c7ac7f4be18654997f4.patch	2022-05-03 06:35:31 UTC (rev 444434)
@@ -1,43 +0,0 @@
-From 34771e1931587807d0395c7ac7f4be18654997f4 Mon Sep 17 00:00:00 2001
-From: Elia Geretto <elia.f.geretto at gmail.com>
-Date: Fri, 11 Mar 2022 19:32:30 +0100
-Subject: [PATCH] s3:libsmb: Fix errno for failed authentication in
- SMBC_server_internal()
-
-In SMBC_server_internal(), when authentication fails, the errno value is
-currently hard-coded to EPERM, while it should be EACCES instead. Use the
-NT_STATUS map to set the appropriate value.
-
-This bug was found because it breaks listing printers protected by
-authentication in GNOME Control Panel.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14983
-
-Signed-off-by: Elia Geretto <elia.f.geretto at gmail.com>
-Reviewed-by: Jeremy Allison <jra at samba.org>
-Reviewed-by: Volker Lendecke <vl at samba.org>
-
-Autobuild-User(master): Jeremy Allison <jra at samba.org>
-Autobuild-Date(master): Wed Mar 16 19:44:18 UTC 2022 on sn-devel-184
-
-(cherry picked from commit 70b9977a46e5242174b4461a7f49d5f640c1db62)
----
- source3/libsmb/libsmb_server.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
-index b92477c88fe..09d27868c0e 100644
---- a/source3/libsmb/libsmb_server.c
-+++ b/source3/libsmb/libsmb_server.c
-@@ -572,7 +572,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
- 		    !NT_STATUS_IS_OK(cli_session_setup_anon(c))) {
- 
-                         cli_shutdown(c);
--                        errno = EPERM;
-+			errno = map_errno_from_nt_status(status);
-                         return NULL;
-                 }
- 	}
--- 
-GitLab
-

Copied: samba/repos/extra-x86_64/34771e1931587807d0395c7ac7f4be18654997f4.patch (from rev 444433, samba/trunk/34771e1931587807d0395c7ac7f4be18654997f4.patch)
===================================================================
--- 34771e1931587807d0395c7ac7f4be18654997f4.patch	                        (rev 0)
+++ 34771e1931587807d0395c7ac7f4be18654997f4.patch	2022-05-03 06:35:31 UTC (rev 444434)
@@ -0,0 +1,43 @@
+From 34771e1931587807d0395c7ac7f4be18654997f4 Mon Sep 17 00:00:00 2001
+From: Elia Geretto <elia.f.geretto at gmail.com>
+Date: Fri, 11 Mar 2022 19:32:30 +0100
+Subject: [PATCH] s3:libsmb: Fix errno for failed authentication in
+ SMBC_server_internal()
+
+In SMBC_server_internal(), when authentication fails, the errno value is
+currently hard-coded to EPERM, while it should be EACCES instead. Use the
+NT_STATUS map to set the appropriate value.
+
+This bug was found because it breaks listing printers protected by
+authentication in GNOME Control Panel.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14983
+
+Signed-off-by: Elia Geretto <elia.f.geretto at gmail.com>
+Reviewed-by: Jeremy Allison <jra at samba.org>
+Reviewed-by: Volker Lendecke <vl at samba.org>
+
+Autobuild-User(master): Jeremy Allison <jra at samba.org>
+Autobuild-Date(master): Wed Mar 16 19:44:18 UTC 2022 on sn-devel-184
+
+(cherry picked from commit 70b9977a46e5242174b4461a7f49d5f640c1db62)
+---
+ source3/libsmb/libsmb_server.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
+index b92477c88fe..09d27868c0e 100644
+--- a/source3/libsmb/libsmb_server.c
++++ b/source3/libsmb/libsmb_server.c
+@@ -572,7 +572,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
+ 		    !NT_STATUS_IS_OK(cli_session_setup_anon(c))) {
+ 
+                         cli_shutdown(c);
+-                        errno = EPERM;
++			errno = map_errno_from_nt_status(status);
+                         return NULL;
+                 }
+ 	}
+-- 
+GitLab
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-03 06:35:16 UTC (rev 444433)
+++ PKGBUILD	2022-05-03 06:35:31 UTC (rev 444434)
@@ -1,215 +0,0 @@
-
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: judd <jvinet at 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.talk at gmail.com>
-# Contributor: Adam Russell <adamlr6+arch at gmail.com>
-# Contributor: Dhananjay Sathe <dhananjaysathe at gmail.com>
-
-pkgbase=samba
-pkgname=('smbclient' 'samba')
-pkgver=4.16.0
-pkgrel=6
-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' 'libaio'
-             'perl-parse-yapp' 'libnsl' 'libtirpc' 'rpcsvc-proto' 'jansson'
-             'ceph-libs' '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
-        34771e1931587807d0395c7ac7f4be18654997f4.patch)
-validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs at samba.org>
-sha512sums=('cea6bab64021779d217669e58612d192b907c2c481ef30e40e449bc6b8f8993a9b7b7b5bfcfebe54d8f70b8f720893cfa77a9d674ef8e07dd45a55a0fbc673e2'
-            'SKIP'
-            '2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858'
-            '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
-            'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc'
-            'ee60e1d16241698fa4e66fbb97d4a08c6ccf8f03a1ce17b855bd0ca47b546747d67a01c89330072833949ec1ab8d7fd713c7370613b24e777f158c141195cd53')
-### UNINSTALL dmapi package before building!!!
-
-prepare () {
-  # Fix 74259
-  cd samba-${pkgver}
-  patch -Rp1 -i ../34771e1931587807d0395c7ac7f4be18654997f4.patch
-}
-
-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-cluster-support \
-              --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')
-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' 'libaio' 'perl-parse-yapp' "smbclient>=$pkgver" 'gpgme'
-         'ceph-libs' 'libldb.so' 'libtdb.so' 'libtevent.so' 'liburing')
-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
-
-  # Fix waf installing the wrong permissions for sudoers.d
-  chmod 750 ${pkgdir}/etc/sudoers.d
-  chmod 440 ${pkgdir}/etc/sudoers.d/ctdb
-  # install ctdb service
-  install -D -m644 "${srcdir}"/samba-${pkgver}/ctdb/config/ctdb.service  ${pkgdir}/usr/lib/systemd/system/ctdb.service
-}
-
-# vim: ts=2 sw=2 et:

Copied: samba/repos/extra-x86_64/PKGBUILD (from rev 444433, samba/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-05-03 06:35:31 UTC (rev 444434)
@@ -0,0 +1,215 @@
+
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: judd <jvinet at 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.talk at gmail.com>
+# Contributor: Adam Russell <adamlr6+arch at gmail.com>
+# Contributor: Dhananjay Sathe <dhananjaysathe at gmail.com>
+
+pkgbase=samba
+pkgname=('smbclient' 'samba')
+pkgver=4.16.1
+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' 'libaio'
+             'perl-parse-yapp' 'libnsl' 'libtirpc' 'rpcsvc-proto' 'jansson'
+             'ceph-libs' '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
+        34771e1931587807d0395c7ac7f4be18654997f4.patch)
+validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs at samba.org>
+sha512sums=('d82ab250e87cb64b083345b61da8c4edbb2185a13f8cef33232f823fd510822570ed27c7b260a1fefd3af3b2fc4b271257c2c3e6ab3241c8c147bebae6ab39fc'
+            'SKIP'
+            '2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858'
+            '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
+            'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc'
+            'ee60e1d16241698fa4e66fbb97d4a08c6ccf8f03a1ce17b855bd0ca47b546747d67a01c89330072833949ec1ab8d7fd713c7370613b24e777f158c141195cd53')
+### UNINSTALL dmapi package before building!!!
+
+prepare () {
+  # Fix 74259
+  cd samba-${pkgver}
+  patch -Rp1 -i ../34771e1931587807d0395c7ac7f4be18654997f4.patch
+}
+
+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-cluster-support \
+              --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')
+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' 'libaio' 'perl-parse-yapp' "smbclient>=$pkgver" 'gpgme'
+         'ceph-libs' 'libldb.so' 'libtdb.so' 'libtevent.so' 'liburing')
+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
+
+  # Fix waf installing the wrong permissions for sudoers.d
+  chmod 750 ${pkgdir}/etc/sudoers.d
+  chmod 440 ${pkgdir}/etc/sudoers.d/ctdb
+  # install ctdb service
+  install -D -m644 "${srcdir}"/samba-${pkgver}/ctdb/config/ctdb.service  ${pkgdir}/usr/lib/systemd/system/ctdb.service
+}
+
+# vim: ts=2 sw=2 et:

Deleted: samba.conf
===================================================================
--- samba.conf	2022-05-03 06:35:16 UTC (rev 444433)
+++ samba.conf	2022-05-03 06:35:31 UTC (rev 444434)
@@ -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 444433, samba/trunk/samba.conf)
===================================================================
--- samba.conf	                        (rev 0)
+++ samba.conf	2022-05-03 06:35:31 UTC (rev 444434)
@@ -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-05-03 06:35:16 UTC (rev 444433)
+++ samba.install	2022-05-03 06:35:31 UTC (rev 444434)
@@ -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 444433, samba/trunk/samba.install)
===================================================================
--- samba.install	                        (rev 0)
+++ samba.install	2022-05-03 06:35:31 UTC (rev 444434)
@@ -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-05-03 06:35:16 UTC (rev 444433)
+++ samba.logrotate	2022-05-03 06:35:31 UTC (rev 444434)
@@ -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 444433, samba/trunk/samba.logrotate)
===================================================================
--- samba.logrotate	                        (rev 0)
+++ samba.logrotate	2022-05-03 06:35:31 UTC (rev 444434)
@@ -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-05-03 06:35:16 UTC (rev 444433)
+++ samba.pam	2022-05-03 06:35:31 UTC (rev 444434)
@@ -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 444433, samba/trunk/samba.pam)
===================================================================
--- samba.pam	                        (rev 0)
+++ samba.pam	2022-05-03 06:35:31 UTC (rev 444434)
@@ -0,0 +1,3 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so



More information about the arch-commits mailing list