[Pkg-ossec-devel] [pkg-ossec] 15/18: Updating patch #03 to 2.7.1-beta-1 upstream version.

[Jose Antonio Quevedo Muñoz]

This is an automated email from the git hooks/post-receive script.

jaqm-guest pushed a commit to branch debian
in repository pkg-ossec.

commit bdc20a50bbb228142f920888c69461517513ca33
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Tue Aug 13 16:00:00 2013 +0200

    Updating patch #03 to 2.7.1-beta-1 upstream version.
---
 debian/patches/03-disable-chroot-default.patch |   33 +++++++++++-------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/debian/patches/03-disable-chroot-default.patch b/debian/patches/03-disable-chroot-default.patch
index 9740e78..10d6045 100644
--- a/debian/patches/03-disable-chroot-default.patch
+++ b/debian/patches/03-disable-chroot-default.patch
@@ -21,12 +21,10 @@ Last-Update: 2012-08-26
 
 --- a/src/addagent/main.c
 +++ b/src/addagent/main.c
-@@ -25,8 +25,8 @@
+@@ -25,6 +25,8 @@
      printf("\t-l          List available agents.\n");
      printf("\t-e <id>     Extracts key for an agent (Manager only).\n");
      printf("\t-i <id>     Import authentication key (Agent only).\n");
--    printf("\t-N          Do not chroot.\n");
--    printf("\t-C          Chroot the program (default behaviour).\n");
 +    printf("\t-N          Do not chroot (default behaviour).\n");
 +    printf("\t-C          Chroot the program.\n");
      printf("\t-f <file>   Bulk generate client keys from file. (Manager only).\n");
@@ -71,7 +69,7 @@ Last-Update: 2012-08-26
  
      int uid = 0;
      int gid = 0;
--    int do_chroot = 1;
+-
 +    int do_chroot = 0;
  
      /* Setting the name */
@@ -155,11 +153,10 @@ Last-Update: 2012-08-26
      char *user = MAILUSER;
 --- a/src/remoted/main.c
 +++ b/src/remoted/main.c
-@@ -21,7 +21,7 @@
+@@ -21,6 +21,7 @@
      int i = 0,c = 0;
      int uid = 0, gid = 0;
      int test_config = 0,run_foreground = 0;
--    int do_chroot = 1;
 +    int do_chroot = 0;
  
      char *cfg = DEFAULTCPATH;
@@ -212,15 +209,15 @@ Last-Update: 2012-08-26
      exit(1);
  }
  
-@@ -46,7 +46,7 @@
+@@ -45,7 +45,7 @@
+     char *user = USER;
      int gid;
      int uid;
-     int c;	       
--    int do_chroot = 1;
+-
 +    int do_chroot = 0;
  
- 
      /* Setting the name */
+     OS_SetName(ARGV0);
 --- a/src/util/list_agents.c
 +++ b/src/util/list_agents.c
 @@ -26,8 +26,8 @@
@@ -234,11 +231,11 @@ Last-Update: 2012-08-26
      exit(1);
  }
  
-@@ -45,7 +45,7 @@
+@@ -44,7 +44,7 @@
+     int gid;
      int uid;
      int flag;
-     int c;
--    int do_chroot = 1;
+-
 +    int do_chroot = 0;
  
      /* Setting the name */
@@ -300,12 +297,12 @@ Last-Update: 2012-08-26
      printf("\t-u local Update (clear) syscheck database locally.\n\n");
      exit(1);
  }
-@@ -42,7 +42,7 @@
+@@ -41,7 +41,7 @@
+     char *user = USER;
      int gid;
      int uid;
-     int c;
--    int do_chroot = 1;
+-
 +    int do_chroot = 0;
-     int list_agents, update_agents = 0;
-     char *agent_id = NULL;
  
+     /* Setting the name */
+     OS_SetName(ARGV0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ossec/pkg-ossec.git