rpms/tigervnc/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 tigervnc-cookie.patch, 1.1, 1.2 tigervnc.spec, 1.23, 1.24 tigervnc10-compat.patch, 1.1, NONE tigervnc10-rh510185.patch, 1.1, NONE tigervnc10-rh516274.patch, 1.1, NONE tigervnc10-rh524340.patch, 1.1, NONE

Adam Tkac atkac at fedoraproject.org
Mon Dec 21 15:55:21 UTC 2009 

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17587

Modified Files:
	.cvsignore sources tigervnc-cookie.patch tigervnc.spec 
Removed Files:
	tigervnc10-compat.patch tigervnc10-rh510185.patch 
	tigervnc10-rh516274.patch tigervnc10-rh524340.patch 
Log Message:
- update to 1.0.90 snapshot
- patches merged
  - tigervnc10-compat.patch
  - tigervnc10-rh510185.patch
  - tigervnc10-rh524340.patch
  - tigervnc10-rh516274.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	8 Oct 2009 13:38:33 -0000	1.9
+++ .cvsignore	21 Dec 2009 15:55:20 -0000	1.10
@@ -1,2 +1,2 @@
-tigervnc-1.0.0.tar.gz
-xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm
+tigervnc-1.0.90-20091221svn3929.tar.bz2
+shave-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 Oct 2009 13:38:33 -0000	1.9
+++ sources	21 Dec 2009 15:55:21 -0000	1.10
@@ -1,2 +1,2 @@
-622c6689a66651419b5431efdee99d5a  tigervnc-1.0.0.tar.gz
-bc5cb09b51297251c9f2e25e5719a735  xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm
+012731b0df6b00345401bc33e8f8dfe3  tigervnc-1.0.90-20091221svn3929.tar.bz2
+4b7761c018efd6dc0e14c82c5bdd36fa  shave-1.tar.bz2

tigervnc-cookie.patch:
 vncserver |   27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

Index: tigervnc-cookie.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc-cookie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tigervnc-cookie.patch	3 Mar 2009 21:02:04 -0000	1.1
+++ tigervnc-cookie.patch	21 Dec 2009 15:55:21 -0000	1.2
@@ -1,19 +1,29 @@
---- vnc-4_1-unixsrc/unix/vncserver.cookie	2005-02-23 12:28:18.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/vncserver	2005-03-03 22:04:28.000000000 +0000
-@@ -116,18 +116,12 @@
+diff -up tigervnc-1.0.90-20091221svn3929/unix/vncserver.cookie tigervnc-1.0.90-20091221svn3929/unix/vncserver
+--- tigervnc-1.0.90-20091221svn3929/unix/vncserver.cookie	2009-11-12 11:39:54.000000000 +0100
++++ tigervnc-1.0.90-20091221svn3929/unix/vncserver	2009-12-21 16:15:01.907799091 +0100
+@@ -189,27 +189,12 @@ $vncPort = 5900 + $displayNumber;
  $desktopLog = "$vncUserDir/$host:$displayNumber.log";
  unlink($desktopLog);
  
--# Make an X server cookie - use as the seed the sum of the current time, our
--# PID and part of the encrypted form of the password.  Ideally we'd use
--# /dev/urandom, but that's only available on Linux.
+-# Make an X server cookie - use /dev/urandom on systems that have it,
+-# otherwise use perl's random number generator, seeded with the sum
+-# of the current time, our PID and part of the encrypted form of the password.
 -
--srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
--$cookie = "";
--for (1..16) {
+-my $cookie = "";
+-if (open(URANDOM, '<', '/dev/urandom')) {
+-  my $randata;
+-  if (sysread(URANDOM, $randata, 16) == 16) {
+-    $cookie = unpack 'h*', $randata;
+-  }
+-  close(URANDOM);
+-}
+-if ($cookie eq "") {
+-  srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
+-  for (1..16) {
 -    $cookie .= sprintf("%02x", int(rand(256)) % 256);
+-  }
 -}
--    
+-
 -system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
 -system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie"); 
 +# Make an X server cookie - use mcookie


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- tigervnc.spec	26 Oct 2009 14:48:15 -0000	1.23
+++ tigervnc.spec	21 Dec 2009 15:55:21 -0000	1.24
@@ -1,17 +1,19 @@
+%define snap 20091221svn3929
+
 Name:		tigervnc
-Version:	1.0.0
-Release:	3%{?dist}
+Version:	1.0.90
+Release:	0.1.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.tigervnc.com
 
-Source0:	%{name}-%{version}.tar.gz
+Source0:	%{name}-%{version}-%{snap}.tar.bz2
 Source1:	vncserver.init
 Source2:	vncserver.sysconfig
+Source3:	shave-1.tar.bz2
 Source6:	vncviewer.desktop
-Source7:	xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libX11-devel, automake, autoconf, libtool, gettext, cvs
@@ -39,10 +41,6 @@ Obsoletes:	tightvnc < 1.5.0-0.15.2009020
 Patch0:		tigervnc-102434.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
-Patch10:	tigervnc10-compat.patch
-Patch11:	tigervnc10-rh510185.patch
-Patch12:	tigervnc10-rh524340.patch
-Patch13:	tigervnc10-rh516274.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -88,43 +86,34 @@ to access the desktop on your machine.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
-
-rpm2cpio %{SOURCE7} > cpio
-cpio -id < cpio
+%setup -q -n %{name}-%{version}-%{snap}
 
-cp -r usr/share/xorg-x11-server-source/* unix/xserver
+cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
-patch -p1 -b --suffix .vnc < ../xserver16.patch
+patch -p1 -b --suffix .vnc < ../xserver17.patch
+tar -xjf %{SOURCE3}
 popd
 
 
 %patch0 -p1 -b .102434
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
-%patch10 -p1 -b .compat
-%patch11 -p0 -b .rh510185
-%patch12 -p0 -b .rh524340
-%patch13 -p1 -b .rh516274
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
-	unix/configure.ac
+	configure.ac
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$CFLAGS"
 
-pushd unix
 autoreconf -fiv
-%configure \
-	--disable-static
+%configure --disable-static
 
 make %{?_smp_mflags}
-popd
 
 pushd unix/xserver
 autoreconf -fiv
@@ -153,9 +142,7 @@ popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd unix
 make install DESTDIR=$RPM_BUILD_ROOT
-popd
 
 pushd unix/xserver/hw/vnc
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -250,6 +237,14 @@ fi
 %endif
 
 %changelog
+* Mon Dec 21 2009 Adam Tkac <atkac redhat com> 1.0.90-0.1.20091221svn3929
+- update to 1.0.90 snapshot
+- patches merged
+  - tigervnc10-compat.patch
+  - tigervnc10-rh510185.patch
+  - tigervnc10-rh524340.patch
+  - tigervnc10-rh516274.patch
+
 * Mon Oct 26 2009 Adam Tkac <atkac redhat com> 1.0.0-3
 - create Xvnc keyboard mapping before first keypress (#516274)
 


--- tigervnc10-compat.patch DELETED ---


--- tigervnc10-rh510185.patch DELETED ---


--- tigervnc10-rh516274.patch DELETED ---


--- tigervnc10-rh524340.patch DELETED ---

More information about the fedora-extras-commits mailing list