From dfe7d80443126a6d1b9c5c9b86c6890afb7ec092 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Fri, 24 Nov 2023 16:55:09 +0300
Subject: [PATCH] openldap-2.6.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

slapd usr/bin/slapd dizinine alındı  comar /usr/bin/slapd olarak ayarlandı
---
 server/openldap/actions.py      | 12 +++++++++---
 server/openldap/comar/slapd.py  |  2 +-
 server/openldap/comar/slapd_.py | 23 +++++++++++++++++++++++
 server/openldap/pspec.xml       | 13 +++++++++++--
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 server/openldap/comar/slapd_.py

diff --git a/server/openldap/actions.py b/server/openldap/actions.py
index 94099cb022..6859dfb460 100644
--- a/server/openldap/actions.py
+++ b/server/openldap/actions.py
@@ -19,7 +19,7 @@ def setup():
     )
     pisitools.dosed("servers/slapd/Makefile.in", "(\$\(DESTDIR\))\$\(localstatedir\)(\/run)", r"\1\2")
 
-    pisitools.flags.add("-D_REENTRANT -D_GNU_SOURCE -fPIC -Wl,--as-needed -DLDAP_CONNECTIONLESS")
+    # pisitools.flags.add("-D_REENTRANT -D_GNU_SOURCE -fPIC -Wl,--as-needed -DLDAP_CONNECTIONLESS")
 
     # shelltools.system("sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}")
     shelltools.system("sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap}/Makefile.in")
@@ -59,7 +59,7 @@ def setup():
     if get.buildTYPE() == "emul32":
         options +=  " --prefix=/emul32 \
                      --libdir=/usr/lib32 \
-                     --libexecdir=/emul32/libexec \
+                     --libexecdir=/usr/lib32 \
                      --disable-bdb \
                      --disable-hdb \
                      --disable-wrappers \
@@ -73,6 +73,8 @@ def setup():
     else: options += " --enable-wrappers \
                                   --enable-spasswd \
                                   --enable-perl \
+                                  --libdir=/usr/lib \
+                                  --libexecdir=/usr/lib \
                                   --enable-mdb=yes \
                                   --with-cyrus-sasl \
                                   --enable-bdb=yes \
@@ -96,6 +98,10 @@ def install():
         pisitools.dosym("/usr/lib/libslapi.so.2.0.200", "/usr/lib/libldap-2.4.so.2")
         pisitools.dosym("/usr/lib/liblber.so.2.0.200", "/usr/lib/liblber-2.4.so.2")
         pisitools.dosym("/usr/lib/libslapi.so.2.0.200", "/usr/lib/libslapi-2.4.so.2")
+        # pisitools.dosym("/usr/lib/slapd", "/usr/libexec/slapd")
+        pisitools.dosym("/usr/lib/slapd", "/usr/bin/slapd")
+        pisitools.remove("/usr/lib32/*.la")
+        pisitools.remove("/usr/lib32/openldap/*.la")
         return
 
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
@@ -107,4 +113,4 @@ def install():
     pisitools.dodoc("ANNOUNCEMENT", "CHANGES", "COPYRIGHT", "README", "LICENSE")
 
     pisitools.remove("/usr/lib/*.la")
-    pisitools.remove("/usr/libexec/openldap/*.la")
+    pisitools.remove("/usr/lib/openldap/*.la")
diff --git a/server/openldap/comar/slapd.py b/server/openldap/comar/slapd.py
index 768adf7aef..ef57be1c49 100644
--- a/server/openldap/comar/slapd.py
+++ b/server/openldap/comar/slapd.py
@@ -10,7 +10,7 @@ def start():
     os.environ["LC_ALL"] = "C"
     os.environ["LANG"] = "C"
 
-    startService(command="/usr/libexec/slapd",
+    startService(command="/usr/bin/slapd",
                  args="-u ldap -g ldap %s" % config.get("OPTS", ""),
                  pidfile="/run/openldap/slapd.pid",
                  donotify=True)
diff --git a/server/openldap/comar/slapd_.py b/server/openldap/comar/slapd_.py
new file mode 100644
index 0000000000..768adf7aef
--- /dev/null
+++ b/server/openldap/comar/slapd_.py
@@ -0,0 +1,23 @@
+from comar.service import *
+
+serviceType = "server"
+serviceDesc = _({"en": "OpenLDAP Server",
+                 "tr": "OpenLDAP Sunucusu"})
+serviceConf = "slapd"
+
+def start():
+    import os
+    os.environ["LC_ALL"] = "C"
+    os.environ["LANG"] = "C"
+
+    startService(command="/usr/libexec/slapd",
+                 args="-u ldap -g ldap %s" % config.get("OPTS", ""),
+                 pidfile="/run/openldap/slapd.pid",
+                 donotify=True)
+
+def stop():
+    stopService(pidfile="/run/openldap/slapd.pid",
+                donotify=True)
+
+def status():
+    return isServiceRunning("/run/openldap/slapd.pid")
diff --git a/server/openldap/pspec.xml b/server/openldap/pspec.xml
index c95635e4d5..38252eda98 100644
--- a/server/openldap/pspec.xml
+++ b/server/openldap/pspec.xml
@@ -11,7 +11,7 @@
         <License>OPENLDAP</License>
         <Summary>Open-source suite of LDAP applications and development tools</Summary>
         <Description>OpenLDAP is an open-source suite of LDAP (Lightweight Directory Access Protocol) applications and development tools</Description>
-        <Archive sha1sum="8ed73b552324a92d2f6e53381f9b1d10ca0b5485" type="targz">ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.6.4.tgz</Archive>
+        <Archive sha1sum="633bc0ce9b5d91852c1fe38c720763f32d18390f" type="targz">ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.6.6.tgz</Archive>
         <BuildDependencies>
             <Dependency>nss-devel</Dependency>
             <Dependency>db-devel</Dependency>
@@ -79,7 +79,9 @@
             <Path fileType="config">/etc/openldap</Path>
             <Path fileType="config">/usr/lib/tmpfiles.d/openldap-server.conf</Path>
             <Path fileType="executable">/usr/sbin</Path>
-            <Path fileType="library">/usr/libexec</Path>
+            <Path fileType="library">/usr/lib/openldap</Path>
+            <Path fileType="library">/usr/lib/slapd</Path>
+            <Path fileType="executable">/usr/libexec/slapd</Path>
             <Path fileType="man">/usr/share/man/man3</Path>
             <Path fileType="man">/usr/share/man/man5</Path>
             <Path fileType="man">/usr/share/man/man8</Path>
@@ -117,6 +119,13 @@
     </Package>
 
     <History>
+        <Update release="11">
+            <Date>2023-11-23</Date>
+            <Version>2.6.6</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="10">
             <Date>2023-05-22</Date>
             <Version>2.6.4</Version>