- update to 1.3.10

5 files changed, 5 insertions, 212 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 8c200f6f8ab5..e3f010a218f8 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.3.9
-PORTREVISION=	3
+PORTVERSION=	1.3.10
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index 95e90df054c1..d0d4d693e217 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (cups-1.3.9-source.tar.bz2) = cf63f451c356e6cabb08972d4d11c365
-SHA256 (cups-1.3.9-source.tar.bz2) = 38856ab4b8bcf51be2bed1f554cd8089c1f2448a6979c055762b49eda82a6b6b
-SIZE (cups-1.3.9-source.tar.bz2) = 3993875
+MD5 (cups-1.3.10-source.tar.bz2) = 84fffe96b8537c81a463faccead80026
+SHA256 (cups-1.3.10-source.tar.bz2) = 9701a545a6a05a991beeb49b41fbb4d450c3bdbb4eb74b132b0d2988640bb566
+SIZE (cups-1.3.10-source.tar.bz2) = 3778970
diff --git a/print/cups-base/files/patch-maxsubscriptions b/print/cups-base/files/patch-maxsubscriptions
deleted file mode 100644
index a3f9e8567316..000000000000
--- a/print/cups-base/files/patch-maxsubscriptions
+++ /dev/null
@@ -1,179 +0,0 @@
-Obtained from: Michael Sweet, via oss-security list,
-  http://www.openwall.com/lists/oss-security/2008/11/20/2
-
-Index: test/run-stp-tests.sh
-===================================================================
---- test/run-stp-tests.sh	(revision 8145)
-+++ test/run-stp-tests.sh	(revision 8146)
-@@ -307,6 +307,7 @@
- DocumentRoot $root/doc
- RequestRoot /tmp/cups-$user/spool
- TempDir /tmp/cups-$user/spool/temp
-+MaxSubscriptions 3
- MaxLogSize 0
- AccessLog /tmp/cups-$user/log/access_log
- ErrorLog /tmp/cups-$user/log/error_log
-Index: test/4.4-subscription-ops.test
-===================================================================
---- test/4.4-subscription-ops.test	(revision 8145)
-+++ test/4.4-subscription-ops.test	(revision 8146)
-@@ -116,7 +116,33 @@
- 	EXPECT notify-events
- 	DISPLAY notify-events
- }
-+{
-+	# The name of the test...
-+	NAME "Check MaxSubscriptions limits"
- 
-+	# The operation to use
-+	OPERATION Create-Printer-Subscription
-+	RESOURCE /
-+
-+	# The attributes to send
-+	GROUP operation
-+	ATTR charset attributes-charset utf-8
-+	ATTR language attributes-natural-language en
-+	ATTR uri printer-uri $method://$hostname:$port/printers/Test1
-+
-+        GROUP subscription
-+	ATTR uri notify-recipient-uri testnotify://
-+	ATTR keyword notify-events printer-state-changed
-+	ATTR integer notify-lease-duration 5
-+
-+	# What statuses are OK?
-+	STATUS client-error-too-many-subscriptions
-+
-+	# What attributes do we expect?
-+	EXPECT attributes-charset
-+	EXPECT attributes-natural-language
-+}
-+
- #
- # End of "$Id$"
- #
-Index: scheduler/subscriptions.c
-===================================================================
---- scheduler/subscriptions.c	(revision 8145)
-+++ scheduler/subscriptions.c	(revision 8146)
-@@ -341,9 +341,55 @@
-   * Limit the number of subscriptions...
-   */
- 
--  if (cupsArrayCount(Subscriptions) >= MaxSubscriptions)
-+  if (MaxSubscriptions > 0 && cupsArrayCount(Subscriptions) >= MaxSubscriptions)
-+  {
-+    cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                    "cupsdAddSubscription: Reached MaxSubscriptions %d",
-+		    MaxSubscriptions);
-     return (NULL);
-+  }
- 
-+  if (MaxSubscriptionsPerJob > 0 && job)
-+  {
-+    int	count;				/* Number of job subscriptions */
-+
-+    for (temp = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions),
-+             count = 0;
-+         temp;
-+	 temp = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
-+      if (temp->job == job)
-+        count ++;
-+
-+    if (count >= MaxSubscriptionsPerJob)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		      "cupsdAddSubscription: Reached MaxSubscriptionsPerJob %d "
-+		      "for job #%d", MaxSubscriptionsPerJob, job->id);
-+      return (NULL);
-+    }
-+  }
-+
-+  if (MaxSubscriptionsPerPrinter > 0 && dest)
-+  {
-+    int	count;				/* Number of printer subscriptions */
-+
-+    for (temp = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions),
-+             count = 0;
-+         temp;
-+	 temp = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
-+      if (temp->dest == dest)
-+        count ++;
-+
-+    if (count >= MaxSubscriptionsPerPrinter)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		      "cupsdAddSubscription: Reached "
-+		      "MaxSubscriptionsPerPrinter %d for %s",
-+		      MaxSubscriptionsPerPrinter, dest->name);
-+      return (NULL);
-+    }
-+  }
-+
-  /*
-   * Allocate memory for this subscription...
-   */
-@@ -758,7 +804,6 @@
-       cupsdLogMessage(CUPSD_LOG_ERROR,
-                       "Syntax error on line %d of subscriptions.conf.",
- 	              linenum);
--      break;
-     }
-     else if (!strcasecmp(line, "Events"))
-     {
-Index: scheduler/ipp.c
-===================================================================
---- scheduler/ipp.c	(revision 8145)
-+++ scheduler/ipp.c	(revision 8146)
-@@ -2119,24 +2119,25 @@
-     if (mask == CUPSD_EVENT_NONE)
-       mask = CUPSD_EVENT_JOB_COMPLETED;
- 
--    sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job, recipient,
--                               0);
-+    if ((sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job,
-+                                    recipient, 0)) != NULL)
-+    {
-+      sub->interval = interval;
- 
--    sub->interval = interval;
-+      cupsdSetString(&sub->owner, job->username);
- 
--    cupsdSetString(&sub->owner, job->username);
-+      if (user_data)
-+      {
-+	sub->user_data_len = user_data->values[0].unknown.length;
-+	memcpy(sub->user_data, user_data->values[0].unknown.data,
-+	       sub->user_data_len);
-+      }
- 
--    if (user_data)
--    {
--      sub->user_data_len = user_data->values[0].unknown.length;
--      memcpy(sub->user_data, user_data->values[0].unknown.data,
--             sub->user_data_len);
-+      ippAddSeparator(con->response);
-+      ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
-+		    "notify-subscription-id", sub->id);
-     }
- 
--    ippAddSeparator(con->response);
--    ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
--                  "notify-subscription-id", sub->id);
--
-     if (attr)
-       attr = attr->next;
-   }
-@@ -5590,7 +5591,12 @@
-     else
-       job = NULL;
- 
--    sub = cupsdAddSubscription(mask, printer, job, recipient, 0);
-+    if ((sub = cupsdAddSubscription(mask, printer, job, recipient, 0)) == NULL)
-+    {
-+      send_ipp_status(con, IPP_TOO_MANY_SUBSCRIPTIONS,
-+		      _("There are too many subscriptions."));
-+      return;
-+    }
- 
-     if (job)
-       cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for job %d",
diff --git a/print/cups-base/files/patch-str2974 b/print/cups-base/files/patch-str2974
deleted file mode 100644
index f407d5543387..000000000000
--- a/print/cups-base/files/patch-str2974
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix for the buffer overflow in the PNG reading code
-
-See: http://www.cups.org/str.php?L2974
-Obtained from: http://www.cups.org/strfiles/2974/str2974.patch
-
-Index: filter/image-png.c
-===================================================================
---- filter/image-png.c	(revision 8062)
-+++ filter/image-png.c	(working copy)
-@@ -178,7 +178,7 @@
-     {
-       bufsize = img->xsize * img->ysize;
- 
--      if ((bufsize / img->ysize) != img->xsize)
-+      if ((bufsize / img->xsize) != img->ysize)
-       {
- 	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
- 		(unsigned)width, (unsigned)height);
-@@ -190,7 +190,7 @@
-     {
-       bufsize = img->xsize * img->ysize * 3;
- 
--      if ((bufsize / (img->ysize * 3)) != img->xsize)
-+      if ((bufsize / (img->xsize * 3)) != img->ysize)
-       {
- 	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
- 		(unsigned)width, (unsigned)height);
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 0d70f1f6849d..db872c3cff71 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.3.9
+PORTVERSION=	1.3.10
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty