From cb5ccc529e84a6f39f74845cab4f0b198b0b77fc Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Wed, 26 Jun 2013 20:59:32 +0200 Subject: [PATCH] 1.0.35 --- .gitignore | 1 + cups-filters-coverity.patch | 156 ------------------------------------ cups-filters-pcl.patch | 19 ----- cups-filters.spec | 15 ++-- sources | 2 +- 5 files changed, 8 insertions(+), 185 deletions(-) delete mode 100644 cups-filters-coverity.patch delete mode 100644 cups-filters-pcl.patch diff --git a/.gitignore b/.gitignore index ffb0e13..b4808c8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /cups-filters-1.0.32.tar.xz /cups-filters-1.0.33.tar.xz /cups-filters-1.0.34.tar.xz +/cups-filters-1.0.35.tar.xz diff --git a/cups-filters-coverity.patch b/cups-filters-coverity.patch deleted file mode 100644 index d00e787..0000000 --- a/cups-filters-coverity.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff -up cups-filters-1.0.34/cupsfilters/image-tiff.c.coverity cups-filters-1.0.34/cupsfilters/image-tiff.c ---- cups-filters-1.0.34/cupsfilters/image-tiff.c.coverity 2012-06-22 18:10:47.000000000 +0200 -+++ cups-filters-1.0.34/cupsfilters/image-tiff.c 2013-06-05 12:47:24.891983446 +0200 -@@ -655,7 +655,12 @@ _cupsImageReadTIFF( - case PHOTOMETRIC_PALETTE : - if (!TIFFGetField(tif, TIFFTAG_COLORMAP, &redcmap, &greencmap, &bluecmap)) - { -- fputs("DEBUG: No colormap tag in the file!\n", stderr); -+ _TIFFfree(scanline); -+ free(in); -+ free(out); -+ -+ TIFFClose(tif); -+ fputs("DEBUG: No colormap tag in the file!\n", stderr); - fclose(fp); - return (-1); - } -diff -up cups-filters-1.0.34/filter/pdftopdf/nup.cc.coverity cups-filters-1.0.34/filter/pdftopdf/nup.cc ---- cups-filters-1.0.34/filter/pdftopdf/nup.cc.coverity 2012-08-20 02:29:46.000000000 +0200 -+++ cups-filters-1.0.34/filter/pdftopdf/nup.cc 2013-06-05 12:47:24.891983446 +0200 -@@ -52,7 +52,7 @@ bool NupParameters::possible(int nup) // - { - // 1 2 3 4 6 8 9 10 12 15 16 - return (nup>=1)&&(nup<=16)&& -- ( (nup!=5)||(nup!=7)||(nup!=11)||(nup!=13)||(nup!=14) ); -+ ( (nup!=5)&&(nup!=7)&&(nup!=11)&&(nup!=13)&&(nup!=14) ); - } - // }}} - -diff -up cups-filters-1.0.34/filter/textcommon.c.coverity cups-filters-1.0.34/filter/textcommon.c ---- cups-filters-1.0.34/filter/textcommon.c.coverity 2012-06-22 18:10:47.000000000 +0200 -+++ cups-filters-1.0.34/filter/textcommon.c 2013-06-05 12:47:24.892983432 +0200 -@@ -608,6 +608,8 @@ TextMain(const char *name, /* I - Name o - - if (PageColumns < 1) - { -+ if (fp != stdin) -+ fclose(fp); - fprintf(stderr, "ERROR: Bad columns value %d.\n", PageColumns); - return (1); - } -@@ -619,6 +621,8 @@ TextMain(const char *name, /* I - Name o - - if (CharsPerInch <= 0.0) - { -+ if (fp != stdin) -+ fclose(fp); - fprintf(stderr, "ERROR: Bad cpi value %f.\n", CharsPerInch); - return (1); - } -@@ -630,6 +634,8 @@ TextMain(const char *name, /* I - Name o - - if (LinesPerInch <= 0.0) - { -+ if (fp != stdin) -+ fclose(fp); - fprintf(stderr, "ERROR: Bad lpi value %f.", LinesPerInch); - return (1); - } -@@ -1110,6 +1116,9 @@ TextMain(const char *name, /* I - Name o - - WriteEpilogue(); - -+ if (fp != stdin) -+ fclose(fp); -+ - if (ppd != NULL) - ppdClose(ppd); - -diff -up cups-filters-1.0.34/filter/texttopdf.c.coverity cups-filters-1.0.34/filter/texttopdf.c ---- cups-filters-1.0.34/filter/texttopdf.c.coverity 2013-03-01 19:06:58.000000000 +0100 -+++ cups-filters-1.0.34/filter/texttopdf.c 2013-06-05 12:47:24.892983432 +0200 -@@ -1220,6 +1220,7 @@ static void write_pretty_header() // {{{ - x = PageRight - PageLeft - 36.0f / LinesPerInch - stringwidth_x(pagestr); - } - write_font_str(x,y,ATTR_BOLD,pagestr,-1); -+ free(pagestr); - - pdfOut_printf(pdf,"Q\n"); - } -diff -up cups-filters-1.0.34/fontembed/embed_sfnt.c.coverity cups-filters-1.0.34/fontembed/embed_sfnt.c ---- cups-filters-1.0.34/fontembed/embed_sfnt.c.coverity 2012-06-22 18:10:47.000000000 +0200 -+++ cups-filters-1.0.34/fontembed/embed_sfnt.c 2013-06-05 12:47:24.892983432 +0200 -@@ -335,7 +335,7 @@ static const char *emb_otf_get_post_name - if (gidtimeout = current_time + TIMEOUT_RETRY; - break; - } -+ if (response) -+ ippDelete(response); - - /* No jobs, not default printer, remove the CUPS queue */ - request = ippNewRequest(CUPS_DELETE_PRINTER); -@@ -635,6 +637,9 @@ void generate_local_queue(const char *ho - ignore this remote printer */ - debug_printf("cups-browsed: %s also taken, printer ignored.\n", - local_queue_name); -+ free (backup_queue_name); -+ free (remote_host); -+ cupsFreeDests(num_dests, dests); - return; - } - } -@@ -716,6 +721,8 @@ void generate_local_queue(const char *ho - name ? name : "", type, domain); - free (uri); - } -+ free (backup_queue_name); -+ free (remote_host); - - if (p) - debug_printf("cups-browsed: Bonjour IDs: Service name: \"%s\", " -@@ -1562,8 +1569,11 @@ fail: - if (conn) - httpClose (conn); - -+ if (server) -+ free (server); -+ - /* Call a new timeout handler so that we run again */ -- g_timeout_add_seconds (BrowseInterval, browse_poll, server); -+ g_timeout_add_seconds (BrowseInterval, browse_poll, data); - - /* Stop this timeout handler, we called a new one */ - return FALSE; -@@ -1933,13 +1943,13 @@ int main(int argc, char*argv[]) { - } - - if (BrowsePoll) { -- char **server; -- for (server = BrowsePoll; -- *server; -- server++) { -+ size_t index; -+ for (index = 0; -+ index < NumBrowsePoll; -+ index++) { - debug_printf ("cups-browsed: will browse poll %s every %ds\n", -- *server, BrowseInterval); -- g_idle_add (browse_poll, *server); -+ BrowsePoll[index], BrowseInterval); -+ g_idle_add (browse_poll, BrowsePoll[index]); - } - } - diff --git a/cups-filters-pcl.patch b/cups-filters-pcl.patch deleted file mode 100644 index 115b36e..0000000 --- a/cups-filters-pcl.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up cups-filters-1.0.34/Makefile.am.pcl cups-filters-1.0.34/Makefile.am ---- cups-filters-1.0.34/Makefile.am.pcl 2013-03-19 16:19:30.000000000 +0100 -+++ cups-filters-1.0.34/Makefile.am 2013-05-15 15:33:37.094839315 +0200 -@@ -213,6 +213,15 @@ pkgdriver_DATA = \ - - EXTRA_DIST += $(pkgdriver_DATA) - -+# ======= -+# Definitions for drivers -+# ======= -+pkgppdcdir = $(CUPS_DATADIR)/ppdc -+pkgppdc_DATA = \ -+ filter/pcl.h -+ -+EXTRA_DIST += $(pkgppdc_DATA) -+ - # ===== - # MIMEs - # ===== diff --git a/cups-filters.spec b/cups-filters.spec index 0b02dcb..d73162a 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -3,8 +3,8 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters -Version: 1.0.34 -Release: 8%{?dist} +Version: 1.0.35 +Release: 1%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -18,13 +18,10 @@ Release: 8%{?dist} License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT Group: System Environment/Base -Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format +Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz Source1: cups-browsed.service -Patch1: cups-filters-pcl.patch -Patch2: cups-filters-coverity.patch - Requires: cups-filters-libs%{?_isa} = %{version}-%{release} # Obsolete cups-php (bug #971741) @@ -98,8 +95,6 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q -%patch1 -p1 -b .pcl -%patch2 -p1 -b .coverity %build # work-around Rpath @@ -110,7 +105,6 @@ This is the development package for OpenPrinting CUPS filters and backends. %configure --disable-static \ --disable-silent-rules \ --with-pdftops=pdftops \ - --with-browseremoteprotocols=DNSSD,CUPS \ --with-rcdir=no make %{?_smp_mflags} @@ -207,6 +201,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Wed Jun 26 2013 Jiri Popelka - 1.0.35-1 +- 1.0.35 + * Wed Jun 19 2013 Jiri Popelka - 1.0.34-8 - fix the note we add in cups-browsed.conf diff --git a/sources b/sources index c12f7f9..aa01467 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4d605cd35ea5a42c13f7fc1e1f273de cups-filters-1.0.34.tar.xz +f722074dfa8efd3fcb8502cede13a608 cups-filters-1.0.35.tar.xz