# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271253774 -10800
# Node ID 9fc0ed567871086421755a71eec183fb52008b9b
# Parent  a15e6baef5102298035880616ad26b59ba3fe6cd
Revision: 201013
Kit: 201015

diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/group/bld.inf
--- a/vpnclient_sis/group/bld.inf	Wed Mar 31 23:11:34 2010 +0300
+++ b/vpnclient_sis/group/bld.inf	Wed Apr 14 17:02:54 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -17,16 +17,12 @@
 *
 *
 */
-
-
-
 PRJ_PLATFORMS
-DEFAULT
+ARMV5
 
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-	gnumakefile update_versions.mk
 	gnumakefile vpnclient_sis.mk
 
 // End of File
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/group/create_vpnclient_sis.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vpnclient_sis/group/create_vpnclient_sis.pl	Wed Apr 14 17:02:54 2010 +0300
@@ -0,0 +1,129 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Updates pkg-files' and vpnclient_sis.mk's version information with current date.
+# Creates temporary pkg-files with updated version.
+#
+
+use strict;
+use POSIX qw(strftime);
+use File::Copy;
+
+
+#Subroutines to update version information
+my $PLATFORM = "42";
+
+#
+# Creates a temp file and replaces line
+#
+sub replace_line_and_create_temp
+{
+	# arguments
+	my ($pattern, $replacement, $path) = @_;
+		
+	# create temp file
+	my $temp_path = "temp_".$path;
+	if (-e $temp_path)
+	{
+		chmod 0666, $temp_path;
+		unlink $temp_path;
+	}
+	copy($path, $temp_path);
+	chmod 0666, $temp_path;
+	
+	# update version information
+	my ($infile, $outfile);
+	open $infile, "<".$path or die "Can't open $path : $!";
+	open $outfile, ">".$temp_path or die "Can't open $temp_path : $!";
+	while (<$infile>)
+	{
+		my $line = $_;
+		if ($line =~ s/$pattern/$replacement/g)
+		{
+			print "Replaced line in $temp_path\n";
+		}
+		print $outfile $line;
+	}
+	close $infile;
+	close $outfile;
+}
+
+
+# Define variables
+my $pkgtime = strftime($PLATFORM.",%y,%m%d", localtime());
+my $mktime = strftime("%y%m%d", localtime());
+my $epocroot = $ENV{'EPOCROOT'};
+$epocroot =~ s/\\/\//;
+
+my $rdderdir="../data/RDTest_02.der";
+my $rdkeydir="../data/RDTest_02.key";
+my $localisation_files = $epocroot . "epoc32/data/Z/resource/vpnecomnotifier.r05";
+
+if (!(-e $localisation_files))
+{
+ 	die "Localisation files are not available! Exiting..\n";
+} 
+
+
+my $numArgs = $#ARGV + 1;
+if (!($#ARGV + 1 eq 1))
+{
+	die "wrong number of command line arguments.";
+}
+my $config = @ARGV[0];
+
+# Creates temp pkg files with updated version information
+if ($config eq "UREL")
+{
+# nokia_vpn_client_localised_armv5_urel.pkg
+	replace_line_and_create_temp(
+	    '^\(0x101F5147\),.*?,.*?,.*?, TYPE=SA, RU$',
+	    "(0x101F5147),$pkgtime, TYPE=SA, RU",
+	    'nokia_vpn_client_localised_armv5_urel.pkg');
+
+	print "Processing temp_nokia_vpn_client_localised_armv5_urel.pkg\n";
+	system("makesis -v temp_nokia_vpn_client_localised_armv5_urel.pkg mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_urel.sis") == 0 or 
+		die "UREL sis creation failed";  		
+	print "\nSigning created mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_urel.sis\n";
+	system("signsis mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_urel.sis mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_urel.sis " . $rdderdir . " " . $rdkeydir) == 0 or 
+		die "UREL sis signing failed";
+
+	# remove temp files
+	unlink <temp_*_urel.pkg>;  
+		
+}
+elsif ($config eq "UDEB")  
+{
+	# nokia_vpn_client_localised_armv5_udeb.pkg
+		replace_line_and_create_temp(
+		    '^\(0x101F5147\),.*?,.*?,.*?, TYPE=SA, RU$',
+		    "(0x101F5147),$pkgtime, TYPE=SA, RU",
+		    'nokia_vpn_client_localised_armv5_udeb.pkg');
+		
+		print "Processing temp_nokia_vpn_client_localised_armv5_udeb.pkg\n";
+		my $udeb_sis_file_name = "mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_udeb.sis";
+		system("makesis -v temp_nokia_vpn_client_localised_armv5_udeb.pkg " . $udeb_sis_file_name ) == 0 or 
+			die "UDEB sis creation failed";			
+		print "\nSigning created mVPN_RnD_" . $PLATFORM . "_" . $mktime . "_udeb.sis\n";
+		system ("signsis " . $udeb_sis_file_name . " " . $udeb_sis_file_name . " "  . $rdderdir . " " . $rdkeydir)  == 0 or 
+			die "UDEB sis signing failed";	
+			
+	# remove temp files
+	unlink <temp_*_udeb.pkg>;
+}
+else
+{
+	die "Unknown config " . $config . "\n";
+}
+		    
\ No newline at end of file
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/group/mVPN_vpnpolins_armv5.sis
Binary file vpnclient_sis/group/mVPN_vpnpolins_armv5.sis has changed
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/group/nokia_vpn_acuins_armv5.pkg
--- a/vpnclient_sis/group/nokia_vpn_acuins_armv5.pkg	Wed Mar 31 23:11:34 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: Package file for project Acu Policy Installer
-;
-
-
-; LANGUAGES
-; - None (English only by default)
-
-; INSTALLATION HEADER 
-#{"Nokia VPN Server Installer"},(0xA0000132),32,08,0124, TYPE=SA, RU
-
-; Product / platform version compatibility - S60 5.1 and 5.2
-[0x10283160],0,0,0,{"Series60ProductID"}
-[0x20022e6d],0,0,0,{"Series60ProductID"}
-
-; List of localised vendor names - one per language.
-; At least one must be provided (English [EN]).
-%{"Nokia"}
-
-; Unique Vendor Name
-:"Nokia"
-
-; LIST OF FILES
-; No files!
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/group/update_versions.mk
--- a/vpnclient_sis/group/update_versions.mk	Wed Mar 31 23:11:34 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2008-2008 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:  Calls version update script 
-#
-
-do_nothing :
-	@rem do_nothing
-	
-MAKMAKE : do_nothing
-
-BLD :
-	@echo Updating versions..
-	perl update_versions.pl
-	@echo Update done!
-	
-FREEZE LIB CLEANLIB RESOURCE RELEASABLES CLEAN FINAL SAVESPACE : do_nothing
\ No newline at end of file
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/group/update_versions.pl
--- a/vpnclient_sis/group/update_versions.pl	Wed Mar 31 23:11:34 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-# Updates pkg-files' and vpnclient_sis.mk's version information with current date.
-# Creates temporary pkg-files with updated version.
-#
-
-use strict;
-use POSIX qw(strftime);
-use File::Copy;
-
-
-my $PLATFORM = "42";
-
-#
-# Creates a temp file and replaces line
-#
-sub replace_line_and_create_temp
-{
-	# arguments
-	my ($pattern, $replacement, $path) = @_;
-		
-	# create temp file
-	my $temp_path = "temp_".$path;
-	if (-e $temp_path)
-	{
-		chmod 0666, $temp_path;
-		unlink $temp_path;
-	}
-	copy($path, $temp_path);
-	chmod 0666, $temp_path;
-	
-	# update version information
-	my ($infile, $outfile);
-	open $infile, "<".$path or die "Can't open $path : $!";
-	open $outfile, ">".$temp_path or die "Can't open $temp_path : $!";
-	while (<$infile>)
-	{
-		my $line = $_;
-		if ($line =~ s/$pattern/$replacement/g)
-		{
-			print "Replaced line in $temp_path\n";
-		}
-		print $outfile $line;
-	}
-	close $infile;
-	close $outfile;
-}
-
-#
-# Replaces line
-#
-sub replace_line
-{
-	# arguments
-	my ($pattern, $replacement, $path) = @_;
-		
-	# Backup
-	if (-e "$path.BACKUP")
-	{
-		chmod 0666, "$path.BACKUP";
-		unlink "$path.BACKUP";
-	}
-	chmod 0666, $path;
-	rename $path, "$path.BACKUP";
-	
-	# update version information
-	my ($infile, $outfile);
-	open $infile, "<$path.BACKUP" or die "Can't open $path.BACKUP : $!";
-	open $outfile, ">$path" or die "Can't open $path : $!";
-	while (<$infile>)
-	{
-		my $line = $_;
-		if ($line =~ s/$pattern/$replacement/g)
-		{
-			print "Replaced line in $path\n";
-		}
-		print $outfile $line;
-	}
-	close $infile;
-	close $outfile;
-}
-
-my $pkgtime = strftime($PLATFORM.",%y,%m%d", localtime());
-my $mktime = strftime("%y%m%d", localtime());
-
-# nokia_vpn_vpnpolins_armv5.pkg
-replace_line_and_create_temp(
-    '^#{"Nokia VPN Policy Installer"},\(0xA0000131\),.*?,.*?,.*?, TYPE=SA, RU$',
-    "#{\"Nokia VPN Policy Installer\"},(0xA0000131),$pkgtime, TYPE=SA, RU",
-    'nokia_vpn_vpnpolins_armv5.pkg');
-    
-# nokia_vpn_client_localised_armv5_urel.pkg
-replace_line_and_create_temp(
-    '^\(0x101F5147\),.*?,.*?,.*?, TYPE=SA, RU$',
-    "(0x101F5147),$pkgtime, TYPE=SA, RU",
-    'nokia_vpn_client_localised_armv5_urel.pkg');
-
-# nokia_vpn_client_localised_armv5_udeb.pkg
-replace_line_and_create_temp(
-    '^\(0x101F5147\),.*?,.*?,.*?, TYPE=SA, RU$',
-    "(0x101F5147),$pkgtime, TYPE=SA, RU",
-    'nokia_vpn_client_localised_armv5_udeb.pkg');
-
-# vpnclient_sis.mk
-replace_line(
-    '^VERSION=.*?$',
-    "VERSION=$mktime",
-    'vpnclient_sis.mk');
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/group/vpnclient_sis.mk
--- a/vpnclient_sis/group/vpnclient_sis.mk	Wed Mar 31 23:11:34 2010 +0300
+++ b/vpnclient_sis/group/vpnclient_sis.mk	Wed Apr 14 17:02:54 2010 +0300
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of "Eclipse Public License v1.0"
@@ -14,69 +14,18 @@
 # Description:  Creates either localised or nonlocalised mVPN Client SIS files 
 #
 
-# To ensure that EPOCROOT always ends with a forward slash
-TMPROOT:=$(subst \,/,$(EPOCROOT))
-EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
-
-VERSION=091014
-RDDERDIR=../data/RDTest_02.der
-RDKEYDIR=../data/RDTest_02.key
-LOCALISATION_FILES=$(EPOCROOT)epoc32/data/Z/resource/vpnecomnotifier.r05
-S60PLATFORM=v42
-
 do_nothing :
 	@rem do_nothing
 
 MAKMAKE : do_nothing
 
 BLD :
-
-#
-# Localisation files must exist
-#
-	@echo --
-	if exist $(LOCALISATION_FILES) @echo Building localised version
-	if not exist $(LOCALISATION_FILES) @echo Localisation files are not available! Exiting..
-	if not exist $(LOCALISATION_FILES) @echo --
-	if not exist $(LOCALISATION_FILES) exit 1
-	@echo --
-
-#
-# vpn policy installer
-#
-	@echo Processing temp_nokia_vpn_vpnpolins_armv5.pkg
-	$(EPOCROOT)epoc32\tools\makesis -v temp_nokia_vpn_vpnpolins_armv5.pkg mVPN_vpnpolins_armv5.sis
-	@echo Signing created mVPN_vpnpolins_armv5.sis
-	$(EPOCROOT)epoc32\tools\signsis mVPN_vpnpolins_armv5.sis mVPN_vpnpolins_armv5.sis $(RDDERDIR) $(RDKEYDIR)
+	perl create_vpnclient_sis.pl $(CFG)
 	
-#
-# If localisation files exist create localised SIS files.
-#
-# UREL 
-	@echo Processing temp_nokia_vpn_client_localised_armv5_urel.pkg
-	$(EPOCROOT)epoc32\tools\makesis -v temp_nokia_vpn_client_localised_armv5_urel.pkg mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis
-	@echo Signing created mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis
-	$(EPOCROOT)epoc32\tools\signsis mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis $(RDDERDIR) $(RDKEYDIR)	
-# UDEB	
-	@echo Processing temp_nokia_vpn_client_localised_armv5_udeb.pkg
-	$(EPOCROOT)epoc32\tools\makesis -v temp_nokia_vpn_client_localised_armv5_udeb.pkg mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis
-	@echo Signing created mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis
-	$(EPOCROOT)epoc32\tools\signsis mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis $(RDDERDIR) $(RDKEYDIR)
-
-		    
-# remove policy installer
-	@echo Remove unnecessary temporary sis files
-	if exist mVPN_vpnpolins_armv5.sis erase mVPN_vpnpolins_armv5.sis
+CLEAN : 
+	if exist mVPN_RnD*.sis erase mVPN_RnD*.sis
 	if exist temp_* erase temp_*
 	
-CLEAN : 
-	if exist mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis erase mVPN_RnD_$(S60PLATFORM)_$(VERSION)_urel.sis
-	if exist mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis erase mVPN_RnD_$(S60PLATFORM)_$(VERSION)_udeb.sis
-	if exist mVPN_vpnpolins_armv5.sis erase mVPN_vpnpolins_armv5.sis
-	if exist temp_* erase temp_*
-	if exist *.BACKUP erase *.BACKUP
-	
-
 LIB : do_nothing
 
 CLEANLIB : do_nothing
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/stub_sis/group/bld.inf
--- a/vpnclient_sis/stub_sis/group/bld.inf	Wed Mar 31 23:11:34 2010 +0300
+++ b/vpnclient_sis/stub_sis/group/bld.inf	Wed Apr 14 17:02:54 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,7 +21,7 @@
 
 
 PRJ_PLATFORMS
-DEFAULT
+ARMV5
 
 PRJ_EXPORTS
 ../data/101f877b.txt.vpn      /epoc32/data/z/private/10202be9/101f877b.txt.vpn
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/stub_sis/group/create_vpnclient_sis.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vpnclient_sis/stub_sis/group/create_vpnclient_sis.pl	Wed Apr 14 17:02:54 2010 +0300
@@ -0,0 +1,127 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Updates pkg-files' and vpnclient_sis.mk's version information with current date.
+# Creates temporary pkg-files with updated version.
+#
+
+use strict;
+use POSIX qw(strftime);
+use File::Copy;
+
+
+#Subroutines to update version information
+my $PLATFORM = "42";
+
+#
+# Creates a temp file and replaces line
+#
+sub replace_line_and_create_temp
+{
+	# arguments
+	my ($pattern, $replacement, $path) = @_;
+		
+	# create temp file
+	my $temp_path = "temp_".$path;
+	if (-e $temp_path)
+	{
+		chmod 0666, $temp_path;
+		unlink $temp_path;
+	}
+	copy($path, $temp_path);
+	chmod 0666, $temp_path;
+	
+	# update version information
+	my ($infile, $outfile);
+	open $infile, "<".$path or die "Can't open $path : $!";
+	open $outfile, ">".$temp_path or die "Can't open $temp_path : $!";
+	while (<$infile>)
+	{
+		my $line = $_;
+		if ($line =~ s/$pattern/$replacement/g)
+		{
+			print "Replaced line in $temp_path\n";
+		}
+		print $outfile $line;
+	}
+	close $infile;
+	close $outfile;
+}
+
+
+# Define variables
+my $pkgtime = strftime($PLATFORM.",%y,%m%d", localtime());
+my $mktime = strftime("%y%m%d", localtime());
+my $epocroot = $ENV{'EPOCROOT'};
+$epocroot =~ s/\\/\//;
+
+my $rdderdir="../data/RDTest_02.der";
+my $rdkeydir="../data/RDTest_02.key";
+my $localisation_files = $epocroot . "epoc32/data/Z/resource/vpnecomnotifier.r05";
+
+if (!(-e $localisation_files))
+{
+ 	die "Localisation files are not available! Exiting..\n";
+} 
+
+
+my $numArgs = $#ARGV + 1;
+if (!($#ARGV + 1 eq 1))
+{
+	die "wrong number of command line arguments.";
+}
+my $config = @ARGV[0];
+
+# Creates temp pkg files with updated version information
+if ($config eq "UREL")
+{
+
+# stub_nokia_vpn_vpnpolins_armv5.pkg
+replace_line_and_create_temp(
+    '^#{"Nokia VPN Policy Installer Stub"},\(0xA0000131\),.*?,.*?,.*?',
+    "#{\"Nokia VPN Policy Installer Stub\"},(0xA0000131),$pkgtime",
+    'stub_vpnpolins_armv5.pkg');
+    
+# stub_nokia_vpn_client_localised_armv5.pkg
+replace_line_and_create_temp(
+    '^\(0x101F5147\),.*?,.*?,.*?$',
+    "(0x101F5147),$pkgtime",
+    'stub_nokia_vpn_client_armv5.pkg');
+	
+	print "Processing stub_vpnpolins_armv5.pkg\n";
+	system("makesis -v -s stub_vpnpolins_armv5.pkg ipsecvpn_vpnpolins.SIS") == 0 or 
+		die  "ipsecvpn_vpnpolins.SIS creation failed";
+	
+	
+	print "Processing stub_nokia_vpn_client_armv5.pkg\n";
+	system("makesis -v -s stub_nokia_vpn_client_armv5.pkg ipsecvpn.SIS") == 0 or 
+		die "ipsecvpn.SIS creation failed";
+	
+	print "Export stub sis files to " . $epocroot . "epoc32/data/z/system/install\n";
+	copy("ipsecvpn_vpnpolins.SIS", $epocroot . "epoc32/data/z/system/install") or die "ipsecvpn_vpnpolins.SIS cannot be copied.";
+	copy("ipsecvpn.SIS", $epocroot . "epoc32/data/z/system/install") or die "ipsecvpn_vpnpolins.SIS cannot be copied.";
+	
+	# remove temp files
+	unlink <temp_*.pkg>;  
+		
+}
+elsif ($config eq "UDEB")  
+{
+  #do nothing
+}
+else
+{
+	die "Unknown config " . $config . "\n";
+}
+		    
\ No newline at end of file
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/stub_sis/group/update_versions.pl
--- a/vpnclient_sis/stub_sis/group/update_versions.pl	Wed Mar 31 23:11:34 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-#
-# update_versions.pl
-#
-# Updates pkg-files' and vpnclient_sis.mk's version information with current date.
-# Creates temporary pkg-files with updated version.
-#
-
-use strict;
-use POSIX qw(strftime);
-use File::Copy;
-
-
-my $PLATFORM = "41";
-
-#
-# Creates a temp file and replaces line
-#
-sub replace_line_and_create_temp
-{
-	# arguments
-	my ($pattern, $replacement, $path) = @_;
-		
-	# create temp file
-	my $temp_path = "temp_".$path;
-	if (-e $temp_path)
-	{
-		chmod 0666, $temp_path;
-		unlink $temp_path;
-	}
-	copy($path, $temp_path);
-	chmod 0666, $temp_path;
-	
-	# update version information
-	my ($infile, $outfile);
-	open $infile, "<".$path or die "Can't open $path : $!";
-	open $outfile, ">".$temp_path or die "Can't open $temp_path : $!";
-	while (<$infile>)
-	{
-		my $line = $_;
-		if ($line =~ s/$pattern/$replacement/g)
-		{
-			print "Replaced line in $temp_path\n";
-		}
-		print $outfile $line;
-	}
-	close $infile;
-	close $outfile;
-}
-
-my $pkgtime = strftime($PLATFORM.",%y,%m%d", localtime());
-my $mktime = strftime("%y%m%d", localtime());
-
-# stub_nokia_vpn_vpnpolins_armv5.pkg
-replace_line_and_create_temp(
-    '^#{"Nokia VPN Policy Installer Stub"},\(0xA0000131\),.*?,.*?,.*?',
-    "#{\"Nokia VPN Policy Installer Stub\"},(0xA0000131),$pkgtime",
-    'stub_vpnpolins_armv5.pkg');
-    
-# stub_nokia_vpn_client_localised_armv5.pkg
-replace_line_and_create_temp(
-    '^\(0x101F5147\),.*?,.*?,.*?$',
-    "(0x101F5147),$pkgtime",
-    'stub_nokia_vpn_client_armv5.pkg');
diff -r a15e6baef510 -r 9fc0ed567871 vpnclient_sis/stub_sis/group/vpnclient_stub_sis.mk
--- a/vpnclient_sis/stub_sis/group/vpnclient_stub_sis.mk	Wed Mar 31 23:11:34 2010 +0300
+++ b/vpnclient_sis/stub_sis/group/vpnclient_stub_sis.mk	Wed Apr 14 17:02:54 2010 +0300
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006 - 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006 - 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of "Eclipse Public License v1.0"
@@ -21,21 +21,13 @@
 
 MAKMAKE : do_nothing
 
-BLD :
-	@echo Processing stub_vpnpolins_armv5.pkg
-	makesis -v -s stub_vpnpolins_armv5.pkg ipsecvpn_vpnpolins.SIS
-	
-	@echo Processing stub_nokia_vpn_client_armv5.pkg
-	makesis -v -s stub_nokia_vpn_client_armv5.pkg ipsecvpn.SIS
-	
-	@echo Export stub sis files to $(EPOCROOT)epoc32\data\z\system\install
-	copy ipsecvpn_vpnpolins.SIS $(EPOCROOT)epoc32\data\z\system\install
-	copy ipsecvpn.SIS $(EPOCROOT)epoc32\data\z\system\install
+BLD :	
+	perl create_vpnclient_sis.pl $(CFG)
 
 CLEAN : 
 	if exist ipsecvpn_vpnpolins.SIS erase ipsecvpn_vpnpolins.SIS
-	if exist $(EPOCROOT)epoc32/data/z/system/install/ipsecvpn_vpnpolins.SIS erase $(EPOCROOT)epoc32/data/z/system/install/ipsecvpn_vpnpolins.SIS
-	if exist $(EPOCROOT)epoc32/data/z/system/install/ipsecvpn.SIS erase $(EPOCROOT)epoc32/data/z/system/install/ipsecvpn.SIS
+	if exist $(EPOCROOT)epoc32\data\z\system\install\ipsecvpn_vpnpolins.SIS erase $(EPOCROOT)epoc32\data\z\system\install\ipsecvpn_vpnpolins.SIS
+	if exist $(EPOCROOT)epoc32\data\z\system\install\ipsecvpn.SIS erase $(EPOCROOT)epoc32\data\z\system\install\ipsecvpn.SIS
 	if exist ipsecvpn.SIS erase ipsecvpn.SIS
 	if exist *BACKUP erase *BACKUP
 
diff -r a15e6baef510 -r 9fc0ed567871 vpnengine/vpncleaner/group/vpncleaner.mmp
--- a/vpnengine/vpncleaner/group/vpncleaner.mmp	Wed Mar 31 23:11:34 2010 +0300
+++ b/vpnengine/vpncleaner/group/vpncleaner.mmp	Wed Apr 14 17:02:54 2010 +0300
@@ -23,7 +23,7 @@
 TARGETTYPE     exe
 UID            0x1000008d 0x101FAE02
 
-CAPABILITY	   ReadDeviceData WriteDeviceData NetworkControl AllFiles NetworkServices
+CAPABILITY	   WriteDeviceData ReadDeviceData ReadUserData
 VENDORID       VID_DEFAULT
 
 SOURCEPATH     ../src
diff -r a15e6baef510 -r 9fc0ed567871 vpnengine/vpncleaner/src/vpncleanerexe.cpp
--- a/vpnengine/vpncleaner/src/vpncleanerexe.cpp	Wed Mar 31 23:11:34 2010 +0300
+++ b/vpnengine/vpncleaner/src/vpncleanerexe.cpp	Wed Apr 14 17:02:54 2010 +0300
@@ -72,7 +72,7 @@
 
     if ( KErrNone == err )
         {
-        _LIT( KRomPath, "z:\\sys\\bin\\kmdserver.exe" );
+        _LIT( KRomPath, "z:\\resource\\vpnlogmessages.rsc" );
 
         if ( KErrNone == fs.Att( KRomPath, fileAttr ) )
             {