diff options
Diffstat (limited to 'source/n/httpd')
| -rw-r--r-- | source/n/httpd/httpd-2.4.58-r1914013.patch | 14 | ||||
| -rwxr-xr-x | source/n/httpd/httpd.SlackBuild | 5 |
2 files changed, 18 insertions, 1 deletions
diff --git a/source/n/httpd/httpd-2.4.58-r1914013.patch b/source/n/httpd/httpd-2.4.58-r1914013.patch new file mode 100644 index 000000000..f9e078632 --- /dev/null +++ b/source/n/httpd/httpd-2.4.58-r1914013.patch @@ -0,0 +1,14 @@ +# ./pullrev.sh 1914013 +http://svn.apache.org/viewvc?view=revision&revision=1914013 + +--- httpd-2.4.58/modules/filters/mod_xml2enc.c ++++ httpd-2.4.58/modules/filters/mod_xml2enc.c +@@ -209,7 +209,7 @@ + + /* to sniff, first we look for BOM */ + if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) { +- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf, ++ 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) diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 438525eef..904450cfb 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -114,6 +114,9 @@ sed -i -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" config.layout # Just use /var/run rather than /var/run/httpd. sed -i -e "s#/run/httpd#/run#" config.layout +# Fix FTBFS with recent libxml2: +cat $CWD/httpd-2.4.58-r1914013.patch | patch -p1 --verbose || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |