[Pkg-nagios-devel] nagios-plugins/debian/patches 00list, NONE, 1.1 02_utilspm.dpatch, NONE, 1.1 06_checkircd.dpatch, NONE, 1.1 08_subst.dpatch, NONE, 1.1 09_pssyntax.dpatch, NONE, 1.1

seanius at haydn.debian.org seanius at haydn.debian.org
Fri Sep 30 13:15:19 UTC 2005 

Update of /cvsroot/pkg-nagios/nagios-plugins/debian/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv19179/debian/patches

Added Files:
	00list 02_utilspm.dpatch 06_checkircd.dpatch 08_subst.dpatch 
	09_pssyntax.dpatch 
Log Message:
Added debian changes for version 1.4-6. 


--- NEW FILE: 00list ---
02_utilspm
06_checkircd
08_subst
09_pssyntax

--- NEW FILE: 02_utilspm.dpatch ---
#!/bin/sh -e
## 02_utilspm.dpatch by Guido Trotter <ultrotter at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct utils.pm script to begin with #!/usr/bin/perl

if [ $# -lt 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

case "$1" in
       -patch) patch $patch_opts -p1 < $0;;
       -unpatch) patch $patch_opts -p1 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
                exit 1;;
esac

exit 0

@DPATCH@
diff -urNad /home/ultrotter/docs/projects/deb/nagios/nagios-plugins-1.3.1/plugins-scripts/utils.pm.in nagios-plugins-1.3.1/plugins-scripts/utils.pm.in
--- /home/ultrotter/docs/projects/deb/nagios/nagios-plugins-1.3.1/plugins-scripts/utils.pm.in	2003-02-03 21:29:55.000000000 +0100
+++ nagios-plugins-1.3.1/plugins-scripts/utils.pm.in	2004-02-01 10:42:54.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/perl
 # Utility drawer for Nagios plugins.
 # $Id: 02_utilspm.dpatch,v 1.1 2005/09/30 13:15:15 seanius Exp $
 #

--- NEW FILE: 06_checkircd.dpatch ---
#! /bin/sh -e
## 06_checkircd.dpatch by  <ultrotter at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

if [ $# -lt 1 ]; then
    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
    -patch) patch -p1 ${patch_opts} < $0;;
    -unpatch) patch -R -p1 ${patch_opts} < $0;;
    *)
        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
        exit 1;;
esac

exit 0

@DPATCH@
diff -urNad /home/ultrotter/docs/projects/deb/nagios/new/nagios-plugins-1.3.1.0/plugins-scripts/check_ircd.pl nagios-plugins-1.3.1.0/plugins-scripts/check_ircd.pl
--- /home/ultrotter/docs/projects/deb/nagios/new/nagios-plugins-1.3.1.0/plugins-scripts/check_ircd.pl	2002-05-07 07:35:49.000000000 +0200
+++ nagios-plugins-1.3.1.0/plugins-scripts/check_ircd.pl	2004-08-12 15:54:50.000000000 +0200
@@ -148,7 +148,6 @@
 	my $proto = getprotobyname('tcp');
 	my $sockaddr;
 	my $this;
-	my $thisaddr = gethostbyname($in_hostname);
 	my $that;
 	my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
 #	($name,$aliases,$type,$len,$thisaddr) = gethostbyname($in_hostname);
@@ -158,7 +157,7 @@
 	    exit $ERRORS{"UNKNOWN"};
 	}
 	$sockaddr = 'S n a4 x8';
-	$this = pack($sockaddr, AF_INET, 0, $thisaddr);
+	$this = pack($sockaddr, AF_INET, 0, INADDR_ANY);
 	$that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
 	if (!bind(ClientSocket, $this)) {
 	    print "IRCD UNKNOWN: Could not bind socket ($!)\n";

--- NEW FILE: 08_subst.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 08_subst.dpatch by Guido Trotter <ultrotter at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad nagios-plugins-1.3.1.0/plugins-scripts/subst.in /tmp/dpep.bslXbi/nagios-plugins-1.3.1.0/plugins-scripts/subst.in
--- nagios-plugins-1.3.1.0/plugins-scripts/subst.in	2004-10-13 13:58:07.000000000 -0700
+++ /tmp/dpep.bslXbi/nagios-plugins-1.3.1.0/plugins-scripts/subst.in	2004-10-13 13:59:26.000000000 -0700
@@ -1,35 +1,37 @@
 #!/usr/bin/awk
 
-function which(c,path) {
-	cmd = "test -x " c;
-
-	if (system(cmd)==0) {
-		return c;
-	} 
-
-	sub(/\/.*\//,"",c);
-  for (dir in path) {
-			cmd = "test -x " path[dir] "/" c;
-			if (system(cmd)==0) {
-					return path[dir] "/" c;
-			} 
-	}
-
-
-	return c;
-}
+# Useless
+#function which(c,path) {
+#	cmd = "test -x " c;
+#
+#	if (system(cmd)==0) {
+#		return c;
+#	} 
+#
+#	sub(/\/.*\//,"",c);
+#  for (dir in path) {
+#			cmd = "test -x " path[dir] "/" c;
+#			if (system(cmd)==0) {
+#					return path[dir] "/" c;
+#			} 
+#	}
+#
+#
+#	return c;
+#}
 
 # used to replace "use lib utils.pm" with "use lib @libexecdir"
 #
 function led() {
-	led1 = "@libexecdir@";
-	led2 = "@exec_prefix@";
-	led3 = "@prefix@";
-	if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) {
-		return "\"" led3 "/libexec\" " ;
-	
-	}
-	return "\"" led1 "\"" ;
+#	led1 = "@libexecdir@";
+#	led2 = "@exec_prefix@";
+#	led3 = "@prefix@";
+#	if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) {
+#		return "\"" led3 "/libexec\" " ;
+#	
+#	}
+#	Hack to force debian package to have the correct dir on all arches
+	return "\"/usr/lib/nagios/plugins\"" ;
 }
 
 BEGIN {
@@ -60,13 +62,14 @@
 
 # Specific programs
 
+# They are already correct, it seems... don't bother with this!
 #
-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-	start=RSTART+RLENGTH;
-	c=substr($0,RSTART,RLENGTH);
-	sub(c,which(c,path));
-}
+#/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
+#	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
+#	start=RSTART+RLENGTH;
+#	c=substr($0,RSTART,RLENGTH);
+#	sub(c,which(c,path));
+#}
 
 {
 	print;

--- NEW FILE: 09_pssyntax.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 09_pssyntax.dpatch by Guido Trotter <ultrotter at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad nagios-plugins-1.4/configure /tmp/dpep.mMn24q/nagios-plugins-1.4/configure
--- nagios-plugins-1.4/configure	2005-02-04 00:48:39.000000000 +0000
+++ /tmp/dpep.mMn24q/nagios-plugins-1.4/configure	2005-02-19 19:37:02.416691816 +0000
@@ -14012,7 +14012,7 @@
 	egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PPID +COMMAND" > /dev/null
 then
 	ac_cv_ps_varlist="procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
-	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu comm args'"
+	ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid ppid vsz rss pcpu comm args'"
 	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
 	ac_cv_ps_cols=8
 	echo "$as_me:$LINENO: result: $ac_cv_ps_command" >&5

More information about the Pkg-nagios-devel mailing list