This commit is contained in:
committed by
Git OBS Bridge
parent
3089fbccce
commit
8208b6f1db
11
cups-1.3.8-ipp_stop_after_pause.patch
Normal file
11
cups-1.3.8-ipp_stop_after_pause.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- cups-1.3.8/backend/ipp.c.orig 2008-07-14 23:25:26.000000000 +0200
|
||||
+++ cups-1.3.8/backend/ipp.c 2008-10-02 14:02:05.000000000 +0200
|
||||
@@ -1061,7 +1061,7 @@ main(int argc, /* I - Number of comm
|
||||
}
|
||||
else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
|
||||
ipp_status == IPP_PRINTER_BUSY)
|
||||
- break;
|
||||
+ continue;
|
||||
else
|
||||
copies_remaining --;
|
||||
|
22
cups-1.3.8-lose_printers_on_allowed_users.patch
Normal file
22
cups-1.3.8-lose_printers_on_allowed_users.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
--- cups-1.3.8/cgi-bin/admin.c.orig 2008-07-12 00:48:49.000000000 +0200
|
||||
+++ cups-1.3.8/cgi-bin/admin.c 2008-10-02 14:03:51.000000000 +0200
|
||||
@@ -2598,6 +2598,9 @@ do_set_allowed_users(http_t *http) /* I
|
||||
while (*ptr == ',' || isspace(*ptr & 255))
|
||||
ptr ++;
|
||||
|
||||
+ if (!*ptr)
|
||||
+ break;
|
||||
+
|
||||
if (*ptr == '\'' || *ptr == '\"')
|
||||
{
|
||||
/*
|
||||
@@ -2663,6 +2666,9 @@ do_set_allowed_users(http_t *http) /* I
|
||||
while (*ptr == ',' || isspace(*ptr & 255))
|
||||
ptr ++;
|
||||
|
||||
+ if (!*ptr)
|
||||
+ break;
|
||||
+
|
||||
if (*ptr == '\'' || *ptr == '\"')
|
||||
{
|
||||
/*
|
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 2 14:11:00 CEST 2008 - kssingvo@suse.de
|
||||
|
||||
- bugfixes:
|
||||
* printer stops after IPP pause
|
||||
* pritners got lost when users are set in Set Allowed Users Dialog
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 25 12:33:59 CEST 2008 - kssingvo@suse.de
|
||||
|
||||
|
10
cups.spec
10
cups.spec
@@ -30,7 +30,7 @@ License: GPL v2 or later
|
||||
Group: Hardware/Printing
|
||||
Summary: The Common UNIX Printing System
|
||||
Version: 1.3.8
|
||||
Release: 33
|
||||
Release: 34
|
||||
Requires: cups-libs = %{version}, cups-client = %{version}
|
||||
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
|
||||
Requires: util-linux /usr/bin/pdftops
|
||||
@@ -91,6 +91,8 @@ Patch30: cups-1.3.8-startstop_msg.patch
|
||||
Patch31: cups-1.3.8-noclobber_symlink.patch
|
||||
Patch32: cups-1.3.8-more_debuginfo.patch
|
||||
Patch33: cups-1.3.8-hostlookup.patch
|
||||
Patch34: cups-1.3.8-ipp_stop_after_pause.patch
|
||||
Patch35: cups-1.3.8-lose_printers_on_allowed_users.patch
|
||||
Patch100: cups-1.1.23-testpage.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@@ -203,6 +205,8 @@ mv pdftops pdftos.use_filter_pdftops_c
|
||||
%patch31 -p0
|
||||
%patch32 -p0
|
||||
%patch33 -p0
|
||||
%patch34 -p1
|
||||
%patch35 -p1
|
||||
if [ -f /.buildenv ]; then
|
||||
. /.buildenv
|
||||
test -z "$BUILD_DISTRIBUTION_NAME" && BUILD_DISTRIBUTION_NAME="%{?distribution}"
|
||||
@@ -456,6 +460,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
|
||||
%{_datadir}/locale/*/cups_*
|
||||
|
||||
%changelog
|
||||
* Thu Oct 02 2008 kssingvo@suse.de
|
||||
- bugfixes:
|
||||
* printer stops after IPP pause
|
||||
* pritners got lost when users are set in Set Allowed Users Dialog
|
||||
* Thu Sep 25 2008 kssingvo@suse.de
|
||||
- added und integrated latest patches from upstream bugzilla:
|
||||
cups-1.3.8-custom_ppd_fix.patch (CUPS STR #2889)
|
||||
|
Reference in New Issue
Block a user