[cups/f21] Don't report waste-receptacle SNMP state reasons (STR #4499, bug #1193105).

[Tim Waugh]

commit 20ccae986cab00c3fc5e149ab9536b1a8543d4fa
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Feb 18 12:41:59 2015 +0000

    Don't report waste-receptacle SNMP state reasons (STR #4499, bug #1193105).
    
    Resolves: rhbz#1193105

 cups-str4499.patch |   19 +++++++++++++++++++
 cups.spec          |   10 +++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/cups-str4499.patch b/cups-str4499.patch
new file mode 100644
index 0000000..07fc797
--- /dev/null
+++ b/cups-str4499.patch
@@ -0,0 +1,19 @@
+diff -up cups-1.7.5/backend/snmp-supplies.c.str4499 cups-1.7.5/backend/snmp-supplies.c
+--- cups-1.7.5/backend/snmp-supplies.c.str4499	2013-09-27 17:18:26.000000000 +0100
++++ cups-1.7.5/backend/snmp-supplies.c	2015-02-18 12:40:31.603246538 +0000
+@@ -304,6 +304,7 @@ backendSNMPSupplies(
+               else
+                 new_supply_state |= CUPS_OPC_NEAR_EOL;
+               break;
++#if 0 /* Because no two vendors report waste containers the same, disable SNMP reporting of same */
+           case CUPS_TC_wasteInk :
+           case CUPS_TC_wastePaper :
+           case CUPS_TC_wasteToner :
+@@ -314,6 +315,7 @@ backendSNMPSupplies(
+               else
+                 new_supply_state |= CUPS_WASTE_ALMOST_FULL;
+               break;
++#endif /* 0 */
+           case CUPS_TC_cleanerUnit :
+           case CUPS_TC_fuserCleaningPad :
+               if (percent <= 1)
diff --git a/cups.spec b/cups.spec
index 11b2d50..7561332 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.7.5
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@ -71,6 +71,7 @@ Patch41: cups-str4475.patch
 Patch42: cups-str4500.patch
 Patch43: cups-str4496.patch
 Patch44: cups-str4551.patch
+Patch45: cups-str4499.patch
 
 Patch100: cups-lspp.patch
 
@@ -285,6 +286,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # Apply upstream patch to fix CVE-2014-9679, cupsRasterReadPixels
 # buffer overflow (STR #4551, bug #1191591).
 %patch44 -p1 -b .str4551
+# Don't report waste-receptacle SNMP state reasons (STR #4499,
+# bug #1193105).
+%patch45 -p1 -b .str4499
 
 %if %lspp
 # LSPP support.
@@ -692,6 +696,10 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Wed Feb 18 2015 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-16
+- Don't report waste-receptacle SNMP state reasons (STR #4499,
+  bug #1193105).
+
 * Mon Feb 16 2015 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-15
 - Apply upstream patch to fix CVE-2014-9679, cupsRasterReadPixels
   buffer overflow (STR #4551, bug #1191591).