Merge remote-tracking branch 'eibd/master'

5 files changed, 101 insertions, 0 deletions

diff --git a/eibd/PKGBUILD b/eibd/PKGBUILD
new file mode 100644
index 0000000..7f6b56c
--- /dev/null
+++ b/eibd/PKGBUILD
@@ -0,0 +1,55 @@
+# Maintainer: Sven Fischer <sven (at) leiderfischer.de>
+# Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
+
+pkgname=eibd
+_pkgname=bcusdk
+pkgver=0.0.5
+pkgrel=7
+pkgdesc="Daemon as interface to the EIB / KNX bus"
+arch=('i686' 'x86_64' 'arm' 'armv7h')
+url="http://www.auto.tuwien.ac.at/~mkoegler/index.php/bcusdk"
+license=('GPL')
+depends=('pthsem>=2.0.8' 'gcc-libs')
+source=(http://www.auto.tuwien.ac.at/~mkoegler/eib/bcusdk_${pkgver}.tar.gz
+        eibd.patch eibd.socket eibd.service eibd.conf)
+md5sums=('5f81bc4e6bb53564573d573e795a9a5f'
+         'b9e50d68138fb74a4d0f6370a720d8fe'
+         '82e079c823fa226146ba49b47c76bab7'
+         '6535a482ea51ff5f8d9abf3d560fca1a'
+         '815323eebff8bc442c1e653a34e6b0b4')
+
+prepare() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    patch -p1 -i ${srcdir}/eibd.patch
+}
+
+build() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+
+    ./configure \
+        --prefix=/usr \
+        --enable-onlyeibd \
+        --enable-usb \
+        --enable-ft12 \
+        --enable-eibnetip \
+        --enable-eibnetipserver \
+        --enable-eibnetiptunnel
+
+    cd "${srcdir}/${_pkgname}-${pkgver}/common"
+    make
+
+    cd "${srcdir}/${_pkgname}-${pkgver}/eibd"
+    make
+}
+
+package() {
+    cd "${srcdir}"
+    install -Dm644 eibd.socket eibd.service -t "${pkgdir}/usr/lib/systemd/system"
+    install -Dm644 eibd.conf -t "${pkgdir}/etc/conf.d"
+
+    cd "${srcdir}/${_pkgname}-${pkgver}/common"
+    make DESTDIR="${pkgdir}" install
+
+    cd "${srcdir}/${_pkgname}-${pkgver}/eibd"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/eibd/eibd.conf b/eibd/eibd.conf
new file mode 100644
index 0000000..82d7147
--- /dev/null
+++ b/eibd/eibd.conf
@@ -0,0 +1,2 @@
+# Option file for eibd
+EIBD_OPTS="-D -T -S -i "
diff --git a/eibd/eibd.patch b/eibd/eibd.patch
new file mode 100644
index 0000000..daa9eb7
--- /dev/null
+++ b/eibd/eibd.patch
@@ -0,0 +1,25 @@
+diff -rupN bcusdk-0.0.5.orig/eibd/server/eibd.cpp bcusdk-0.0.5/eibd/server/eibd.cpp
+--- bcusdk-0.0.5.orig/eibd/server/eibd.cpp	2011-02-27 19:57:20.000000000 +0100
++++ bcusdk-0.0.5/eibd/server/eibd.cpp	2014-02-25 18:21:56.199884864 +0100
+@@ -358,7 +358,7 @@ main (int ac, char *ag[])
+       }
+ 
+   l2 = Create (ag[index], arg.backendflags, &t);
+-  if (!l2->init ())
++  if (!l2 || !l2->init ())
+     die ("initialisation of the backend failed");
+   l3 = new Layer3 (l2, &t);
+   if (arg.port)
+diff -rupN bcusdk-0.0.5.orig/eibd/usb/linux_usbfs.c bcusdk-0.0.5/eibd/usb/linux_usbfs.c
+--- bcusdk-0.0.5.orig/eibd/usb/linux_usbfs.c	2011-01-26 11:50:08.000000000 +0100
++++ bcusdk-0.0.5/eibd/usb/linux_usbfs.c	2014-02-25 18:23:21.549887409 +0100
+@@ -52,7 +52,8 @@ int pthread_mutex_trylock(pthread_mutex_
+ 	return 0;
+ }
+ 
+-int clock_gettime(clockid_t clk_id, struct timespec *tp)
++#define clock_gettime(A,B) xclock_gettime(A, B)
++int xclock_gettime(clockid_t clk_id, struct timespec *tp)
+ {
+ 	pth_int_time (tp);
+ 	return 0;
diff --git a/eibd/eibd.service b/eibd/eibd.service
new file mode 100644
index 0000000..133a19e
--- /dev/null
+++ b/eibd/eibd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=EIB Daemon
+After=network.target
+
+[Service]
+User=daemon
+EnvironmentFile=/etc/conf.d/eibd.conf
+ExecStart=/usr/bin/eibd $EIBD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/eibd/eibd.socket b/eibd/eibd.socket
new file mode 100644
index 0000000..22831fe
--- /dev/null
+++ b/eibd/eibd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Conflicts=eibd.service
+
+[Socket]
+ListenDatagram=6720
+
+[Install]
+WantedBy=sockets.target