[Pkg-nagios-changes] [pkg-nsca] 04/25: Switch from dpatch to source format 3.0 (quilt).
Bas Couwenberg
sebastic at debian.org
Mon Dec 5 07:08:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pkg-nsca.
commit 905b8957c209bda02ce135982733113a88f9ad73
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 4 20:28:57 2016 +0100
Switch from dpatch to source format 3.0 (quilt).
---
debian/README.source | 38 ------------------
debian/changelog | 1 +
debian/control | 1 -
debian/patches/00list | 4 --
debian/patches/01_send_nsca.cfg.dpatch | 17 --------
debian/patches/01_send_nsca.cfg.patch | 14 +++++++
..._foreground.dpatch => 02_nsca_foreground.patch} | 24 +++++------
..._to_stderr.dpatch => 03_errors_to_stderr.patch} | 46 ++++++++++------------
...s.dpatch => 04_nsca.cfg_nagios_vs_nagios.patch} | 17 +++-----
debian/patches/series | 4 ++
debian/rules | 4 +-
debian/source.lintian-overrides | 1 -
debian/source/format | 1 +
13 files changed, 57 insertions(+), 115 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index fc98b3d..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,38 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
----
-
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer at debian.org>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index 141f6a9..359ff08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ nsca (2.9.1-4) UNRELEASED; urgency=medium
* Add Vcs-* fields to control file.
* Restructure control file with cme.
* Add Homepage field to control file.
+ * Switch from dpatch to source format 3.0 (quilt).
-- Bas Couwenberg <sebastic at debian.org> Sun, 04 Dec 2016 00:04:22 +0100
diff --git a/debian/control b/debian/control
index 53302e6..e828541 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Uploaders: Alexander Wirt <formorer at debian.org>
Section: net
Priority: optional
Build-Depends: libmcrypt-dev,
- dpatch (>= 2.0.32~),
debhelper (>= 7.0.50~),
po-debconf
Standards-Version: 3.9.2
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5e233ea..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_send_nsca.cfg.dpatch
-02_nsca_foreground.dpatch
-03_errors_to_stderr.dpatch
-04_nsca.cfg_nagios_vs_nagios.dpatch
diff --git a/debian/patches/01_send_nsca.cfg.dpatch b/debian/patches/01_send_nsca.cfg.dpatch
deleted file mode 100755
index eea8be6..0000000
--- a/debian/patches/01_send_nsca.cfg.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_send_nsca.cfg.dpatch by <seanius at debian.org>
-##
-## DP: default to /etc/send_nsca.cfg instead of ./send_nsca.cfg
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nsca~/src/send_nsca.c pkg-nsca/src/send_nsca.c
---- pkg-nsca~/src/send_nsca.c 2011-11-29 08:40:05.000000000 +0100
-+++ pkg-nsca/src/send_nsca.c 2011-11-29 18:24:26.328039621 +0100
-@@ -25,7 +25,7 @@
- int server_port=DEFAULT_SERVER_PORT;
- char server_name[MAX_HOST_ADDRESS_LENGTH];
- char password[MAX_INPUT_BUFFER]="";
--char config_file[MAX_INPUT_BUFFER]="send_nsca.cfg";
-+char config_file[MAX_INPUT_BUFFER]="/etc/send_nsca.cfg";
- char delimiter[2]="\t";
- char block_delimiter[2]=BLOCK_DELIMITER;
diff --git a/debian/patches/01_send_nsca.cfg.patch b/debian/patches/01_send_nsca.cfg.patch
new file mode 100644
index 0000000..a742b2e
--- /dev/null
+++ b/debian/patches/01_send_nsca.cfg.patch
@@ -0,0 +1,14 @@
+Description: default to /etc/send_nsca.cfg instead of ./send_nsca.cfg
+Author: Sean Finney <seanius at debian.org>
+
+--- a/src/send_nsca.c
++++ b/src/send_nsca.c
+@@ -25,7 +25,7 @@ time_t start_time,end_time;
+ int server_port=DEFAULT_SERVER_PORT;
+ char server_name[MAX_HOST_ADDRESS_LENGTH];
+ char password[MAX_INPUT_BUFFER]="";
+-char config_file[MAX_INPUT_BUFFER]="send_nsca.cfg";
++char config_file[MAX_INPUT_BUFFER]="/etc/send_nsca.cfg";
+ char delimiter[2]="\t";
+ char block_delimiter[2]=BLOCK_DELIMITER;
+
diff --git a/debian/patches/02_nsca_foreground.dpatch b/debian/patches/02_nsca_foreground.patch
old mode 100755
new mode 100644
similarity index 66%
rename from debian/patches/02_nsca_foreground.dpatch
rename to debian/patches/02_nsca_foreground.patch
index 6470349..a643c5e
--- a/debian/patches/02_nsca_foreground.dpatch
+++ b/debian/patches/02_nsca_foreground.patch
@@ -1,15 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_nsca_foreground.dpatch by <seanius at debian.org>
-##
-## DP: allow nsca to run in the foreground, which makes
-## DP: starting/stopping/restarting easier as we can use
-## DP: external tools like s-s-d to track the pid
+Description: Allow nsca to run in the foreground.
+ It makes starting/stopping/restarting easier as we can use
+ external tools like s-s-d to track the PID.
+Author: Sean Finney <seanius at debian.org>
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nsca~/src/nsca.c pkg-nsca/src/nsca.c
---- pkg-nsca~/src/nsca.c 2011-11-29 08:40:05.000000000 +0100
-+++ pkg-nsca/src/nsca.c 2011-11-29 18:29:39.308036635 +0100
-@@ -54,6 +54,8 @@
+--- a/src/nsca.c
++++ b/src/nsca.c
+@@ -54,6 +54,8 @@ int show_help=FALSE;
int show_license=FALSE;
int show_version=FALSE;
@@ -18,7 +14,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
int sigrestart=FALSE;
int sigshutdown=FALSE;
-@@ -112,10 +114,11 @@
+@@ -112,10 +114,11 @@ int main(int argc, char **argv){
}
if(result!=OK || show_help==TRUE){
@@ -31,7 +27,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
printf(" [mode] = Determines how NSCA should run. Valid modes:\n");
printf(" --inetd = Run as a service under inetd or xinetd\n");
printf(" --daemon = Run as a standalone multi-process daemon\n");
-@@ -198,7 +201,7 @@
+@@ -198,7 +201,7 @@ int main(int argc, char **argv){
V */
/* daemonize and start listening for requests... */
@@ -40,7 +36,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
/* we're a daemon - set up a new process group */
setsid();
-@@ -1378,6 +1381,10 @@
+@@ -1375,6 +1378,10 @@ int process_arguments(int argc, char **a
else if(!strcmp(argv[x-1],"-V") || !strcmp(argv[x-1],"--version"))
show_version=TRUE;
diff --git a/debian/patches/03_errors_to_stderr.dpatch b/debian/patches/03_errors_to_stderr.patch
old mode 100755
new mode 100644
similarity index 76%
rename from debian/patches/03_errors_to_stderr.dpatch
rename to debian/patches/03_errors_to_stderr.patch
index 35631e6..f4520db
--- a/debian/patches/03_errors_to_stderr.dpatch
+++ b/debian/patches/03_errors_to_stderr.patch
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_errors_to_stderr.dpatch by <seanius at debian.org>
-##
-## DP: send errors to stderr, where they belong
+Description: Send errors to stderr, where they belong.
+Author: Sean Finney <seanius at debian.org>
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nsca~/src/netutils.c pkg-nsca/src/netutils.c
---- pkg-nsca~/src/netutils.c 2011-11-29 08:40:05.000000000 +0100
-+++ pkg-nsca/src/netutils.c 2011-12-04 07:58:33.258095494 +0100
-@@ -61,7 +61,7 @@
+--- a/src/netutils.c
++++ b/src/netutils.c
+@@ -61,7 +61,7 @@ int my_connect(char *host_name,int port,
/* else do a DNS lookup */
hp=gethostbyname((const char *)host_name);
if(hp==NULL){
@@ -16,7 +12,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
return STATE_UNKNOWN;
}
-@@ -70,14 +70,14 @@
+@@ -70,14 +70,14 @@ int my_connect(char *host_name,int port,
/* map transport protocol name to protocol number */
if(((ptrp=getprotobyname(proto)))==NULL){
@@ -33,7 +29,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
return STATE_UNKNOWN;
}
-@@ -86,16 +86,16 @@
+@@ -86,16 +86,16 @@ int my_connect(char *host_name,int port,
if(result<0){
switch(errno){
case ECONNREFUSED:
@@ -54,10 +50,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
}
return STATE_CRITICAL;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nsca~/src/nsca.c pkg-nsca/src/nsca.c
---- pkg-nsca~/src/nsca.c 2011-12-04 07:51:06.000000000 +0100
-+++ pkg-nsca/src/nsca.c 2011-12-04 07:59:36.138097102 +0100
-@@ -92,7 +92,7 @@
+--- a/src/nsca.c
++++ b/src/nsca.c
+@@ -92,7 +92,7 @@ int main(int argc, char **argv){
if(result!=OK || show_help==TRUE || show_license==TRUE || show_version==TRUE){
if(result!=OK)
@@ -66,10 +61,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
printf("\n");
printf("NSCA - Nagios Service Check Acceptor\n");
printf("Copyright (c) 2009 Nagios Core Development Team and Community Contributors\n");
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nsca~/src/send_nsca.c pkg-nsca/src/send_nsca.c
---- pkg-nsca~/src/send_nsca.c 2011-12-04 07:51:06.000000000 +0100
-+++ pkg-nsca/src/send_nsca.c 2011-12-04 08:03:18.626102801 +0100
-@@ -80,7 +80,7 @@
+--- a/src/send_nsca.c
++++ b/src/send_nsca.c
+@@ -80,7 +80,7 @@ int main(int argc, char **argv){
if(result!=OK || show_help==TRUE || show_license==TRUE || show_version==TRUE){
if(result!=OK)
@@ -78,7 +72,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
printf("\n");
printf("NSCA Client %s\n",PROGRAM_VERSION);
printf("Copyright (c) 2000-2007 Ethan Galstad (www.nagios.org)\n");
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ int main(int argc, char **argv){
/* exit if there are errors... */
if(result==ERROR){
@@ -87,7 +81,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
do_exit(STATE_CRITICAL);
}
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ int main(int argc, char **argv){
/* we couldn't connect */
if(result!=STATE_OK){
@@ -96,7 +90,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
do_exit(STATE_CRITICAL);
}
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ int main(int argc, char **argv){
/* read the initialization packet containing the IV and timestamp */
result=read_init_packet(sd);
if(result!=OK){
@@ -105,7 +99,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
close(sd);
do_exit(STATE_CRITICAL);
}
-@@ -176,7 +176,7 @@
+@@ -176,7 +176,7 @@ int main(int argc, char **argv){
/* initialize encryption/decryption routines with the IV we received from the server */
if(encrypt_init(password,encryption_method,received_iv,&CI)!=OK){
@@ -114,7 +108,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
close(sd);
do_exit(STATE_CRITICAL);
}
-@@ -280,7 +280,7 @@
+@@ -280,7 +280,7 @@ int main(int argc, char **argv){
/* there was an error sending the packet */
if(rc==-1){
@@ -123,7 +117,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
close(sd);
do_exit(STATE_UNKNOWN);
}
-@@ -353,13 +353,13 @@
+@@ -353,13 +353,13 @@ int read_init_packet(int sock){
/* recv() error or server disconnect */
if(rc<=0){
@@ -139,7 +133,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
return ERROR;
}
-@@ -468,7 +468,7 @@
+@@ -468,7 +468,7 @@ int process_arguments(int argc, char **a
/* handle timeouts */
void alarm_handler(int sig){
diff --git a/debian/patches/04_nsca.cfg_nagios_vs_nagios.dpatch b/debian/patches/04_nsca.cfg_nagios_vs_nagios.patch
old mode 100755
new mode 100644
similarity index 57%
rename from debian/patches/04_nsca.cfg_nagios_vs_nagios.dpatch
rename to debian/patches/04_nsca.cfg_nagios_vs_nagios.patch
index 79190a6..3218f5e
--- a/debian/patches/04_nsca.cfg_nagios_vs_nagios.dpatch
+++ b/debian/patches/04_nsca.cfg_nagios_vs_nagios.patch
@@ -1,14 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_nsca.cfg_nagios_vs_nagios.dpatch by <seanius at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Description: Update paths in nsca.cfg for Debian.
+Author: Sean Finney <seanius at debian.org>
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nsca~/sample-config/nsca.cfg.in pkg-nsca/sample-config/nsca.cfg.in
---- pkg-nsca~/sample-config/nsca.cfg.in 2012-02-16 16:26:21.000000000 +0100
-+++ pkg-nsca/sample-config/nsca.cfg.in 2013-02-25 11:40:18.427269711 +0100
-@@ -89,9 +89,12 @@
+--- a/sample-config/nsca.cfg.in
++++ b/sample-config/nsca.cfg.in
+@@ -89,9 +89,12 @@ debug=0
# COMMAND FILE
# This is the location of the Nagios command file that the daemon
# should write all service check results that it receives.
@@ -24,7 +19,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
# ALTERNATE DUMP FILE
# This is used to specify an alternate file the daemon should
-@@ -103,8 +106,7 @@
+@@ -103,8 +106,7 @@ command_file=@localstatedir@/rw/nagios.c
# it starts Nagios. Or you may simply choose to ignore any
# check results received while Nagios was not running...
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cc6df4d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_send_nsca.cfg.patch
+02_nsca_foreground.patch
+03_errors_to_stderr.patch
+04_nsca.cfg_nagios_vs_nagios.patch
diff --git a/debian/rules b/debian/rules
index 43e3f0d..dde7136 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
-
%:
- dh $@ --with dpatch
+ dh $@
override_dh_auto_configure:
./configure \
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index ecccaa0..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-nsca source: build-depends-on-obsolete-package build-depends: dpatch (>= 2.0.32~)
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-nsca.git
More information about the Pkg-nagios-changes
mailing list