[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. f89fb2c00b1a2606035e5cd0e35b4ebe99f049ac
Javier Fernandez-Sanguino
jfs at debian.org
Wed Aug 29 16:31:35 UTC 2012
The following commit has been merged in the master branch:
commit 70344482a7ebe85745db26ec564d566b2026cdd9
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date: Wed Aug 29 02:12:47 2012 +0200
Adjust the pidfile directory
diff --git a/debian/patches/05-standard-pidfile-location b/debian/patches/05-standard-pidfile-location
index f2d9869..7d03cdf 100644
--- a/debian/patches/05-standard-pidfile-location
+++ b/debian/patches/05-standard-pidfile-location
@@ -1,7 +1,7 @@
Index: pkg-ossec/active-response/host-deny.sh
===================================================================
---- pkg-ossec.orig/active-response/host-deny.sh 2012-08-28 23:23:04.000000000 +0200
-+++ pkg-ossec/active-response/host-deny.sh 2012-08-28 23:27:14.000000000 +0200
+--- pkg-ossec.orig/active-response/host-deny.sh 2012-08-29 02:03:05.000000000 +0200
++++ pkg-ossec/active-response/host-deny.sh 2012-08-29 02:10:06.000000000 +0200
@@ -9,12 +9,14 @@
USER=$2
IP=$3
@@ -25,8 +25,8 @@ Index: pkg-ossec/active-response/host-deny.sh
Index: pkg-ossec/src/init/ossec-client.sh
===================================================================
---- pkg-ossec.orig/src/init/ossec-client.sh 2012-08-28 23:22:58.000000000 +0200
-+++ pkg-ossec/src/init/ossec-client.sh 2012-08-28 23:31:10.000000000 +0200
+--- pkg-ossec.orig/src/init/ossec-client.sh 2012-08-29 02:05:48.000000000 +0200
++++ pkg-ossec/src/init/ossec-client.sh 2012-08-29 02:10:06.000000000 +0200
@@ -4,10 +4,14 @@
# Author: Daniel B. Cid <daniel.cid at gmail.com>
@@ -70,7 +70,7 @@ Index: pkg-ossec/src/init/ossec-client.sh
fi
done
done
-@@ -123,7 +127,7 @@
+@@ -122,7 +126,7 @@
{
# We first loop to check the config.
for i in ${SDAEMONS}; do
@@ -79,7 +79,7 @@ Index: pkg-ossec/src/init/ossec-client.sh
if [ $? != 0 ]; then
echo "${i}: Configuration error. Exiting"
unlock;
-@@ -146,7 +150,7 @@
+@@ -145,7 +149,7 @@
for i in ${SDAEMONS}; do
pstatus ${i};
if [ $? = 0 ]; then
@@ -88,7 +88,7 @@ Index: pkg-ossec/src/init/ossec-client.sh
if [ $? != 0 ]; then
unlock;
exit 1;
-@@ -176,13 +180,13 @@
+@@ -175,13 +179,13 @@
return 0;
fi
@@ -105,7 +105,7 @@ Index: pkg-ossec/src/init/ossec-client.sh
continue;
fi
-@@ -207,12 +211,12 @@
+@@ -206,12 +210,12 @@
if [ $? = 1 ]; then
echo "Killing ${i} .. ";
@@ -122,8 +122,8 @@ Index: pkg-ossec/src/init/ossec-client.sh
Index: pkg-ossec/src/init/ossec-local.sh
===================================================================
---- pkg-ossec.orig/src/init/ossec-local.sh 2012-08-28 23:22:57.000000000 +0200
-+++ pkg-ossec/src/init/ossec-local.sh 2012-08-28 23:32:36.000000000 +0200
+--- pkg-ossec.orig/src/init/ossec-local.sh 2012-08-29 02:05:38.000000000 +0200
++++ pkg-ossec/src/init/ossec-local.sh 2012-08-29 02:10:06.000000000 +0200
@@ -5,11 +5,13 @@
@@ -150,7 +150,7 @@ Index: pkg-ossec/src/init/ossec-local.sh
-LOCK="${DIR}/var/start-script-lock"
-LOCK_PID="${LOCK}/pid"
+LOCK="${DIRECTORY}/var/run/ossec-hids/"
-+LOCK_PID="${LOCK_DIR}/start-script-lock.pid"
++LOCK_PID="${LOCK}/start-script-lock.pid"
# This number should be more than enough (even if it is
@@ -169,7 +169,7 @@ Index: pkg-ossec/src/init/ossec-local.sh
fi
done
done
-@@ -200,7 +202,7 @@
+@@ -199,7 +201,7 @@
{
# We first loop to check the config.
for i in ${SDAEMONS}; do
@@ -178,7 +178,7 @@ Index: pkg-ossec/src/init/ossec-local.sh
if [ $? != 0 ]; then
echo "${i}: Configuration error. Exiting"
unlock;
-@@ -216,7 +218,7 @@
+@@ -215,7 +217,7 @@
SDAEMONS="${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON} ossec-maild ossec-execd ossec-analysisd ossec-logcollector ossec-syscheckd ossec-monitord"
echo "Starting $NAME $VERSION (by $AUTHOR)..."
@@ -187,7 +187,7 @@ Index: pkg-ossec/src/init/ossec-local.sh
if [ ! $? = 0 ]; then
echo "ossec-analysisd: Configuration error. Exiting."
fi
-@@ -229,7 +231,7 @@
+@@ -228,7 +230,7 @@
for i in ${SDAEMONS}; do
pstatus ${i};
if [ $? = 0 ]; then
@@ -196,7 +196,7 @@ Index: pkg-ossec/src/init/ossec-local.sh
if [ $? != 0 ]; then
unlock;
exit 1;
-@@ -259,13 +261,13 @@
+@@ -258,13 +260,13 @@
return 0;
fi
@@ -213,7 +213,7 @@ Index: pkg-ossec/src/init/ossec-local.sh
continue;
fi
-@@ -290,12 +292,12 @@
+@@ -289,12 +291,12 @@
if [ $? = 1 ]; then
echo "Killing ${i} .. ";
@@ -230,8 +230,8 @@ Index: pkg-ossec/src/init/ossec-local.sh
Index: pkg-ossec/src/init/ossec-server.sh
===================================================================
---- pkg-ossec.orig/src/init/ossec-server.sh 2012-08-28 23:22:55.000000000 +0200
-+++ pkg-ossec/src/init/ossec-server.sh 2012-08-28 23:30:17.000000000 +0200
+--- pkg-ossec.orig/src/init/ossec-server.sh 2012-08-29 02:05:44.000000000 +0200
++++ pkg-ossec/src/init/ossec-server.sh 2012-08-29 02:10:06.000000000 +0200
@@ -5,11 +5,15 @@
@@ -258,7 +258,7 @@ Index: pkg-ossec/src/init/ossec-server.sh
-LOCK="${DIR}/var/start-script-lock"
-LOCK_PID="${LOCK}/pid"
+LOCK="${DIRECTORY}/var/run/ossec-hids/"
-+LOCK_PID="${LOCK_DIR}/start-script-lock.pid"
++LOCK_PID="${LOCK}/start-script-lock.pid"
# This number should be more than enough (even if it is
@@ -277,7 +277,7 @@ Index: pkg-ossec/src/init/ossec-server.sh
fi
done
done
-@@ -199,7 +203,7 @@
+@@ -198,7 +202,7 @@
{
# We first loop to check the config.
for i in ${SDAEMONS}; do
@@ -286,7 +286,7 @@ Index: pkg-ossec/src/init/ossec-server.sh
if [ $? != 0 ]; then
echo "${i}: Configuration error. Exiting"
unlock;
-@@ -214,7 +218,7 @@
+@@ -213,7 +217,7 @@
SDAEMONS="${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON} ossec-maild ossec-execd ossec-analysisd ossec-logcollector ossec-remoted ossec-syscheckd ossec-monitord"
echo "Starting $NAME $VERSION (by $AUTHOR)..."
@@ -295,7 +295,7 @@ Index: pkg-ossec/src/init/ossec-server.sh
if [ ! $? = 0 ]; then
echo "OSSEC analysisd: Testing rules failed. Configuration error. Exiting."
fi
-@@ -226,7 +230,7 @@
+@@ -225,7 +229,7 @@
for i in ${SDAEMONS}; do
pstatus ${i};
if [ $? = 0 ]; then
@@ -304,7 +304,7 @@ Index: pkg-ossec/src/init/ossec-server.sh
if [ $? != 0 ]; then
unlock;
exit 1;
-@@ -256,13 +260,13 @@
+@@ -255,13 +259,13 @@
return 0;
fi
@@ -321,7 +321,7 @@ Index: pkg-ossec/src/init/ossec-server.sh
continue;
fi
-@@ -287,12 +291,12 @@
+@@ -286,12 +290,12 @@
if [ $? = 1 ]; then
echo "Killing ${i} .. ";
@@ -336,3 +336,16 @@ Index: pkg-ossec/src/init/ossec-server.sh
done
+Index: pkg-ossec/src/headers/file_op.h
+===================================================================
+--- pkg-ossec.orig/src/headers/file_op.h 2012-08-29 02:12:29.000000000 +0200
++++ pkg-ossec/src/headers/file_op.h 2012-08-29 02:12:38.000000000 +0200
+@@ -20,7 +20,7 @@
+
+ #define __FILE_H
+
+-#define OS_PIDFILE "/var/run"
++#define OS_PIDFILE "/var/run/ossec-hids"
+
+ /* Set the program name. Must be done before **anything** else */
+ void OS_SetName(char *name);
--
Git repository for pkg-ossec
More information about the Pkg-ossec-devel
mailing list