From 1c6ee4122bdf090edc6d2901f3e27141a1ff598c Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Fri, 21 Jul 2023 19:20:33 +0300
Subject: [PATCH] postgresqls:Fixed server running issue and file paths

---
 server/database/postgresql/comar/package.py |   3 +-
 server/database/postgresql/comar/service.py |   4 +-
 server/database/postgresql/pspec.xml        | 121 +++++++++++++-------
 3 files changed, 83 insertions(+), 45 deletions(-)

diff --git a/server/database/postgresql/comar/package.py b/server/database/postgresql/comar/package.py
index 289666e299..5623b20ead 100644
--- a/server/database/postgresql/comar/package.py
+++ b/server/database/postgresql/comar/package.py
@@ -12,4 +12,5 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
         for i in ["LANG", "LANGUAGE", "LC_ALL"]:
             os.environ[i] = "en_US.UTF-8"
 
-        os.system('/bin/su postgres -s /bin/sh -p -c "/usr/bin/initdb --pgdata /var/lib/postgresql/data"')
\ No newline at end of file
+        os.system('/bin/su postgres -s /bin/sh -p -c "/usr/bin/initdb --pgdata /var/lib/postgresql/data"')
+        os.system('/bin/su postgres -s /bin/sh -p -c "/usr/bin/pg_ctl --pgdata -l logfile start"')
diff --git a/server/database/postgresql/comar/service.py b/server/database/postgresql/comar/service.py
index 3126257eec..7e1689bd6d 100644
--- a/server/database/postgresql/comar/service.py
+++ b/server/database/postgresql/comar/service.py
@@ -19,7 +19,7 @@ def check_postgresql():
         fail(MSG_ERR_PGSQLNOTINST)
 
 PIDFILE = "%s/postmaster.pid" % config.get("PGDATA", "/var/lib/postgresql/data")
-
+#pg_ctl
 @synchronized
 def start():
     check_postgresql()
@@ -42,4 +42,4 @@ def reload():
                 donotify=True)
 
 def status():
-    return isServiceRunning(PIDFILE)
\ No newline at end of file
+    return isServiceRunning(PIDFILE)
diff --git a/server/database/postgresql/pspec.xml b/server/database/postgresql/pspec.xml
index 57cf8863fc..4989671e9b 100644
--- a/server/database/postgresql/pspec.xml
+++ b/server/database/postgresql/pspec.xml
@@ -32,65 +32,72 @@
         </Patches>
     </Source>
 
-    <Package>
-        <Name>postgresql-lib</Name>
-        <IsA>library</IsA>
-        <Summary>Essential shared libraries for any PostgreSQL client program or interface</Summary>
-        <RuntimeDependencies>
-            <Dependency>mit-kerberos</Dependency>
-            <Dependency>python3</Dependency>
-            <Dependency>lz4</Dependency>
-            <Dependency>zlib</Dependency>
-            <Dependency>libxml2</Dependency>
-            <Dependency>openssl</Dependency>
-            <Dependency>e2fsprogs</Dependency>
-            <Dependency>libxslt</Dependency>
-            <Dependency>openldap-client</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="header">/usr/include</Path>
-            <Path fileType="library">/usr/lib/pkgconfig</Path>
-            <Path fileType="data">/usr/share/postgresql</Path>
-            <Path fileType="executable">/usr/bin/pg_config</Path>
-        </Files>
-    </Package>
-
-    <Package>
-        <Name>postgresql-doc</Name>
-        <IsA>data:doc</IsA>
-        <Summary>Postgresql documents</Summary>
-        <Description>Additional documentation for PostgreSQL.</Description>
-        <RuntimeDependencies>
-            <Dependency release="current">postgresql-lib</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-    </Package>
-
     <Package>
         <Name>postgresql-server</Name>
         <IsA>service</IsA>
         <RuntimeDependencies>
-            <Dependency release="current">postgresql-lib</Dependency>
             <Dependency>pam</Dependency>
             <Dependency>lz4</Dependency>
             <Dependency>zlib</Dependency>
             <Dependency>libxml2</Dependency>
+            <Dependency>libxslt</Dependency>
             <Dependency>openssl</Dependency>
+            <Dependency>python3</Dependency>
             <Dependency>readline</Dependency>
-            <Dependency>e2fsprogs</Dependency>
             <Dependency>mit-kerberos</Dependency>
-            <Dependency>openldap-server</Dependency>
             <Dependency>openldap-client</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="executable">/usr/bin/clusterdb</Path>
+            <Path fileType="executable">/usr/bin/reindexdb</Path>
+            <Path fileType="executable">/usr/bin/pgbench</Path>
+            <Path fileType="executable">/usr/bin/initdb</Path>
+            <Path fileType="executable">/usr/bin/psql</Path>
+            <Path fileType="executable">/usr/bin/ecpg</Path>
+            <Path fileType="executable">/usr/bin/oid2name</Path>
+            <Path fileType="executable">/usr/bin/postgresql</Path>
+            <Path fileType="executable">/usr/bin/pg_*</Path>
+            <Path fileType="executable">/usr/bin/creat*</Path>
+            <Path fileType="executable">/usr/bin/vacuum*</Path>
+            <Path fileType="executable">/usr/bin/drop*</Path>
+            <Path fileType="executable">/usr/bin/post*</Path>
+            <Path fileType="executable">/usr/bin/pg_config</Path>
             <Path fileType="config">/etc</Path>
-            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="localedata">/usr/share/locale</Path>
             <Path fileType="data">/usr/share/postgresql/contrib</Path>
+            <Path fileType="data">/usr/share/postgresql/extension</Path>
+            <Path fileType="data">/usr/share/postgresql/tsearch_data</Path>
+            <Path fileType="data">/usr/share/postgresql/timezonesets</Path>
+            <Path fileType="data">/usr/lib/postgresql/pgxs</Path>
             <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="library">/usr/lib/postgresql/a*</Path>
+            <Path fileType="library">/usr/lib/postgresql/b*</Path>
+            <Path fileType="library">/usr/lib/postgresql/c*</Path>
+            <Path fileType="library">/usr/lib/postgresql/d*</Path>
+            <Path fileType="library">/usr/lib/postgresql/e*</Path>
+            <Path fileType="library">/usr/lib/postgresql/f*</Path>
+            <Path fileType="library">/usr/lib/postgresql/h*</Path>
+            <Path fileType="library">/usr/lib/postgresql/i*</Path>
+            <Path fileType="library">/usr/lib/postgresql/j*</Path>
+            <Path fileType="library">/usr/lib/postgresql/l*</Path>
+            <Path fileType="library">/usr/lib/postgresql/m*</Path>
+            <Path fileType="library">/usr/lib/postgresql/o*</Path>
+            <Path fileType="library">/usr/lib/postgresql/pa*</Path>
+            <Path fileType="library">/usr/lib/postgresql/pg*</Path>
+            <Path fileType="library">/usr/lib/postgresql/plpgsql.so</Path>
+            <Path fileType="library">/usr/lib/postgresql/plpython3.so</Path>
+            <Path fileType="library">/usr/lib/postgresql/po*</Path>
+            <Path fileType="library">/usr/lib/postgresql/r*</Path>
+            <Path fileType="library">/usr/lib/postgresql/s*</Path>
+            <Path fileType="library">/usr/lib/postgresql/t*</Path>
+            <Path fileType="library">/usr/lib/postgresql/u*</Path>
+            <Path fileType="library">/usr/lib/postgresql/_int*</Path>
+            <Path fileType="library">/usr/lib/lib*</Path>
+            <Path fileType="data">/usr/share/postgresql/s*</Path>
+            <Path fileType="library">/usr/lib/postgresql/utf8*</Path>
+            <Path fileType="data">/usr/share/postgresql/p*</Path>
+            <Path fileType="data">/usr/share/postgresql/information_schema.sql</Path>
+            <Path fileType="data">/usr/share/postgresql/errcodes.txt</Path>
             <Path fileType="data">/var/lib</Path>
         </Files>
         <AdditionalFiles>
@@ -105,7 +112,6 @@
     <Package>
         <Name>postgresql-pl</Name>
         <RuntimeDependencies>
-            <Dependency release="current">postgresql-lib</Dependency>
             <Dependency>tcl</Dependency>
             <Dependency>perl</Dependency>
         </RuntimeDependencies>
@@ -120,7 +126,38 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>postgresql-doc</Name>
+        <IsA>data:doc</IsA>
+        <Summary>Postgresql documents</Summary>
+        <Description>Additional documentation for PostgreSQL.</Description>
+        <Files>
+            <Path fileType="doc">/usr/share/doc</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>postgresql-lib</Name>
+        <IsA>library</IsA>
+        <Summary>Essential shared libraries for any PostgreSQL client program or interface</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">postgresql-server</Dependency>
+            <Dependency>openssl-devel</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
+        </Files>
+    </Package>
+
     <History>
+        <Update release="10">
+            <Date>2023-07-21</Date>
+            <Version>15.3</Version>
+            <Comment>Fixed server running issue and file paths</Comment>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Update>
         <Update release="9">
             <Date>2023-05-27</Date>
             <Version>15.3</Version>