From eca4bb269364376058ee8cf61c222c757052e237 Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Sun, 2 Apr 2023 22:56:43 +0300
Subject: [PATCH] upg openldap

---
 jobo-setup/pkg/jobo-setup/usr/bin/jobo-setup |  1 +
 jobo-setup/src/README.txt                    |  1 +
 jobo-setup/src/jobo-setup.sh                 |  1 +
 openldap/PKGBUILD                            | 14 ++++++++++----
 openldap/PKGBUILD-arch                       |  8 +++++---
 5 files changed, 18 insertions(+), 7 deletions(-)
 create mode 120000 jobo-setup/pkg/jobo-setup/usr/bin/jobo-setup
 create mode 120000 jobo-setup/src/README.txt
 create mode 120000 jobo-setup/src/jobo-setup.sh

diff --git a/jobo-setup/pkg/jobo-setup/usr/bin/jobo-setup b/jobo-setup/pkg/jobo-setup/usr/bin/jobo-setup
new file mode 120000
index 0000000..9d79ebe
--- /dev/null
+++ b/jobo-setup/pkg/jobo-setup/usr/bin/jobo-setup
@@ -0,0 +1 @@
+/usr/bin/jobo-setup.sh
\ No newline at end of file
diff --git a/jobo-setup/src/README.txt b/jobo-setup/src/README.txt
new file mode 120000
index 0000000..a53492b
--- /dev/null
+++ b/jobo-setup/src/README.txt
@@ -0,0 +1 @@
+/src/pkg/jobcore/jobo-setup/README.txt
\ No newline at end of file
diff --git a/jobo-setup/src/jobo-setup.sh b/jobo-setup/src/jobo-setup.sh
new file mode 120000
index 0000000..a907e42
--- /dev/null
+++ b/jobo-setup/src/jobo-setup.sh
@@ -0,0 +1 @@
+/src/pkg/jobcore/jobo-setup/jobo-setup.sh
\ No newline at end of file
diff --git a/openldap/PKGBUILD b/openldap/PKGBUILD
index 4a614bb..ddad2fa 100644
--- a/openldap/PKGBUILD
+++ b/openldap/PKGBUILD
@@ -9,8 +9,7 @@ pkgbase=openldap
 pkgname=('openldap' 'libldap')
 pkgdesc='Lightweight Directory Access Protocol (LDAP) client, libraries, and server, w/o ipv6 & systemd'
 pkgver=2.6.4
-pkgrel=01
-arch=(x86_64)
+pkgrel=02
 url='https://www.openldap.org'
 source=($url/software/download/OpenLDAP/openldap-release/$pkgbase-$pkgver.tgz{,.asc}
   openldap.tmpfiles
@@ -21,6 +20,8 @@ _extra_modules=(
   'autogroup'
   'lastbind'
   'passwd/sha2'
+  'allowed'
+  'noopsrch'
 )
 
 makedepends=('libtool' 'libsasl' 'util-linux' 'chrpath' 'unixodbc' 'libsodium')
@@ -132,7 +133,7 @@ package_openldap() {
       DESTDIR="$pkgdir" install
 
     # passwd/sha2 has no man page, so skip it
-    if [ "$module" != "passwd/sha2" ]; then
+    if [ -f "contrib/slapd-modules/$module/slapo-$module.5" ]; then
       install -m644 -t "$pkgdir/usr/share/man/man5" \
         "contrib/slapd-modules/$module/slapo-$module.5"
     fi
@@ -163,7 +164,9 @@ package_openldap() {
   install -Dm644 -t "${pkgdir}"/usr/share/licenses/"${pkgname}" LICENSE
 }
 
-#---- license gpg-key sha256sums ----
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
 
 license=(custom)
 
@@ -174,3 +177,6 @@ sha256sums=(d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991  #
 	0be46138e53ff2fa6d4b4c06bfbdd2100426e0bd2ed29bf3419ade6b5974e9a0  # openldap.tmpfiles
 	c6e3fa72138edfebb4ecb17f677e217c885ff9eef805b5c8ad1c09169bb0ff8e) #  openldap.sysusers
 
+##  913229cd21593c419ff2c6b114e7cb234e240cd560f0407342c6c68f95603809  libldap-2.6.4-02-x86_64.pkg.tar.lz
+##  3681a59ce80630a8da8dbe62e49518c1b8782c10fc9dcbd3a3ef3740c3139935  openldap-2.6.4-02-x86_64.pkg.tar.lz
+
diff --git a/openldap/PKGBUILD-arch b/openldap/PKGBUILD-arch
index f67864f..b57186c 100644
--- a/openldap/PKGBUILD-arch
+++ b/openldap/PKGBUILD-arch
@@ -4,7 +4,7 @@
 pkgbase=openldap
 pkgname=('openldap' 'libldap')
 pkgver=2.6.4
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://www.openldap.org/"
 license=('custom')
@@ -27,6 +27,8 @@ _extra_modules=(
   'autogroup'
   'lastbind'
   'passwd/sha2'
+  'allowed'
+  'noopsrch'
 )
 
 prepare() {
@@ -89,7 +91,7 @@ check() {
 
 package_libldap() {
   pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl' 'e2fsprogs')
+  depends=('libsasl')
   backup=('etc/openldap/ldap.conf')
 
   cd ${pkgbase}-${pkgver}
@@ -132,7 +134,7 @@ package_openldap() {
       DESTDIR="$pkgdir" install
 
     # passwd/sha2 has no man page, so skip it
-    if [ "$module" != "passwd/sha2" ]; then
+    if [ -f "contrib/slapd-modules/$module/slapo-$module.5" ]; then
       install -m644 -t "$pkgdir/usr/share/man/man5" \
         "contrib/slapd-modules/$module/slapo-$module.5"
     fi