[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. ae60336025d26d3f6ccea5276085c636f252207f

[Jose Antonio Quevedo]

The following commit has been merged in the master branch:
commit f7df53dae6c816ddbfe5c27d8f6f45561a6ae3eb
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Tue Jul 19 00:09:41 2011 +0200

    First changes made in install.sh to separate build() from the install() function.
    Three packages added to debian/control

diff --git a/debian/control b/debian/control
index 92a0103..f3a4495 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: ossec-hids
-Section: unknown
+Section: utils
 Priority: extra
 Maintainer: Jose Antonio Quevedo Muñoz <joseantonio.quevedo at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~)
@@ -11,10 +11,33 @@ Homepage: http://www.ossec.net/
 Package: ossec-hids
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion detection), log monitoring and SIM/SIEM together.
- <insert long description, indented with spaces>
+Description: (short description here) 
+ OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion  detection), log monitoring and SIM/SIEM together.
+
 
 Package: ossec-hids-doc
 Architecture: all
 Description: documentation for ossec-hids
  <insert long description, indented with spaces>
+
+Package: ossec-hids-local
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: (short description here) 
+ OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion  detection), log monitoring and SIM/SIEM together.
+ <insert long description, indented with spaces>
+
+Package: ossec-hids-server
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: (short description here)
+ OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion  detection), log monitoring and SIM/SIEM together.
+ <insert long description, indented with spaces>
+
+Package: ossec-hids-client
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: (short description here)
+ OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion  detection), log monitoring and SIM/SIEM together.
+ <insert long description, indented with spaces>
+
diff --git a/debian/init.d.ex b/debian/init.d
similarity index 100%
rename from debian/init.d.ex
rename to debian/init.d
diff --git a/install.sh b/install.sh
index a133c80..a6ec366 100755
--- a/install.sh
+++ b/install.sh
@@ -53,8 +53,6 @@ for i in $*; do
         exit 1;
     fi        
 done
-        
-
 
 ##########
 # install()
@@ -83,18 +81,7 @@ Install()
 
     # Binary install will use the previous generated code.
     if [ "X${USER_BINARYINSTALL}" = "X" ]; then
-        make all
-        if [ $? != 0 ]; then
-            cd ../
-            catError "0x5-build"
-        fi
-        
-        # Building everything    
-        make build
-        if [ $? != 0 ]; then
-            cd ../
-            catError "0x5-build"
-        fi    
+	build
     fi
     
     # If update, stop ossec
@@ -150,9 +137,6 @@ Install()
     	
 }
 
-
-
-
 ##########
 # UseSyscheck()
 ##########
@@ -234,9 +218,6 @@ UseRootcheck()
     fi            
 }
 
-
-
-
 ##########
 # SetupLogs()
 ##########
@@ -323,9 +304,6 @@ SetupLogs()
     fi
 }
 
-
-
-
 ##########
 # ConfigureClient()
 ##########
@@ -395,9 +373,6 @@ ConfigureClient()
     echo "</ossec_config>" >> $NEWCONFIG
 }
 
-
-
-
 ##########
 # ConfigureServer()
 ##########
@@ -681,9 +656,6 @@ ConfigureServer()
     echo "</ossec_config>" >> $NEWCONFIG 
 }
 
-
-
-
 ##########
 # setEnv()
 ##########
@@ -1171,11 +1143,40 @@ main()
     fi
 }
 
+# Inicio del parche
+##########
+# build()
+##########
+build()
+{
 
+  cd `dirname $0`
+  cd ./src/
 
+  make all
+  if [ $? != 0 ]; then
+    cd ../
+    catError "0x5-build"
+  fi
+        
+  # Building everything    
+  make build
+  if [ $? != 0 ]; then
+    cd ../
+    catError "0x5-build"
+  fi    
+
+}
+
+USER_LANGUAGE="en"
+USER_INSTALL_TYPE="server"
+
+if [$1="build"]; then build
+elif [$1=install] install
+fi
 
 ### Calling main function where everything happens
-main
+#main
 
 
 exit 0

-- 
Git repository for pkg-ossec