On 2008/09/01 11:48, Lars Noodén wrote:
> Some of the links are returning "404 not found" when searching for
> apt-util during a regular 'make'
Here's a simple update to 1.2.12 which is pretty similar to 1.2.10
and is still available. This diff disables one regression test which
would run with FLAVOR=mt which is totally broken (hangs), there is
another failure with the date conversion test (their test is wrong).
I don't run anything which uses this but it doesn't break the
apache-httpd build on amd64, and the test suite is ok apart from
the 2 mentioned failures.
Diffing the two versions I don't think there's any need to bump
the library version.
I would imagine we probably want to move to 1.3.x though, what
does ${MAINTAINER} think about this? (Cc'd).
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/apr-util/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 27 Jul 2008 10:47:53 -0000 1.22
+++ Makefile 1 Sep 2008 10:35:43 -0000
@@ -2,9 +2,9 @@
COMMENT= companion library to APR
-V= 1.2.10
+V= 1.2.12
DISTNAME= apr-util-$V
-FULLPKGNAME= apr-util${MT}-$Vp1${FLAVOR_EXT:S/-mt//}
+FULLPKGNAME= apr-util${MT}-$V${FLAVOR_EXT:S/-mt//}
SHARED_LIBS += aprutil-1${MT} 2.11 # .2.11
CATEGORIES= devel
@@ -30,7 +30,7 @@ LIB_DEPENDS= lib/db4/db.>=4:db-4.*:datab
MODULES= converters/libiconv
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu autoconf
-AUTOCONF_VERSION=2.59
+AUTOCONF_VERSION=2.61
CONFIGURE_ARGS= --with-apr=${LOCALBASE} \
--with-dbm=db4 \
--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib/db4 \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/apr-util/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 20 Sep 2007 10:18:37 -0000 1.6
+++ distinfo 1 Sep 2008 10:35:43 -0000
@@ -1,5 +1,5 @@
-MD5 (apr-util-1.2.10.tar.gz) = dVj7os5ureg88opxZKmB+g==
-RMD160 (apr-util-1.2.10.tar.gz) = bVd7BKTXXvy0DhMv3fFfrt57KcE=
-SHA1 (apr-util-1.2.10.tar.gz) = nhNqVJIxOg6zxQFUol2iyZ3Kuxs=
-SHA256 (apr-util-1.2.10.tar.gz) = h2H+xIf/mOe52WWGQSXQRoo9St8skaRINPr/PGk+b0c=
-SIZE (apr-util-1.2.10.tar.gz) = 654083
+MD5 (apr-util-1.2.12.tar.gz) = 4pKULiLt0htoYJCGNSIS5A==
+RMD160 (apr-util-1.2.12.tar.gz) = Q4Uo/k0gfcIpDegMy9KXMmaFP4o=
+SHA1 (apr-util-1.2.12.tar.gz) = fA2SmjwLMowlfJFkCLwsnUdpD+0=
+SHA256 (apr-util-1.2.12.tar.gz) = fXD/F77HM72wSmZTqOnBWrfYhCnayRpK5Ywdtcqu4H8=
+SIZE (apr-util-1.2.12.tar.gz) = 668292
Index: patches/patch-build_apu-conf_m4
===================================================================
RCS file: patches/patch-build_apu-conf_m4
diff -N patches/patch-build_apu-conf_m4
--- patches/patch-build_apu-conf_m4 20 Sep 2007 10:18:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-build_apu-conf_m4,v 1.1 2007/09/20 10:18:37 steven Exp $
---- build/apu-conf.m4.orig Tue Sep 18 14:47:31 2007
-+++ build/apu-conf.m4 Tue Sep 18 14:47:57 2007
-@@ -144,6 +144,7 @@ AC_ARG_WITH([expat],
- APR_ADDTO(LDFLAGS, [-L$withval/lib])
- APR_ADDTO(CPPFLAGS, [-I$withval/include])
- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-+ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
- fi
- # ...and refuse to fall back on the builtin expat.
- apu_try_builtin_expat=0
Index: patches/patch-test_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/apr-util/patches/patch-test_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-test_Makefile_in
--- patches/patch-test_Makefile_in 20 Sep 2007 10:18:37 -0000 1.3
+++ patches/patch-test_Makefile_in 1 Sep 2008 10:35:43 -0000
@@ -1,16 +1,28 @@
$OpenBSD: patch-test_Makefile_in,v 1.3 2007/09/20 10:18:37 steven Exp $
---- test/Makefile.in.orig Sat Sep 1 11:45:39 2007
-+++ test/Makefile.in Tue Sep 18 15:12:55 2007
-@@ -8,7 +8,7 @@ TARGETS = $(PROGRAMS)
-
- [EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
--TARGET_LIB_PATH = ../[EMAIL PROTECTED]@.la
-+TARGET_LIB_PATH = ../[EMAIL PROTECTED]@${MT}.la
+
+testreslist is broken (hangs) in 1.2.12
+
+--- test/Makefile.in.orig Tue Oct 30 04:19:17 2007
++++ test/Makefile.in Mon Sep 1 11:30:52 2008
+@@ -16,7 +16,7 @@ STDTEST_PORTABLE = testall dbd
+
+ TESTS = teststrmatch.lo testuri.lo testuuid.lo testbuckets.lo testpass.lo \
+ testmd4.lo testmd5.lo testldap.lo testdate.lo testdbm.lo testdbd.lo \
+- testxml.lo testrmm.lo testreslist.lo testqueue.lo testxlate.lo
++ testxml.lo testrmm.lo testqueue.lo testxlate.lo
+
+ OTHER_PROGRAMS =
+
+@@ -24,7 +24,7 @@ PROGRAMS = $(STDTEST_PORTABLE) $(OTHER_PROGRAMS)
+
+ TARGETS = $(PROGRAMS)
+
+-LOCAL_LIBS = ../[EMAIL PROTECTED]@@[EMAIL PROTECTED]
++LOCAL_LIBS = ../[EMAIL PROTECTED]@@[EMAIL PROTECTED]
CLEAN_TARGETS = manyfile.bin testfile.txt data/sqlite*.db
-@@ -30,7 +30,11 @@ check: $(PROGRAMS)
+@@ -68,7 +68,11 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STD
fi; \
done; \
else \
Index: patches/patch-test_abts_tests_h
===================================================================
RCS file: patches/patch-test_abts_tests_h
diff -N patches/patch-test_abts_tests_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_abts_tests_h 1 Sep 2008 10:35:43 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+test_reslist is broken (hangs) in 1.2.12
+
+--- test/abts_tests.h.orig Mon Sep 1 11:33:39 2008
++++ test/abts_tests.h Mon Sep 1 11:33:47 2008
+@@ -38,7 +38,7 @@ const struct testlist {
+ {testrmm},
+ {testdbm},
+ {testqueue},
+- {testreslist}
++/* {testreslist} */
+ };
+
+ #endif /* APR_TEST_INCLUDES */
