summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2007-04-12 21:00:48 +0000
committerRaúl Porcel <armin76@gentoo.org>2007-04-12 21:00:48 +0000
commit0231237d7dd01bbf1a3983a301f8e064e0c04012 (patch)
tree1282bfd6f931f82da3bbabaa390820307164002e /net-misc/tightvnc
parentStable for HPPA (bug #174216). (diff)
downloadhistorical-0231237d7dd01bbf1a3983a301f8e064e0c04012.tar.gz
historical-0231237d7dd01bbf1a3983a301f8e064e0c04012.tar.bz2
historical-0231237d7dd01bbf1a3983a301f8e064e0c04012.zip
Add init scripts, bug 39023 and remove vulnerable version
Package-Manager: portage-2.1.2.3
Diffstat (limited to 'net-misc/tightvnc')
-rw-r--r--net-misc/tightvnc/ChangeLog7
-rw-r--r--net-misc/tightvnc/Manifest39
-rw-r--r--net-misc/tightvnc/files/digest-tightvnc-1.3.83
-rw-r--r--net-misc/tightvnc/files/tightvnc.confd9
-rw-r--r--net-misc/tightvnc/files/tightvnc.initd57
-rw-r--r--net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild7
-rw-r--r--net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild7
-rw-r--r--net-misc/tightvnc/tightvnc-1.3.8.ebuild107
8 files changed, 102 insertions, 134 deletions
diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index cf0cce6c489c..8250a9b1b6f4 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/tightvnc
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.94 2007/04/12 20:34:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.95 2007/04/12 21:00:48 armin76 Exp $
+
+ 12 Apr 2007; Raúl Porcel <armin76@gentoo.org> +files/tightvnc.confd,
+ +files/tightvnc.initd, tightvnc-1.2.9-r4.ebuild, -tightvnc-1.3.8.ebuild,
+ tightvnc-1.3.8-r1.ebuild:
+ Add init scripts, bug 39023 and remove vulnerable version
12 Apr 2007; Jeroen Roovers <jer@gentoo.org> tightvnc-1.3.8-r1.ebuild:
Stable for HPPA (bug #174200).
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index ff4a60a05308..8627767cdb5e 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -54,6 +54,14 @@ AUX tightvnc-ppcsparc-server.patch 785 RMD160 7544ad7b3339ad3da2bc5da7a2f43bfe52
MD5 edad6a34c89561a1a11e68781bc9fcfd files/tightvnc-ppcsparc-server.patch 785
RMD160 7544ad7b3339ad3da2bc5da7a2f43bfe52c2d9b0 files/tightvnc-ppcsparc-server.patch 785
SHA256 2b095cb4446b77fbf3d1dcb6e40d7cc9658dfd0ec46f4b217b4029dc6d776eeb files/tightvnc-ppcsparc-server.patch 785
+AUX tightvnc.confd 341 RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d SHA1 4b7f5f708cb92f5fc82508141422003ab05c1452 SHA256 3463105ab7f4aec95b9a72bcfcb9808b3acdcad0c1e5b608f1408faa79f3d4a0
+MD5 7319b537e42c0e12033ac679063161cc files/tightvnc.confd 341
+RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d files/tightvnc.confd 341
+SHA256 3463105ab7f4aec95b9a72bcfcb9808b3acdcad0c1e5b608f1408faa79f3d4a0 files/tightvnc.confd 341
+AUX tightvnc.initd 1564 RMD160 d07cff262d301ac9420dd9deb03b9a690ba08e47 SHA1 4da9e387d6b490d40c2f630d1ac8b99e013431a2 SHA256 0eb23645bce70757879c1bd08b423f53c94d4f2692239336b09105c402442a67
+MD5 37310d5a7d6258787394165ae260d166 files/tightvnc.initd 1564
+RMD160 d07cff262d301ac9420dd9deb03b9a690ba08e47 files/tightvnc.initd 1564
+SHA256 0eb23645bce70757879c1bd08b423f53c94d4f2692239336b09105c402442a67 files/tightvnc.initd 1564
AUX vncviewer.png 495 RMD160 0378b8e33783ea6599e304de8279e0e4a9478ae7 SHA1 c835d70475bde75e93818676b2b43cb8d7f07081 SHA256 dfe4eaf3f68a4905b3ab90e7cae528449c7d13a4f712f97d8855058ed9cc3fc4
MD5 13fdea0a38fc64d5c1f529dbadcfb8d8 files/vncviewer.png 495
RMD160 0378b8e33783ea6599e304de8279e0e4a9478ae7 files/vncviewer.png 495
@@ -68,22 +76,18 @@ EBUILD tightvnc-1.2.9-r3.ebuild 2872 RMD160 ebac825b740010b85b1faf3b61d4f131c0e9
MD5 cd1f16c55e6f5b44ac0c35290f7b616c tightvnc-1.2.9-r3.ebuild 2872
RMD160 ebac825b740010b85b1faf3b61d4f131c0e9c35e tightvnc-1.2.9-r3.ebuild 2872
SHA256 744bf69b2c424b539ef1377da1469984ae5e21b1a0395725885bacaa9f1312ac tightvnc-1.2.9-r3.ebuild 2872
-EBUILD tightvnc-1.2.9-r4.ebuild 2975 RMD160 fc8508e01ef676f516ab4d7768fce9a1c5ecfc43 SHA1 16f91b1dc545fbf906dbb832939a040b83af7237 SHA256 65883eb2025a27193aa913c6c268c90b37dab1b6f05566163a62b888e440beab
-MD5 a3e06ecf5f97d73a6b3f18aea7f4e1e4 tightvnc-1.2.9-r4.ebuild 2975
-RMD160 fc8508e01ef676f516ab4d7768fce9a1c5ecfc43 tightvnc-1.2.9-r4.ebuild 2975
-SHA256 65883eb2025a27193aa913c6c268c90b37dab1b6f05566163a62b888e440beab tightvnc-1.2.9-r4.ebuild 2975
-EBUILD tightvnc-1.3.8-r1.ebuild 2913 RMD160 111deb80f18997c788f98eef8d7e4b8775abda8e SHA1 a0633c0d163ae8a21125fb275303e2767f3bbf24 SHA256 5396daab251fd07ec875a50c43289405fd1e5ffb053c254e0940cf914c80cff8
-MD5 b0282987bfad9a5375f01f2a1e0ccf47 tightvnc-1.3.8-r1.ebuild 2913
-RMD160 111deb80f18997c788f98eef8d7e4b8775abda8e tightvnc-1.3.8-r1.ebuild 2913
-SHA256 5396daab251fd07ec875a50c43289405fd1e5ffb053c254e0940cf914c80cff8 tightvnc-1.3.8-r1.ebuild 2913
-EBUILD tightvnc-1.3.8.ebuild 2810 RMD160 c45331235e43bd9f9424f283146985ec9209a644 SHA1 dc53fb825df98c66336d8a9b45d0d416a2004184 SHA256 5010decbe93a40bcf531ec486fe8cc244c981063a1fab7f2773d3cd044206d52
-MD5 e2f917cc9b2ce75c79c2b793b722d140 tightvnc-1.3.8.ebuild 2810
-RMD160 c45331235e43bd9f9424f283146985ec9209a644 tightvnc-1.3.8.ebuild 2810
-SHA256 5010decbe93a40bcf531ec486fe8cc244c981063a1fab7f2773d3cd044206d52 tightvnc-1.3.8.ebuild 2810
-MISC ChangeLog 14387 RMD160 d55d804a60d28cdc20cbb54c58739ce1e37a5c62 SHA1 71c82d4e4f8d29fcd642af42c293cdc3ca6f25dd SHA256 2fc426d7cb98d435aae84b6b02ecd80057379110f4a84ab90e53121fea40d93a
-MD5 ea468768d38d7c54c9f33de897805561 ChangeLog 14387
-RMD160 d55d804a60d28cdc20cbb54c58739ce1e37a5c62 ChangeLog 14387
-SHA256 2fc426d7cb98d435aae84b6b02ecd80057379110f4a84ab90e53121fea40d93a ChangeLog 14387
+EBUILD tightvnc-1.2.9-r4.ebuild 3070 RMD160 358b6bee35d98088e94ce928d52e634e3842092e SHA1 afed9ef1876104f0a492fbaf81fa0d19c3312b2e SHA256 3a0a7a176e5d82165c2d6a7a855d7bc8d716ad1239608089bb842478511b4aa7
+MD5 76f50c46e09663b0866146bdacd8dc21 tightvnc-1.2.9-r4.ebuild 3070
+RMD160 358b6bee35d98088e94ce928d52e634e3842092e tightvnc-1.2.9-r4.ebuild 3070
+SHA256 3a0a7a176e5d82165c2d6a7a855d7bc8d716ad1239608089bb842478511b4aa7 tightvnc-1.2.9-r4.ebuild 3070
+EBUILD tightvnc-1.3.8-r1.ebuild 3009 RMD160 f0e079f400f601805984816cefad22e7222436ab SHA1 0e7795325f72ea736bd88cbc289fbb9f2d14d4a2 SHA256 ae0ddb8b6485b581e1ba0b9ff6540c9d50a939c2b9591a521fc0cb7c1ed5bb36
+MD5 c09c2ad55cb8c977a8143e29d82c2ac2 tightvnc-1.3.8-r1.ebuild 3009
+RMD160 f0e079f400f601805984816cefad22e7222436ab tightvnc-1.3.8-r1.ebuild 3009
+SHA256 ae0ddb8b6485b581e1ba0b9ff6540c9d50a939c2b9591a521fc0cb7c1ed5bb36 tightvnc-1.3.8-r1.ebuild 3009
+MISC ChangeLog 14627 RMD160 67cee8214b80a39a87e153ccc988f727dad39ece SHA1 afd026e99755817e3a8f40ccdc45baaa925d4d99 SHA256 2ec5fb3c646af74d19a979c21fbb505993c033724b8673f7564d59f80ce472eb
+MD5 b46f9482298f40c4b9201f8b375b7036 ChangeLog 14627
+RMD160 67cee8214b80a39a87e153ccc988f727dad39ece ChangeLog 14627
+SHA256 2ec5fb3c646af74d19a979c21fbb505993c033724b8673f7564d59f80ce472eb ChangeLog 14627
MISC metadata.xml 223 RMD160 f88bcdebf752bcc3933b4159df5d8f9f7d487ca1 SHA1 4a17e70b26b3bba2ec6eddb403ff890bb8bcf13f SHA256 98c023870e5fbbcc4f050a192947b7b6bbd239041c9f921b3fbf64b03523019f
MD5 038a74c1f0dc742c6df70730348c240a metadata.xml 223
RMD160 f88bcdebf752bcc3933b4159df5d8f9f7d487ca1 metadata.xml 223
@@ -94,9 +98,6 @@ SHA256 c7b13ad35c4b2e2bde6a2fcb01b6ad276384a265613a35ee739c2a3f0c2e3ea3 files/di
MD5 31a483eed14190f8cd911b0d05521431 files/digest-tightvnc-1.2.9-r4 274
RMD160 c998a7ff40fb44c186f7089d877a68b8e33a4a06 files/digest-tightvnc-1.2.9-r4 274
SHA256 c7b13ad35c4b2e2bde6a2fcb01b6ad276384a265613a35ee739c2a3f0c2e3ea3 files/digest-tightvnc-1.2.9-r4 274
-MD5 bfe15238bfcba463b0abf4e830dbc177 files/digest-tightvnc-1.3.8 274
-RMD160 da00418fe1031595ec6a5943151b71ac60c5e8cf files/digest-tightvnc-1.3.8 274
-SHA256 b5684a8c3ea14d9490e9fe673bb74100da2bd98b86c58dc2332857f4f2885193 files/digest-tightvnc-1.3.8 274
MD5 bfe15238bfcba463b0abf4e830dbc177 files/digest-tightvnc-1.3.8-r1 274
RMD160 da00418fe1031595ec6a5943151b71ac60c5e8cf files/digest-tightvnc-1.3.8-r1 274
SHA256 b5684a8c3ea14d9490e9fe673bb74100da2bd98b86c58dc2332857f4f2885193 files/digest-tightvnc-1.3.8-r1 274
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.3.8 b/net-misc/tightvnc/files/digest-tightvnc-1.3.8
deleted file mode 100644
index bc139c537f55..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9b9b0465834289d1b7899982c0096440 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
-RMD160 98013a7074c488d1cfc85ea2d7a9665a05ee2431 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
-SHA256 cd76e1c5c6843fec2a7a5c493158cdb3642eb1ef4caecee7a89bfd2078881178 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
diff --git a/net-misc/tightvnc/files/tightvnc.confd b/net-misc/tightvnc/files/tightvnc.confd
new file mode 100644
index 000000000000..757f4b989f80
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc.confd
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/vnc
+
+# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display".
+# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space.
+# DISPLAYS="myuser:1"
+
+# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information.
+# VNC_OPTS=""
+
diff --git a/net-misc/tightvnc/files/tightvnc.initd b/net-misc/tightvnc/files/tightvnc.initd
new file mode 100644
index 000000000000..29adfa8e3633
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc.initd
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/files/tightvnc.initd,v 1.1 2007/04/12 21:00:48 armin76 Exp $
+
+depend() {
+ need net
+}
+
+checkconfig() {
+ if [ -n "${DISPLAYS}" ]; then
+ if [ $1 = "start" ]; then
+ local user
+ for user in $DISPLAYS; do
+ if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then
+ eerror "There are no passwords defined for user ${user%%:*}."
+ return 1
+ elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
+ eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}"
+ eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
+ return 1
+ elif [ -e "/tmp/.X${user##*:}-lock" ]; then
+ eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock"
+ eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
+ return 1
+ fi
+ done
+ fi
+ return 0
+ else
+ eerror 'Please define $DISPLAYS in /etc/conf.d/vnc'
+ return 1
+ fi
+}
+
+start() {
+ checkconfig start || return 1
+ ebegin "Starting TightVNC server"
+ for user in $DISPLAYS; do
+ su ${user%%:*} -c "cd /home/${user%%:*} && vncserver :${user##*:} $VNC_OPTS" &>/dev/null
+ done
+ eend $?
+}
+
+stop() {
+ checkconfig stop || return 2
+ ebegin "Stopping TightVNC server"
+ for user in $DISPLAYS; do
+ su ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null
+ done
+ eend $?
+}
+
+restart() {
+ svc_stop
+ svc_start
+}
diff --git a/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild
index 65caafec63c3..21179198d73c 100644
--- a/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild,v 1.4 2007/04/12 06:39:21 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild,v 1.5 2007/04/12 21:00:48 armin76 Exp $
inherit eutils toolchain-funcs
@@ -97,7 +97,10 @@ src_install() {
dodir /usr/share/man/man1 /usr/bin
./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
- if ! use server; then
+ if use server; then
+ newconfd "${FILESDIR}"/tightvnc.confd vnc
+ newinitd "${FILESDIR}"/tightvnc.initd vnc
+ else
rm -f ${D}/usr/bin/vncserver
rm -f ${D}/usr/share/man/man1/{Xvnc,vncserver}*
fi
diff --git a/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild b/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild
index 531e3d30939f..a9ecff620604 100644
--- a/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild,v 1.2 2007/04/12 20:34:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild,v 1.3 2007/04/12 21:00:48 armin76 Exp $
inherit eutils toolchain-funcs
@@ -96,7 +96,10 @@ src_install() {
dodir /usr/share/man/man1 /usr/bin
./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
- if ! use server; then
+ if use server; then
+ newconfd "${FILESDIR}"/tightvnc.confd vnc
+ newinitd "${FILESDIR}"/tightvnc.initd vnc
+ else
rm -f ${D}/usr/bin/vncserver
rm -f ${D}/usr/share/man/man1/{Xvnc,vncserver}*
fi
diff --git a/net-misc/tightvnc/tightvnc-1.3.8.ebuild b/net-misc/tightvnc/tightvnc-1.3.8.ebuild
deleted file mode 100644
index afbc31804702..000000000000
--- a/net-misc/tightvnc/tightvnc-1.3.8.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.8.ebuild,v 1.5 2007/02/26 12:39:36 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-IUSE="java tcpd server"
-
-S="${WORKDIR}/vnc_unixsrc"
-DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
-SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
-HOMEPAGE="http://www.tightvnc.com/"
-
-KEYWORDS="~alpha ~amd64 hppa ~mips ~ppc ~ppc-macos ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt
- x11-proto/xextproto
- x11-proto/xproto
- server? (
- x11-proto/inputproto
- x11-proto/kbproto
- x11-proto/printproto
- )
- >=x11-misc/imake-1
- x11-misc/gccmakedep
- ~media-libs/jpeg-6b
- tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
- !net-misc/vnc"
-
-RDEPEND="${DEPEND}
- server? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc
- x11-apps/rgb
- x11-apps/xauth
- x11-apps/xsetroot
- )
- java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
-
-src_unpack() {
-
- if ! use server;
- then
- echo
- einfo "The 'server' USE flag will build tightvnc's server."
- einfo "If '-server' is chosen only the client is built to save space."
- einfo "Stop the build now if you need to add 'server' to USE flags.\n"
- ebeep
- epause 5
- fi
-
- unpack ${A} && cd ${S}
- epatch "${FILESDIR}/${P}-pathfixes.patch" # fixes bug 78385 and 146099
- epatch "${FILESDIR}/${P}-imake-tmpdir.patch" # fixes bug 23483
- epatch "${FILESDIR}/${P}-darwin.patch" # fixes bug 89908
- use amd64 && epatch "${FILESDIR}/${P}-amd64.patch" # fixes bug 82583
- use mips && epatch "${FILESDIR}/${P}-mips.patch"
-}
-
-src_compile() {
- xmkmf -a || die "xmkmf failed"
-
- make CDEBUGFLAGS="${CFLAGS}" World || die
-
- if use server; then
- cd Xvnc && ./configure || die "Configure failed."
- if use tcpd; then
- local myextra="-lwrap"
- use userland_Darwin || myextra="${myextra} -lnss_nis"
- make EXTRA_LIBRARIES="${myextra}" \
- CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
- else
- make CDEBUGFLAGS="${CFLAGS}" || die
- fi
- fi
-
-}
-
-src_install() {
- # the web based interface and the java viewer need the java class files
- if use java; then
- insinto /usr/share/tightvnc/classes
- doins classes/*
- fi
-
- dodir /usr/share/man/man1 /usr/bin
- ./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
-
- if ! use server; then
- rm -f ${D}/usr/bin/vncserver
- rm -f ${D}/usr/share/man/man1/{Xvnc,vncserver}*
- fi
-
- doicon ${FILESDIR}/vncviewer.png
- make_desktop_entry vncviewer vncviewer vncviewer.png Network
-
- dodoc ChangeLog README WhatsNew
- use java && dodoc ${FILESDIR}/README.JavaViewer
- newdoc vncviewer/README README.vncviewer
-}