Attachment 89847 Details for Bug 126881 – file.diff

[patch] file.diff

file.diff (text/plain), 11.16 KB, created by Martin Matuska on 2008-08-27 12:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2008-08-27 12:10:03 UTC

Size: 11.16 KB

patch

obsolete

>Index: ports/print/cups-base/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/print/cups-base/Makefile,v
>retrieving revision 1.97
>diff -u -r1.97 Makefile
>--- ports/print/cups-base/Makefile	21 Aug 2008 06:18:08 -0000	1.97
>+++ ports/print/cups-base/Makefile	27 Aug 2008 10:57:51 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	cups
>-PORTVERSION=	1.3.7
>-PORTREVISION=	4
>+PORTVERSION=	1.3.8
> DISTVERSIONSUFFIX=	-source
> CATEGORIES=	print
> MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
>@@ -23,7 +22,6 @@
> CONFLICTS=	LPRng-[0-9]*
> 
> USE_LDCONFIG=	yes
>-USE_BZIP2=	yes
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> USE_RC_SUBR=	cupsd
>Index: ports/print/cups-base/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/print/cups-base/distinfo,v
>retrieving revision 1.22
>diff -u -r1.22 distinfo
>--- ports/print/cups-base/distinfo	2 Apr 2008 15:20:37 -0000	1.22
>+++ ports/print/cups-base/distinfo	27 Aug 2008 10:57:51 -0000
>@@ -1,3 +1,5 @@
>-MD5 (cups-1.3.7-source.tar.bz2) = db4a45a17104f10f3ee599d88267c9e5
>-SHA256 (cups-1.3.7-source.tar.bz2) = 1c8bb310131498934657651fb0ea3e44b4f6d0243ba2ad252644a8f039dda0fe
>-SIZE (cups-1.3.7-source.tar.bz2) = 3895825
>+MD5 (cups-1.3.8-source.tar.gz) = 7b0f4979ac231a4df5ebfbf7ebc61b8a
>+SHA256 (cups-1.3.8-source.tar.gz) = baebfbe2695f5d331a4bfbce7d437d6010226d8ba5cd2834a7e80344aedd0e50
>+MD5 (cups-1.3.8-source.tar.gz) = 10efe9825c1a1dcd325be47a6cc21faf
>+SHA256 (cups-1.3.8-source.tar.gz) = 7ecf2d1bc70d118cd0feaa3f91a4c9f90d4ce8357b04ea16ee41163165549cab
>+SIZE (cups-1.3.8-source.tar.gz) = 4796827
>Index: ports/print/cups-base/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/print/cups-base/pkg-plist,v
>retrieving revision 1.44
>diff -u -r1.44 pkg-plist
>--- ports/print/cups-base/pkg-plist	2 Apr 2008 15:20:38 -0000	1.44
>+++ ports/print/cups-base/pkg-plist	27 Aug 2008 10:57:52 -0000
>@@ -522,6 +522,73 @@
> %%DATADIR%%/templates/header.tmpl
> %%DATADIR%%/templates/help-header.tmpl
> %%DATADIR%%/templates/help-printable.tmpl
>+%%DATADIR%%/templates/id/add-class.tmpl
>+%%DATADIR%%/templates/id/add-printer.tmpl
>+%%DATADIR%%/templates/id/add-rss-subscription.tmpl
>+%%DATADIR%%/templates/id/admin.tmpl
>+%%DATADIR%%/templates/id/choose-device.tmpl
>+%%DATADIR%%/templates/id/choose-make.tmpl
>+%%DATADIR%%/templates/id/choose-model.tmpl
>+%%DATADIR%%/templates/id/choose-serial.tmpl
>+%%DATADIR%%/templates/id/choose-uri.tmpl
>+%%DATADIR%%/templates/id/class-added.tmpl
>+%%DATADIR%%/templates/id/class-confirm.tmpl
>+%%DATADIR%%/templates/id/class-deleted.tmpl
>+%%DATADIR%%/templates/id/class-jobs-header.tmpl
>+%%DATADIR%%/templates/id/class-modified.tmpl
>+%%DATADIR%%/templates/id/classes-header.tmpl
>+%%DATADIR%%/templates/id/classes.tmpl
>+%%DATADIR%%/templates/id/edit-config.tmpl
>+%%DATADIR%%/templates/id/error-op.tmpl
>+%%DATADIR%%/templates/id/error.tmpl
>+%%DATADIR%%/templates/id/header.tmpl
>+%%DATADIR%%/templates/id/help-header.tmpl
>+%%DATADIR%%/templates/id/help-printable.tmpl
>+%%DATADIR%%/templates/id/list-available-printers.tmpl
>+%%DATADIR%%/templates/id/job-cancel.tmpl
>+%%DATADIR%%/templates/id/job-hold.tmpl
>+%%DATADIR%%/templates/id/job-move.tmpl
>+%%DATADIR%%/templates/id/job-moved.tmpl
>+%%DATADIR%%/templates/id/job-release.tmpl
>+%%DATADIR%%/templates/id/job-restart.tmpl
>+%%DATADIR%%/templates/id/jobs-header.tmpl
>+%%DATADIR%%/templates/id/jobs.tmpl
>+%%DATADIR%%/templates/id/maintenance.tmpl
>+%%DATADIR%%/templates/id/modify-class.tmpl
>+%%DATADIR%%/templates/id/modify-printer.tmpl
>+%%DATADIR%%/templates/id/norestart.tmpl
>+%%DATADIR%%/templates/id/option-boolean.tmpl
>+%%DATADIR%%/templates/id/option-conflict.tmpl
>+%%DATADIR%%/templates/id/option-header.tmpl
>+%%DATADIR%%/templates/id/option-pickmany.tmpl
>+%%DATADIR%%/templates/id/option-pickone.tmpl
>+%%DATADIR%%/templates/id/option-trailer.tmpl
>+%%DATADIR%%/templates/id/pager.tmpl
>+%%DATADIR%%/templates/id/printer-accept.tmpl
>+%%DATADIR%%/templates/id/printer-added.tmpl
>+%%DATADIR%%/templates/id/printer-configured.tmpl
>+%%DATADIR%%/templates/id/printer-confirm.tmpl
>+%%DATADIR%%/templates/id/printer-default.tmpl
>+%%DATADIR%%/templates/id/printer-deleted.tmpl
>+%%DATADIR%%/templates/id/printer-jobs-header.tmpl
>+%%DATADIR%%/templates/id/printer-modified.tmpl
>+%%DATADIR%%/templates/id/printer-purge.tmpl
>+%%DATADIR%%/templates/id/printer-reject.tmpl
>+%%DATADIR%%/templates/id/printer-start.tmpl
>+%%DATADIR%%/templates/id/printer-stop.tmpl
>+%%DATADIR%%/templates/id/printers-header.tmpl
>+%%DATADIR%%/templates/id/printers.tmpl
>+%%DATADIR%%/templates/id/restart.tmpl
>+%%DATADIR%%/templates/id/samba-export.tmpl
>+%%DATADIR%%/templates/id/samba-exported.tmpl
>+%%DATADIR%%/templates/id/search.tmpl
>+%%DATADIR%%/templates/id/set-printer-options-header.tmpl
>+%%DATADIR%%/templates/id/set-printer-options-trailer.tmpl
>+%%DATADIR%%/templates/id/subscription-added.tmpl
>+%%DATADIR%%/templates/id/subscription-canceled.tmpl
>+%%DATADIR%%/templates/id/test-page.tmpl
>+%%DATADIR%%/templates/id/trailer.tmpl
>+%%DATADIR%%/templates/id/users.tmpl
> %%DATADIR%%/templates/it/add-class.tmpl
> %%DATADIR%%/templates/it/add-printer.tmpl
> %%DATADIR%%/templates/it/admin.tmpl
>@@ -1297,6 +1364,62 @@
> %%DOCSDIR%%/images/web-set-printer-options.gif
> %%DOCSDIR%%/images/web-test-page.gif
> %%DOCSDIR%%/index.html
>+%%DOCSDIR%%/id/images/button-accept-jobs.gif
>+%%DOCSDIR%%/id/images/button-add-class.gif
>+%%DOCSDIR%%/id/images/button-add-printer.gif
>+%%DOCSDIR%%/id/images/button-add-rss-subscription.gif
>+%%DOCSDIR%%/id/images/button-add-this-printer.gif
>+%%DOCSDIR%%/id/images/button-cancel-all-jobs.gif
>+%%DOCSDIR%%/id/images/button-cancel-job.gif
>+%%DOCSDIR%%/id/images/button-cancel-subscription.gif
>+%%DOCSDIR%%/id/images/button-change-settings.gif
>+%%DOCSDIR%%/id/images/button-clean-print-heads.gif
>+%%DOCSDIR%%/id/images/button-clear.gif
>+%%DOCSDIR%%/id/images/button-continue.gif
>+%%DOCSDIR%%/id/images/button-delete-class.gif
>+%%DOCSDIR%%/id/images/button-delete-printer.gif
>+%%DOCSDIR%%/id/images/button-edit-configuration-file.gif
>+%%DOCSDIR%%/id/images/button-export-samba.gif
>+%%DOCSDIR%%/id/images/button-find-new-printers.gif
>+%%DOCSDIR%%/id/images/button-help.gif
>+%%DOCSDIR%%/id/images/button-hold-job.gif
>+%%DOCSDIR%%/id/images/button-manage-classes.gif
>+%%DOCSDIR%%/id/images/button-manage-jobs.gif
>+%%DOCSDIR%%/id/images/button-manage-printers.gif
>+%%DOCSDIR%%/id/images/button-manage-server.gif
>+%%DOCSDIR%%/id/images/button-modify-class.gif
>+%%DOCSDIR%%/id/images/button-modify-printer.gif
>+%%DOCSDIR%%/id/images/button-move-job.gif
>+%%DOCSDIR%%/id/images/button-move-jobs.gif
>+%%DOCSDIR%%/id/images/button-print-self-test-page.gif
>+%%DOCSDIR%%/id/images/button-print-test-page.gif
>+%%DOCSDIR%%/id/images/button-publish-printer.gif
>+%%DOCSDIR%%/id/images/button-reject-jobs.gif
>+%%DOCSDIR%%/id/images/button-release-job.gif
>+%%DOCSDIR%%/id/images/button-restart-job.gif
>+%%DOCSDIR%%/id/images/button-save-changes.gif
>+%%DOCSDIR%%/id/images/button-search.gif
>+%%DOCSDIR%%/id/images/button-set-allowed-users.gif
>+%%DOCSDIR%%/id/images/button-set-as-default.gif
>+%%DOCSDIR%%/id/images/button-set-printer-options.gif
>+%%DOCSDIR%%/id/images/button-show-active.gif
>+%%DOCSDIR%%/id/images/button-show-all.gif
>+%%DOCSDIR%%/id/images/button-show-completed.gif
>+%%DOCSDIR%%/id/images/button-show-next.gif
>+%%DOCSDIR%%/id/images/button-show-previous.gif
>+%%DOCSDIR%%/id/images/button-sort-ascending.gif
>+%%DOCSDIR%%/id/images/button-sort-descending.gif
>+%%DOCSDIR%%/id/images/button-start-class.gif
>+%%DOCSDIR%%/id/images/button-start-printer.gif
>+%%DOCSDIR%%/id/images/button-stop-class.gif
>+%%DOCSDIR%%/id/images/button-stop-printer.gif
>+%%DOCSDIR%%/id/images/button-unpublish-printer.gif
>+%%DOCSDIR%%/id/images/button-use-default-config.gif
>+%%DOCSDIR%%/id/images/button-view-access-log.gif
>+%%DOCSDIR%%/id/images/button-view-error-log.gif
>+%%DOCSDIR%%/id/images/button-view-page-log.gif
>+%%DOCSDIR%%/id/images/button-view-printable-version.gif
>+%%DOCSDIR%%/id/index.html
> %%DOCSDIR%%/it/images/button-accept-jobs.gif
> %%DOCSDIR%%/it/images/button-add-class.gif
> %%DOCSDIR%%/it/images/button-add-printer.gif
>@@ -1579,6 +1702,7 @@
> share/locale/fi/cups_fi.po
> share/locale/fr/cups_fr.po
> share/locale/he/cups_he.po
>+share/locale/id/cups_id.po
> share/locale/it/cups_it.po
> share/locale/ja/cups_ja.po
> share/locale/ko/cups_ko.po
>@@ -1633,6 +1757,8 @@
> @dirrm %%DOCSDIR%%/ko
> @dirrm %%DOCSDIR%%/ja/images
> @dirrm %%DOCSDIR%%/ja
>+@dirrm %%DOCSDIR%%/id/images
>+@dirrm %%DOCSDIR%%/id
> @dirrm %%DOCSDIR%%/it/images
> @dirrm %%DOCSDIR%%/it
> @dirrm %%DOCSDIR%%/images
>@@ -1658,6 +1784,7 @@
> @dirrm %%DATADIR%%/templates/pl
> @dirrm %%DATADIR%%/templates/ja
> @dirrm %%DATADIR%%/templates/it
>+@dirrm %%DATADIR%%/templates/id
> @dirrm %%DATADIR%%/templates/he
> @dirrm %%DATADIR%%/templates/fr
> @dirrm %%DATADIR%%/templates/et
>Index: ports/print/cups-base/files/patch-str2790
>===================================================================
>RCS file: ports/print/cups-base/files/patch-str2790
>diff -N ports/print/cups-base/files/patch-str2790
>--- ports/print/cups-base/files/patch-str2790	12 Aug 2008 14:21:12 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,72 +0,0 @@
>-Index: image-png.c
>-===================================================================
>---- filter/image-png.c	(revision 7434)
>-+++ filter/image-png.c	(working copy)
>-@@ -3,7 +3,7 @@
>-  *
>-  *   PNG image routines for the Common UNIX Printing System (CUPS).
>-  *
>-- *   Copyright 2007 by Apple Inc.
>-+ *   Copyright 2007-2008 by Apple Inc.
>-  *   Copyright 1993-2007 by Easy Software Products.
>-  *
>-  *   These coded instructions, statements, and computer programs are the
>-@@ -170,16 +170,56 @@
>-     * Interlaced images must be loaded all at once...
>-     */
>- 
>-+    size_t bufsize;			/* Size of buffer */
>-+
>-+
>-     if (color_type == PNG_COLOR_TYPE_GRAY ||
>- 	color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
>--      in = malloc(img->xsize * img->ysize);
>-+    {
>-+      bufsize = img->xsize * img->ysize;
>-+
>-+      if ((bufsize / img->ysize) != img->xsize)
>-+      {
>-+	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
>-+		(unsigned)width, (unsigned)height);
>-+	fclose(fp);
>-+	return (1);
>-+      }
>-+    }
>-     else
>--      in = malloc(img->xsize * img->ysize * 3);
>-+    {
>-+      bufsize = img->xsize * img->ysize * 3;
>-+
>-+      if ((bufsize / (img->ysize * 3)) != img->xsize)
>-+      {
>-+	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
>-+		(unsigned)width, (unsigned)height);
>-+	fclose(fp);
>-+	return (1);
>-+      }
>-+    }
>-+
>-+    in = malloc(bufsize);
>-   }
>- 
>-   bpp = cupsImageGetDepth(img);
>-   out = malloc(img->xsize * bpp);
>- 
>-+  if (!in || !out)
>-+  {
>-+    fputs("DEBUG: Unable to allocate memory for PNG image!\n", stderr);
>-+
>-+    if (in)
>-+      free(in);
>-+
>-+    if (out)
>-+      free(out);
>-+
>-+    fclose(fp);
>-+
>-+    return (1);
>-+  }
>-+
>-  /*
>-   * Read the image, interlacing as needed...
>-   */
>Index: ports/print/cups/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/print/cups/Makefile,v
>retrieving revision 1.40
>diff -u -r1.40 Makefile
>--- ports/print/cups/Makefile	6 Jun 2008 13:57:43 -0000	1.40
>+++ ports/print/cups/Makefile	27 Aug 2008 10:58:01 -0000
>@@ -8,8 +8,7 @@
> #
> 
> PORTNAME=	cups
>-PORTVERSION=	1.3.7
>-PORTREVISION=	1
>+PORTVERSION=	1.3.8
> CATEGORIES=	print
> MASTER_SITES=	# empty
> DISTFILES=	# empty

Actions: View | Diff

Attachments on bug 126881: 89847