Skip to content
Snippets Groups Projects
PKG.patch 2.65 KiB
Newer Older
diff -uar a/PKGBUILD b/PKGBUILD
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
 license=('GPL3')
 makedepends=('python' 'python-markdown' 'python-dnspython' 'docbook-xsl' 'pkg-config' 'libbsd' 'popt' 'libcups'
              'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb' 'krb5' 'pam'
-             'systemd' 'gnutls' 'talloc' 'tdb' 'dbus' 
+             'gnutls' 'talloc' 'tdb' 'dbus'
              'perl-parse-yapp' 'libnsl' 'libtirpc' 'rpcsvc-proto' 'jansson'
              'liburing' 'perl-json' 'glusterfs')
 optdepends=(
Eric Vidal's avatar
Eric Vidal committed
@@ -27,7 +27,8 @@
 source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc}
         samba.logrotate
         samba.pam
-        samba.conf)
+        samba.conf
+        samba.sysconfig)
 validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs@samba.org>
 sha512sums=('908418c16e94cf8f87dd331fa4c0081e89d147706e4c85d0cd331327481cab49f6f17ed338c1d0e73475ef8da2398f80db18d63f2d37fc8cb4f053e3b3081af7'
             'SKIP'
@@ -61,8 +62,7 @@
               --with-ldap \
               --with-winbind \
               --with-acl-support \
-              --with-systemd \
-              --systemd-install-services \
+              --without-systemd \
               --with-pam \
               --with-pammodulesdir=/usr/lib/security \
               --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util \
Eric Vidal's avatar
Eric Vidal committed
@@ -179,10 +179,8 @@
                "${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
+  install -d -m755  "$pkgdir"/etc/conf.d
+  install -m644 "$srcdir"/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
Eric Vidal's avatar
Eric Vidal committed
@@ -193,15 +191,15 @@
   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 
-  
+  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
 }