diff options
author | Simon Frankenberger <simon@fraho.eu> | 2020-05-31 00:53:33 +0200 |
---|---|---|
committer | Milan P. Stanić <mps@arvanta.net> | 2020-05-31 11:32:44 +0000 |
commit | 2d0ee64b9f155e433d3f4e9a2e1f0b0128c785aa (patch) | |
tree | 84ed63acdbf76731a4cafb6f55d7d3a2478c9f93 | |
parent | 5e50e404b585b364a4d5c96d65586618ef079a5f (diff) | |
download | alpine_aports-2d0ee64b9f155e433d3f4e9a2e1f0b0128c785aa.tar.bz2 alpine_aports-2d0ee64b9f155e433d3f4e9a2e1f0b0128c785aa.tar.xz alpine_aports-2d0ee64b9f155e433d3f4e9a2e1f0b0128c785aa.zip |
testing/proftpd: Upgrade to 1.3.7_rc4
-rw-r--r-- | testing/proftpd/APKBUILD | 9 | ||||
-rw-r--r-- | testing/proftpd/fix-ar-dir.patch | 13 |
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 @@ | |||
3 | # Contributor: Valery Kartel <valery.kartel@gmail.com> | 3 | # Contributor: Valery Kartel <valery.kartel@gmail.com> |
4 | # Maintainer: Valery Kartel <valery.kartel@gmail.com> | 4 | # Maintainer: Valery Kartel <valery.kartel@gmail.com> |
5 | pkgname=proftpd | 5 | pkgname=proftpd |
6 | pkgver=1.3.7_rc3 | 6 | pkgver=1.3.7_rc4 |
7 | _pkgver=${pkgver/_/} | 7 | _pkgver=${pkgver/_/} |
8 | pkgrel=1 | 8 | pkgrel=0 |
9 | pkgdesc="Highly configurable FTP server software" | 9 | pkgdesc="Highly configurable FTP server software" |
10 | url="https://github.com/proftpd/proftpd" | 10 | url="https://github.com/proftpd/proftpd" |
11 | pkgusers=$pkgname | 11 | pkgusers=$pkgname |
@@ -45,6 +45,7 @@ done | |||
45 | 45 | ||
46 | source="$pkgname-$_pkgver.tar.gz::https://github.com/proftpd/proftpd/archive/v$_pkgver.tar.gz | 46 | source="$pkgname-$_pkgver.tar.gz::https://github.com/proftpd/proftpd/archive/v$_pkgver.tar.gz |
47 | fix-autoconf.patch | 47 | fix-autoconf.patch |
48 | fix-ar-dir.patch | ||
48 | 49 | ||
49 | $pkgname.logrotate | 50 | $pkgname.logrotate |
50 | $pkgname.initd | 51 | $pkgname.initd |
@@ -56,7 +57,6 @@ builddir="$srcdir/$pkgname-$_pkgver/" | |||
56 | 57 | ||
57 | prepare() { | 58 | prepare() { |
58 | default_prepare | 59 | default_prepare |
59 | update_config_guess | ||
60 | autoreconf -f | 60 | autoreconf -f |
61 | } | 61 | } |
62 | 62 | ||
@@ -184,8 +184,9 @@ _post_mod_sftp() { | |||
184 | "$subpkgdir"/etc/$pkgname/ | 184 | "$subpkgdir"/etc/$pkgname/ |
185 | } | 185 | } |
186 | 186 | ||
187 | sha512sums="cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f proftpd-1.3.7rc3.tar.gz | 187 | sha512sums="8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b proftpd-1.3.7rc4.tar.gz |
188 | d127ffe52df1d0130cc838eaf8aaf2e2980704cd840afd7e2ee30b1c0cd40440a1552b652c7e47b13306accd0cabdf35b8ab78e04141f2a83d60c310bcfbf311 fix-autoconf.patch | 188 | d127ffe52df1d0130cc838eaf8aaf2e2980704cd840afd7e2ee30b1c0cd40440a1552b652c7e47b13306accd0cabdf35b8ab78e04141f2a83d60c310bcfbf311 fix-autoconf.patch |
189 | 00cceed4c7fb98a109e1f7059e352d02cdbe9805df6e9de052fd44a9562f31234fbd72a57f92f6612b69c8ed6b946b7b9a5dd75ff98ce43b9eaf74ac48fabeda fix-ar-dir.patch | ||
189 | 142f8ba096844eb48883cdd3890fa3c0c4c8f73f7ce4f2acd5fb742053f8a3605b3f6ca5d5ab6c62c673d76eb60885d796af55bd7b53950794c4e7e2837973b8 proftpd.logrotate | 190 | 142f8ba096844eb48883cdd3890fa3c0c4c8f73f7ce4f2acd5fb742053f8a3605b3f6ca5d5ab6c62c673d76eb60885d796af55bd7b53950794c4e7e2837973b8 proftpd.logrotate |
190 | a03124a88c0c9f3981762804c62aa479f36227f24408a60437bf737c1e783c539a2d2c0aed0b1d95e56a587bdb5c372f6d670c298cdb7433ecd1f64d4bef7c42 proftpd.initd | 191 | a03124a88c0c9f3981762804c62aa479f36227f24408a60437bf737c1e783c539a2d2c0aed0b1d95e56a587bdb5c372f6d670c298cdb7433ecd1f64d4bef7c42 proftpd.initd |
191 | c6c6b6c32dd00d31fc1e328e989c77944aac993818747da05794c9560a270630e9bc7e09ac29215b57bcc709299d3720ae9009d3e2a94a0aef8cc5729fae1d0b proftpd.conf | 192 | 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 @@ | |||
1 | Don't know why, but ar is running in the wrong directory on alpine. | ||
2 | |||
3 | --- old/lib/Makefile.in | ||
4 | +++ new/lib/Makefile.in | ||
5 | @@ -28,7 +28,7 @@ | ||
6 | cd libltdl/ && $(MAKE) | ||
7 | |||
8 | libsupp.a: $(LIB_OBJS) | ||
9 | - $(AR) rc libsupp.a $(LIB_OBJS) | ||
10 | + cd .libs && $(AR) rc ../libsupp.a $(LIB_OBJS) | ||
11 | $(RANLIB) libsupp.a | ||
12 | |||
13 | lib: libsupp.a $(LIB_DEPS) | ||