Hello community, here is the log from the commit of package rfbplaymacro checked in at Sun May 11 17:48:17 CEST 2008. -------- --- rfbplaymacro/rfbplaymacro.changes 2006-01-25 21:41:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/rfbplaymacro/rfbplaymacro.changes 2008-05-09 19:24:09.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 09 17:05:57 CEST 2008 - mfabian@suse.de + +- bnc#388222: update to 0.2.2 + • src/rfbplaymacro.c (connect_to_server): Use protocol 3.3. + • src/rfbplaymacro.c: Made more tolerant of bad input files, and + of servers requesting passwords when none has been specified. + • test.rfm: New file, created by Ralf Mueller. + • README: Updated. + • src/rfbplaymacro.c (main): Accept 'password' in the input file. + Spotted by Ralf Mueller. + +------------------------------------------------------------------- Old: ---- rfbplaymacro-0.2.0.tar.bz2 New: ---- rfbplaymacro-0.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfbplaymacro.spec ++++++ --- /var/tmp/diff_new_pack.g30760/_old 2008-05-11 17:21:34.000000000 +0200 +++ /var/tmp/diff_new_pack.g30760/_new 2008-05-11 17:21:34.000000000 +0200 @@ -1,26 +1,26 @@ # -# spec file for package rfbplaymacro (Version 0.2.0) +# spec file for package rfbplaymacro (Version 0.2.2) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-devel pam-modules patch permissions popt ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils cracklib gcc gdbm gettext libtool perl rpm + Name: rfbplaymacro -URL: http://cyberelk.net/tim/rfbplaymacro/ -License: GPL +Url: http://cyberelk.net/tim/rfbplaymacro/ +License: GPL v2 or later Group: System/X11/Utilities #Requires: xforms -Autoreqprov: on -Version: 0.2.0 -Release: 188 -Summary: replays VNC macros -Source: %name-%version.tar.bz2 +AutoReqProv: on +Version: 0.2.2 +Release: 1 +Summary: Replays VNC macros +Source: http://cyberelk.net/tim/data/rfbplaymacro/stable/%name-%version.tar.bz2 #Patch: %name-%version.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +42,6 @@ make %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean @@ -50,17 +49,26 @@ %files %defattr(-,root,root) -%doc ChangeLog NEWS README AUTHORS COPYING +%doc ChangeLog NEWS README AUTHORS COPYING test.rfm /usr/bin/rfbplaymacro -%changelog -n rfbplaymacro -* Wed Jan 25 2006 - mls@suse.de +%changelog +* Fri May 09 2008 mfabian@suse.de +- bnc#388222: update to 0.2.2 + • src/rfbplaymacro.c (connect_to_server): Use protocol 3.3. + • src/rfbplaymacro.c: Made more tolerant of bad input files, and + of servers requesting passwords when none has been specified. + • test.rfm: New file, created by Ralf Mueller. + • README: Updated. + • src/rfbplaymacro.c (main): Accept 'password' in the input file. + Spotted by Ralf Mueller. +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - add %%defattr -* Mon Jun 16 2003 - coolo@suse.de +* Mon Jun 16 2003 coolo@suse.de - use BuildRoot -* Tue Jul 09 2002 - uli@suse.de +* Tue Jul 09 2002 uli@suse.de - update -> 0.2.0 (VNC authentication support) -* Wed Apr 17 2002 - uli@suse.de +* Wed Apr 17 2002 uli@suse.de - initial package ++++++ rfbplaymacro-0.2.0.tar.bz2 -> rfbplaymacro-0.2.2.tar.bz2 ++++++ ++++ 3640 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rfbplaymacro-0.2.0/ChangeLog new/rfbplaymacro-0.2.2/ChangeLog --- old/rfbplaymacro-0.2.0/ChangeLog 2002-07-08 15:48:46.000000000 +0200 +++ new/rfbplaymacro-0.2.2/ChangeLog 2003-08-11 15:58:00.000000000 +0200 @@ -1,3 +1,29 @@ +2003-08-11 Tim Waugh <twaugh@redhat.com> + + * configure.in: Version 0.2.2 (stable). + +2003-08-11 Tim Waugh <twaugh@redhat.com> + + * src/rfbplaymacro.c (connect_to_server): Use protocol 3.3. + +2003-05-23 Tim Waugh <twaugh@redhat.com> + + * configure.in: Version 0.2.1 (stable). + +2003-05-23 Tim Waugh <twaugh@redhat.com> + + * Makefile.am: Add tag rule. + + * src/rfbplaymacro.c: Made more tolerant of bad input files, and of + servers requesting passwords when none has been specified. + + * test.rfm: New file, created by Ralf Mueller. + * Makefile.am: Ship it. + * README: Updated. + + * src/rfbplaymacro.c (main): Accept 'password' in the input file. + Spotted by Ralf Mueller. + 2002-07-07 Tim Waugh <twaugh@redhat.com> * configure.in: Version 0.2.0 (stable). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rfbplaymacro-0.2.0/configure.in new/rfbplaymacro-0.2.2/configure.in --- old/rfbplaymacro-0.2.0/configure.in 2002-07-07 14:28:49.000000000 +0200 +++ new/rfbplaymacro-0.2.2/configure.in 2003-08-11 15:57:48.000000000 +0200 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(rfbplaymacro, 0.2.0) +AC_INIT(rfbplaymacro, 0.2.2) AC_CONFIG_SRCDIR(ChangeLog) AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6]) AC_PREREQ(2.53) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rfbplaymacro-0.2.0/Makefile.am new/rfbplaymacro-0.2.2/Makefile.am --- old/rfbplaymacro-0.2.0/Makefile.am 2002-07-07 14:28:49.000000000 +0200 +++ new/rfbplaymacro-0.2.2/Makefile.am 2003-05-23 19:34:12.000000000 +0200 @@ -2,4 +2,7 @@ INCLUDES = -I$(top_srcdir)/include bin_PROGRAMS = src/rfbplaymacro src_rfbplaymacro_SOURCES = src/rfbplaymacro.c src/d3des.c src/d3des.h -EXTRA_DIST = rfbplaymacro.spec +EXTRA_DIST = rfbplaymacro.spec test.rfm + +tag: + cvs tag -c `echo V@VERSION@ | tr . _` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rfbplaymacro-0.2.0/NEWS new/rfbplaymacro-0.2.2/NEWS --- old/rfbplaymacro-0.2.0/NEWS 2002-07-07 14:16:04.000000000 +0200 +++ new/rfbplaymacro-0.2.2/NEWS 2003-08-11 15:56:48.000000000 +0200 @@ -1,6 +1,14 @@ Rfbplaymacro news ----------------- +0.2.2 (stable) + + ProtocolVersion fix. + +0.2.1 (stable) + + Specifying a password in the script file now works properly. + 0.2.0 (stable) VNC authentication support was added. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rfbplaymacro-0.2.0/README new/rfbplaymacro-0.2.2/README --- old/rfbplaymacro-0.2.0/README 2002-07-07 14:12:12.000000000 +0200 +++ new/rfbplaymacro-0.2.2/README 2003-05-27 13:26:19.000000000 +0200 @@ -1 +1,23 @@ This is rfbplaymacro, a remote control utility for VNC. + +An example macro file "test.rfm" exists. +To use it, you should + + chown yourname test.rfm + chmod 600 test.rfm + +it, so no one else can read it. + +Now you can safely insert your VNC password after "password" in the file. + +Run a VNC Client on your desktop, so you can watch what the script will do. + +Run (on the local machine, of course) + + rfbplaymacro --server=myhost:1 < test.rfm + +The macro simply opens an xclock and kills it after 10 seconds using xkill. + +The script implies that your VNC server has been started with the +-alwaysshared option, and that your VNC desktop starts with an xterm in the +upper left corner of your screen. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rfbplaymacro-0.2.0/rfbplaymacro.spec new/rfbplaymacro-0.2.2/rfbplaymacro.spec --- old/rfbplaymacro-0.2.0/rfbplaymacro.spec 2002-07-08 15:50:07.000000000 +0200 +++ new/rfbplaymacro-0.2.2/rfbplaymacro.spec 2003-08-11 15:59:39.000000000 +0200 @@ -1,6 +1,6 @@ Summary: A remote control tool for VNC. Name: rfbplaymacro -Version: 0.2.0 +Version: 0.2.2 Release: 0.1 License: GPL Group: Applications/System diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rfbplaymacro-0.2.0/src/rfbplaymacro.c new/rfbplaymacro-0.2.2/src/rfbplaymacro.c --- old/rfbplaymacro-0.2.0/src/rfbplaymacro.c 2002-07-07 14:10:27.000000000 +0200 +++ new/rfbplaymacro-0.2.2/src/rfbplaymacro.c 2003-08-11 15:55:08.000000000 +0200 @@ -1,6 +1,6 @@ /* * rfbplaymacro - scriptable control of a VNC session - * Copyright (C) 2000, 2001 Tim Waugh <twaugh@redhat.com> + * Copyright (C) 2000, 2001, 2002, 2003 Tim Waugh <twaugh@redhat.com> * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -693,7 +693,7 @@ } /* ProtocolVersion from client */ - write_exact (s, buf, 12); + write_exact (s, "RFB 003.003\n", 12); if (read_exact (s, &bit32, 4) < 4) { fprintf (stderr, "Couldn't read Authentication\n"); @@ -709,6 +709,12 @@ } if (bit32 == 2) { + if (!password) { + fprintf (stderr, "Need a password!\n"); + close (s); + return -1; + } + /* Let's try to authenticate */ if (read_exact (s, buf, CHALLENGESIZE) < CHALLENGESIZE) { fprintf (stderr, "Couldn't read DES Challenge\n"); @@ -804,6 +810,7 @@ int main (int argc, char *argv[]) { const char *display = ":1"; + int connected = 0; struct timeval defaultdelay; struct timeval delay; char packet[20]; @@ -867,6 +874,8 @@ socket = connect_to_server (display, shared, password); if (socket < 0) break; + + connected = 1; } do_delay = 0; @@ -886,7 +895,14 @@ defaultdelay = line.u.default_delay.tv; break; + case Password: + password = line.u.password.password; + break; + case Key: + if (!connected) + goto not_connected; + packet[0] = '\4'; packet[1] = !line.u.key.up; packet[2] = packet[3] = '\0'; @@ -901,6 +917,9 @@ break; case Press: + if (!connected) + goto not_connected; + packet[0] = '\4'; packet[1] = '\1'; packet[2] = packet[3] = '\0'; @@ -919,6 +938,9 @@ case Type: { unsigned char *p = line.u.type.string; + if (!connected) + goto not_connected; + packet[0] = '\4'; packet[2] = packet[3] = '\0'; while (*p) { @@ -940,6 +962,9 @@ } case Pointer: + if (!connected) + goto not_connected; + if (line.u.pointer.delta) { x += line.u.pointer.x; y += line.u.pointer.y; @@ -960,6 +985,9 @@ break; case Button: + if (!connected) + goto not_connected; + if (line.u.button.number > 7) { fprintf (stderr, "Button %d ignored\n", line.u.button.number); @@ -979,6 +1007,12 @@ break; case Click: + if (!connected) { + not_connected: + fprintf (stderr, "Not connected yet!\n"); + break; + } + if (line.u.button.number > 7) { fprintf (stderr, "Button %d ignored\n", line.u.button.number); @@ -997,10 +1031,6 @@ delay = defaultdelay; break; - case Password: - fprintf (stderr, "password in input file not " - "implemented, use command line for now\n"); - break; case Cut: default: fprintf (stderr, "(not implemented)\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rfbplaymacro-0.2.0/test.rfm new/rfbplaymacro-0.2.2/test.rfm --- old/rfbplaymacro-0.2.0/test.rfm 1970-01-01 01:00:00.000000000 +0100 +++ new/rfbplaymacro-0.2.2/test.rfm 2003-05-23 13:12:24.000000000 +0200 @@ -0,0 +1,28 @@ +RFM 001.000 +# The first line of each script must look like this + +password "mypasswd123" +# replace mypasswd123 with your VNC password. + + +# +# This demo will display a clock for 10 seconds +# + +# Move Mouse to the xterm (upper left of screen): +pointer 100 20 delay 1s + +# Open the xclock: +type "xclock -geometry +400+200 &" +press Return + +# get a kill cursor: +type "xkill" +press Return + +# place the kill cursor over the xclock window: +pointer 410 210 delay 10s # wait for 10 seconds after placing the cursor + +# click to kill: +click 0 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org