From 4e48df9ebbb829fee706945d79b413bad13fbfee Mon Sep 17 00:00:00 2001
From: ScrumpyJack <scrumpyjack@st.ilet.to>
Date: Wed, 11 Nov 2015 14:02:01 +0000
Subject: main/open-lldp: build fix

This is a replacement for patchwork patch 979. Please reject patch 979

Version bump from 0.9.45 to 0.9.46
Minor patch for missing include in clif.h

Thanks to xming for C89 with GNU extensions flag
---
 main/open-lldp/APKBUILD     | 28 +++++++++++++++++++---------
 main/open-lldp/clif.h.patch | 10 ++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 main/open-lldp/clif.h.patch

diff --git a/main/open-lldp/APKBUILD b/main/open-lldp/APKBUILD
index 1a69d0a81d..4c64a20ea0 100644
--- a/main/open-lldp/APKBUILD
+++ b/main/open-lldp/APKBUILD
@@ -1,7 +1,8 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=open-lldp
 _realname=lldpad
-pkgver=0.9.45
+pkgver=0.9.46
 pkgrel=2
 pkgdesc="Open Source implementation of the IEEE standard 802.1AB Link Layer Discovery Protocol (LLDP)"
 url="http://www.open-lldp.org"
@@ -12,16 +13,22 @@ makedepends="autoconf automake bash flex libtool libconfig-dev libnl-dev
 	readline-dev linux-headers bsd-compat-headers"
 install=
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://dev.alpinelinux.org/archive/open-lldp/lldpad-$pkgver.tar.gz
+source="http://ftp-osl.osuosl.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        clif.h.patch
 	$pkgname.initd
 	$pkgname.confd"
 
-_builddir="$srcdir/lldpad-$pkgver"
+_builddir="$srcdir/${pkgname}-${pkgver}"
 
 prepare() {
-	cd "$_builddir"
+        local i
+        cd "$_builddir"
+        for i in $source; do
+                case $i in
+                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+                esac
+        done
 	sed -i 's/ln -T -s/ln -s/' Makefile.am || return 1
-	#sed -i 's/ln -T -s/ln -s/' Makefile.in || return 1
 	sed -i -e 's/-Werror//' Makefile.am configure.ac || return 1
 	libtoolize --force && aclocal && autoconf --force && automake --add-missing
 }
@@ -29,7 +36,7 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./bootstrap.sh || return 1
-	# aclocal -W all && automake -W all && autoconf -W all
+        export CFLAGS="${CFLAGS} -fgnu89-inline"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -51,12 +58,15 @@ package() {
 	install -m644 -D ../../$pkgname.confd "$pkgdir"/etc/conf.d/$_realname
 }
 
-md5sums="b06621c730a5e6f575755b061676ac5e  lldpad-0.9.45.tar.gz
+md5sums="15ca4c1f6ce3023f7134ab7d784986c3  open-lldp-0.9.46.tar.gz
+709186cd0d59b59d43958e5eadf0b97d  clif.h.patch
 1d6cdac5614860629fd2a5bbe02d9263  open-lldp.initd
 a1d2e351028d39193fc0a3466ba4db33  open-lldp.confd"
-sha256sums="823f65f317f65888a1fb887fe030d1ff3215e2e1ae18f68e2c8519f92a5dc8a8  lldpad-0.9.45.tar.gz
+sha256sums="c7b4abc970bf4cc12617b8124de0b440e69fc2a9f680973d2c313301802def14  open-lldp-0.9.46.tar.gz
+bff3746fe5d576d4239664a6966d6fd3e8defac208f8cb538dd24fbd9613fc47  clif.h.patch
 5f7a6f265afc16051066c1890c49f330f1fb79cce4fc9a0880aec161eb00d27c  open-lldp.initd
 f914e08fb444ee398727fabdf6bd84df2f66087ba5ce35872452859ed06e9890  open-lldp.confd"
-sha512sums="5ce0019ac8726238d446b985edadce3da0f831f9e7e3f69c0bb16ea64ec4228418f43455a5174af87f3d579c1950f0bef0d8ac75b07f666fb1fbcc31977daf4e  lldpad-0.9.45.tar.gz
+sha512sums="45982ba69c159ca386970d49de8cee70b654e762b60d95c96a4794ee696e6c889694bb12eb1454e6c176152c949e67af38974a431838c3788d9bc42751c60878  open-lldp-0.9.46.tar.gz
+fd9eca241564e76df2b97d8048b788fc35c3d791a1784386e68bf92dfd39076b356546adee42028007483f0cdb579b0da519d0376791d0f902f7e83df60d9306  clif.h.patch
 cfd618d2414ec1624e66105b5357de93414b0320badf63b78cbab9b5bb493bd8ef7cac9a22ba4d60418037d2d6636469a20dc288906348c2332beb786f67f808  open-lldp.initd
 8f8a68b9764e3b2be0cc01a37debb099e3d9021c354eb8d584a5123c470002f1f61ecc5688e5d958c8c576fd36df7a65233192221849a8fc51e999a7c5ea5678  open-lldp.confd"
diff --git a/main/open-lldp/clif.h.patch b/main/open-lldp/clif.h.patch
new file mode 100644
index 0000000000..976066e955
--- /dev/null
+++ b/main/open-lldp/clif.h.patch
@@ -0,0 +1,10 @@
+--- open-lldp-0.9.46/include/clif.h
++++ ../clif.h.patched
+@@ -34,6 +34,7 @@
+ 
+ #include <sys/un.h>
+ #include "clif_sock.h"
++#include <sys/types.h>
+ 
+ /**
+  * struct clif - Internal structure for client interface library
-- 
cgit v1.2.3