From 45a9a3cd3ba6705f60714c773c32c51ef43eef5f Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Mon, 10 Aug 2015 14:14:34 +0200 Subject: [PATCH] 2.0.4 --- .gitignore | 1 + cups-2.0.3-source.tar.bz2.sig | Bin 543 -> 0 bytes cups-2.0.4-source.tar.bz2.sig | Bin 0 -> 543 bytes cups-str4538.patch | 26 -------------------------- cups-str4646.patch | 13 ------------- cups.spec | 13 +++++-------- sources | 2 +- 7 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 cups-2.0.3-source.tar.bz2.sig create mode 100644 cups-2.0.4-source.tar.bz2.sig delete mode 100644 cups-str4538.patch delete mode 100644 cups-str4646.patch diff --git a/.gitignore b/.gitignore index a03ea6e..ff58546 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ cups-1.4.4-source.tar.bz2 /cups-2.0.1-source.tar.bz2 /cups-2.0.2-source.tar.bz2 /cups-2.0.3-source.tar.bz2 +/cups-2.0.4-source.tar.bz2 diff --git a/cups-2.0.3-source.tar.bz2.sig b/cups-2.0.3-source.tar.bz2.sig deleted file mode 100644 index 82dafca87f694d16c0d99c6085ad470810f2d60c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SW*H1p-xd=vV*>2@u<(r>h9pVk6L{5C2124Tb}wxLlE%nMy}N zH>GdPtdGPA(yD?}d~vaqdNqROe6YUL8HERi*yS>3pCWY6#XW&mqlC@Y;k}MA_ zC+a!Ir~p{_6Y+k?aBES1O`)Dtt>^+ z9|`U`DoNl7X2nvRSKn~|IR#MO5tx@koxcDJTpL1~p_8fBG_=Z4!w`Sjq>0kZ7viZ} z-B*71C?*z^x>u=;|D5u&tIPmrg}X#_h@<+FBsq1CT;ov&GJKb3i0VCaK(oazHNE~& ze^c+@F+yN)p<(1I(dJDkh~VU{P>Ux^fc(f|YYJ^Vmau~O2)~x8ON3EQFvE=Btg>Ix zTS@BeOl+I0BYJGO30~iP7P#XMz_wL^z5QO~EG)tdv|?x%I?rmn!Z4KKq*f`LGxQq^ z5}`YY2_Zim{7TJhds_$*u2pfb!~s-~!|LfjVMswCFZE@jZJdY9+Qn?^-cU(9o&bk; zmO1(Cp^lZ#RjWUPzci9R$40~M5mh8s4l4%~#p2Ta$JAph9pVk0%05BdXAXe!U}P5Lw5d!_?u zDRcTTn(jt8D5PbbWg~?mHhme^mfMwTVWaoKK>nLxGu=3nPOI!!8!^wJVjFb^A`D)D zT@OnOo!+fyh=mTP#7$nR9lnxmkDkYW*2jWs#$-Qi{* zP*E?=S=9N5!U_o*dzvgUJbSPcceqI3%mN7=5vG34WHc9>2Q>_g1(H@oydb`2TvP#K z<)xq?J35Y!r_CSw8RoniB~nBEn*$quc+z_?dpu!A3IscJc_+vPS8!Lt)WxTS{%JWM z1!;4ff?x;={{;lb<%JvkPUMY$8%y+fCX!^ksJdu^8_NOSq_GMbio64(j6 z%g7{g;RrqSn=YsGXrHDRx={NQX&*?FzCVx$Q)5*#L;DKCWbsJxw#G5!U*#FHO3^$^ zj;|ps?9pUb_pW`Tvp7)x{0wT-KX3lxk_~E3&%u!PL#r@Ry02MLgkY`62%qo&pswzl h!JA$1=MJ$vW-&88<>maKqu%+yJ_#sot~LQWEN9DM0P6q% literal 0 HcmV?d00001 diff --git a/cups-str4538.patch b/cups-str4538.patch deleted file mode 100644 index 98f8935..0000000 --- a/cups-str4538.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up cups-2.0.3/scheduler/client.c.str4538 cups-2.0.3/scheduler/client.c ---- cups-2.0.3/scheduler/client.c.str4538 2015-06-25 08:35:22.196788744 +0100 -+++ cups-2.0.3/scheduler/client.c 2015-06-25 08:35:38.079786648 +0100 -@@ -2294,6 +2294,9 @@ cupsdSendError(cupsd_client_t *con, /* I - http_status_t code, /* I - Error code */ - int auth_type)/* I - Authentication type */ - { -+ char location[HTTP_MAX_VALUE]; /* Location field */ -+ -+ - cupsdLogClient(con, CUPSD_LOG_DEBUG2, "cupsdSendError code=%d, auth_type=%d", - code, auth_type); - -@@ -2326,8 +2329,12 @@ cupsdSendError(cupsd_client_t *con, /* I - * never disable it in that case. - */ - -+ strlcpy(location, httpGetField(con->http, HTTP_FIELD_LOCATION), sizeof(location)); -+ - httpClearFields(con->http); - -+ httpSetField(con->http, HTTP_FIELD_LOCATION, location); -+ - if (code >= HTTP_STATUS_BAD_REQUEST && con->type != CUPSD_AUTH_NEGOTIATE) - httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF); - diff --git a/cups-str4646.patch b/cups-str4646.patch deleted file mode 100644 index 14ee21d..0000000 --- a/cups-str4646.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up cups-2.0.3/scheduler/job.c.str4646 cups-2.0.3/scheduler/job.c ---- cups-2.0.3/scheduler/job.c.str4646 2015-06-25 08:57:18.780913432 +0100 -+++ cups-2.0.3/scheduler/job.c 2015-06-25 08:57:29.669132254 +0100 -@@ -392,7 +392,9 @@ cupsdCheckJobs(void) - * Start the job... - */ - -+ cupsArraySave(ActiveJobs); - start_job(job, printer); -+ cupsArrayRestore(ActiveJobs); - } - } - } diff --git a/cups.spec b/cups.spec index 73db8d1..ffa088f 100644 --- a/cups.spec +++ b/cups.spec @@ -10,8 +10,8 @@ Summary: CUPS printing system Name: cups Epoch: 1 -Version: 2.0.3 -Release: 4%{?dist} +Version: 2.0.4 +Release: 1%{?dist} License: GPLv2 Url: http://www.cups.org/ Source0: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 @@ -26,7 +26,6 @@ Source8: macros.cups Patch1: cups-no-gzip-man.patch Patch2: cups-system-auth.patch Patch3: cups-multilib.patch -Patch4: cups-str4538.patch Patch5: cups-banners.patch Patch6: cups-serverbin-compat.patch Patch7: cups-no-export-ssllibs.patch @@ -48,7 +47,6 @@ Patch22: cups-hp-deviceid-oid.patch Patch23: cups-dnssd-deviceid.patch Patch24: cups-ricoh-deviceid-oid.patch Patch25: cups-systemd-socket.patch -Patch26: cups-str4646.patch Patch27: cups-avahi-address.patch Patch28: cups-enum-all.patch Patch29: cups-dymo-deviceid.patch @@ -190,8 +188,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch2 -p1 -b .system-auth # Prevent multilib conflict in cups-config script. %patch3 -p1 -b .multilib -# Fix redirection from CGI scripts (bug #1232030, STR #4538). -%patch4 -p1 -b .str4538 # Ignore rpm save/new files in the banners directory. %patch5 -p1 -b .banners # Use compatibility fallback path for ServerBin. @@ -234,8 +230,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch24 -p1 -b .ricoh-deviceid-oid # Make cups.service Type=notify (bug #1088918). %patch25 -p1 -b .systemd-socket -# Fix slow resume of jobs after restart (STR #4646). -%patch26 -p1 -b .str4646 # Use IP address when resolving DNSSD URIs (bug #948288). %patch27 -p1 -b .avahi-address # Return from cupsEnumDests() once all records have been returned. @@ -618,6 +612,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Mon Aug 10 2015 Jiri Popelka - 1:2.0.4-1 +- 2.0.4 + * Tue Jul 28 2015 Jiri Popelka - 1:2.0.3-4 - BuildRequires: gnutls-devel -> pkgconfig(gnutls) diff --git a/sources b/sources index c4267fd..7cdb813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d98b85edbdab7ab03739c9622f570e8 cups-2.0.3-source.tar.bz2 +f5c847d9a4fac6c4c66fb0526a7afaae cups-2.0.4-source.tar.bz2