cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This release fixes several scheduler and printing bugs as well as a reported

Browse Source 
security bug (which kili@ already patched for in previous commmit).
This commit is contained in:
ajacoutot 2010-11-12 07:09:00 +00:00
parent 40bff91d10
commit b886080d0c
9 changed files with 23 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
print/cups/Makefile
View File

@ -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

10
print/cups/distinfo
View File

@ -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

10
print/cups/patches/patch-config-scripts_cups-common_m4
View File

@ -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`)

34
print/cups/patches/patch-cups_ipp_c
View File

@ -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 :

13
print/cups/patches/patch-cups_ipp_h
View File

@ -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 */

14
print/cups/patches/patch-man_lp_man
View File

@ -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

8
print/cups/patches/patch-scheduler_ipp_c
View File

@ -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);

10
print/cups/patches/patch-systemv_lpadmin_c
View File

@ -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...
*/

5
print/cups/pkg/PLIST
View File

@ -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