diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-11-21 07:56:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-11-21 07:56:08 +0000 |
| commit | 3c3179836816cb7e68c25709e0c4561c7f412815 (patch) | |
| tree | 3dc335d14b2ebbe98d1482bfbbdcafc40791e510 /testing/proftpd | |
| parent | 6f03407f091e9899853dc9d3487391e85559eb97 (diff) | |
testing/proftpd: security upgrade to 1.3.4a (CVE-2011-4130)
fixes #817
Diffstat (limited to 'testing/proftpd')
| -rw-r--r-- | testing/proftpd/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/proftpd/mempcpy.patch | 13 |
2 files changed, 27 insertions, 3 deletions
diff --git a/testing/proftpd/APKBUILD b/testing/proftpd/APKBUILD index fcfc9487727..63af201f4dc 100644 --- a/testing/proftpd/APKBUILD +++ b/testing/proftpd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net> # Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net> pkgname=proftpd -pkgver=1.3.3e -pkgrel=2 +pkgver=1.3.4a +pkgrel=0 pkgdesc="Highly configurable GPL-licensed FTP server software" url="http://www.proftpd.org/" arch="all" @@ -13,11 +13,21 @@ makedepends="$depends_dev libtool" install="" subpackages="$pkgname-doc" source="ftp://ftp.proftpd.org/distrib/source/proftpd-${pkgver}.tar.bz2 + mempcpy.patch proftpd.initd proftpd.confd" _builddir="$srcdir"/"$pkgname"-"$pkgver" +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { cd "$_builddir" ./configure \ @@ -44,6 +54,7 @@ package() { "$pkgdir"/etc/conf.d/$pkgname || return 1 } -md5sums="acc49b6589bc8c9fdf1dce9000bebdbd proftpd-1.3.3e.tar.bz2 +md5sums="4e3235dc1ef95d36e59721d70c5c489c proftpd-1.3.4a.tar.bz2 +cee983fba72533440d1a95c87bbbefc3 mempcpy.patch 175ce0cef2fb410d0ac8929ad421f941 proftpd.initd aab5852ac574e87781f1c9c4942e699b proftpd.confd" diff --git a/testing/proftpd/mempcpy.patch b/testing/proftpd/mempcpy.patch new file mode 100644 index 00000000000..e58210f3727 --- /dev/null +++ b/testing/proftpd/mempcpy.patch @@ -0,0 +1,13 @@ +diff --git a/lib/pr_fnmatch.c b/lib/pr_fnmatch.c +index 9e398e7..102591a 100644 +--- a/lib/pr_fnmatch.c ++++ b/lib/pr_fnmatch.c +@@ -233,7 +233,7 @@ __wcschrnul (const wchar_t *s, wint_t c) + # endif + # define STRLEN(S) strlen (S) + # define STRCAT(D, S) strcat (D, S) +-# define MEMPCPY(D, S, N) __mempcpy (D, S, N) ++# define MEMPCPY(D, S, N) mempcpy (D, S, N) + # define MEMCHR(S, C, N) memchr (S, C, N) + # define STRCOLL(S1, S2) strcoll (S1, S2) + # include "pr_fnmatch_loop.c" |