Initial import

6 files changed, 196 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..283aca8f6790
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,31 @@
+pkgbase = telldus-core-git
+	pkgdesc = Driver and tools for controlling a Telldus Technologies TellStick
+	pkgver = r1
+	pkgrel = 1
+	url = https://github.com/telldus/telldus
+	arch = i686
+	arch = x86_64
+	license = LGPL2
+	makedepends = gcc
+	makedepends = cmake
+	makedepends = make
+	makedepends = git
+	makedepends = doxygen
+	depends = libftdi-compat
+	depends = confuse
+	provides = telldus-core
+	conflicts = telldus-core
+	backup = etc/tellstick.conf
+	source = telldus::git+https://github.com/telldus/telldus.git
+	source = telldusd.service
+	source = pthread.patch
+	source = uucp.patch
+	source = bin.patch
+	sha512sums = SKIP
+	sha512sums = 6f1df90a7d073acc2825d480552dc25fc0ccbafc58295542278a1a69a42030c2df7221bb3915a96c7a37924b1c276b78fe9d821b371cbe84c6eb09f6e987ebde
+	sha512sums = eb54e6cd62fbb3088827d92bb138b8fc88c2d76b6ec660bc6c88c5fda2b0d2493a2bb3509d24e5a6a871d42d335dff49c07721be955cbdbcda28e51df04bbb74
+	sha512sums = 0888e11a2a1080d0b5bad515534dc127f201ad25db427e45d4bbb981254608bbbdbc490c76b7aeaf65eea7e2699cbb62cab8ebf6f4e4048a9dc668a68d7b6ab5
+	sha512sums = 27178656d147481eb76c820bf49da0339714f7d27c413777e2ecfc0296de5ccfe9425d7e4bc5ea2dfbe530d6fe47a22e111618808cf296b3bfa21569af7512ec
+
+pkgname = telldus-core-git
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..711819ea1516
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,63 @@
+pkgname=('telldus-core-git')
+srcname='telldus'
+pkgver='r1'
+pkgrel='1'
+pkgdesc='Driver and tools for controlling a Telldus Technologies TellStick'
+arch=('i686' 'x86_64')
+url='https://github.com/telldus/telldus'
+license=('LGPL2')
+
+depends=('libftdi-compat' 'confuse')
+makedepends=('gcc' 'cmake' 'make' 'git' 'doxygen')
+provides=('telldus-core')
+conflicts=('telldus-core')
+
+source=(
+    "${srcname}::git+https://github.com/telldus/telldus.git"
+    'telldusd.service'
+    'pthread.patch'
+    'uucp.patch'
+    'bin.patch'
+)
+sha512sums=(
+    'SKIP'
+    '6f1df90a7d073acc2825d480552dc25fc0ccbafc58295542278a1a69a42030c2df7221bb3915a96c7a37924b1c276b78fe9d821b371cbe84c6eb09f6e987ebde'
+    'eb54e6cd62fbb3088827d92bb138b8fc88c2d76b6ec660bc6c88c5fda2b0d2493a2bb3509d24e5a6a871d42d335dff49c07721be955cbdbcda28e51df04bbb74'
+    '0888e11a2a1080d0b5bad515534dc127f201ad25db427e45d4bbb981254608bbbdbc490c76b7aeaf65eea7e2699cbb62cab8ebf6f4e4048a9dc668a68d7b6ab5'
+    '27178656d147481eb76c820bf49da0339714f7d27c413777e2ecfc0296de5ccfe9425d7e4bc5ea2dfbe530d6fe47a22e111618808cf296b3bfa21569af7512ec'
+)
+
+backup=('etc/tellstick.conf')
+
+pkgver() {
+    cd "${srcdir}/${srcname}"
+
+    printf 'r%s.%s\n' \
+        "$( git rev-list HEAD | wc --lines )" \
+        "$( git describe --always | sed 's/-/./g' )"
+}
+
+prepare() {
+    cd "${srcdir}/${srcname}"
+
+    git apply "${srcdir}/pthread.patch"
+    git apply "${srcdir}/uucp.patch"
+    git apply "${srcdir}/bin.patch"
+}
+
+build() {
+    cd "${srcdir}/${srcname}/telldus-core"
+
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DFORCE_COMPILE_FROM_TRUNK=TRUE .
+    make
+}
+
+package() {
+    cd "${srcdir}/${srcname}/telldus-core"
+
+    make DESTDIR="${pkgdir}" install
+
+    install -D --mode=644 \
+        "${srcdir}/telldusd.service" \
+        "${pkgdir}/usr/lib/systemd/system/telldusd.service"
+}
diff --git a/bin.patch b/bin.patch
new file mode 100644
index 000000000000..6eb1a973ce76
--- /dev/null
+++ b/bin.patch
@@ -0,0 +1,41 @@
+diff --git a/telldus-core/service/CMakeLists.txt b/telldus-core/service/CMakeLists.txt
+index 595d551..541477e 100644
+--- a/telldus-core/service/CMakeLists.txt
++++ b/telldus-core/service/CMakeLists.txt
+@@ -254,7 +254,7 @@ IF (UNIX)
+ ENDIF (UNIX)
+ 
+ IF (UNIX AND NOT APPLE)
+-	INSTALL(TARGETS ${telldus-service_TARGET} RUNTIME DESTINATION sbin)
++	INSTALL(TARGETS ${telldus-service_TARGET} RUNTIME DESTINATION bin)
+ 	INSTALL(FILES tellstick.conf
+ 		DESTINATION ${SYSCONF_INSTALL_DIR}
+ 	)
+diff --git a/telldus-core/tdadmin/CMakeLists.txt b/telldus-core/tdadmin/CMakeLists.txt
+index 7c72b26..58793c6 100644
+--- a/telldus-core/tdadmin/CMakeLists.txt
++++ b/telldus-core/tdadmin/CMakeLists.txt
+@@ -56,7 +56,7 @@ IF (UNIX)
+ 	ENDIF (GENERATE_MAN)
+ ENDIF (UNIX)
+ 
+-INSTALL(TARGETS tdadmin RUNTIME DESTINATION sbin)
++INSTALL(TARGETS tdadmin RUNTIME DESTINATION bin)
+ 
+ IF (UNIX AND NOT APPLE)
+ 	SET(UDEV_RULES_DIR	"/etc/udev/rules.d" CACHE PATH "The directory where udev store its rules" )
+diff --git a/telldus-core/tdadmin/udev.sh b/telldus-core/tdadmin/udev.sh
+index 3b935d7..074c7dc 100755
+--- a/telldus-core/tdadmin/udev.sh
++++ b/telldus-core/tdadmin/udev.sh
+@@ -2,8 +2,8 @@
+ 
+ if [ "${ID_VENDOR_ID}" = "1781" ]; then
+ 	if [ "${ACTION}" = "add" ]; then
+-		@CMAKE_INSTALL_PREFIX@/sbin/tdadmin controller connect --pid=${ID_MODEL_ID} --vid=${ID_VENDOR_ID} --serial=${ID_SERIAL_SHORT}
++		@CMAKE_INSTALL_PREFIX@/bin/tdadmin controller connect --pid=${ID_MODEL_ID} --vid=${ID_VENDOR_ID} --serial=${ID_SERIAL_SHORT}
+ 	elif [ "${ACTION}" = "remove" ]; then
+-		@CMAKE_INSTALL_PREFIX@/sbin/tdadmin controller disconnect --pid=${ID_MODEL_ID} --vid=${ID_VENDOR_ID} --serial=${ID_SERIAL_SHORT}
++		@CMAKE_INSTALL_PREFIX@/bin/tdadmin controller disconnect --pid=${ID_MODEL_ID} --vid=${ID_VENDOR_ID} --serial=${ID_SERIAL_SHORT}
+ 	fi
+ fi
diff --git a/pthread.patch b/pthread.patch
new file mode 100644
index 000000000000..fc0e53663399
--- /dev/null
+++ b/pthread.patch
@@ -0,0 +1,14 @@
+diff --git a/telldus-core/client/CMakeLists.txt b/telldus-core/client/CMakeLists.txt
+index 3336d29..f6a98bc 100644
+--- a/telldus-core/client/CMakeLists.txt
++++ b/telldus-core/client/CMakeLists.txt
+@@ -4,6 +4,9 @@ ENDIF(COMMAND cmake_policy)
+ 
+ FIND_PACKAGE( SignTool REQUIRED )
+ 
++SET(CMAKE_C_FLAGS "-pthread")
++SET(CMAKE_CXX_FLAGS "-pthread")
++
+ ######## Non configurable options  ########
+ SET( telldus-core_SRCS
+ 	CallbackDispatcher.cpp
diff --git a/telldusd.service b/telldusd.service
new file mode 100644
index 000000000000..d61c7111aa8f
--- /dev/null
+++ b/telldusd.service
@@ -0,0 +1,14 @@
+# Telldusd service unit file
+#
+[Unit]
+Description=Telldus-core service telldusd
+After=basic.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/telldusd
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/run/telldusd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/uucp.patch b/uucp.patch
new file mode 100644
index 000000000000..b36ea31519d3
--- /dev/null
+++ b/uucp.patch
@@ -0,0 +1,33 @@
+diff --git a/telldus-core/service/SettingsConfuse.cpp b/telldus-core/service/SettingsConfuse.cpp
+index 0503041..285c92a 100644
+--- a/telldus-core/service/SettingsConfuse.cpp
++++ b/telldus-core/service/SettingsConfuse.cpp
+@@ -396,7 +396,7 @@ bool readConfig(cfg_t **cfg) {
+ 
+ 	cfg_opt_t opts[] = {
+ 		CFG_STR(const_cast<char *>("user"), const_cast<char *>("nobody"), CFGF_NONE),
+-		CFG_STR(const_cast<char *>("group"), const_cast<char *>("plugdev"), CFGF_NONE),
++		CFG_STR(const_cast<char *>("group"), const_cast<char *>("uucp"), CFGF_NONE),
+ 		CFG_STR(const_cast<char *>("deviceNode"), const_cast<char *>("/dev/tellstick"), CFGF_NONE),
+ 		CFG_STR(const_cast<char *>("ignoreControllerConfirmation"), const_cast<char *>("false"), CFGF_NONE),
+ 		CFG_SEC(const_cast<char *>("device"), device_opts, CFGF_MULTI),
+diff --git a/telldus-core/service/tellstick.conf b/telldus-core/service/tellstick.conf
+index fed9c66..eba48cc 100644
+--- a/telldus-core/service/tellstick.conf
++++ b/telldus-core/service/tellstick.conf
+@@ -1,5 +1,5 @@
+ user = "nobody"
+-group = "plugdev"
++group = "uucp"
+ ignoreControllerConfirmation = "false"
+ device {
+   id = 1
+diff --git a/telldus-core/tdadmin/05-tellstick.rules b/telldus-core/tdadmin/05-tellstick.rules
+index b450b35..685ad97 100644
+--- a/telldus-core/tdadmin/05-tellstick.rules
++++ b/telldus-core/tdadmin/05-tellstick.rules
+@@ -1,3 +1,3 @@
+-ATTRS{idVendor}=="1781", SUBSYSTEM=="usb", ACTION=="add", MODE="664", GROUP="plugdev", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="@CMAKE_INSTALL_PREFIX@/share/telldus-core/helpers/udev.sh"
++ATTRS{idVendor}=="1781", SUBSYSTEM=="usb", ACTION=="add", MODE="664", GROUP="uucp", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="@CMAKE_INSTALL_PREFIX@/share/telldus-core/helpers/udev.sh"
+ ENV{ID_VENDOR_ID}=="1781", SUBSYSTEM=="usb", ACTION=="remove", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="@CMAKE_INSTALL_PREFIX@/share/telldus-core/helpers/udev.sh"
+