Date: Mon, 26 Dec 2016 09:29:33 +0800 From: Marcelo Araujo <araujobsdport@gmail.com> To: Marcelo Araujo <araujo@freebsd.org> Cc: suraj@ixsystems.com, Olli Hauer <ohauer@freebsd.org>, apache@freebsd.org Subject: Re: svn commit: r429063 - in head/www/apache24: . files Message-ID: <CAOfEmZjNxHH7KDqHB4M=_PM%2BSm7dsM_-2%2Bpd1=OJf9PK-_vuNA@mail.gmail.com> In-Reply-To: <CAOfEmZjchF%2BBYNMEQ-BWUyKBYPOHOfW-awrGrr_D=bueHbgz4A@mail.gmail.com> References: <201612211041.uBLAf9Q9097859@repo.freebsd.org> <CAOfEmZjchF%2BBYNMEQ-BWUyKBYPOHOfW-awrGrr_D=bueHbgz4A@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Hello guys, i guess Olli might be busy, anybody else cold take a look on the issue below? Thanks. On Dec 23, 2016 6:16 PM, "Marcelo Araujo" <araujobsdport@gmail.com> wrote: > Hello Olli, > > How are you doing? > > At iXsystems we got a problem to build the latest version of apache24, > comparing with the previous version, we have the following error: > > the previous version: > usr/local/include/apache24/ap_config_auto.h:253:9: warning: > 'PACKAGE_VERSION' macro redefined [-Wmacro-redefined] > #define PACKAGE_VERSION "" > > > new version: > In file included from /usr/local/include/apache24/ap_config.h:138: > /usr/local/include/apache24/ap_config_auto.h:257:9: error: > 'PACKAGE_VERSION' macro redefined [-Werror,-Wmacro-redefined] > #define PACKAGE_VERSION "" > > As you can see, apache package added on configure.in the option > '-Werror', the macro-redefined before was just a warning but now the build > fail with an error. > > Attached there is a patch that fix it. > > What do you think about it? > > > Best, > > 2016-12-21 18:41 GMT+08:00 Olli Hauer <ohauer@freebsd.org>: > >> Author: ohauer >> Date: Wed Dec 21 10:41:09 2016 >> New Revision: 429063 >> URL: https://svnweb.freebsd.org/changeset/ports/429063 >> >> Log: >> - update to 2.4.25 >> >> PR: 215457 >> Reported by: Apache Software Foundation >> MFH: 2016Q4 >> Security: vid 862d6ab3-c75e-11e6-9f98-20cf30e32f6d >> CVE-2016-8743 >> CVE-2016-2161 >> CVE-2016-0736 >> CVE-2016-8740 >> CVE-2016-5387 >> >> Deleted: >> head/www/apache24/files/patch-CVE-2016-8740 >> head/www/apache24/files/patch-httpoxy >> Modified: >> head/www/apache24/Makefile >> head/www/apache24/distinfo >> >> Modified: head/www/apache24/Makefile >> ============================================================ >> ================== >> --- head/www/apache24/Makefile Wed Dec 21 10:36:14 2016 (r429062) >> +++ head/www/apache24/Makefile Wed Dec 21 10:41:09 2016 (r429063) >> @@ -1,8 +1,7 @@ >> # $FreeBSD$ >> >> PORTNAME= apache24 >> -PORTVERSION= 2.4.23 >> -PORTREVISION= 3 >> +PORTVERSION= 2.4.25 >> CATEGORIES= www ipv6 >> MASTER_SITES= APACHE_HTTPD >> DISTNAME= httpd-${PORTVERSION} >> >> Modified: head/www/apache24/distinfo >> ============================================================ >> ================== >> --- head/www/apache24/distinfo Wed Dec 21 10:36:14 2016 (r429062) >> +++ head/www/apache24/distinfo Wed Dec 21 10:41:09 2016 (r429063) >> @@ -1,3 +1,3 @@ >> -TIMESTAMP = 1467307196 >> -SHA256 (apache24/httpd-2.4.23.tar.bz2) = 0c1694b2aad7765896faf92843452e >> e2555b9591ae10d4f19b245f2adfe85e58 >> -SIZE (apache24/httpd-2.4.23.tar.bz2) = 6351875 >> +TIMESTAMP = 1482168542 >> +SHA256 (apache24/httpd-2.4.25.tar.bz2) = f87ec2df1c9fee3e6bfde3c8b855a3 >> ddb7ca1ab20ca877bd0e2b6bf3f05c80b2 >> +SIZE (apache24/httpd-2.4.25.tar.bz2) = 6398218 >> >> > > > -- > > -- > Marcelo Araujo (__)araujo@FreeBSD.org \\\'',)http://www.FreeBSD.org <http://www.freebsd.org/>; \/ \ ^ > Power To Server. .\. /_) > > [-- Attachment #2 --] --- configure.in.orig 2016-12-02 11:36:06 UTC +++ configure.in @@ -111,7 +111,7 @@ fi if test "$apr_found" = "reconfig"; then APR_SUBDIR_CONFIG(srclib/apr, - [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir], + [$apache_apr_flags --prefix=$prefix], [--enable-layout=*|\'--enable-layout=*]) dnl We must be the first to build and the last to be cleaned AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS" @@ -177,7 +177,7 @@ esac if test "$apu_found" = "reconfig"; then APR_SUBDIR_CONFIG(srclib/apr-util, - [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir], + [--with-apr=../apr --prefix=$prefix], [--enable-layout=*|\'--enable-layout=*]) dnl We must be the last to build and the first to be cleaned AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" @@ -597,7 +597,6 @@ AC_ARG_ENABLE(maintainer-mode,APACHE_HEL if test "$GCC" = "yes"; then APR_ADDTO(CFLAGS,[-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith]) APACHE_ADD_GCC_CFLAG([-std=c89]) - APACHE_ADD_GCC_CFLAG([-Werror]) APACHE_ADD_GCC_CFLAG([-Wdeclaration-after-statement]) APACHE_ADD_GCC_CFLAG([-Wformat]) APACHE_ADD_GCC_CFLAG([-Wformat-security]) @@ -838,12 +837,18 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre [Root directory of the Apache install area]) AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", [Location of the config file, relative to the Apache root directory]) +AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log", + [Location of error log file]) +AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status", + [Location of ScoreBoard file]) AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", [Location of the MIME types config file, relative to the Apache root directory]) +AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}", + [Location of document root]) -perlbin=`$ac_aux_dir/PrintPath perl` +perlbin=/usr/local/bin/perl if test "x$perlbin" = "x"; then - perlbin="/replace/with/path/to/perl/interpreter" + perlbin=/usr/local/bin/perl fi AC_SUBST(perlbin)help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOfEmZjNxHH7KDqHB4M=_PM%2BSm7dsM_-2%2Bpd1=OJf9PK-_vuNA>