From patchwork Mon Dec 18 17:29:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7407 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 4Sv6Jv6R6cz3x25 for ; Mon, 18 Dec 2023 17:29:51 +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 4Sv6Jv2j5yz1Nr; Mon, 18 Dec 2023 17:29:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Sv6Jv0YJVz30sF; Mon, 18 Dec 2023 17:29:51 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Sv6Jr5cy1z2xG5 for ; Mon, 18 Dec 2023 17:29:48 +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 4Sv6Jr46pVz1C7; Mon, 18 Dec 2023 17:29:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1702920588; 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=P3ekgkyiZd0ADPpHgnuh3V6CwiufSBv9HODukp18Xws=; b=sxFekF71l9tpymkcSjgrTfz5yCRCSud3WTcggoFVV7BfmPysYJz6OrmufHPl4dplKLb7XM nTKTmmhWcmtp67Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1702920588; 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=P3ekgkyiZd0ADPpHgnuh3V6CwiufSBv9HODukp18Xws=; b=sb5aiwC1UMU30WZ28Wh3NT2lkYEkxtl1MHK9nsHu8UyE4skA0dlbEiF3o/5jyxAR/WH6jz TReMJGqIyALwYiLWce1Ur8w4EvtiVKOXbZHVuMRLYGGlygtWryMqnKfhh4Tjy7/JVzZR00 PORTbt2bSU67+US9b2pYynvxR6w0NRAaEtOj6Z6W8FZsbgqoYVdPq+4QPF1JNpJwxOj4R+ g+PnWdyvWnrRNn4I5/pJoILtfWBTwANIRH/efPebwzU6Jgdkc/18iMt2wEihUJBkryEuUl 6LdqYe5DH7rWbB8ZrKY0evFxawnoTBmTx1iHeg6QUKnGs8oKNwLGjKE4IObVgA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] apache2: Apply patch to make work with updated libxml2 Date: Mon, 18 Dec 2023 18:29:44 +0100 Message-ID: <20231218172944.2531813-2-adolf.belka@ipfire.org> In-Reply-To: <20231218172944.2531813-1-adolf.belka@ipfire.org> References: <20231218172944.2531813-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: NACPRPER5XLEBQSYGIOFFKAX76QPPNWV X-Message-ID-Hash: NACPRPER5XLEBQSYGIOFFKAX76QPPNWV X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - libxml2 since version 2.12.0 has removed a variable that was specified in the apache apache mod_xml2enc code. - This dependency caused the apache2 build to fail with the updated libxml2. - This patch removes the dependency. It will be able to be removed when the next apache update is carried out as the patch was created from an apache commit. Signed-off-by: Adolf Belka --- lfs/apache2 | 1 + ...emove_dependency_on_xmlstring_header.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch diff --git a/lfs/apache2 b/lfs/apache2 index 9a0ad38a9..c1973e6d5 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -75,6 +75,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch ### Add IPFire's layout, too echo "# IPFire layout" >> $(DIR_APP)/config.layout echo "" >> $(DIR_APP)/config.layout diff --git a/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch b/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch new file mode 100644 index 000000000..c190a2648 --- /dev/null +++ b/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch @@ -0,0 +1,24 @@ +diff -Naur httpd-2.4.58-orig/changes-entries/xmlchar.txt httpd-2.4.58/changes-entries/xmlchar.txt +--- httpd-2.4.58-orig/changes-entries/xmlchar.txt 1970-01-01 01:00:00.000000000 +0100 ++++ httpd-2.4.58/changes-entries/xmlchar.txt 2023-12-18 12:31:00.719087460 +0100 +@@ -0,0 +1,2 @@ ++ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later. ++ [ttachi ] +diff -Naur httpd-2.4.58-orig/modules/filters/mod_xml2enc.c httpd-2.4.58/modules/filters/mod_xml2enc.c +--- httpd-2.4.58-orig/modules/filters/mod_xml2enc.c 2020-02-21 01:33:40.000000000 +0100 ++++ httpd-2.4.58/modules/filters/mod_xml2enc.c 2023-12-18 12:32:34.248535392 +0100 +@@ -206,11 +206,11 @@ + } + } + } +- ++ + /* to sniff, first we look for BOM */ + if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) { +- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf, +- ctx->bytes); ++ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf, ++ ctx->bytes); + if (HAVE_ENCODING(ctx->xml2enc)) { + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432) + "Got charset from XML rules.") ;