Merge git://dev.alpinelinux.org/aports

4 files changed, 27 insertions, 88 deletions

diff --git a/testing/lua-zmq/APKBUILD b/testing/lua-zmq/APKBUILD
deleted file mode 100644
index 1cf29100fb..0000000000
--- a/testing/lua-zmq/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lua-zmq
-pkgver=1.1
-pkgrel=0
-pkgdesc="Lua zeromq2 binding"
-url="https://github.com/Neopallium/lua-zmq"
-arch="all"
-license="MIT"
-depends=""
-makedepends="wget zeromq-dev cmake"
-install=""
-subpackages=
-source="saveas-http://github.com/Neopallium/lua-zmq/tarball/v1.1/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/Neopallium-lua-zmq-5cf558e
-
-prepare() {
-	local i
-	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"
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		. || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make install DESTDIR="$pkgdir" || return 1
-}
-
-md5sums="d3813c48a9e2b88426fd79604862966d  lua-zmq-1.1.tar.gz"
diff --git a/testing/proftpd/APKBUILD b/testing/proftpd/APKBUILD
index fcfc948772..63af201f4d 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 0000000000..e58210f372
--- /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"
diff --git a/testing/zeromq/APKBUILD b/testing/zeromq/APKBUILD
deleted file mode 100644
index 6715f0af97..0000000000
--- a/testing/zeromq/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=zeromq
-pkgver=2.1.7
-pkgrel=2
-pkgdesc="The ZeroMQ messaging library and tools"
-url="http://www.zeromq.org/"
-arch="all"
-license="LGPLv3+"
-depends=
-makedepends="util-linux-dev"
-install=
-subpackages="$pkgname-dev $pkgname-doc libzmq"
-source="http://download.zeromq.org/zeromq-$pkgver.tar.gz"
-
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/*.la
-}
-
-libzmq() {
-	pkgdesc="The ZeroMQ messaging library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libzmq.so.* "$subpkgdir"/usr/lib/
-}
-
-md5sums="7d3120f8a8fb913a7e55c57c6eb024f3  zeromq-2.1.7.tar.gz"