[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:25 UTC 2012
The following commit has been merged in the master branch:
commit 21d7c7f8126028d5b227b7c5a152fa9729a919c0
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date: Sun Aug 26 14:04:35 2012 +0200
Clarify the -D option (it also means changing directory now)
diff --git a/debian/patches/02-add-chroot-option.patch b/debian/patches/02-add-chroot-option.patch
index c17fef8..ccf2ff4 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-26 13:49:00.000000000 +0200
-+++ pkg-ossec/src/os_auth/main-server.c 2012-08-26 13:51:56.000000000 +0200
+--- pkg-ossec.orig/src/os_auth/main-server.c 2012-08-26 13:54:55.000000000 +0200
++++ pkg-ossec/src/os_auth/main-server.c 2012-08-26 14:02:22.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-26 13:47:38.000000000 +0200
-+++ pkg-ossec/src/os_csyslogd/main.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/os_csyslogd/main.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/os_csyslogd/main.c 2012-08-26 14:02:21.000000000 +0200
@@ -20,6 +20,7 @@
int main(int argc, char **argv)
{
@@ -130,12 +130,14 @@ Index: pkg-ossec/src/os_csyslogd/main.c
Index: pkg-ossec/src/shared/help.c
===================================================================
---- pkg-ossec.orig/src/shared/help.c 2012-08-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/shared/help.c 2012-08-26 13:49:01.000000000 +0200
-@@ -35,6 +35,8 @@
+--- pkg-ossec.orig/src/shared/help.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/shared/help.c 2012-08-26 14:04:02.000000000 +0200
+@@ -34,7 +34,9 @@
+ print_out(" -u <user> Run as 'user'");
print_out(" -g <group> Run as 'group'");
print_out(" -c <config> Read the 'config' file");
- print_out(" -D <dir> Chroot to 'dir'");
+- print_out(" -D <dir> Chroot to 'dir'");
++ print_out(" -D <dir> Chroot or change working directory to 'dir'");
+ print_out(" -N Do not chroot");
+ print_out(" -C Chroot the program (default behaviour)");
print_out(" ");
@@ -143,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-26 13:47:38.000000000 +0200
-+++ pkg-ossec/src/analysisd/analysisd.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/analysisd/analysisd.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/analysisd/analysisd.c 2012-08-26 14:02:21.000000000 +0200
@@ -132,6 +132,7 @@
#endif
{
@@ -196,12 +198,14 @@ Index: pkg-ossec/src/analysisd/analysisd.c
Index: pkg-ossec/src/analysisd/makelists.c
===================================================================
---- pkg-ossec.orig/src/analysisd/makelists.c 2012-08-26 13:47:38.000000000 +0200
-+++ pkg-ossec/src/analysisd/makelists.c 2012-08-26 13:49:01.000000000 +0200
-@@ -67,6 +67,8 @@
+--- pkg-ossec.orig/src/analysisd/makelists.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/analysisd/makelists.c 2012-08-26 14:04:08.000000000 +0200
+@@ -66,7 +66,9 @@
+ print_out(" -u <user> Run as 'user'");
print_out(" -g <group> Run as 'group'");
print_out(" -c <config> Read the 'config' file");
- print_out(" -D <dir> Chroot to 'dir'");
+- print_out(" -D <dir> Chroot to 'dir'");
++ print_out(" -D <dir> Chroot or change working directory to 'dir'");
+ print_out(" -N Do not chroot");
+ print_out(" -C Chroot the daemon (default behaviour)");
print_out(" ");
@@ -258,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-26 13:47:38.000000000 +0200
-+++ pkg-ossec/src/os_maild/maild.c 2012-08-26 13:49:42.000000000 +0200
+--- pkg-ossec.orig/src/os_maild/maild.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/os_maild/maild.c 2012-08-26 14:02:21.000000000 +0200
@@ -31,6 +31,7 @@
int main(int argc, char **argv)
{
@@ -311,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/addagent/main.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/addagent/main.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/addagent/main.c 2012-08-26 14:02:22.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");
@@ -380,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/monitord/main.c 2012-08-26 13:50:33.000000000 +0200
+--- pkg-ossec.orig/src/monitord/main.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/monitord/main.c 2012-08-26 14:02:22.000000000 +0200
@@ -19,6 +19,7 @@
int main(int argc, char **argv)
{
@@ -433,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/monitord/report.c 2012-08-26 13:50:08.000000000 +0200
+--- pkg-ossec.orig/src/monitord/report.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/monitord/report.c 2012-08-26 14:02:21.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");
@@ -495,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/os_dbd/main.c 2012-08-26 13:50:58.000000000 +0200
+--- pkg-ossec.orig/src/os_dbd/main.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/os_dbd/main.c 2012-08-26 14:02:22.000000000 +0200
@@ -55,6 +55,7 @@
{
int c, test_config = 0, run_foreground = 0;
@@ -550,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/remoted/main.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/remoted/main.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/remoted/main.c 2012-08-26 14:02:22.000000000 +0200
@@ -20,6 +20,7 @@
int i = 0,c = 0;
int uid = 0, gid = 0;
@@ -608,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/util/agent_control.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/util/agent_control.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/util/agent_control.c 2012-08-26 14:02:22.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");
@@ -675,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/util/rootcheck_control.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/util/rootcheck_control.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/util/rootcheck_control.c 2012-08-26 14:02:22.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");
@@ -742,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/util/clear_stats.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/util/clear_stats.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/util/clear_stats.c 2012-08-26 14:02:22.000000000 +0200
@@ -27,6 +27,8 @@
printf("\t-a Clear all the stats (averages).\n");
printf("\t-d Clear the daily averages.\n");
@@ -864,8 +868,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/util/syscheck_update.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/util/syscheck_update.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/util/syscheck_update.c 2012-08-26 14:02:22.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");
@@ -1155,9 +1159,18 @@ 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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/util/syscheck_control.c 2012-08-26 13:49:01.000000000 +0200
-@@ -51,6 +51,7 @@
+--- pkg-ossec.orig/src/util/syscheck_control.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/util/syscheck_control.c 2012-08-26 14:02:22.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");
+ printf("\t-s Changes the output to CSV (comma delimited).\n");
++ printf("\t-N Do not chroot.\n");
++ printf("\t-C Chroot the program (default behaviour).\n");
+ exit(1);
+ }
+
+@@ -51,6 +53,7 @@
int gid = 0;
int uid = 0;
@@ -1165,7 +1178,7 @@ Index: pkg-ossec/src/util/syscheck_control.c
int c = 0, info_agent = 0, update_syscheck = 0,
list_agents = 0, zero_counter = 0,
registry_only = 0;
-@@ -71,7 +72,7 @@
+@@ -71,7 +74,7 @@
}
@@ -1174,7 +1187,7 @@ Index: pkg-ossec/src/util/syscheck_control.c
{
switch(c){
case 'V':
-@@ -126,6 +127,12 @@
+@@ -126,6 +129,12 @@
agent_id = optarg;
update_syscheck = 1;
break;
@@ -1187,7 +1200,7 @@ Index: pkg-ossec/src/util/syscheck_control.c
default:
helpmsg();
break;
-@@ -151,14 +158,16 @@
+@@ -151,14 +160,16 @@
/* Chrooting to the default directory */
@@ -1213,8 +1226,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/client-agent/agentd.c 2012-08-26 13:53:41.000000000 +0200
+--- pkg-ossec.orig/src/client-agent/agentd.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/client-agent/agentd.c 2012-08-26 13:54:58.000000000 +0200
@@ -24,7 +24,7 @@
/* AgentdStart v0.2, 2005/11/09
* Starts the agent daemon.
@@ -1245,8 +1258,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/client-agent/agentd.h 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/client-agent/agentd.h 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/client-agent/agentd.h 2012-08-26 13:54:58.000000000 +0200
@@ -28,7 +28,7 @@
int ClientConf(char *cfgfile);
@@ -1258,8 +1271,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/client-agent/main.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/client-agent/main.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/client-agent/main.c 2012-08-26 14:02:22.000000000 +0200
@@ -42,13 +42,14 @@
int uid = 0;
@@ -1300,8 +1313,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-26 13:47:39.000000000 +0200
-+++ pkg-ossec/src/util/list_agents.c 2012-08-26 13:49:01.000000000 +0200
+--- pkg-ossec.orig/src/util/list_agents.c 2012-08-26 13:54:06.000000000 +0200
++++ pkg-ossec/src/util/list_agents.c 2012-08-26 14:02:22.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