testing/proftpd: Upgrade to 1.3.7_rc4

2 files changed, 18 insertions, 4 deletions

diff --git a/testing/proftpd/APKBUILD b/testing/proftpd/APKBUILD
index 788a2da93f..0d7425c132 100644
--- a/testing/proftpd/APKBUILD
+++ b/testing/proftpd/APKBUILD
@@ -3,9 +3,9 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=proftpd
-pkgver=1.3.7_rc3
+pkgver=1.3.7_rc4
 _pkgver=${pkgver/_/}
-pkgrel=1
+pkgrel=0
 pkgdesc="Highly configurable FTP server software"
 url="https://github.com/proftpd/proftpd"
 pkgusers=$pkgname
@@ -45,6 +45,7 @@ done
 
 source="$pkgname-$_pkgver.tar.gz::https://github.com/proftpd/proftpd/archive/v$_pkgver.tar.gz
         fix-autoconf.patch
+        fix-ar-dir.patch
 
         $pkgname.logrotate
         $pkgname.initd
@@ -56,7 +57,6 @@ builddir="$srcdir/$pkgname-$_pkgver/"
 
 prepare() {
         default_prepare
-        update_config_guess
         autoreconf -f
 }
 
@@ -184,8 +184,9 @@ _post_mod_sftp() {
                 "$subpkgdir"/etc/$pkgname/
 }
 
-sha512sums="cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f  proftpd-1.3.7rc3.tar.gz
+sha512sums="8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b  proftpd-1.3.7rc4.tar.gz
 d127ffe52df1d0130cc838eaf8aaf2e2980704cd840afd7e2ee30b1c0cd40440a1552b652c7e47b13306accd0cabdf35b8ab78e04141f2a83d60c310bcfbf311  fix-autoconf.patch
+00cceed4c7fb98a109e1f7059e352d02cdbe9805df6e9de052fd44a9562f31234fbd72a57f92f6612b69c8ed6b946b7b9a5dd75ff98ce43b9eaf74ac48fabeda  fix-ar-dir.patch
 142f8ba096844eb48883cdd3890fa3c0c4c8f73f7ce4f2acd5fb742053f8a3605b3f6ca5d5ab6c62c673d76eb60885d796af55bd7b53950794c4e7e2837973b8  proftpd.logrotate
 a03124a88c0c9f3981762804c62aa479f36227f24408a60437bf737c1e783c539a2d2c0aed0b1d95e56a587bdb5c372f6d670c298cdb7433ecd1f64d4bef7c42  proftpd.initd
 c6c6b6c32dd00d31fc1e328e989c77944aac993818747da05794c9560a270630e9bc7e09ac29215b57bcc709299d3720ae9009d3e2a94a0aef8cc5729fae1d0b  proftpd.conf
diff --git a/testing/proftpd/fix-ar-dir.patch b/testing/proftpd/fix-ar-dir.patch
new file mode 100644
index 0000000000..044c097778
--- /dev/null
+++ b/testing/proftpd/fix-ar-dir.patch
@@ -0,0 +1,13 @@
+Don't know why, but ar is running in the wrong directory on alpine.
+
+--- old/lib/Makefile.in
++++ new/lib/Makefile.in
+@@ -28,7 +28,7 @@
+        cd libltdl/ && $(MAKE)
+ 
+ libsupp.a: $(LIB_OBJS)
+-       $(AR) rc libsupp.a $(LIB_OBJS)
++       cd .libs && $(AR) rc ../libsupp.a $(LIB_OBJS)
+        $(RANLIB) libsupp.a
+ 
+ lib: libsupp.a $(LIB_DEPS)