diff --git a/apr-util/PKGBUILD b/apr-util/PKGBUILD index ae2a7233..07a43044 100644 --- a/apr-util/PKGBUILD +++ b/apr-util/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=('apr-util' 'apr-util-devel') -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') @@ -10,17 +10,17 @@ depends=('apr' 'expat') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2" - apr-util-1.5.2-msys2.patch + apr-util-1.5.3-msys2.patch plugins.patch) -md5sums=('89c1348aa79e898d7c34a6206311c9c2' - '4fabcb20add9e5c977a0c8dc497b8805' - '35734891d5c00414e3cd7473ec7c1058') +md5sums=('6f3417691c7a27090f36e7cf4d94b36e' + '65f1542688914fb609c88aba605d1169' + '9db9f3c4b14749988e9133aaa0658fcd') prepare() { cd "${srcdir}/apr-util-${pkgver}" patch -p1 -i ${srcdir}/plugins.patch - patch -p1 -i ${srcdir}/apr-util-1.5.2-msys2.patch + patch -p1 -i ${srcdir}/apr-util-1.5.3-msys2.patch autoreconf -fi } @@ -36,7 +36,7 @@ build() { --without-pgsql \ --with-sqlite3=/usr - make + make -j1 make DESTDIR="${srcdir}/dest" install } diff --git a/apr-util/apr-util-1.5.2-msys2.patch b/apr-util/apr-util-1.5.3-msys2.patch similarity index 96% rename from apr-util/apr-util-1.5.2-msys2.patch rename to apr-util/apr-util-1.5.3-msys2.patch index 595445d3..7149ef0a 100644 --- a/apr-util/apr-util-1.5.2-msys2.patch +++ b/apr-util/apr-util-1.5.3-msys2.patch @@ -1,16 +1,6 @@ diff -Naur apr-util-1.5.2-orig/build/config.guess apr-util-1.5.2/build/config.guess --- apr-util-1.5.2-orig/build/config.guess 2011-05-20 20:22:23.000000000 +0000 +++ apr-util-1.5.2/build/config.guess 2013-04-25 19:11:50.799804600 +0000 -@@ -804,6 +804,9 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; @@ -844,6 +847,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin @@ -21,18 +11,6 @@ diff -Naur apr-util-1.5.2-orig/build/config.guess apr-util-1.5.2/build/config.gu p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit ;; -diff -Naur apr-util-1.5.2-orig/build/config.sub apr-util-1.5.2/build/config.sub ---- apr-util-1.5.2-orig/build/config.sub 2011-05-20 20:22:23.000000000 +0000 -+++ apr-util-1.5.2/build/config.sub 2013-04-25 19:12:03.174804600 +0000 -@@ -1336,7 +1336,7 @@ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ diff -Naur apr-util-1.5.2-orig/xml/expat/configure apr-util-1.5.2/xml/expat/configure --- apr-util-1.5.2-orig/xml/expat/configure 2013-03-30 20:30:12.000000000 +0000 +++ apr-util-1.5.2/xml/expat/configure 2013-04-25 19:15:05.333984300 +0000 diff --git a/apr-util/plugins.patch b/apr-util/plugins.patch index a5e578c4..8024bf79 100644 --- a/apr-util/plugins.patch +++ b/apr-util/plugins.patch @@ -5,10 +5,8 @@ From: David Rothenberger --- Makefile.in | 2 +- - dbd/apr_dbd.c | 2 +- - dbm/apr_dbm.c | 2 +- ldap/apr_ldap_stub.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 963fead..c9827de 100644 @@ -23,32 +21,6 @@ index 963fead..c9827de 100644 APU_DSO_LIBDIR = @APU_DSO_LIBDIR@ LT_VERSION = @APU_LTVERSION@ -diff --git a/dbd/apr_dbd.c b/dbd/apr_dbd.c -index 49553f2..664b441 100644 ---- a/dbd/apr_dbd.c -+++ b/dbd/apr_dbd.c -@@ -184,7 +184,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name, - - #if defined(NETWARE) - apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name); --#elif defined(WIN32) -+#elif defined(WIN32) || defined(CYGWIN) || defined(MSYS) - apr_snprintf(modname, sizeof(modname), - "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name); - #else -diff --git a/dbm/apr_dbm.c b/dbm/apr_dbm.c -index 5c506fc..a5beead 100644 ---- a/dbm/apr_dbm.c -+++ b/dbm/apr_dbm.c -@@ -162,7 +162,7 @@ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable, - - #if defined(NETWARE) - apr_snprintf(modname, sizeof(modname), "dbm%s.nlm", type); --#elif defined(WIN32) -+#elif defined(WIN32) || defined(CYGWIN) || defined(MSYS) - apr_snprintf(modname, sizeof(modname), - "apr_dbm_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", type); - #else diff --git a/ldap/apr_ldap_stub.c b/ldap/apr_ldap_stub.c index 97c1551..9df76b7 100644 --- a/ldap/apr_ldap_stub.c @@ -58,7 +30,7 @@ index 97c1551..9df76b7 100644 } -#if defined(WIN32) -+#if defined(WIN32) || defined(CYGWIN) || defined(MSYS) ++#if defined(WIN32) || defined(__CYGWIN__) modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll"; #else modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".so";