Correction de la définition pour la v 2.5.1

createlinks

@@ -2,5 +2,4 @@
 
 use esmith::Build::CreateLinks qw(:all);
 
-templates2events("/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x86.reg", qw(wpkg-update bootstrap-console-save));
-templates2events("/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x64.reg", qw(wpkg-update bootstrap-console-save));
+templates2events("/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc.reg", qw(wpkg-update bootstrap-console-save));

packages/tightvnc.xml

@@ -2,7 +2,7 @@
 <packages>
     <package id="tightvnc" 
              name="Serveur VNC TightVNC"
-             revision="5" 
+             revision="6" 
              priority="10" 
              reboot="false">
  
@@ -10,14 +10,22 @@
 
         <variable architecture="x86" name="MSI" value="%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-setup-32bit.msi" />
         <variable architecture="x64" name="MSI" value="%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-setup-64bit.msi" />
-        <variable architecture="x86" name="REG_PATH" value="%SETTINGS%\tightvnc\tightvnc_x86.reg" />
-        <variable architecture="x64" name="REG_PATH" value="%SETTINGS%\tightvnc\tightvnc_x64.reg" />
+        <variable name="REG_PATH" value="%SETTINGS%\tightvnc\tightvnc.reg" />
         <variable name="INSTALL_PATH" value="%PROGRAMFILES%\TightVNC" />
 
-        <check type="uninstall" condition="exists" path="TightVNC %PKG_VERSION%" />
+        <check type="uninstall" condition="versiongreaterorequal" path="TightVNC" value="%PKG_VERSION%" />
 
         <!-- Remove RealVNC if installed -->
         <install cmd='%COMSPEC% /C if exist "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" /SP- /VERYSILENT /NORESTART' />
+        <!-- Remove 2.0.X TightVNC if needed -->
+        <install architecture='x86' cmd='"%ProgramFiles%\TightVNC\uninstall.exe" /S' >
+            <exit code="any" />
+        </install>
+        <install architecture='x64' cmd='"%ProgramFiles(x86)%\TightVNC\uninstall.exe" /S' >
+            <exit code="any" />
+        </install>
+        <!-- Wait a few seconds for the uninstall to run as it returns immediatly -->
+        <install cmd='%COMSPEC% /C ping -n 5 127.0.0.1 1>NUL 2>NUL' />
 
         <!-- Install TightVNC -->
         <install cmd='msiexec /qn /norestart /i "%MSI%"' />
@@ -38,6 +46,15 @@
 
         <!-- Remove RealVNC if installed -->
         <upgrade cmd='%COMSPEC% /C if exist "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" /SP- /VERYSILENT /NORESTART' />
+        <!-- Remove 2.0.X TightVNC if needed -->
+        <upgrade architecture='x86' cmd='"%ProgramFiles%\TightVNC\uninstall.exe" /S' >
+            <exit code="any" />
+        </upgrade>
+        <upgrade architecture='x64' cmd='"%ProgramFiles(x86)%\TightVNC\uninstall.exe" /S' >
+            <exit code="any" />
+        </upgrade>
+        <!-- Wait a few seconds for the uninstall to run as it returns immediatly -->
+        <upgrade cmd='%COMSPEC% /C ping -n 5 127.0.0.1 1>NUL 2>NUL' />
         <upgrade cmd='msiexec /qn /norestart /i "%MSI%"' />
         <upgrade cmd='"%INSTALL_PATH%\tvnserver" -reinstall -silent' />
         <upgrade cmd='"%INSTALL_PATH%\tvnserver" -stop -silent' >

root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x64.reg/10All

@@ -1,54 +0,0 @@
-Windows Registry Editor Version 5.00
-
-{
-
-use Crypt::DES;
-my $clear = $wpkg{'VNCPassword'} || 'secretpassword';
-$clear = substr $clear, 0, 8;
-my $key = pack ('H16', "E84AD660C4721AE0");
-my $des = Crypt::DES->new($key);
-my $crypt = $des->encrypt($clear);
-my $pass = join(',', map {unpack('H2', $_)} split //, $crypt);
-
-my $out =<<"EOF";
-
-[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\TightVNC\\Server]
-"ExtraPorts"=""
-"QueryTimeout"=dword:0000001e
-"QueryAcceptOnTimeout"=dword:00000000
-"LocalInputPriorityTimeout"=dword:00000003
-"LocalInputPriority"=dword:00000000
-"BlockRemoteInput"=dword:00000000
-"BlockLocalInput"=dword:00000000
-"IpAccessControl"=""
-"RfbPort"=dword:0000170c
-"HttpPort"=dword:000016a8
-"DisconnectAction"=dword:00000000
-"AcceptRfbConnections"=dword:00000001
-"UseVncAuthentication"=dword:00000001
-"UseControlAuthentication"=dword:00000001
-"LoopbackOnly"=dword:00000000
-"AcceptHttpConnections"=dword:00000000
-"LogLevel"=dword:00000000
-"EnableFileTransfers"=dword:00000001
-"BlankScreen"=dword:00000000
-"RemoveWallpaper"=dword:00000001
-"EnableUrlParams"=dword:00000001
-"Password"=hex:$pass
-"AlwaysShared"=dword:00000000
-"NeverShared"=dword:00000000
-"DisconnectClients"=dword:00000001
-"PollingInterval"=dword:000003e8
-"AllowLoopback"=dword:00000000
-"VideoRecognitionInterval"=dword:00000bb8
-"GrabTransparentWindows"=dword:00000001
-"SaveLogToAllUsersPath"=dword:00000000
-"RunControlInterface"=dword:00000001
-"VideoClasses"=""
-"ControlPassword"=hex:$pass
-
-EOF
-
-$out =~ s/\n/\r\n/g;
-$OUT = $out;
-}

wpkg-tightvnc.spec

@@ -1,6 +1,6 @@
 %define package tightvnc
 %define version 2.5.1
-%define release 0.beta1
+%define release 0.beta2
 
 Name:		wpkg-%{package}
 Version:	%{version}
@@ -48,6 +48,9 @@ cp -r packages/* %{buildroot}/home/e-smith/files/shares/wpkg/files/packages/
 /bin/rm -rf %{buildroot}
 
 %changelog
+* Fri Jun 8 2012 Daniel Berteaud <daniel@firewall-services.com> 2.5.1-2
+- Fix package description for 2.5.1
+
 * Wed Jun 6 2012 Daniel Berteaud <daniel@firewall-services.com> 2.5.1-1
 - Change version scheme