[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, debian, updated. f89fb2c00b1a2606035e5cd0e35b4ebe99f049ac
Javier Fernandez-Sanguino
jfs at debian.org
Wed Aug 29 12:57:43 UTC 2012
The following commit has been merged in the debian branch:
commit 79c2e4a8284b1a9046e60ef71ed9faa95a86b6aa
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date: Tue Aug 28 14:52:22 2012 +0200
Refresh patch due to changes in 02 patch
diff --git a/debian/patches/03-disable-chroot-default.patch b/debian/patches/03-disable-chroot-default.patch
index 4389654..be22a6f 100644
--- a/debian/patches/03-disable-chroot-default.patch
+++ b/debian/patches/03-disable-chroot-default.patch
@@ -21,8 +21,8 @@ Last-Update: 2012-08-26
Index: pkg-ossec/src/addagent/main.c
===================================================================
---- pkg-ossec.orig/src/addagent/main.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/addagent/main.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/addagent/main.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/addagent/main.c 2012-08-28 14:51:12.000000000 +0200
@@ -24,8 +24,8 @@
printf("\t-l List available agents.\n");
printf("\t-e <id> Extracts key for an agent (Manager only).\n");
@@ -36,8 +36,8 @@ Index: pkg-ossec/src/addagent/main.c
Index: pkg-ossec/src/analysisd/analysisd.c
===================================================================
---- pkg-ossec.orig/src/analysisd/analysisd.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/analysisd/analysisd.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/analysisd/analysisd.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/analysisd/analysisd.c 2012-08-28 14:51:12.000000000 +0200
@@ -132,7 +132,7 @@
#endif
{
@@ -49,8 +49,8 @@ Index: pkg-ossec/src/analysisd/analysisd.c
char *group = GROUPGLOBAL;
Index: pkg-ossec/src/analysisd/makelists.c
===================================================================
---- pkg-ossec.orig/src/analysisd/makelists.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/analysisd/makelists.c 2012-08-28 14:39:58.000000000 +0200
+--- pkg-ossec.orig/src/analysisd/makelists.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/analysisd/makelists.c 2012-08-28 14:51:12.000000000 +0200
@@ -67,8 +67,8 @@
print_out(" -g <group> Run as 'group'");
print_out(" -c <config> Read the 'config' file");
@@ -73,8 +73,8 @@ Index: pkg-ossec/src/analysisd/makelists.c
char *group = GROUPGLOBAL;
Index: pkg-ossec/src/client-agent/main.c
===================================================================
---- pkg-ossec.orig/src/client-agent/main.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/client-agent/main.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/client-agent/main.c 2012-08-28 14:48:48.000000000 +0200
++++ pkg-ossec/src/client-agent/main.c 2012-08-28 14:51:12.000000000 +0200
@@ -42,7 +42,7 @@
int uid = 0;
@@ -86,8 +86,8 @@ Index: pkg-ossec/src/client-agent/main.c
/* Setting the name */
Index: pkg-ossec/src/monitord/main.c
===================================================================
---- pkg-ossec.orig/src/monitord/main.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/monitord/main.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/monitord/main.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/monitord/main.c 2012-08-28 14:51:12.000000000 +0200
@@ -19,7 +19,7 @@
int main(int argc, char **argv)
{
@@ -99,8 +99,8 @@ Index: pkg-ossec/src/monitord/main.c
char *user = USER;
Index: pkg-ossec/src/monitord/report.c
===================================================================
---- pkg-ossec.orig/src/monitord/report.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/monitord/report.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/monitord/report.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/monitord/report.c 2012-08-28 14:51:12.000000000 +0200
@@ -24,8 +24,8 @@
printf("\t-r <filter> <value> Show related entries.\n");
printf("\t-n Creates a description for the report.\n");
@@ -123,8 +123,8 @@ Index: pkg-ossec/src/monitord/report.c
char *group = GROUPGLOBAL;
Index: pkg-ossec/src/os_auth/main-server.c
===================================================================
---- pkg-ossec.orig/src/os_auth/main-server.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/os_auth/main-server.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/os_auth/main-server.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/os_auth/main-server.c 2012-08-28 14:51:12.000000000 +0200
@@ -48,7 +48,7 @@
FILE *fp;
int c, test_config = 0;
@@ -136,8 +136,8 @@ Index: pkg-ossec/src/os_auth/main-server.c
char *group = GROUPGLOBAL;
Index: pkg-ossec/src/os_csyslogd/main.c
===================================================================
---- pkg-ossec.orig/src/os_csyslogd/main.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/os_csyslogd/main.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/os_csyslogd/main.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/os_csyslogd/main.c 2012-08-28 14:51:12.000000000 +0200
@@ -20,7 +20,7 @@
int main(int argc, char **argv)
{
@@ -149,8 +149,8 @@ Index: pkg-ossec/src/os_csyslogd/main.c
/* Using MAILUSER (read only) */
Index: pkg-ossec/src/os_dbd/main.c
===================================================================
---- pkg-ossec.orig/src/os_dbd/main.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/os_dbd/main.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/os_dbd/main.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/os_dbd/main.c 2012-08-28 14:51:12.000000000 +0200
@@ -55,7 +55,7 @@
{
int c, test_config = 0, run_foreground = 0;
@@ -162,8 +162,8 @@ Index: pkg-ossec/src/os_dbd/main.c
char *dir = DEFAULTDIR;
Index: pkg-ossec/src/os_maild/maild.c
===================================================================
---- pkg-ossec.orig/src/os_maild/maild.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/os_maild/maild.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/os_maild/maild.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/os_maild/maild.c 2012-08-28 14:51:12.000000000 +0200
@@ -31,7 +31,7 @@
int main(int argc, char **argv)
{
@@ -175,8 +175,8 @@ Index: pkg-ossec/src/os_maild/maild.c
char *user = MAILUSER;
Index: pkg-ossec/src/remoted/main.c
===================================================================
---- pkg-ossec.orig/src/remoted/main.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/remoted/main.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/remoted/main.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/remoted/main.c 2012-08-28 14:51:12.000000000 +0200
@@ -20,7 +20,7 @@
int i = 0,c = 0;
int uid = 0, gid = 0;
@@ -188,8 +188,8 @@ Index: pkg-ossec/src/remoted/main.c
char *dir = DEFAULTDIR;
Index: pkg-ossec/src/shared/help.c
===================================================================
---- pkg-ossec.orig/src/shared/help.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/shared/help.c 2012-08-28 14:40:33.000000000 +0200
+--- pkg-ossec.orig/src/shared/help.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/shared/help.c 2012-08-28 14:51:12.000000000 +0200
@@ -35,8 +35,8 @@
print_out(" -g <group> Run as 'group'");
print_out(" -c <config> Read the 'config' file");
@@ -203,8 +203,8 @@ Index: pkg-ossec/src/shared/help.c
}
Index: pkg-ossec/src/util/agent_control.c
===================================================================
---- pkg-ossec.orig/src/util/agent_control.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/util/agent_control.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/util/agent_control.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/util/agent_control.c 2012-08-28 14:51:12.000000000 +0200
@@ -34,8 +34,8 @@
printf("\t-f <ar> Used with -b, specifies which response to run.\n");
printf("\t-L List available active responses.\n");
@@ -227,8 +227,8 @@ Index: pkg-ossec/src/util/agent_control.c
Index: pkg-ossec/src/util/clear_stats.c
===================================================================
---- pkg-ossec.orig/src/util/clear_stats.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/util/clear_stats.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/util/clear_stats.c 2012-08-28 14:50:19.000000000 +0200
++++ pkg-ossec/src/util/clear_stats.c 2012-08-28 14:51:30.000000000 +0200
@@ -27,8 +27,8 @@
printf("\t-a Clear all the stats (averages).\n");
printf("\t-d Clear the daily averages.\n");
@@ -240,10 +240,10 @@ Index: pkg-ossec/src/util/clear_stats.c
exit(1);
}
-@@ -44,7 +44,7 @@
- char *user = USER;
+@@ -45,7 +45,7 @@
int gid;
int uid;
+ int c;
- int do_chroot = 1;
+ int do_chroot = 0;
@@ -251,8 +251,8 @@ Index: pkg-ossec/src/util/clear_stats.c
/* Setting the name */
Index: pkg-ossec/src/util/list_agents.c
===================================================================
---- pkg-ossec.orig/src/util/list_agents.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/util/list_agents.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/util/list_agents.c 2012-08-28 14:50:40.000000000 +0200
++++ pkg-ossec/src/util/list_agents.c 2012-08-28 14:51:56.000000000 +0200
@@ -25,8 +25,8 @@
printf("\t-a List all agents.\n");
printf("\t-c List the connected (active) agents.\n");
@@ -264,10 +264,10 @@ Index: pkg-ossec/src/util/list_agents.c
exit(1);
}
-@@ -43,7 +43,7 @@
- int gid;
+@@ -44,7 +44,7 @@
int uid;
int flag;
+ int c;
- int do_chroot = 1;
+ int do_chroot = 0;
@@ -275,8 +275,8 @@ Index: pkg-ossec/src/util/list_agents.c
/* Setting the name */
Index: pkg-ossec/src/util/rootcheck_control.c
===================================================================
---- pkg-ossec.orig/src/util/rootcheck_control.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/util/rootcheck_control.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/util/rootcheck_control.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/util/rootcheck_control.c 2012-08-28 14:51:12.000000000 +0200
@@ -34,8 +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");
@@ -299,8 +299,8 @@ Index: pkg-ossec/src/util/rootcheck_control.c
resolved_only = 0;
Index: pkg-ossec/src/util/syscheck_control.c
===================================================================
---- pkg-ossec.orig/src/util/syscheck_control.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/util/syscheck_control.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/util/syscheck_control.c 2012-08-28 14:48:47.000000000 +0200
++++ pkg-ossec/src/util/syscheck_control.c 2012-08-28 14:51:12.000000000 +0200
@@ -36,8 +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");
@@ -323,8 +323,8 @@ Index: pkg-ossec/src/util/syscheck_control.c
registry_only = 0;
Index: pkg-ossec/src/util/syscheck_update.c
===================================================================
---- pkg-ossec.orig/src/util/syscheck_update.c 2012-08-28 14:38:40.000000000 +0200
-+++ pkg-ossec/src/util/syscheck_update.c 2012-08-28 14:39:06.000000000 +0200
+--- pkg-ossec.orig/src/util/syscheck_update.c 2012-08-28 14:49:48.000000000 +0200
++++ pkg-ossec/src/util/syscheck_update.c 2012-08-28 14:51:45.000000000 +0200
@@ -27,8 +27,8 @@
printf("\t-a Update syscheck database for all agents.\n");
printf("\t-u <id> Update syscheck database for a specific agent.\n");
@@ -336,10 +336,10 @@ Index: pkg-ossec/src/util/syscheck_update.c
exit(1);
}
-@@ -41,7 +41,7 @@
- char *user = USER;
+@@ -42,7 +42,7 @@
int gid;
int uid;
+ int c;
- int do_chroot = 1;
+ int do_chroot = 0;
int list_agents, update_agents = 0;
--
Git repository for pkg-ossec
More information about the Pkg-ossec-devel
mailing list