From f102d743eb2fc780fd61ba88993f12c51b14cea5 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 14 Dec 2001 23:18:15 +0000 Subject: Update print/cups to 1.1.12. Relevant changes from version 1.1.10.1 include: - Bug fixes. - Start of internationalization support for banner and PPD files. - Added support for embedded TrueType fonts in PDF files. - Added support for PostScript functions in PDF files. - Added new "cupsaddsmb" utility for exporting CUPS printer drivers to SAMBA/Windows clients. - The ippRead() and ipp_read_file() functions could not handle more than IPP_MAX_VALUES (100) values in a 1setOf attribute. These functions have been updated to dynamically allocate more memory as needed, and the IPP_MAX_VALUES constant now represents the allocation increment. [this caused some versions of the GIMP-print drivers to fail since the number of media options exceeded 100...] - The web interfaces did not always quote < and & in things like the job title. This had the potential for browser-based security violations (on the browser's machine); bug report from SuSE. - The scheduler now treats unauthenticated usernames as case-insensitive when doing quota and allow/deny processing. - The PostScript filter (pstops) now handles EPS files, adding a showpage command to the files as needed. - The cups-lpd mini-daemon did not support anonymous printing (no username specified). While the username is REQUIRED by RFC-1179, MacOS clients do not send the REQUIRED username information when printing via LPD. - The httpConnect*() functions now try all available addresses for a host when connecting for the first time. --- print/cups/Makefile | 50 +++++++++++++++++++++++---------------------- print/cups/PLIST | 12 +++++++++-- print/cups/distinfo | 10 ++++----- print/cups/patches/patch-ab | 40 +++++++++++++++++++++++++++--------- print/cups/patches/patch-ag | 8 ++++---- 5 files changed, 75 insertions(+), 45 deletions(-) (limited to 'print/cups') diff --git a/print/cups/Makefile b/print/cups/Makefile index b07d8be5e03..f7a3b7251f5 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.42 2001/12/02 06:56:43 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2001/12/14 23:18:15 jlam Exp $ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} -BASE_VERS= 1.1.10 -DIST_VERS= ${BASE_VERS}-1 +BASE_VERS= 1.1.12 +DIST_VERS= ${BASE_VERS} VERS= ${DIST_VERS:S/-/./g} WRKSRC= ${WRKDIR}/cups-${BASE_VERS} CATEGORIES= print @@ -21,10 +21,10 @@ COMMENT= Common UNIX Printing System CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* -USE_BUILDLINK_ONLY= # defined -USE_GMAKE= # defined -USE_LIBTOOL= # defined -GNU_CONFIGURE= # defined +USE_BUILDLINK_ONLY= YES +USE_GMAKE= YES +USE_LIBTOOL= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/cups @@ -60,26 +60,28 @@ BUILD_DEFS+= CUPS_USER CUPS_GROUP DOCDIR= ${PREFIX}/share/doc/cups EGDIR= ${PREFIX}/share/examples/cups +CUPS_CONFDIR= ${PKG_SYSCONFDIR}/cups +CUPS_LOGDIR= /var/log/cups +CUPS_REQUESTS= /var/spool/cups -PKG_GROUPS= ${CUPS_GROUP} -PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\\ Printing\\ System\\ user:${SH} +PKG_GROUPS= ${CUPS_GROUP} +PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\\ Printing\\ System\\ user::${SH} -CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/cups/client.conf -CONF_FILES+= ${EGDIR}/cupsd.conf ${PKG_SYSCONFDIR}/cups/cupsd.conf -SUPPORT_FILES= ${EGDIR}/classes.conf ${PKG_SYSCONFDIR}/cups/classes.conf -SUPPORT_FILES+= ${EGDIR}/mime.convs ${PKG_SYSCONFDIR}/cups/mime.convs -SUPPORT_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/cups/mime.types -SUPPORT_FILES+= ${EGDIR}/printers.conf ${PKG_SYSCONFDIR}/cups/printers.conf -RCD_SCRIPTS= cupsd +CONF_FILES= ${EGDIR}/client.conf ${CUPS_CONFDIR}/client.conf +CONF_FILES+= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf +SUPPORT_FILES= ${EGDIR}/classes.conf ${CUPS_CONFDIR}/classes.conf +SUPPORT_FILES+= ${EGDIR}/mime.convs ${CUPS_CONFDIR}/mime.convs +SUPPORT_FILES+= ${EGDIR}/mime.types ${CUPS_CONFDIR}/mime.types +SUPPORT_FILES+= ${EGDIR}/printers.conf ${CUPS_CONFDIR}/printers.conf +RCD_SCRIPTS= cupsd -OWN_DIRS+= ${PKG_SYSCONFDIR}/cups -OWN_DIRS+= ${PKG_SYSCONFDIR}/cups/interfaces -OWN_DIRS+= ${PKG_SYSCONFDIR}/cups/ppd -OWN_DIRS+= /var/log/cups -OWN_DIRS+= /var/spool/cups -OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/cups/certs \ - ${CUPS_USER} ${CUPS_GROUP} 0711 -OWN_DIRS_PERMS+= /var/spool/cups/tmp ${CUPS_USER} ${CUPS_GROUP} 1700 +OWN_DIRS= ${CUPS_CONFDIR} +OWN_DIRS+= ${CUPS_CONFDIR}/interfaces +OWN_DIRS+= ${CUPS_CONFDIR}/ppd +OWN_DIRS+= ${CUPS_LOGDIR} +OWN_DIRS_PERMS= ${CUPS_CONFDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711 +OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${CUPS_USER} ${CUPS_GROUP} 0700 +OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${CUPS_USER} ${CUPS_GROUP} 1700 pre-install: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam diff --git a/print/cups/PLIST b/print/cups/PLIST index 733ce9374ae..7340e3e5db1 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:35 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/12/14 23:18:15 jlam Exp $ bin/cancel +bin/cups-config bin/disable bin/enable bin/lp @@ -21,7 +22,7 @@ lib/libcups.a lib/libcups.la lib/libcups.so lib/libcups.so.2 -lib/libcups.so.2.3 +lib/libcups.so.2.4 lib/libcupsimage.a lib/libcupsimage.la lib/libcupsimage.so @@ -60,6 +61,7 @@ man/cat1/lpq.0 man/cat1/lpr.0 man/cat1/lprm.0 man/cat1/lpstat.0 +man/cat3/cups-config.0 man/cat5/classes.conf.0 man/cat5/cupsd.conf.0 man/cat5/mime.convs.0 @@ -68,6 +70,7 @@ man/cat5/printers.conf.0 man/cat8/accept.0 man/cat8/cups-lpd.0 man/cat8/cups-polld.0 +man/cat8/cupsaddsmb.0 man/cat8/cupsd.0 man/cat8/disable.0 man/cat8/enable.0 @@ -86,6 +89,7 @@ man/man1/lpq.1 man/man1/lpr.1 man/man1/lprm.1 man/man1/lpstat.1 +man/man3/cups-config.3 man/man5/classes.conf.5 man/man5/cupsd.conf.5 man/man5/mime.convs.5 @@ -94,6 +98,7 @@ man/man5/printers.conf.5 man/man8/accept.8 man/man8/cups-lpd.8 man/man8/cups-polld.8 +man/man8/cupsaddsmb.8 man/man8/cupsd.8 man/man8/disable.8 man/man8/enable.8 @@ -103,6 +108,7 @@ man/man8/lpinfo.8 man/man8/lpmove.8 man/man8/reject.8 sbin/accept +sbin/cupsaddsmb sbin/cupsd sbin/lpadmin sbin/lpc @@ -257,6 +263,7 @@ share/cups/templates/header.tmpl share/cups/templates/job-cancel.tmpl share/cups/templates/job-hold.tmpl share/cups/templates/job-release.tmpl +share/cups/templates/job-restart.tmpl share/cups/templates/jobs.tmpl share/cups/templates/modify-class.tmpl share/cups/templates/modify-printer.tmpl @@ -354,6 +361,7 @@ share/examples/cups/mime.convs share/examples/cups/mime.types share/examples/cups/printers.conf share/locale/C/cups_C +share/locale/cs/cups_cs share/locale/de/cups_de share/locale/en/cups_en share/locale/es/cups_es diff --git a/print/cups/distinfo b/print/cups/distinfo index 37d98daf765..66ca4f1e8b2 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2001/12/10 07:41:23 jmc Exp $ +$NetBSD: distinfo,v 1.10 2001/12/14 23:18:15 jlam Exp $ -SHA1 (cups-1.1.10-1-source.tar.bz2) = 97c0e36a49df927c1bbe3bb457bb8849b7992c62 -Size (cups-1.1.10-1-source.tar.bz2) = 5370979 bytes -SHA1 (patch-ab) = 2b58233ac8a5b5cb5cfbdc82abfe78a27678556c -SHA1 (patch-ag) = 0fe671d3eb19ccaac53e999cc0bd25016736af5e +SHA1 (cups-1.1.12-source.tar.bz2) = 1df65094b198bd446db8cd7d1624ad4feba32f3a +Size (cups-1.1.12-source.tar.bz2) = 5397921 bytes +SHA1 (patch-ab) = 44db4e52c4b7eb92847780dabb884277a6edaa4a +SHA1 (patch-ag) = 8f8afb26507941371a34fe51608295678adeea96 SHA1 (patch-ah) = a7cdf225c7256c3277559d5bd2923df74ee3d26e diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab index ae2f8a11548..f982ceac8d5 100644 --- a/print/cups/patches/patch-ab +++ b/print/cups/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.11 2001/08/18 04:41:46 jlam Exp $ +$NetBSD: patch-ab,v 1.12 2001/12/14 23:18:16 jlam Exp $ ---- Makefile.orig Mon Aug 6 15:37:08 2001 -+++ Makefile +--- Makefile.orig Tue Oct 30 15:37:13 2001 ++++ Makefile Fri Dec 14 17:33:21 2001 @@ -60,8 +60,6 @@ echo Installing in $$dir... ;\ (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ @@ -11,14 +11,34 @@ $NetBSD: patch-ab,v 1.11 2001/08/18 04:41:46 jlam Exp $ echo Installing in data... (cd data; $(MAKE) $(MFLAGS) install) echo Installing in doc... -@@ -86,10 +84,6 @@ - $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc3.d/S99cups; \ - $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc5.d; \ - $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc5.d/S99cups; \ +@@ -77,30 +75,6 @@ + echo Installing cups-config script... + $(INSTALL_DIR) $(bindir) + $(INSTALL_SCRIPT) cups-config $(bindir)/cups-config +- echo Installing startup script... +- if test "x$(INITDIR)" != "x"; then \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ - fi - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ -- $(INSTALL_DIR) $(prefix)/$(INITDDIR); \ -- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDDIR)/cups; \ - fi +- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ +- if test "$(INITDDIR)" = "/System/Library/StartupItems/CUPS"; then \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/CUPS; \ +- $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ +- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ +- $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ +- else \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ +- fi \ +- fi + # diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag index 8f1c0ea66f3..9aaa5fc627d 100644 --- a/print/cups/patches/patch-ag +++ b/print/cups/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.9 2001/08/18 04:41:46 jlam Exp $ +$NetBSD: patch-ag,v 1.10 2001/12/14 23:18:16 jlam Exp $ ---- filter/Makefile.orig Fri Aug 17 11:54:02 2001 -+++ filter/Makefile -@@ -122,7 +122,7 @@ +--- filter/Makefile.orig Sun Oct 7 08:16:09 2001 ++++ filter/Makefile Fri Dec 14 17:34:59 2001 +@@ -137,7 +137,7 @@ libcupsimage.la: $(IMAGEOBJS) ../Makedefs echo Linking $@... -- cgit v1.2.3