summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/apr-util/Makefile6
-rw-r--r--package/apr/Makefile6
-rw-r--r--package/apr/patches/patch-Makefile_in23
3 files changed, 11 insertions, 24 deletions
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 490b131b3..d7a148c4a 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -4,15 +4,15 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= apr-util
-PKG_VERSION:= 1.5.3
+PKG_VERSION:= 1.5.4
PKG_RELEASE:= 1
-PKG_HASH:= 76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743
+PKG_HASH:= 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
PKG_DESCR:= apache portable runtime utility library
PKG_SECTION:= libs/misc
PKG_DEPENDS:= libexpat apr
PKG_BUILDDEP:= expat apr
PKG_URL:= http://apr.apache.org/
-PKG_SITES:= http://apache.cs.utah.edu/apr/
+PKG_SITES:= http://mirrors.ibiblio.org/apache//apr/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/apr/Makefile b/package/apr/Makefile
index d374a72f5..5882e7389 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -4,14 +4,14 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= apr
-PKG_VERSION:= 1.5.1
+PKG_VERSION:= 1.5.2
PKG_RELEASE:= 1
-PKG_HASH:= 94b1c9d9835cc9e902838b95d62ecc9a39b698f23e3e706812ec65a78ba41af7
+PKG_HASH:= 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
PKG_DESCR:= apache portable runtime library
PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpthread
PKG_URL:= http://apr.apache.org/
-PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
+PKG_SITES:= http://mirrors.ibiblio.org/apache//apr/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/apr/patches/patch-Makefile_in b/package/apr/patches/patch-Makefile_in
index 9aa6768f7..82194ab1d 100644
--- a/package/apr/patches/patch-Makefile_in
+++ b/package/apr/patches/patch-Makefile_in
@@ -1,22 +1,9 @@
---- apr-1.5.1.orig/Makefile.in 2014-03-17 16:10:26.000000000 +0100
-+++ apr-1.5.1/Makefile.in 2014-08-15 22:13:18.000000000 +0200
-@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+--- apr-1.5.2.orig/Makefile.in 2014-04-25 12:51:11.000000000 +0200
++++ apr-1.5.2/Makefile.in 2015-05-30 02:17:01.000000000 +0200
+@@ -134,8 +134,8 @@ tools/gen_test_char.lo: tools/gen_test_c
+ $(APR_MKDIR) tools
+ $(LT_COMPILE)
- CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
- build/apr_rules.out tools/gen_test_char@EXEEXT@ \
-- tools/gen_test_char.o tools/gen_test_char.lo \
- include/private/apr_escape_test_char.h
- DISTCLEAN_TARGETS = config.cache config.log config.status \
- include/apr.h include/arch/unix/apr_private.h \
-@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
- etags:
- etags `find . -name '*.[ch]'`
-
--make_tools_dir:
-- $(APR_MKDIR) tools
--
--OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
--tools/gen_test_char.lo: make_tools_dir
-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c