From b73b92d3a9a0d6092eacd970df2317f7033900b8 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 8 Jun 2012 09:54:58 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20de=20la=20d=C3=A9finition=20pour?= =?UTF-8?q?=20la=20v=202.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- createlinks | 3 +- packages/tightvnc.xml | 25 ++++++++-- .../{tightvnc_x86.reg => tightvnc.reg}/10All | 0 .../template-begin | 0 .../files/settings/tightvnc/tightvnc_x64.reg/10All | 54 ---------------------- .../tightvnc/tightvnc_x86.reg/template-begin | 0 wpkg-tightvnc.spec | 5 +- 7 files changed, 26 insertions(+), 61 deletions(-) rename root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/{tightvnc_x86.reg => tightvnc.reg}/10All (100%) rename root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/{tightvnc_x64.reg => tightvnc.reg}/template-begin (100%) delete mode 100644 root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x64.reg/10All delete mode 100644 root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x86.reg/template-begin diff --git a/createlinks b/createlinks index f09bb67..73153af 100644 --- a/createlinks +++ b/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)); diff --git a/packages/tightvnc.xml b/packages/tightvnc.xml index d785f77..363f9f0 100755 --- a/packages/tightvnc.xml +++ b/packages/tightvnc.xml @@ -2,7 +2,7 @@ @@ -10,14 +10,22 @@ - - + - + + + + + + + + + + @@ -38,6 +46,15 @@ + + + + + + + + + diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x86.reg/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc.reg/10All similarity index 100% rename from root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x86.reg/10All rename to root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc.reg/10All diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x64.reg/template-begin b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc.reg/template-begin similarity index 100% rename from root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x64.reg/template-begin rename to root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc.reg/template-begin diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x64.reg/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x64.reg/10All deleted file mode 100644 index 515e00b..0000000 --- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x64.reg/10All +++ /dev/null @@ -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; -} diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x86.reg/template-begin b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/tightvnc/tightvnc_x86.reg/template-begin deleted file mode 100644 index e69de29..0000000 diff --git a/wpkg-tightvnc.spec b/wpkg-tightvnc.spec index 565107a..bc13547 100644 --- a/wpkg-tightvnc.spec +++ b/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 2.5.1-2 +- Fix package description for 2.5.1 + * Wed Jun 6 2012 Daniel Berteaud 2.5.1-1 - Change version scheme