From 66cacb9ef9b3b0e65e188e1c1182fa598adfdfda Mon Sep 17 00:00:00 2001 From: miqlas Date: Mon, 5 Jun 2017 13:24:44 +0200 Subject: [PATCH] Apache: bump version, fix patchset (#1391) * Apache: bump version, fix patchset * Switch to secure source --- ...ache-2.4.3.recipe => apache-2.4.25.recipe} | 61 ++++-- .../apache/patches/apache-2.4.25.patchset | 22 ++ .../apache/patches/apache-2.4.3.patchset | 207 ------------------ 3 files changed, 59 insertions(+), 231 deletions(-) rename www-servers/apache/{apache-2.4.3.recipe => apache-2.4.25.recipe} (85%) create mode 100644 www-servers/apache/patches/apache-2.4.25.patchset delete mode 100644 www-servers/apache/patches/apache-2.4.3.patchset diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.25.recipe similarity index 85% rename from www-servers/apache/apache-2.4.3.recipe rename to www-servers/apache/apache-2.4.25.recipe index 1a67b0757..13e0f4aee 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.25.recipe @@ -2,13 +2,17 @@ SUMMARY="The Number One HTTP Server On The Internet" DESCRIPTION="The Apache HTTP Server Project is a collaborative software \ development effort aimed at creating a robust, commercial-grade, featureful, \ and freely-available source code implementation of an HTTP (Web) server" -HOMEPAGE="http://httpd.apache.org" -SOURCE_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" -CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" -REVISION="2" +HOMEPAGE="https://httpd.apache.org/" +COPYRIGHT="1995-2016 The Apache Software Foundation." +LICENSE="Apache v2" +REVISION="1" +SOURCE_URI="https://archive.apache.org/dist/httpd/httpd-$portVersion.tar.gz" +CHECKSUM_SHA256="be6c5eb805216ec205453bb02b1990c82609cb1b145bcb69dc6e99fff45493a9" +SOURCE_DIR="httpd-$portVersion" +PATCHES="apache-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -SOURCE_DIR="httpd-2.4.3" PROVIDES=" apache2$secondaryArchSuffix = $portVersion @@ -52,6 +56,7 @@ PROVIDES=" lib:mod_buffer$secondaryArchSuffix lib:mod_cache$secondaryArchSuffix lib:mod_cache_disk$secondaryArchSuffix + lib:mod_cache_socache$secondaryArchSuffix lib:mod_cgid$secondaryArchSuffix lib:mod_dav$secondaryArchSuffix lib:mod_dav_fs$secondaryArchSuffix @@ -73,6 +78,7 @@ PROVIDES=" lib:mod_log_config$secondaryArchSuffix lib:mod_log_debug$secondaryArchSuffix lib:mod_logio$secondaryArchSuffix + lib:mod_macro$secondaryArchSuffix lib:mod_mime$secondaryArchSuffix lib:mod_negotiation$secondaryArchSuffix lib:mod_proxy$secondaryArchSuffix @@ -81,9 +87,12 @@ PROVIDES=" lib:mod_proxy_connect$secondaryArchSuffix lib:mod_proxy_express$secondaryArchSuffix lib:mod_proxy_fcgi$secondaryArchSuffix + lib:mod_proxy_fdpass$secondaryArchSuffix lib:mod_proxy_ftp$secondaryArchSuffix + lib:mod_proxy_hcheck$secondaryArchSuffix lib:mod_proxy_http$secondaryArchSuffix lib:mod_proxy_scgi$secondaryArchSuffix + lib:mod_proxy_wstunnel$secondaryArchSuffix lib:mod_ratelimit$secondaryArchSuffix lib:mod_remoteip$secondaryArchSuffix lib:mod_reqtimeout$secondaryArchSuffix @@ -99,6 +108,7 @@ PROVIDES=" lib:mod_socache_memcache$secondaryArchSuffix lib:mod_socache_shmcb$secondaryArchSuffix lib:mod_speling$secondaryArchSuffix + lib:mod_ssl$secondaryArchSuffix lib:mod_status$secondaryArchSuffix lib:mod_substitute$secondaryArchSuffix lib:mod_unique_id$secondaryArchSuffix @@ -106,19 +116,20 @@ PROVIDES=" lib:mod_userdir$secondaryArchSuffix lib:mod_version$secondaryArchSuffix lib:mod_vhost_alias$secondaryArchSuffix + lib:mod_watchdog$secondaryArchSuffix " - REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libapr_1$secondaryArchSuffix lib:libaprutil_1$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libiconv$secondaryArchSuffix +# lib:libldap$secondaryArchSuffix lib:libpcre$secondaryArchSuffix + lib:libssl$secondaryArchSuffix " -PATCHES="apache-2.4.3.patchset" - GLOBAL_WRITABLE_FILES=" settings/extra/httpd-autoindex.conf keep-old settings/extra/httpd-dav.conf keep-old @@ -150,22 +161,25 @@ GLOBAL_WRITABLE_FILES=" settings/original/httpd.conf keep-old " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:libtoolize - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:pcre_config - cmd:make - cmd:awk - " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libapr_1$secondaryArchSuffix devel:libaprutil_1$secondaryArchSuffix - devel:libz$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libiconv$secondaryArchSuffix +# devel:libldap$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:autoconf + cmd:awk + cmd:gcc$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:pcre_config " BUILD() @@ -174,7 +188,9 @@ BUILD() aclocal autoconf - runConfigure ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir + runConfigure ./configure \ + --with-apr=/$relativeBinDir \ + --with-apr-util=/$relativeBinDir make $jobArgs } @@ -182,6 +198,3 @@ INSTALL() { make install } - -LICENSE="Apache v2" -COPYRIGHT="2012 The Apache Software Foundation." diff --git a/www-servers/apache/patches/apache-2.4.25.patchset b/www-servers/apache/patches/apache-2.4.25.patchset new file mode 100644 index 000000000..ef5a7a6ed --- /dev/null +++ b/www-servers/apache/patches/apache-2.4.25.patchset @@ -0,0 +1,22 @@ +From d6536335557d4d5397edf1575881fd980b91ed5a Mon Sep 17 00:00:00 2001 +From: Nav +Date: Mon, 15 Dec 2014 16:39:31 +0000 +Subject: Fixed redefinition error + + +diff --git a/server/Makefile.in b/server/Makefile.in +index 42d1fe5..9418843 100644 +--- a/server/Makefile.in ++++ b/server/Makefile.in +@@ -32,7 +32,7 @@ test_char.h: gen_test_char + util.lo: test_char.h + + EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) +-EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) ++EXPORT_DIRS_APR = $(APU_INCLUDEDIR) + + # If export_files is a dependency here, but we remove it during this stage, + # when exports.c is generated, make will not detect that export_files is no +-- +2.2.2 + diff --git a/www-servers/apache/patches/apache-2.4.3.patchset b/www-servers/apache/patches/apache-2.4.3.patchset deleted file mode 100644 index db2676b24..000000000 --- a/www-servers/apache/patches/apache-2.4.3.patchset +++ /dev/null @@ -1,207 +0,0 @@ -From e8186cf22c52b4b5a662756e939df6ed35702eec Mon Sep 17 00:00:00 2001 -From: Nav -Date: Tue, 9 Dec 2014 19:29:31 +0000 -Subject: Fixing patch - - -diff --git a/acinclude.m4 b/acinclude.m4 -index 54defc2..b59b688 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -4,25 +4,25 @@ dnl Autoconf 2.50 can not handle substr correctly. It does have - dnl AC_HELP_STRING, so let's try to call it if we can. - dnl Note: this define must be on one line so that it can be properly returned - dnl as the help string. --AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl -+AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl - - dnl APACHE_SUBST(VARIABLE) - dnl Makes VARIABLE available in generated files - dnl (do not use @variable@ in Makefiles, but $(variable)) --AC_DEFUN(APACHE_SUBST,[ -+AC_DEFUN([APACHE_SUBST],[ - APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1" - AC_SUBST($1) - ]) - - dnl APACHE_FAST_OUTPUT(FILENAME) - dnl Perform substitutions on FILENAME (Makefiles only) --AC_DEFUN(APACHE_FAST_OUTPUT,[ -+AC_DEFUN([APACHE_FAST_OUTPUT],[ - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1" - ]) - - dnl APACHE_GEN_CONFIG_VARS - dnl Creates config_vars.mk --AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ -+AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ - APACHE_SUBST(abs_srcdir) - APACHE_SUBST(bindir) - APACHE_SUBST(sbindir) -@@ -112,14 +112,14 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ - - dnl APACHE_GEN_MAKEFILES - dnl Creates Makefiles --AC_DEFUN(APACHE_GEN_MAKEFILES,[ -+AC_DEFUN([APACHE_GEN_MAKEFILES],[ - $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES - ]) - - dnl ## APACHE_OUTPUT(file) - dnl ## adds "file" to the list of files generated by AC_OUTPUT - dnl ## This macro can be used several times. --AC_DEFUN(APACHE_OUTPUT, [ -+AC_DEFUN([APACHE_OUTPUT], [ - APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" - ]) - -@@ -128,7 +128,7 @@ dnl APACHE_TYPE_RLIM_T - dnl - dnl If rlim_t is not defined, define it to int - dnl --AC_DEFUN(APACHE_TYPE_RLIM_T, [ -+AC_DEFUN([APACHE_TYPE_RLIM_T], [ - AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ - AC_TRY_COMPILE([ - #include -@@ -146,7 +146,7 @@ AC_DEFUN(APACHE_TYPE_RLIM_T, [ - ]) - - dnl APACHE_MODPATH_INIT(modpath) --AC_DEFUN(APACHE_MODPATH_INIT,[ -+AC_DEFUN([APACHE_MODPATH_INIT],[ - current_dir=$1 - modpath_current=modules/$1 - modpath_static= -@@ -155,7 +155,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[ - > $modpath_current/modules.mk - ])dnl - dnl --AC_DEFUN(APACHE_MODPATH_FINISH,[ -+AC_DEFUN([APACHE_MODPATH_FINISH],[ - echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk -@@ -168,7 +168,7 @@ AC_DEFUN(APACHE_MODPATH_FINISH,[ - ])dnl - dnl - dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) --AC_DEFUN(APACHE_MODPATH_ADD,[ -+AC_DEFUN([APACHE_MODPATH_ADD],[ - if test -z "$3"; then - objects="mod_$1.lo" - else -@@ -214,7 +214,7 @@ dnl config -- configuration logic to run if the MPM is enabled - dnl path -- relative path to MPM (default: server/mpm/mpmname) - dnl libs -- libs needed by this MPM - dnl --AC_DEFUN(APACHE_MPM_MODULE,[ -+AC_DEFUN([APACHE_MPM_MODULE],[ - if ap_mpm_is_enabled $1; then - if test -z "$3"; then - objects="$1.lo" -@@ -291,7 +291,7 @@ dnl current module. - dnl prereq_module's APACHE_MODULE() statement must have been processed - dnl before the current APACHE_MODULE() statement. - dnl --AC_DEFUN(APACHE_MODULE,[ -+AC_DEFUN([APACHE_MODULE],[ - AC_MSG_CHECKING(whether to enable mod_$1) - define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl - AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5)) -@@ -392,7 +392,7 @@ AC_DEFUN(APACHE_MODULE,[ - dnl - dnl APACHE_ENABLE_MODULES - dnl --AC_DEFUN(APACHE_ENABLE_MODULES,[ -+AC_DEFUN([APACHE_ENABLE_MODULES],[ - module_selection=most - module_default=shared - -@@ -452,7 +452,7 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[ - ]) - ]) - --AC_DEFUN(APACHE_REQUIRE_CXX,[ -+AC_DEFUN([APACHE_REQUIRE_CXX],[ - if test -z "$apache_cxx_done"; then - AC_PROG_CXX - AC_PROG_CXXCPP -@@ -466,7 +466,7 @@ dnl - dnl Configure for OpenSSL, giving preference to - dnl "--with-ssl=" if it was specified. - dnl --AC_DEFUN(APACHE_CHECK_OPENSSL,[ -+AC_DEFUN([APACHE_CHECK_OPENSSL],[ - AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [ - dnl initialise the variables we use - ac_cv_openssl=no -@@ -576,14 +576,14 @@ dnl Export (via APACHE_SUBST) the various path-related variables that - dnl apache will use while generating scripts like autoconf and apxs and - dnl the default config file. - --AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[ -+AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[ - APR_EXPAND_VAR(exp_$1, [$]$1) - APACHE_SUBST(exp_$1) - APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix}) - APACHE_SUBST(rel_$1) - ]) - --AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ -+AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[ - APACHE_SUBST_EXPANDED_ARG(exec_prefix) - APACHE_SUBST_EXPANDED_ARG(bindir) - APACHE_SUBST_EXPANDED_ARG(sbindir) -diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c -index 0cf5693..f4e958c 100644 ---- a/modules/proxy/mod_proxy_connect.c -+++ b/modules/proxy/mod_proxy_connect.c -@@ -254,7 +254,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, - rv = apr_sockaddr_info_get(&nexthop, connectname, APR_UNSPEC, - connectport, 0, p); - if (rv != APR_SUCCESS) { -- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, - "failed to resolve hostname '%s'", connectname); - return ap_proxyerror(r, HTTP_BAD_GATEWAY, - apr_pstrcat(p, "DNS lookup failure for: ", -diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c -index a9b7ca2..178eea5 100644 ---- a/modules/slotmem/mod_slotmem_shm.c -+++ b/modules/slotmem/mod_slotmem_shm.c -@@ -33,7 +33,7 @@ - #include /* for getpid() */ - #endif - --#if HAVE_SYS_SEM_H -+#if HAVE_SYS_SHM_H - #include - #if !defined(SHM_R) - #define SHM_R 0400 --- -2.2.2 - - -From d6536335557d4d5397edf1575881fd980b91ed5a Mon Sep 17 00:00:00 2001 -From: Nav -Date: Mon, 15 Dec 2014 16:39:31 +0000 -Subject: Fixed redefinition error - - -diff --git a/server/Makefile.in b/server/Makefile.in -index 42d1fe5..9418843 100644 ---- a/server/Makefile.in -+++ b/server/Makefile.in -@@ -32,7 +32,7 @@ test_char.h: gen_test_char - util.lo: test_char.h - - EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) --EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) -+EXPORT_DIRS_APR = $(APR_INCLUDEDIR) - - # If export_files is a dependency here, but we remove it during this stage, - # when exports.c is generated, make will not detect that export_files is no --- -2.2.2 -