np-hardass 15/06/18 08:35:17
Modified: teamviewerd.init
Added: teamviewerd.conf teamviewerd9.init teamviewer.sh
Removed: teamviewer-10.0.36281-gentoo.patch
teamviewer-9.0.30203-gentoo.patch
Log:
Version bump to 10.0.41499 and drop 10.0.36281. Resolves bug #544222 and
#542728
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
18F89C67)
Revision Changes Path
1.3 net-misc/teamviewer/files/teamviewerd.init
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewerd.init?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewerd.init?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewerd.init?r1=1.2&r2=1.3
Index: teamviewerd.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/teamviewer/files/teamviewerd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- teamviewerd.init 18 Apr 2013 13:08:45 -0000 1.2
+++ teamviewerd.init 18 Jun 2015 08:35:17 -0000 1.3
@@ -1,26 +1,31 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-misc/teamviewer/files/teamviewerd.init,v 1.2
2013/04/18 13:08:45 hasufell Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-misc/teamviewer/files/teamviewerd.init,v 1.3
2015/06/18 08:35:17 np-hardass Exp $
+command=/opt/teamviewer@TVV@/tv_bin/teamviewerd
+command_args=-d
description="daemon for TeamViewer"
+pidfile=/var/run/teamviewerd.pid
-PIDFILE="/var/run/teamviewerd.pid"
+extra_stopped_commands="passwd"
-start() {
- ebegin "Starting Teamviewer Daemon"
-
- start-stop-daemon \
- --start \
- --pidfile "${PIDFILE}" \
- --background \
- --exec /opt/teamviewer@TVV@/teamviewerd -- -d
-}
-
-stop() {
- ebegin "Stopping Teamviewer Daemon"
-
- start-stop-daemon \
- --stop \
- --pidfile "${PIDFILE}"
+passwd() {
+ if [ -z "${PASSWD}" ]; then
+ eerror "No password specified."
+ exit 1
+ fi
+
+ ebegin "Attempting to change password."
+ /opt/teamviewer@TVV@/tv_bin/teamviewerd --passwd "${PASSWD}"
+ retr=$?
+ case $retr in
+ 0) einfo "Password successfully set." ;;
+ 11|12) eerror "Password must be between 8 and 12 characters.";;
+ 13) eerror "Invalid characters detected.";;
+ 14) eerror "Password invalid. Validation failed.";;
+ *) eerror "Unknown error code";;
+ esac
+ eend $retr
+ exit $retr
}
1.1 net-misc/teamviewer/files/teamviewerd.conf
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewerd.conf?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewerd.conf?rev=1.1&content-type=text/plain
Index: teamviewerd.conf
===================================================================
# This entry can be used to specify a default daemon password.
# It is set by running /etc/init.d/teamviewerd@TVV@ passwd.
# The password must be between 8 and 12 characters, and special characters
should
# be avoided.
PASSWD=""
1.1 net-misc/teamviewer/files/teamviewerd9.init
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewerd9.init?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewerd9.init?rev=1.1&content-type=text/plain
Index: teamviewerd9.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/net-misc/teamviewer/files/teamviewerd9.init,v 1.1
2015/06/18 08:35:17 np-hardass Exp $
description="daemon for TeamViewer"
PIDFILE="/var/run/teamviewerd.pid"
start() {
ebegin "Starting Teamviewer Daemon"
start-stop-daemon \
--start \
--pidfile "${PIDFILE}" \
--background \
--exec /opt/teamviewer@TVV@/teamviewerd -- -d
}
stop() {
ebegin "Stopping Teamviewer Daemon"
start-stop-daemon \
--stop \
--pidfile "${PIDFILE}"
}
1.1 net-misc/teamviewer/files/teamviewer.sh
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh?rev=1.1&content-type=text/plain
Index: teamviewer.sh
===================================================================
#!/bin/bash
tv="$(basename $0)"
version="@TVV@"
tvw_version=""
prefix="${HOME}/.wine-${tv}"
arch="win32"
native=true
if [ ! -d "${prefix}" ]; then
echo "Creating prefix..."
env WINEARCH="${arch}" WINEPREFIX="${prefix}" wineboot -i &> /dev/null
fi
if [ -e "${prefix}/tvw-version" ]; then
tvw_version=$(<"${prefix}/tvw-version")
fi
#If version has changed or new instance
if [ "${version}" != "${tvw_version}" ]; then
echo "Copying TeamViewer files to prefix..."
cp -R "/opt/${tv}/wine/drive_c/TeamViewer"
"${prefix}/drive_c/TeamViewer"
echo "Creating config and log directories in ~/.config/teamviewer@TVMV@"
mkdir -p "${HOME}"/.config/teamviewer@TVMV@/{config,logfiles}
echo "${version}" > "${prefix}/tvw-version"
fi
TV_BASE_DIR="${tv}"
TV_BIN_DIR="${TV_BASE_DIR}/tv_bin"
TV_PROFILE="${prefix}"
TV_LOG_DIR="${TV_PROFILE}/logfiles"
TV_CFG_DIR="${TV_PROFILE}/config"
TV_USERHOME="${HOME}"
if $native; then
export WINEDLLPATH="${prefix}/drive_c/TeamViewer"
else
export
WINEDLLPATH="${tv}/tv_bin/wine/lib:${tv}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer"
export PATH="${tv}/tv_bin/wine/bin:${PATH}"
fi
export WINEPREFIX="${prefix}"
wine "C:\\TeamViewer\\TeamViewer.exe" "\${[@]}" &> \
"${HOME}/.config/teamviewer@TVMV@/logfiles/$(date
+%Y.%m.%d-%H:%M:%S)-wine.log"
