Hello community, here is the log from the commit of package tightvnc for openSUSE:Factory checked in at 2013-07-25 14:49:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tightvnc (Old) and /work/SRC/openSUSE:Factory/.tightvnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tightvnc" Changes: -------- --- /work/SRC/openSUSE:Factory/tightvnc/tightvnc.changes 2013-04-05 17:14:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tightvnc.new/tightvnc.changes 2013-07-25 14:49:34.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 23 13:26:29 UTC 2013 - [email protected] + +- Remove xinetd service for VNC. (Moved to xorg-x11-Xvnc.) + (bnc#800959) + +------------------------------------------------------------------- Old: ---- vnc.xinetd New: ---- vnchttpd.xinetd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tightvnc.spec ++++++ --- /var/tmp/diff_new_pack.UAZ2CM/_old 2013-07-25 14:49:35.000000000 +0200 +++ /var/tmp/diff_new_pack.UAZ2CM/_new 2013-07-25 14:49:35.000000000 +0200 @@ -33,7 +33,7 @@ Release: 0 Source0: http://www.tightvnc.com/download/%{version}/%{name}-%{version}_unixsrc.tar.bz2 Source1: vnc_inetd_httpd -Source2: vnc.xinetd +Source2: vnchttpd.xinetd Source3: vnc.reg Source4: tightvnc-firewall-vnc Source5: tightvnc-firewall-http @@ -93,7 +93,7 @@ mkdir -m755 -p $RPM_BUILD_ROOT/etc install -m644 tightvncserver.conf $RPM_BUILD_ROOT/etc/ mkdir -m755 -p $RPM_BUILD_ROOT/etc/xinetd.d/ -cp %{SOURCE2} $RPM_BUILD_ROOT/etc/xinetd.d/vnc +cp %{SOURCE2} $RPM_BUILD_ROOT/etc/xinetd.d/vnchttpd install -m755 -c %{SOURCE1} $RPM_BUILD_ROOT/usr/bin/ mkdir -m755 -p $RPM_BUILD_ROOT/etc/slp.reg.d/ install -m644 -c %{SOURCE3} $RPM_BUILD_ROOT/etc/slp.reg.d/ @@ -103,28 +103,6 @@ # we don't ship Xvnc rm $RPM_BUILD_ROOT%_mandir/man1/Xvnc* -%post -if [ -f /etc/xinetd.d/vnc.rpmnew -a -f /etc/xinetd.d/vnc ]; then - awk ' -$1 == "server" { - sub(/\/usr\/X11R6/,"/usr", $0) -} -$1 == "server_args" && /:42/ { - sub(/:42/,"", $0); -} -$1 == "server_args" && / -noreset/ { - sub(/ -noreset/,"", $0); -} -$1 == "server_args" && /=/ { - sub(/=/,"= -noreset", $0); -} -{ - print -} - ' < /etc/xinetd.d/vnc > /etc/xinetd.d/vnc.new.$$ - /bin/mv -b /etc/xinetd.d/vnc.new.$$ /etc/xinetd.d/vnc -fi - %files %defattr(-,root,root) %doc README LICENCE.TXT ChangeLog WhatsNew @@ -132,7 +110,7 @@ /usr/share/vnc /usr/bin/* %config(noreplace) /etc/tightvncserver.conf -%config(noreplace) /etc/xinetd.d/vnc +%config(noreplace) /etc/xinetd.d/vnchttpd %dir /etc/slp.reg.d %config(noreplace) /etc/slp.reg.d/* %config(noreplace) /etc/sysconfig/SuSEfirewall2.d/services/* ++++++ vnchttpd.xinetd ++++++ # default: off # description: This serves out the vncviewer Java applet for the VNC \ # server running on port 5901, (vnc port 1). service vnchttpd1 { type = UNLISTED port = 5801 socket_type = stream protocol = tcp wait = no user = nobody server = /usr/bin/vnc_inetd_httpd server_args = 1024 768 5901 disable = yes } # default: off # description: This serves out the vncviewer Java applet for the VNC \ # server running on port 5902, (vnc port 2). service vnchttpd2 { type = UNLISTED port = 5802 socket_type = stream protocol = tcp wait = no user = nobody server = /usr/bin/vnc_inetd_httpd server_args = 1280 1024 5902 disable = yes } # default: off # description: This serves out the vncviewer Java applet for the VNC \ # server running on port 5902, (vnc port 3). service vnchttpd3 { type = UNLISTED port = 5803 socket_type = stream protocol = tcp wait = no user = nobody server = /usr/bin/vnc_inetd_httpd server_args = 1600 1200 5903 disable = yes } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
