[PATCH 1/4] libxcrypt: Update to version 4.4.36

[PATCH 1/4] libxcrypt: Update to version 4.4.36

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]

- IPFire3.x
- Update from version 4.4.33 to 4.4.36
- Changelog
Version 4.4.36
	* Fix left over bits failing with Perl v5.38.0 (issue #173).
Version 4.4.35
	* Fix build with Perl v5.38.0 (issue #170).
	* Fix build with MinGW-w(32|64).
Version 4.4.34
	* Update build-aux/m4/ax_valgrind_check.m4 to v23.
	* Optimize some cast operation for performance in
	  lib/alg-yescrypt-platform.c.
	* Add SHA-2 Maj() optimization proposed by Wei Dai in lib/alg-sha512.c.
	* Explicitly clean the stack and context state after computation in
	  lib/alg-gost3411-2012-hmac.c, lib/alg-hmac-sha1.c, and lib/alg-sha256.c
	  (issue #168).

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 libxcrypt/libxcrypt.nm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libxcrypt/libxcrypt.nm b/libxcrypt/libxcrypt.nm
index 0005eba61..cd84935d9 100644
--- a/libxcrypt/libxcrypt.nm
+++ b/libxcrypt/libxcrypt.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libxcrypt
-version    = 4.4.33
-release    = 2
+version    = 4.4.36
+release    = 1
 
 groups     = System/Libraries
 url        = https://github.com/besser82/libxcrypt/
-- 
2.42.0

[PATCH 2/4] apr: Include libxcrypt as dependency

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 637 bytes --]

- IPFire3.x
- libxcrypt dependency in apr is required by apr-util and then apache

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 apr/apr.nm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apr/apr.nm b/apr/apr.nm
index 622356d37..0e363c53f 100644
--- a/apr/apr.nm
+++ b/apr/apr.nm
@@ -5,7 +5,7 @@
 
 name       = apr
 version    = 1.7.4
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = https://apr.apache.org/
@@ -23,6 +23,7 @@ source_dl  = https://www.apache.org/dist/apr/
 build
 	requires
 		libuuid-devel
+		libxcrypt-devel
 	end
 
 	configure_options += \
-- 
2.42.0

[PATCH 3/4] apr-util: Update version to 1.6.3 and add libxcrypt as dependency

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1819 bytes --]

- IPFire3.x
- Update version from 1.6.1 to 1.6.3
- libxcrypt dependency required for apache
- Changelog
    1.6.3
	  *) Correct a packaging issue in 1.6.2. The contents of the release were
	     correct, but the top level directory was misnamed.
    1.6.2
	  *) SECURITY: CVE-2022-25147 (cve.mitre.org)
	     Integer Overflow or Wraparound vulnerability in apr_base64 functions
	     of Apache Portable Runtime Utility (APR-util) allows an attacker to
	     write beyond bounds of a buffer.
	  *) Teach configure how to find and build against MariaDB 10.2. PR 61517
	     [Kris Karas <bugs-a17 moonlit-rail.com>]
	  *) apr_crypto_commoncrypto: Remove stray reference to -lcrypto that
	     prevented commoncrypto being enabled. [Graham Leggett]
	  *) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov]
	  *) apr_dbm_gdbm: Fix handling of error codes. This makes gdbm 1.14 work.
	     apr_dbm_gdbm will now also return error codes starting with
	     APR_OS_START_USEERR, as apr_dbm_berkleydb does, instead of always
	     returning APR_EGENERAL. [Stefan Fritsch]

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 apr-util/apr-util.nm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apr-util/apr-util.nm b/apr-util/apr-util.nm
index ab4e1655d..f9b8fc4dc 100644
--- a/apr-util/apr-util.nm
+++ b/apr-util/apr-util.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = apr-util
-version    = 1.6.1
-release    = 2.2
+version    = 1.6.3
+release    = 3
 
 groups     = System/Libraries
 url        = https://apr.apache.org/
@@ -28,6 +28,7 @@ build
 		expat-devel
 		libuuid-devel
 		openssl-devel
+		libxcrypt-devel
 	end
 
 	configure_options += \
-- 
2.42.0

[PATCH 4/4] apache: Introduce apache into IPFire3.x

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 4215 bytes --]

- IPFire3.x
- Creation of nm file for installation of apache

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 apache/apache.nm | 104 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 apache/apache.nm

diff --git a/apache/apache.nm b/apache/apache.nm
new file mode 100644
index 000000000..a4421b634
--- /dev/null
+++ b/apache/apache.nm
@@ -0,0 +1,104 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = apache
+version    = 2.4.57
+release    = 1
+thisapp    = httpd-%{version}
+
+groups     = System/Libraries
+url        = https://httpd.apache.org/
+license    = ASL 2.0
+summary    = Apache Portable Runtime library
+
+description
+	The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP
+	server for modern operating systems including UNIX and Windows. The goal of this project is
+	to provide a secure, efficient and extensible server that provides HTTP services in sync with 
+	the current HTTP standards.
+
+	The Apache HTTP Server ("httpd") was launched in 1995 and it has been the most popular web
+	server on the Internet since April 1996. It has celebrated its 25th birthday as a project
+	in February 2020.
+
+	The Apache HTTP Server is a project of The Apache Software Foundation.
+end
+
+source_dl  = https://downloads.apache.org/httpd/
+sources    = %{thisapp}.tar.bz2
+
+build
+	requires
+		apr-devel
+		apr-util-devel
+		pcre-devel
+		pcre2-devel
+		openssl-devel
+		expat-devel
+		libuuid-devel
+		libxcrypt-devel
+	end
+	
+	prepare_cmds
+		### Add IPFire's layout, too
+		echo "# IPFire layout" >> config.layout
+		echo "<Layout IPFire>" >> config.layout
+		echo "    prefix:             /usr" >> config.layout
+		echo "    exec_prefix:        /usr" >> config.layout
+		echo "    bindir:             /usr/bin" >> config.layout
+		echo "    sbindir:            /usr/sbin" >> config.layout
+		echo "    libdir:             /usr/lib" >> config.layout
+		echo "    libexecdir:         /usr/lib/httpd/modules" >> config.layout
+		echo "    mandir:             /usr/share/man" >> config.layout
+		echo "    sysconfdir:         /etc/httpd/conf" >> config.layout
+		echo "    datadir:            /srv/web/ipfire" >> config.layout
+		echo "    installbuilddir:    /usr/lib/apache/build" >> config.layout
+		echo "    errordir:           /srv/web/ipfire/error" >> config.layout
+		echo "    iconsdir:           /srv/web/ipfire/icons" >> config.layout
+		echo "    htdocsdir:          /srv/web/ipfire/htdocs" >> config.layout
+		echo "    manualdir:          /srv/web/ipfire/manual" >> config.layout
+		echo "    cgidir:             /srv/web/ipfire/cgi-bin" >> config.layout
+		echo "    includedir:         /usr/include/apache" >> config.layout
+		echo "    localstatedir:      /srv/web/ipfire" >> config.layout
+		echo "    runtimedir:         /var/run" >> config.layout
+		echo "    logfiledir:         /var/log/httpd" >> config.layout
+		echo "    proxycachedir:      /var/cache/apache/proxy" >> config.layout
+		echo "</Layout>" >> config.layout
+	end
+
+	configure_options += \
+		--enable-layout=IPFire \
+		--enable-ssl \
+		--enable-mods-shared=all \
+		--enable-proxy \
+		--with-mpm=event \
+		--disable-lua \
+		--disable-md \
+		--libexecdir=/usr/lib/httpd/modules
+
+	install_cmds
+		# var/run no longer used
+		rm -df %{BUILDROOT}/var/run
+		
+		# non executable bash scripts should not be in usr/sbin 
+		mv %{BUILDROOT}/usr/sbin/envvars* %{BUILDROOT}/usr/lib/apache/
+		
+		# change location of envars files in apachectl
+		sed -i 's#/usr/sbin/envvars#/usr/lib/apache/envvars#g' %{BUILDROOT}/usr/sbin/apachectl
+	end
+
+end
+
+packages
+	package %{name}
+
+	package %{name}-devel
+		template DEVEL
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
-- 
2.42.0