rpms/hplip/F-8 .cvsignore, 1.20, 1.21 hplip-media-empty.patch, 1.3, 1.4 hplip.spec, 1.163, 1.164 sources, 1.20, 1.21 hplip-ljdot4.patch, 1.1, NONE

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10055

Modified Files:
	.cvsignore hplip-media-empty.patch hplip.spec sources 
Removed Files:
	hplip-ljdot4.patch 
Log Message:
* Fri Jan 18 2008 Tim Waugh <twaugh at redhat.com> 2.7.12-1
- 2.7.12.  No longer need ljdot4 patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	3 Aug 2007 17:23:54 -0000	1.20
+++ .cvsignore	18 Jan 2008 15:16:12 -0000	1.21
@@ -17,3 +17,4 @@
 hplip-1.7.4a.tar.gz
 hplip-2.7.6.tar.gz
 hplip-2.7.7.tar.gz
+hplip-2.7.12.tar.gz

hplip-media-empty.patch:

Index: hplip-media-empty.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip-media-empty.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hplip-media-empty.patch	29 Jun 2007 16:53:39 -0000	1.3
+++ hplip-media-empty.patch	18 Jan 2008 15:16:12 -0000	1.4
@@ -1,28 +1,50 @@
---- hplip-2.7.6/prnt/backend/hp.c.media-empty	2007-05-11 22:55:52.000000000 +0100
-+++ hplip-2.7.6/prnt/backend/hp.c	2007-06-29 15:34:02.000000000 +0100
-@@ -326,7 +326,7 @@
-    int len, vstatus, cnt;
-    char buf[HPMUD_BUFFER_SIZE];
-    struct hpmud_model_attributes ma;
--   int paperout=0, offline=0;
-+   int paperout=-1, offline=-1;
-    HPMUD_DEVICE hd=-1;
-    HPMUD_CHANNEL cd=-1;
-    int n, total, retry=0, size;
-@@ -440,14 +440,14 @@
-                switch (vstatus)
-                {
-                   case VSTATUS_OOPA:
--                     if (!paperout)
-+                     if (paperout != 1)
-                      {
-                         fputs("STATE: +media-empty-error\n", stderr);
-                         paperout=1;
-                      }
-                      break;
-                   default:
--                     if (!offline)
-+                     if (offline != 1)
-                      {
-                         fputs("STATE: +other\n", stderr);
-                         offline=1;
+diff -up hplip-2.7.12/prnt/backend/hp.c.media-empty hplip-2.7.12/prnt/backend/hp.c
+--- hplip-2.7.12/prnt/backend/hp.c.media-empty	2007-11-29 00:17:27.000000000 +0000
++++ hplip-2.7.12/prnt/backend/hp.c	2008-01-18 14:37:11.000000000 +0000
+@@ -517,10 +517,12 @@ bugout:
+ }
+ 
+ /* Check printer status, if in an error state, loop until error condition is cleared. */
++/* XXX What if it is immediately replaced by a different error condition? XXX */
+ static int loop_test(HPMUD_DEVICE dd, HPMUD_CHANNEL cd, struct pjl_attributes *pa, const char *uri, const char *job)
+ {
+-   int retry=0, status;
++   int status;
+    const char *pstate;
++   const char *emitted_state_reason = NULL;
+ 
+    while (1)
+    {
+@@ -529,27 +531,26 @@ static int loop_test(HPMUD_DEVICE dd, HP
+ 
+       if (strcmp(pstate, "none")==0)
+       {
+-         if (retry)
++         if (emitted_state_reason)
+          {
+             /* Clear error. */
+             device_event(uri, job, VSTATUS_PRNT, "event", 0);
+             fputs("INFO: Printing...\n", stderr);
+-            fprintf(stderr, "STATE: -%s\n", pstate);
+-            retry=0;
++            fprintf(stderr, "STATE: -%s\n", emitted_state_reason);
+          }
+          break;   /* no error, done */
+       }
+ 
+-      if (!retry)
++      if (!emitted_state_reason)
+       {
+          /* Display error. */
+          device_event(uri, job, status, "error", RETRY_TIMEOUT);
+-         fprintf(stderr, "STATE: +%s\n", pstate);
++	 emitted_state_reason = pstate;
++         fprintf(stderr, "STATE: +%s\n", emitted_state_reason);
+       }
+ 
+       BUG("ERROR: %d %s; will retry in %d seconds...\n", status, pstate, RETRY_TIMEOUT);
+       sleep(RETRY_TIMEOUT);
+-      retry = 1;
+    }
+ 
+    return 0;


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- hplip.spec	4 Jan 2008 18:09:03 -0000	1.163
+++ hplip.spec	18 Jan 2008 15:16:12 -0000	1.164
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.7.7
-Release: 7%{?dist}
+Version: 2.7.12
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -15,7 +15,6 @@
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
 Patch1: hplip-desktop.patch
-Patch2: hplip-ljdot4.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-libm.patch
@@ -95,9 +94,6 @@
 # Fix desktop file.
 %patch1 -p1 -b .desktop
 
-# Use raw instead of 1284.4 communication for LJ4000 series (bug #249191).
-%patch2 -p1 -b .ljdot4
-
 # Quieten hpssd on startup.
 %patch3 -p1 -b .quiet
 
@@ -222,7 +218,6 @@
 %{_datadir}/hplip/base
 %{_datadir}/hplip/copier
 %dir %{_datadir}/hplip/data
-%{_datadir}/hplip/data/firmware
 %{_datadir}/hplip/data/ldl
 %{_datadir}/hplip/data/localization
 %{_datadir}/hplip/data/models
@@ -279,13 +274,30 @@
 exit 0
 
 %changelog
-* Fri Jan  4 2008 Tim Waugh <twaugh at redhat.com> 2.7.7-7
+* Fri Jan 18 2008 Tim Waugh <twaugh at redhat.com> 2.7.12-1
+- 2.7.12.  No longer need ljdot4 patch.
+
+* Fri Jan  4 2008 Tim Waugh <twaugh at redhat.com> 2.7.10-2
 - Don't ship udev rules; instead, grant an ACL for group lp (bug #424331).
 
-* Tue Oct  9 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-6
+* Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.7.10-2
+- Rebuild for deps
+
+* Mon Oct 22 2007 Tim Waugh <twaugh at redhat.com> 2.7.10-1
+- 2.7.10.
+
+* Fri Oct 12 2007 Tim Waugh <twaugh at redhat.com> 2.7.9-3
+- Applied patch to fix remnants of CVE-2007-5208 (bug #329111).
+
+* Tue Oct  9 2007 Tim Waugh <twaugh at redhat.com> 2.7.9-2
 - Use raw instead of 1284.4 communication for LJ4000 series (bug #249191).
 - Build requires openssl-devel.
 
+* Wed Oct  3 2007 Tim Waugh <twaugh at redhat.com> 2.7.9-1
+- 2.7.9.
+- Adjusted udev rules to be less permissive.  We use ConsoleKit to add
+  ACLs to the device nodes, so world-writable device nodes can be avoided.
+
 * Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-5
 - Prevent hpfax trying to load configuration files as user lp.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	3 Aug 2007 17:23:54 -0000	1.20
+++ sources	18 Jan 2008 15:16:12 -0000	1.21
@@ -1 +1 @@
-086bd6a306fa2dfbd6e8c962fddcdef4  hplip-2.7.7.tar.gz
+ba00337ccf1b520509518bffbec960db  hplip-2.7.12.tar.gz


--- hplip-ljdot4.patch DELETED ---