[Pkg-nagios-devel] nagios-plugins/debian/patches 00list, 1.5,
1.6 13_subst.in_again.dpatch, NONE, 1.1
seanius at haydn.debian.org
seanius at haydn.debian.org
Fri Oct 7 20:40:51 UTC 2005
Update of /cvsroot/pkg-nagios/nagios-plugins/debian/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv9659/debian/patches
Modified Files:
00list
Added Files:
13_subst.in_again.dpatch
Log Message:
really broken upstream behavior, i have to reintroduce a new version of
guido's subst.in patch.
Index: 00list
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios-plugins/debian/patches/00list,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 00list 7 Oct 2005 20:25:36 -0000 1.5
+++ 00list 7 Oct 2005 20:40:47 -0000 1.6
@@ -2,3 +2,4 @@
10_config.h_debiandefaults.dpatch
11_check_ups.c_perfdata_fix.dpatch
12_check_mysql.c_mysql_options.dpatch
+13_subst.in_again.dpatch
--- NEW FILE: 13_subst.in_again.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 13_subst.in_again.dpatch by <seanius at localhost.localdomain>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad sid2~/plugins-scripts/subst.in sid2/plugins-scripts/subst.in
--- sid2~/plugins-scripts/subst.in 2005-08-31 00:11:42.000000000 +0200
+++ sid2/plugins-scripts/subst.in 2005-10-07 22:37:45.000000000 +0200
@@ -1,35 +1,9 @@
#!/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;
-}
-
# 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 "\"" ;
+ return "\"/usr/lib/nagios/plugins\"" ;
}
BEGIN {
@@ -58,16 +32,6 @@
sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived");
}
-# If a script contains a reference to a fully qualified command,
-# subst will replace the fully qualified command with whatever is
-# returned from the which subroutine
-#
-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
- match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
- c=substr($0,RSTART,RLENGTH);
- sub(c,which(c,path));
-}
-
{
print;
}
More information about the Pkg-nagios-devel
mailing list