Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  2 May 2014 11:30:42 +0200 (CEST)
From:      Johan Ström <johan@stromnet.se>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/189221: New port: comms/telldus-core, software for communicating with Telldus Tellstick
Message-ID:  <20140502093042.A087940FF@back-1.stromnet.se>
Resent-Message-ID: <201405020940.s429e1jj022863@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         189221
>Category:       ports
>Synopsis:       New port: comms/telldus-core, software for communicating with Telldus Tellstick
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 02 09:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Johan Ström
>Release:        FreeBSD 9.2-RELEASE-p3 amd64
>Organization:
Stromnet
>Environment:
System: FreeBSD back-1.stromnet.se 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #0: Sat Jan 11 03:25:02 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	Telldus Tellstick core

	Allows access to Telldus Tellstick USB dongles
	for communicating with 433MHz devices in your home.

	Provides "telldusd", the daemon which keeps track of your
	tellstick devices.
	Through a UNIX socket, the sensors and devices can be
	used/controlled from the command line tool "tdtool", or
	via the libtelldus-core C client library.

	WWW: http://www.telldus.com/products/tellstick

Port tested on FreeBSD 8.4, 9.2 and 10.0.
10.0 fixes and validation by FreeBSD Forums user mix_room (https://forums.freebsd.org/viewtopic.php?f=46&t=12553#p256613), thanks!

All patches except the tr1 fix (extra-patch-common_Event.h) submitted upstream: https://github.com/telldus/telldus/pull/6

>How-To-Repeat:
>Fix:

--- telldus-core.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	telldus-core
#	telldus-core/distinfo
#	telldus-core/pkg-plist
#	telldus-core/Makefile
#	telldus-core/pkg-descr
#	telldus-core/files
#	telldus-core/files/patch-service-Sensor.h
#	telldus-core/files/patch-common-Thread.h
#	telldus-core/files/patch-service-ConnectionListener_unix.cpp
#	telldus-core/files/patch-tdadmin-freebsd-devd-tellstick.conf
#	telldus-core/files/patch-common-Socket_unix.cpp
#	telldus-core/files/patch-CMakeLists.txt
#	telldus-core/files/patch-service-CMakeLists.txt
#	telldus-core/files/patch-tdadmin-CMakeLists.txt
#	telldus-core/files/patch-tdtool-CMakeLists.txt
#	telldus-core/files/telldusd.in
#	telldus-core/files/patch-service-SettingsConfuse.cpp
#	telldus-core/files/patch-common-CMakeLists.txt
#	telldus-core/files/patch-service-EventUpdateManager.cpp
#	telldus-core/files/extra-patch-common_Event.h
#	telldus-core/files/patch-service-tellstick.conf
#	telldus-core/pkg-message
#
echo c - telldus-core
mkdir -p telldus-core > /dev/null 2>&1
echo x - telldus-core/distinfo
sed 's/^X//' >telldus-core/distinfo << 'd6f8a25314d9a5b6bac91dada7853e45'
XSHA256 (telldus-core-2.1.2.tar.gz) = a20f6c74814afc23312d2c93ebbb37fdea9deaaee05ae7b6a6275e11e4662014
XSIZE (telldus-core-2.1.2.tar.gz) = 169850
d6f8a25314d9a5b6bac91dada7853e45
echo x - telldus-core/pkg-plist
sed 's/^X//' >telldus-core/pkg-plist << 'e5bf9a5b5c3ca1a0fc1bc1c7ac210235'
Xetc/devd/tellstick.conf
X
X@unexec if cmp %D/etc/tellstick.conf.sample %D/etc/tellstick.conf; then rm -vf %D/etc/tellstick.conf; fi
Xetc/tellstick.conf.sample
X@exec [ -f %D/etc/tellstick.conf ] || cp -v %D/etc/tellstick.conf.sample %D/etc/tellstick.conf
X
X@exec mkdir -p %D/var/telldus && chown nobody:dialer %D/var/telldus
X@unexec if [ ! -s %D/var/telldus/telldus-core.conf ]; then rm -vf %D/var/telldus/telldus-core.conf; fi
X@exec [ -f %D/var/telldus/telldus-core.conf ] || touch %D/var/telldus/telldus-core.conf && chown nobody:dialer %D/var/telldus/telldus-core.conf
X@dirrmtry var/telldus
X@dirrmtry var
X
Xbin/tdtool
Xinclude/telldus-core.h
Xlib/libtelldus-core.so
Xlib/libtelldus-core.so.2
Xlib/libtelldus-core.so.2.1.2
Xsbin/tdadmin
Xsbin/telldusd
Xman/man1/tdadmin.1.gz
Xman/man1/tdtool.1.gz
Xman/man1/telldusd.1.gz
e5bf9a5b5c3ca1a0fc1bc1c7ac210235
echo x - telldus-core/Makefile
sed 's/^X//' >telldus-core/Makefile << 'b110d193f3fbbe5f7a37b9d9717ce2c3'
X# Created by: Johan Strom <johna@stromnet.se>
X# $FreeBSD$
X
XPORTNAME=		telldus-core
XPORTVERSION=	2.1.2
XPORTREVISION=	2
XCATEGORIES=		comms
X# http://download.telldus.se/TellStick/Software/telldus-core/telldus-core-2.1.2.tar.gz
XMASTER_SITES=	http://download.telldus.se/TellStick/Software/telldus-core/
X
XMAINTAINER=		johan@stromnet.se
XCOMMENT=			Tellstick Telldus daemon + library
X
XLICENSE=			LGPL21
X
XLIB_DEPENDS+=libftdi.so:${PORTSDIR}/devel/libftdi
XLIB_DEPENDS+=libconfuse.so:${PORTSDIR}/devel/libconfuse
XLIB_DEPENDS+=libargp.so:${PORTSDIR}/devel/argp-standalone
X
XBUILD_DEPENDS+=help2man:${PORTSDIR}/misc/help2man
X
X.include <bsd.port.options.mk>
X
XUSES= cmake
XUSES+=iconv
X#CMAKE_VERBOSE=yes
XCMAKE_ARGS+=-DGENERATE_MAN=TRUE
XCMAKE_ARGS+=-DSYSCONF_INSTALL_DIR="${PREFIX}/etc"
XCMAKE_ARGS+=-DSTATE_INSTALL_DIR="${PREFIX}/var/telldus"
X
X# Cannot handle parallel build
XMAKE_JOBS_UNSAFE=yes
X
X.if ${OSVERSION} >= 1000000
X# On 10.x and above we use clang, and with clang we have a C++
X# env where std::tr1 does not exist.
X# There *should* be some proper way to fix this in code, to make it buildable
X# in both new and old envs, but I'm no expert and have not found any "perfect" solution.
XEXTRA_PATCHES+=${FILESDIR}/extra-patch-common_Event.h
X.endif
X
XMAN1=tdadmin.1 tdtool.1 telldusd.1
XMANCOMPRESSED=no
X
XUSE_RC_SUBR=telldusd
X
XUSER=nobody
XGROUP=dialer
X
X# telldus-core.conf: We install an empty file in pkg-plist, if none is there already
Xpost-install:
X	(cd ${STAGEDIR}${PREFIX}/etc; ${MV} tellstick.conf tellstick.conf.sample)
X	${RM} ${STAGEDIR}${PREFIX}/var/telldus/telldus-core.conf
X
X.include <bsd.port.mk>
b110d193f3fbbe5f7a37b9d9717ce2c3
echo x - telldus-core/pkg-descr
sed 's/^X//' >telldus-core/pkg-descr << '5feab4d57533fc5b23320a46a78ca3ee'
XTelldus Tellstick core
X
XAllows access to Telldus Tellstick USB dongles
Xfor communicating with 433MHz devices in your home.
X
XProvides "telldusd", the daemon which keeps track of your
Xtellstick devices.
XThrough a UNIX socket, the sensors and devices can be
Xused/controlled from the command line tool "tdtool", or
Xvia the libtelldus-core C client library.
X
XWWW: http://www.telldus.com/products/tellstick
5feab4d57533fc5b23320a46a78ca3ee
echo c - telldus-core/files
mkdir -p telldus-core/files > /dev/null 2>&1
echo x - telldus-core/files/patch-service-Sensor.h
sed 's/^X//' >telldus-core/files/patch-service-Sensor.h << '1ec99594f925b91718ecd98420f15184'
X--- service/Sensor.h
X+++ service/Sensor.h
X@@ -8,6 +8,9 @@
X #define TELLDUS_CORE_SERVICE_SENSOR_H_
X 
X #include <string>
X+#ifdef __FreeBSD__
X+#include <ctime>
X+#endif
X #include "common/Mutex.h"
X 
X class Sensor : public TelldusCore::Mutex {
1ec99594f925b91718ecd98420f15184
echo x - telldus-core/files/patch-common-Thread.h
sed 's/^X//' >telldus-core/files/patch-common-Thread.h << 'c154e2f5625edc3c2f22204a02fc8336'
X--- common/Thread.h
X+++ common/Thread.h
X@@ -13,6 +13,9 @@
X #define TELLDUS_CORE_COMMON_THREAD_H_
X 
X #include <string>
X+#ifdef __FreeBSD__
X+#include <pthread.h>
X+#endif
X #include "common/Mutex.h"
X 
X namespace TelldusCore {
c154e2f5625edc3c2f22204a02fc8336
echo x - telldus-core/files/patch-service-ConnectionListener_unix.cpp
sed 's/^X//' >telldus-core/files/patch-service-ConnectionListener_unix.cpp << 'cd197c4b76402cb58863af907444c3c7'
X--- service/ConnectionListener_unix.cpp
X+++ service/ConnectionListener_unix.cpp
X@@ -17,7 +17,7 @@
X #include "service/ConnectionListener.h"
X #include "common/Socket.h"
X 
X-#if defined(_MACOSX) && !defined(SOCK_CLOEXEC)
X+#if (defined(_MACOSX) || defined (__FreeBSD__)) && !defined(SOCK_CLOEXEC)
X #define SOCK_CLOEXEC 0
X #endif
X 
cd197c4b76402cb58863af907444c3c7
echo x - telldus-core/files/patch-tdadmin-freebsd-devd-tellstick.conf
sed 's/^X//' >telldus-core/files/patch-tdadmin-freebsd-devd-tellstick.conf << 'a8c23cd1a41899328d4adb43bee77c86'
X--- tdadmin/freebsd-devd-tellstick.conf	2014-04-06 22:40:11.000000000 +0200
X+++ tdadmin/freebsd-devd-tellstick.conf	2014-04-06 20:37:50.501751596 +0200
X@@ -0,0 +1,12 @@
X+attach 10 {
X+	device-name "uftdi[0-9]+";
X+	match "vendor" "0x1781";
X+	match "product" "0x0c30";
X+
X+	action "chgrp dialer /dev/ugen$port.$devaddr; chmod 660 /dev/ugen$port.$devaddr;
X+		@CMAKE_INSTALL_PREFIX@/sbin/tdadmin --pid $product --vid $vendor --serial $sernum controller connect";
X+};
X+
X+
X+# Haven't managed to handle detach/disconnect events, seems they do not provide any information
X+# at all so cannot distinguish different uftdi devices.
a8c23cd1a41899328d4adb43bee77c86
echo x - telldus-core/files/patch-common-Socket_unix.cpp
sed 's/^X//' >telldus-core/files/patch-common-Socket_unix.cpp << '19acbdc4e00dcf5be930ebb756e018bd'
X--- common/Socket_unix.cpp
X+++ common/Socket_unix.cpp
X@@ -18,7 +18,7 @@
X #include "common/Strings.h"
X 
X #define BUFSIZE 512
X-#if defined(_MACOSX) && !defined(SOCK_CLOEXEC)
X+#if (defined(_MACOSX) || defined (__FreeBSD__)) && !defined(SOCK_CLOEXEC)
X 	#define SOCK_CLOEXEC 0
X #endif
X 
X@@ -130,8 +130,10 @@ std::wstring Socket::read(int timeout) {
X 
X void Socket::stopReadWait() {
X 	TelldusCore::MutexLocker locker(&d->mutex);
X-	d->connected = false;
X-	// TODO(stefan): somehow signal the socket here?
X+	if(d->connected && d->socket != -1) {
X+		d->connected = false;
X+		shutdown(d->socket, SHUT_RDWR);
X+	}
X }
X 
X void Socket::write(const std::wstring &msg) {
19acbdc4e00dcf5be930ebb756e018bd
echo x - telldus-core/files/patch-CMakeLists.txt
sed 's/^X//' >telldus-core/files/patch-CMakeLists.txt << '1ca28904865428986aa32b3b1f587f1d'
X--- CMakeLists.txt
X+++ CMakeLists.txt
X@@ -42,8 +42,18 @@ ENDIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
X SET(BUILD_TDTOOL	TRUE				CACHE BOOL "Build tdtool")
X SET(BUILD_TDADMIN	${TDADMIN_DEFAULT}	CACHE BOOL "Build tdadmin")
X 
X+SET(GENERATE_DOXYGEN	FALSE	CACHE	BOOL "Enable generation of doxygen")
X SET(GENERATE_MAN	FALSE	CACHE	BOOL "Enable generation of man-files")
X 
X+
X+IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
X+	SET(MAN_DIR_DEFAULT "man")
X+ELSE()
X+	SET(MAN_DIR_DEFAULT "share/man")
X+ENDIF()
X+SET(MAN_DIR ${MAN_DIR_DEFAULT} CACHE PATH "The directory where man pages are located (related to ${CMAKE_INSTALL_PREFIX})")
X+
X+
X ADD_SUBDIRECTORY(common)
X ADD_SUBDIRECTORY(service)
X ADD_SUBDIRECTORY(client)
X@@ -61,20 +71,23 @@ ENDIF(BUILD_TDADMIN)
X ENABLE_TESTING()
X ADD_SUBDIRECTORY(tests)
X 
X-FIND_PACKAGE(Doxygen)
X-
X-IF(DOXYGEN_FOUND)
X-	SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
X-
X-	CONFIGURE_FILE(
X-		"${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
X-		${DOXY_CONFIG} @ONLY
X-	)
X-
X-	ADD_CUSTOM_TARGET(docs
X-		${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG}
X-		DEPENDS ${DOXY_CONFIG}
X-		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
X-		COMMENT "Generating doxygen documentation" VERBATIM
X-	)
X-ENDIF()
X+IF (GENERATE_DOXYGEN)
X+	FIND_PACKAGE(Doxygen)
X+	IF(DOXYGEN_FOUND)
X+		SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
X+
X+		CONFIGURE_FILE(
X+			"${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
X+			${DOXY_CONFIG} @ONLY
X+		)
X+
X+		ADD_CUSTOM_TARGET(docs
X+			${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG}
X+			DEPENDS ${DOXY_CONFIG}
X+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
X+			COMMENT "Generating doxygen documentation" VERBATIM
X+		)
X+	ELSE()
X+		MESSAGE("Warn: doxygen not found, wont build")
X+	ENDIF()
X+ENDIF(GENERATE_DOXYGEN)
1ca28904865428986aa32b3b1f587f1d
echo x - telldus-core/files/patch-service-CMakeLists.txt
sed 's/^X//' >telldus-core/files/patch-service-CMakeLists.txt << '83e5b962570457e10d789eb000190cf5'
X--- service/CMakeLists.txt
X+++ service/CMakeLists.txt
X@@ -249,7 +249,7 @@ IF (UNIX)
X 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
X 			COMMENT "Generating man file telldusd.1"
X 		)
X-		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/telldusd.1 DESTINATION share/man/man1)
X+		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/telldusd.1 DESTINATION ${MAN_DIR}/man1)
X 	ENDIF (GENERATE_MAN)
X ENDIF (UNIX)
X 
83e5b962570457e10d789eb000190cf5
echo x - telldus-core/files/patch-tdadmin-CMakeLists.txt
sed 's/^X//' >telldus-core/files/patch-tdadmin-CMakeLists.txt << '032543e26f1e82189aad97fb7ecdc50c'
X--- tdadmin/CMakeLists.txt
X+++ tdadmin/CMakeLists.txt
X@@ -52,13 +52,13 @@ IF (UNIX)
X 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
X 			COMMENT "Generating man file tdadmin.1"
X 		)
X-		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdadmin.1 DESTINATION share/man/man1)
X+		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdadmin.1 DESTINATION ${MAN_DIR}/man1)
X 	ENDIF (GENERATE_MAN)
X ENDIF (UNIX)
X 
X INSTALL(TARGETS tdadmin RUNTIME DESTINATION sbin)
X 
X-IF (UNIX AND NOT APPLE)
X+IF (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
X 	SET(UDEV_RULES_DIR	"/etc/udev/rules.d" CACHE PATH "The directory where udev store its rules" )
X 	CONFIGURE_FILE(
X 		${CMAKE_CURRENT_SOURCE_DIR}/05-tellstick.rules
X@@ -76,4 +76,14 @@ IF (UNIX AND NOT APPLE)
X 	INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/parsed/udev.sh
X 		DESTINATION share/telldus-core/helpers/
X 	)
X-ENDIF (UNIX AND NOT APPLE)
X+ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
X+	SET(UDEV_RULES_DIR	"/usr/local/etc/devd/" CACHE PATH "The directory where devd store its rules" )
X+	CONFIGURE_FILE(
X+		${CMAKE_CURRENT_SOURCE_DIR}/freebsd-devd-tellstick.conf
X+		${CMAKE_BINARY_DIR}/parsed/tellstick.conf
X+		@ONLY
X+	)
X+	INSTALL(FILES ${CMAKE_BINARY_DIR}/parsed/tellstick.conf
X+		DESTINATION ${UDEV_RULES_DIR}
X+	)
X+ENDIF ()
032543e26f1e82189aad97fb7ecdc50c
echo x - telldus-core/files/patch-tdtool-CMakeLists.txt
sed 's/^X//' >telldus-core/files/patch-tdtool-CMakeLists.txt << '3afb2f3b2be71e34da1fc0a46788519d'
X--- tdtool/CMakeLists.txt
X+++ tdtool/CMakeLists.txt
X@@ -49,7 +49,7 @@ IF (UNIX)
X 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
X 			COMMENT "Generating man file tdtool.1"
X 		)
X-		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdtool.1 DESTINATION share/man/man1)
X+		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdtool.1 DESTINATION ${MAN_DIR}/man1)
X 	ENDIF (GENERATE_MAN)
X ENDIF (UNIX)
X 
3afb2f3b2be71e34da1fc0a46788519d
echo x - telldus-core/files/telldusd.in
sed 's/^X//' >telldus-core/files/telldusd.in << 'aeb219bce626c2b3b9b5bb78b69f6f8e'
X#!/bin/sh
X
X#
X# PROVIDE: telldusd
X# Add the following lines to /etc/rc.conf to enable telldusd:
X# telldusd_enable (bool):    Set to "NO" by default.
X#                            Set it to "YES" to enable telldusd.
X# telldusd_flags (str):      Set to "" by default.
X# telldusd_configfile (str): Set to "/usr/local/etc/tellstick.conf" by defult
X#
X
X. /etc/rc.subr
X
Xname="telldusd"
Xrcvar=telldusd_enable
X
Xcommand="/usr/local/sbin/telldusd"
Xpidfile="/var/run/telldusd.pid"
X
Xtelldusd_enable=${telldusd_enable:-"NO"}
Xtelldusd_flags=${telldusd_flags:-""}
Xtelldusd_configfile=${telldusd_configfile:-"/usr/local/etc/tellstick.conf"}
X
Xload_rc_config "${name}"
X
Xrequired_files="${telldusd_configfile}"
X
Xrun_rc_command "$1"
aeb219bce626c2b3b9b5bb78b69f6f8e
echo x - telldus-core/files/patch-service-SettingsConfuse.cpp
sed 's/^X//' >telldus-core/files/patch-service-SettingsConfuse.cpp << '50c6b403bd59ca2c3355ab84825e40b2'
X--- service/SettingsConfuse.cpp
X+++ service/SettingsConfuse.cpp
X@@ -17,6 +17,8 @@
X 
X class Settings::PrivateData {
X public:
X+	PrivateData()
X+		: cfg(NULL), var_cfg(NULL) {}
X 	cfg_t *cfg;
X 	cfg_t *var_cfg;
X };
50c6b403bd59ca2c3355ab84825e40b2
echo x - telldus-core/files/patch-common-CMakeLists.txt
sed 's/^X//' >telldus-core/files/patch-common-CMakeLists.txt << '786ef6e31cf0ac4735dd9d35c8d30020'
X--- common/CMakeLists.txt
X+++ common/CMakeLists.txt
X@@ -54,16 +54,22 @@ ELSEIF (WIN32)
X 	)
X ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
X 	#### FreeBSD ####
X-	FIND_LIBRARY(ICONV_LIBRARY iconv)
X+	string(REGEX MATCH "(([0-9]+)\\.([0-9]+))-([A-Z0-9])+" FREEBSD "${CMAKE_SYSTEM_VERSION}")
X+	set( FREEBSD_RELEASE "${CMAKE_MATCH_1}" )
X 	ADD_DEFINITIONS( -D_FREEBSD )
X 	LIST(APPEND  telldus-common_SRCS
X 		Event_unix.cpp
X 		EventHandler_unix.cpp
X 		Socket_unix.cpp
X 	)
X-	LIST(APPEND telldus-common_LIBRARIES
X-		${ICONV_LIBRARY}
X-	)
X+
X+	# FreeBSD 10 has iconv built in to libc
X+	IF(FREEBSD_RELEASE LESS 10)
X+		FIND_LIBRARY(ICONV_LIBRARY iconv)
X+		LIST(APPEND telldus-common_LIBRARIES
X+			${ICONV_LIBRARY}
X+		)
X+	ENDIF ()
X ELSE (APPLE)
X 	#### Linux ####
X 	ADD_DEFINITIONS( -D_LINUX )
786ef6e31cf0ac4735dd9d35c8d30020
echo x - telldus-core/files/patch-service-EventUpdateManager.cpp
sed 's/^X//' >telldus-core/files/patch-service-EventUpdateManager.cpp << '97ff7fd1ad6f32dfd39ae088cf7d35d7'
X--- service/EventUpdateManager.cpp
X+++ service/EventUpdateManager.cpp
X@@ -33,6 +33,10 @@
X #include "service/ConnectionListener.h"
X #include "service/Log.h"
X 
X+#ifdef __FreeBSD__
X+extern char **environ;
X+#endif
X+
X typedef std::list<TelldusCore::Socket *> SocketList;
X typedef std::list<std::string> StringList;
X 
97ff7fd1ad6f32dfd39ae088cf7d35d7
echo x - telldus-core/files/extra-patch-common_Event.h
sed 's/^X//' >telldus-core/files/extra-patch-common_Event.h << '021faeee72e5dcf98c3fdd89bde92f45'
X--- common/Event.h
X+++ common/Event.h
X@@ -32,7 +32,7 @@
X 		virtual bool isValid() const;
X 	};
X 
X-	typedef std::tr1::shared_ptr<EventData> EventDataRef;
X+	typedef std::shared_ptr<EventData> EventDataRef;
X 
X 	class EventBase {
X 	public:
X@@ -74,7 +74,7 @@
X 		friend class EventHandler;
X 	};
X 
X-	typedef std::tr1::shared_ptr<Event> EventRef;
X+	typedef std::shared_ptr<Event> EventRef;
X }
X 
X #endif  // TELLDUS_CORE_COMMON_EVENT_H_
021faeee72e5dcf98c3fdd89bde92f45
echo x - telldus-core/files/patch-service-tellstick.conf
sed 's/^X//' >telldus-core/files/patch-service-tellstick.conf << '4022aeb9dd39cf9bbf8e8ca3fd390b05'
X--- service/tellstick.conf	2014-04-08 20:53:25.374751487 +0200
X+++ service/tellstick.conf	2014-04-08 20:53:36.055838124 +0200
X@@ -1,5 +1,5 @@
X user = "nobody"
X-group = "plugdev"
X+group = "dialer"
X ignoreControllerConfirmation = "false"
X device {
X   id = 1
4022aeb9dd39cf9bbf8e8ca3fd390b05
echo x - telldus-core/pkg-message
sed 's/^X//' >telldus-core/pkg-message << 'df7e7b0548e498905aae1863de63980a'
X
X======
XNOTICE
X======
X
XA devd rule has been installed to automatically notify telldusd
Xwhen a new device has been detected.
X
XPlease restart devd to activate this:
X
X	/etc/rc.d/devd restart
X
XEdit /usr/local/etc/tellstick.conf to configure some devices,
Xand enable telldusd in rc.conf.
X
XThen start telldusd.
X
XWhen starting for the first time, you might need to unplug/plugin the device
Xto allow devd to fix the permissions on the /dev/ugenX.X device.
X
X
df7e7b0548e498905aae1863de63980a
exit
--- telldus-core.shar ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140502093042.A087940FF>