diff --git a/apr-util/PKGBUILD b/apr-util/PKGBUILD index b92f70f7..42b5336c 100644 --- a/apr-util/PKGBUILD +++ b/apr-util/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Alexey Pavlov pkgname=('apr-util' 'apr-util-devel') -pkgver=1.5.4 -pkgrel=2 +pkgver=1.6.1 +pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="https://apr.apache.org/" @@ -12,8 +12,8 @@ license=('APACHE') source=("https://archive.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2" apr-util-1.5.3-msys2.patch plugins.patch) -sha256sums=('a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e' - '51566cd23d08880c9b493087bc788f6310f7641c1273c55e38c80245c0697ff2' +sha256sums=('d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b' + '55e5f524a5323476f5e224ed9d748a5417a64d5b21b89b2267a22ea4e32b9269' 'd79c9202ce6ddc9a67a671ec5bcf495672330a4fa7e29446fa54db793f3f09fe') prepare() { diff --git a/apr-util/apr-util-1.5.3-msys2.patch b/apr-util/apr-util-1.5.3-msys2.patch index 0092f62a..31e53b24 100644 --- a/apr-util/apr-util-1.5.3-msys2.patch +++ b/apr-util/apr-util-1.5.3-msys2.patch @@ -1,26 +1,12 @@ 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 -@@ -844,6 +847,9 @@ +@@ -870,6 +870,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; + amd64:MSYS*:*:* | x86_64:MSYS*:*:*) + echo x86_64-unknown-msys + exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; -diff -Naur apr-util-1.5.2-orig/xml/expat/conftools/config.guess apr-util-1.5.2/xml/expat/conftools/config.guess ---- apr-util-1.5.2-orig/xml/expat/conftools/config.guess 2012-08-07 20:33:52.000000000 +0000 -+++ apr-util-1.5.2/xml/expat/conftools/config.guess 2013-04-25 19:15:42.600585900 +0000 -@@ -851,6 +851,9 @@ - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;;