From patchwork Mon Sep 18 14:16:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7206 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rq6N55CL1z3ws3 for ; Mon, 18 Sep 2023 14:18:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rq6Mv1syJz1x0; Mon, 18 Sep 2023 14:18:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rq6Mt5dGBz30HQ; Mon, 18 Sep 2023 14:18:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rq6Mr2RqLz2y0d for ; Mon, 18 Sep 2023 14:18:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rq6Mq4FcBzR4; Mon, 18 Sep 2023 14:18:15 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1695046695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ALinwaz83DhGe50b7LKPdEDdSTDhFW5HymGOSBXPyco=; b=wcDYcTxyIJGrR+d6+Zjwj/x4I4RZlv/CMn6MnKDaVfecQGTp9Z3Bz+21KlcfJJIjN9uPFv TzU/mX7CV8jOLnCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1695046695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ALinwaz83DhGe50b7LKPdEDdSTDhFW5HymGOSBXPyco=; b=mZYU0HzWnXIA78R/bifhgx3Am5hFAhIolXy5gh8w9HBP4YdO7GzclSLX9PVvp7qF/4jCry l5IQEMqOss8w6sB5r1CK70FBdUYtMjNp1cpBQvhV5bdy1Uvq36xI7LPl1eyuCBCZIAgaaY 4UezyF6cDD2qeXt27pP6ZJCMwz9azSSQVkfofBV6GzrBwLCYqATDp2bd/mts2o0upDoeqg tNarm/k6b8N0rLaKphiddJg2fGxS5GQ24/FHAyL96hEMuAM177BGFzk0IQzqwMDOh+LU5Z yRFHppKCKUU0cVNqRu+RxiThz0+JJv9prFHUBYB+9D38oFrXj8GIL1qW6lda0g== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/4] libxcrypt: Update to version 4.4.36 Date: Mon, 18 Sep 2023 16:16:54 +0200 Message-ID: <20230918141810.536112-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 --- 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/ From patchwork Mon Sep 18 14:16:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7205 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rq6N34LWkz3ws3 for ; Mon, 18 Sep 2023 14:18:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rq6Mv3djMz3fQ; Mon, 18 Sep 2023 14:18:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rq6Mv1nFRz30Dy; Mon, 18 Sep 2023 14:18:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rq6Mr5D6rz2y4Q for ; Mon, 18 Sep 2023 14:18:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rq6Mr2rxWz1fS; Mon, 18 Sep 2023 14:18:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1695046696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=usDUwh8lzOk/ASl/N9sw6hlXp9x8PwSUW4Mz2PWfSGc=; b=pmha5GtEzvhUoYq2QCoSbhhrf5bgnD7Ng7u63UbswIM36nRC5Y1+3Qtw8darLLk/IgXHzd wTN1VoW5pVTotsBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1695046696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=usDUwh8lzOk/ASl/N9sw6hlXp9x8PwSUW4Mz2PWfSGc=; b=eyRpE/hCQIPImGC9lNPcuKx3sr/6u3/dlLKMmPZMs6gQF9OJ01KfTthr1jO211e9TbqKQ6 uZiVb8bCI5O1Y/z537z47cn6F4+Q84D68DmGDc7XdN1xuYP0nShuG5F7X8cJhZCddK+Hh2 cLzGM/Pd2pUK+lnD34BAhjs+j+XpZhVo97lVnC27J7SUE/3btbUuO/slEHMsSiZEmhCCHi KYXdGQ2rVexFr7pMkjAIR1y+vpfsUtxNjCEhrNfkuyKUsqaxmE0xDEvvJcKxO0nZyplJyx +j20lsr0IrF57C41yrr/K9b6VRDpszgyHFuVPGh1eg/7jnpVPg9SzrAlGxPIfQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/4] apr: Include libxcrypt as dependency Date: Mon, 18 Sep 2023 16:16:55 +0200 Message-ID: <20230918141810.536112-2-adolf.belka@ipfire.org> In-Reply-To: <20230918141810.536112-1-adolf.belka@ipfire.org> References: <20230918141810.536112-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - IPFire3.x - libxcrypt dependency in apr is required by apr-util and then apache Signed-off-by: Adolf Belka --- 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 += \ From patchwork Mon Sep 18 14:16:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7207 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rq6N72M3Rz3ws3 for ; Mon, 18 Sep 2023 14:18:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rq6Mv5VLQz3ft; Mon, 18 Sep 2023 14:18:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rq6Mv4x9Cz2yPg; Mon, 18 Sep 2023 14:18:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rq6Ms2y8Sz2y0d for ; Mon, 18 Sep 2023 14:18:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rq6Mr5PmSz1x0; Mon, 18 Sep 2023 14:18:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1695046696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TOuE1XDO/XgfNhzlv+5wWnSEliGaROP9dbBOnbrbCJM=; b=nFjBeb23ak1FgNfayHAQJ6sujrW1Y+nkFDmHKw/x4u9mZ34O5AmAryt8pDUeyxRcTNtAqE M/ukO99lEuQcLNAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1695046696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TOuE1XDO/XgfNhzlv+5wWnSEliGaROP9dbBOnbrbCJM=; b=wNwkIJr6zVXnJs7upjCq8eVYVNH5sD2xCDhGwEe3tWnsa3IgI3E7Gzp5AGaySDOMzxphYp Xzoo5aG9ExCN9biVr9hoFRo5SKwesfm5F6fiKw1Z41fFVddPyMJRM5kA8hWu9YjOlLGrfA g0PmUcsmsS5rK6Q72Fda0vpvy9fNH56qo7ddclgY5ujfePkYN/zxM43TI7D0m7Ctb6DL1P P6mHFdxt2uQadZYQ7EkvNdXYFZZUNTSFPyODrhS/SxVYacHUDlN0jJySTdHLk1Ktrj7+GO d+GTFCCeM+YzZmCxyx6hm5K7bWICR0LA51686DAntqe9TrijuVO6gdFy98lNcw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/4] apr-util: Update version to 1.6.3 and add libxcrypt as dependency Date: Mon, 18 Sep 2023 16:16:56 +0200 Message-ID: <20230918141810.536112-3-adolf.belka@ipfire.org> In-Reply-To: <20230918141810.536112-1-adolf.belka@ipfire.org> References: <20230918141810.536112-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 ] *) 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 --- 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 += \ From patchwork Mon Sep 18 14:16:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7208 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rq6N81zpjz3wtY for ; Mon, 18 Sep 2023 14:18:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rq6Mw2VLzzR4; Mon, 18 Sep 2023 14:18:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rq6Mv5RZfz2ynQ; Mon, 18 Sep 2023 14:18:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rq6Ms6TCRz2y4Q for ; Mon, 18 Sep 2023 14:18:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rq6Ms4W3rz2Hn; Mon, 18 Sep 2023 14:18:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1695046697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RZ5oK+plc75p5oedFeS+73lgJ5rwNgoZtQtqzkqVYA4=; b=NYvy0LL+rQ+Oacoq+K/3zqMvt4P52BMKR5cOhbnUGEXPPcRoPvtqEhEqVg9ZakVNUpzlya U5pACxOryrYrveAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1695046697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RZ5oK+plc75p5oedFeS+73lgJ5rwNgoZtQtqzkqVYA4=; b=RBdaWbldltpIm4ac2nuX2TBZD+3G7Tz8ILxDacKDgGrdCZayKsiwyz7BSFUrzRql+3zEqt i7upvKrQa0A8d7IPeWdwfE9Hyukr6OFD7zfkwiu4pNM+A/tF6dq/qsTWAdW5u9DKs1rNG0 331ovCT6jC6JhgJLQdxk69v7uhEq7o1RKs6WERaQf9DX7ZNQp3RX5cJT8qZpfWwCIzM8PF Swj8Y4UVjOCG1fzKUxfJPzKamO9/k3f5wYg+F2IAq7fYT6uWYIzm26NPFXeaBuAbHhojHE dwUtWcmS0u52C+iW5DNwYijEtXxOe4vZoyOP/3EFu3oOEYYvaSpYwAu0zupSBQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 4/4] apache: Introduce apache into IPFire3.x Date: Mon, 18 Sep 2023 16:16:57 +0200 Message-ID: <20230918141810.536112-4-adolf.belka@ipfire.org> In-Reply-To: <20230918141810.536112-1-adolf.belka@ipfire.org> References: <20230918141810.536112-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - IPFire3.x - Creation of nm file for installation of apache Signed-off-by: Adolf Belka --- 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 # +############################################################################### + +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 "" >> 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 "" >> 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