packages: nagios-plugins/nagios-plugins-check_hpjd-no-paper-out.patch, nagi...

[glen]

Author: glen                         Date: Tue Sep 14 14:47:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.15, but some stuff does not link together

---- Files affected:
packages/nagios-plugins:
   nagios-plugins-check_hpjd-no-paper-out.patch (1.1 -> 1.2) , nagios-plugins.spec (1.138 -> 1.139) , nagios-plugins-check_game_cmdline.patch (1.1 -> NONE)  (REMOVED), nagios-plugins-check_ldap_pointer.patch (1.1 -> NONE)  (REMOVED), nagios-plugins-check_smb_hostaddress.patch (1.1 -> NONE)  (REMOVED), nagios-plugins-checkircd.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/nagios-plugins/nagios-plugins-check_hpjd-no-paper-out.patch
diff -u packages/nagios-plugins/nagios-plugins-check_hpjd-no-paper-out.patch:1.1 packages/nagios-plugins/nagios-plugins-check_hpjd-no-paper-out.patch:1.2
--- packages/nagios-plugins/nagios-plugins-check_hpjd-no-paper-out.patch:1.1	Fri Dec  5 20:16:28 2008
+++ packages/nagios-plugins/nagios-plugins-check_hpjd-no-paper-out.patch	Tue Sep 14 16:46:59 2010
@@ -1,6 +1,5 @@
-diff -aru nagios-plugins-1.4.13.orig/plugins/check_hpjd.c nagios-plugins-1.4.13/plugins/check_hpjd.c
---- plugins/check_hpjd.c	2008-05-07 12:02:42.000000000 +0200
-+++ plugins/check_hpjd.c	2008-12-05 15:19:10.746605526 +0100
+--- nagios-plugins-1.4.15/plugins/check_hpjd.c~	2010-09-14 16:49:38.000000000 +0300
++++ nagios-plugins-1.4.15/plugins/check_hpjd.c	2010-09-14 16:52:30.060156750 +0300
 @@ -70,6 +70,7 @@
  
  char *community = NULL;
@@ -57,12 +56,10 @@
  	printf ("\n");
  
  #ifdef NP_EXTRA_OPTS
-@@ -421,6 +430,6 @@
- void
+@@ -421,5 +421,5 @@
  print_usage (void)
  {
--  printf (_("Usage:"));
+   printf ("%s\n", _("Usage:"));
 -	printf ("%s -H host [-C community]\n", progname);
-+	printf (_("Usage:"));
-+	printf ("%s -H host [-C community] [-n]\n", progname);
++  printf ("%s -H host [-C community] [-n]\n", progname);
  }

================================================================
Index: packages/nagios-plugins/nagios-plugins.spec
diff -u packages/nagios-plugins/nagios-plugins.spec:1.138 packages/nagios-plugins/nagios-plugins.spec:1.139
--- packages/nagios-plugins/nagios-plugins.spec:1.138	Tue Sep 14 14:36:04 2010
+++ packages/nagios-plugins/nagios-plugins.spec	Tue Sep 14 16:46:59 2010
@@ -9,12 +9,12 @@
 Summary:	Host/service/network monitoring program plugins for Nagios
 Summary(pl.UTF-8):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
-Version:	1.4.14
-Release:	10
+Version:	1.4.15
+Release:	0.1
 License:	GPL v2
 Group:		Networking
 Source0:	http://downloads.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
-# Source0-md5:	a1835a48a777863ed2583de3c82446a9
+# Source0-md5:	56abd6ade8aa860b38c4ca4a6ac5ab0d
 Source1:	%{name}-config-20100219.tar.bz2
 # Source1-md5:	7914664eee7d77be9b8f05347a276e0f
 Source2:	nagios-utils.php
@@ -26,13 +26,9 @@
 Patch5:		%{name}-check_ping-socket-filter-warning.patch
 Patch6:		%{name}-path.patch
 Patch7:		%{name}-pgsql.patch
-Patch8:		%{name}-checkircd.patch
 Patch9:		%{name}-check_log_paths.patch
-Patch10:	%{name}-check_game_cmdline.patch
-Patch11:	%{name}-check_smb_hostaddress.patch
 Patch12:	%{name}-implicit-basename.patch
 Patch13:	%{name}-check_radius_segfault.patch
-Patch17:	%{name}-check_ldap_pointer.patch
 Patch18:	%{name}-configure.patch
 Patch19:	%{name}-perlautodep.patch
 Patch20:	%{name}-cosmetic.patch
@@ -505,16 +501,12 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch10 -p1
-%patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p0
+%patch21 -p1
 %patch22 -p0
 %patch23 -p0
 %patch24 -p1
@@ -564,6 +556,14 @@
 	s,/usr/local/libexec,%{_pluginlibdir},
 " check_* *.pl
 
+cd ..
+
+# remove libtool m4 macro copies, breaks when system libtool is older
+rm -rf gl/m4/libtool.m4 gl/m4/lt*.m4
+
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 %build
 %{__gettextize}
 %{__libtoolize}
@@ -957,6 +957,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139  2010/09/14 14:46:59  glen
+- up to 1.4.15, but some stuff does not link together
+
 Revision 1.138  2010/09/14 12:36:04  glen
 - require /etc/ldap.conf for ldap plugin
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugins/nagios-plugins-check_hpjd-no-paper-out.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugins/nagios-plugins.spec?r1=1.138&r2=1.139&f=u