rpms/cups/devel cups-ricoh-deviceid-oid.patch, NONE, 1.1 cups.spec, 1.596, 1.597

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25974

Modified Files:
	cups.spec 
Added Files:
	cups-ricoh-deviceid-oid.patch 
Log Message:
* Tue May 11 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.3-7
- Add an SNMP query for Ricoh's device ID OID (STR #3552).


cups-ricoh-deviceid-oid.patch:
 snmp.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE cups-ricoh-deviceid-oid.patch ---
diff -up cups-1.4.3/backend/snmp.c.ricoh-deviceid-oid cups-1.4.3/backend/snmp.c
--- cups-1.4.3/backend/snmp.c.ricoh-deviceid-oid	2010-05-11 17:30:57.266120467 +0100
+++ cups-1.4.3/backend/snmp.c	2010-05-11 17:31:16.267120141 +0100
@@ -195,6 +195,7 @@ static const int	LexmarkProductOID[] = {
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
 static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -1002,6 +1003,9 @@ read_snmp_response(int fd)		/* I - SNMP 
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -p -r1.596 -r1.597
--- cups.spec	16 Apr 2010 18:47:04 -0000	1.596
+++ cups.spec	11 May 2010 16:53:02 -0000	1.597
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -66,6 +66,7 @@ Patch32: cups-str3541.patch
 Patch33: cups-snmp-quirks.patch
 Patch34: cups-hp-deviceid-oid.patch
 Patch35: cups-dnssd-deviceid.patch
+Patch36: cups-ricoh-deviceid-oid.patch
 
 Patch100: cups-lspp.patch
 
@@ -271,6 +272,8 @@ module. 
 %patch34 -p1 -b .hp-deviceid-oid
 # Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
 %patch35 -p1 -b .dnssd-deviceid
+# Add an SNMP query for Ricoh's device ID OID (STR #3552).
+%patch36 -p1 -b .ricoh-deviceid-oid
 
 %if %lspp
 # LSPP support.
@@ -571,6 +574,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue May 11 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.3-7
+- Add an SNMP query for Ricoh's device ID OID (STR #3552).
+
 * Fri Apr 16 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.3-6
 - Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".