This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 3d9025281e1e93686e94b5ce45718edb5c773dea (commit) via 01a64af60010491f390a2649192689328ceac6ab (commit) via 2753980e81947c0672660c1c6b215a1fa9dce992 (commit) via 76b28d71976e88d03dc8006332515569524dbc11 (commit) via eb3618b42e26895332b00c7af4afad9976735906 (commit) from 5e8abb0d5ebea534ddf4ec083e1b9e50375e8554 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3d9025281e1e93686e94b5ce45718edb5c773dea Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 18 16:16:54 2023 +0200
libxcrypt: Update to version 4.4.36
- 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@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 01a64af60010491f390a2649192689328ceac6ab Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 18 16:16:57 2023 +0200
apache: Introduce apache into IPFire 3.x
- Creation of nm file for installation of apache
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2753980e81947c0672660c1c6b215a1fa9dce992 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 18 16:16:56 2023 +0200
apr-util: Update version to 1.6.3 and add libxcrypt as dependency
- 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@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 76b28d71976e88d03dc8006332515569524dbc11 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 18 16:16:55 2023 +0200
apr: Include libxcrypt as dependency
- IPFire3.x - libxcrypt dependency in apr is required by apr-util and then apache
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eb3618b42e26895332b00c7af4afad9976735906 Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Sep 17 16:29:32 2023 +0200
apr: Update to version 1.7.4
- IPFire3.x - Update from version 1.7.2 to 1.7.4 - Changelog 1.7.4 *) Fix a regression where writing to a file opened with both APR_FOPEN_APPEND and APR_FOPEN_BUFFERED did not properly append the data on Windows. (This regression was introduced in APR 1.7.3) [Evgeny Kotkov] 1.7.3 *) apr-1-config: Fix crosscompiling detection in apr-1-config. PR 66510 [Ruediger Pluem] *) configure: Add --enable-sysv-shm to use SysV shared memory (shmget) if available. [Ruediger Pluem] *) apr_socket_sendfile: Use WSAIoctl() to get TransmitFile function pointer on Windows. [Ivan Zhakov] *) apr_dir_read: Do not request short file names on Windows 7 and later. [Ivan Zhakov] *) apr_file_gets: Optimize for buffered files on Windows. [Evgeny Kotkov] *) Fix a deadlock when writing to locked files opened with APR_FOPEN_APPEND on Windows. PR 50058. [Evgeny Kotkov] *) Don't seek to the end when opening files with APR_FOPEN_APPEND on Windows. [Evgeny Kotkov] *) apr_file_write: Optimize large writes to buffered files on Windows. [Evgeny Kotkov] *) apr_file_read: Optimize large reads from buffered files on Windows. [Evgeny Kotkov]
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: apache/apache.nm | 104 +++++++++++++++++++++++++++++++++++++++++++++++++ apr-util/apr-util.nm | 5 ++- apr/apr.nm | 8 ++-- libxcrypt/libxcrypt.nm | 4 +- 4 files changed, 114 insertions(+), 7 deletions(-) create mode 100644 apache/apache.nm
Difference in files: 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@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 diff --git a/apr-util/apr-util.nm b/apr-util/apr-util.nm index ab4e1655d..6e45f3abc 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 = 1
groups = System/Libraries url = https://apr.apache.org/ @@ -28,6 +28,7 @@ build expat-devel libuuid-devel openssl-devel + libxcrypt-devel end
configure_options += \ diff --git a/apr/apr.nm b/apr/apr.nm index a2709ac35..0e363c53f 100644 --- a/apr/apr.nm +++ b/apr/apr.nm @@ -4,8 +4,8 @@ ###############################################################################
name = apr -version = 1.7.2 -release = 1 +version = 1.7.4 +release = 2
groups = System/Libraries url = https://apr.apache.org/ @@ -23,10 +23,12 @@ source_dl = https://www.apache.org/dist/apr/ build requires libuuid-devel + libxcrypt-devel end
configure_options += \ - --with-devrandom=/dev/urandom + --disable-static \ + --with-installbuilddir=/usr/share/apr-1/build end
packages 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/
hooks/post-receive -- IPFire 3.x development tree