This diff updates APR and APR-util to their latest releases.

It also enables APR pool debugging.
This is intended for development builds but has the desirable side
effect of making APR memory pools a thin layer around the malloc()
and free() functions, rather than allowing APR to manage larger
chunks of memory on its own. APR will also overwrites memory with
a poison byte ('A') before freeing it, like malloc's J flag would do.

Note that pool debugging has various levels, where higher levels
cause excessive debug output to stderr. I'm enabling the lowest level.

I've seen a small performance impact of this while running Subversion
regression tests. But I believe this is worth enabling by default since
it allows applications using APR to benefit more from OpenBSD's native
allocator. I'm not sure how large the impact on busy Apache HTTPD2 servers
will be (if anyone even runs such a thing on OpenBSD). But I think it's
worth a try.

I've bumped all dependencies highlighted by 'make search key=devel/apr'.

Subversion will receive an upgrade which I'll mail out separately.
I intend to commit both APR and SVN updates together.

ok?

Index: devel/apr/Makefile
===================================================================
RCS file: /cvs/ports/devel/apr/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- devel/apr/Makefile  25 Nov 2013 11:37:15 -0000      1.33
+++ devel/apr/Makefile  10 Apr 2014 12:33:10 -0000
@@ -2,10 +2,9 @@
 
 COMMENT=       Apache Portable Runtime
 
-V=             1.4.6
+V=             1.5.0
 DISTNAME=      apr-$V
-REVISION=      3
-SHARED_LIBS += apr-1             4.6     # .4.6
+SHARED_LIBS += apr-1             5.0     # .5.0
 
 CATEGORIES=    devel
 
@@ -27,6 +26,7 @@ CONFIGURE_ARGS=       ${CONFIGURE_SHARED} \
                --with-installbuilddir=${LOCALBASE}/lib/apr-1/ \
                --enable-other-child \
                --enable-threads \
+               --enable-pool-debug=yes \
                ac_cv_prog_AWK=awk
 
 pre-install:
Index: devel/apr/distinfo
===================================================================
RCS file: /cvs/ports/devel/apr/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- devel/apr/distinfo  25 Nov 2013 11:37:15 -0000      1.9
+++ devel/apr/distinfo  10 Apr 2014 12:33:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (apr-1.4.6.tar.gz) = U41ZPYBcNphfxtIA0xv2wbX5DfKlC5F5AnQ6E7vBDgU=
-SIZE (apr-1.4.6.tar.gz) = 982243
+SHA256 (apr-1.5.0.tar.gz) = mHnwIFTLIumfYF9v2/R/TAKK9M1PNRz2QYan7kR/Ndc=
+SIZE (apr-1.5.0.tar.gz) = 1016391
Index: devel/apr-util/Makefile
===================================================================
RCS file: /cvs/ports/devel/apr-util/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- devel/apr-util/Makefile     20 Jun 2013 06:54:36 -0000      1.43
+++ devel/apr-util/Makefile     10 Apr 2014 12:33:38 -0000
@@ -2,10 +2,9 @@
 
 COMMENT=       companion library to APR
 
-V=             1.4.1
+V=             1.5.3
 DISTNAME=      apr-util-$V
-REVISION=      2
-SHARED_LIBS += aprutil-1          4.1     # .4.1
+SHARED_LIBS += aprutil-1          5.3     # .5.3
 
 CATEGORIES=    devel
 
@@ -53,7 +52,7 @@ CONFIGURE_ARGS+=      --with-ldap=no
 .endif
 
 CONFIGURE_ENV+=        APRUTIL_EXPORT_LIBS=-pthread
-LIB_DEPENDS+=  apr-1.4.6:devel/apr
-WANTLIB+=      apr-1=4
+LIB_DEPENDS+=  apr-1.5.0:devel/apr
+WANTLIB+=      apr-1=5
 
 .include <bsd.port.mk>
Index: devel/apr-util/distinfo
===================================================================
RCS file: /cvs/ports/devel/apr-util/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- devel/apr-util/distinfo     28 Apr 2012 09:49:43 -0000      1.7
+++ devel/apr-util/distinfo     10 Apr 2014 12:33:38 -0000
@@ -1,5 +1,2 @@
-MD5 (apr-util-1.4.1.tar.gz) = ZmpdVgmKnev5mFEOMEyAlQ==
-RMD160 (apr-util-1.4.1.tar.gz) = zN0YoMZcd96nWxgbenf165TycHA=
-SHA1 (apr-util-1.4.1.tar.gz) = yk22MdGG6hNSb9CHrrwGeZ1MVBU=
-SHA256 (apr-util-1.4.1.tar.gz) = 1jbZ75XG5Q5H/DONUyqjde3RHl16PDDe5IvrON30q0w=
-SIZE (apr-util-1.4.1.tar.gz) = 774770
+SHA256 (apr-util-1.5.3.tar.gz) = dts0y1CONG479pNHwp7RUAvwtxvMSNVCca2dHCVwN0M=
+SIZE (apr-util-1.5.3.tar.gz) = 874462
Index: net/serf/Makefile
===================================================================
RCS file: /cvs/ports/net/serf/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- net/serf/Makefile   16 Mar 2014 22:07:43 -0000      1.5
+++ net/serf/Makefile   10 Apr 2014 12:33:57 -0000
@@ -2,6 +2,7 @@
 
 COMMENT =              high performance HTTP client library
 DISTNAME =             serf-1.3.4
+REVISION =             0
 SHARED_LIBS =          serf-1                    1.0 # 1.3.0
 CATEGORIES =           net
 HOMEPAGE =             https://code.google.com/p/serf/
Index: www/ap2-mod_dnssd/Makefile
===================================================================
RCS file: /cvs/ports/www/ap2-mod_dnssd/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- www/ap2-mod_dnssd/Makefile  6 Apr 2013 07:57:42 -0000       1.1.1.1
+++ www/ap2-mod_dnssd/Makefile  10 Apr 2014 12:33:57 -0000
@@ -5,6 +5,7 @@ SHARED_ONLY=    Yes
 COMMENT=       Apache2 Zeroconf module
 
 DISTNAME=      mod_dnssd-0.6
+REVISION=      0
 PKGNAME=       ap2-${DISTNAME}
 
 CATEGORIES=    www net
Index: www/ap2-mod_perl/Makefile
===================================================================
RCS file: /cvs/ports/www/ap2-mod_perl/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- www/ap2-mod_perl/Makefile   21 Mar 2014 17:26:04 -0000      1.24
+++ www/ap2-mod_perl/Makefile   10 Apr 2014 12:33:57 -0000
@@ -3,6 +3,7 @@
 COMMENT=       module that embeds a Perl interpreter into Apache2
 
 DISTNAME=      mod_perl-2.0.8
+REVISION=      0
 PKGNAME=       ap2-${DISTNAME}
 CATEGORIES=    www net
 
Index: www/apache-httpd/Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- www/apache-httpd/Makefile   9 Apr 2014 22:11:32 -0000       1.44
+++ www/apache-httpd/Makefile   10 Apr 2014 12:33:57 -0000
@@ -3,6 +3,7 @@
 COMMENT=       apache HTTP server
 
 V=             2.2.27
+REVISION=      0
 PKGNAME=       apache-httpd-${V}
 DISTNAME=      httpd-${V}
 

Reply via email to