From f2af0aa666d36b4f63dce92e0062bebe7b122ef2 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 10 Jan 2004 03:32:09 +0000 Subject: Update print/cups to 1.1.20. Changes from version 1.1.19nb3 include: Bug fixes: - The HTTP code did not use a case-insensitive comparison when checking for the Basic authentication method (STR #407) - The cupsaddsmb program didn't export the new CUPS driver for Windows properly (STR #390) - The default landscape orientation was not the same as that defined in the PPD file (STR #397) - The pdftops filter incorrectly auto-rotated pages when the user already had specified the proper orientation (STR #207) - The scheduler did not reset the group list when running CGI and filter processes (STR #185) Enhancements: - Updated the pdftops filter to use the annotation flags instead of the subtype to determine whether to print an annotation (STR #425) - The pdftops filter no longer needs to create temporary files with tmpnam (STR #406) - The scheduler now waits up to 60 seconds before restarting to allow active jobs to complete printing and pending requests to be processed (STR #226) - Added new cupsDoAuthentication(), cupsGetFd(), cupsGetFile(), cupsPutFd(), and cupsPutFile() functions to the CUPS API (STR #112) - The PDF filter always scaled and offset pages; this caused problems under MacOS X, so now the "fitplot" option controls whether PDF files are scaled to fit within the printable area of the page (STR #250) - Updated the pdftops filter to be based upon Xpdf 2.02pl1 (STR #191) --- print/cups/Makefile | 6 +++--- print/cups/PLIST | 6 ++++-- print/cups/distinfo | 12 ++++++------ print/cups/files/cupsd.sh | 8 +++----- print/cups/patches/patch-af | 6 +++--- print/cups/patches/patch-ag | 17 ++++------------- print/cups/patches/patch-ap | 8 ++++---- 7 files changed, 27 insertions(+), 36 deletions(-) (limited to 'print') diff --git a/print/cups/Makefile b/print/cups/Makefile index 24471380a95..eddc8f32383 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2004/01/10 02:57:35 jlam Exp $ +# $NetBSD: Makefile,v 1.70 2004/01/10 03:32:09 jlam Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -6,8 +6,8 @@ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} -PKGREVISION= 3 -BASE_VERS= 1.1.19 +PKGREVISION= # empty +BASE_VERS= 1.1.20 DIST_VERS= ${BASE_VERS} VERS= ${DIST_VERS:S/-/./g} WRKSRC= ${WRKDIR}/cups-${BASE_VERS} diff --git a/print/cups/PLIST b/print/cups/PLIST index e486b489a30..7250c840948 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2003/05/28 02:33:59 jlam Exp $ +@comment $NetBSD: PLIST,v 1.11 2004/01/10 03:32:09 jlam Exp $ bin/cancel bin/cups-config bin/cupstestppd @@ -24,7 +24,7 @@ lib/libcups.a lib/libcups.la lib/libcups.so lib/libcups.so.2 -lib/libcups.so.2.5 +lib/libcups.so.2.6 lib/libcupsimage.a lib/libcupsimage.la lib/libcupsimage.so @@ -275,6 +275,7 @@ share/cups/templates/de/jobs.tmpl share/cups/templates/de/modify-class.tmpl share/cups/templates/de/modify-printer.tmpl share/cups/templates/de/option-boolean.tmpl +share/cups/templates/de/option-conflict.tmpl share/cups/templates/de/option-header.tmpl share/cups/templates/de/option-pickmany.tmpl share/cups/templates/de/option-pickone.tmpl @@ -321,6 +322,7 @@ share/cups/templates/fr/jobs.tmpl share/cups/templates/fr/modify-class.tmpl share/cups/templates/fr/modify-printer.tmpl share/cups/templates/fr/option-boolean.tmpl +share/cups/templates/fr/option-conflict.tmpl share/cups/templates/fr/option-header.tmpl share/cups/templates/fr/option-pickmany.tmpl share/cups/templates/fr/option-pickone.tmpl diff --git a/print/cups/distinfo b/print/cups/distinfo index 9a501796a4b..c5ff5a57c3d 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.23 2003/06/04 06:08:44 jlam Exp $ +$NetBSD: distinfo,v 1.24 2004/01/10 03:32:09 jlam Exp $ -SHA1 (cups-1.1.19-source.tar.bz2) = 125f82618ca8221598079e275fa1c3e874b3211b -Size (cups-1.1.19-source.tar.bz2) = 3691376 bytes +SHA1 (cups-1.1.20-source.tar.bz2) = aa0fd35fb4b17ad3311801284295e2693a6e220b +Size (cups-1.1.20-source.tar.bz2) = 3741510 bytes SHA1 (patch-aa) = 931a6f35ec0d4f41240031abb98be3e7e4b6de38 SHA1 (patch-ab) = 29c205c31a70229f46f0c99775e70fc9c56af1e8 SHA1 (patch-ad) = a426a03e67800a66fc819e79762e64fd2a73c646 -SHA1 (patch-af) = e0de558fdc6bd960ceb26709ea6ff33bc33567e0 -SHA1 (patch-ag) = 317ba533794c9acf968f21c5a0f38aac4d74eedb +SHA1 (patch-af) = b6f8a67e1c837ef2e674af886d80e5d16643b500 +SHA1 (patch-ag) = bb33db57dd0cfec78fd6110436d91c26615f5bf6 SHA1 (patch-am) = 67446886161f3062b89f3d9da56edc7faca4ad18 SHA1 (patch-an) = c4266134f66868f59978ca513f8e3f68dc10f07f SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef -SHA1 (patch-ap) = 04da658e62e9ef1765ae4d34ab1f809327d5cf8b +SHA1 (patch-ap) = b117e9fedee45bea544c0ec1ea1b8b4e60483aa9 SHA1 (patch-at) = 331bfe986dbb1e7f894ec6f0a6baaa86b36307a5 diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh index 7c07b802f9f..06b2283cff9 100644 --- a/print/cups/files/cupsd.sh +++ b/print/cups/files/cupsd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: cupsd.sh,v 1.17 2003/06/04 06:15:38 jlam Exp $ +# $NetBSD: cupsd.sh,v 1.18 2004/01/10 03:32:09 jlam Exp $ # # Common UNIX Printing System daemon # @@ -16,8 +16,7 @@ # # to respond before we declare it not responding; # # this variable is optional and defaults to "60". -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi @@ -63,8 +62,7 @@ cupsd_waitcmd() fi } -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then load_rc_config $name [ -z "${cupsd_wait}" ] && cupsd_wait=NO [ -z "${cupsd_timeout}" ] && cupsd_timeout=60 diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af index 73575714283..15b432f274e 100644 --- a/print/cups/patches/patch-af +++ b/print/cups/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.12 2003/05/28 02:34:00 jlam Exp $ +$NetBSD: patch-af,v 1.13 2004/01/10 03:32:09 jlam Exp $ ---- cups/Makefile.orig Wed Mar 19 21:45:21 2003 +--- cups/Makefile.orig Fri Aug 29 17:26:40 2003 +++ cups/Makefile @@ -93,8 +93,8 @@ install: all installhdrs fi @@ -44,7 +44,7 @@ $NetBSD: patch-af,v 1.12 2003/05/28 02:34:00 jlam Exp $ echo Linking $@... $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ - -version-info 2:5 $(SSLLIBS) $(COMMONLIBS) -+ -version-info 2:5 $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) ++ -version-info 2:6 $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) # diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag index 49e95301e49..9764ba0153c 100644 --- a/print/cups/patches/patch-ag +++ b/print/cups/patches/patch-ag @@ -1,17 +1,8 @@ -$NetBSD: patch-ag,v 1.15 2003/05/28 02:34:00 jlam Exp $ +$NetBSD: patch-ag,v 1.16 2004/01/10 03:32:09 jlam Exp $ ---- filter/Makefile.orig Tue May 27 21:29:11 2003 +--- filter/Makefile.orig Mon Nov 17 17:04:53 2003 +++ filter/Makefile -@@ -27,7 +27,7 @@ - include ../Makedefs - - TARGETS = gziptoany hpgltops texttops pstops imagetops imagetoraster \ -- rastertodymo rastertoepson rastertohp libcupsimage.a -+ rastertodymo rastertoepson rastertohp - - HPGLOBJS = hpgl-attr.o hpgl-config.o hpgl-main.o hpgl-prolog.o \ - hpgl-char.o hpgl-input.o hpgl-polygon.o hpgl-vector.o -@@ -45,7 +45,7 @@ OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOB +@@ -46,7 +46,7 @@ OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOB # Make all targets... # @@ -20,7 +11,7 @@ $NetBSD: patch-ag,v 1.15 2003/05/28 02:34:00 jlam Exp $ # -@@ -87,8 +87,8 @@ install: all installhdrs +@@ -88,8 +88,8 @@ install: all installhdrs fi -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \ $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \ diff --git a/print/cups/patches/patch-ap b/print/cups/patches/patch-ap index 6054ff3a158..d241f0cc559 100644 --- a/print/cups/patches/patch-ap +++ b/print/cups/patches/patch-ap @@ -1,13 +1,13 @@ -$NetBSD: patch-ap,v 1.3 2003/05/28 02:34:01 jlam Exp $ +$NetBSD: patch-ap,v 1.4 2004/01/10 03:32:09 jlam Exp $ ---- cups-config.in.orig Mon Apr 14 15:55:37 2003 +--- cups-config.in.orig Wed Sep 17 15:35:21 2003 +++ cups-config.in @@ -40,7 +40,7 @@ cups_serverroot=@CUPS_SERVERROOT@ # flags for C++ compiler: CFLAGS="" LDFLAGS="@EXPORT_LDFLAGS@" --LIBS="@EXPORT_SSLLIBS@ @NETLIBS@" -+LIBS="@EXPORT_LIBCRYPT@ @EXPORT_SSLLIBS@ @NETLIBS@" +-LIBS="@EXPORT_SSLLIBS@ @NETLIBS@ @COMMONLIBS@" ++LIBS="@EXPORT_LIBCRYPT@ @EXPORT_SSLLIBS@ @NETLIBS@ @COMMONLIBS@" IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@" if test $includedir != /usr/include; then -- cgit v1.2.3