[Pkg-nagios-changes] [pkg-lconf] 08/09: Set export user to nagios, while avoiding the Makefile to use user/group

Markus Frosch lazyfrosch-guest at alioth.debian.org
Fri Sep 6 14:26:47 UTC 2013


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

lazyfrosch-guest pushed a commit to branch master
in repository pkg-lconf.

commit 163f8c689094fcf9d26fcd3841b43c1dc1f64e63
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Fri Sep 6 16:15:49 2013 +0200

    Set export user to nagios, while avoiding the Makefile to use user/group
---
 debian/patches/01_avoid_install_with_owners |   17 +++++++++++++++++
 debian/patches/series                       |    1 +
 debian/rules                                |    2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/patches/01_avoid_install_with_owners b/debian/patches/01_avoid_install_with_owners
new file mode 100644
index 0000000..ea5644d
--- /dev/null
+++ b/debian/patches/01_avoid_install_with_owners
@@ -0,0 +1,17 @@
+Description: Makefile should not use user/group for install
+Author: Markus Frosch <markus at lazyfrosch.de>
+Last-Update: 2013-09-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -68,7 +68,8 @@
+ LDAP_CONFIG_STYLE=@ldap_config_style@
+ 
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=-o $(LCONF_CLI_USER) -g $(LCONF_CLI_GROUP)
++#INSTALL_OPTS=-o $(LCONF_CLI_USER) -g $(LCONF_CLI_GROUP)
++INSTALL_OPTS=
+ 
+ ifeq ($(LDAP_CONFIG_STYLE),old)
+ 	LDAP_CONFIG_STYLE="old (with slapd.conf)"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..776b986
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_avoid_install_with_owners
diff --git a/debian/rules b/debian/rules
index b3aefd3..1881ecc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--with-lconf-cli-user=root --with-lconf-cli-group=bin \
+		--with-lconf-cli-user=nagios --with-lconf-cli-group=nagios \
 		--bindir=/usr/lib/lconf/bin \
 		--sysconfdir=/etc/lconf \
 		--libdir=/usr/lib/lconf/lib \

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



More information about the Pkg-nagios-changes mailing list