From da7c758ed9319353755be1c1baeee75f5c7e272d Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Wed, 12 Nov 2014 23:21:38 +0000 Subject: [PATCH] added missing patch Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2B6559ED --- net-misc/teamviewer/ChangeLog | 6 +- net-misc/teamviewer/Manifest | 9 +- .../files/teamviewer-9.0.32150-gentoo.patch | 138 ++++++++++++++++++ 3 files changed, 148 insertions(+), 5 deletions(-) create mode 100644 net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch diff --git a/net-misc/teamviewer/ChangeLog b/net-misc/teamviewer/ChangeLog index af862558ad82..158feb21e9ad 100644 --- a/net-misc/teamviewer/ChangeLog +++ b/net-misc/teamviewer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/teamviewer # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.13 2014/11/12 23:18:50 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.14 2014/11/12 23:21:34 axs Exp $ + + 12 Nov 2014; Ian Stakenvicius (_AxS_) + +files/teamviewer-9.0.32150-gentoo.patch: + added missing patch *teamviewer-9.0.32150 (12 Nov 2014) diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest index b49db50056a8..12dcd090e750 100644 --- a/net-misc/teamviewer/Manifest +++ b/net-misc/teamviewer/Manifest @@ -4,6 +4,7 @@ Hash: SHA256 AUX teamviewer-7.0.9377-POSIX.patch 3698 SHA256 fd595f395e0a66407c4bad2ee0d75a8f44bb39e89efc2b3ceaa5c71023024fd9 SHA512 67e9e82a606303501c0f8d4e06f06772322117b54c486c0516a593ce257961f866a4852ad677eef2a15e5714946a83d380e467519f4cc660a219f44abf8ca795 WHIRLPOOL 030ca9ee795eee371d9338fb2826b3f24617b0307c4f7a94127c921338ba335fe261bfc389cae12827b8f68deafb6852baa84664a7b3c16946670704521d49a7 AUX teamviewer-8.0.20931-gentoo.patch 3786 SHA256 560d0ec32bae1493e2a64ffbd61f42ef7f57ee6961175cee6e0a80de683a04c2 SHA512 6395c088d8cb99d8f0067296166170b6353a8c5a3b4b3a0390a7781dd0ee2d6cf7cd48e884ab286d5c87a9a4423227f6cff8b7c2fa7d591897c4657cbca19574 WHIRLPOOL 5ca33f345fe4315a89f944056bd1df73362d005e4c75b2a8d58d35990709eab223a6c82198bd5e7e621af2a6085a250bafd3bac8e7b9a61cdf7b52edbf63437f AUX teamviewer-9.0.30203-gentoo.patch 3876 SHA256 c8a9ee6772df79076c68bd3b47654d42d87fa5846e7f812fbf756d26ccc4fe65 SHA512 7eef0090c836ca304554dd064ef105a8ed141e8300a829ebeb6b73e233413efdbdf8662a48da340c11f4e8cddeb00d4cfe7d761e3adf532e48f61fccf642752f WHIRLPOOL 2f68646f536cff27becc20aab89e70a136a5b4f576026cb4e22e184e59cdc0449f322965e8649630ebc36c7cefb4cf089d896c685a8910752013dc6633de11a3 +AUX teamviewer-9.0.32150-gentoo.patch 3876 SHA256 c8a9ee6772df79076c68bd3b47654d42d87fa5846e7f812fbf756d26ccc4fe65 SHA512 7eef0090c836ca304554dd064ef105a8ed141e8300a829ebeb6b73e233413efdbdf8662a48da340c11f4e8cddeb00d4cfe7d761e3adf532e48f61fccf642752f WHIRLPOOL 2f68646f536cff27becc20aab89e70a136a5b4f576026cb4e22e184e59cdc0449f322965e8649630ebc36c7cefb4cf089d896c685a8910752013dc6633de11a3 AUX teamviewerd.init 600 SHA256 769f1455cb9b43d9a8907bd7b594db2af7d3905ca40c795ce0bbb4e016219bd8 SHA512 c79d8abb0c3f8623b6c063cd6775aacd362bce6ad245f11bba7fc868e601d62f163e1a2d0e9ec2d748565c031ce471e42a70aab88f8276aa74e22a44b7a7d46d WHIRLPOOL 7bf69e2c0b4e578b5b029265686f416d57d12ea6130c169846bd5843cb8b5e3ac337fe971883803f11ad90b87671b84b1f3132041087fedddea2d9d866086ec8 DIST teamviewer-7.0.9377.tar.gz 18102617 SHA256 3eaa78cbbd49449f2dbe5be6f0af99535a039598867a537ea8230189251909b9 SHA512 cc959dc9d243be499dbd5781c979305787659fbc95f72f5cb5e05dc042006cf05e670e8feb88322a1adf74f1c58cdf8883c11945a5baff26b0a7a2a4e8b08a8b WHIRLPOOL 68cc97298d8f98b5021e39954f45167eb2b32ff3bd32aa38733120574dafcf13884e452823ccec9d73f3244989433919395ba6d357f714635a1a6276bd8fa855 DIST teamviewer-8.0.20931.deb 19567090 SHA256 6ad27b106a125c51075597c526b7b84fa9637af1aef6ee0514faa49694bf70dd SHA512 991fb4e572b312289097062577c9dfd9189d8405902e6965b224b1ad7e883de2dca99aa18b4ae2e333ce1cab65eade0f86eddccc32ed045140a34037c1a129d0 WHIRLPOOL e7ec1544e13b6cdc161783e36589b1cf07bbe60dd32f811d29e8c7b266477840550a08382c3b4683fbf00a6433305c135714bb30fb260c202a1bb828f0da8d45 @@ -13,12 +14,12 @@ EBUILD teamviewer-7.0.9377.ebuild 3032 SHA256 49a71b9768241d59928d1307b640f46c56 EBUILD teamviewer-8.0.20931.ebuild 4048 SHA256 04ca630dd0c14de5699ad69f02286558f016a0329d0089531e6679d370551079 SHA512 b496af5a230defa2ab0415b2ad3c57455d97f895600d6f56da4a6072d754d0605bf2c858234ea9f0b60e169ddc938533bb4bfc769dd2b494d093f043658cce19 WHIRLPOOL 528bce42659086a617aa3303af48920c24a6bf636d40929e9349efc3b8a13d8ff31152c805359f133a1de854d0d439c9225f511f1c5c8a7bb18b0afe1f2630c4 EBUILD teamviewer-9.0.30203.ebuild 3534 SHA256 2669e112819b67da3609d5e8c661dda472cfd053184b438380e01b449102c254 SHA512 b517d79a821580fa2ea18f57ff5cdc3a5c2dc99dfe70039d4a6de88895de6aeb3067c85b67c83dc66a9eb1a382ca5a9466fd116f5cbd18732761e77d196e8468 WHIRLPOOL a711ff6ad87727c987fd93ba3a4c3c0b3e3ee792f245018ae00e57f6df090532dfa5efac5258096ced16f1e5ac1ec315cae0e6a63ab304bda08be4667223350f EBUILD teamviewer-9.0.32150.ebuild 3602 SHA256 8db11bca416534735e49fabc425333562e60a1a7b899d7eb73438f9b207d5355 SHA512 6e208658a27c4079556d2bc7e05551c3bbd6e7f5a56dafd21b995a9bfaf68d6af42dcdc02b2127b9a2367c342d8dc2a67fc261f733315e70fe072ff13795e825 WHIRLPOOL 3975c0f4e424ee8ab6c3a72fd2847a8276950329af282515f0932f3b913bb20314407b5f5840041a1b83750e85623dd4292a588bd2b68dab803304a433ecc27a -MISC ChangeLog 3181 SHA256 8763fa9647314dce0f1c9feeb54998b6083fd6066fc379695e3dbf6dbd5e131c SHA512 06c9dcae94a3c6e57edaad617bf5e2e1adef1bca76f69225088171bceb18370154a8674eff5fea507ad114b0133dd6c2bdfd052820f506e4e894b81b864b019c WHIRLPOOL c5d6d7a603d4a96061bf5d44292bc2d7b341b6b07c7a3e36f7385d46c29b40b791772b8c4a8c43ea5f45698e0ff5be98c65b2da7e36d9a363275cf2f7bfcc3da +MISC ChangeLog 3305 SHA256 4ff181c098f06e80f9f7ecf7696ca0a635387225ebce06de5fea54f788e6f90c SHA512 fd87b35159ccfa0905b15212180be7f3427c6aa922feb9d24821a2f9672df4b7057add0b91b22d4bbff711842e059ba52b0bf0d998af23d9ea75a8363ec606a7 WHIRLPOOL 1c3837a2b632b630cbb11200e79fb49837e49bcb8848e9ff3157a350380630b6e7563a2424e7072db1765ec19c9cc676a80536ff3eeb051641f2cd7cff31b6d6 MISC metadata.xml 444 SHA256 639cdfda43bf7e000721768a1ea21f4f28b465aae9fc0f4b4ff46c1b55f6538a SHA512 a3b75ae69a85bd9eadeb0b58564b39486cc3f27b2588b76ed54529b03d3bd049ddeca4bf1552ceb26b58285e99fbd7b850814007365bb1e70d0c6c59aa64fea5 WHIRLPOOL 64614b52256d2dfdb9a7b94b33aaff022ceb52631bce602467422d7971339e26c5aef255c2f057d8157f00b53351f3a4f96dabbc6967f904611bf9853634ebbb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRj6t8ACgkQ2ugaI38ACPA4BwD7BYq9ozExzbQZF+9UyeSSxn+V -tbxo26YZSKA8iZEiNRoA/jPGx31Br9sRhEvTnInYMh4JJGgmEVP8XSOFSXGSGgnc -=89D6 +iF4EAREIAAYFAlRj64IACgkQ2ugaI38ACPAf/gD/XigwaWxROZcKBkXFfEPAB6w3 +q41SzJnhwxZV7EcRJTEA/jubtmlKxiGOpxxs/Uji1DcM0cuafqiyu0lUVm+8jc/m +=po0l -----END PGP SIGNATURE----- diff --git a/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch b/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch new file mode 100644 index 000000000000..1df4632795bc --- /dev/null +++ b/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch @@ -0,0 +1,138 @@ +diff --git a/opt/teamviewer9/tv_bin/script/tvw_extra b/opt/teamviewer9/tv_bin/script/tvw_extra +index 71164aa..848cd25 100644 +--- a/opt/teamviewer9/tv_bin/script/tvw_extra ++++ b/opt/teamviewer9/tv_bin/script/tvw_extra +@@ -16,13 +16,6 @@ + isInstalledTV || return + ABecho "teamviewer --passwd [PASSWD]" "set a password (useful when installing remote (ssh)" + echo +- ABecho "teamviewer --daemon status" "show current status of the TeamViewer daemon" +- ABecho "teamviewer --daemon start" "start TeamViewer daemon" +- ABecho "teamviewer --daemon stop" "stop TeamViewer daemon" +- ABecho "teamviewer --daemon restart" "stop/start TeamViewer daemon" +- ABecho "teamviewer --daemon disable" "disable TeamViewer daemon - don't start daemon on system startup" +- ABecho "teamviewer --daemon enable" "enable TeamViewer daemon - start daemon on system startup (default)" +- echo + } + + function PrintVersion() +@@ -37,19 +30,6 @@ + PrintDaemonStatus + echo + PrintTeamViewerID +-} +- +-function PrintDaemonStatus() +-{ +- local cmd="$(daemonCtl 'status')" +- local txt="n/a" +- +- if [ isInstalledTV ] ; then +- txt="$(eval "$cmd")" +- [ $? = 0 ] || txt='n/a (error)' +- fi +- +- ABecho "teamviewerd status" "$txt" + } + + function PrintTeamViewerID() +@@ -64,20 +44,21 @@ + ABecho "TeamViewer ID:" "$tvid" + + if [ -z "$tvid" ] && isInstalledTV; then +- echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)" ++ echo "Try restarting the TeamViewer daemon." + fi + } + + function SetPasswd() + { ++ echo "Stop your teamviewer daemon first, then press enter." ++ read ++ + local pwd="$1" + [ -n "$pwd" ] || die 'no password specified' + + installedTVorDie + isSuperUser || die 'You need root permissions for this operation' + +- Run_Daemon 'stop' > /dev/null +- + "$TV_BIN_DIR/teamviewerd" --passwd "$pwd" + case $? in + 0 ) echo 'ok' ;; +@@ -88,12 +69,14 @@ + * ) echo 'unknown response' ;; + esac + +- Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon' +- echo ++ echo "You may start your teamviewer daemon again." + } + + function ExportLicense() + { ++ echo "Stop your teamviewer daemon first, then press enter." ++ read ++ + local license="$1" + local path='/tmp/tv_global.conf' + +@@ -101,8 +84,6 @@ + + isSuperUser || die 'You need root permissions for this operation' + +- Run_Daemon 'stop' > /dev/null +- + "$TV_BIN_DIR/teamviewerd" --export-license "$license" "$path" + case $? in + 0 ) echo "ok - license exported to '$path'" ;; +@@ -110,8 +91,7 @@ + * ) echo 'unknown response' ;; + esac + +- Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon' +- echo ++ echo "You may start your teamviewer daemon again." + } + + function StripPersonalInformation() +diff --git a/opt/teamviewer9/tv_bin/script/tvw_main b/opt/teamviewer9/tv_bin/script/tvw_main +index 8984db0..c6dff8d 100644 +--- a/opt/teamviewer9/tv_bin/script/tvw_main ++++ b/opt/teamviewer9/tv_bin/script/tvw_main +@@ -4,7 +4,6 @@ + source "$TV_SCRIPT_DIR/tvw_config" + source "$TV_SCRIPT_DIR/tvw_exec" + source "$TV_SCRIPT_DIR/tvw_extra" +-source "$TV_SCRIPT_DIR/tvw_daemon" + source "$TV_SCRIPT_DIR/tvw_profile" + + function Main() +@@ -18,7 +17,6 @@ + --help ) PrintHelp ;; + --version ) PrintVersion ;; + --info ) PrintInfo ;; +- --daemon ) Run_Daemon $opt ;; + --winecfg ) shift; Run_WineCfg "$@" ;; + --regedit ) shift; Run_RegEdit "$@" ;; + --kill ) Run_KillTeamViewer ;; +@@ -170,18 +168,3 @@ + Init + wine regedit "$@" + } +- +-function Run_Daemon() +-{ +- local opt="$1" +- +- installedTVorDie +- +- case "$opt" in +- ( disable ) removeDaemon || rootSuggest ;; +- ( enable ) installDaemon || rootSuggest ;; +- ( start | stop | restart ) cmdDaemon $opt || rootSuggest ;; +- ( status ) cmdDaemon $opt ;; +- ( * ) echo "unknown option '$opt'" ;; +- esac +-} -- 2.26.2