diff --git a/print/cups/Makefile b/print/cups/Makefile index f2ca34b7951..e4166ec6f51 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.85 2010/11/10 12:53:09 kili Exp $ +# $OpenBSD: Makefile,v 1.86 2010/11/12 07:09:00 ajacoutot Exp $ COMMENT= Common Unix Printing System -VERSION= 1.4.4 +VERSION= 1.4.5 DISTNAME= cups-${VERSION}-source PKGNAME= cups-${VERSION} -REVISION= 7 CATEGORIES= print sysutils diff --git a/print/cups/distinfo b/print/cups/distinfo index 53ccccf3115..b9782c79c2c 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,5 +1,5 @@ -MD5 (cups-1.4.4-source.tar.bz2) = h3ZAOtYP6p6F6rnATYhWDQ== -RMD160 (cups-1.4.4-source.tar.bz2) = H0hqzaAug7aCT4yjO3TAL/PwGZQ= -SHA1 (cups-1.4.4-source.tar.bz2) = PhecAH+mzWh0tg/xim9IBwVHoAo= -SHA256 (cups-1.4.4-source.tar.bz2) = 0l/6Na3Tq+7sDrpgviz/yJQltknGTvOnPfxyRoOlmqM= -SIZE (cups-1.4.4-source.tar.bz2) = 4472741 +MD5 (cups-1.4.5-source.tar.bz2) = UHKfb8RrpUIj4Or1AJ80GQ== +RMD160 (cups-1.4.5-source.tar.bz2) = P7Ms2EXVbj/n75xU8ddhvO6Qghg= +SHA1 (cups-1.4.5-source.tar.bz2) = aK83I0ZFlU4b+tajYIxnwDqa73g= +SHA256 (cups-1.4.5-source.tar.bz2) = BFDW2OboryJdKjMZyEhzfXZHOmx1ec+XxSCG0DccDv4= +SIZE (cups-1.4.5-source.tar.bz2) = 4513924 diff --git a/print/cups/patches/patch-config-scripts_cups-common_m4 b/print/cups/patches/patch-config-scripts_cups-common_m4 index a4e03f26a63..a9da6923157 100644 --- a/print/cups/patches/patch-config-scripts_cups-common_m4 +++ b/print/cups/patches/patch-config-scripts_cups-common_m4 @@ -1,9 +1,9 @@ -$OpenBSD: patch-config-scripts_cups-common_m4,v 1.3 2010/07/02 07:52:08 ajacoutot Exp $ +$OpenBSD: patch-config-scripts_cups-common_m4,v 1.4 2010/11/12 07:09:00 ajacoutot Exp $ STR #3447: dbus notifier no longer builds ---- config-scripts/cups-common.m4.orig Thu Jun 17 20:25:43 2010 -+++ config-scripts/cups-common.m4 Fri Jul 2 09:19:02 2010 +--- config-scripts/cups-common.m4.orig Thu Nov 11 21:11:32 2010 ++++ config-scripts/cups-common.m4 Fri Nov 12 07:31:19 2010 @@ -130,7 +130,6 @@ AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H)) AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H)) AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H)) @@ -11,8 +11,8 @@ STR #3447: dbus notifier no longer builds -AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H)) AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H)) - dnl Checks for string functions. -@@ -276,6 +275,8 @@ if test "x$enable_dbus" != xno; then + dnl Checks for statfs and its many headers... +@@ -283,6 +282,8 @@ if test "x$enable_dbus" != xno; then dbus_message_iter_init_append, AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),, `$PKGCONFIG --libs dbus-1`) diff --git a/print/cups/patches/patch-cups_ipp_c b/print/cups/patches/patch-cups_ipp_c deleted file mode 100644 index db1bd9ae8bc..00000000000 --- a/print/cups/patches/patch-cups_ipp_c +++ /dev/null @@ -1,34 +0,0 @@ -$OpenBSD: patch-cups_ipp_c,v 1.4 2010/11/10 12:53:09 kili Exp $ ---- cups/ipp.c.orig Fri Apr 23 20:56:34 2010 -+++ cups/ipp.c Wed Nov 10 11:19:50 2010 -@@ -1275,7 +1275,9 @@ ippReadIO(void *src, /* I - Data source */ - - attr->value_tag = tag; - } -- else if ((value_tag >= IPP_TAG_TEXTLANG && -+ else if (value_tag == IPP_TAG_TEXTLANG || -+ value_tag == IPP_TAG_NAMELANG || -+ (value_tag >= IPP_TAG_TEXT && - value_tag <= IPP_TAG_MIMETYPE)) - { - /* -@@ -1283,8 +1285,9 @@ ippReadIO(void *src, /* I - Data source */ - * forms; accept sets of differing values... - */ - -- if ((tag < IPP_TAG_TEXTLANG || tag > IPP_TAG_MIMETYPE) && -- tag != IPP_TAG_NOVALUE) -+ if (tag != IPP_TAG_TEXTLANG && tag != IPP_TAG_NAMELANG && -+ (tag < IPP_TAG_TEXT || tag > IPP_TAG_MIMETYPE) && -+ tag != IPP_TAG_NOVALUE) - { - DEBUG_printf(("1ippReadIO: 1setOf value tag %x(%s) != %x(%s)", - value_tag, ippTagString(value_tag), tag, -@@ -2766,6 +2769,7 @@ _ippFreeAttr(ipp_attribute_t *attr) /* I - Attribute t - { - case IPP_TAG_TEXT : - case IPP_TAG_NAME : -+ case IPP_TAG_RESERVED_STRING : - case IPP_TAG_KEYWORD : - case IPP_TAG_URI : - case IPP_TAG_URISCHEME : diff --git a/print/cups/patches/patch-cups_ipp_h b/print/cups/patches/patch-cups_ipp_h deleted file mode 100644 index 8530c3ad44c..00000000000 --- a/print/cups/patches/patch-cups_ipp_h +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-cups_ipp_h,v 1.2 2010/11/10 12:53:09 kili Exp $ ---- cups/ipp.h.orig Fri Apr 23 20:56:34 2010 -+++ cups/ipp.h Wed Nov 10 11:19:50 2010 -@@ -93,7 +93,8 @@ typedef enum ipp_tag_e /**** Format tags for attribu - IPP_TAG_END_COLLECTION, /* End of collection value */ - IPP_TAG_TEXT = 0x41, /* Text value */ - IPP_TAG_NAME, /* Name value */ -- IPP_TAG_KEYWORD = 0x44, /* Keyword value */ -+ IPP_TAG_RESERVED_STRING, /* Reserved for future string value @private@ */ -+ IPP_TAG_KEYWORD, /* Keyword value */ - IPP_TAG_URI, /* URI value */ - IPP_TAG_URISCHEME, /* URI scheme value */ - IPP_TAG_CHARSET, /* Character set value */ diff --git a/print/cups/patches/patch-man_lp_man b/print/cups/patches/patch-man_lp_man deleted file mode 100644 index 65dd6e00b51..00000000000 --- a/print/cups/patches/patch-man_lp_man +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-man_lp_man,v 1.1 2010/08/22 10:48:42 ajacoutot Exp $ - -STR #3650: left over text in lp.man - ---- man/lp.man.orig Sun Aug 22 12:44:11 2010 -+++ man/lp.man Sun Aug 22 12:44:19 2010 -@@ -157,7 +157,6 @@ contain a list of numbers and ranges (#-#) separated b - (e.g. 1,3-5,16). The page numbers refer to the output pages and - not the document's original pages - options like "number-up" can - affect the numbering of the pages. --that are - .SH COMMON JOB OPTIONS - Aside from the printer-specific options reported by the - \fIlpoptions(1)\fR command, the following generic options are diff --git a/print/cups/patches/patch-scheduler_ipp_c b/print/cups/patches/patch-scheduler_ipp_c index 2a6c5861c89..0f1eea251ec 100644 --- a/print/cups/patches/patch-scheduler_ipp_c +++ b/print/cups/patches/patch-scheduler_ipp_c @@ -1,11 +1,11 @@ -$OpenBSD: patch-scheduler_ipp_c,v 1.4 2010/06/27 04:18:50 ajacoutot Exp $ +$OpenBSD: patch-scheduler_ipp_c,v 1.5 2010/11/12 07:09:00 ajacoutot Exp $ Increase timeout for the PPD file to be copied so that it doesn't fail on low-end configurations. ---- scheduler/ipp.c.orig Fri Apr 23 20:56:34 2010 -+++ scheduler/ipp.c Sun Jun 27 06:09:51 2010 -@@ -5245,7 +5245,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect +--- scheduler/ipp.c.orig Wed Oct 6 22:07:44 2010 ++++ scheduler/ipp.c Fri Nov 12 07:31:19 2010 +@@ -5235,7 +5235,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect FD_SET(temppipe[0], &input); FD_SET(CGIPipes[0], &input); diff --git a/print/cups/patches/patch-systemv_lpadmin_c b/print/cups/patches/patch-systemv_lpadmin_c index 213d5ad0616..be665c49ec7 100644 --- a/print/cups/patches/patch-systemv_lpadmin_c +++ b/print/cups/patches/patch-systemv_lpadmin_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-systemv_lpadmin_c,v 1.5 2010/03/31 16:20:02 ajacoutot Exp $ ---- systemv/lpadmin.c.orig Tue Feb 17 00:57:08 2009 -+++ systemv/lpadmin.c Sun Aug 30 15:14:02 2009 -@@ -1952,14 +1952,14 @@ set_printer_options( +$OpenBSD: patch-systemv_lpadmin_c,v 1.6 2010/11/12 07:09:00 ajacoutot Exp $ +--- systemv/lpadmin.c.orig Fri Aug 13 03:34:04 2010 ++++ systemv/lpadmin.c Fri Nov 12 07:31:19 2010 +@@ -1367,14 +1367,14 @@ set_printer_options( static int /* O - 0 if name is no good, 1 if name is good */ validate_name(const char *name) /* I - Name to check */ { @@ -18,7 +18,7 @@ $OpenBSD: patch-systemv_lpadmin_c,v 1.5 2010/03/31 16:20:02 ajacoutot Exp $ if (*ptr == '@') break; else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || -@@ -1970,7 +1970,7 @@ validate_name(const char *name) /* I - Name to check +@@ -1385,7 +1385,7 @@ validate_name(const char *name) /* I - Name to check * All the characters are good; validate the length, too... */ diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST index 44d67e8e58d..ae92a6d693f 100644 --- a/print/cups/pkg/PLIST +++ b/print/cups/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.27 2010/10/28 15:12:50 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.28 2010/11/12 07:09:00 ajacoutot Exp $ @conflict LPRng-* @newgroup _cups:541 @newuser _cups:541:541:daemon:CUPS printer spooler daemon:/var/empty:/sbin/nologin @@ -122,7 +122,6 @@ libexec/cups/notifier/ @man man/man5/printers.conf.5 @man man/man5/subscriptions.conf.5 @man man/man7/backend.7 -@man man/man7/drv.7 @man man/man7/filter.7 @man man/man7/notifier.7 @man man/man8/accept.8 @@ -921,7 +920,6 @@ share/doc/cups/help/man-cupsd.html share/doc/cups/help/man-cupsenable.html share/doc/cups/help/man-cupstestdsc.html share/doc/cups/help/man-cupstestppd.html -share/doc/cups/help/man-drv.html share/doc/cups/help/man-filter.html share/doc/cups/help/man-lp.html share/doc/cups/help/man-lpadmin.html @@ -986,6 +984,7 @@ share/doc/cups/images/cups-icon.png share/doc/cups/images/cups-postscript-chain.png share/doc/cups/images/cups-raster-chain.png share/doc/cups/images/cups.png +share/doc/cups/images/generic.png share/doc/cups/images/left.gif share/doc/cups/images/raster.png share/doc/cups/images/right.gif