From owner-svn-ports-all@freebsd.org Sat Oct 27 21:46:52 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5A7510D509F; Sat, 27 Oct 2018 21:46:52 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4A5667CEF7; Sat, 27 Oct 2018 21:46:52 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2AD7F1602E; Sat, 27 Oct 2018 21:46:52 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9RLkqVK064357; Sat, 27 Oct 2018 21:46:52 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9RLkpJT064352; Sat, 27 Oct 2018 21:46:51 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201810272146.w9RLkpJT064352@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 27 Oct 2018 21:46:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483173 - in head/devel/apr1: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/devel/apr1: . files X-SVN-Commit-Revision: 483173 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2018 21:46:52 -0000 Author: brnrd Date: Sat Oct 27 21:46:51 2018 New Revision: 483173 URL: https://svnweb.freebsd.org/changeset/ports/483173 Log: devel/apr1: Update APR to 1.6.5 - MySQL 8.0 (port marked "devel") not compatible [1] PR: 230538 [1] Reported by: Differential Revision: https://reviews.freebsd.org/D17688 Modified: head/devel/apr1/Makefile head/devel/apr1/distinfo head/devel/apr1/files/patch-apr__configure head/devel/apr1/files/patch-apr_poll_unix_kqueue.c Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Sat Oct 27 20:45:43 2018 (r483172) +++ head/devel/apr1/Makefile Sat Oct 27 21:46:51 2018 (r483173) @@ -3,7 +3,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ @@ -20,7 +19,7 @@ USES= iconv pathfix libtool cpe USE_LDCONFIG= yes GNU_CONFIGURE= yes -APR_VERSION= 1.6.3 +APR_VERSION= 1.6.5 APU_VERSION= 1.6.1 CPE_VENDOR= apache @@ -120,6 +119,12 @@ APU_CONF_ARGS+= --with-crypto APU_CONF_ARGS+= --without-crypto .endif +.include + +.if ${PORT_OPTIONS:MMYSQL} && ${MYSQL_VER} == 80 +BROKEN= Does not build with MySQL 8.0, see https://bz.apache.org/bugzilla/show_bug.cgi?id=62631 +.endif + post-extract: # cleanup files not used on this platform @${FIND} ${WRKDIR} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete @@ -170,4 +175,4 @@ rpfl: configure ${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APR_WRKDIR}/config.log ${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APU_WRKDIR}/config.log -.include +.include Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Sat Oct 27 20:45:43 2018 (r483172) +++ head/devel/apr1/distinfo Sat Oct 27 21:46:51 2018 (r483173) @@ -1,5 +1,5 @@ -TIMESTAMP = 1509875572 -SHA256 (apr-1.6.3.tar.gz) = 8fdabcc0004216c3588b7dca0f23d104dfe012a47e2bb6f13827534a6ee73aa7 -SIZE (apr-1.6.3.tar.gz) = 1072661 +TIMESTAMP = 1540370746 +SHA256 (apr-1.6.5.tar.gz) = 70dcf9102066a2ff2ffc47e93c289c8e54c95d8dda23b503f9e61bb0cbd2d105 +SIZE (apr-1.6.5.tar.gz) = 1073556 SHA256 (apr-util-1.6.1.tar.gz) = b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459 SIZE (apr-util-1.6.1.tar.gz) = 554301 Modified: head/devel/apr1/files/patch-apr__configure ============================================================================== --- head/devel/apr1/files/patch-apr__configure Sat Oct 27 20:45:43 2018 (r483172) +++ head/devel/apr1/files/patch-apr__configure Sat Oct 27 21:46:51 2018 (r483173) @@ -1,5 +1,5 @@ ---- apr-1.6.3/configure.orig 2015-04-25 12:04:18 UTC -+++ apr-1.6.3/configure +--- apr-1.6.5/configure.orig 2015-04-25 12:04:18 UTC ++++ apr-1.6.5/configure @@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ; apr_lock_method="USE_FLOCK_SERIALIZE" fi Modified: head/devel/apr1/files/patch-apr_poll_unix_kqueue.c ============================================================================== --- head/devel/apr1/files/patch-apr_poll_unix_kqueue.c Sat Oct 27 20:45:43 2018 (r483172) +++ head/devel/apr1/files/patch-apr_poll_unix_kqueue.c Sat Oct 27 21:46:51 2018 (r483173) @@ -1,8 +1,8 @@ # upstram PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=59914 # FreeBSD PR: 211430 ======================================================================== ---- apr-1.6.3/poll/unix/kqueue.c.orig 2015-03-20 01:34:07 UTC -+++ apr-1.6.3/poll/unix/kqueue.c +--- apr-1.6.5/poll/unix/kqueue.c.orig 2015-03-20 01:34:07 UTC ++++ apr-1.6.5/poll/unix/kqueue.c @@ -25,21 +25,40 @@ #ifdef HAVE_KQUEUE