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

Update to cups-1.4.7.

Browse Source
This commit is contained in:
ajacoutot 2011-06-28 11:52:38 +00:00
parent c12b40632d
commit b58dcc0c5c
10 changed files with 45 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/cups/Makefile
View File

@ -1,13 +1,11 @@
# $OpenBSD: Makefile,v 1.106 2011/06/02 13:41:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.107 2011/06/28 11:52:38 ajacoutot Exp $
COMMENT= Common Unix Printing System
VERSION= 1.4.6
VERSION= 1.4.7
DISTNAME= cups-${VERSION}-source
PKGNAME= cups-${VERSION}
REVISION= 10
# Allow both ulpt(4) and libusb based backends to work together.
# See http://www.cups.org/str.php?L3357
PATCHFILES= usb-backend-both-usblp-and-libusb.dpatch:0

10
print/cups/distinfo
View File

@ -1,10 +1,10 @@
MD5 (cups-1.4.6-source.tar.bz2) = 3o+1opw2VUklwMam4sDa4Q==
MD5 (cups-1.4.7-source.tar.bz2) = FZADOrTHObhZrrZy/oSQiQ==
MD5 (usb-backend-both-usblp-and-libusb.dpatch) = SpQlKg3rdMb+EvNzvldhgg==
RMD160 (cups-1.4.6-source.tar.bz2) = lMmSHgP17FLZwWlHQ1YiNl9TrvY=
RMD160 (cups-1.4.7-source.tar.bz2) = BzBq8zo83KJdTVemrn0T8JKlRE8=
RMD160 (usb-backend-both-usblp-and-libusb.dpatch) = Msuh3Y68YsQPuuoYOHbpuV6bPPk=
SHA1 (cups-1.4.6-source.tar.bz2) = QvscoA7nKRVhVk0wcnFusgRfBdE=
SHA1 (cups-1.4.7-source.tar.bz2) = N4fvlspviAmcPiLsmOyJz15tZfA=
SHA1 (usb-backend-both-usblp-and-libusb.dpatch) = AiHICgW09Ls/DbzOpDV5N44IMzg=
SHA256 (cups-1.4.6-source.tar.bz2) = 8IcRcCp3tSxxUPlv4fRUgvYVHLle9gEmjFKGB/5q1RQ=
SHA256 (cups-1.4.7-source.tar.bz2) = Tm49AbgGKEruKi7UMv5fiYgpEvQL6/hwuwHhRnGblvY=
SHA256 (usb-backend-both-usblp-and-libusb.dpatch) = N5NkcdyAl6IVFAzkM3sOIwpsb3e6IGqJKG+ElcWr084=
SIZE (cups-1.4.6-source.tar.bz2) = 4517061
SIZE (cups-1.4.7-source.tar.bz2) = 4548102
SIZE (usb-backend-both-usblp-and-libusb.dpatch) = 18871

8
print/cups/patches/patch-cgi-bin_admin_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cgi-bin_admin_c,v 1.6 2010/03/31 16:20:02 ajacoutot Exp $
--- cgi-bin/admin.c.orig Fri Jan 15 03:10:32 2010
+++ cgi-bin/admin.c Wed Mar 31 15:53:42 2010
@@ -835,7 +835,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */
$OpenBSD: patch-cgi-bin_admin_c,v 1.7 2011/06/28 11:52:38 ajacoutot Exp $
--- cgi-bin/admin.c.orig Fri Mar 4 20:28:38 2011
+++ cgi-bin/admin.c Tue Jun 28 13:32:08 2011
@@ -858,7 +858,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */
*uriptr; /* Pointer into URI */
int maxrate; /* Maximum baud rate */
char baudrate[255]; /* Baud rate string */

56
print/cups/patches/patch-cgi-bin_html_c
View File

@ -1,56 +0,0 @@
$OpenBSD: patch-cgi-bin_html_c,v 1.1 2011/01/11 12:13:59 ajacoutot Exp $
STR #3455
--- cgi-bin/html.c.orig Thu Jan 22 21:35:12 2009
+++ cgi-bin/html.c Tue Jan 11 13:05:16 2011
@@ -1,9 +1,9 @@
/*
* "$Id: patch-cgi-bin_html_c,v 1.1 2011/01/11 12:13:59 ajacoutot Exp $"
*
- * HTML support functions for the Common UNIX Printing System (CUPS).
+ * HTML support functions for CUPS.
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2011 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -208,31 +208,13 @@ cgiStartMultipart(void)
int /* O - 1 if multi-part supported, 0 otherwise */
cgiSupportsMultipart(void)
{
- const char *user_agent; /* User-Agent string */
- static int supports_multipart = -1;/* Cached value */
+ /*
+ * Too many bug reports for browsers that don't support it, and too much pain
+ * to whitelist known-good browsers, so for now we just punt on multi-part
+ * support... :(
+ */
-
- if (supports_multipart < 0)
- {
- /*
- * CUPS STR #3049: Apparently some browsers don't support multi-part
- * documents, which makes them useless for many web sites. Rather than
- * abandoning those users, we'll offer a degraded single-part mode...
- *
- * Currently we know that anything based on Gecko, MSIE, and Safari all
- * work. We'll add more as they are reported/tested.
- */
-
- if ((user_agent = getenv("HTTP_USER_AGENT")) != NULL &&
- (strstr(user_agent, " Gecko/") != NULL ||
- strstr(user_agent, " MSIE ") != NULL ||
- strstr(user_agent, " Safari/") != NULL))
- supports_multipart = 1;
- else
- supports_multipart = 0;
- }
-
- return (supports_multipart);
+ return (0);
}

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

@ -1,10 +1,7 @@
$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 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))
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.5 2011/06/28 11:52:38 ajacoutot Exp $
--- config-scripts/cups-common.m4.orig Tue Jun 28 05:15:59 2011
+++ config-scripts/cups-common.m4 Tue Jun 28 13:32:08 2011
@@ -133,7 +133,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))
AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
@ -12,12 +9,3 @@ STR #3447: dbus notifier no longer builds
AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))
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`)
+ DBUS_NOTIFIER="dbus"
+ DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
else
AC_MSG_RESULT(no)
fi

22
print/cups/patches/patch-config-scripts_cups-compiler_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-config-scripts_cups-compiler_m4,v 1.2 2010/04/04 18:42:14 kili Exp $
--- config-scripts/cups-compiler.m4.orig Sun May 17 02:13:47 2009
+++ config-scripts/cups-compiler.m4 Sun Apr 4 20:10:14 2010
$OpenBSD: patch-config-scripts_cups-compiler_m4,v 1.3 2011/06/28 11:52:38 ajacoutot Exp $
--- config-scripts/cups-compiler.m4.orig Sat Jun 11 00:59:36 2011
+++ config-scripts/cups-compiler.m4 Tue Jun 28 13:32:08 2011
@@ -123,7 +123,7 @@ if test -n "$GCC"; then
if test -z "$OPTIM"; then
if test "x$with_optim" = x; then
@ -10,19 +10,3 @@ $OpenBSD: patch-config-scripts_cups-compiler_m4,v 1.2 2010/04/04 18:42:14 kili E
else
OPTIM="$with_optim $OPTIM"
fi
@@ -152,10 +152,11 @@ if test -n "$GCC"; then
AC_MSG_CHECKING(if GCC supports -pie)
OLDCFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -pie -fPIE"
- AC_TRY_COMPILE(,,
- PIEFLAGS="-pie -fPIE"
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
+ AC_RUN_IFELSE(
+ AC_LANG_PROGRAM(,[[return 0;]]),
+ PIEFLAGS="-pie -fPIE"
+ AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
CFLAGS="$OLDCFLAGS"
if test "x$with_optim" = x; then

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

@ -1,10 +1,10 @@
$OpenBSD: patch-cups_http_c,v 1.5 2010/07/13 13:02:47 ajacoutot Exp $
$OpenBSD: patch-cups_http_c,v 1.6 2011/06/28 11:52:38 ajacoutot Exp $
fix build on gcc-2.95 archs
--- cups/http.c.orig Tue Jul 13 10:38:54 2010
+++ cups/http.c Tue Jul 13 10:39:51 2010
@@ -1191,6 +1191,8 @@ httpInitialize(void)
--- cups/http.c.orig Fri Feb 11 00:52:40 2011
+++ cups/http.c Tue Jun 28 13:32:08 2011
@@ -1192,6 +1192,8 @@ httpInitialize(void)
static int initialized = 0; /* Have we been called before? */
#ifdef WIN32
WSADATA winsockdata; /* WinSock data */
@ -13,7 +13,7 @@ fix build on gcc-2.95 archs
#endif /* WIN32 */
#ifdef HAVE_LIBSSL
int i; /* Looping var */
@@ -1213,7 +1215,6 @@ httpInitialize(void)
@@ -1214,7 +1216,6 @@ httpInitialize(void)
sigset(SIGPIPE, SIG_IGN);
# elif defined(HAVE_SIGACTION)

15
print/cups/patches/patch-filter_raster_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-filter_raster_c,v 1.1 2011/06/28 11:52:38 ajacoutot Exp $
raster.c:154: error: 'intptr_t' undeclared (first use in this function)
--- filter/raster.c.orig Tue Jun 28 13:40:29 2011
+++ filter/raster.c Tue Jun 28 13:40:51 2011
@@ -44,6 +44,8 @@
* Include necessary headers...
*/
+#include <stdint.h>
+
#include "image-private.h"
#if defined(WIN32) || defined(__EMX__)
# include <io.h>

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

@ -1,11 +1,11 @@
$OpenBSD: patch-scheduler_ipp_c,v 1.5 2010/11/12 07:09:00 ajacoutot Exp $
$OpenBSD: patch-scheduler_ipp_c,v 1.6 2011/06/28 11:52:38 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 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
--- scheduler/ipp.c.orig Tue Feb 15 00:47:29 2011
+++ scheduler/ipp.c Tue Jun 28 13:32:08 2011
@@ -5252,7 +5252,7 @@ copy_model(cupsd_client_t *con, /* I - Client connect
FD_SET(temppipe[0], &input);
FD_SET(CGIPipes[0], &input);

4
print/cups/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.31 2011/05/11 07:45:53 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.32 2011/06/28 11:52:38 ajacoutot Exp $
@conflict LPRng-*
@newgroup _cups:541
@newuser _cups:541:541:daemon:CUPS printer spooler daemon:/var/empty:/sbin/nologin
@ -987,8 +987,10 @@ 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-organization.png
share/doc/cups/images/raster.png
share/doc/cups/images/right.gif
share/doc/cups/images/sample-image.png
share/doc/cups/images/sel.gif
share/doc/cups/images/smiley.jpg
share/doc/cups/images/unsel.gif