Merge pull request #14549 from Rmys/master

apache ver. bump

server/web/apache/actions.py

@@ -30,7 +30,7 @@ def config_layout():
     htdocsdir:       /var/www/localhost/htdocs
     cgidir:          /var/www/localhost/cgi-bin
     manualdir:       /usr/share/doc/version/manual
-    sysconfdir:      /etc/apache2
+    sysconfdir:      /etc/httpd/conf
     localstatedir:   /var
     runtimedir:      /run
     logfiledir:      /var/log/apache2
@@ -125,7 +125,7 @@ def install():
                     "my $envvars = \"$installbuilddir/envvars\";")
 
     # Clean-up
-    pisitools.remove("/etc/apache2/*")
+    # pisitools.remove("/etc/apache2/*")
     pisitools.remove("/var/www/localhost/htdocs/*")
 
     # Add conf.d for 3rd party configuration files

server/web/apache/pspec.xml

@@ -13,7 +13,7 @@
         <IsA>service</IsA>
         <Summary>Apache web server</Summary>
         <Description>Apache HTTP Server is a free software/open source web server for Unix-like systems, Microsoft Windows, Novell NetWare and other operating systems. Apache is notable for playing a key role in the initial growth of the World Wide Web, and continues to be the most popular web server in use, serving as the de facto reference platform against which other web servers are designed and judged.</Description>
-        <Archive sha1sum="01044512374941fad939ec4b1537428cc7edc769" type="tarbz2">https://downloads.apache.org/httpd/httpd-2.4.57.tar.bz2</Archive>
+        <Archive sha1sum="826a3a0de20a07b86e122fb7108fb135e0956178" type="tarbz2">https://downloads.apache.org/httpd/httpd-2.4.61.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>apr-devel</Dependency>
             <Dependency>nss-devel</Dependency>
@@ -91,6 +91,13 @@
     </Package>
 
     <History>
+        <Update release="16">
+            <Date>2024-07-03</Date>
+            <Version>2.4.61</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="15">
             <Date>2023-10-17</Date>
             <Version>2.4.57</Version>