5 files changed, 17 insertions, 198 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 2050c4fd49da..7923ff16233c 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTVERSION=	1.3.4
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
@@ -25,7 +25,6 @@ CONFLICTS=	LPRng-[0-9]*
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	cupsd
 CFLAGS+=	${PTHREAD_CFLAGS}
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index 0cabfd917ede..e2c7a7d705bd 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (cups-1.3.3-source.tar.bz2) = d4911e68b6979d16bc7a55f68d16cc53
-SHA256 (cups-1.3.3-source.tar.bz2) = 5e9e5670777055293e309cb0cbb2758df9c1275bf648df70478b7389c2d804de
-SIZE (cups-1.3.3-source.tar.bz2) = 4077262
+MD5 (cups-1.3.4-source.tar.bz2) = 4bd20d69bb083b42632346a383b6aefb
+SHA256 (cups-1.3.4-source.tar.bz2) = 91581afc60aa0a6789b1c0373bc204d3b7deec5b608cc3cadc8c07d0ba749154
+SIZE (cups-1.3.4-source.tar.bz2) = 4082345
diff --git a/print/cups-base/files/patch-CVE-2007-4351 b/print/cups-base/files/patch-CVE-2007-4351
deleted file mode 100644
index da0d07a14ad2..000000000000
--- a/print/cups-base/files/patch-CVE-2007-4351
+++ /dev/null
@@ -1,153 +0,0 @@
-Index: ipp.c
-===================================================================
---- cups/ipp.c	(revision 7023)
-+++ cups/ipp.c	(working copy)
-@@ -1306,6 +1306,12 @@
- 	  {
- 	    case IPP_TAG_INTEGER :
- 	    case IPP_TAG_ENUM :
-+		if (n != 4)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 4) < 4)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read integer value!");
-@@ -1318,6 +1324,12 @@
-                 value->integer = n;
- 	        break;
- 	    case IPP_TAG_BOOLEAN :
-+		if (n != 1)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 1) < 1)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read boolean value!");
-@@ -1335,6 +1347,12 @@
- 	    case IPP_TAG_CHARSET :
- 	    case IPP_TAG_LANGUAGE :
- 	    case IPP_TAG_MIMETYPE :
-+		if (n >= sizeof(buffer))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 		if ((*cb)(src, buffer, n) < n)
- 		{
- 		  DEBUG_puts("ippReadIO: unable to read name!");
-@@ -1347,6 +1365,12 @@
- 		              value->string.text));
- 	        break;
- 	    case IPP_TAG_DATE :
-+		if (n != 11)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, value->date, 11) < 11)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to date integer value!");
-@@ -1354,6 +1378,12 @@
- 		}
- 	        break;
- 	    case IPP_TAG_RESOLUTION :
-+		if (n != 9)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 9) < 9)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read resolution value!");
-@@ -1370,6 +1400,12 @@
- 		    (ipp_res_t)buffer[8];
- 	        break;
- 	    case IPP_TAG_RANGE :
-+		if (n != 8)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 8) < 8)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read range value!");
-@@ -1385,7 +1421,7 @@
- 	        break;
- 	    case IPP_TAG_TEXTLANG :
- 	    case IPP_TAG_NAMELANG :
--	        if (n > sizeof(buffer) || n < 4)
-+	        if (n >= sizeof(buffer) || n < 4)
- 		{
- 		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
- 		  return (IPP_ERROR);
-@@ -1411,22 +1447,27 @@
- 
- 		n = (bufptr[0] << 8) | bufptr[1];
- 
--                if (n >= sizeof(string))
-+		if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)) ||
-+		    n >= sizeof(string))
- 		{
--		  memcpy(string, bufptr + 2, sizeof(string) - 1);
--		  string[sizeof(string) - 1] = '\0';
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
- 		}
--		else
--		{
--		  memcpy(string, bufptr + 2, n);
--		  string[n] = '\0';
--                }
- 
-+		memcpy(string, bufptr + 2, n);
-+		string[n] = '\0';
-+
- 		value->string.charset = _cupsStrAlloc((char *)string);
- 
-                 bufptr += 2 + n;
- 		n = (bufptr[0] << 8) | bufptr[1];
- 
-+		if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 		bufptr[2 + n] = '\0';
-                 value->string.text = _cupsStrAlloc((char *)bufptr + 2);
- 	        break;
-@@ -1468,6 +1509,12 @@
- 		* we need to carry over...
- 		*/
- 
-+		if (n >= sizeof(buffer))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, n) < n)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read member name value!");
-@@ -1489,6 +1536,12 @@
- 		break;
- 
-             default : /* Other unsupported values */
-+		if (n > sizeof(buffer))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
-                 value->unknown.length = n;
- 	        if (n > 0)
- 		{
diff --git a/print/cups-base/files/patch-Makedefs.in b/print/cups-base/files/patch-Makedefs.in
deleted file mode 100644
index 7bd6f66f03e5..000000000000
--- a/print/cups-base/files/patch-Makedefs.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makedefs.in.orig	Fri Sep 28 21:13:27 2007
-+++ Makedefs.in	Fri Sep 28 21:13:48 2007
-@@ -108,8 +108,8 @@
- #               for extra debug info)
- #
- 
--ALL_CFLAGS	=	$(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
--			$(OPTIONS) $(CFLAGS)
-+ALL_CFLAGS	=	$(CFLAGS) $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
-+			$(OPTIONS)
- ARCHFLAGS	=	@ARCHFLAGS@
- ARFLAGS		=	@ARFLAGS@
- BACKLIBS	=	@BACKLIBS@
-
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 3e6b5df2ddca..2138c53d584f 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -154,32 +154,7 @@ sbin/reject
 %%DATADIR%%/charmaps/windows-936.txt
 %%DATADIR%%/charmaps/windows-949.txt
 %%DATADIR%%/charmaps/windows-950.txt
-%%DATADIR%%/charsets/iso-8859-1
-%%DATADIR%%/charsets/iso-8859-10
-%%DATADIR%%/charsets/iso-8859-13
-%%DATADIR%%/charsets/iso-8859-14
-%%DATADIR%%/charsets/iso-8859-15
-%%DATADIR%%/charsets/iso-8859-2
-%%DATADIR%%/charsets/iso-8859-3
-%%DATADIR%%/charsets/iso-8859-4
-%%DATADIR%%/charsets/iso-8859-5
-%%DATADIR%%/charsets/iso-8859-6
-%%DATADIR%%/charsets/iso-8859-7
-%%DATADIR%%/charsets/iso-8859-8
-%%DATADIR%%/charsets/iso-8859-9
-%%DATADIR%%/charsets/koi8-r
-%%DATADIR%%/charsets/koi8-u
 %%DATADIR%%/charsets/utf-8
-%%DATADIR%%/charsets/windows-1250
-%%DATADIR%%/charsets/windows-1251
-%%DATADIR%%/charsets/windows-1252
-%%DATADIR%%/charsets/windows-1253
-%%DATADIR%%/charsets/windows-1254
-%%DATADIR%%/charsets/windows-1255
-%%DATADIR%%/charsets/windows-1256
-%%DATADIR%%/charsets/windows-1257
-%%DATADIR%%/charsets/windows-1258
-%%DATADIR%%/charsets/windows-874
 %%DATADIR%%/data/HPGLprolog
 %%DATADIR%%/data/psglyphs
 %%DATADIR%%/data/testprint.ps
@@ -612,6 +587,7 @@ sbin/reject
 %%DATADIR%%/templates/it/users.tmpl
 %%DATADIR%%/templates/ja/add-class.tmpl
 %%DATADIR%%/templates/ja/add-printer.tmpl
+%%DATADIR%%/templates/ja/add-rss-subscription.tmpl
 %%DATADIR%%/templates/ja/admin.tmpl
 %%DATADIR%%/templates/ja/choose-device.tmpl
 %%DATADIR%%/templates/ja/choose-make.tmpl
@@ -638,9 +614,11 @@ sbin/reject
 %%DATADIR%%/templates/ja/job-restart.tmpl
 %%DATADIR%%/templates/ja/jobs-header.tmpl
 %%DATADIR%%/templates/ja/jobs.tmpl
+%%DATADIR%%/templates/ja/list-available-printers.tmpl
 %%DATADIR%%/templates/ja/maintenance.tmpl
 %%DATADIR%%/templates/ja/modify-class.tmpl
 %%DATADIR%%/templates/ja/modify-printer.tmpl
+%%DATADIR%%/templates/ja/norestart.tmpl
 %%DATADIR%%/templates/ja/option-conflict.tmpl
 %%DATADIR%%/templates/ja/option-trailer.tmpl
 %%DATADIR%%/templates/ja/pager.tmpl
@@ -662,6 +640,8 @@ sbin/reject
 %%DATADIR%%/templates/ja/samba-export.tmpl
 %%DATADIR%%/templates/ja/samba-exported.tmpl
 %%DATADIR%%/templates/ja/search.tmpl
+%%DATADIR%%/templates/ja/subscription-added.tmpl
+%%DATADIR%%/templates/ja/subscription-canceled.tmpl
 %%DATADIR%%/templates/ja/test-page.tmpl
 %%DATADIR%%/templates/ja/users.tmpl
 %%DATADIR%%/templates/job-cancel.tmpl
@@ -1373,15 +1353,20 @@ sbin/reject
 %%DOCSDIR%%/ja/images/button-accept-jobs.gif
 %%DOCSDIR%%/ja/images/button-add-class.gif
 %%DOCSDIR%%/ja/images/button-add-printer.gif
+%%DOCSDIR%%/ja/images/button-add-rss-subscription.gif
 %%DOCSDIR%%/ja/images/button-add-this-printer.gif
 %%DOCSDIR%%/ja/images/button-cancel-all-jobs.gif
 %%DOCSDIR%%/ja/images/button-cancel-job.gif
+%%DOCSDIR%%/ja/images/button-cancel-subscription.gif
 %%DOCSDIR%%/ja/images/button-change-settings.gif
+%%DOCSDIR%%/ja/images/button-clean-print-heads.gif
+%%DOCSDIR%%/ja/images/button-clear.gif
 %%DOCSDIR%%/ja/images/button-continue.gif
 %%DOCSDIR%%/ja/images/button-delete-class.gif
 %%DOCSDIR%%/ja/images/button-delete-printer.gif
 %%DOCSDIR%%/ja/images/button-edit-configuration-file.gif
 %%DOCSDIR%%/ja/images/button-export-samba.gif
+%%DOCSDIR%%/ja/images/button-find-new-printers.gif
 %%DOCSDIR%%/ja/images/button-help.gif
 %%DOCSDIR%%/ja/images/button-hold-job.gif
 %%DOCSDIR%%/ja/images/button-manage-classes.gif
@@ -1392,6 +1377,7 @@ sbin/reject
 %%DOCSDIR%%/ja/images/button-modify-printer.gif
 %%DOCSDIR%%/ja/images/button-move-job.gif
 %%DOCSDIR%%/ja/images/button-move-jobs.gif
+%%DOCSDIR%%/ja/images/button-print-self-test-page.gif
 %%DOCSDIR%%/ja/images/button-print-test-page.gif
 %%DOCSDIR%%/ja/images/button-publish-printer.gif
 %%DOCSDIR%%/ja/images/button-reject-jobs.gif
@@ -1418,6 +1404,7 @@ sbin/reject
 %%DOCSDIR%%/ja/images/button-view-access-log.gif
 %%DOCSDIR%%/ja/images/button-view-error-log.gif
 %%DOCSDIR%%/ja/images/button-view-page-log.gif
+%%DOCSDIR%%/ja/images/button-view-printable-version.gif
 %%DOCSDIR%%/ja/index.html
 %%DOCSDIR%%/pl/images/button-accept-jobs.gif
 %%DOCSDIR%%/pl/images/button-add-class.gif