X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Fwin32%2Fossec-installer.nsi;fp=src%2Fwin32%2Fossec-installer.nsi;h=4064220f0dac980b5663b30bf9221f448d5299c6;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=8e91796dd11694ffe7758d54dddb53ed949bb682;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b;p=ossec-hids.git

diff --git a/src/win32/ossec-installer.nsi b/src/win32/ossec-installer.nsi
old mode 100755
new mode 100644
index 8e91796..4064220
--- a/src/win32/ossec-installer.nsi
+++ b/src/win32/ossec-installer.nsi
@@ -13,6 +13,10 @@
 ; include SimpleSC
 !addplugindir "SimpleSC"
 
+; include GetTime
+!include "FileFunc.nsh"
+!insertmacro GetTime
+
 ; output file
 !ifndef OutFile
     !define OutFile "ossec-win32-agent.exe"
@@ -21,9 +25,8 @@
 ; general
 !define MUI_ICON favicon.ico
 !define MUI_UNICON ossec-uninstall.ico
-!define VERSION "2.8.3"
+!define VERSION "3.3.0"
 !define NAME "OSSEC HIDS"
-!define /date CDATE "%b %d %Y at %H:%M:%S"
 !define SERVICE "OssecSvc"
 
 Name "${NAME} Windows Agent v${VERSION}"
@@ -143,10 +146,11 @@ Section "OSSEC Agent (required)" MainSec
     CreateDirectory "$INSTDIR\tmp"
 
     ; install files
-    File ossec-lua.exe
-    File ossec-luac.exe
+    ;File ossec-lua.exe
+    ;File ossec-luac.exe
     File ossec-agent.exe
     File ossec-agent-eventchannel.exe
+    File agent-auth.exe
     File default-ossec.conf
     File manage_agents.exe
     File /oname=win32ui.exe os_win32ui.exe
@@ -157,15 +161,15 @@ Section "OSSEC Agent (required)" MainSec
     File setup-syscheck.exe
     File setup-iis.exe
     File doc.html
-    File /oname=shared\rootkit_trojans.txt rootkit_trojans.txt
-    File /oname=shared\rootkit_files.txt rootkit_files.txt
+    File /oname=shared\rootkit_trojans.txt ../rootcheck/db/rootkit_trojans.txt
+    File /oname=shared\rootkit_files.txt ../rootcheck/db/rootkit_files.txt
     File add-localfile.exe
     File LICENSE.txt
-    File /oname=shared\win_applications_rcl.txt rootcheck\db\win_applications_rcl.txt
-    File /oname=shared\win_malware_rcl.txt rootcheck\db\win_malware_rcl.txt
-    File /oname=shared\win_audit_rcl.txt rootcheck\db\win_audit_rcl.txt
+    File /oname=shared\win_applications_rcl.txt ../rootcheck\db\win_applications_rcl.txt
+    File /oname=shared\win_malware_rcl.txt ../rootcheck\db\win_malware_rcl.txt
+    File /oname=shared\win_audit_rcl.txt ../rootcheck\db\win_audit_rcl.txt
     File help.txt
-    File vista_sec.csv
+    File vista_sec.txt
     File /oname=active-response\bin\route-null.cmd route-null.cmd
     File /oname=active-response\bin\restart-ossec.cmd restart-ossec.cmd
 
@@ -189,10 +193,15 @@ Section "OSSEC Agent (required)" MainSec
     WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ossec" "NoRepair" 1
     WriteUninstaller "uninstall.exe"
 
+    ; get current local time
+    ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
+    var /global CURRENTTIME
+    StrCpy $CURRENTTIME "$2-$1-$0 $4:$5:$6"
+
     ; write version and install information
     VersionInstall:
         FileOpen $0 "$INSTDIR\VERSION.txt" w
-        FileWrite $0 "${NAME} v${VERSION} - Installed on ${CDATE}"
+        FileWrite $0 "${NAME} v${VERSION} - Installed on $CURRENTTIME"
         FileClose $0
         IfErrors VersionError VersionComplete
     VersionError:
@@ -399,8 +408,8 @@ Section "Uninstall"
 
     ; remove files and uninstaller
     Delete "$INSTDIR\ossec-agent.exe"
-    Delete "$INSTDIR\ossec-lua.exe"
-    Delete "$INSTDIR\ossec-luac.exe"
+    ;Delete "$INSTDIR\ossec-lua.exe"
+    ;Delete "$INSTDIR\ossec-luac.exe"
     Delete "$INSTDIR\manage_agents.exe"
     Delete "$INSTDIR\ossec.conf"
     Delete "$INSTDIR\uninstall.exe"