[Pkg-nagios-changes] [SCM] Debian packaging for mod gearman. branch, master, updated. f5edd3e88aa2138dcf6d044c835fbd0ada944168

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit 76887eabbbafc956f2bf0a6b511a3cda4def9e24
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Fri Feb 4 17:09:15 2011 +0100

    Refresh debian/patches from patch queue

diff --git a/debian/patches/0001-The-nagios-user-does-not-necessarily-exist-on-the-bu.patch b/debian/patches/0001-The-nagios-user-does-not-necessarily-exist-on-the-bu.patch
new file mode 100644
index 0000000..48a2c2d
--- /dev/null
+++ b/debian/patches/0001-The-nagios-user-does-not-necessarily-exist-on-the-bu.patch
@@ -0,0 +1,48 @@
+From: Stig Sandbeck Mathisen <ssm at debian.org>
+Date: Fri, 4 Feb 2011 16:49:36 +0100
+Subject: [PATCH] The "nagios" user does not necessarily exist on the build host
+
+---
+ Makefile.am  |    7 +------
+ configure.ac |    9 ---------
+ 2 files changed, 1 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index afb058c..a7c5dd3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -151,12 +151,7 @@ install-exec-local: install-local-state-dir
+ 
+ install-local-state-dir:
+ 	$(RM) $(DESTDIR)$(pkglibdir)/mod_gearman.so
+-	if [ `id -u` -eq 0 ]; then \
+-	    $(install_sh_PROGRAM) -o $(user) -d $(DESTDIR)$(localstatedir)/mod_gearman/; \
+-    else \
+-	    $(install_sh_PROGRAM) -o $(user) -d $(DESTDIR)$(localstatedir)/mod_gearman/; \
+-        echo "*** You should run: sudo chown $(user) $(DESTDIR)$(localstatedir)/mod_gearman/"; \
+-    fi
++	$(install_sh_PROGRAM) -d $(DESTDIR)$(localstatedir)/mod_gearman
+ 
+ install-data-local: install-local-state-dir
+ 	$(install_sh_PROGRAM) -m 644 extras/shared.conf            $(DESTDIR)$(datadir)/mod_gearman/shared.conf
+diff --git a/configure.ac b/configure.ac
+index 748a1ef..b697ced 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,15 +56,6 @@ AC_ARG_WITH([user],
+ user="$with_user"
+ AC_SUBST(user)
+ 
+-AC_MSG_CHECKING(if user $user exists)
+-id -a $user > /dev/null 2>&1
+-if test "$?" != "0" ; then
+-    AC_MSG_RESULT(no)
+-    AC_MSG_ERROR(user $user does not exist)
+-else
+-    AC_MSG_RESULT(yes)
+-fi
+-
+ ##############################################
+ # Check some functions
+ AC_CHECK_FUNCS([gettimeofday strdup strchr strstr strtoul alarm gethostname memset strcspn strerror atexit gethostbyname socket])
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3215dfc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-The-nagios-user-does-not-necessarily-exist-on-the-bu.patch

-- 
Debian packaging for mod gearman.