[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. d15bc9fc080f48e2bb59840e6e01d4cd55926eaf
Javier Fernandez-Sanguino
jfs at debian.org
Sat Sep 1 11:28:27 UTC 2012
The following commit has been merged in the master branch:
commit d15bc9fc080f48e2bb59840e6e01d4cd55926eaf
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date: Thu Aug 30 01:57:25 2012 +0200
Add missing option in rootcheck_control.c
diff --git a/debian/patches/02-add-chroot-option.patch b/debian/patches/02-add-chroot-option.patch
index 8727e3d..9d906a8 100644
--- a/debian/patches/02-add-chroot-option.patch
+++ b/debian/patches/02-add-chroot-option.patch
@@ -23,8 +23,8 @@ Last-Update: 2012-08-26
Index: pkg-ossec/src/os_auth/main-server.c
===================================================================
---- pkg-ossec.orig/src/os_auth/main-server.c 2012-08-28 14:47:51.000000000 +0200
-+++ pkg-ossec/src/os_auth/main-server.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/os_auth/main-server.c 2012-08-30 01:39:37.000000000 +0200
++++ pkg-ossec/src/os_auth/main-server.c 2012-08-30 01:55:42.000000000 +0200
@@ -48,6 +48,7 @@
FILE *fp;
int c, test_config = 0;
@@ -73,8 +73,8 @@ Index: pkg-ossec/src/os_auth/main-server.c
/* Signal manipulation */
Index: pkg-ossec/src/os_csyslogd/main.c
===================================================================
---- pkg-ossec.orig/src/os_csyslogd/main.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/os_csyslogd/main.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/os_csyslogd/main.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/os_csyslogd/main.c 2012-08-30 01:55:41.000000000 +0200
@@ -20,6 +20,7 @@
int main(int argc, char **argv)
{
@@ -130,8 +130,8 @@ Index: pkg-ossec/src/os_csyslogd/main.c
Index: pkg-ossec/src/shared/help.c
===================================================================
---- pkg-ossec.orig/src/shared/help.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/shared/help.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/shared/help.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/shared/help.c 2012-08-30 01:55:41.000000000 +0200
@@ -34,7 +34,9 @@
print_out(" -u <user> Run as 'user'");
print_out(" -g <group> Run as 'group'");
@@ -145,8 +145,8 @@ Index: pkg-ossec/src/shared/help.c
}
Index: pkg-ossec/src/analysisd/analysisd.c
===================================================================
---- pkg-ossec.orig/src/analysisd/analysisd.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/analysisd/analysisd.c 2012-08-28 14:54:02.000000000 +0200
+--- pkg-ossec.orig/src/analysisd/analysisd.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/analysisd/analysisd.c 2012-08-30 01:55:41.000000000 +0200
@@ -132,6 +132,7 @@
#endif
{
@@ -198,8 +198,8 @@ Index: pkg-ossec/src/analysisd/analysisd.c
Index: pkg-ossec/src/analysisd/makelists.c
===================================================================
---- pkg-ossec.orig/src/analysisd/makelists.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/analysisd/makelists.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/analysisd/makelists.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/analysisd/makelists.c 2012-08-30 01:55:41.000000000 +0200
@@ -66,7 +66,9 @@
print_out(" -u <user> Run as 'user'");
print_out(" -g <group> Run as 'group'");
@@ -262,8 +262,8 @@ Index: pkg-ossec/src/analysisd/makelists.c
/* Createing the lists for use in rules */
Index: pkg-ossec/src/os_maild/maild.c
===================================================================
---- pkg-ossec.orig/src/os_maild/maild.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/os_maild/maild.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/os_maild/maild.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/os_maild/maild.c 2012-08-30 01:55:41.000000000 +0200
@@ -31,6 +31,7 @@
int main(int argc, char **argv)
{
@@ -315,8 +315,8 @@ Index: pkg-ossec/src/os_maild/maild.c
/* Changing user */
Index: pkg-ossec/src/addagent/main.c
===================================================================
---- pkg-ossec.orig/src/addagent/main.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/addagent/main.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/addagent/main.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/addagent/main.c 2012-08-30 01:55:41.000000000 +0200
@@ -24,6 +24,8 @@
printf("\t-l List available agents.\n");
printf("\t-e <id> Extracts key for an agent (Manager only).\n");
@@ -384,8 +384,8 @@ Index: pkg-ossec/src/addagent/main.c
#endif
Index: pkg-ossec/src/monitord/main.c
===================================================================
---- pkg-ossec.orig/src/monitord/main.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/monitord/main.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/monitord/main.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/monitord/main.c 2012-08-30 01:55:41.000000000 +0200
@@ -19,6 +19,7 @@
int main(int argc, char **argv)
{
@@ -437,8 +437,8 @@ Index: pkg-ossec/src/monitord/main.c
/* Changing user */
Index: pkg-ossec/src/monitord/report.c
===================================================================
---- pkg-ossec.orig/src/monitord/report.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/monitord/report.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/monitord/report.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/monitord/report.c 2012-08-30 01:55:41.000000000 +0200
@@ -24,6 +24,8 @@
printf("\t-r <filter> <value> Show related entries.\n");
printf("\t-n Creates a description for the report.\n");
@@ -499,8 +499,8 @@ Index: pkg-ossec/src/monitord/report.c
/* Changing user */
Index: pkg-ossec/src/os_dbd/main.c
===================================================================
---- pkg-ossec.orig/src/os_dbd/main.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/os_dbd/main.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/os_dbd/main.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/os_dbd/main.c 2012-08-30 01:55:41.000000000 +0200
@@ -55,6 +55,7 @@
{
int c, test_config = 0, run_foreground = 0;
@@ -554,8 +554,8 @@ Index: pkg-ossec/src/os_dbd/main.c
/* Inserting server info into the db */
Index: pkg-ossec/src/remoted/main.c
===================================================================
---- pkg-ossec.orig/src/remoted/main.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/remoted/main.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/remoted/main.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/remoted/main.c 2012-08-30 01:55:41.000000000 +0200
@@ -20,6 +20,7 @@
int i = 0,c = 0;
int uid = 0, gid = 0;
@@ -612,8 +612,8 @@ Index: pkg-ossec/src/remoted/main.c
/* Starting the signal manipulation */
Index: pkg-ossec/src/util/agent_control.c
===================================================================
---- pkg-ossec.orig/src/util/agent_control.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/util/agent_control.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/util/agent_control.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/util/agent_control.c 2012-08-30 01:55:41.000000000 +0200
@@ -34,6 +34,8 @@
printf("\t-f <ar> Used with -b, specifies which response to run.\n");
printf("\t-L List available active responses.\n");
@@ -679,8 +679,8 @@ Index: pkg-ossec/src/util/agent_control.c
/* Setting the user */
Index: pkg-ossec/src/util/rootcheck_control.c
===================================================================
---- pkg-ossec.orig/src/util/rootcheck_control.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/util/rootcheck_control.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/util/rootcheck_control.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/util/rootcheck_control.c 2012-08-30 01:55:57.000000000 +0200
@@ -34,6 +34,8 @@
printf("\t-q Used with -i, prints all the outstanding issues.\n");
printf("\t-L Used with -i, prints the last scan.\n");
@@ -703,7 +703,7 @@ Index: pkg-ossec/src/util/rootcheck_control.c
- while((c = getopt(argc, argv, "VhqrDdLlcsu:i:")) != -1)
-+ while((c = getopt(argc, argv, "VhqrDdLlcsu:i:N")) != -1)
++ while((c = getopt(argc, argv, "VhqrDdLlcsu:i:NC")) != -1)
{
switch(c){
case 'V':
@@ -746,8 +746,8 @@ Index: pkg-ossec/src/util/rootcheck_control.c
/* Setting the user */
Index: pkg-ossec/src/util/clear_stats.c
===================================================================
---- pkg-ossec.orig/src/util/clear_stats.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/util/clear_stats.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/util/clear_stats.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/util/clear_stats.c 2012-08-30 01:55:42.000000000 +0200
@@ -27,6 +27,8 @@
printf("\t-a Clear all the stats (averages).\n");
printf("\t-d Clear the daily averages.\n");
@@ -869,8 +869,8 @@ Index: pkg-ossec/src/util/clear_stats.c
if(clear_daily)
Index: pkg-ossec/src/util/syscheck_update.c
===================================================================
---- pkg-ossec.orig/src/util/syscheck_update.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/util/syscheck_update.c 2012-08-28 14:54:07.000000000 +0200
+--- pkg-ossec.orig/src/util/syscheck_update.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/util/syscheck_update.c 2012-08-30 01:55:41.000000000 +0200
@@ -27,6 +27,8 @@
printf("\t-a Update syscheck database for all agents.\n");
printf("\t-u <id> Update syscheck database for a specific agent.\n");
@@ -1161,8 +1161,8 @@ Index: pkg-ossec/src/util/syscheck_update.c
Index: pkg-ossec/src/util/syscheck_control.c
===================================================================
---- pkg-ossec.orig/src/util/syscheck_control.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/util/syscheck_control.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/util/syscheck_control.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/util/syscheck_control.c 2012-08-30 01:55:42.000000000 +0200
@@ -36,6 +36,8 @@
printf("\t-z Used with the -f, zeroes the auto-ignore counter.\n");
printf("\t-d Used with the -f, ignores that file.\n");
@@ -1228,8 +1228,8 @@ Index: pkg-ossec/src/util/syscheck_control.c
/* Setting the user */
Index: pkg-ossec/src/client-agent/agentd.c
===================================================================
---- pkg-ossec.orig/src/client-agent/agentd.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/client-agent/agentd.c 2012-08-28 14:47:51.000000000 +0200
+--- pkg-ossec.orig/src/client-agent/agentd.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/client-agent/agentd.c 2012-08-30 01:39:39.000000000 +0200
@@ -24,7 +24,7 @@
/* AgentdStart v0.2, 2005/11/09
* Starts the agent daemon.
@@ -1260,8 +1260,8 @@ Index: pkg-ossec/src/client-agent/agentd.c
if(Privsep_SetUser(uid) < 0)
Index: pkg-ossec/src/client-agent/agentd.h
===================================================================
---- pkg-ossec.orig/src/client-agent/agentd.h 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/client-agent/agentd.h 2012-08-28 14:47:51.000000000 +0200
+--- pkg-ossec.orig/src/client-agent/agentd.h 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/client-agent/agentd.h 2012-08-30 01:39:39.000000000 +0200
@@ -28,7 +28,7 @@
int ClientConf(char *cfgfile);
@@ -1273,8 +1273,8 @@ Index: pkg-ossec/src/client-agent/agentd.h
void *EventForward();
Index: pkg-ossec/src/client-agent/main.c
===================================================================
---- pkg-ossec.orig/src/client-agent/main.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/client-agent/main.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/client-agent/main.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/client-agent/main.c 2012-08-30 01:55:42.000000000 +0200
@@ -42,13 +42,14 @@
int uid = 0;
@@ -1315,8 +1315,8 @@ Index: pkg-ossec/src/client-agent/main.c
return(0);
Index: pkg-ossec/src/util/list_agents.c
===================================================================
---- pkg-ossec.orig/src/util/list_agents.c 2012-08-28 14:47:13.000000000 +0200
-+++ pkg-ossec/src/util/list_agents.c 2012-08-28 14:54:03.000000000 +0200
+--- pkg-ossec.orig/src/util/list_agents.c 2012-08-29 13:44:53.000000000 +0200
++++ pkg-ossec/src/util/list_agents.c 2012-08-30 01:55:42.000000000 +0200
@@ -25,6 +25,8 @@
printf("\t-a List all agents.\n");
printf("\t-c List the connected (active) agents.\n");
--
Git repository for pkg-ossec
More information about the Pkg-ossec-devel
mailing list