head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.8 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.6 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.4 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.2 pkgsrc-2011Q2-base:1.7 pkgsrc-2010Q3:1.6.0.4 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.2 pkgsrc-2010Q2-base:1.6 pkgsrc-2009Q4:1.4.0.46 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.44 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.42 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.40 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.38 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.36 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.34 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.32 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.30 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.28 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.26 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.24 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.22 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.20 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.18 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 buildlink2-base:1.4 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.7 date 2010.11.12.08.59.42; author sbd; state dead; branches; next 1.6; 1.6 date 2010.06.16.21.15.18; author sbd; state Exp; branches; next 1.5; 1.5 date 2010.06.16.18.18.26; author drochner; state Exp; branches; next 1.4; 1.4 date 2000.12.21.14.59.39; author jlam; state dead; branches; next 1.3; 1.3 date 2000.12.14.17.04.45; author jlam; state Exp; branches; next 1.2; 1.2 date 2000.12.07.20.33.06; author jlam; state Exp; branches; next 1.1; 1.1 date 2000.07.12.20.09.39; author jlam; state Exp; branches; next ; desc @@ 1.7 log @using wildcards with 'cvs delete' dose not work\! @ text @$NetBSD: patch-bb,v 1.6 2010/06/16 21:15:18 sbd Exp $ Incorporate str3577.patch from http://www.cups.org/str.php?L3577 "Memory disclosure in CUPS with admin URLs" --- cgi-bin/var.c.orig 2010-02-08 17:33:31.000000000 +0000 +++ cgi-bin/var.c @@@@ -927,6 +927,9 @@@@ cgi_initialize_string(const char *data) * Read the hex code... */ + if (!isxdigit(data[1] & 255) || !isxdigit(data[2] & 255)) + return (0); + if (s < (value + sizeof(value) - 1)) { data ++; @ 1.6 log @Add patch comments to patch-b? @ text @d1 1 a1 1 $NetBSD: patch-bb,v 1.5 2010/06/16 18:18:26 drochner Exp $ @ 1.5 log @add some patches from upstream to fix security problems: -use-after-free problem (CVE-2010-0302) -information disclosure (CVE-2010-1748) -unchecked memory allocation is texttops -file overwrite problem (I didn't find references from cups patches to CVE #s, or vice versa, so the CVE #s are not certain.) The missing http session check problem (CVE-2010-0540?) is not fixed, this would be a large patch affecting tens of files. bump PKGREVISION @ text @d1 5 a5 1 $NetBSD$ @ 1.4 log @Update cups to 1.1.5. Relevant changes since version 1.1.4 include lots of bug and security fixes, improvements to the efficiency of the server and utilities, improvements to the documentation, plus the following: * Security updates - new default configuration does not broadcast printer information and only allows access from the local system. * EXPERIMENTAL encryption support - CUPS now optionally supports TLS/SSL encryption via the OpenSSL library. * Updated PDF filter to Xpdf 0.91. * Added PPD files for 9-pin and 24-pin OKIDATA printers. * Changed all sprintf's that use string formats to snprintf's, even if the destination buffer is larger than the source string(s); this protects against buffer overflows caused outside of CUPS... * Changed all strcpy's to strncpy's between local and global variables, even if the destination buffer is larger than the source string; this protects against buffer overflows caused outside of CUPS... * Added new mime.types rules to allow automatic raw printing of PCL and ESC/P files; PJL headers are parsed to differentiate between PostScript and PCL job files. This should eliminate a lot of the reports of SAMBA printing problems due to the missing "-oraw" or "-l" options. * Jobs are now assigned to printers in a class round-robin style. This should prevent the first server in the class from bearing the brunt of the jobs. * The serial backend didn't support the higher baud rates with the old termios interface. It now supports 57600 and 115200 baud. * The serial backend now supports different types of flow control; previously it ignored the flow=XYZ option in the device URI. * The serial backend now supports DTR/DSR flow control, which is popular on dot-matrix printers (access with "flow=dtrdsr" in the device URI) * Added new job-originating-host-name attribute for jobs. The new attribute provides the hostname or IP address of the machine that submitted the job. * Added quota and allow/deny user support for printers and classes. @ text @d1 1 a1 1 $NetBSD: patch-bb,v 1.3 2000/12/14 17:04:45 jlam Exp $ d3 5 a7 4 --- configure.in.orig Wed Sep 20 15:11:05 2000 +++ configure.in @@@@ -44,8 +44,11 @@@@ CXXFLAGS="${CXXFLAGS:=}" d9 2 a10 63 -AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then +AC_ARG_ENABLE(rootconfig, [ --enable-rootconfig + set root of CUPS configuration to root directory + [default=no]]) +AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then OPTIM="-g " fi]) -AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=yes]]) +AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=yes]]) AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported=LIBTOOL_PATH turn on building with libtool (UNSUPPORTED!) [default=no]],[if eval "test x$enable_libtool_unsupported != xno"; then @@@@ -116,4 +119,12 @@@@ AC_ARG_WITH(fontpath, [ --with-fontpath set font path for pstoraster],fontpath="$withval",fontpath="") +AC_ARG_WITH(cups-user, [ --with-cups-user=USERID + use USERID as cups userid [default=lp]], CUPS_USER="$withval", CUPS_USER="lp") +AC_ARG_WITH(cups-group, [ --with-cups-group=GROUPID + use GROUPID as cups group [default=sys]], CUPS_GROUP="$withval", CUPS_GROUP="sys") + +AC_SUBST(CUPS_USER) +AC_SUBST(CUPS_GROUP) + dnl Checks for programs... AC_PROG_AWK @@@@ -485,6 +496,14 @@@@ esac else - INITDIR="/etc" - INITDDIR="../init.d" + case "$uname" in + FreeBSD* | NetBSD* | OpenBSD*) + INITDIR="" + INITDDIR="" + ;; + *) + INITDIR="/etc" + INITDDIR="../init.d" + ;; + esac fi @@@@ -493,11 +512,21 @@@@ dnl Setup default locations... -CUPS_SERVERROOT='${prefix}/etc/cups' -CUPS_LOGDIR='${prefix}/var/log/cups' -CUPS_REQUESTS='${prefix}/var/spool/cups' - -AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups") -AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups") -AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups") +if test "$enable_rootconfig" = "yes"; then + CUPS_SERVERROOT='/etc/cups' + CUPS_LOGDIR='/var/log/cups' + CUPS_REQUESTS='/var/spool/cups' + + AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "/etc/cups") + AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "/var/log/cups") + AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "/var/spool/cups") +else + CUPS_SERVERROOT='${prefix}/etc/cups' + CUPS_LOGDIR='${prefix}/var/log/cups' + CUPS_REQUESTS='${prefix}/var/spool/cups' d12 3 a14 22 + AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups") + AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups") + AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups") +fi dnl See what directory to put server executables... @@@@ -550,6 +579,6 @@@@ dnl Set the CUPS_DOCROOT directory... -CUPS_DOCROOT='${exec_prefix}/share/doc/cups' -AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups") +CUPS_DOCROOT='${exec_prefix}/share/doc/html/cups' +AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/html/cups") AC_SUBST(CUPS_DOCROOT) @@@@ -557,5 +586,5 @@@@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath") -AC_OUTPUT(Makedefs cups.sh) +AC_OUTPUT(Makedefs cups.sh conf/cupsd.conf) dnl @ 1.3 log @Deal with init script in a better way. Also update various patches to versions sent back to Easy Software. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update cups to 1.1.4. Changes from version 1.1 include a large number of bugfixes, security fixes, improvements to the web admin interface, addition of new printer drivers, improved documentation, and improvements to the CUPS API for client development. @ text @d5 1 a5 2 @@@@ -43,6 +43,9 @@@@ CFLAGS="${CFLAGS:=}" d8 1 d12 1 a12 1 AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then d15 18 a32 43 @@@@ -449,23 +452,25 @@@@ case "$uname" in FreeBSD* | NetBSD* | OpenBSD*) # *BSD - INITDIR="" - INITDDIR="" + INSTALL_INIT="" ;; Linux*) # Linux seems to choose an init.d directory at random... if test -d /sbin/init.d; then # SuSE + INSTALL_INIT="install-init" INITDIR="/sbin/init.d" INITDDIR=".." else if test -d /etc/rc.d; then # RedHat + INSTALL_INIT="install-init" INITDIR="/etc/rc.d" INITDDIR="../init.d" else # Others + INSTALL_INIT="install-init" INITDIR="/etc" INITDDIR="../init.d" fi @@@@ -473,32 +478,55 @@@@ ;; OSF1* | HP-UX*) + INSTALL_INIT="install-init" INITDIR="/sbin" INITDDIR="../init.d" ;; *) + INSTALL_INIT="install-init" INITDIR="/etc" INITDDIR="../init.d" ;; d39 2 a40 3 + INSTALL_INIT="" + INITDIR="/etc" + INITDDIR="../init.d" a42 1 + INSTALL_INIT="install-init" d49 1 a49 3 +AC_SUBST(INSTALL_INIT) AC_SUBST(INITDIR) AC_SUBST(INITDDIR) d78 1 a78 3 case "$uname" in @@@@ -549,8 +577,8 @@@@ AC_SUBST(CUPS_DATADIR) d87 7 a93 1 dnl Set the CUPS_FONTPATH directory... @ 1.1 log @Update CUPS to 1.1. Remove most of the patches; I worked closely with the author to make this package compile more seamlessly on BSD systems, and in particular with the NetBSD pkgsrc software collection. CUPS 1.1 is the newest production (stable) release of CUPS. It provides many new features from the 1.0.x releases, including a new Level 3 PostScript RIP, a new PDF filter, EPSON printer drivers, IPP/1.1 support, banner page support, and LPD client support. Binaries for several platforms are also available. Major changes in v1.1 include: - The text filter now embeds missing fonts. - Integrated Xpdf's pdftops filter into CUPS, which is a lightweight and reliable replacement for Ghostscript's PDF support. - The web administration interface now allows you to set the default banner pages. - Images can now be positioned on the page using the new "position" option. - Updated the serial, parallel, and usb backends to do multiple writes and ignore ioctl() errors as needed; this should fix problems with serial printing on old serial drivers and with the UltraSPARC parallel port driver under Solaris 2.7. - Now propagate LD_LIBRARY_PATH to child processes from cupsd. - Queued remote jobs recreate remote printers as needed when the scheduler is started. - Deleting a printer also purges all jobs on that printer. - Old job and control files that don't belong to a printer are automatically deleted. - cups-lpd now supports options set with lpoptions. - The IPP backend now switches to IPP/1.0 if a 1.1 request fails. @ text @d3 2 a4 2 --- configure.in.orig Mon Jul 10 16:58:19 2000 +++ configure.in Wed Jul 12 01:04:23 2000 d15 64 a78 2 @@@@ -403,13 +406,23 @@@@ AC_SUBST(CAT8EXT) d108 1 a108 1 @@@@ -460,8 +473,8 @@@@ d118 1 a118 1 AC_OUTPUT(Makedefs cups.sh) @