[Pkg-nagios-changes] [pkg-nrpe] 03/41: Switch from dpatch to source format 3.0 (quilt).
Bas Couwenberg
sebastic at debian.org
Sun Dec 4 17:53:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pkg-nrpe.
commit 874bc250da6214d08c803e2b0cfa89a79225a4e7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 4 12:42:22 2016 +0100
Switch from dpatch to source format 3.0 (quilt).
---
debian/README.source | 3 --
debian/changelog | 2 ++
debian/control | 2 +-
debian/patches/00list | 6 ----
debian/patches/02_nrpe.cfg_local-include.dpatch | 19 ------------
debian/patches/02_nrpe.cfg_local-include.patch | 15 ++++++++++
debian/patches/03_support_nrpe.d.dpatch | 21 -------------
debian/patches/03_support_nrpe.d.patch | 16 ++++++++++
debian/patches/04_weird_output.dpatch | 13 +++------
debian/patches/05_pid_privileges.dpatch | 27 -----------------
debian/patches/05_pid_privileges.patch | 23 +++++++++++++++
debian/patches/06_pid_directory.dpatch | 19 ------------
debian/patches/06_pid_directory.patch | 15 ++++++++++
...rn_ssloption.dpatch => 07_warn_ssloption.patch} | 13 ++++-----
debian/patches/09_noremove_pid.dpatch | 34 ----------------------
debian/patches/09_noremove_pid.patch | 27 +++++++++++++++++
debian/patches/series | 6 ++++
debian/rules | 5 +---
debian/source/format | 1 +
19 files changed, 116 insertions(+), 151 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 98c5ea4..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses dpatch for its patch management, see
-/usr/share/doc/dpatch/README.source.gz if you are unfamiliar with it.
-
diff --git a/debian/changelog b/debian/changelog
index 0c7199b..c66a41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ nagios-nrpe (2.15-2) UNRELEASED; urgency=medium
* Team upload.
* Add Vcs-* fields to control file.
* Change nagios-plugins dependencies to monitoring-plugins.
+ * Switch from dpatch to source format 3.0 (quilt).
+ (closes: #756410)
-- Bas Couwenberg <sebastic at debian.org> Sun, 04 Dec 2016 12:08:25 +0100
diff --git a/debian/control b/debian/control
index befb09e..9fcd8b7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: nagios-nrpe
Section: net
Priority: optional
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), openssl, dpatch (>= 2.0.32~), libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1)
+Build-Depends: debhelper (>= 9), openssl, libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1)
Standards-Version: 3.9.5
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nagios/pkg-nrpe.git
Vcs-Git: https://anonscm.debian.org/git/pkg-nagios/pkg-nrpe.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index bb9c4e6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-02_nrpe.cfg_local-include.dpatch
-03_support_nrpe.d.dpatch
-05_pid_privileges.dpatch
-06_pid_directory.dpatch
-07_warn_ssloption.dpatch
-09_noremove_pid.dpatch
diff --git a/debian/patches/02_nrpe.cfg_local-include.dpatch b/debian/patches/02_nrpe.cfg_local-include.dpatch
deleted file mode 100755
index 1b3252a..0000000
--- a/debian/patches/02_nrpe.cfg_local-include.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_nrpe.cfg_local-include.dpatch by <seanius at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support nrpe_local.cfg
-
- at DPATCH@
-diff -urNad nagios-nrpe-2.4~/sample-config/nrpe.cfg.in nagios-nrpe-2.4/sample-config/nrpe.cfg.in
---- nagios-nrpe-2.4~/sample-config/nrpe.cfg.in 2006-02-03 23:02:32.000000000 +0100
-+++ nagios-nrpe-2.4/sample-config/nrpe.cfg.in 2006-03-31 07:07:16.000000000 +0200
-@@ -178,3 +178,8 @@
- #command[check_load]=@libexecdir@/check_load -w $ARG1$ -c $ARG2$
- #command[check_disk]=@libexecdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
- #command[check_procs]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
-+
-+#
-+# local configuration:
-+# if you'd prefer, you can instead place directives here
-+include=/etc/nagios/nrpe_local.cfg
diff --git a/debian/patches/02_nrpe.cfg_local-include.patch b/debian/patches/02_nrpe.cfg_local-include.patch
new file mode 100644
index 0000000..848f44f
--- /dev/null
+++ b/debian/patches/02_nrpe.cfg_local-include.patch
@@ -0,0 +1,15 @@
+Description: Support nrpe_local.cfg
+Author: Sean Finney <seanius at debian.org>
+Forwarded: not-needed
+
+--- a/sample-config/nrpe.cfg.in
++++ b/sample-config/nrpe.cfg.in
+@@ -233,3 +233,8 @@ command[check_total_procs]=@libexecdir@/
+ #command[check_load]=@libexecdir@/check_load -w $ARG1$ -c $ARG2$
+ #command[check_disk]=@libexecdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+ #command[check_procs]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
++
++#
++# local configuration:
++# if you'd prefer, you can instead place directives here
++include=/etc/nagios/nrpe_local.cfg
diff --git a/debian/patches/03_support_nrpe.d.dpatch b/debian/patches/03_support_nrpe.d.dpatch
deleted file mode 100755
index 2cdb171..0000000
--- a/debian/patches/03_support_nrpe.d.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_support_nrpe.d.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support an nrpe.d directory
-
- at DPATCH@
-diff -urNad nagios-nrpe-2.8.1~/sample-config/nrpe.cfg.in nagios-nrpe-2.8.1/sample-config/nrpe.cfg.in
---- nagios-nrpe-2.8.1~/sample-config/nrpe.cfg.in 2008-04-15 23:53:48.000000000 +0200
-+++ nagios-nrpe-2.8.1/sample-config/nrpe.cfg.in 2008-04-15 23:54:48.000000000 +0200
-@@ -211,3 +211,9 @@
- # local configuration:
- # if you'd prefer, you can instead place directives here
- include=/etc/nagios/nrpe_local.cfg
-+
-+#
-+# you can place your config snipplets into nrpe.d/
-+# only snipplets ending in .cfg will get included
-+include_dir=/etc/nagios/nrpe.d/
-+
-+
diff --git a/debian/patches/03_support_nrpe.d.patch b/debian/patches/03_support_nrpe.d.patch
new file mode 100644
index 0000000..faabe92
--- /dev/null
+++ b/debian/patches/03_support_nrpe.d.patch
@@ -0,0 +1,16 @@
+Description: Support an nrpe.d directory
+Author: Alexander Wirt <formorer at debian.org>
+Forwarded: not-needed
+
+--- a/sample-config/nrpe.cfg.in
++++ b/sample-config/nrpe.cfg.in
+@@ -238,3 +238,9 @@ command[check_total_procs]=@libexecdir@/
+ # local configuration:
+ # if you'd prefer, you can instead place directives here
+ include=/etc/nagios/nrpe_local.cfg
++
++#
++# you can place your config snipplets into nrpe.d/
++# only snipplets ending in .cfg will get included
++include_dir=/etc/nagios/nrpe.d/
++
diff --git a/debian/patches/04_weird_output.dpatch b/debian/patches/04_weird_output.dpatch
index 85faea1..994bd0c 100755
--- a/debian/patches/04_weird_output.dpatch
+++ b/debian/patches/04_weird_output.dpatch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_weird_output.dpatch by <luk at luknote>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Clean buffer before use
+Description: Clean buffer before use
+Author: Luk Claes <luk at debian.org>
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nrpe~/src/nrpe.c pkg-nrpe/src/nrpe.c
---- pkg-nrpe~/src/nrpe.c 2012-04-30 09:36:53.000000000 +0200
-+++ pkg-nrpe/src/nrpe.c 2012-04-30 09:52:47.890535825 +0200
+--- a/src/nrpe.c 2012-04-30 09:36:53.000000000 +0200
++++ b/src/nrpe.c 2012-04-30 09:52:47.890535825 +0200
@@ -1107,6 +1107,9 @@
/* disable connection alarm - a new alarm will be setup during my_system */
alarm(0);
diff --git a/debian/patches/05_pid_privileges.dpatch b/debian/patches/05_pid_privileges.dpatch
deleted file mode 100755
index cfec725..0000000
--- a/debian/patches/05_pid_privileges.dpatch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_pid_privileges.dpatch by <luk at luknote>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nrpe~/src/nrpe.c pkg-nrpe/src/nrpe.c
---- pkg-nrpe~/src/nrpe.c 2014-05-23 20:42:27.000000000 +0200
-+++ pkg-nrpe/src/nrpe.c 2014-07-15 14:09:45.027422047 +0200
-@@ -317,13 +317,13 @@
- /* log info to syslog facility */
- syslog(LOG_NOTICE,"Starting up daemon");
-
-+ /* drop privileges */
-+ drop_privileges(nrpe_user,nrpe_group);
-+
- /* write pid file */
- if(write_pid_file()==ERROR)
- return STATE_CRITICAL;
-
-- /* drop privileges */
-- drop_privileges(nrpe_user,nrpe_group);
--
- /* make sure we're not root */
- check_privileges();
-
diff --git a/debian/patches/05_pid_privileges.patch b/debian/patches/05_pid_privileges.patch
new file mode 100644
index 0000000..9ea167d
--- /dev/null
+++ b/debian/patches/05_pid_privileges.patch
@@ -0,0 +1,23 @@
+Description: Drop privileges before writing PID file
+Author: Luk Claes <luk at debian.org>
+Bug-Debian: https://bugs.debian.org/498749
+
+--- a/src/nrpe.c
++++ b/src/nrpe.c
+@@ -317,13 +317,13 @@ int main(int argc, char **argv){
+ /* log info to syslog facility */
+ syslog(LOG_NOTICE,"Starting up daemon");
+
++ /* drop privileges */
++ drop_privileges(nrpe_user,nrpe_group);
++
+ /* write pid file */
+ if(write_pid_file()==ERROR)
+ return STATE_CRITICAL;
+
+- /* drop privileges */
+- drop_privileges(nrpe_user,nrpe_group);
+-
+ /* make sure we're not root */
+ check_privileges();
+
diff --git a/debian/patches/06_pid_directory.dpatch b/debian/patches/06_pid_directory.dpatch
deleted file mode 100755
index a3b7e52..0000000
--- a/debian/patches/06_pid_directory.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_pid_directory.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad nagios-nrpe-2.8.1~/sample-config/nrpe.cfg.in nagios-nrpe-2.8.1/sample-config/nrpe.cfg.in
---- nagios-nrpe-2.8.1~/sample-config/nrpe.cfg.in 2007-03-09 19:08:58.000000000 +0100
-+++ nagios-nrpe-2.8.1/sample-config/nrpe.cfg.in 2009-07-06 07:43:09.000000000 +0200
-@@ -16,7 +16,7 @@
- # number. The file is only written if the NRPE daemon is started by the root
- # user and is running in standalone mode.
-
--pid_file=/var/run/nrpe.pid
-+pid_file=/var/run/nagios/nrpe.pid
-
-
-
diff --git a/debian/patches/06_pid_directory.patch b/debian/patches/06_pid_directory.patch
new file mode 100644
index 0000000..4d90602
--- /dev/null
+++ b/debian/patches/06_pid_directory.patch
@@ -0,0 +1,15 @@
+Description: Use /var/run/nagios directory for PID file
+Author: Alexander Wirt <formorer at debian.org>
+Bug-Debian: https://bugs.debian.org/411046
+
+--- a/sample-config/nrpe.cfg.in
++++ b/sample-config/nrpe.cfg.in
+@@ -23,7 +23,7 @@ log_facility=@log_facility@
+ # number. The file is only written if the NRPE daemon is started by the root
+ # user and is running in standalone mode.
+
+-pid_file=/var/run/nrpe.pid
++pid_file=/var/run/nagios/nrpe.pid
+
+
+
diff --git a/debian/patches/07_warn_ssloption.dpatch b/debian/patches/07_warn_ssloption.patch
old mode 100755
new mode 100644
similarity index 68%
rename from debian/patches/07_warn_ssloption.dpatch
rename to debian/patches/07_warn_ssloption.patch
index 5964ccc..453dae1
--- a/debian/patches/07_warn_ssloption.dpatch
+++ b/debian/patches/07_warn_ssloption.patch
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_warn_ssloption.dpatch by Thijs Kinkhorst <thijs at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Warn against inadequateness of NRPE's own SSL option.
+Description: Warn against inadequateness of NRPE's own SSL option.
+Author: Thijs Kinkhorst <thijs at debian.org>
---- a/SECURITY 2013-02-10 15:07:18.000000000 +0100
-+++ b/SECURITY 2013-02-10 15:08:50.000000000 +0100
-@@ -67,14 +67,17 @@
+--- a/SECURITY
++++ b/SECURITY
+@@ -93,14 +93,17 @@ ENCRYPTION
----------
If you do enable support for command arguments in the NRPE daemon,
diff --git a/debian/patches/09_noremove_pid.dpatch b/debian/patches/09_noremove_pid.dpatch
deleted file mode 100755
index ce57531..0000000
--- a/debian/patches/09_noremove_pid.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_noremove_pid.dpatch by <simon.deziel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not remove the PID file after a connection error (original patch
-## DP: from Hiren Patel)
-
-# Author: Hiren Patel
-# From: http://comments.gmane.org/gmane.network.nagios.devel/6774
-# Bug-Debian: #716949
-# Bug-Ubuntu: https://launchpad.net/bugs/1126890
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nrpe~/src/nrpe.c pkg-nrpe/src/nrpe.c
---- pkg-nrpe~/src/nrpe.c 2014-07-15 14:20:02.000000000 +0200
-+++ pkg-nrpe/src/nrpe.c 2014-07-15 14:20:55.775429979 +0200
-@@ -998,7 +998,7 @@
- /* close socket prioer to exiting */
- close(sock);
-
-- return;
-+ exit(STATE_CRITICAL);
- }
-
- /* handle signals */
-@@ -1022,7 +1022,7 @@
- /* close socket prior to exiting */
- close(new_sd);
-
-- return;
-+ exit(STATE_CRITICAL);
- }
-
- /* is this is a blessed machine? */
diff --git a/debian/patches/09_noremove_pid.patch b/debian/patches/09_noremove_pid.patch
new file mode 100644
index 0000000..5cc4cb2
--- /dev/null
+++ b/debian/patches/09_noremove_pid.patch
@@ -0,0 +1,27 @@
+Description: Do not remove the PID file after a connection error.
+ Original patch Hiren Patel.
+Author: Hiren Patel
+Origin: http://comments.gmane.org/gmane.network.nagios.devel/6774
+Bug-Debian: https://bugs.debian.org/716949
+Bug-Ubuntu: https://launchpad.net/bugs/1126890
+
+--- a/src/nrpe.c
++++ b/src/nrpe.c
+@@ -998,7 +998,7 @@ void wait_for_connections(void){
+ /* close socket prioer to exiting */
+ close(sock);
+
+- return;
++ exit(STATE_CRITICAL);
+ }
+
+ /* handle signals */
+@@ -1022,7 +1022,7 @@ void wait_for_connections(void){
+ /* close socket prior to exiting */
+ close(new_sd);
+
+- return;
++ exit(STATE_CRITICAL);
+ }
+
+ /* is this is a blessed machine? */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8aa9efb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+02_nrpe.cfg_local-include.patch
+03_support_nrpe.d.patch
+05_pid_privileges.patch
+06_pid_directory.patch
+07_warn_ssloption.patch
+09_noremove_pid.patch
diff --git a/debian/rules b/debian/rules
index 247b5d8..3e6557a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,8 @@
# newer dpkg set this by default.
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
%:
- dh $@ --with dpatch,autotools_dev
+ dh $@ --with autotools_dev
override_dh_auto_configure:
./configure \
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nrpe.git
More information about the Pkg-nagios-changes
mailing list