diff options
author | jlam <jlam@pkgsrc.org> | 2001-02-08 19:05:00 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-02-08 19:05:00 +0000 |
commit | 4cbcdacb90cacce450dd7cc5144f60f7bf709ad2 (patch) | |
tree | eaecbe09126a7d3a2cc264044e13344e64ff59ad /print | |
parent | 9b0deda231d89bbc8bfba58c81f25142400bf45a (diff) | |
download | pkgsrc-4cbcdacb90cacce450dd7cc5144f60f7bf709ad2.tar.gz |
Update cups to 1.1.6.2nb1. Changes from version 1.1.6.1 include:
- Added changes to support NetBSD startup scripts.
- The mime.types file contained syntax errors.
- Updated the FreeBSD USB device filenames to use the /dev/unlptN files
so that the USB device is not reset prior to printing (causes print
corruption on many printers)
- Added new cupsTempFd() function to avoid serious security bug in
glibc fopen() function. The glibc fopen() function unlinks a file
before creating it, which opens up possible symlink attacks.
- Now reject 0-length names in add-printer and add-class
requests.
- cupsGetPPD() didn't reconnect when a HTTP connection
was lost.
- Many security-related fixes from SuSE.
Diffstat (limited to 'print')
-rw-r--r-- | print/cups/Makefile | 56 | ||||
-rw-r--r-- | print/cups/files/md5 | 4 | ||||
-rw-r--r-- | print/cups/files/patch-sum | 17 | ||||
-rw-r--r-- | print/cups/patches/patch-aa | 18 | ||||
-rw-r--r-- | print/cups/patches/patch-ab | 27 | ||||
-rw-r--r-- | print/cups/patches/patch-ac | 2 | ||||
-rw-r--r-- | print/cups/patches/patch-ad | 91 | ||||
-rw-r--r-- | print/cups/patches/patch-ae | 69 | ||||
-rw-r--r-- | print/cups/patches/patch-af | 17 | ||||
-rw-r--r-- | print/cups/patches/patch-ag | 13 | ||||
-rw-r--r-- | print/cups/patches/patch-ah | 52 | ||||
-rw-r--r-- | print/cups/patches/patch-ai | 34 | ||||
-rw-r--r-- | print/cups/patches/patch-aj | 46 | ||||
-rw-r--r-- | print/cups/patches/patch-ak | 12 | ||||
-rw-r--r-- | print/cups/pkg/PLIST | 4 |
15 files changed, 113 insertions, 349 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index ade0e3ae778..7f46d55212c 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2001/02/05 09:01:02 tron Exp $ +# $NetBSD: Makefile,v 1.21 2001/02/08 19:05:00 jlam Exp $ # -DISTNAME= cups-${VERS}-1-source -PKGNAME= cups-${VERS}.1 +DISTNAME= cups-${VERS}-2-source +PKGNAME= cups-${VERS}.2nb1 VERS= 1.1.6 WRKSRC= ${WRKDIR}/cups-${VERS} CATEGORIES= print @@ -78,43 +78,37 @@ EGDIR= ${PREFIX}/share/examples/cups post-extract: cd ${WRKSRC}/conf; ${MV} cupsd.conf cupsd.conf.in -pre-patch: - ${MKDIR} ${WRKSRC}/scripts - -post-patch: - cd ${WRKSRC}/scripts; ${CHMOD} +x netbsd sysv - pre-configure: cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf post-build: - ${SED} -e "s,@CUPS_USER@,${CUPS_USER},g" \ - -e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \ + ${SED} -e "s|@CUPS_USER@|${CUPS_USER}|g" \ + -e "s|@CUPS_GROUP@|${CUPS_GROUP}|g" \ ${WRKSRC}/conf/cupsd.conf.in > ${WRKSRC}/conf/cupsd.conf - ${SED} -e "s,@PREFIX@,${PREFIX},g" \ + ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam pre-install: - ${SED} -e "s,@CUPS_USER@,${CUPS_USER},g" \ - -e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \ - -e "s,@CAT@,${CAT},g" \ - -e "s,@RM@,${RM},g" \ - -e "s,@RMDIR@,${RMDIR},g" \ - -e "s,@TRUE@,${TRUE},g" \ + ${SED} -e "s|@CUPS_USER@|${CUPS_USER}|g" \ + -e "s|@CUPS_GROUP@|${CUPS_GROUP}|g" \ + -e "s|@CAT@|${CAT}|g" \ + -e "s|@RM@|${RM}|g" \ + -e "s|@RMDIR@|${RMDIR}|g" \ + -e "s|@TRUE@|${TRUE}|g" \ ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} -e "s,@CUPS_USER@,${CUPS_USER},g" \ - -e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \ - -e "s,@ADDUSER@,${ADDUSER},g" \ - -e "s,@ADDGROUP@,${ADDGROUP},g" \ - -e "s,@CAT@,${CAT},g" \ - -e "s,@CHGRP@,${CHGRP},g" \ - -e "s,@CHMOD@,${CHMOD},g" \ - -e "s,@CHOWN@,${CHOWN},g" \ - -e "s,@CP@,${CP},g" \ - -e "s,@GREP@,${GREP},g" \ - -e "s,@MKDIR@,${MKDIR},g" \ - -e "s,@RM@,${RM},g" \ - -e "s,@TOUCH@,${TOUCH},g" \ + ${SED} -e "s|@CUPS_USER@|${CUPS_USER}|g" \ + -e "s|@CUPS_GROUP@|${CUPS_GROUP}|g" \ + -e "s|@ADDUSER@|${ADDUSER}|g" \ + -e "s|@ADDGROUP@|${ADDGROUP}|g" \ + -e "s|@CAT@|${CAT}|g" \ + -e "s|@CHGRP@|${CHGRP}|g" \ + -e "s|@CHMOD@|${CHMOD}|g" \ + -e "s|@CHOWN@|${CHOWN}|g" \ + -e "s|@CP@|${CP}|g" \ + -e "s|@GREP@|${GREP}|g" \ + -e "s|@MKDIR@|${MKDIR}|g" \ + -e "s|@RM@|${RM}|g" \ + -e "s|@TOUCH@|${TOUCH}|g" \ ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL diff --git a/print/cups/files/md5 b/print/cups/files/md5 index 557638763b9..f0af32d42b5 100644 --- a/print/cups/files/md5 +++ b/print/cups/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.7 2001/01/28 02:05:37 jlam Exp $ +$NetBSD: md5,v 1.8 2001/02/08 19:05:01 jlam Exp $ -MD5 (cups-1.1.6-1-source.tar.bz2) = 83759c52574337e18a58f31e340ee64b +MD5 (cups-1.1.6-2-source.tar.bz2) = 1cef7a1bc8b4995842d01516f4193dde diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum index 11d4e7b29b9..6e99a28c730 100644 --- a/print/cups/files/patch-sum +++ b/print/cups/files/patch-sum @@ -1,13 +1,8 @@ -$NetBSD: patch-sum,v 1.11 2001/01/28 02:05:37 jlam Exp $ +$NetBSD: patch-sum,v 1.12 2001/02/08 19:05:01 jlam Exp $ -MD5 (patch-aa) = 0d4f5503c08018b655b245368d546860 -MD5 (patch-ab) = 62c2fcd503f8eaa38cbca2028bd31a14 +MD5 (patch-aa) = 9e634f9986e0cec53cb2c4fd673755e4 +MD5 (patch-ab) = 4155498923feeee81ea9f8b99821fb82 MD5 (patch-ac) = 4ea2faaf4cf0ef1a75a3b35d964683e1 -MD5 (patch-ad) = ce1fd6b48d75462cd222c510f15f8c7c -MD5 (patch-ae) = e23521560a35f929c3d6ec586cb8394b -MD5 (patch-af) = 3b44eace3dde4d9f2f7df834013f76e5 -MD5 (patch-ag) = dfec81a5c1f8658c6ae99d23b07eb240 -MD5 (patch-ah) = e34733f587785c73087725a3c861c5e4 -MD5 (patch-ai) = 6777d3a4248f7dd8b746e2d96cf58a6e -MD5 (patch-aj) = afe9775bfc8f2568edd9b443c0535292 -MD5 (patch-ak) = ef4c76ef21c68a8714eef2b8efac253c +MD5 (patch-ad) = bc2bbc360d01993f2986abb79eca9dfc +MD5 (patch-ae) = de716f90758eafa9a32102af85b04adc +MD5 (patch-af) = bc8ceab0769999b4acc5b7eb0b3c4007 diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa index e9d8eaa128b..141a6426033 100644 --- a/print/cups/patches/patch-aa +++ b/print/cups/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.7 2001/01/28 02:05:37 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2001/02/08 19:05:01 jlam Exp $ ---- Makedefs.in.orig Mon Jan 22 10:03:15 2001 +--- Makedefs.in.orig Fri Feb 2 11:37:43 2001 +++ Makedefs.in @@ -48,11 +48,11 @@ # Installation programs... @@ -13,21 +13,9 @@ $NetBSD: patch-aa,v 1.7 2001/01/28 02:05:37 jlam Exp $ -INSTALL_SCRIPT = $(CP) +INSTALL_BIN = $(LIBTOOL) $(BSD_INSTALL_PROGRAM) +INSTALL_DATA = $(BSD_INSTALL_DATA) -+INSTALL_LIB = $(LIBTOOL) $(BSD_INSTALL_DATA) ++INSTALL_LIB = $(LIBTOOL) $(BSD_INSTALL_PROGRAM) +INSTALL_MAN = $(BSD_INSTALL_MAN) +INSTALL_SCRIPT = $(BSD_INSTALL_SCRIPT) INSTALL_SYSV = @INSTALL_SYSV@ # -@@ -137,6 +137,11 @@ - CAT1EXT = @CAT1EXT@ - CAT5EXT = @CAT5EXT@ - CAT8EXT = @CAT8EXT@ -+ -+# -+# Init script installation script -+# -+INITSCRIPT = @INITSCRIPT@ - - # - # Rules... diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab index cb0a75e16b5..8004026616a 100644 --- a/print/cups/patches/patch-ab +++ b/print/cups/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.8 2001/01/28 02:05:37 jlam Exp $ +$NetBSD: patch-ab,v 1.9 2001/02/08 19:05:01 jlam Exp $ ---- Makefile.orig Wed Jan 3 12:44:40 2001 +--- Makefile.orig Fri Feb 2 11:37:43 2001 +++ Makefile @@ -60,8 +60,8 @@ echo Installing in $$dir... ;\ @@ -13,26 +13,3 @@ $NetBSD: patch-ab,v 1.8 2001/01/28 02:05:37 jlam Exp $ echo Installing in data... (cd data; $(MAKE) $(MFLAGS) install) echo Installing in doc... -@@ -75,21 +75,7 @@ - echo Installing in templates... - (cd templates; $(MAKE) $(MFLAGS) install) - echo Installing startup script... -- if test "x$(INITDIR)" != "x"; then \ -- $(MKDIR) $(prefix)/$(INITDIR)/init.d; \ -- $(RM) $(prefix)/$(INITDIR)/init.d/cups; \ -- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \ -- $(CHMOD) ugo+rx $(prefix)/$(INITDIR)/init.d/cups; \ -- $(MKDIR) $(prefix)/$(INITDIR)/rc0.d; \ -- $(RM) $(prefix)/$(INITDIR)/rc0.d/K00cups; \ -- ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc0.d/K00cups; \ -- $(MKDIR) $(prefix)/$(INITDIR)/rc3.d; \ -- $(RM) $(prefix)/$(INITDIR)/rc3.d/S99cups; \ -- ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc3.d/S99cups; \ -- $(MKDIR) $(prefix)/$(INITDIR)/rc5.d; \ -- $(RM) $(prefix)/$(INITDIR)/rc5.d/S99cups; \ -- ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc5.d/S99cups; \ -- fi -+ $(INITSCRIPT) - - # - # Make software distributions using EPM (http://www.easysw.com/epm)... diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac index f714adf6b0a..1e4ca8bdb7e 100644 --- a/print/cups/patches/patch-ac +++ b/print/cups/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.7 2001/01/28 02:05:37 jlam Exp $ +$NetBSD: patch-ac,v 1.8 2001/02/08 19:05:01 jlam Exp $ --- conf/cupsd.conf.in.orig Wed Dec 20 08:41:12 2000 +++ conf/cupsd.conf.in diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad index 4557039eecc..baeb66b3c55 100644 --- a/print/cups/patches/patch-ad +++ b/print/cups/patches/patch-ad @@ -1,60 +1,37 @@ -$NetBSD: patch-ad,v 1.5 2001/01/28 02:05:37 jlam Exp $ +$NetBSD: patch-ad,v 1.6 2001/02/08 19:05:01 jlam Exp $ ---- configure.in.orig Fri Jan 26 10:01:59 2001 +--- configure.in.orig Tue Feb 6 20:25:38 2001 +++ configure.in -@@ -514,8 +514,14 @@ - dnl Setup init.d locations... - case "$uname" in -- FreeBSD* | NetBSD* | OpenBSD*) -- # *BSD -+ FreeBSD* | OpenBSD*) - INITDIR="" - INITDDIR="" -+ INITSCRIPT="" -+ ;; -+ -+ NetBSD*) -+ INITDIR="/etc/rc.d" -+ INITDDIR="" -+ INITSCRIPT="scripts/netbsd" - ;; - -@@ -526,4 +532,5 @@ - INITDIR="/sbin/init.d" - INITDDIR=".." -+ INITSCRIPT="scripts/sysv" - else - if test -d /etc/rc.d; then -@@ -531,8 +538,10 @@ - INITDIR="/etc/rc.d" - INITDDIR="../init.d" -+ INITSCRIPT="scripts/sysv" - else - # Others - INITDIR="/etc" - INITDDIR="../init.d" -+ INITSCRIPT="scripts/sysv" - fi - fi -@@ -542,4 +551,5 @@ - INITDIR="/sbin" - INITDDIR="../init.d" -+ INITSCRIPT="scripts/sysv" - ;; - -@@ -547,4 +557,5 @@ - INITDIR="/etc" - INITDDIR="../init.d" -+ INITSCRIPT="scripts/sysv" - ;; - -@@ -553,4 +564,5 @@ - AC_SUBST(INITDIR) - AC_SUBST(INITDDIR) -+AC_SUBST(INITSCRIPT) - - dnl Setup default locations... -@@ -612,6 +624,6 @@ +@@ -390,18 +390,7 @@ + # rather than to the executables. This makes things smaller if you + # are using any static libraries, and it also allows us to distribute +- # a single DSO rather than a bunch...unless the linker is dumb. +- case $uname in +- NetBSD*) +- # NetBSD's linker won't resolve symbols in a shared +- # libraries unless their enclosing shared libraries +- # are explicitly listed. +- DSOLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)" +- IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)" +- ;; +- *) +- DSOLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)" +- IMGLIBS="" +- ;; +- esac ++ # a single DSO rather than a bunch. ++ DSOLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)" ++ IMGLIBS="" + + # The *BSD, HP-UX, and Solaris run-time linkers need help when +@@ -427,5 +416,5 @@ + else + DSOLIBS="" +- IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)" ++ IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)" + fi + +@@ -655,6 +644,6 @@ dnl Set the CUPS_DOCROOT directory... -CUPS_DOCROOT='${datadir}/doc/cups' @@ -63,10 +40,10 @@ $NetBSD: patch-ad,v 1.5 2001/01/28 02:05:37 jlam Exp $ +AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups") AC_SUBST(CUPS_DOCROOT) -@@ -619,5 +631,5 @@ +@@ -662,5 +651,5 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath") -AC_OUTPUT(Makedefs cups.sh) -+AC_OUTPUT(Makedefs cups.sh scripts/common) ++AC_OUTPUT(Makedefs cups.sh conf/cupsd.conf) dnl diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae index b6232527a20..b48952c0d63 100644 --- a/print/cups/patches/patch-ae +++ b/print/cups/patches/patch-ae @@ -1,37 +1,36 @@ -$NetBSD: patch-ae,v 1.6 2001/01/28 02:05:37 jlam Exp $ +$NetBSD: patch-ae,v 1.7 2001/02/08 19:05:01 jlam Exp $ ---- cups.sh.in.orig Mon Jan 22 10:03:16 2001 -+++ cups.sh.in -@@ -10,6 +10,12 @@ - # description: Startup/shutdown script for the Common UNIX \ - # Printing System (CUPS). - # -+# NetBSD 1.5+ rcorder script lines. The format of the following two -+# lines is very strict -- please don't add additional spaces! -+# -+# PROVIDE: cups -+# REQUIRE: DAEMON -+# - # Copyright 1997-2001 by Easy Software Products, all rights reserved. - # - # These coded instructions, statements, and computer programs are the -@@ -35,6 +41,9 @@ - IS_ON=/sbin/chkconfig - ;; - -+ NetBSD*) -+ IS_ON=: +--- backend/usb.c.orig Tue Feb 6 05:41:04 2001 ++++ backend/usb.c +@@ -398,7 +398,7 @@ + #elif defined(__sun) + #elif defined(__hpux) + #elif defined(__osf) +-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#elif defined(__FreeBSD__) + int i; /* Looping var */ + int fd; /* File descriptor */ + char device[255]; /* Device filename */ +@@ -407,6 +407,22 @@ + for (i = 0; i < 3; i ++) + { + sprintf(device, "/dev/unlpt%d", i); ++ if ((fd = open(device, O_WRONLY)) >= 0) ++ { ++ close(fd); ++ printf("direct usb:%s \"Unknown\" \"USB Port #%d\"\n", device, i + 1); ++ } ++ } ++#endif ++#elif defined(__NetBSD__) || defined(__OpenBSD__) ++ int i; /* Looping var */ ++ int fd; /* File descriptor */ ++ char device[255]; /* Device filename */ + - *) - IS_ON=/bin/true - ;; -@@ -57,6 +66,9 @@ - pid=`ps -e | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'` - ;; - Linux) -+ pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'` -+ ;; -+ NetBSD) - pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'` - ;; - *) ++ ++ for (i = 0; i < 3; i ++) ++ { ++ sprintf(device, "/dev/ulpt%d", i); + if ((fd = open(device, O_WRONLY)) >= 0) + { + close(fd); diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af index e227186aa93..733461bbe7e 100644 --- a/print/cups/patches/patch-af +++ b/print/cups/patches/patch-af @@ -1,22 +1,13 @@ -$NetBSD: patch-af,v 1.7 2001/01/28 02:05:38 jlam Exp $ +$NetBSD: patch-af,v 1.8 2001/02/08 19:05:01 jlam Exp $ ---- cups/Makefile.orig Mon Jan 22 10:03:23 2001 +--- cups/Makefile.orig Fri Feb 2 11:37:44 2001 +++ cups/Makefile -@@ -87,7 +87,7 @@ - - libcups.so.2 libcups.sl.2: $(LIBOBJS) ../Makedefs - echo Linking $@... -- $(DSO) $@ $(LIBOBJS) $(SSLLIBS) -+ $(DSO) $@ $(LDFLAGS) $(LIBOBJS) $(SSLLIBS) - $(RM) `basename $@ .2` - $(LN) $@ `basename $@ .2` - @@ -99,7 +99,7 @@ libcups.la: $(LIBOBJS) ../Makedefs echo Linking $@... $(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ -- -version-info 2:0 $(SSLLIBS) $(LIBS) -+ -version-info 2:0 $(SSLLIBS) +- -version-info 2:0 $(SSLLIBS) ++ -version-info 2:1 $(SSLLIBS) # diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag deleted file mode 100644 index 4e2846154d2..00000000000 --- a/print/cups/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2001/01/28 02:05:38 jlam Exp $ - ---- filter/Makefile.orig Mon Jan 22 10:03:36 2001 -+++ filter/Makefile -@@ -102,7 +102,7 @@ - - libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs - echo Linking $@... -- $(DSO) $@ $(IMAGEOBJS) $(DSOLIBS) -lm -+ $(DSO) $@ $(LDFLAGS) $(IMAGEOBJS) $(DSOLIBS) -lm - $(RM) `basename $@ .2` - $(LN) $@ `basename $@ .2` - diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah deleted file mode 100644 index 5cdcda199ce..00000000000 --- a/print/cups/patches/patch-ah +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-ah,v 1.5 2001/01/28 02:05:38 jlam Exp $ - ---- scripts/common.in.orig Sat Jan 27 19:27:30 2001 -+++ scripts/common.in -@@ -0,0 +1,47 @@ -+# -+# Common shell variable definitions -+# -+# Copyright 1997-2001 by Easy Software Products, all rights reserved. -+# -+# These coded instructions, statements, and computer programs are the -+# property of Easy Software Products and are protected by Federal -+# copyright law. Distribution and use rights are outlined in the file -+# "LICENSE.txt" which should have been included with this file. If this -+# file is missing or damaged please contact Easy Software Products -+# at: -+# -+# Attn: CUPS Licensing Information -+# Easy Software Products -+# 44141 Airport View Drive, Suite 204 -+# Hollywood, Maryland 20636-3111 USA -+# -+# Voice: (301) 373-9603 -+# EMail: cups-info@cups.org -+# WWW: http://www.cups.org -+# -+ -+# -+# Programs... -+# -+ -+CHMOD="@CHMOD@" -+CP="@CP@" -+LIBTOOL="@LIBTOOL@" -+LN="/bin/ln -sf" -+MKDIR="@MKDIR@ -p" -+MV="@MV@" -+RM="@RM@ -f" -+ -+# -+# Installation programs... -+# -+ -+INSTALL_SCRIPT="${CP}" -+ -+# -+# Directories... -+# -+ -+prefix="@prefix@" -+INITDIR="@INITDIR@" -+INITDDIR="@INITDDIR@" diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai deleted file mode 100644 index a8ea9bed4ec..00000000000 --- a/print/cups/patches/patch-ai +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ai,v 1.5 2001/01/28 02:05:38 jlam Exp $ - ---- scripts/netbsd.orig Sat Jan 27 19:27:30 2001 -+++ scripts/netbsd -@@ -0,0 +1,29 @@ -+#!/bin/sh -+# -+# Startup script installation for NetBSD -+# -+# Copyright 1997-2000 by Easy Software Products, all rights reserved. -+# -+# These coded instructions, statements, and computer programs are the -+# property of Easy Software Products and are protected by Federal -+# copyright law. Distribution and use rights are outlined in the file -+# "LICENSE.txt" which should have been included with this file. If this -+# file is missing or damaged please contact Easy Software Products -+# at: -+# -+# Attn: CUPS Licensing Information -+# Easy Software Products -+# 44141 Airport View Drive, Suite 204 -+# Hollywood, Maryland 20636-3111 USA -+# -+# Voice: (301) 373-9603 -+# EMail: cups-info@cups.org -+# WWW: http://www.cups.org -+# -+ -+. scripts/common -+ -+${MKDIR} ${prefix}/${INITDIR} -+${RM} ${prefix}/${INITDIR}/cups -+${INSTALL_SCRIPT} cups.sh ${prefix}/${INITDIR}/cups -+${CHMOD} ugo+rx ${prefix}/${INITDIR}/cups diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj deleted file mode 100644 index d1e6b26945e..00000000000 --- a/print/cups/patches/patch-aj +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2001/01/28 02:05:38 jlam Exp $ - ---- scripts/sysv.orig Sat Jan 27 19:27:30 2001 -+++ scripts/sysv -@@ -0,0 +1,41 @@ -+#!/bin/sh -+# -+# Startup script installation for SysV systems -+# -+# Copyright 1997-2000 by Easy Software Products, all rights reserved. -+# -+# These coded instructions, statements, and computer programs are the -+# property of Easy Software Products and are protected by Federal -+# copyright law. Distribution and use rights are outlined in the file -+# "LICENSE.txt" which should have been included with this file. If this -+# file is missing or damaged please contact Easy Software Products -+# at: -+# -+# Attn: CUPS Licensing Information -+# Easy Software Products -+# 44141 Airport View Drive, Suite 204 -+# Hollywood, Maryland 20636-3111 USA -+# -+# Voice: (301) 373-9603 -+# EMail: cups-info@cups.org -+# WWW: http://www.cups.org -+# -+ -+. scripts/common -+ -+${MKDIR} ${prefix}/${INITDIR}/init.d -+${RM} ${prefix}/${INITDIR}/init.d/cups -+${INSTALL_SCRIPT} cups.sh ${prefix}/${INITDIR}/init.d/cups -+${CHMOD} ugo+rx ${prefix}/${INITDIR}/init.d/cups -+ -+${MKDIR} ${prefix}/${INITDIR}/rc0.d -+${RM} ${prefix}/${INITDIR}/rc0.d/K00cups -+${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc0.d/K00cups -+ -+${MKDIR} ${prefix}/${INITDIR}/rc3.d -+${RM} ${prefix}/${INITDIR}/rc3.d/S99cups -+${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc3.d/S99cups -+ -+${MKDIR} ${prefix}/${INITDIR}/rc5.d -+${RM} ${prefix}/${INITDIR}/rc5.d/S99cups -+${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc5.d/S99cups diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak deleted file mode 100644 index ab90f559bf6..00000000000 --- a/print/cups/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ak,v 1.5 2001/01/28 02:05:38 jlam Exp $ - ---- systemv/lpstat.c.orig Fri Jan 26 09:22:00 2001 -+++ systemv/lpstat.c -@@ -761,6 +761,7 @@ - */ - - printer = NULL; -+ printer_uri = NULL; - members = NULL; - - while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST index 6502f5a130f..112ac52b6bb 100644 --- a/print/cups/pkg/PLIST +++ b/print/cups/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2001/01/28 02:05:38 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2001/02/08 19:05:02 jlam Exp $ bin/cancel bin/disable bin/enable @@ -21,7 +21,7 @@ lib/libcups.a lib/libcups.la lib/libcups.so lib/libcups.so.2 -lib/libcups.so.2.0 +lib/libcups.so.2.1 lib/libcupsimage.a lib/libcupsimage.la lib/libcupsimage.so |