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

4 files changed, 75 insertions, 4 deletions

diff --git a/testing/open-lldp/APKBUILD b/testing/open-lldp/APKBUILD
new file mode 100644
index 0000000000..b2b0c6ce18
--- /dev/null
+++ b/testing/open-lldp/APKBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+pkgname=open-lldp
+_realname=lldpad
+pkgver=0.9.38
+pkgrel=0
+pkgdesc="Open Source implementation of the IEEE standard 802.1AB Link Layer Discovery Protocol (LLDP)"
+url="http://www.open-lldp.org"
+arch="all"
+license="GPL"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://www.open-lldp.org/open-lldp/downloads/$_realname-$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.confd"
+
+_builddir="$srcdir"/$_realname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	sed -i 's/ln -T -s/ln -s/' Makefile.am || exit 1
+	sed -i 's/ln -T -s/ln -s/' Makefile.in || exit 1
+}
+
+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
+	mkdir -p "$pkgdir"/usr/include/dcbd
+	# ln -s /usr/include/lldpad "$pkgdir"/usr/include/dcbd
+	ln -s /usr/include/lldpad/lldp_dcbx_cmds.h "$pkgdir"/usr/include/dcbd/clif_cmds.h
+	install -m755 -D ../../$pkgname.initd "$pkgdir"/etc/init.d/$_realname
+	install -m644 -D ../../$pkgname.confd "$pkgdir"/etc/conf.d/$_realname
+}
+
+md5sums="a55178979b523c02d0bb90bb36f3a693  lldpad-0.9.38.tar.gz
+4d226f4520fec36afee8e6b6eebf46f1  open-lldp.initd
+a1d2e351028d39193fc0a3466ba4db33  open-lldp.confd"
diff --git a/testing/open-lldp/open-lldp.confd b/testing/open-lldp/open-lldp.confd
new file mode 100644
index 0000000000..a4d4b1de80
--- /dev/null
+++ b/testing/open-lldp/open-lldp.confd
@@ -0,0 +1,2 @@
+# Remove existing pid file at startup
+OPTS="-d -f /etc/lldpad.conf"
diff --git a/testing/open-lldp/open-lldp.initd b/testing/open-lldp/open-lldp.initd
new file mode 100755
index 0000000000..ed9807d514
--- /dev/null
+++ b/testing/open-lldp/open-lldp.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+
+NAME="lldpad"
+DAEMON="/usr/sbin/$NAME"
+pidfile=/var/run/$NAME.pid
+
+depend() {
+	need net
+	after firewall
+}
+
+start() {
+	ebegin "Starting ${NAME}"
+	start-stop-daemon --start --quiet --pidfile ${pidfile} \
+		--exec ${DAEMON} -- ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${NAME}"
+	start-stop-daemon --stop --exec ${DAEMON}
+	eend $?
+}
+
diff --git a/testing/poppler-qt4/APKBUILD b/testing/poppler-qt4/APKBUILD
index 8ab7f7beaf..ea6c85222c 100644
--- a/testing/poppler-qt4/APKBUILD
+++ b/testing/poppler-qt4/APKBUILD
@@ -3,7 +3,7 @@
 # this aport only includes glib/gtk support in order to break the
 # circular make dependency: gtk <- cups <- poppler <- gtk
 
-_ver=0.20.1
+_ver=0.20.2
 # get the pkgver from poppler
 if [ -r ../../main/poppler/APKBUILD ]; then
 	. ../../main/poppler/APKBUILD
@@ -38,14 +38,12 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
-		--disable-gdk \
 		--disable-poppler-glib \
 		--enable-cairo-output \
 		--enable-xpdf-headers \
 		--enable-libjpeg \
 		--enable-zlib \
 		--enable-poppler-qt4 \
-		--disable-poppler-qt \
 		--disable-utils \
 		|| return 1
 	make || return 1
@@ -59,4 +57,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
-md5sums="a61e3b844061f5324512a16d6d16984c  poppler-0.20.1.tar.gz"
+md5sums="45dd2c16c8c4d1a39e830e45745c4e25  poppler-0.20.2.tar.gz"