Import CUPS v2.0rc1

2016-03-15 10:40:26 -04:00
@@ -1,5 +1,28 @@
-CHANGES.txt - 2.0b1 - 2014-07-30
--------------------------------
+CHANGES.txt - 2.0rc1 - 2014-09-02
+---------------------------------
+
+CHANGES IN CUPS V2.0rc1
+
+	- Documentation updates (STR #4464)
+	- The scheduler now monitors the AC power status on OS X, allowing for
+	  "sleep printing" when sharing printers (<rdar://problem/17325852>)
+	- The scheduler incorrectly called launch_activate_socket multiple times
+	  on OS X (<rdar://problem/17523218>)
+	- The ippserver test program now passes the IPP Everywhere self-
+	  certification tests (STR #4101)
+	- Relaxed the new OS X filter sandbox slightly (STR #4471,
+	  <rdar://problem/17483959>)
+	- Dropped the old Epson Stylus Color/Photo sample drivers since they
+	  don't work with any current printers and there are free alternatives
+	  that produce much better output (<rdar://problem/18036889>)
+	- Log and configuration files that are not world-readable are again
+	  accessible via the web interface (STR #4461)
+	- PPD files are now created using the permissions specified by the
+	  ConfigFilePerm directive.
+	- Fixed RPM build issues (STR #4459)
+	- Fixed the spinner image and restart page when reconfiguring the
+	  scheduler through the web interface (STR #4475)
+

 CHANGES IN CUPS V2.0b1

@@ -1,5 +1,5 @@
-INSTALL - CUPS v2.0b1 - 2014-07-30
----------------------------------
+INSTALL - CUPS v2.0rc1 - 2014-09-02
+-----------------------------------

 This file describes how to compile and install CUPS from source code. For more
 information on CUPS see the file called "README.txt".  A complete change log can
@@ -165,17 +165,11 @@ CREATING BINARY DISTRIBUTIONS WITH EPM
    following:

 	epm       - Builds a script + tarfile package
-	aix       - Builds an AIX package
 	bsd       - Builds a *BSD package
 	deb       - Builds a Debian package
-	depot     - Builds a HP-UX package (also swinstall)
-	inst      - Builds an IRIX package (also tardist)
 	pkg       - Builds a Solaris package
 	rpm       - Builds a RPM package
-	setld     - Build a Tru64 UNIX package
 	slackware - Build a Slackware package
-	swinstall - Build a HP-UX package (also depot)
-	tardist   - Builds an IRIX package (also inst)


 GETTING DEBUG LOGGING FROM CUPS
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 12074 2014-07-31 01:10:14Z msweet $"
+# "$Id: Makefile 12145 2014-09-02 15:00:50Z msweet $"
 #
 # Top-level Makefile for CUPS.
 #
@@ -319,7 +319,7 @@ sloc:

 EPMFLAGS	=	-v --output-dir dist $(EPMARCH)

-bsd deb pkg slackware tardist:
+bsd deb pkg slackware:
 	epm $(EPMFLAGS) -f $@ cups packaging/cups.list

 epm:
@@ -348,5 +348,5 @@ dist:	all


 #
-# End of "$Id: Makefile 12074 2014-07-31 01:10:14Z msweet $".
+# End of "$Id: Makefile 12145 2014-09-02 15:00:50Z msweet $".
 #
@@ -1,5 +1,5 @@
-README - CUPS v2.0b1 - 2014-07-30
---------------------------------
+README - CUPS v2.0rc1 - 2014-09-02
+----------------------------------

 ********************************************************************************
 ********************************************************************************
@@ -54,10 +54,10 @@ READING THE DOCUMENTATION

 GETTING SUPPORT AND OTHER RESOURCES

-    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide many
-    discussion forums which are available at:
+    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide two
+    mailing lists which are available at:

-	http://www.cups.org/newsgroups.php
+	http://www.cups.org/lists.php

    See the CUPS web site at "http://www.cups.org/" for other resources.

@@ -91,10 +91,6 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
 	-----------------------------  ------------------------------
 	Dymo Label Printers            drv:///sample.drv/dymo.ppd
 	Intellitech Intellibar         drv:///sample.drv/intelbar.ppd
-	EPSON Stylus Color Series      drv:///sample.drv/stcolor.ppd
-	EPSON Stylus Photo Series      drv:///sample.drv/stphoto.ppd
-	EPSON Stylus New Color Series  drv:///sample.drv/stcolor2.ppd
-	EPSON Stylus New Photo Series  drv:///sample.drv/stphoto2.ppd
 	EPSON 9-pin Series             drv:///sample.drv/epson9.ppd
 	EPSON 24-pin Series            drv:///sample.drv/epson24.ppd
 	Generic PCL Laser Printer      drv:///sample.drv/generpcl.ppd
@@ -126,11 +122,7 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
        lpadmin -p printername -E -v lpd://11.22.33.44/ -m ppd-name

    The sample drivers provide basic printing capabilities, but generally do not
-    exercise the full potential of the printers or CUPS.  The CUPS web site
-    provides links and drivers:
-
-        http://www.cups.org/ppd.php      PPD files
-	http://www.cups.org/links.php    Links to other drivers
+    exercise the full potential of the printers or CUPS.


 PRINTING FILES
@@ -147,8 +139,8 @@ PRINTING FILES
 	lpr -o media=A4 -o resolution=600dpi filename

    CUPS recognizes many types of images files as well as PDF, PostScript,
-    HP-GL/2, and text files, so you can print those files directly rather than
-    through an application.
+    and text files, so you can print those files directly rather than through
+    an application.

    If you have an application that generates output specifically for your
    printer then you need to use the "-oraw" or "-l" options:
@@ -156,8 +148,7 @@ PRINTING FILES
 	lp -o raw filename
 	lpr -l filename

-    This will prevent the filters from misinterpreting your print
-    file.
+    This will prevent the filters from misinterpreting your print file.


 LEGAL STUFF
@@ -167,8 +158,6 @@ LEGAL STUFF

    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

-    This software is based in part on the work of the Independent JPEG Group.
-
    CUPS is provided under the terms of version 2 of the GNU General Public
    License and GNU Library General Public License. This program is distributed
    in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
@@ -1,5 +1,5 @@
 /*
- * "$Id: network.c 11970 2014-07-01 14:35:25Z msweet $"
+ * "$Id: network.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * Common backend network APIs for CUPS.
 *
@@ -175,13 +175,13 @@ backendNetworkSideCB(
 	      {
 	        case CUPS_ASN1_BOOLEAN :
 		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%d", packet.object_value.boolean);
-	            datalen += strlen(dataptr);
+	            datalen += (int)strlen(dataptr);
 		    break;

 	        case CUPS_ASN1_INTEGER :
 		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%d",
 		             packet.object_value.integer);
-	            datalen += strlen(dataptr);
+	            datalen += (int)strlen(dataptr);
 		    break;

 	        case CUPS_ASN1_BIT_STRING :
@@ -193,13 +193,13 @@ backendNetworkSideCB(

 		    memcpy(dataptr, packet.object_value.string.bytes, i);

-                    datalen += i;
+                    datalen += (int)i;
 		    break;

 	        case CUPS_ASN1_OID :
 		    _cupsSNMPOIDToString(packet.object_value.oid, dataptr,
 		                         sizeof(data) - (size_t)(dataptr - data));
-	            datalen += strlen(dataptr);
+	            datalen += (int)strlen(dataptr);
 		    break;

                case CUPS_ASN1_HEX_STRING :
@@ -208,22 +208,22 @@ backendNetworkSideCB(
 			     dataptr < (data + sizeof(data) - 3);
 			 i ++, dataptr += 2)
 		      sprintf(dataptr, "%02X", packet.object_value.string.bytes[i]);
-	            datalen += strlen(dataptr);
+	            datalen += (int)strlen(dataptr);
 		    break;

                case CUPS_ASN1_COUNTER :
 		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%u", packet.object_value.counter);
-	            datalen += strlen(dataptr);
+	            datalen += (int)strlen(dataptr);
 		    break;

                case CUPS_ASN1_GAUGE :
 		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%u", packet.object_value.gauge);
-	            datalen += strlen(dataptr);
+	            datalen += (int)strlen(dataptr);
 		    break;

                case CUPS_ASN1_TIMETICKS :
 		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%u", packet.object_value.timeticks);
-	            datalen += strlen(dataptr);
+	            datalen += (int)strlen(dataptr);
 		    break;

                default :
@@ -304,5 +304,5 @@ backendNetworkSideCB(


 /*
- * End of "$Id: network.c 11970 2014-07-01 14:35:25Z msweet $".
+ * End of "$Id: network.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-unix.c 11342 2013-10-18 20:36:01Z msweet $"
+ * "$Id: usb-unix.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * USB port backend for CUPS.
 *
@@ -146,7 +146,7 @@ print_device(const char *uri,		/* I - Device URI */

  tcgetattr(device_fd, &opts);

-  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
+  opts.c_lflag &= ~(unsigned)(ICANON | ECHO | ISIG);	/* Raw mode */

  /**** No options supported yet ****/

@@ -603,5 +603,5 @@ side_cb(int         print_fd,		/* I - Print file */


 /*
- * End of "$Id: usb-unix.c 11342 2013-10-18 20:36:01Z msweet $".
+ * End of "$Id: usb-unix.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: admin.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: admin.c 12123 2014-08-28 14:24:45Z msweet $"
 *
 * Administration CGI for CUPS.
 *
@@ -1897,7 +1897,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    }
    else
    {
-      cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect");
+      cgiSetVariable("refresh_page", "5;URL=/admin/");

      cgiStartHTML(cgiText(_("Edit Configuration File")));
      cgiCopyTemplateLang("restart.tmpl");
@@ -4198,5 +4198,5 @@ get_points(double     number,		/* I - Original number */


 /*
- * End of "$Id: admin.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: admin.c 12123 2014-08-28 14:24:45Z msweet $".
 */
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 12073 2014-07-31 00:58:00Z msweet $"
+dnl "$Id: cups-common.m4 12140 2014-08-30 01:51:22Z msweet $"
 dnl
 dnl Common configuration stuff for CUPS.
 dnl
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

 dnl Version number information...
-CUPS_VERSION=2.0b1
+CUPS_VERSION=2.0rc1
 CUPS_REVISION=
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
@@ -369,9 +369,6 @@ case $uname in
 		AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
 		AC_CHECK_FUNCS(mbr_uid_to_uuid)

-                dnl Check for the vproc_transaction_begin/end stuff...
-		AC_CHECK_FUNCS(vproc_transaction_begin)
-
 		dnl Need <dlfcn.h> header...
 		AC_CHECK_HEADER(dlfcn.h,AC_DEFINE(HAVE_DLFCN_H))

@@ -465,5 +462,5 @@ esac
 AC_SUBST(BUILDDIRS)

 dnl
-dnl End of "$Id: cups-common.m4 12073 2014-07-31 00:58:00Z msweet $".
+dnl End of "$Id: cups-common.m4 12140 2014-08-30 01:51:22Z msweet $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 11683 2014-03-05 20:00:54Z msweet $"
+dnl "$Id: cups-compiler.m4 12122 2014-08-28 12:55:52Z msweet $"
 dnl
 dnl Compiler stuff for CUPS.
 dnl
@@ -110,7 +110,7 @@ if test -n "$GCC"; then
 	# The -fstack-protector option is available with some versions of
 	# GCC and adds "stack canaries" which detect when the return address
 	# has been overwritten, preventing many types of exploit attacks.
-	AC_MSG_CHECKING(if GCC supports -fstack-protector)
+	AC_MSG_CHECKING(whether compiler supports -fstack-protector)
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fstack-protector"
 	AC_TRY_LINK(,,
@@ -130,7 +130,7 @@ if test -n "$GCC"; then
 		# exploits that depend on a fixed address for common functions.
 		#
 		# Not available to LSB binaries...
-		AC_MSG_CHECKING(if GCC supports -fPIE)
+		AC_MSG_CHECKING(whether compiler supports -fPIE)
 		OLDCFLAGS="$CFLAGS"
 		case "$uname" in
 			Darwin*)
@@ -154,9 +154,18 @@ if test -n "$GCC"; then

 	if test "x$with_optim" = x; then
 		# Add useful warning options for tracking down problems...
-		OPTIM="-Wall -Wno-format-y2k -Wsign-conversion -Wunused $OPTIM"
+		OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM"

-		AC_MSG_CHECKING(if GCC supports -Wno-tautological-compare)
+		AC_MSG_CHECKING(whether compiler supports -Wsign-conversion)
+		OLDCFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS -Werror -Wsign-conversion"
+		AC_TRY_COMPILE(,,
+			[OPTIM="$OPTIM -Wsign-conversion"
+			AC_MSG_RESULT(yes)],
+			AC_MSG_RESULT(no))
+		CFLAGS="$OLDCFLAGS"
+
+		AC_MSG_CHECKING(whether compiler supports -Wno-tautological-compare)
 		OLDCFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -Werror -Wno-tautological-compare"
 		AC_TRY_COMPILE(,,
@@ -211,7 +220,7 @@ else
 			# should contribute the necessary options to
 			# cups-support@cups.org...
 			echo "Building CUPS with default compiler optimizations; contact"
-			echo "cups-bugs@cups.org with uname and compiler options needed"
+			echo "cups-devel@cups.org with uname and compiler options needed"
 			echo "for your platform, or set the CFLAGS and LDFLAGS environment"
 			echo "variables before running configure."
 			;;
@@ -228,5 +237,5 @@ case $uname in
 esac

 dnl
-dnl End of "$Id: cups-compiler.m4 11683 2014-03-05 20:00:54Z msweet $".
+dnl End of "$Id: cups-compiler.m4 12122 2014-08-28 12:55:52Z msweet $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-ssl.m4 11911 2014-06-10 13:54:53Z msweet $"
+dnl "$Id: cups-ssl.m4 12122 2014-08-28 12:55:52Z msweet $"
 dnl
 dnl TLS stuff for CUPS.
 dnl
@@ -78,6 +78,11 @@ if test x$enable_ssl != xno; then
 	if test $have_ssl = 1; then
 	    CUPS_SERVERCERT="ssl/server.crt"
 	    CUPS_SERVERKEY="ssl/server.key"
+
+	    SAVELIBS="$LIBS"
+	    LIBS="$LIBS $SSLLIBS"
+	    AC_CHECK_FUNC(gnutls_transport_set_pull_timeout_function, AC_DEFINE(HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION))
+	    LIBS="$SAVELIBS"
 	fi
    fi
 fi
@@ -101,5 +106,5 @@ EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)

 dnl
-dnl End of "$Id: cups-ssl.m4 11911 2014-06-10 13:54:53Z msweet $".
+dnl End of "$Id: cups-ssl.m4 12122 2014-08-28 12:55:52Z msweet $".
 dnl
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h.in 11717 2014-03-21 16:42:53Z msweet $"
+ * "$Id: config.h.in 12140 2014-08-30 01:51:22Z msweet $"
 *
 * Configuration file for CUPS.
 *
@@ -93,7 +93,7 @@
 * Default MaxCopies value...
 */

-#define CUPS_DEFAULT_MAX_COPIES	100
+#define CUPS_DEFAULT_MAX_COPIES	9999


 /*
@@ -150,10 +150,7 @@
 * Do we have PAM stuff?
 */

-#ifndef HAVE_LIBPAM
 #define HAVE_LIBPAM 0
-#endif /* !HAVE_LIBPAM */
-
 #undef HAVE_PAM_PAM_APPL_H
 #undef HAVE_PAM_SET_ITEM
 #undef HAVE_PAM_SETCRED
@@ -297,9 +294,17 @@

 #undef HAVE_CDSASSL
 #undef HAVE_GNUTLS
+#undef HAVE_SSPISSL
 #undef HAVE_SSL


+/*
+ * Do we have the gnutls_transport_set_pull_timeout_function function?
+ */
+
+#undef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION
+
+
 /*
 * What Security framework headers do we have?
 */
@@ -632,13 +637,6 @@
 #endif /* HAVE_ARC4RANDOM */


-/*
- * Do we have vproc_transaction_begin/end?
- */
-
-#undef HAVE_VPROC_TRANSACTION_BEGIN
-
-
 /*
 * Do we have libusb?
 */
@@ -714,5 +712,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */

 /*
- * End of "$Id: config.h.in 11717 2014-03-21 16:42:53Z msweet $".
+ * End of "$Id: config.h.in 12140 2014-08-30 01:51:22Z msweet $".
 */
@@ -2520,7 +2520,7 @@ esac
 ac_config_headers="$ac_config_headers config.h"


-CUPS_VERSION=2.0b1
+CUPS_VERSION=2.0rc1
 CUPS_REVISION=
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
@@ -5692,18 +5692,6 @@ if test "x$ac_cv_func_mbr_uid_to_uuid" = xyes; then :
 #define HAVE_MBR_UID_TO_UUID 1
 _ACEOF

-fi
-done
-
-
-                		for ac_func in vproc_transaction_begin
-do :
-  ac_fn_c_check_func "$LINENO" "vproc_transaction_begin" "ac_cv_func_vproc_transaction_begin"
-if test "x$ac_cv_func_vproc_transaction_begin" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VPROC_TRANSACTION_BEGIN 1
-_ACEOF
-
 fi
 done

@@ -6625,8 +6613,8 @@ if test -n "$GCC"; then
 	# The -fstack-protector option is available with some versions of
 	# GCC and adds "stack canaries" which detect when the return address
 	# has been overwritten, preventing many types of exploit attacks.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if GCC supports -fstack-protector" >&5
-$as_echo_n "checking if GCC supports -fstack-protector... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -fstack-protector" >&5
+$as_echo_n "checking whether compiler supports -fstack-protector... " >&6; }
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fstack-protector"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6663,8 +6651,8 @@ rm -f core conftest.err conftest.$ac_objext \
 		# exploits that depend on a fixed address for common functions.
 		#
 		# Not available to LSB binaries...
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if GCC supports -fPIE" >&5
-$as_echo_n "checking if GCC supports -fPIE... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -fPIE" >&5
+$as_echo_n "checking whether compiler supports -fPIE... " >&6; }
 		OLDCFLAGS="$CFLAGS"
 		case "$uname" in
 			Darwin*)
@@ -6722,10 +6710,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 	if test "x$with_optim" = x; then
 		# Add useful warning options for tracking down problems...
-		OPTIM="-Wall -Wno-format-y2k -Wsign-conversion -Wunused $OPTIM"
+		OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM"

-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if GCC supports -Wno-tautological-compare" >&5
-$as_echo_n "checking if GCC supports -Wno-tautological-compare... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wsign-conversion" >&5
+$as_echo_n "checking whether compiler supports -Wsign-conversion... " >&6; }
+		OLDCFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS -Werror -Wsign-conversion"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  OPTIM="$OPTIM -Wsign-conversion"
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+		CFLAGS="$OLDCFLAGS"
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wno-tautological-compare" >&5
+$as_echo_n "checking whether compiler supports -Wno-tautological-compare... " >&6; }
 		OLDCFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -Werror -Wno-tautological-compare"
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6796,7 +6810,7 @@ else
 			# should contribute the necessary options to
 			# cups-support@cups.org...
 			echo "Building CUPS with default compiler optimizations; contact"
-			echo "cups-bugs@cups.org with uname and compiler options needed"
+			echo "cups-devel@cups.org with uname and compiler options needed"
 			echo "for your platform, or set the CFLAGS and LDFLAGS environment"
 			echo "variables before running configure."
 			;;
@@ -8295,6 +8309,16 @@ fi
 	if test $have_ssl = 1; then
 	    CUPS_SERVERCERT="ssl/server.crt"
 	    CUPS_SERVERKEY="ssl/server.key"
+
+	    SAVELIBS="$LIBS"
+	    LIBS="$LIBS $SSLLIBS"
+	    ac_fn_c_check_func "$LINENO" "gnutls_transport_set_pull_timeout_function" "ac_cv_func_gnutls_transport_set_pull_timeout_function"
+if test "x$ac_cv_func_gnutls_transport_set_pull_timeout_function" = xyes; then :
+  $as_echo "#define HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION 1" >>confdefs.h
+
+fi
+
+	    LIBS="$SAVELIBS"
 	fi
    fi
 fi
@@ -4,8 +4,9 @@ adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
  thread-private.h adminutil.h
-array.o: array.c string-private.h ../config.h debug-private.h \
-  ../cups/versioning.h array-private.h ../cups/array.h
+array.o: array.c ../cups/cups.h file.h versioning.h ipp.h http.h array.h \
+  language.h pwg.h string-private.h ../config.h debug-private.h \
+  array-private.h
 attr.o: attr.c cups-private.h string-private.h ../config.h \
  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
@@ -223,8 +224,12 @@ snmp.o: snmp.c cups-private.h string-private.h ../config.h \
  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
  thread-private.h snmp-private.h
 snprintf.o: snprintf.c string-private.h ../config.h
-string.o: string.c string-private.h ../config.h debug-private.h \
-  ../cups/versioning.h thread-private.h array.h
+string.o: string.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
+  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
+  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
+  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
+  thread-private.h
 tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \
  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
@@ -3,7 +3,7 @@

  Filter and backend programming introduction for CUPS.

-  Copyright 2007-2013 by Apple Inc.
+  Copyright 2007-2014 by Apple Inc.
  Copyright 1997-2006 by Easy Software Products, all rights reserved.

  These coded instructions, statements, and computer programs are the
@@ -81,7 +81,7 @@ directory to write to.</p>

 <p>In addition, some operating systems provide additional security mechanisms
 that further limit file system access, even for backends running as root. On
-OS X, for example, no backend may write to a user's home directory.</p>
+OS X, for example, no backend may write to a user's home directory. See the <a href="#SANDBOXING">Sandboxing on OS X</a> section for more information.</p>
 </blockquote>

 <h3><a name="SIGNALS">Canceled Jobs and Signal Handling</a></h3>
@@ -852,3 +852,25 @@ void *my_data;

 <a href="#cupsSideChannelSNMPWalk">cupsSNMPSideChannelWalk</a>(".1.3.6.1.2.1.43", 5.0, my_callback, my_data);
 </pre>
+
+<h2><a name="SANDBOXING">Sandboxing on OS X</a></h2>
+
+<p>Starting with OS X 10.6, filters and backends are run inside a security "sandbox" which further limits (beyond the normal UNIX user/group permissions) what a filter or backend can do. This helps to both secure the printing system from malicious software and enforce the functional separation of components in the CUPS filter chain. What follows is a list of actions that are explicitly allowed for all filters and backends:</p>
+
+<ol>
+
+	<li>Reading of files: pursuant to normal UNIX file permissions, filters and backends can read files for the current job from the <var>/private/var/spool/cups</var> directory and other files on mounted filesystems <em>except</em> for user home directories under <var>/Users</var>.</li>
+
+	<li>Writing of files: pursuant to normal UNIX file permissions, filters and backends can read/write files to the cache directory specified by the <code>CUPS_CACHEDIR</code> environment variable, to the state directory specified by the <code>CUPS_STATEDIR</code> environment variable, to the temporary directory specified by the <code>TMPDIR</code> environment variable, and under the <var>/private/var/db</var>, <var>/private/var/folders</var>, <var>/private/var/lib</var>, <var>/private/var/mysql</var>, <var>/private/var/run</var>, <var>/private/var/spool</var> (except <var>/private/var/spool/cups</var>), <var>/Library/Application&nbsp;Support</var>, <var>/Library/Caches</var>, <var>/Library/Logs</var>, <var>/Library/Preferences</var>, <var>/Library/WebServer</var>, and <var>/Users/Shared</var> directories.</li>
+
+	<li>Execution of programs: pursuant to normal UNIX file permissions, filters and backends can execute any program not located under the <var>/Users</var> directory. Child processes inherit the sandbox and are subject to the same restrictions as the parent.</li>
+
+	<li>Bluetooth and USB: backends can access Bluetooth and USB printers through IOKit. <em>Filters cannot access Bluetooth and USB printers directly.</em></li>
+
+	<li>Network: filters and backends can access UNIX domain sockets under the <var>/private/tmp</var>, <var>/private/var/run</var>, and <var>/private/var/tmp</var> directories. Backends can also create IPv4 and IPv6 TCP (outgoing) and UDP (incoming and outgoing) socket, and bind to local source ports. <em>Filters cannot directly create IPv4 and IPv6 TCP or UDP sockets.</em></li>
+
+	<li>Notifications: filters and backends can send notifications via the Darwin <code>notify_post()</code> API.</li>
+
+</ol>
+
+<blockquote><b>Note:</b> The sandbox profile used in CUPS 2.0 still allows some actions that are not listed above - these privileges will be removed over time until the profile matches the list above.</blockquote>
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 11884 2014-05-16 21:54:22Z msweet $"
+ * "$Id: cups.h 12094 2014-08-19 12:15:11Z msweet $"
 *
 * API definitions for CUPS.
 *
@@ -615,7 +615,7 @@ extern int		cupsGetDestMediaDefault(http_t *http, cups_dest_t *dest,
 extern void		cupsSetUserAgent(const char *user_agent) _CUPS_API_1_7;
 extern const char	*cupsUserAgent(void) _CUPS_API_1_7;

-/* New in CUPS 2.0 */
+/* New in CUPS 2.0/OS X 10.10 */
 extern cups_dest_t	*cupsGetDestWithURI(const char *name, const char *uri) _CUPS_API_2_0;
 extern const char	*cupsLocalizeDestMedia(http_t *http, cups_dest_t *dest, cups_dinfo_t *info, unsigned flags, cups_size_t *size) _CUPS_API_2_0;
 extern int		cupsMakeServerCredentials(const char *path, const char *common_name, int num_alt_names, const char **alt_names, time_t expiration_date) _CUPS_API_2_0;
@@ -628,5 +628,5 @@ extern int		cupsSetServerCredentials(const char *path, const char *common_name,
 #endif /* !_CUPS_CUPS_H_ */

 /*
- * End of "$Id: cups.h 11884 2014-05-16 21:54:22Z msweet $".
+ * End of "$Id: cups.h 12094 2014-08-19 12:15:11Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest-localization.c 11894 2014-05-23 03:18:00Z msweet $"
+ * "$Id: dest-localization.c 12094 2014-08-19 12:15:11Z msweet $"
 *
 * Destination localization support for CUPS.
 *
@@ -38,7 +38,7 @@ static char	*cups_scan_strings(char *buffer);
 * The returned string is stored in the destination information and will become
 * invalid if the destination information is deleted.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
 */

 const char *				/* O - Localized string */
@@ -535,5 +535,5 @@ cups_scan_strings(char *buffer)		/* I - Start of string */


 /*
- * End of "$Id: dest-localization.c 11894 2014-05-23 03:18:00Z msweet $".
+ * End of "$Id: dest-localization.c 12094 2014-08-19 12:15:11Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest.c 11959 2014-06-26 18:30:19Z msweet $"
+ * "$Id: dest.c 12094 2014-08-19 12:15:11Z msweet $"
 *
 * User-defined destination (and option) support for CUPS.
 *
@@ -1310,7 +1310,7 @@ _cupsGetDestResource(
 *
 * "uri" is the "ipp" or "ipps" URI for the printer.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
 */

 cups_dest_t *				/* O - Destination or @code NULL@ */
@@ -3942,5 +3942,5 @@ cups_make_string(


 /*
- * End of "$Id: dest.c 11959 2014-06-26 18:30:19Z msweet $".
+ * End of "$Id: dest.c 12094 2014-08-19 12:15:11Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.c 11851 2014-05-07 23:55:35Z msweet $"
+ * "$Id: globals.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 *   Global variable access routines for CUPS.
 *
@@ -361,7 +361,9 @@ cups_globals_free(_cups_globals_t *cg)	/* I - Pointer to global data */

  httpClose(cg->http);

+#ifdef HAVE_SSL
  _httpFreeCredentials(cg->tls_credentials);
+#endif /* HAVE_SSL */

  cupsFileClose(cg->stdio_files[0]);
  cupsFileClose(cg->stdio_files[1]);
@@ -392,5 +394,5 @@ cups_globals_init(void)


 /*
- * End of "$Id: globals.c 11851 2014-05-07 23:55:35Z msweet $".
+ * End of "$Id: globals.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-addr.c 11627 2014-02-20 16:15:09Z msweet $"
+ * "$Id: http-addr.c 12129 2014-08-28 19:26:31Z msweet $"
 *
 * HTTP address routines for CUPS.
 *
@@ -64,7 +64,7 @@ httpAddrAny(const http_addr_t *addr)	/* I - Address to check */
 * listen address for sockets created with @link httpAddrListen@. This will
 * ensure that domain sockets are removed when closed.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int						/* O - 0 on success, -1 on failure */
@@ -653,7 +653,7 @@ httpAddrString(const http_addr_t *addr,	/* I - Address to convert */
 *
 * Returns @code NULL@ if the socket is currently unconnected.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 http_addr_t *				/* O - Connected address or @code NULL@ */
@@ -865,6 +865,13 @@ httpGetHostname(http_t *http,		/* I - HTTP connection or NULL */
      }
 #endif /* HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME */
    }
+
+   /*
+    * Make sure .local hostnames end with a period...
+    */
+
+    if (strlen(s) > 6 && !strcmp(s + strlen(s) - 6, ".local"))
+      strlcat(s, ".", (size_t)slen);
  }

 /*
@@ -879,7 +886,7 @@ httpGetHostname(http_t *http,		/* I - HTTP connection or NULL */
 * 'httpResolveHostname()' - Resolve the hostname of the HTTP connection
 *                           address.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 const char *				/* O - Resolved hostname or @code NULL@ */
@@ -917,5 +924,5 @@ httpResolveHostname(http_t *http,	/* I - HTTP connection */


 /*
- * End of "$Id: http-addr.c 11627 2014-02-20 16:15:09Z msweet $".
+ * End of "$Id: http-addr.c 12129 2014-08-28 19:26:31Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h 12044 2014-07-17 21:21:21Z msweet $"
+ * "$Id: http-private.h 12126 2014-08-28 16:02:00Z msweet $"
 *
 * Private HTTP definitions for CUPS.
 *
@@ -76,7 +76,6 @@ typedef int socklen_t;
 #  ifdef HAVE_GNUTLS
 #    include <gnutls/gnutls.h>
 #    include <gnutls/x509.h>
-#    include <gcrypt.h>
 #  elif defined(HAVE_CDSASSL)
 #    include <CoreFoundation/CoreFoundation.h>
 #    include <Security/Security.h>
@@ -439,5 +438,5 @@ extern int		_httpWait(http_t *http, int msec, int usessl);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */

 /*
- * End of "$Id: http-private.h 12044 2014-07-17 21:21:21Z msweet $".
+ * End of "$Id: http-private.h 12126 2014-08-28 16:02:00Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-support.c 11844 2014-05-02 11:58:54Z msweet $"
+ * "$Id: http-support.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * HTTP support routines for CUPS.
 *
@@ -649,7 +649,7 @@ httpDecode64_2(char       *out,		/* I  - String to write to */
 	  break;
      case 3 :
          if (outptr < outend)
-            *outptr++ |= base64;
+            *outptr++ |= (char)base64;
 	  pos = 0;
 	  break;
    }
@@ -1300,7 +1300,7 @@ httpSeparateURI(
 /*
 * 'httpStateString()' - Return the string describing a HTTP state value.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 const char *				/* O - State string */
@@ -1433,7 +1433,7 @@ httpStatus(http_status_t status)	/* I - HTTP status code */
 /*
 * 'httpURIStatusString()' - Return a string describing a URI status code.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 const char *				/* O - Localized status string */
@@ -2544,5 +2544,5 @@ http_resolve_cb(


 /*
- * End of "$Id: http-support.c 11844 2014-05-02 11:58:54Z msweet $".
+ * End of "$Id: http-support.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c 12034 2014-07-16 19:37:34Z msweet $"
+ * "$Id: http.c 12125 2014-08-28 15:49:29Z msweet $"
 *
 * HTTP routines for CUPS.
 *
@@ -393,7 +393,7 @@ httpClose(http_t *http)			/* I - HTTP connection */
 /*
 * 'httpCompareCredentials()' - Compare two sets of X.509 credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 if they match, 0 if they do not */
@@ -759,7 +759,7 @@ httpGet(http_t     *http,		/* I - HTTP connection */
 *
 * The return value is the UNIX time of the last read or write.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 time_t					/* O - Time of last read or write */
@@ -911,7 +911,7 @@ httpGetCookie(http_t *http)		/* I - HTTP connecion */
 * @link httpIsEncrypted@ function to determine whether a TLS session has
 * been established.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 http_encryption_t			/* O - Current encryption mode */
@@ -995,7 +995,7 @@ httpGetField(http_t       *http,	/* I - HTTP connection */
 /*
 * 'httpGetKeepAlive()' - Get the current Keep-Alive state of the connection.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 http_keepalive_t			/* O - Keep-Alive state */
@@ -1104,7 +1104,7 @@ httpGetLength2(http_t *http)		/* I - HTTP connection */
 /*
 * 'httpGetPending()' - Get the number of bytes that are buffered for writing.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 size_t					/* O - Number of bytes buffered */
@@ -1117,7 +1117,7 @@ httpGetPending(http_t *http)		/* I - HTTP connection */
 /*
 * 'httpGetReady()' - Get the number of bytes that can be read without blocking.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 size_t					/* O - Number of bytes available */
@@ -1143,7 +1143,7 @@ httpGetReady(http_t *http)		/* I - HTTP connection */
 * The @link httpIsChunked@ function can be used to determine whether the
 * message body is chunked or fixed-length.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 size_t					/* O - Remaining bytes */
@@ -1582,7 +1582,7 @@ httpInitialize(void)
 * This function returns non-zero if the message body is composed of
 * variable-length chunks.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 if chunked, 0 if not */
@@ -1597,7 +1597,7 @@ httpIsChunked(http_t *http)		/* I - HTTP connection */
 *
 * This function returns non-zero if the connection is currently encrypted.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 if encrypted, 0 if not */
@@ -1793,8 +1793,8 @@ httpPeek(http_t *http,			/* I - HTTP connection */

      memcpy(http->sbuffer + http->stream.avail_in, http->buffer, buflen);
      http->stream.avail_in += buflen;
-      http->used            -= buflen;
-      http->data_remaining  -= buflen;
+      http->used            -= (int)buflen;
+      http->data_remaining  -= (off_t)buflen;

      if (http->used > 0)
        memmove(http->buffer, http->buffer + buflen, (size_t)http->used);
@@ -2557,9 +2557,11 @@ httpSetCredentials(http_t	*http,		/* I - HTTP connection */
  if (!http || cupsArrayCount(credentials) < 1)
    return (-1);

+#ifdef HAVE_SSL
  _httpFreeCredentials(http->tls_credentials);

  http->tls_credentials = _httpCreateCredentials(credentials);
+#endif /* HAVE_SSL */

  return (http->tls_credentials ? 0 : -1);
 }
@@ -2769,7 +2771,7 @@ httpSetField(http_t       *http,	/* I - HTTP connection */
 /*
 * 'httpSetKeepAlive()' - Set the current Keep-Alive state of a connection.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 void
@@ -2847,7 +2849,7 @@ httpSetTimeout(
 /*
 * 'httpShutdown()' - Shutdown one side of an HTTP connection.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 void
@@ -2856,8 +2858,10 @@ httpShutdown(http_t *http)		/* I - HTTP connection */
  if (!http || http->fd < 0)
    return;

+#ifdef HAVE_SSL
  if (http->tls)
    _httpTLSStop(http);
+#endif /* HAVE_SSL */

 #ifdef WIN32
  shutdown(http->fd, SD_RECEIVE);	/* Microsoft-ism... */
@@ -4822,5 +4826,5 @@ http_write_chunk(http_t     *http,	/* I - HTTP connection */


 /*
- * End of "$Id: http.c 12034 2014-07-16 19:37:34Z msweet $".
+ * End of "$Id: http.c 12125 2014-08-28 15:49:29Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.h 11850 2014-05-07 23:12:48Z msweet $"
+ * "$Id: http.h 12094 2014-08-19 12:15:11Z msweet $"
 *
 * Hyper-Text Transport Protocol definitions for CUPS.
 *
@@ -342,7 +342,7 @@ typedef enum http_status_e		/**** HTTP status codes ****/
 #  endif /* !_CUPS_NO_DEPRECATED */
 } http_status_t;

-typedef enum http_trust_e		/**** Level of trust for credentials @since CUPS 2.0@ */
+typedef enum http_trust_e		/**** Level of trust for credentials @since CUPS 2.0/OS 10.10@ */
 {
  HTTP_TRUST_OK = 0,			/* Credentials are OK/trusted */
  HTTP_TRUST_INVALID,			/* Credentials are invalid */
@@ -620,7 +620,7 @@ extern void		httpSetDefaultField(http_t *http, http_field_t field,
 extern http_state_t	httpWriteResponse(http_t *http,
 			                  http_status_t status) _CUPS_API_1_7;

-/* New in CUPS 2.0 */
+/* New in CUPS 2.0/OS X 10.10 */
 extern int		httpAddrClose(http_addr_t *addr, int fd) _CUPS_API_2_0;
 extern int		httpAddrFamily(http_addr_t *addr) _CUPS_API_2_0;
 extern int		httpCompareCredentials(cups_array_t *cred1, cups_array_t *cred2) _CUPS_API_2_0;
@@ -656,5 +656,5 @@ extern const char	*httpURIStatusString(http_uri_status_t status) _CUPS_API_2_0;
 #endif /* !_CUPS_HTTP_H_ */

 /*
- * End of "$Id: http.h 11850 2014-05-07 23:12:48Z msweet $".
+ * End of "$Id: http.h 12094 2014-08-19 12:15:11Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-support.c 11806 2014-04-09 16:12:27Z msweet $"
+ * "$Id: ipp-support.c 12095 2014-08-19 16:16:06Z msweet $"
 *
 * Internet Printing Protocol support functions for CUPS.
 *
@@ -669,7 +669,14 @@ ippAttributeString(
          break;

      case IPP_TAG_RESOLUTION :
-          if (buffer && bufptr < bufend)
+	  if (val->resolution.xres == val->resolution.yres)
+	  {
+	    if (buffer && bufptr < bufend)
+	      bufptr += snprintf(bufptr, (size_t)(bufend - bufptr + 1), "%d%s", val->resolution.xres, val->resolution.units == IPP_RES_PER_INCH ? "dpi" : "dpcm");
+	    else
+	      bufptr += snprintf(temp, sizeof(temp), "%d%s", val->resolution.xres, val->resolution.units == IPP_RES_PER_INCH ? "dpi" : "dpcm");
+	  }
+	  else if (buffer && bufptr < bufend)
            bufptr += snprintf(bufptr, (size_t)(bufend - bufptr + 1), "%dx%d%s", val->resolution.xres, val->resolution.yres, val->resolution.units == IPP_RES_PER_INCH ? "dpi" : "dpcm");
          else
            bufptr += snprintf(temp, sizeof(temp), "%dx%d%s", val->resolution.xres, val->resolution.yres, val->resolution.units == IPP_RES_PER_INCH ? "dpi" : "dpcm");
@@ -2122,7 +2129,7 @@ ippSetPort(int p)			/* I - Port number to use */
 /*
 * 'ippStateString()' - Return the name corresponding to a state value.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 const char *				/* O - State name */
@@ -2256,5 +2263,5 @@ ipp_col_string(ipp_t  *col,		/* I - Collection attribute */


 /*
- * End of "$Id: ipp-support.c 11806 2014-04-09 16:12:27Z msweet $".
+ * End of "$Id: ipp-support.c 12095 2014-08-19 16:16:06Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 11840 2014-04-29 15:57:26Z msweet $"
+ * "$Id: ipp.c 12093 2014-08-19 12:10:17Z msweet $"
 *
 * Internet Printing Protocol functions for CUPS.
 *
@@ -1728,7 +1728,7 @@ ippCopyAttribute(
 /*
 * 'ippCopyAttributes()' - Copy attributes from one IPP message to another.
 *
- * Zero or more attributes are copied from the source IPP message, @code@ src, to the
+ * Zero or more attributes are copied from the source IPP message, @code src@, to the
 * destination IPP message, @code dst@. When @code quickcopy@ is non-zero, a "shallow"
 * reference copy of the attribute is created - this should only be done as long as the
 * original source IPP message will not be freed for the life of the destination.
@@ -7046,5 +7046,5 @@ ipp_write_file(int         *fd,		/* I - File descriptor */


 /*
- * End of "$Id: ipp.c 11840 2014-04-29 15:57:26Z msweet $".
+ * End of "$Id: ipp.c 12093 2014-08-19 12:10:17Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: md5.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: md5.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * Private MD5 implementation for CUPS.
 *
@@ -333,7 +333,7 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16])
    for (i = 0; i < 8; ++i)
 	data[i] = (unsigned char)(pms->count[i >> 2] >> ((i & 3) << 3));
    /* Pad to 56 bytes mod 64. */
-    _cupsMD5Append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    _cupsMD5Append(pms, pad, (int)((55 - (pms->count[0] >> 3)) & 63) + 1);
    /* Append the length. */
    _cupsMD5Append(pms, data, 8);
    for (i = 0; i < 16; ++i)
@@ -342,5 +342,5 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16])


 /*
- * End of "$Id: md5.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: md5.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd-cache.c 11832 2014-04-24 15:04:00Z msweet $"
+ * "$Id: ppd-cache.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * PPD cache implementation for CUPS.
 *
@@ -2630,7 +2630,7 @@ pwg_compare_finishings(
    _pwg_finishings_t *a,		/* I - First finishings value */
    _pwg_finishings_t *b)		/* I - Second finishings value */
 {
-  return (b->value - a->value);
+  return ((int)b->value - (int)a->value);
 }


@@ -2712,5 +2712,5 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */


 /*
- * End of "$Id: ppd-cache.c 11832 2014-04-24 15:04:00Z msweet $".
+ * End of "$Id: ppd-cache.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: sidechannel.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: sidechannel.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * Side-channel API code for CUPS.
 *
@@ -490,7 +490,7 @@ cupsSideChannelSNMPWalk(
        real_data[real_datalen] = '\0';

      real_oidlen  = strlen(real_data) + 1;
-      real_datalen -= real_oidlen;
+      real_datalen -= (int)real_oidlen;

     /*
      * Call the callback with the OID and data...
@@ -625,5 +625,5 @@ cupsSideChannelWrite(


 /*
- * End of "$Id: sidechannel.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: sidechannel.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-darwin.c 12029 2014-07-15 18:59:26Z msweet $"
+ * "$Id: tls-darwin.c 12094 2014-08-19 12:15:11Z msweet $"
 *
 * TLS support code for CUPS on OS X.
 *
@@ -61,7 +61,7 @@ static OSStatus		http_cdsa_write(SSLConnectionRef connection, const void *data,
 /*
 * 'cupsMakeServerCredentials()' - Make a self-signed certificate and private key pair.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -283,7 +283,7 @@ cleanup:
 * Note: The server credentials are used by all threads in the running process.
 * This function is threadsafe.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -452,7 +452,7 @@ _httpCreateCredentials(
 /*
 * 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
 */

 int					/* O - 1 if valid, 0 otherwise */
@@ -515,7 +515,7 @@ httpCredentialsAreValidForName(
 /*
 * 'httpCredentialsGetTrust()' - Return the trust of credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
 */

 http_trust_t				/* O - Level of trust */
@@ -599,7 +599,7 @@ httpCredentialsGetTrust(
 /*
 * 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
 */

 time_t					/* O - Expiration date of credentials */
@@ -624,7 +624,7 @@ httpCredentialsGetExpiration(
 /*
 * 'httpCredentialsString()' - Return a string representing the credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
 */

 size_t					/* O - Total size of credentials string */
@@ -697,7 +697,7 @@ _httpFreeCredentials(
 /*
 * 'httpLoadCredentials()' - Load X.509 credentials from a keychain file.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 0 on success, -1 on error */
@@ -803,7 +803,7 @@ httpLoadCredentials(
 /*
 * 'httpSaveCredentials()' - Save X.509 credentials to a keychain file.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - -1 on error, 0 on success */
@@ -1660,5 +1660,5 @@ http_cdsa_write(


 /*
- * End of "$Id: tls-darwin.c 12029 2014-07-15 18:59:26Z msweet $".
+ * End of "$Id: tls-darwin.c 12094 2014-08-19 12:15:11Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-gnutls.c 12050 2014-07-18 16:51:12Z msweet $"
+ * "$Id: tls-gnutls.c 12125 2014-08-28 15:49:29Z msweet $"
 *
 * TLS support code for CUPS using GNU TLS.
 *
@@ -51,7 +51,7 @@ static ssize_t		http_gnutls_write(gnutls_transport_ptr_t ptr, const void *data,
 /*
 * 'cupsMakeServerCredentials()' - Make a self-signed certificate and private key pair.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -228,7 +228,7 @@ cupsMakeServerCredentials(
 * Note: The server credentials are used by all threads in the running process.
 * This function is threadsafe.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -357,7 +357,7 @@ _httpFreeCredentials(
 /*
 * 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 if valid, 0 otherwise */
@@ -383,7 +383,7 @@ httpCredentialsAreValidForName(
 /*
 * 'httpCredentialsGetTrust()' - Return the trust of credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 http_trust_t				/* O - Level of trust */
@@ -475,7 +475,7 @@ httpCredentialsGetTrust(
 /*
 * 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 time_t					/* O - Expiration date of credentials */
@@ -500,7 +500,7 @@ httpCredentialsGetExpiration(
 /*
 * 'httpCredentialsString()' - Return a string representing the credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 size_t					/* O - Total size of credentials string */
@@ -556,7 +556,7 @@ httpCredentialsString(
 /*
 * 'httpLoadCredentials()' - Load X.509 credentials from a keychain file.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 0 on success, -1 on error */
@@ -682,7 +682,7 @@ httpLoadCredentials(
 /*
 * 'httpSaveCredentials()' - Save X.509 credentials to a keychain file.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - -1 on error, 0 on success */
@@ -1186,7 +1186,9 @@ _httpTLSStart(http_t *http)		/* I - Connection to server */

  gnutls_transport_set_ptr(http->tls, (gnutls_transport_ptr_t)http);
  gnutls_transport_set_pull_function(http->tls, http_gnutls_read);
+#ifdef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION
  gnutls_transport_set_pull_timeout_function(http->tls, (gnutls_pull_timeout_func)httpWait);
+#endif /* HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION */
  gnutls_transport_set_push_function(http->tls, http_gnutls_write);

  while ((status = gnutls_handshake(http->tls)) != GNUTLS_E_SUCCESS)
@@ -1289,5 +1291,5 @@ _httpTLSWrite(http_t     *http,		/* I - Connection to server */


 /*
- * End of "$Id: tls-gnutls.c 12050 2014-07-18 16:51:12Z msweet $".
+ * End of "$Id: tls-gnutls.c 12125 2014-08-28 15:49:29Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-sspi.c 12047 2014-07-18 13:53:34Z msweet $"
+ * "$Id: tls-sspi.c 12094 2014-08-19 12:15:11Z msweet $"
 *
 * TLS support for CUPS on Windows using SSPI.
 *
@@ -66,7 +66,7 @@ static DWORD	http_sspi_verify(PCCERT_CONTEXT cert, const char *common_name, DWOR
 /*
 * 'cupsMakeServerCredentials()' - Make a self-signed certificate and private key pair.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -102,7 +102,7 @@ cupsMakeServerCredentials(
 * Note: The server credentials are used by all threads in the running process.
 * This function is threadsafe.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 on success, 0 on failure */
@@ -165,7 +165,7 @@ _httpCreateCredentials(
 /*
 * 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 1 if valid, 0 otherwise */
@@ -230,7 +230,7 @@ httpCredentialsAreValidForName(
 /*
 * 'httpCredentialsGetTrust()' - Return the trust of credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 http_trust_t				/* O - Level of trust */
@@ -272,7 +272,7 @@ httpCredentialsGetTrust(
 /*
 * 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 time_t					/* O - Expiration date of credentials */
@@ -309,7 +309,7 @@ httpCredentialsGetExpiration(
 /*
 * 'httpCredentialsString()' - Return a string representing the credentials.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 size_t					/* O - Total size of credentials string */
@@ -399,7 +399,7 @@ _httpFreeCredentials(
 /*
 * 'httpLoadCredentials()' - Load X.509 credentials from a keychain file.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - 0 on success, -1 on error */
@@ -523,7 +523,7 @@ cleanup:
 /*
 * 'httpSaveCredentials()' - Save X.509 credentials to a keychain file.
 *
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
 */

 int					/* O - -1 on error, 0 on success */
@@ -2359,5 +2359,5 @@ http_sspi_verify(


 /*
- * End of "$Id: tls-sspi.c 12047 2014-07-18 13:53:34Z msweet $".
+ * End of "$Id: tls-sspi.c 12094 2014-08-19 12:15:11Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls.c 11841 2014-04-29 16:39:25Z msweet $"
+ * "$Id: tls.c 12136 2014-08-29 15:19:40Z msweet $"
 *
 * TLS routines for CUPS.
 *
@@ -46,12 +46,67 @@
 #    include "tls-gnutls.c"
 #  elif defined(HAVE_CDSASSL)
 #    include "tls-darwin.c"
-#  else
+#  elif defined(HAVE_SSPISSL)
 #    include "tls-sspi.c"
 #  endif /* HAVE_GNUTLS */
+#else
+/* Stubs for when TLS is not supported/available */
+int
+httpCopyCredentials(http_t *http, cups_array_t **credentials)
+{
+  (void)http;
+  if (credentials)
+    *credentials = NULL;
+  return (-1);
+}
+int
+httpCredentialsAreValidForName(cups_array_t *credentials, const char *common_name)
+{
+  (void)credentials;
+  (void)common_name;
+  return (1);
+}
+time_t
+httpCredentialsGetExpiration(cups_array_t *credentials)
+{
+  (void)credentials;
+  return (INT_MAX);
+}
+http_trust_t
+httpCredentialsGetTrust(cups_array_t *credentials, const char *common_name)
+{
+  (void)credentials;
+  (void)common_name;
+  return (HTTP_TRUST_OK);
+}
+size_t
+httpCredentialsString(cups_array_t *credentials, char *buffer, size_t bufsize)
+{
+  (void)credentials;
+  (void)bufsize;
+  if (buffer)
+    *buffer = '\0';
+  return (0);
+}
+int
+httpLoadCredentials(const char *path, cups_array_t **credentials, const char *common_name)
+{
+  (void)path;
+  (void)credentials;
+  (void)common_name;
+  return (-1);
+}
+int
+httpSaveCredentials(const char *path, cups_array_t *credentials, const char *common_name)
+{
+  (void)path;
+  (void)credentials;
+  (void)common_name;
+  return (-1);
+}
 #endif /* HAVE_SSL */


 /*
- * End of "$Id: tls.c 11841 2014-04-29 16:39:25Z msweet $".
+ * End of "$Id: tls.c 12136 2014-08-29 15:19:40Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: usersys.c 11908 2014-06-09 18:57:44Z msweet $"
+ * "$Id: usersys.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * User, system, and password routines for CUPS.
 *
@@ -211,8 +211,10 @@ cupsSetCredentials(
  if (cupsArrayCount(credentials) < 1)
    return (-1);

+#ifdef HAVE_SSL
  _httpFreeCredentials(cg->tls_credentials);
  cg->tls_credentials = _httpCreateCredentials(credentials);
+#endif /* HAVE_SSL */

  return (cg->tls_credentials ? 0 : -1);
 }
@@ -1127,5 +1129,5 @@ cups_read_client_conf(


 /*
- * End of "$Id: usersys.c 11908 2014-06-09 18:57:44Z msweet $".
+ * End of "$Id: usersys.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -2097,7 +2097,7 @@ example, passing <code>CUPS_MEDIA_FLAGS_BORDERLESS</code> will return the defaul
 borderless size, typically US Letter or A4, but sometimes 4x6 photo media.

 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="cupsGetDestWithURI">cupsGetDestWithURI</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS X 10.10&nbsp;</span><a name="cupsGetDestWithURI">cupsGetDestWithURI</a></h3>
 <p class="description">Get a destination associated with a URI.</p>
 <p class="code">
 <a href="#cups_dest_t">cups_dest_t</a> *cupsGetDestWithURI (<br>
@@ -2525,7 +2525,7 @@ cups_lang_t *cupsLangGet (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Language data</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="cupsLocalizeDestMedia">cupsLocalizeDestMedia</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS X 10.10&nbsp;</span><a name="cupsLocalizeDestMedia">cupsLocalizeDestMedia</a></h3>
 <p class="description">Get the localized string for a destination media
 size.</p>
 <p class="code">
@@ -408,6 +408,7 @@ div.contents ul.subcontents li {
 	<li><a href="#COMMUNICATING_FILTER">Communicating with Filters</a></li>
 	<li><a href="#SNMP">Doing SNMP Queries with Network Printers</a></li>
 </ul></li>
+<li><a href="#SANDBOXING">Sandboxing on OS X</a></li>
 <li><a href="#FUNCTIONS">Functions</a><ul class="code">
 	<li><a href="#cupsBackChannelRead" title="Read data from the backchannel.">cupsBackChannelRead</a></li>
 	<li><a href="#cupsBackChannelWrite" title="Write data to the backchannel.">cupsBackChannelWrite</a></li>
@@ -442,7 +443,7 @@ div.contents ul.subcontents li {

  Filter and backend programming introduction for CUPS.

-  Copyright 2007-2013 by Apple Inc.
+  Copyright 2007-2014 by Apple Inc.
  Copyright 1997-2006 by Easy Software Products, all rights reserved.

  These coded instructions, statements, and computer programs are the
@@ -520,7 +521,7 @@ directory to write to.</p>

 <p>In addition, some operating systems provide additional security mechanisms
 that further limit file system access, even for backends running as root. On
-OS X, for example, no backend may write to a user's home directory.</p>
+OS X, for example, no backend may write to a user's home directory. See the <a href="#SANDBOXING">Sandboxing on OS X</a> section for more information.</p>
 </blockquote>

 <h3><a name="SIGNALS">Canceled Jobs and Signal Handling</a></h3>
@@ -1291,6 +1292,28 @@ void *my_data;

 <a href="#cupsSideChannelSNMPWalk">cupsSNMPSideChannelWalk</a>(".1.3.6.1.2.1.43", 5.0, my_callback, my_data);
 </pre>
+
+<h2><a name="SANDBOXING">Sandboxing on OS X</a></h2>
+
+<p>Starting with OS X 10.6, filters and backends are run inside a security "sandbox" which further limits (beyond the normal UNIX user/group permissions) what a filter or backend can do. This helps to both secure the printing system from malicious software and enforce the functional separation of components in the CUPS filter chain. What follows is a list of actions that are explicitly allowed for all filters and backends:</p>
+
+<ol>
+
+	<li>Reading of files: pursuant to normal UNIX file permissions, filters and backends can read files for the current job from the <var>/private/var/spool/cups</var> directory and other files on mounted filesystems <em>except</em> for user home directories under <var>/Users</var>.</li>
+
+	<li>Writing of files: pursuant to normal UNIX file permissions, filters and backends can read/write files to the cache directory specified by the <code>CUPS_CACHEDIR</code> environment variable, to the state directory specified by the <code>CUPS_STATEDIR</code> environment variable, to the temporary directory specified by the <code>TMPDIR</code> environment variable, and under the <var>/private/var/db</var>, <var>/private/var/folders</var>, <var>/private/var/lib</var>, <var>/private/var/mysql</var>, <var>/private/var/run</var>, <var>/private/var/spool</var> (except <var>/private/var/spool/cups</var>), <var>/Library/Application&nbsp;Support</var>, <var>/Library/Caches</var>, <var>/Library/Logs</var>, <var>/Library/Preferences</var>, <var>/Library/WebServer</var>, and <var>/Users/Shared</var> directories.</li>
+
+	<li>Execution of programs: pursuant to normal UNIX file permissions, filters and backends can execute any program not located under the <var>/Users</var> directory. Child processes inherit the sandbox and are subject to the same restrictions as the parent.</li>
+
+	<li>Bluetooth and USB: backends can access Bluetooth and USB printers through IOKit. <em>Filters cannot access Bluetooth and USB printers directly.</em></li>
+
+	<li>Network: filters and backends can access UNIX domain sockets under the <var>/private/tmp</var>, <var>/private/var/run</var>, and <var>/private/var/tmp</var> directories. Backends can also create IPv4 and IPv6 TCP (outgoing) and UDP (incoming and outgoing) socket, and bind to local source ports. <em>Filters cannot directly create IPv4 and IPv6 TCP or UDP sockets.</em></li>
+
+	<li>Notifications: filters and backends can send notifications via the Darwin <code>notify_post()</code> API.</li>
+
+</ol>
+
+<blockquote><b>Note:</b> The sandbox profile used in CUPS 2.0 still allows some actions that are not listed above - these privileges will be removed over time until the profile matches the list above.</blockquote>
 <h2 class="title"><a name="FUNCTIONS">Functions</a></h2>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.2/OS X 10.5&nbsp;</span><a name="cupsBackChannelRead">cupsBackChannelRead</a></h3>
 <p class="description">Read data from the backchannel.</p>
@@ -1490,7 +1490,7 @@ int httpAddrAny (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">1 if &quot;any&quot;, 0 otherwise</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpAddrClose">httpAddrClose</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpAddrClose">httpAddrClose</a></h3>
 <p class="description">Close a socket created by <a href="#httpAddrConnect"><code>httpAddrConnect</code></a> or
 <a href="#httpAddrListen"><code>httpAddrListen</code></a>.</p>
 <p class="code">
@@ -1820,7 +1820,7 @@ void httpClose (<br>
 <dt>http</dt>
 <dd class="description">HTTP connection</dd>
 </dl>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpCompareCredentials">httpCompareCredentials</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpCompareCredentials">httpCompareCredentials</a></h3>
 <p class="description">Compare two sets of X.509 credentials.</p>
 <p class="code">
 int httpCompareCredentials (<br>
@@ -2107,7 +2107,7 @@ int httpGet (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Status of call (0 = success)</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpGetActivity">httpGetActivity</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpGetActivity">httpGetActivity</a></h3>
 <p class="description">Get the most recent activity for a connection.</p>
 <p class="code">
 time_t httpGetActivity (<br>
@@ -2124,7 +2124,7 @@ time_t httpGetActivity (<br>
 <p class="discussion">The return value is the UNIX time of the last read or write.

 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpGetAddress">httpGetAddress</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpGetAddress">httpGetAddress</a></h3>
 <p class="description">Get the address of the connected peer of a connection.</p>
 <p class="code">
 <a href="#http_addr_t">http_addr_t</a> *httpGetAddress (<br>
@@ -2255,7 +2255,7 @@ time_t httpGetDateTime (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">UNIX time</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpGetEncryption">httpGetEncryption</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpGetEncryption">httpGetEncryption</a></h3>
 <p class="description">Get the current encryption mode of a connection.</p>
 <p class="code">
 <a href="#http_encryption_t">http_encryption_t</a> httpGetEncryption (<br>
@@ -2362,7 +2362,7 @@ Otherwise, return the FQDN for the local system using both gethostname()
 and gethostbyname() to get the local hostname with domain.

 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpGetKeepAlive">httpGetKeepAlive</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpGetKeepAlive">httpGetKeepAlive</a></h3>
 <p class="description">Get the current Keep-Alive state of the connection.</p>
 <p class="code">
 <a href="#http_keepalive_t">http_keepalive_t</a> httpGetKeepAlive (<br>
@@ -2413,7 +2413,7 @@ off_t httpGetLength2 (<br>
 content larger than 2^31 - 1.

 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpGetPending">httpGetPending</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpGetPending">httpGetPending</a></h3>
 <p class="description">Get the number of bytes that are buffered for writing.</p>
 <p class="code">
 size_t httpGetPending (<br>
@@ -2426,7 +2426,7 @@ size_t httpGetPending (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Number of bytes buffered</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpGetReady">httpGetReady</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpGetReady">httpGetReady</a></h3>
 <p class="description">Get the number of bytes that can be read without blocking.</p>
 <p class="code">
 size_t httpGetReady (<br>
@@ -2439,7 +2439,7 @@ size_t httpGetReady (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Number of bytes available</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpGetRemaining">httpGetRemaining</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpGetRemaining">httpGetRemaining</a></h3>
 <p class="description">Get the number of remaining bytes in the message
 body or current chunk.</p>
 <p class="code">
@@ -2584,7 +2584,7 @@ int httpHead (<br>
 default HTTP proxy (if any).</p>
 <p class="code">
 void httpInitialize (void);</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpIsChunked">httpIsChunked</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpIsChunked">httpIsChunked</a></h3>
 <p class="description">Report whether a message body is chunked.</p>
 <p class="code">
 int httpIsChunked (<br>
@@ -2602,7 +2602,7 @@ int httpIsChunked (<br>
 variable-length chunks.

 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpIsEncrypted">httpIsEncrypted</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpIsEncrypted">httpIsEncrypted</a></h3>
 <p class="description">Report whether a connection is encrypted.</p>
 <p class="code">
 int httpIsEncrypted (<br>
@@ -2856,7 +2856,7 @@ int httpReconnect2 (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">0 on success, non-zero on failure</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpResolveHostname">httpResolveHostname</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpResolveHostname">httpResolveHostname</a></h3>
 <p class="description">Resolve the hostname of the HTTP connection
 address.</p>
 <p class="code">
@@ -3109,7 +3109,7 @@ void httpSetField (<br>
 <dt>value</dt>
 <dd class="description">Value</dd>
 </dl>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpSetKeepAlive">httpSetKeepAlive</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpSetKeepAlive">httpSetKeepAlive</a></h3>
 <p class="description">Set the current Keep-Alive state of a connection.</p>
 <p class="code">
 void httpSetKeepAlive (<br>
@@ -3163,7 +3163,7 @@ must be greater than 0</dd>
 data pointer and must return 1 to continue or 0 to error (time) out.

 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpShutdown">httpShutdown</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpShutdown">httpShutdown</a></h3>
 <p class="description">Shutdown one side of an HTTP connection.</p>
 <p class="code">
 void httpShutdown (<br>
@@ -3174,7 +3174,7 @@ void httpShutdown (<br>
 <dt>http</dt>
 <dd class="description">HTTP connection</dd>
 </dl>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpStateString">httpStateString</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpStateString">httpStateString</a></h3>
 <p class="description">Return the string describing a HTTP state value.</p>
 <p class="code">
 const char *httpStateString (<br>
@@ -3219,7 +3219,7 @@ int httpTrace (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Status of call (0 = success)</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="httpURIStatusString">httpURIStatusString</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="httpURIStatusString">httpURIStatusString</a></h3>
 <p class="description">Return a string describing a URI status code.</p>
 <p class="code">
 const char *httpURIStatusString (<br>
@@ -4140,7 +4140,7 @@ int ippCopyAttributes (<br>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">1 on success, 0 on error</p>
 <h4 class="discussion">Discussion</h4>
-<p class="discussion">Zero or more attributes are copied from the source IPP message, @code@ src, to the
+<p class="discussion">Zero or more attributes are copied from the source IPP message, <code>src</code>, to the
 destination IPP message, <code>dst</code>. When <code>quickcopy</code> is non-zero, a &quot;shallow&quot;
 reference copy of the attribute is created - this should only be done as long as the
 original source IPP message will not be freed for the life of the destination.<br>
@@ -5393,7 +5393,7 @@ the <a href="#ippNew"><code>ippNew</code></a>, <a href="#ippNewRequest"><code>ip
 The valid version numbers are currently 1.0, 1.1, 2.0, 2.1, and 2.2.

 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="ippStateString">ippStateString</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="ippStateString">ippStateString</a></h3>
 <p class="description">Return the name corresponding to a state value.</p>
 <p class="code">
 const char *ippStateString (<br>
@@ -5616,7 +5616,7 @@ typedef struct _http_s http_t;
 <p class="code">
 typedef int (*http_timeout_cb_t)(<a href="#http_t">http_t</a> *http, void *user_data);
 </p>
-<h3 class="typedef"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="http_trust_t">http_trust_t</a></h3>
+<h3 class="typedef"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="http_trust_t">http_trust_t</a></h3>
 <p class="description">Level of trust for credentials </p>
 <p class="code">
 typedef enum <a href="#http_trust_e">http_trust_e</a> http_trust_t;
@@ -6018,7 +6018,7 @@ are server-oriented...</p>
 <dt>HTTP_STATUS_USE_PROXY </dt>
 <dd class="description">Must use a proxy to access this URI</dd>
 </dl>
-<h3 class="enumeration"><span class="info">&nbsp;CUPS 2.0&nbsp;</span><a name="http_trust_e">http_trust_e</a></h3>
+<h3 class="enumeration"><span class="info">&nbsp;CUPS 2.0/OS 10.10&nbsp;</span><a name="http_trust_e">http_trust_e</a></h3>
 <p class="description">Level of trust for credentials </p>
 <h4 class="constants">Constants</h4>
 <dl>
@@ -71,9 +71,12 @@ ipptool - perform internet printing protocol requests
 <b>ipptool</b>
 sends IPP requests to the specified
 <i>printer-uri</i>
-and tests and/or displays the results. Each named
+and tests and/or displays the results.
+Each named
 <i>testfile</i>
-defines one or more requests, including the expected response status, attributes, and values. Output is either a plain text, formatted text, CSV, or XML report on the standard output, with a non-zero exit status indicating that one or more tests have failed. The
+defines one or more requests, including the expected response status, attributes, and values.
+Output is either a plain text, formatted text, CSV, or XML report on the standard output, with a non-zero exit status indicating that one or more tests have failed.
+The
 <i>testfile</i>
 format is described in
 <a href="man-ipptoolfile.html?TOPIC=Man+Pages"><b>ipptoolfile</b>(5).</a>
@@ -102,7 +105,8 @@ must connect to the printer or server using IPv4.
 <b>ipptool</b>
 must connect to the printer or server using IPv6.
 <dt><b>-C</b>
-<dd style="margin-left: 5.0em">Specifies that requests should be sent using the HTTP/1.1 "Transfer-Encoding: chunked" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
+<dd style="margin-left: 5.0em">Specifies that requests should be sent using the HTTP/1.1 "Transfer-Encoding: chunked" header, which is required for conformance by all versions of IPP.
+The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
 <dt><b>-E</b>
 <dd style="margin-left: 5.0em">Forces TLS encryption when connecting to the server using the HTTP "Upgrade" header.
 <dt><b>-I</b>
@@ -110,9 +114,11 @@ must connect to the printer or server using IPv6.
 <b>ipptool</b>
 will continue past errors.
 <dt><b>-L</b>
-<dd style="margin-left: 5.0em">Specifies that requests should be sent using the HTTP/1.0 "Content-Length:" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
+<dd style="margin-left: 5.0em">Specifies that requests should be sent using the HTTP/1.0 "Content-Length:" header, which is required for conformance by all versions of IPP.
+The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
 <dt><b>-P</b><i> filename.plist</i>
-<dd style="margin-left: 5.0em">Specifies that the test results should be written to the named XML (Apple plist) file in addition to the plain text report. This option is incompatible with the <b>-i</b> (interval) and <b>-n</b> (repeat-count) options.
+<dd style="margin-left: 5.0em">Specifies that the test results should be written to the named XML (Apple plist) file in addition to the regular test report (<b>-t</b>).
+This option is incompatible with the <b>-i</b> (interval) and <b>-n</b> (repeat-count) options.
 <dt><b>-S</b>
 <dd style="margin-left: 5.0em">Forces (dedicated) TLS encryption when connecting to the server.
 <dt><b>-T</b><i> seconds</i>
@@ -120,7 +126,8 @@ will continue past errors.
 <dt><b>-V</b><i> version</i>
 <dd style="margin-left: 5.0em">Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not specified, version 1.1 is used.
 <dt><b>-X</b>
-<dd style="margin-left: 5.0em">Specifies that XML (Apple plist) output is desired instead of the plain text report. This option is incompatible with the <b>-i</b> (interval) and <b>-n</b> (repeat-count) options.
+<dd style="margin-left: 5.0em">Specifies that XML (Apple plist) output is desired instead of the plain text report.
+This option is incompatible with the <b>-i</b> (interval) and <b>-n</b> (repeat-count) options.
 <dt><b>-c</b>
 <dd style="margin-left: 5.0em">Specifies that CSV (comma-separated values) output is desired instead of the plain text output.
 <dt><b>-d</b><i> name=value</i>
@@ -130,17 +137,22 @@ will continue past errors.
 <dt><b>-i</b><i> seconds</i>
 <dd style="margin-left: 5.0em">Specifies that the (last)
 <i>testfile</i>
-should be repeated at the specified interval. This option is incompatible with the <b>-X</b> (XML plist output) option.
+should be repeated at the specified interval.
+This option is incompatible with the <b>-X</b> (XML plist output) option.
 <dt><b>-l</b>
 <dd style="margin-left: 5.0em">Specifies that plain text output is desired.
 <dt><b>-n</b><i> repeat-count</i>
 <dd style="margin-left: 5.0em">Specifies that the (last)
 <i>testfile</i>
-should be repeated the specified number of times. This option is incompatible with the <i>-X</i> (XML plist output) option.
+should be repeated the specified number of times.
+This option is incompatible with the <i>-X</i> (XML plist output) option.
+<dt><b>-q</b>
+<dd style="margin-left: 5.0em">Be quiet and produce no output.
 <dt><b>-t</b>
 <dd style="margin-left: 5.0em">Specifies that CUPS test report output is desired instead of the plain text output.
 <dt><b>-v</b>
-<dd style="margin-left: 5.0em">Specifies that all request and response attributes should be output in CUPS test mode (<b>-t</b>). This is the default for XML output.
+<dd style="margin-left: 5.0em">Specifies that all request and response attributes should be output in CUPS test mode (<b>-t</b>).
+This is the default for XML output.
 </dl>
 <h2 class="title"><a name="EXIT_STATUS">Exit Status</a></h2>
 The
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: raster.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * Raster file routines for CUPS.
 *
@@ -378,7 +378,7 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
      if (!cups_raster_read(r, &byte, 1))
 	return (0);

-      r->count = byte + 1;
+      r->count = (unsigned)byte + 1;

      if (r->count > 1)
 	ptr = r->pixels;
@@ -418,7 +418,7 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
 	  * Repeat the next N bytes...
 	  */

-          count = (byte + 1) * r->bpp;
+          count = ((unsigned)byte + 1) * r->bpp;
          if (count > (unsigned)bytes)
 	    count = (unsigned)bytes;

@@ -1448,5 +1448,5 @@ cups_write_fd(void          *ctx,	/* I - File descriptor pointer */


 /*
- * End of "$Id: raster.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: raster.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertoepson.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: rastertoepson.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * EPSON ESC/P and ESC/P2 filter for CUPS.
 *
@@ -201,14 +201,14 @@ StartPage(
        if (Model < EPSON_ICOLOR)
 	{
 	  pwrite("\033(U\001\000", 5);		/* Resolution/units */
-	  putchar(3600 / header->HWResolution[1]);
+	  putchar((int)(3600 / header->HWResolution[1]));
        }
 	else
 	{
 	  pwrite("\033(U\005\000", 5);
-	  putchar(1440 / header->HWResolution[1]);
-	  putchar(1440 / header->HWResolution[1]);
-	  putchar(1440 / header->HWResolution[0]);
+	  putchar((int)(1440 / header->HWResolution[1]));
+	  putchar((int)(1440 / header->HWResolution[1]));
+	  putchar((int)(1440 / header->HWResolution[0]));
 	  putchar(0xa0);	/* n/1440ths... */
 	  putchar(0x05);
 	}
@@ -811,8 +811,8 @@ OutputRows(
    {
      putchar(0x1b);
      putchar('$');
-      putchar(i & 255);
-      putchar(i >> 8);
+      putchar((int)(i & 255));
+      putchar((int)(i >> 8));
    }

   /*
@@ -853,8 +853,8 @@ OutputRows(
    }

    n = dot_count / DotBytes;
-    putchar(n & 255);
-    putchar(n / 256);
+    putchar((int)(n & 255));
+    putchar((int)(n / 256));

   /*
    * Write the graphics data...
@@ -883,8 +883,8 @@ OutputRows(
      {
 	putchar(0x1b);
 	putchar('$');
-	putchar(i & 255);
-	putchar(i >> 8);
+	putchar((int)(i & 255));
+	putchar((int)(i >> 8));
      }

      if (header->HWResolution[0] == 120)
@@ -893,8 +893,8 @@ OutputRows(
      	printf("\033*\003");		/* Select bit image */

      n = (unsigned)dot_count / DotBytes;
-      putchar(n & 255);
-      putchar(n / 256);
+      putchar((int)(n & 255));
+      putchar((int)(n / 256));

      for (n = dot_count / 2, ptr = dot_ptr + 1; n > 0; n --, ptr += 2)
      {
@@ -1138,5 +1138,5 @@ main(int  argc,				/* I - Number of command-line arguments */


 /*
- * End of "$Id: rastertoepson.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: rastertoepson.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -189,6 +189,7 @@
 "  --domain regex          Match domain to regular expression." = "  --domain regex          Match domain to regular expression.";
 "  --exec utility [argument ...] ;\n                          Execute program if true." = "  --exec utility [argument ...] ;\n                          Execute program if true.";
 "  --false                 Always false." = "  --false                 Always false.";
+"  --help                  Show help." = "  --help                  Show help.";
 "  --help                  Show this help." = "  --help                  Show this help.";
 "  --host regex            Match hostname to regular expression." = "  --host regex            Match hostname to regular expression.";
 "  --lf                    End lines with LF (UNIX/Linux/OS X)." = "  --lf                    End lines with LF (UNIX/Linux/OS X).";
@@ -203,11 +204,13 @@
 "  --print-name            Print service name if true." = "  --print-name            Print service name if true.";
 "  --quiet                 Quietly report match via exit code." = "  --quiet                 Quietly report match via exit code.";
 "  --remote                True if service is remote." = "  --remote                True if service is remote.";
+"  --stop-after-include-error\n                          Stop tests after a failed INCLUDE." = "  --stop-after-include-error\n                          Stop tests after a failed INCLUDE.";
 "  --true                  Always true." = "  --true                  Always true.";
 "  --txt key               True if the TXT record contains the key." = "  --txt key               True if the TXT record contains the key.";
 "  --txt-* regex           Match TXT record key to regular expression." = "  --txt-* regex           Match TXT record key to regular expression.";
 "  --uri regex             Match URI to regular expression." = "  --uri regex             Match URI to regular expression.";
 "  --version               Show program version." = "  --version               Show program version.";
+"  --version               Show version." = "  --version               Show version.";
 "  -4                      Connect using IPv4." = "  -4                      Connect using IPv4.";
 "  -6                      Connect using IPv6." = "  -6                      Connect using IPv6.";
 "  -C                      Send requests using chunking (default)." = "  -C                      Send requests using chunking (default).";
@@ -221,6 +224,7 @@
 "  -I include-dir          Add include directory to search path." = "  -I include-dir          Add include directory to search path.";
 "  -I {filename,filters,none,profiles}" = "  -I {filename,filters,none,profiles}";
 "  -L                      Send requests using content-length." = "  -L                      Send requests using content-length.";
+"  -P filename.plist       Produce XML plist to a file and test report to standard output." = "  -P filename.plist       Produce XML plist to a file and test report to standard output.";
 "  -P filename.ppd         Set PPD file." = "  -P filename.ppd         Set PPD file.";
 "  -P number[-number]      Match port to number or range." = "  -P number[-number]      Match port to number or range.";
 "  -R root-directory       Set alternate root." = "  -R root-directory       Set alternate root.";
@@ -233,6 +237,7 @@
 "  -X                      Produce XML plist instead of plain text." = "  -X                      Produce XML plist instead of plain text.";
 "  -a                      Browse for all services." = "  -a                      Browse for all services.";
 "  -a                      Export all printers." = "  -a                      Export all printers.";
+"  -c                      Produce CSV output." = "  -c                      Produce CSV output.";
 "  -c catalog.po           Load the specified message catalog." = "  -c catalog.po           Load the specified message catalog.";
 "  -c cups-files.conf      Set cups-files.conf file to use." = "  -c cups-files.conf      Set cups-files.conf file to use.";
 "  -c cupsd.conf           Set cupsd.conf file to use." = "  -c cupsd.conf           Set cupsd.conf file to use.";
@@ -251,6 +256,7 @@
 "  -i seconds              Repeat the last file with the given time interval." = "  -i seconds              Repeat the last file with the given time interval.";
 "  -j job-id[,N]           Filter file N from the specified job (default is file 1)." = "  -j job-id[,N]           Filter file N from the specified job (default is file 1).";
 "  -l                      List attributes." = "  -l                      List attributes.";
+"  -l                      Produce plain text output." = "  -l                      Produce plain text output.";
 "  -l                      Run cupsd on demand." = "  -l                      Run cupsd on demand.";
 "  -l lang[,lang,...]      Specify the output language(s) (locale)." = "  -l lang[,lang,...]      Specify the output language(s) (locale).";
 "  -m                      Use the ModelName value as the filename." = "  -m                      Use the ModelName value as the filename.";
@@ -602,7 +608,6 @@
 "7 inches/sec." = "7 inches/sec.";
 "7 x 9" = "7 x 9";
 "70" = "70";
-"720dpi" = "720dpi";
 "75" = "75";
 "8" = "8";
 "8 inches/sec." = "8 inches/sec.";
@@ -1008,8 +1013,6 @@
 "Name OID uses indefinite length" = "Name OID uses indefinite length";
 "Nested classes are not allowed." = "Nested classes are not allowed.";
 "Never" = "Never";
-"New Stylus Color Series" = "New Stylus Color Series";
-"New Stylus Photo Series" = "New Stylus Photo Series";
 "No" = "No";
 "No Content" = "No Content";
 "No PPD name" = "No PPD name";
@@ -1164,8 +1167,6 @@
 "Starting Banner" = "Starting Banner";
 "Starting page %d." = "Starting page %d.";
 "Statement" = "Statement";
-"Stylus Color Series" = "Stylus Color Series";
-"Stylus Photo Series" = "Stylus Photo Series";
 "Subscription #%d does not exist." = "Subscription #%d does not exist.";
 "Substitutions:" = "Substitutions:";
 "Super A" = "Super A";
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-06-26 14:29-0400\n"
+"POT-Creation-Date: 2014-08-29 22:25-0400\n"
 "PO-Revision-Date: 2012-09-29 11:21+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -973,6 +973,9 @@ msgstr ""
 msgid "  --false                 Always false."
 msgstr ""

+msgid "  --help                  Show help."
+msgstr ""
+
 msgid "  --help                  Show this help."
 msgstr ""

@@ -1015,6 +1018,11 @@ msgstr ""
 msgid "  --remote                True if service is remote."
 msgstr ""

+msgid ""
+"  --stop-after-include-error\n"
+"                          Stop tests after a failed INCLUDE."
+msgstr ""
+
 msgid "  --true                  Always true."
 msgstr ""

@@ -1030,6 +1038,9 @@ msgstr ""
 msgid "  --version               Show program version."
 msgstr ""

+msgid "  --version               Show version."
+msgstr ""
+
 msgid "  -4                      Connect using IPv4."
 msgstr "  -4                      Connecta fent servir IPv4."

@@ -1075,6 +1086,11 @@ msgid "  -L                      Send requests using content-length."
 msgstr ""
 "  -L                      Envia les peticions fent servir content-length."

+msgid ""
+"  -P filename.plist       Produce XML plist to a file and test report to "
+"standard output."
+msgstr ""
+
 msgid "  -P filename.ppd         Set PPD file."
 msgstr "  -P nomfitxer.ppd         Estableix el fitxer PPD."

@@ -1118,6 +1134,9 @@ msgstr ""
 msgid "  -a                      Export all printers."
 msgstr "  -a                      Exporta totes les impressores."

+msgid "  -c                      Produce CSV output."
+msgstr ""
+
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catàleg.po           Carrega el catàleg de missatges indicat."

@@ -1183,6 +1202,9 @@ msgstr ""
 msgid "  -l                      List attributes."
 msgstr ""

+msgid "  -l                      Produce plain text output."
+msgstr ""
+
 msgid "  -l                      Run cupsd on demand."
 msgstr ""

@@ -2422,9 +2444,6 @@ msgstr "7 x 9"
 msgid "70"
 msgstr "70"

-msgid "720dpi"
-msgstr "720ppp"
-
 msgid "75"
 msgstr "75"

@@ -3734,12 +3753,6 @@ msgstr "No es permeten les classes imbricades."
 msgid "Never"
 msgstr "Mai"

-msgid "New Stylus Color Series"
-msgstr "Sèrie New Stylus Color"
-
-msgid "New Stylus Photo Series"
-msgstr "Sèrie New Stylus Photo"
-
 msgid "No"
 msgstr "No"

@@ -4217,12 +4230,6 @@ msgstr "S'està començant la pàgina %d."
 msgid "Statement"
 msgstr "Declaració"

-msgid "Stylus Color Series"
-msgstr "Sèrie Stylus Color"
-
-msgid "Stylus Photo Series"
-msgstr "Sèrie Stylus Photo"
-
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "La subscripció #%d no existeix."
@@ -6080,6 +6087,9 @@ msgstr "La variable-bindings fa servir una longitud indefinida"
 #~ msgid "3.5\" Disk - 2 1/8 x 2 3/4\""
 #~ msgstr "Disc de 3.5 - 2 1/8 x 2 3/4\""

+#~ msgid "720dpi"
+#~ msgstr "720ppp"
+
 #~ msgid "Address - 1 1/8 x 3 1/2\""
 #~ msgstr "Adreça - 1 1/8 x 3 1/2\""

@@ -6117,6 +6127,12 @@ msgstr "La variable-bindings fa servir una longitud indefinida"
 #~ msgid "Large Address - 1 4/10 x 3 1/2\""
 #~ msgstr "Adreça gran - 1 4/10 x 3 1/2\""

+#~ msgid "New Stylus Color Series"
+#~ msgstr "Sèrie New Stylus Color"
+
+#~ msgid "New Stylus Photo Series"
+#~ msgstr "Sèrie New Stylus Photo"
+
 #~ msgid "Output for printer %s is sent to %s"
 #~ msgstr "La sortida de la impressora %s s'envia a %s"

@@ -6181,6 +6197,12 @@ msgstr "La variable-bindings fa servir una longitud indefinida"
 #~ msgid "Shipping Address - 2 5/16 x 4\""
 #~ msgstr "Adreça de lliurament - 2 5/16 x 4\""

+#~ msgid "Stylus Color Series"
+#~ msgstr "Sèrie Stylus Color"
+
+#~ msgid "Stylus Photo Series"
+#~ msgstr "Sèrie Stylus Photo"
+
 #~ msgid "The output bin is almost full."
 #~ msgstr "La safata de sortida és gairebé plena."

@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-06-26 14:29-0400\n"
+"POT-Creation-Date: 2014-08-29 22:25-0400\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
@@ -826,6 +826,9 @@ msgstr ""
 msgid "  --false                 Always false."
 msgstr ""

+msgid "  --help                  Show help."
+msgstr ""
+
 msgid "  --help                  Show this help."
 msgstr ""

@@ -868,6 +871,11 @@ msgstr ""
 msgid "  --remote                True if service is remote."
 msgstr ""

+msgid ""
+"  --stop-after-include-error\n"
+"                          Stop tests after a failed INCLUDE."
+msgstr ""
+
 msgid "  --true                  Always true."
 msgstr ""

@@ -883,6 +891,9 @@ msgstr ""
 msgid "  --version               Show program version."
 msgstr ""

+msgid "  --version               Show version."
+msgstr ""
+
 msgid "  -4                      Connect using IPv4."
 msgstr ""

@@ -923,6 +934,11 @@ msgstr ""
 msgid "  -L                      Send requests using content-length."
 msgstr ""

+msgid ""
+"  -P filename.plist       Produce XML plist to a file and test report to "
+"standard output."
+msgstr ""
+
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""

@@ -961,6 +977,9 @@ msgstr ""
 msgid "  -a                      Export all printers."
 msgstr ""

+msgid "  -c                      Produce CSV output."
+msgstr ""
+
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""

@@ -1018,6 +1037,9 @@ msgstr ""
 msgid "  -l                      List attributes."
 msgstr ""

+msgid "  -l                      Produce plain text output."
+msgstr ""
+
 msgid "  -l                      Run cupsd on demand."
 msgstr ""

@@ -2234,9 +2256,6 @@ msgstr ""
 msgid "70"
 msgstr "70"

-msgid "720dpi"
-msgstr "720 dpi"
-
 msgid "75"
 msgstr "75"

@@ -3524,12 +3543,6 @@ msgstr ""
 msgid "Never"
 msgstr "Nikdy"

-msgid "New Stylus Color Series"
-msgstr "New Stylus Color Series"
-
-msgid "New Stylus Photo Series"
-msgstr "New Stylus Photo Series"
-
 msgid "No"
 msgstr "Ne"

@@ -4003,12 +4016,6 @@ msgstr ""
 msgid "Statement"
 msgstr "Prohlášení"

-msgid "Stylus Color Series"
-msgstr "Stylus Color Series"
-
-msgid "Stylus Photo Series"
-msgstr "Stylus Photo Series"
-
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
@@ -5675,6 +5682,9 @@ msgstr "nepojmenovaný"
 msgid "variable-bindings uses indefinite length"
 msgstr "\"variable-bindings\" má neomezenou délku"

+#~ msgid "720dpi"
+#~ msgstr "720 dpi"
+
 #~ msgid "Enter old password:"
 #~ msgstr "Zadejte původní heslo:"

@@ -5684,5 +5694,17 @@ msgstr "\"variable-bindings\" má neomezenou délku"
 #~ msgid "Enter password:"
 #~ msgstr "Zadejte heslo:"

+#~ msgid "New Stylus Color Series"
+#~ msgstr "New Stylus Color Series"
+
+#~ msgid "New Stylus Photo Series"
+#~ msgstr "New Stylus Photo Series"
+
 #~ msgid "Purge Jobs"
 #~ msgstr "Výmaz úloh"
+
+#~ msgid "Stylus Color Series"
+#~ msgstr "Stylus Color Series"
+
+#~ msgid "Stylus Photo Series"
+#~ msgstr "Stylus Photo Series"
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-06-26 14:29-0400\n"
+"POT-Creation-Date: 2014-08-29 22:25-0400\n"
 "PO-Revision-Date: 2012-07-01 20:21+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <riopedre13@yahoo.es>\n"
 "Language-Team: Spanish\n"
@@ -965,6 +965,9 @@ msgstr ""
 msgid "  --false                 Always false."
 msgstr ""

+msgid "  --help                  Show help."
+msgstr ""
+
 msgid "  --help                  Show this help."
 msgstr ""

@@ -1007,6 +1010,11 @@ msgstr ""
 msgid "  --remote                True if service is remote."
 msgstr ""

+msgid ""
+"  --stop-after-include-error\n"
+"                          Stop tests after a failed INCLUDE."
+msgstr ""
+
 msgid "  --true                  Always true."
 msgstr ""

@@ -1022,6 +1030,9 @@ msgstr ""
 msgid "  --version               Show program version."
 msgstr ""

+msgid "  --version               Show version."
+msgstr ""
+
 msgid "  -4                      Connect using IPv4."
 msgstr "  -4                      Conectar usando IPv4."

@@ -1067,6 +1078,11 @@ msgstr "  -I {filename,filters,none,profiles}"
 msgid "  -L                      Send requests using content-length."
 msgstr "  -L                      Envía peticiones usando content-length."

+msgid ""
+"  -P filename.plist       Produce XML plist to a file and test report to "
+"standard output."
+msgstr ""
+
 msgid "  -P filename.ppd         Set PPD file."
 msgstr "  -P nombre_archivo.ppd         Establece archivo PPD."

@@ -1110,6 +1126,9 @@ msgstr ""
 msgid "  -a                      Export all printers."
 msgstr "  -a                      Exporta todas las impresoras."

+msgid "  -c                      Produce CSV output."
+msgstr ""
+
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catálogo.po           Carga el catálogo de mensajes especificado."

@@ -1174,6 +1193,9 @@ msgstr ""
 msgid "  -l                      List attributes."
 msgstr ""

+msgid "  -l                      Produce plain text output."
+msgstr ""
+
 msgid "  -l                      Run cupsd on demand."
 msgstr ""

@@ -2411,9 +2433,6 @@ msgstr "7 x 9"
 msgid "70"
 msgstr "70"

-msgid "720dpi"
-msgstr "720ppp"
-
 msgid "75"
 msgstr "75"

@@ -3721,12 +3740,6 @@ msgstr "No se permiten clases anidadas."
 msgid "Never"
 msgstr "Nunca"

-msgid "New Stylus Color Series"
-msgstr "Nueva Stylus Color Series"
-
-msgid "New Stylus Photo Series"
-msgstr "Nueva Stylus Photo Series"
-
 msgid "No"
 msgstr "No"

@@ -4203,12 +4216,6 @@ msgstr "Iniciando página %d."
 msgid "Statement"
 msgstr "Declaración"

-msgid "Stylus Color Series"
-msgstr "Stylus Color Series"
-
-msgid "Stylus Photo Series"
-msgstr "Stylus Photo Series"
-
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "Subscripción #%d no existe."
@@ -5993,6 +6000,9 @@ msgstr "variable-bindings usa una longitud indefinida"
 #~ msgid "%s: Error - expected destination after \"-b\" option."
 #~ msgstr "%s: Error - se esperaba un destino tras la opción \"-b\"."

+#~ msgid "720dpi"
+#~ msgstr "720ppp"
+
 #~ msgid "Bad printer URI."
 #~ msgstr "URI de impresora incorrecto."

@@ -6005,6 +6015,12 @@ msgstr "variable-bindings usa una longitud indefinida"
 #~ msgid "Enter password:"
 #~ msgstr "Introduzca la contraseña:"

+#~ msgid "New Stylus Color Series"
+#~ msgstr "Nueva Stylus Color Series"
+
+#~ msgid "New Stylus Photo Series"
+#~ msgstr "Nueva Stylus Photo Series"
+
 #~ msgid "Output for printer %s is sent to %s"
 #~ msgstr "La salida de la impresora %s se ha enviado a %s"

@@ -6040,6 +6056,12 @@ msgstr "variable-bindings usa una longitud indefinida"
 #~ msgstr ""
 #~ "Rango  Propiet.   Pri  Trabajo    Archivos                    Tamaño total"

+#~ msgid "Stylus Color Series"
+#~ msgstr "Stylus Color Series"
+
+#~ msgid "Stylus Photo Series"
+#~ msgstr "Stylus Photo Series"
+
 #~ msgid "The output bin is almost full."
 #~ msgstr "Recipiente de salida casi lleno"

@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-06-26 14:29-0400\n"
+"POT-Creation-Date: 2014-08-29 22:25-0400\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -826,6 +826,9 @@ msgstr ""
 msgid "  --false                 Always false."
 msgstr ""

+msgid "  --help                  Show help."
+msgstr ""
+
 msgid "  --help                  Show this help."
 msgstr ""

@@ -868,6 +871,11 @@ msgstr ""
 msgid "  --remote                True if service is remote."
 msgstr ""

+msgid ""
+"  --stop-after-include-error\n"
+"                          Stop tests after a failed INCLUDE."
+msgstr ""
+
 msgid "  --true                  Always true."
 msgstr ""

@@ -883,6 +891,9 @@ msgstr ""
 msgid "  --version               Show program version."
 msgstr ""

+msgid "  --version               Show version."
+msgstr ""
+
 msgid "  -4                      Connect using IPv4."
 msgstr ""

@@ -923,6 +934,11 @@ msgstr ""
 msgid "  -L                      Send requests using content-length."
 msgstr ""

+msgid ""
+"  -P filename.plist       Produce XML plist to a file and test report to "
+"standard output."
+msgstr ""
+
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""

@@ -961,6 +977,9 @@ msgstr ""
 msgid "  -a                      Export all printers."
 msgstr ""

+msgid "  -c                      Produce CSV output."
+msgstr ""
+
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""

@@ -1018,6 +1037,9 @@ msgstr ""
 msgid "  -l                      List attributes."
 msgstr ""

+msgid "  -l                      Produce plain text output."
+msgstr ""
+
 msgid "  -l                      Run cupsd on demand."
 msgstr ""

@@ -2234,9 +2256,6 @@ msgstr ""
 msgid "70"
 msgstr "70"

-msgid "720dpi"
-msgstr "720 ppp"
-
 msgid "75"
 msgstr "75"

@@ -3521,12 +3540,6 @@ msgstr ""
 msgid "Never"
 msgstr "Jamais"

-msgid "New Stylus Color Series"
-msgstr "Nouvelles série Stylus Color"
-
-msgid "New Stylus Photo Series"
-msgstr "Nouvelles série Stylus Photo"
-
 msgid "No"
 msgstr "Non"

@@ -4000,12 +4013,6 @@ msgstr ""
 msgid "Statement"
 msgstr "Déclaration"

-msgid "Stylus Color Series"
-msgstr "Série Stylus Color"
-
-msgid "Stylus Photo Series"
-msgstr "Série Stylus Photo"
-
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
@@ -5677,6 +5684,9 @@ msgstr "sans titre"
 msgid "variable-bindings uses indefinite length"
 msgstr ""

+#~ msgid "720dpi"
+#~ msgstr "720 ppp"
+
 #~ msgid "Enter old password:"
 #~ msgstr "Ancien mot de passe :"

@@ -5686,5 +5696,17 @@ msgstr ""
 #~ msgid "Enter password:"
 #~ msgstr "Entrez le nouveau mot de passe :"

+#~ msgid "New Stylus Color Series"
+#~ msgstr "Nouvelles série Stylus Color"
+
+#~ msgid "New Stylus Photo Series"
+#~ msgstr "Nouvelles série Stylus Photo"
+
 #~ msgid "Purge Jobs"
 #~ msgstr "Purger les tâches"
+
+#~ msgid "Stylus Color Series"
+#~ msgstr "Série Stylus Color"
+
+#~ msgid "Stylus Photo Series"
+#~ msgstr "Série Stylus Photo"
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-06-26 14:29-0400\n"
+"POT-Creation-Date: 2014-08-29 22:25-0400\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -974,6 +974,9 @@ msgstr ""
 msgid "  --false                 Always false."
 msgstr "  --false                 Sempre falso."

+msgid "  --help                  Show help."
+msgstr ""
+
 msgid "  --help                  Show this help."
 msgstr "  --help                  Mostra questo aiuto."

@@ -1026,6 +1029,11 @@ msgstr ""
 msgid "  --remote                True if service is remote."
 msgstr "  --remote                Vero se il servizio è remoto."

+msgid ""
+"  --stop-after-include-error\n"
+"                          Stop tests after a failed INCLUDE."
+msgstr ""
+
 msgid "  --true                  Always true."
 msgstr "  --true                  Sempre vero."

@@ -1044,6 +1052,9 @@ msgstr ""
 msgid "  --version               Show program version."
 msgstr "  --version               Mostra la versione del programma."

+msgid "  --version               Show version."
+msgstr ""
+
 msgid "  -4                      Connect using IPv4."
 msgstr "  -4                      Connetti utilizzando IPv4."

@@ -1089,6 +1100,11 @@ msgstr "  -I {file,filtri,nessuno,profili}"
 msgid "  -L                      Send requests using content-length."
 msgstr "  -L                      Invia richieste utilizzando content-length."

+msgid ""
+"  -P filename.plist       Produce XML plist to a file and test report to "
+"standard output."
+msgstr ""
+
 msgid "  -P filename.ppd         Set PPD file."
 msgstr "  -P filename.ppd         Imposta il file PPD."

@@ -1134,6 +1150,9 @@ msgstr "  -a                      Mostra tutti i servizi."
 msgid "  -a                      Export all printers."
 msgstr "  -a                      Esporta tutte le stampanti."

+msgid "  -c                      Produce CSV output."
+msgstr ""
+
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 "  -c catalog.po           Carica il catalogo del messaggio specificato."
@@ -1202,6 +1221,9 @@ msgstr ""
 msgid "  -l                      List attributes."
 msgstr "  -l                      Elenca gli attributi."

+msgid "  -l                      Produce plain text output."
+msgstr ""
+
 msgid "  -l                      Run cupsd on demand."
 msgstr ""

@@ -2500,9 +2522,6 @@ msgstr "7 x 9"
 msgid "70"
 msgstr "70"

-msgid "720dpi"
-msgstr "720dpi"
-
 msgid "75"
 msgstr "75"

@@ -3808,12 +3827,6 @@ msgstr "Le classi nidificate non sono consentite."
 msgid "Never"
 msgstr "Mai"

-msgid "New Stylus Color Series"
-msgstr "Nuova Stylus Color Series"
-
-msgid "New Stylus Photo Series"
-msgstr "Nuova Stylus Photo Series"
-
 msgid "No"
 msgstr "No"

@@ -4291,12 +4304,6 @@ msgstr "Pagina iniziale %d."
 msgid "Statement"
 msgstr "Rapporto"

-msgid "Stylus Color Series"
-msgstr "Stylus Color Series"
-
-msgid "Stylus Photo Series"
-msgstr "Stylus Photo Series"
-
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "La sottoscrizione #%d non esiste."
@@ -6066,6 +6073,9 @@ msgstr "variable-bindings utilizza una lunghezza indefinita"
 #~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 #~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f byte"

+#~ msgid "720dpi"
+#~ msgstr "720dpi"
+
 #~ msgid "Bad printer URI."
 #~ msgstr "L'URI della stampante non è valido."

@@ -6078,6 +6088,12 @@ msgstr "variable-bindings utilizza una lunghezza indefinita"
 #~ msgid "Enter password:"
 #~ msgstr "Digitare la password:"

+#~ msgid "New Stylus Color Series"
+#~ msgstr "Nuova Stylus Color Series"
+
+#~ msgid "New Stylus Photo Series"
+#~ msgstr "Nuova Stylus Photo Series"
+
 #~ msgid "Output for printer %s is sent to %s"
 #~ msgstr "L'output della stampante %s è stato inviato a %s"

@@ -6104,6 +6120,12 @@ msgstr "variable-bindings utilizza una lunghezza indefinita"
 #~ msgstr ""
 #~ "Rank   Owner      Pri  Job        Files                       Total Size"

+#~ msgid "Stylus Color Series"
+#~ msgstr "Stylus Color Series"
+
+#~ msgid "Stylus Photo Series"
+#~ msgstr "Stylus Photo Series"
+
 #~ msgid "The output bin is almost full."
 #~ msgstr "Il raccoglitore di uscita è quasi pieno."

@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.7\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-06-26 14:29-0400\n"
+"POT-Creation-Date: 2014-08-29 22:25-0400\n"
 "PO-Revision-Date: 2013-08-19 11:51+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -972,6 +972,9 @@ msgstr ""
 msgid "  --false                 Always false."
 msgstr "  --false                 常に失敗。"

+msgid "  --help                  Show help."
+msgstr ""
+
 msgid "  --help                  Show this help."
 msgstr "  --help                  このヘルプを表示する。"

@@ -1016,6 +1019,11 @@ msgstr ""
 msgid "  --remote                True if service is remote."
 msgstr "  --remote                サービスがリモートなら真。"

+msgid ""
+"  --stop-after-include-error\n"
+"                          Stop tests after a failed INCLUDE."
+msgstr ""
+
 msgid "  --true                  Always true."
 msgstr "  --true                  常に真。"

@@ -1032,6 +1040,9 @@ msgstr "  --uri <正規表現>        URI が正規表現とマッチするか
 msgid "  --version               Show program version."
 msgstr "  --version               プログラムのバージョンを表示。"

+msgid "  --version               Show version."
+msgstr ""
+
 msgid "  -4                      Connect using IPv4."
 msgstr "  -4                      IPv4 で接続する。"

@@ -1078,6 +1089,11 @@ msgstr "  -I {filename,filters,none,profiles}"
 msgid "  -L                      Send requests using content-length."
 msgstr "  -L                      content-length を用いてリクエストを送る。"

+msgid ""
+"  -P filename.plist       Produce XML plist to a file and test report to "
+"standard output."
+msgstr ""
+
 msgid "  -P filename.ppd         Set PPD file."
 msgstr "  -P filename.ppd         PPD ファイルを指定する。"

@@ -1119,6 +1135,9 @@ msgstr "  -a                      すべてのサービスをブラウズする
 msgid "  -a                      Export all printers."
 msgstr "  -a                      すべてのプリンターをエクスポートする。"

+msgid "  -c                      Produce CSV output."
+msgstr ""
+
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catalog.po           指定したメッセージカタログをロードする。"

@@ -1183,6 +1202,9 @@ msgstr ""
 msgid "  -l                      List attributes."
 msgstr "  -l                      属性の一覧を表示する。"

+msgid "  -l                      Produce plain text output."
+msgstr ""
+
 msgid "  -l                      Run cupsd on demand."
 msgstr ""

@@ -2454,9 +2476,6 @@ msgstr "7 x 9 インチ"
 msgid "70"
 msgstr "70"

-msgid "720dpi"
-msgstr "720dpi"
-
 msgid "75"
 msgstr "75"

@@ -3766,12 +3785,6 @@ msgstr "入れ子になったクラスは許可されていません。"
 msgid "Never"
 msgstr "Never"

-msgid "New Stylus Color Series"
-msgstr "New Stylus Color シリーズ"
-
-msgid "New Stylus Photo Series"
-msgstr "New Stylus Photo シリーズ"
-
 msgid "No"
 msgstr "いいえ"

@@ -4247,12 +4260,6 @@ msgstr "ページ %d を開始しています。"
 msgid "Statement"
 msgstr "記述"

-msgid "Stylus Color Series"
-msgstr "Stylus Color シリーズ"
-
-msgid "Stylus Photo Series"
-msgstr "Stylus Photo シリーズ"
-
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "サブスクリプション番号 %d は存在しません。"
@@ -6051,6 +6058,9 @@ msgstr "variable-bindings の長さが不定"
 #~ msgid "%s: Error - expected destination after \"-b\" option."
 #~ msgstr "%s: エラー - \"-b\" オプションのあとに宛先が必要です。"

+#~ msgid "720dpi"
+#~ msgstr "720dpi"
+
 #~ msgid "Bad printer URI."
 #~ msgstr "不正なプリンター URI です。"

@@ -6063,6 +6073,12 @@ msgstr "variable-bindings の長さが不定"
 #~ msgid "Enter password:"
 #~ msgstr "パスワードを入力:"

+#~ msgid "New Stylus Color Series"
+#~ msgstr "New Stylus Color シリーズ"
+
+#~ msgid "New Stylus Photo Series"
+#~ msgstr "New Stylus Photo シリーズ"
+
 #~ msgid "Output for printer %s is sent to %s"
 #~ msgstr "プリンター %s の出力は %s に送られます"

@@ -6096,6 +6112,12 @@ msgstr "variable-bindings の長さが不定"
 #~ msgstr ""
 #~ "ランク 所有者     優先 ジョブ     ファイル                    合計サイズ"

+#~ msgid "Stylus Color Series"
+#~ msgstr "Stylus Color シリーズ"
+
+#~ msgid "Stylus Photo Series"
+#~ msgstr "Stylus Photo シリーズ"
+
 #~ msgid "The output bin is almost full."
 #~ msgstr "排紙トレイがほとんど一杯です。"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-06-26 14:29-0400\n"
+"POT-Creation-Date: 2014-08-29 22:25-0400\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -799,6 +799,9 @@ msgstr ""
 msgid "  --false                 Always false."
 msgstr ""

+msgid "  --help                  Show help."
+msgstr ""
+
 msgid "  --help                  Show this help."
 msgstr ""

@@ -841,6 +844,11 @@ msgstr ""
 msgid "  --remote                True if service is remote."
 msgstr ""

+msgid ""
+"  --stop-after-include-error\n"
+"                          Stop tests after a failed INCLUDE."
+msgstr ""
+
 msgid "  --true                  Always true."
 msgstr ""

@@ -856,6 +864,9 @@ msgstr ""
 msgid "  --version               Show program version."
 msgstr ""

+msgid "  --version               Show version."
+msgstr ""
+
 msgid "  -4                      Connect using IPv4."
 msgstr ""

@@ -896,6 +907,11 @@ msgstr ""
 msgid "  -L                      Send requests using content-length."
 msgstr ""

+msgid ""
+"  -P filename.plist       Produce XML plist to a file and test report to "
+"standard output."
+msgstr ""
+
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""

@@ -934,6 +950,9 @@ msgstr ""
 msgid "  -a                      Export all printers."
 msgstr ""

+msgid "  -c                      Produce CSV output."
+msgstr ""
+
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""

@@ -991,6 +1010,9 @@ msgstr ""
 msgid "  -l                      List attributes."
 msgstr ""

+msgid "  -l                      Produce plain text output."
+msgstr ""
+
 msgid "  -l                      Run cupsd on demand."
 msgstr ""

@@ -2207,9 +2229,6 @@ msgstr ""
 msgid "70"
 msgstr "70"

-msgid "720dpi"
-msgstr "720dpi"
-
 msgid "75"
 msgstr "75"

@@ -3497,12 +3516,6 @@ msgstr ""
 msgid "Never"
 msgstr "Никогда"

-msgid "New Stylus Color Series"
-msgstr "Серия Stylus Color нового поколения"
-
-msgid "New Stylus Photo Series"
-msgstr "Серия Stylus Photo нового поколения"
-
 msgid "No"
 msgstr "Нет"

@@ -3976,12 +3989,6 @@ msgstr ""
 msgid "Statement"
 msgstr "Оператор"

-msgid "Stylus Color Series"
-msgstr "Серия Stylus Color"
-
-msgid "Stylus Photo Series"
-msgstr "Серия Stylus Photo"
-
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
@@ -7276,6 +7283,9 @@ msgstr "Для variable-bindings длина не установлена"
 #~ msgid "7 x 9\""
 #~ msgstr "7 x 9\""

+#~ msgid "720dpi"
+#~ msgstr "720dpi"
+
 #~ msgid "8 x 10\""
 #~ msgstr "8 x 10\""

@@ -8562,6 +8572,12 @@ msgstr "Для variable-bindings длина не установлена"
 #~ msgid "Nested classes are not allowed"
 #~ msgstr "Вложенные группы не допускаются"

+#~ msgid "New Stylus Color Series"
+#~ msgstr "Серия Stylus Color нового поколения"
+
+#~ msgid "New Stylus Photo Series"
+#~ msgstr "Серия Stylus Photo нового поколения"
+
 #~ msgid "No PPD name!"
 #~ msgstr "Нет имени PPD!"

@@ -8738,6 +8754,12 @@ msgstr "Для variable-bindings длина не установлена"
 #~ msgid "Shipping Address - 2 5/16 x 4\""
 #~ msgstr "Адрес доставки - 2 5/16 x 4\""

+#~ msgid "Stylus Color Series"
+#~ msgstr "Серия Stylus Color"
+
+#~ msgid "Stylus Photo Series"
+#~ msgstr "Серия Stylus Photo"
+
 #~ msgid "Tabloid (Oversize)"
 #~ msgstr "Tabloid (расширенный)"

@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: ipptool.man 11880 2014-05-16 06:14:11Z msweet $"
+.\" "$Id: ipptool.man 12140 2014-08-30 01:51:22Z msweet $"
 .\"
 .\" ipptool man page for CUPS.
 .\"
@@ -11,7 +11,7 @@
 .\" which should have been included with this file.  If this file is
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH ipptool 1 "CUPS" "15 May 2014" "Apple Inc."
+.TH ipptool 1 "CUPS" "29 August 2014" "Apple Inc."
 .SH NAME
 ipptool \- perform internet printing protocol requests
 .SH SYNOPSIS
@@ -76,9 +76,12 @@ ipptool \- perform internet printing protocol requests
 .B ipptool
 sends IPP requests to the specified
 .I printer-uri
-and tests and/or displays the results. Each named
+and tests and/or displays the results.
+Each named
 .I testfile
-defines one or more requests, including the expected response status, attributes, and values. Output is either a plain text, formatted text, CSV, or XML report on the standard output, with a non-zero exit status indicating that one or more tests have failed. The
+defines one or more requests, including the expected response status, attributes, and values.
+Output is either a plain text, formatted text, CSV, or XML report on the standard output, with a non-zero exit status indicating that one or more tests have failed.
+The
 .I testfile
 format is described in
 .BR ipptoolfile (5).
@@ -112,7 +115,8 @@ Specifies that
 must connect to the printer or server using IPv6.
 .TP 5
 .B \-C
-Specifies that requests should be sent using the HTTP/1.1 "Transfer\-Encoding: chunked" header, which is required for conformance by all versions of IPP. The default is to use "Transfer\-Encoding: chunked" for requests with attached files and "Content\-Length:" for requests without attached files.
+Specifies that requests should be sent using the HTTP/1.1 "Transfer\-Encoding: chunked" header, which is required for conformance by all versions of IPP.
+The default is to use "Transfer\-Encoding: chunked" for requests with attached files and "Content\-Length:" for requests without attached files.
 .TP 5
 .B \-E
 Forces TLS encryption when connecting to the server using the HTTP "Upgrade" header.
@@ -123,10 +127,12 @@ Specifies that
 will continue past errors.
 .TP 5
 .B \-L
-Specifies that requests should be sent using the HTTP/1.0 "Content\-Length:" header, which is required for conformance by all versions of IPP. The default is to use "Transfer\-Encoding: chunked" for requests with attached files and "Content\-Length:" for requests without attached files.
+Specifies that requests should be sent using the HTTP/1.0 "Content\-Length:" header, which is required for conformance by all versions of IPP.
+The default is to use "Transfer\-Encoding: chunked" for requests with attached files and "Content\-Length:" for requests without attached files.
 .TP 5
 .BI \-P \ filename.plist
-Specifies that the test results should be written to the named XML (Apple plist) file in addition to the plain text report. This option is incompatible with the \fB\-i\fR (interval) and \fB\-n\fR (repeat\-count) options.
+Specifies that the test results should be written to the named XML (Apple plist) file in addition to the regular test report (\fB\-t\fR).
+This option is incompatible with the \fB\-i\fR (interval) and \fB\-n\fR (repeat\-count) options.
 .TP 5
 .B \-S
 Forces (dedicated) TLS encryption when connecting to the server.
@@ -138,7 +144,8 @@ Specifies a timeout for IPP requests in seconds.
 Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not specified, version 1.1 is used.
 .TP 5
 .B \-X
-Specifies that XML (Apple plist) output is desired instead of the plain text report. This option is incompatible with the \fB\-i\fR (interval) and \fB\-n\fR (repeat\-count) options.
+Specifies that XML (Apple plist) output is desired instead of the plain text report.
+This option is incompatible with the \fB\-i\fR (interval) and \fB\-n\fR (repeat\-count) options.
 .TP 5
 .B \-c
 Specifies that CSV (comma\-separated values) output is desired instead of the plain text output.
@@ -152,7 +159,8 @@ Defines the default request filename for tests.
 .BI \-i \ seconds
 Specifies that the (last)
 .I testfile
-should be repeated at the specified interval. This option is incompatible with the \fB\-X\fR (XML plist output) option.
+should be repeated at the specified interval.
+This option is incompatible with the \fB\-X\fR (XML plist output) option.
 .TP 5
 .B \-l
 Specifies that plain text output is desired.
@@ -160,13 +168,18 @@ Specifies that plain text output is desired.
 .BI \-n \ repeat\-count
 Specifies that the (last)
 .I testfile
-should be repeated the specified number of times. This option is incompatible with the \fI\-X\fR (XML plist output) option.
+should be repeated the specified number of times.
+This option is incompatible with the \fI\-X\fR (XML plist output) option.
+.TP 5
+.B \-q
+Be quiet and produce no output.
 .TP 5
 .B \-t
 Specifies that CUPS test report output is desired instead of the plain text output.
 .TP 5
 .B \-v
-Specifies that all request and response attributes should be output in CUPS test mode (\fB\-t\fR). This is the default for XML output.
+Specifies that all request and response attributes should be output in CUPS test mode (\fB\-t\fR).
+This is the default for XML output.
 .SH EXIT STATUS
 The
 .B ipptool
@@ -231,5 +244,5 @@ RFC 2911 (http://tools.ietf.org/html/rfc2911),
 .SH COPYRIGHT
 Copyright \[co] 2007-2014 by Apple Inc.
 .\"
-.\" End of "$Id: ipptool.man 11880 2014-05-16 06:14:11Z msweet $".
+.\" End of "$Id: ipptool.man 12140 2014-08-30 01:51:22Z msweet $".
 .\"
@@ -1,27 +1,16 @@
 /*
- * "$Id: rss.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id: rss.c 12128 2014-08-28 19:23:23Z msweet $"
 *
- *   RSS notifier for CUPS.
+ * RSS notifier for CUPS.
 *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 2007 by Easy Software Products.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007 by Easy Software Products.
 *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. 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
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()           - Main entry for the test notifier.
- *   compare_rss()    - Compare two messages.
- *   delete_message() - Free all memory used by a message.
- *   load_rss()       - Load an existing RSS feed file.
- *   new_message()    - Create a new RSS message.
- *   password_cb()    - Return the cached password.
- *   save_rss()       - Save messages to a RSS file.
- *   xml_escape()     - Copy a string, escaping &, <, and > as needed.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. 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
+ * file is missing or damaged, see the license at "http://www.cups.org/".
 */

 /*
@@ -29,6 +18,7 @@
 */

 #include <cups/cups.h>
+#include <sys/stat.h>
 #include <cups/language.h>
 #include <cups/string-private.h>
 #include <cups/array.h>
@@ -629,6 +619,8 @@ save_rss(cups_array_t *rss,		/* I - RSS messages */
    return (0);
  }

+  fchmod(fileno(fp), 0644);
+
  fputs("<?xml version=\"1.0\"?>\n", fp);
  fputs("<rss version=\"2.0\">\n", fp);
  fputs("  <channel>\n", fp);
@@ -737,5 +729,5 @@ xml_escape(const char *s)		/* I - String to escape */


 /*
- * End of "$Id: rss.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id: rss.c 12128 2014-08-28 19:23:23Z msweet $".
 */
@@ -44,12 +44,12 @@

 Summary: CUPS
 Name: cups
-Version: 2.0b1
+Version: 2.0rc1
 Release: 1
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: http://www.cups.org/software/2.0b1/cups-2.0b1-source.tar.bz2
+Source: http://www.cups.org/software/2.0rc1/cups-2.0rc1-source.tar.bz2
 Url: http://www.cups.org
 Packager: Anonymous <anonymous@foo.com>
 Vendor: Apple Inc.
@@ -1,5 +1,5 @@
 //
-// "$Id: sample.drv 11800 2014-04-08 19:53:57Z msweet $"
+// "$Id: sample.drv 12105 2014-08-20 15:27:43Z msweet $"
 //
 // Driver info file for CUPS-supplied PPDs.
 //
@@ -217,90 +217,6 @@ Version "2.0"
    *Resolution k 1 8 0 0 120x72dpi
    Resolution k 1 8 0 0 240x72dpi
  }
-
-  // Epson Stylus Color Series
-  {
-    ModelName "Stylus Color Series"
-    Attribute NickName "" "Epson Stylus Color Series"
-    PCFileName "stcolor.ppd"
-    ModelNumber $EPSON_COLOR
-    ColorDevice Yes
-
-    HWMargins 8.6 39.6 8.6 25.51
-    *MediaSize Letter
-    MediaSize Legal
-    MediaSize A4
-
-    Resolution - 1 0 0 0 180dpi
-    *Resolution - 1 0 0 0 360dpi
-    Resolution - 1 0 0 0 720dpi
-
-    *ColorModel CMYK cmyk banded 1
-    ColorModel Gray/Grayscale k chunky 1
-  }
-
-  // Epson New Stylus Color Series
-  {
-    ModelName "New Stylus Color Series"
-    Attribute NickName "" "Epson New Stylus Color Series"
-    PCFileName "stcolor2.ppd"
-    ModelNumber $EPSON_ICOLOR
-    ColorDevice Yes
-
-    HWMargins 8.6 39.6 8.6 25.51
-    *MediaSize Letter
-    MediaSize Legal
-    MediaSize A4
-
-    Resolution - 1 0 0 0 180dpi
-    *Resolution - 1 0 0 0 360dpi
-    Resolution - 1 0 0 0 720dpi
-
-    *ColorModel CMYK cmyk banded 1
-    ColorModel Gray/Grayscale k chunky 1
-  }
-
-  // Epson Stylus Color Series
-  {
-    ModelName "Stylus Photo Series"
-    Attribute NickName "" "Epson Stylus Photo Series"
-    PCFileName "stphoto.ppd"
-    ModelNumber $EPSON_PHOTO
-    ColorDevice Yes
-
-    HWMargins 8.6 39.6 8.6 25.51
-    *MediaSize Letter
-    MediaSize Legal
-    MediaSize A4
-
-    Resolution - 1 0 0 0 180dpi
-    *Resolution - 1 0 0 0 360dpi
-    Resolution - 1 0 0 0 720dpi
-
-    *ColorModel CMYK cmykcm banded 1
-    ColorModel Gray/Grayscale k chunky 1
-  }
-
-  // Epson New Stylus Color Series
-  {
-    ModelName "New Stylus Photo Series"
-    Attribute NickName "" "Epson New Stylus Photo Series"
-    PCFileName "stphoto2.ppd"
-    ModelNumber $EPSON_IPHOTO
-    ColorDevice Yes
-
-    HWMargins 8.6 39.6 8.6 25.51
-    *MediaSize Letter
-    MediaSize Legal
-    MediaSize A4
-
-    Resolution - 1 0 0 0 180dpi
-    *Resolution - 1 0 0 0 360dpi
-    Resolution - 1 0 0 0 720dpi
-
-    *ColorModel CMYK cmykcm banded 1
-    ColorModel Gray/Grayscale k chunky 1
-  }
 }

 // Generic drivers
@@ -1252,5 +1168,5 @@ Version "2.0"
 }

 //
-// End of "$Id: sample.drv 11800 2014-04-08 19:53:57Z msweet $".
+// End of "$Id: sample.drv 12105 2014-08-20 15:27:43Z msweet $".
 //
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 11718 2014-03-21 18:04:48Z msweet $"
+# "$Id: Makefile 12132 2014-08-29 11:27:18Z msweet $"
 #
 # Scheduler Makefile for CUPS.
 #
@@ -171,7 +171,7 @@ install-data:
 	echo Creating $(REQUESTS)/tmp...
 	$(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
 	echo Creating $(CACHEDIR)...
-	$(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)
+	$(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR)
 	if test "x$(INITDIR)" != x; then \
 		echo Installing init scripts...; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
@@ -547,5 +547,5 @@ include Dependencies


 #
-# End of "$Id: Makefile 11718 2014-03-21 18:04:48Z msweet $".
+# End of "$Id: Makefile 12132 2014-08-29 11:27:18Z msweet $".
 #
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 11776 2014-03-28 19:16:05Z msweet $"
+ * "$Id: auth.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * Authorization routines for the CUPS scheduler.
 *
@@ -2171,23 +2171,23 @@ cups_crypt(const char *pw,		/* I - Password string */
    * Copy the final sum to the result string and return...
    */

-    memcpy(result, salt, salt_end - salt);
+    memcpy(result, salt, (size_t)(salt_end - salt));
    ptr = result + (salt_end - salt);
    *ptr++ = '$';

    for (i = 0; i < 5; i ++, ptr += 4)
    {
-      n = (((digest[i] << 8) | digest[i + 6]) << 8);
+      n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8);

      if (i < 4)
-        n |= digest[i + 12];
+        n |= (unsigned)digest[i + 12];
      else
-        n |= digest[5];
+        n |= (unsigned)digest[5];

      to64(ptr, n, 4);
    }

-    to64(ptr, digest[11], 2);
+    to64(ptr, (unsigned)digest[11], 2);
    ptr += 2;
    *ptr = '\0';

@@ -2327,5 +2327,5 @@ to64(char          *s,			/* O - Output string */


 /*
- * End of "$Id: auth.c 11776 2014-03-28 19:16:05Z msweet $".
+ * End of "$Id: auth.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c 12056 2014-07-22 14:02:56Z msweet $"
+ * "$Id: client.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * Client routines for the CUPS scheduler.
 *
@@ -934,7 +934,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	  return;
 	}
 #else
-	if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED, CUPSD_AUTH_NONE))
+	if (!cupsdSendError(con, HTTP_STATUS_NOT_IMPLEMENTED, CUPSD_AUTH_NONE))
 	{
 	  cupsdCloseClient(con);
 	  return;
@@ -993,7 +993,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	  return;
 	}
 #else
-	if (!cupsdSendError(con, HTTP_NOT_IMPLEMENTED, CUPSD_AUTH_NONE))
+	if (!cupsdSendError(con, HTTP_STATUS_NOT_IMPLEMENTED, CUPSD_AUTH_NONE))
 	{
 	  cupsdCloseClient(con);
 	  return;
@@ -1891,7 +1891,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 			      con->request->request.op.version[1],
 			      ippOpString(con->request->request.op.operation_id),
 			      con->request->request.op.request_id);
-	      con->bytes += ippLength(con->request);
+	      con->bytes += (off_t)ippLength(con->request);
 	    }
 	  }

@@ -2912,6 +2912,7 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
  char		*ptr;			/* Pointer info filename */
  size_t	plen;			/* Remaining length after pointer */
  char		language[7];		/* Language subdirectory, if any */
+  int		perm_check = 1;		/* Do permissions check? */


 /*
@@ -2921,17 +2922,27 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
  language[0] = '\0';

  if (!strncmp(con->uri, "/ppd/", 5) && !strchr(con->uri + 5, '/'))
+  {
    snprintf(filename, len, "%s%s", ServerRoot, con->uri);
+
+    perm_check = 0;
+  }
  else if (!strncmp(con->uri, "/icons/", 7) && !strchr(con->uri + 7, '/'))
  {
    snprintf(filename, len, "%s/%s", CacheDir, con->uri + 7);
    if (access(filename, F_OK) < 0)
      snprintf(filename, len, "%s/images/generic.png", DocumentRoot);
+
+    perm_check = 0;
  }
  else if (!strncmp(con->uri, "/rss/", 5) && !strchr(con->uri + 5, '/'))
    snprintf(filename, len, "%s/rss/%s", CacheDir, con->uri + 5);
-  else if (!strncmp(con->uri, "/admin/conf/", 12))
-    snprintf(filename, len, "%s%s", ServerRoot, con->uri + 11);
+  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+  {
+    strlcpy(filename, ConfigurationFile, len);
+
+    perm_check = 0;
+  }
  else if (!strncmp(con->uri, "/admin/log/", 11))
  {
    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
@@ -2942,6 +2953,8 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
      strlcpy(filename, PageLog, len);
    else
      return (NULL);
+
+    perm_check = 0;
  }
  else if (con->language)
  {
@@ -3007,7 +3020,7 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
  * not allow access...
  */

-  if (!status && !(filestats->st_mode & S_IROTH))
+  if (!status && perm_check && !(filestats->st_mode & S_IROTH))
  {
    cupsdLogClient(con, CUPSD_LOG_INFO, "Files/directories such as \"%s\" must be world-readable.", filename);
    return (NULL);
@@ -3115,7 +3128,7 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
    * not allow access...
    */

-    if (!status && !(filestats->st_mode & S_IROTH))
+    if (!status && perm_check && !(filestats->st_mode & S_IROTH))
    {
      cupsdLogClient(con, CUPSD_LOG_INFO, "Files/directories such as \"%s\" must be world-readable.", filename);
      return (NULL);
@@ -4042,5 +4055,5 @@ write_pipe(cupsd_client_t *con)		/* I - Client connection */


 /*
- * End of "$Id: client.c 12056 2014-07-22 14:02:56Z msweet $".
+ * End of "$Id: client.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c 11931 2014-06-16 16:10:58Z msweet $"
+ * "$Id: conf.c 12132 2014-08-29 11:27:18Z msweet $"
 *
 * Configuration routines for the CUPS scheduler.
 *
@@ -1076,7 +1076,7 @@ cupsdReadConfiguration(void)

  if ((cupsdCheckPermissions(RequestRoot, NULL, 0710, RunUser,
 			     Group, 1, 1) < 0 ||
-       cupsdCheckPermissions(CacheDir, NULL, 0775, RunUser,
+       cupsdCheckPermissions(CacheDir, NULL, 0770, RunUser,
 			     Group, 1, 1) < 0 ||
       cupsdCheckPermissions(temp, NULL, 0775, RunUser,
 			     Group, 1, 1) < 0 ||
@@ -4087,5 +4087,5 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */


 /*
- * End of "$Id: conf.c 11931 2014-06-16 16:10:58Z msweet $".
+ * End of "$Id: conf.c 12132 2014-08-29 11:27:18Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-driverd.cxx 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id: cups-driverd.cxx 12124 2014-08-28 15:37:22Z msweet $"
 *
 * PPD/driver support for CUPS.
 *
@@ -1321,7 +1321,7 @@ list_ppds(int        request_id,	/* I - Request ID */

      if (device_id_re &&
 	  !regexec(device_id_re, ppd->record.device_id,
-                   (int)(sizeof(re_matches) / sizeof(re_matches[0])),
+                   (size_t)(sizeof(re_matches) / sizeof(re_matches[0])),
 		   re_matches, 0))
      {
       /*
@@ -1351,7 +1351,7 @@ list_ppds(int        request_id,	/* I - Request ID */

      if (make_and_model_re &&
          !regexec(make_and_model_re, ppd->record.make_and_model,
-	           (int)(sizeof(re_matches) / sizeof(re_matches[0])),
+	           (size_t)(sizeof(re_matches) / sizeof(re_matches[0])),
 		   re_matches, 0))
      {
 	// See how much of the make-and-model string we matched...
@@ -2903,5 +2903,5 @@ regex_string(const char *s)		/* I - String to compare */


 /*
- * End of "$Id: cups-driverd.cxx 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id: cups-driverd.cxx 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 12067 2014-07-31 00:02:30Z msweet $"
+ * "$Id: ipp.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * IPP routines for the CUPS scheduler.
 *
@@ -2715,7 +2715,6 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */

      cupsdLogMessage(CUPSD_LOG_DEBUG,
 		      "Copied PPD file successfully");
-      chmod(dstfile, 0644);
    }
  }

@@ -4623,7 +4622,7 @@ copy_model(cupsd_client_t *con,		/* I - Client connection */
  * Open the destination file for a copy...
  */

-  if ((dst = cupsFileOpen(to, "wb")) == NULL)
+  if ((dst = cupsdCreateConfFile(to, ConfigFilePerm)) == NULL)
  {
    cupsFreeOptions(num_defaults, defaults);
    cupsFileClose(src);
@@ -4678,7 +4677,7 @@ copy_model(cupsd_client_t *con,		/* I - Client connection */

  unlink(tempfile);

-  return (cupsFileClose(dst));
+  return (cupsdCloseCreatedConfFile(dst, to));
 }


@@ -10824,8 +10823,10 @@ validate_job(cupsd_client_t  *con,	/* I - Client connection */
 	     ipp_attribute_t *uri)	/* I - Printer URI */
 {
  http_status_t		status;		/* Policy status */
-  ipp_attribute_t	*attr,		/* Current attribute */
-			*auth_info;	/* auth-info attribute */
+  ipp_attribute_t	*attr;		/* Current attribute */
+#ifdef HAVE_SSL
+  ipp_attribute_t	*auth_info;	/* auth-info attribute */
+#endif /* HAVE_SSL */
  ipp_attribute_t	*format,	/* Document-format attribute */
 			*name;		/* Job-name attribute */
  cups_ptype_t		dtype;		/* Destination type (printer/class) */
@@ -10991,7 +10992,9 @@ validate_job(cupsd_client_t  *con,	/* I - Client connection */
  * Check policy...
  */

+#ifdef HAVE_SSL
  auth_info = ippFindAttribute(con->request, "auth-info", IPP_TAG_TEXT);
+#endif /* HAVE_SSL */

  if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
  {
@@ -11093,5 +11096,5 @@ validate_user(cupsd_job_t    *job,	/* I - Job */


 /*
- * End of "$Id: ipp.c 12067 2014-07-31 00:02:30Z msweet $".
+ * End of "$Id: ipp.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 12067 2014-07-31 00:02:30Z msweet $"
+ * "$Id: job.c 12140 2014-08-30 01:51:22Z msweet $"
 *
 * Job management routines for the CUPS scheduler.
 *
@@ -235,10 +235,7 @@ cupsdCheckJobs(void)

  curtime = time(NULL);

-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdCheckJobs: %d active jobs, sleeping=%d, reload=%d, "
-                  "curtime=%ld", cupsArrayCount(ActiveJobs), Sleeping,
-                  NeedReload, (long)curtime);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCheckJobs: %d active jobs, sleeping=%d, ac-power=%d, reload=%d, curtime=%ld", cupsArrayCount(ActiveJobs), Sleeping, ACPower, NeedReload, (long)curtime);

  for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
       job;
@@ -332,7 +329,7 @@ cupsdCheckJobs(void)
    */

    if (job->state_value == IPP_JOB_PENDING && !NeedReload &&
-        !Sleeping && !DoingShutdown && !job->printer)
+        (!Sleeping || ACPower) && !DoingShutdown && !job->printer)
    {
      printer = cupsdFindDest(job->dest);
      pclass  = NULL;
@@ -5289,5 +5286,5 @@ update_job_attrs(cupsd_job_t *job,	/* I - Job to update */


 /*
- * End of "$Id: job.c 12067 2014-07-31 00:02:30Z msweet $".
+ * End of "$Id: job.c 12140 2014-08-30 01:51:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: listen.c 11717 2014-03-21 16:42:53Z msweet $"
+ * "$Id: listen.c 12080 2014-08-04 13:23:50Z msweet $"
 *
 * Server listening routines for the CUPS scheduler.
 *
@@ -274,23 +274,14 @@ cupsdStopListening(void)
       lis;
       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
  {
-#ifdef HAVE_SYSTEMD
+#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
    if (lis->fd != -1 && !lis->on_demand)
      httpAddrClose(&(lis->address), lis->fd);

-#elif defined(HAVE_LAUNCHD)
-    if (lis->fd != -1)
-    {
-      if (lis->on_demand)
-        httpAddrClose(NULL, lis->fd);
-      else
-        httpAddrClose(&(lis->address), lis->fd);
-    }
-
 #else
    if (lis->fd != -1)
      httpAddrClose(&(lis->address), lis->fd);
-#endif /* HAVE_SYSTEMD */
+#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */

    lis->fd = -1;
  }
@@ -298,5 +289,5 @@ cupsdStopListening(void)


 /*
- * End of "$Id: listen.c 11717 2014-03-21 16:42:53Z msweet $".
+ * End of "$Id: listen.c 12080 2014-08-04 13:23:50Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 11722 2014-03-21 18:28:30Z msweet $"
+ * "$Id: main.c 12140 2014-08-30 01:51:22Z msweet $"
 *
 * Main loop for the CUPS scheduler.
 *
@@ -119,8 +119,7 @@ main(int  argc,				/* I - Number of command-line args */
  int			run_as_child = 0;
 					/* Needed for background fork/exec */
 #ifdef __APPLE__
-  int			use_sysman = !getuid();
-					/* Use system management functions? */
+  int			use_sysman = 1;	/* Use system management functions? */
 #else
  time_t		netif_time = 0;	/* Time since last network update */
 #endif /* __APPLE__ */
@@ -137,7 +136,7 @@ main(int  argc,				/* I - Number of command-line args */

  if (getuid() != geteuid())
  {
-    fputs("cupsd: Cannot run as a setuid program\n", stderr);
+    fputs("cupsd: Cannot run as a setuid program.\n", stderr);
    return (1);
  }
 #endif /* HAVE_GETEUID */
@@ -726,19 +725,6 @@ main(int  argc,				/* I - Number of command-line args */
          break;
 	}

-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
-	if (OnDemand)
-	{
-	 /*
-	  * If we were started by launchd or systemd, get the listen socket file
-	  * descriptors...
-	  */
-
-	  service_checkin();
-	  service_checkout();
-	}
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
-
       /*
        * Startup the server...
        */
@@ -1885,6 +1871,8 @@ service_checkin(void)
 #    endif /* HAVE_SSL */
  }

+  free(ld_sockets);
+
 #  elif defined(HAVE_LAUNCHD)
  size_t		i,		/* Looping var */
 			count;		/* Number of listeners */
@@ -2170,5 +2158,5 @@ usage(int status)			/* O - Exit status */


 /*
- * End of "$Id: main.c 11722 2014-03-21 18:28:30Z msweet $".
+ * End of "$Id: main.c 12140 2014-08-30 01:51:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: process.c 12034 2014-07-16 19:37:34Z msweet $"
+ * "$Id: process.c 12102 2014-08-20 15:19:09Z msweet $"
 *
 * Process management routines for the CUPS scheduler.
 *
@@ -215,6 +215,8 @@ cupsdCreateProfile(int job_id,		/* I - Job ID or 0 for none */
                 " #\"^/private/var/mysql$\""
                 " #\"^/private/var/run$\""
                 " #\"^/private/var/spool$\""
+                 " #\"^/private/var/tmp$\""
+                 " #\"^/private/var/tmp/\""
                 " #\"^/usr/bin$\""	/* /usr/bin */
                 " #\"^/usr/bin/\""	/* /usr/bin/... */
                 " #\"^/usr/libexec/cups$\""	/* /usr/libexec/cups */
@@ -223,27 +225,10 @@ cupsdCreateProfile(int job_id,		/* I - Job ID or 0 for none */
                 " #\"^/usr/libexec/fax/\""	/* /usr/libexec/fax/... */
                 " #\"^/usr/sbin$\""	/* /usr/sbin */
                 " #\"^/usr/sbin/\""	/* /usr/sbin/... */
-		 " #\"^/Library/Application Support$\""
-		 " #\"^/Library/Application Support/\""
-		 " #\"^/Library/Caches$\""
-		 " #\"^/Library/ColorSync$\""
-		 " #\"^/Library/ColorSync/Profiles$\""
-		 " #\"^/Library/ColorSync/Profiles/\""
-		 " #\"^/Library/Fonts$\""
-		 " #\"^/Library/Fonts/\""
-		 " #\"^/Library/Frameworks$\""
-		 " #\"^/Library/Frameworks/\""
-		 " #\"^/Library/Keychains$\""
-		 " #\"^/Library/Keychains/\""
-		 " #\"^/Library/Logs$\""
-		 " #\"^/Library/Printers$\""
-		 " #\"^/Library/Printers/\""
-		 " #\"^/Library/Security$\""
-		 " #\"^/Library/Security/\""
-		 " #\"^/Library/WebServer$\""
-		 " #\"^/System/Library/ColorSync$\""
-		 " #\"^/System/Library/ColorSync/Profiles$\""
-		 " #\"^/System/Library/ColorSync/Profiles/\""
+		 " #\"^/Library$\""	/* /Library */
+		 " #\"^/Library/\""	/* /Library/... */
+		 " #\"^/System$\""	/* /System */
+		 " #\"^/System/\""	/* /System/... */
 		 " #\"^%s/Library$\""	/* RequestRoot/Library */
 		 " #\"^%s/Library/\""	/* RequestRoot/Library/... */
 		 " #\"^%s$\""		/* ServerBin */
@@ -292,6 +277,7 @@ cupsdCreateProfile(int job_id,		/* I - Job ID or 0 for none */
 		   " #\"^%s/\""		/* CUPS_TESTROOT/... */
 		   "))\n",
 		   testroot);
+    cupsFilePrintf(fp, "(allow sysctl*)\n");
  }
  if (job_id)
  {
@@ -314,7 +300,7 @@ cupsdCreateProfile(int job_id,		/* I - Job ID or 0 for none */
  cupsFilePuts(fp, "(allow distributed-notification-post)\n");
  /* Allow outbound networking to local services */
  cupsFilePuts(fp, "(allow network-outbound"
-		   "\n       (regex #\"^/private/var/run/\" #\"^/private/tmp/\")");
+		   "\n       (regex #\"^/private/var/run/\" #\"^/private/tmp/\" #\"^/private/var/tmp/\")");
  for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
       lis;
       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
@@ -884,5 +870,5 @@ cupsd_requote(char       *dst,		/* I - Destination buffer */


 /*
- * End of "$Id: process.c 12034 2014-07-16 19:37:34Z msweet $".
+ * End of "$Id: process.c 12102 2014-08-20 15:19:09Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: sysman.c 11406 2013-11-07 12:47:57Z msweet $"
+ * "$Id: sysman.c 12140 2014-08-30 01:51:22Z msweet $"
 *
 * System management functions for the CUPS scheduler.
 *
- * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2007-2014 by Apple Inc.
 * Copyright 2006 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -19,31 +19,29 @@
 */

 #include "cupsd.h"
-#ifdef HAVE_VPROC_TRANSACTION_BEGIN
-#  include <vproc.h>
-#endif /* HAVE_VPROC_TRANSACTION_BEGIN */
 #ifdef __APPLE__
+#  include <vproc.h>
 #  include <IOKit/pwr_mgt/IOPMLib.h>
 #endif /* __APPLE__ */


 /*
 * The system management functions cover disk and power management which
- * are primarily used on portable computers.
+ * are primarily used for portable computers.
 *
 * Disk management involves delaying the write of certain configuration
 * and state files to minimize the number of times the disk has to spin
- * up.
+ * up or flash to be written to.
 *
 * Power management support is currently only implemented on OS X, but
 * essentially we use four functions to let the OS know when it is OK to
 * put the system to sleep, typically when we are not in the middle of
- * printing a job.
- *
- * Once put to sleep, we invalidate all remote printers since it is common
- * to wake up in a new location/on a new wireless network.
+ * printing a job.  And on OS X we can also "sleep print" - basically the
+ * system only wakes up long enough to service network requests and process
+ * print jobs.
 */

+
 /*
 * 'cupsdCleanDirty()' - Write dirty config and state files.
 */
@@ -132,9 +130,10 @@ cupsdSetBusyState(void)
    "Active clients and printing jobs",
    "Active clients, printing jobs, and dirty files"
  };
-#ifdef HAVE_VPROC_TRANSACTION_BEGIN
+#ifdef __APPLE__
  static vproc_transaction_t vtran = 0;	/* Current busy transaction */
-#endif /* HAVE_VPROC_TRANSACTION_BEGIN */
+  static IOPMAssertionID keep_awake = 0;/* Keep the system awake while printing */
+#endif /* __APPLE__ */


 /*
@@ -174,7 +173,7 @@ cupsdSetBusyState(void)
  {
    busy = newbusy;

-#ifdef HAVE_VPROC_TRANSACTION_BEGIN
+#ifdef __APPLE__
    if (busy && !vtran)
      vtran = vproc_transaction_begin(NULL);
    else if (!busy && vtran)
@@ -182,8 +181,25 @@ cupsdSetBusyState(void)
      vproc_transaction_end(NULL, vtran);
      vtran = 0;
    }
-#endif /* HAVE_VPROC_TRANSACTION_BEGIN */
+#endif /* __APPLE__ */
  }
+
+#ifdef __APPLE__
+  if (cupsArrayCount(PrintingJobs) > 0 && !keep_awake)
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Asserting NetworkClientActive.");
+
+    IOPMAssertionCreateWithName(kIOPMAssertNetworkClientActive,
+				kIOPMAssertionLevelOn,
+				CFSTR("org.cups.cupsd"), &keep_awake);
+  }
+  else if (cupsArrayCount(PrintingJobs) == 0 && keep_awake)
+  {
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "Releasing power assertion.");
+    IOPMAssertionRelease(keep_awake);
+    keep_awake = 0;
+  }
+#endif /* __APPLE__ */
 }


@@ -198,8 +214,10 @@ cupsdSetBusyState(void)
 * Include MacOS-specific headers...
 */

+#  include <notify.h>
 #  include <IOKit/IOKitLib.h>
 #  include <IOKit/IOMessage.h>
+#  include <IOKit/ps/IOPowerSources.h>
 #  include <IOKit/pwr_mgt/IOPMLib.h>
 #  include <SystemConfiguration/SystemConfiguration.h>
 #  include <pthread.h>
@@ -265,6 +283,7 @@ static CFStringRef	ComputerNameKey = NULL,
 					/* Netowrk interface key */
 static cupsd_sysevent_t	LastSysEvent;	/* Last system event (for delayed sleep) */
 static int		NameChanged = 0;/* Did we get a 'name changed' event during sleep? */
+static int		PSToken = 0;	/* Power source notifications */


 /*
@@ -308,6 +327,8 @@ cupsdStartSystemMonitor(void)
  int	flags;				/* fcntl flags on pipe */


+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdStartSystemMonitor()");
+
  if (cupsdOpenPipe(SysEventPipes))
  {
    cupsdLogMessage(CUPSD_LOG_ERROR, "System event monitor pipe() failed - %s!",
@@ -332,6 +353,14 @@ cupsdStartSystemMonitor(void)
  pthread_mutex_init(&SysEventThreadMutex, NULL);
  pthread_cond_init(&SysEventThreadCond, NULL);
  pthread_create(&SysEventThread, NULL, (void *(*)())sysEventThreadEntry, NULL);
+
+ /*
+  * Monitor for power source changes via dispatch queue...
+  */
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdStartSystemMonitor: IOPSGetTimeRemainingEstimate=%f", IOPSGetTimeRemainingEstimate());
+  ACPower = IOPSGetTimeRemainingEstimate() == kIOPSTimeRemainingUnlimited;
+  notify_register_dispatch(kIOPSNotifyPowerSource, &PSToken, dispatch_get_main_queue(), ^(int t) { ACPower = IOPSGetTimeRemainingEstimate() == kIOPSTimeRemainingUnlimited; });
 }


@@ -345,6 +374,8 @@ cupsdStopSystemMonitor(void)
  CFRunLoopRef	rl;			/* The event handler runloop */


+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdStopSystemMonitor()");
+
  if (SysEventThread)
  {
   /*
@@ -375,6 +406,12 @@ cupsdStopSystemMonitor(void)
    cupsdRemoveSelect(SysEventPipes[0]);
    cupsdClosePipe(SysEventPipes);
  }
+
+  if (PSToken != 0)
+  {
+    notify_cancel(PSToken);
+    PSToken = 0;
+  }
 }


@@ -1034,5 +1071,5 @@ sysUpdateNames(void)


 /*
- * End of "$Id: sysman.c 11406 2013-11-07 12:47:57Z msweet $".
+ * End of "$Id: sysman.c 12140 2014-08-30 01:51:22Z msweet $".
 */
@@ -1,16 +1,16 @@
 /*
- * "$Id: sysman.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id: sysman.h 12140 2014-08-30 01:51:22Z msweet $"
 *
- *   System management definitions for the CUPS scheduler.
+ * System management definitions for the CUPS scheduler.
 *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 2006 by Easy Software Products.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2006 by Easy Software Products.
 *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. 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
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. 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
+ * file is missing or damaged, see the license at "http://www.cups.org/".
 */

 /*
@@ -35,7 +35,9 @@ VAR int			DirtyFiles	VALUE(CUPSD_DIRTY_NONE),
 					/* How often do we write dirty files? */
 VAR time_t		DirtyCleanTime	VALUE(0);
 					/* When to clean dirty files next */
-VAR int			Sleeping	VALUE(0);
+VAR int			ACPower		VALUE(-1),
+					/* Is the system on AC power? */
+			Sleeping	VALUE(0);
 					/* Non-zero if machine is entering or *
 					 * in a sleep state...                */
 VAR time_t		SleepJobs	VALUE(0);
@@ -60,5 +62,5 @@ extern void	cupsdStopSystemMonitor(void);


 /*
- * End of "$Id: sysman.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id: sysman.h 12140 2014-08-30 01:51:22Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpstat.c 12066 2014-07-30 18:30:44Z msweet $"
+ * "$Id: lpstat.c 12124 2014-08-28 15:37:22Z msweet $"
 *
 * "lpstat" command for CUPS.
 *
@@ -1270,7 +1270,6 @@ show_jobs(const char *dests,		/* I - Destinations */
 		*reasons;		/* Job state reasons attribute */
  const char	*dest,			/* Pointer into job-printer-uri */
 		*username,		/* Pointer to job-originating-user-name */
-		*title,			/* Pointer to job-name */
 		*message,		/* Pointer to job-printer-state-message */
 		*time_at;		/* time-at-xxx attribute name to use */
  int		rank,			/* Rank in queue */
@@ -1385,7 +1384,6 @@ show_jobs(const char *dests,		/* I - Destinations */
      username = NULL;
      dest     = NULL;
      jobtime  = 0;
-      title    = "no title";
      message  = NULL;
      reasons  = NULL;

@@ -1411,9 +1409,6 @@ show_jobs(const char *dests,		/* I - Destinations */
        else if (!strcmp(attr->name, "job-originating-user-name") &&
 	         attr->value_tag == IPP_TAG_NAME)
 	  username = attr->values[0].string.text;
-        else if (!strcmp(attr->name, "job-name") &&
-	         attr->value_tag == IPP_TAG_NAME)
-	  title = attr->values[0].string.text;
        else if (!strcmp(attr->name, "job-state-reasons") &&
 	         attr->value_tag == IPP_TAG_KEYWORD)
 	  reasons = attr;
@@ -2039,5 +2034,5 @@ show_scheduler(void)


 /*
- * End of "$Id: lpstat.c 12066 2014-07-30 18:30:44Z msweet $".
+ * End of "$Id: lpstat.c 12124 2014-08-28 15:37:22Z msweet $".
 */
@@ -1,4 +1,4 @@
 <H2 CLASS="title">Change Settings</H2>

-<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+<P><IMG SRC="data:image/gif;base64,R0lGODlhEAAQAIQAAP///wAAAPDw8IqKiuDg4EZGRnp6egAAAFhYWCQkJKysrL6+vhQUFJycnAQEBDY2NmhoaP///////////////////////////////////////////////////////////yH/C05FVFNDQVBFMi4wAwEAAAAh+QQABQD/ACwAAAAAEAAQAAAFdyAgAgIJIeWoAkRCCMdBkKtIHIngyMKsErPBYbADpkSCwhDmQCBethRB6Vj4kFCkQPG4IlWDgrNRIwnO4UKBXDufzQvDMaoSDBgFb886MiQadgNABAokfCwzBA8LCg0Egl8jAggGAA1kBIA1BAYzlyILczULC2UhACH5BAEFAB8ALAAAAAAQABAAAAV2ICACAmlAZTmOREEIyUEQjLKKxPHADhEvqxlgcGgkGI1DYSVAIAWMx+lwSKkICJ0QsHi9RgKBwnVTiRQQgwF4I4UFDQQEwi6/3YSGWRRmjhEETAJfIgMFCnAKM0KDV4EEEAQLiF18TAYNXDaSe3x6mjidN1s3IQAh+QQBBQAfACwAAAAAEAAQAAAFeCAgAgLZDGU5jgRECEUiCI+yioSDwDJyLKsXoHFQxBSHAoAAFBhqtMJg8DgQBgfrEsJAEAg4YhZIEiwgKtHiMBgtpg3wbUZXGO7kOb1MUKRFMysCChAoggJCIg0GC2aNe4gqQldfL4l/Ag1AXySJgn5LcoE3QXI3IQAh+QQBBQAfACwAAAAAEAAQAAAFdiAgAgLZNGU5joQhCEjxIssqEo8bC9BRjy9Ag7GILQ4QEoE0gBAEBcOpcBA0DoxSK/e8LRIHn+i1cK0IyKdg0VAoljYIg+GgnRrwVS/8IAkICyosBIQpBAMoKy9dImxPhS+GKkFrkX+TigtLlIyKXUF+NjagNiEAIfkEAQUAHwAsAAAAABAAEAAABWwgIAICaRhlOY4EIgjH8R7LKhKHGwsMvb4AAy3WODBIBBKCsYA9TjuhDNDKEVSERezQEL0WrhXucRUQGuik7bFlngzqVW9LMl9XWvLdjFaJtDFqZ1cEZUB0dUgvL3dgP4WJZn4jkomWNpSTIyEAIfkEAQUAHwAsAAAAABAAEAAABX4gIAICuSxlOY6CIgiD8RrEKgqGOwxwUrMlAoSwIzAGpJpgoSDAGifDY5kopBYDlEpAQBwevxfBtRIUGi8xwWkDNBCIwmC9Vq0aiQQDQuK+VgQPDXV9hCJjBwcFYU5pLwwHXQcMKSmNLQcIAExlbH8JBwttaX0ABAcNbWVbKyEAIfkEAQUAHwAsAAAAABAAEAAABXkgIAICSRBlOY7CIghN8zbEKsKoIjdFzZaEgUBHKChMJtRwcWpAWoWnifm6ESAMhO8lQK0EEAV3rFopIBCEcGwDKAqPh4HUrY4ICHH1dSoTFgcHUiZjBhAJB2AHDykpKAwHAwdzf19KkASIPl9cDgcnDkdtNwiMJCshACH5BAEFAB8ALAAAAAAQABAAAAV3ICACAkkQZTmOAiosiyAoxCq+KPxCNVsSMRgBsiClWrLTSWFoIQZHl6pleBh6suxKMIhlvzbAwkBWfFWrBQTxNLq2RG2yhSUkDs2b63AYDAoJXAcFRwADeAkJDX0AQCsEfAQMDAIPBz0rCgcxky0JRWE1AmwpKyEAIfkEAQUAHwAsAAAAABAAEAAABXkgIAICKZzkqJ4nQZxLqZKv4NqNLKK2/Q4Ek4lFXChsg5ypJjs1II3gEDUSRInEGYAw6B6zM4JhrDAtEosVkLUtHA7RHaHAGJQEjsODcEg0FBAFVgkQJQ1pAwcDDw8KcFtSInwJAowCCA6RIwqZAgkPNgVpWndjdyohACH5BAEFAB8ALAAAAAAQABAAAAV5ICACAimc5KieLEuUKvm2xAKLqDCfC2GaO9eL0LABWTiBYmA06W6kHgvCqEJiAIJiu3gcvgUsscHUERm+kaCxyxa+zRPk0SgJEgfIvbAdIAQLCAYlCj4DBw0IBQsMCjIqBAcPAooCBg9pKgsJLwUFOhCZKyQDA3YqIQAh+QQBBQAfACwAAAAAEAAQAAAFdSAgAgIpnOSonmxbqiThCrJKEHFbo8JxDDOZYFFb+A41E4H4OhkOipXwBElYITDAckFEOBgMQ3arkMkUBdxIUGZpEb7kaQBRlASPg0FQQHAbEEMGDSVEAA1QBhAED1E0NgwFAooCDWljaQIQCE5qMHcNhCkjIQAh+QQBBQAfACwAAAAAEAAQAAAFeSAgAgIpnOSoLgxxvqgKLEcCC65KEAByKK8cSpA4DAiHQ/DkKhGKh4ZCtCyZGo6F6iYYPAqFgYy02xkSaLEMV34tELyRYNEsCQyHlvWkGCzsPgMCEAY7Cg04Uk48LAsDhRA8MVQPEF0GAgqYYwSRlycNcWskCkApIyEAOw==" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
 ALT="Busy Indicator"> Please stand by while the server restarts...</P>
@@ -7,8 +7,7 @@ ippfind.o: ippfind.c ../cups/cups-private.h ../cups/string-private.h \
  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
 ippserver.o: ippserver.c ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h ../config.h ../cups/string-private.h \
-  ../cups/thread-private.h
+  ../cups/language.h ../cups/pwg.h ../config.h ../cups/thread-private.h
 ipptool.o: ipptool.c ../cups/cups-private.h ../cups/string-private.h \
  ../config.h ../cups/debug-private.h ../cups/versioning.h \
  ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -1,9 +1,9 @@
 #
-# "$Id: get-completed-jobs.test 11398 2013-11-06 20:11:11Z msweet $"
+# "$Id: get-completed-jobs.test 12088 2014-08-07 01:09:21Z msweet $"
 #
 #   Get list of completed jobs.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2014 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products. All rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -32,7 +32,7 @@
 	ATTR uri printer-uri $uri
 	ATTR keyword which-jobs completed
 	ATTR keyword requested-attributes
-	     job-id,job-state,job-state-reasons,job-name,job-originating-user-name,job-media-sheets-completed
+	     job-id,job-uri,job-state,job-state-reasons,job-name,job-originating-user-name,job-media-sheets-completed

 	# What statuses are OK?
 	STATUS successful-ok
@@ -47,5 +47,5 @@


 #
-# End of "$Id: get-completed-jobs.test 11398 2013-11-06 20:11:11Z msweet $".
+# End of "$Id: get-completed-jobs.test 12088 2014-08-07 01:09:21Z msweet $".
 #
@@ -1,9 +1,9 @@
 #
-# "$Id: get-jobs.test 11398 2013-11-06 20:11:11Z msweet $"
+# "$Id: get-jobs.test 12088 2014-08-07 01:09:21Z msweet $"
 #
 #   Get list of not-completed jobs.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2014 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products. All rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -31,7 +31,7 @@
 	ATTR language attributes-natural-language en
 	ATTR uri printer-uri $uri
 	ATTR keyword requested-attributes
-	     job-id,job-state,job-state-reasons,job-name,job-originating-user-name,job-media-sheets,job-media-sheets-completed,job-impressions,job-impressions-completed
+	     job-id,job-uri,job-state,job-state-reasons,job-name,job-originating-user-name,job-media-sheets,job-media-sheets-completed,job-impressions,job-impressions-completed

 	# What statuses are OK?
 	STATUS successful-ok
@@ -49,5 +49,5 @@


 #
-# End of "$Id: get-jobs.test 11398 2013-11-06 20:11:11Z msweet $".
+# End of "$Id: get-jobs.test 12088 2014-08-07 01:09:21Z msweet $".
 #
@@ -0,0 +1,20 @@
+# Make the printer beep
+{
+	# The name of the test...
+	NAME "Identify Printer with Sound"
+
+	# The operation to use
+	OPERATION Identify-Printer
+
+	# Attributes, starting in the operation group...
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR keyword identify-actions sound
+
+	# What statuses are OK?
+	STATUS successful-ok
+	STATUS successful-ok-ignored-or-substituted-attributes
+}
@@ -1,5 +1,5 @@
 /*
- * "$Id: ippfind.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: ippfind.c 12139 2014-08-29 17:50:38Z msweet $"
 *
 * Utility to find IPP printers via Bonjour/DNS-SD and optionally run
 * commands such as IPP and Bonjour conformance tests.  This tool is
@@ -242,7 +242,7 @@ main(int  argc,				/* I - Number of command-line args */
 {
  int			i,		/* Looping var */
 			have_output = 0,/* Have output expression */
-			status = IPPFIND_EXIT_TRUE;
+			status = IPPFIND_EXIT_FALSE;
 					/* Exit status */
  const char		*opt,		/* Option character */
 			*search;	/* Current browse/resolve string */
@@ -307,6 +307,10 @@ main(int  argc,				/* I - Number of command-line args */
  * Parse command-line...
  */

+  if (getenv("IPPFIND_DEBUG"))
+    for (i = 1; i < argc; i ++)
+      fprintf(stderr, "argv[%d]=\"%s\"\n", i, argv[i]);
+
  for (i = 1; i < argc; i ++)
  {
    if (argv[i][0] == '-')
@@ -603,9 +607,9 @@ main(int  argc,				/* I - Number of command-line args */
                               NULL)) == NULL)
            return (IPPFIND_EXIT_MEMORY);
        }
-        else if (!strncmp(argv[i], "--txt-", 5))
+        else if (!strncmp(argv[i], "--txt-", 6))
        {
-          const char *key = argv[i] + 5;/* TXT key */
+          const char *key = argv[i] + 6;/* TXT key */

          i ++;
          if (i >= argc)
@@ -1420,8 +1424,8 @@ main(int  argc,				/* I - Number of command-line args */
 	    service->ref = NULL;
 	  }

-          if (!eval_expr(service, expressions))
-            status = IPPFIND_EXIT_FALSE;
+          if (eval_expr(service, expressions))
+            status = IPPFIND_EXIT_TRUE;

          service->is_processed = 1;
        }
@@ -1803,6 +1807,9 @@ eval_expr(ippfind_srv_t  *service,	/* I - Service */
 	    result = !regexec(&(expression->re), val, 0, NULL, 0);
 	  else
 	    result = 0;
+
+	  if (getenv("IPPFIND_DEBUG"))
+	    printf("TXT_REGEX of \"%s\": %d\n", val, result);
          break;
      case IPPFIND_OP_URI_REGEX :
          result = !regexec(&(expression->re), service->uri, 0, NULL, 0);
@@ -1976,9 +1983,9 @@ exec_program(ippfind_srv_t *service,	/* I - Service */
 	    strlcpy(tptr, scheme + 22, sizeof(temp) - (size_t)(tptr - temp));
 	  else if (!strncmp(keyword, "txt_", 4))
 	  {
-	    if ((ptr = (char *)cupsGetOption(keyword + 4, service->num_txt,
-					     service->txt)) != NULL)
-	      strlcpy(tptr, strdup(ptr), sizeof(temp) - (size_t)(tptr - temp));
+	    const char *txt = cupsGetOption(keyword + 4, service->num_txt, service->txt);
+	    if (txt)
+	      strlcpy(tptr, txt, sizeof(temp) - (size_t)(tptr - temp));
 	    else
 	      *tptr = '\0';
 	  }
@@ -2003,6 +2010,17 @@ exec_program(ippfind_srv_t *service,	/* I - Service */
  }

 #ifdef WIN32
+  if (getenv("IPPFIND_DEBUG"))
+  {
+    printf("\nProgram:\n    %s\n", args[0]);
+    puts("\nArguments:");
+    for (i = 0; i < num_args; i ++)
+      printf("    %s\n", myargv[i]);
+    puts("\nEnvironment:");
+    for (i = 0; i < myenvc; i ++)
+      printf("    %s\n", myenvp[i]);
+  }
+
  status = _spawnvpe(_P_WAIT, args[0], myargv, myenvp);

 #else
@@ -2070,6 +2088,18 @@ exec_program(ippfind_srv_t *service,	/* I - Service */
  * Return whether the program succeeded or crashed...
  */

+  if (getenv("IPPFIND_DEBUG"))
+  {
+#ifdef WIN32
+    printf("Exit Status: %d\n", status);
+#else
+    if (WIFEXITED(status))
+      printf("Exit Status: %d\n", WEXITSTATUS(status));
+    else
+      printf("Terminating Signal: %d\n", WTERMSIG(status));
+#endif /* WIN32 */
+  }
+
  return (status == 0);
 }

@@ -2805,5 +2835,5 @@ show_version(void)


 /*
- * End of "$Id: ippfind.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: ippfind.c 12139 2014-08-29 17:50:38Z msweet $".
 */
@@ -0,0 +1,172 @@
+.\"
+.\" "$Id$"
+.\"
+.\" ippserver man page for CUPS.
+.\"
+.\" Copyright 2014 by Apple Inc.
+.\"
+.\" These coded instructions, statements, and computer programs are the
+.\" property of Apple Inc. 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
+.\" file is missing or damaged, see the license at "http://www.cups.org/".
+.\"
+.TH ippserver 1 "CUPS" "28 August 2014" "Apple Inc."
+.SH NAME
+ippserver \- a simple internet printing protocol server
+.SH SYNOPSIS
+.B ippserver
+[
+.B \-2
+] [
+.B \-M
+.I manufacturer
+] [
+.B \-P
+] [
+.B \-c
+.I command
+] [
+.B \-d
+.I spool-directory
+] [
+.B \-f
+.I type/subtype[,...]
+] [
+.B \-h
+] [
+.B \-i
+.I iconfile.png
+] [
+.B \-k
+] [
+.B \-l
+.I location
+] [
+.B \-m
+.I model
+] [
+.B \-n
+.I hostname
+] [
+.B \-p
+.I port
+] [
+.B \-r
+.I subtype
+] [
+.B \-s
+.I speed[,color-speed]
+] [
+.B \-v[vvv]
+]
+.I service-name
+.SH DESCRIPTION
+.B ippserver
+is a simple Internet Printing Protocol (IPP) server conforming to the IPP Everywhere (PWG 5100.14) specification. It can be used to test client software or act as a very basic print server that runs a command for every job that is printed.
+.SH OPTIONS
+The following options are recognized by
+.B ippserver:
+.TP 5
+.B \-2
+Report support for two-sided (duplex) printing.
+.TP 5
+\fB\-M \fImanufacturer\fR
+Set the manufacturer of the printer.
+The default is "Test".
+.TP 5
+.B \-P
+Report support for PIN printing.
+.TP 5
+\fB\-c \fIcommand\fR
+Run the specified command for each document that is printed.
+.TP 5
+\fB\-d \fIspool-directory\fR
+Specifies the directory that will hold the print files.
+The default is a directory under the user's current temporary directory.
+.TP 5
+\fB\-f \fItype/subtype[,...]\fR
+Specifies a list of MIME media types that the server will accept.
+The default is "application/pdf,image/jpeg,image/pwg-raster".
+.TP 5
+.B \-h
+Shows program help.
+.TP 5
+\fB\-i \fIiconfile.png\fR
+Specifies the printer icon file for the server.
+The default is "printer.png".
+.TP 5
+.B \-k
+Keeps the print documents in the spool directory rather than deleting them.
+.TP 5
+\fB\-l \fIlocation\fR
+Specifies the human-readable location string that is reported by the server.
+The default is the empty string.
+.TP 5
+\fB\-m \fImodel\fR
+Specifies the model name of the printer.
+The default is "Printer".
+.TP 5
+\fB\-n \fIhostname\fR
+Specifies the hostname that is reported by the server.
+The default is the name returned by the
+.BR hostname (1)
+command.
+.TP 5
+\fB\-p \fIport\fR
+Specifies the port number to listen on.
+The default is a user-specific number from 8000 to 8999.
+.TP 5
+\fB\-r \fIsubtype\fR
+Specifies the Bonjour subtype(s) to advertise.
+Separate multiple subtypes with a comma.
+The default is "_print".
+.TP 5
+\fB\-s \fIspeed[,color-speed]\fR
+Specifies the printer speed in pages per minute.
+If two numbers are specified and the second number is greater than zero, the server will report support for color printing.
+The default is "10,0".
+.TP 5
+.B \-v[vvv]
+Be (very) verbose when logging activity to the standard output.
+.SH EXIT STATUS
+The
+.B ippserver
+program returns 1 if it is unable to process the command-line arguments or register the IPP service.
+Otherwise
+.B ippserver
+will run continuously until terminated.
+.SH CONFORMING TO
+The
+.B ippserver
+program is unique to CUPS and conforms to the IPP Everywhere (PWG 5100.14) specification.
+.SH ENVIRONMENT
+.B ippserver
+adds environment variables starting with "IPP_" for all IPP Job attributes in the print request.
+For example, when executing a command for an IPP Job containing the "media" Job Template attribute, the "IPP_MEDIA" environment variable will be set to the value of that attribute.
+.LP
+Enumerated values are converted to their keyword equivalents.
+For example, a "print-quality" Job Template attribute with a enum value of 3 will become the "IPP_PRINT_QUALITY" environment variable with a value of "draft".
+.SH EXAMPLES
+Run
+.B ippserver
+with a service name of My Cool Printer:
+.nf
+
+    ippserver "My Cool Printer"
+.fi
+.LP
+Run the
+.BR file (1)
+command whenever a job is sent to the server:
+.nf
+
+    ippserver \-c file "My Cool Printer"
+.fi
+.SH SEE ALSO
+PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
+.SH COPYRIGHT
+Copyright \[co] 2007-2014 by Apple Inc.
+.\"
+.\" End of "$Id$".
+.\"
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipptool.c 12031 2014-07-15 19:57:59Z msweet $"
+ * "$Id: ipptool.c 12143 2014-09-02 13:37:30Z msweet $"
 *
 * ipptool command for CUPS.
 *
@@ -647,6 +647,7 @@ main(int  argc,				/* I - Number of command-line args */
      if (!vars.uri)
      {
        _cupsLangPuts(stderr, _("ipptool: URI required before test file."));
+        _cupsLangPuts(stderr, argv[i]);
 	usage();
      }

@@ -1371,7 +1372,8 @@ do_tests(FILE         *outfile,		/* I - Output file */
        * Name of test...
 	*/

-	get_token(fp, name, sizeof(name), &linenum);
+	get_token(fp, temp, sizeof(temp), &linenum);
+	expand_variables(vars, name, temp, sizeof(name));
      }
      else if (!_cups_strcasecmp(token, "PAUSE"))
      {
@@ -2470,6 +2472,8 @@ do_tests(FILE         *outfile,		/* I - Output file */
      {
 	fputs("<key>Successful</key>\n", outfile);
 	fputs("<true />\n", outfile);
+	fputs("<key>Skipped</key>\n", outfile);
+	fputs("<true />\n", outfile);
 	fputs("<key>StatusCode</key>\n", outfile);
 	print_xml_string(outfile, "string", "skip");
 	fputs("<key>ResponseAttributes</key>\n", outfile);
@@ -3060,7 +3064,62 @@ do_tests(FILE         *outfile,		/* I - Output file */
 	    set_variable(outfile, vars, expect->define_match, "1");

 	  if (found && expect->define_value)
+	  {
+	    if (!expect->with_value)
+	    {
+	      int last = ippGetCount(found) - 1;
+					/* Last element in attribute */
+
+	      switch (ippGetValueTag(found))
+	      {
+	        case IPP_TAG_ENUM :
+		case IPP_TAG_INTEGER :
+		    snprintf(buffer, sizeof(buffer), "%d", ippGetInteger(found, last));
+		    break;
+
+		case IPP_TAG_BOOLEAN :
+		    if (ippGetBoolean(found, last))
+		      strlcpy(buffer, "true", sizeof(buffer));
+		    else
+		      strlcpy(buffer, "false", sizeof(buffer));
+		    break;
+
+		case IPP_TAG_RESOLUTION :
+		    {
+		      int	xres,	/* Horizontal resolution */
+				yres;	/* Vertical resolution */
+		      ipp_res_t	units;	/* Resolution units */
+
+		      xres = ippGetResolution(found, last, &yres, &units);
+
+		      if (xres == yres)
+		        snprintf(buffer, sizeof(buffer), "%d%s", xres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm");
+		      else
+		        snprintf(buffer, sizeof(buffer), "%dx%d%s", xres, yres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm");
+		    }
+		    break;
+
+		case IPP_TAG_CHARSET :
+		case IPP_TAG_KEYWORD :
+		case IPP_TAG_LANGUAGE :
+		case IPP_TAG_MIMETYPE :
+		case IPP_TAG_NAME :
+		case IPP_TAG_NAMELANG :
+		case IPP_TAG_TEXT :
+		case IPP_TAG_TEXTLANG :
+		case IPP_TAG_URI :
+		case IPP_TAG_URISCHEME :
+		    strlcpy(buffer, ippGetString(found, last, NULL), sizeof(buffer));
+		    break;
+
+		default :
+		    ippAttributeString(found, buffer, sizeof(buffer));
+		    break;
+	      }
+	    }
+
 	    set_variable(outfile, vars, expect->define_value, buffer);
+	  }

 	  if (found && expect->repeat_match &&
 	      repeat_count < expect->repeat_limit)
@@ -3079,6 +3138,25 @@ do_tests(FILE         *outfile,		/* I - Output file */
        {
          printf("%04d]\n", repeat_count);
          fflush(stdout);
+
+	  if (num_displayed > 0)
+	  {
+	    for (attrptr = ippFirstAttribute(response); attrptr; attrptr = ippNextAttribute(response))
+	    {
+	      const char *attrname = ippGetName(attrptr);
+	      if (attrname)
+	      {
+		for (i = 0; i < num_displayed; i ++)
+		{
+		  if (!strcmp(displayed[i], attrname))
+		  {
+		    print_attr(stdout, _CUPS_OUTPUT_TEST, attrptr, NULL);
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
        }

        sleep((unsigned)repeat_interval);
@@ -3134,7 +3212,7 @@ do_tests(FILE         *outfile,		/* I - Output file */
 	printf("        status-code = %s (%s)\n", ippErrorString(cupsLastError()),
 	       cupsLastErrorString());

-        if (response)
+        if (Verbosity && response)
        {
 	  for (attrptr = response->attrs;
 	       attrptr != NULL;
@@ -3143,7 +3221,7 @@ do_tests(FILE         *outfile,		/* I - Output file */
 	}
      }
    }
-    else if (!prev_pass)
+    else if (!prev_pass && Output != _CUPS_OUTPUT_QUIET)
      fprintf(stderr, "%s\n", cupsLastErrorString());

    if (prev_pass && Output >= _CUPS_OUTPUT_LIST && !Verbosity &&
@@ -3214,7 +3292,7 @@ do_tests(FILE         *outfile,		/* I - Output file */
      }
    }

-    if (num_displayed > 0 && !Verbosity && response && Output == _CUPS_OUTPUT_TEST)
+    if (num_displayed > 0 && !Verbosity && response && (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout)))
    {
      for (attrptr = response->attrs;
 	   attrptr != NULL;
@@ -3387,14 +3465,26 @@ expand_variables(_cups_vars_t *vars,	/* I - Variables */
      }
      else if (vars)
      {
-	strlcpy(temp, src + 1, sizeof(temp));
+        if (src[1] == '{')
+	{
+	  src += 2;
+	  strlcpy(temp, src, sizeof(temp));
+	  if ((tempptr = strchr(temp, '}')) != NULL)
+	    *tempptr = '\0';
+	  else
+	    tempptr = temp + strlen(temp);
+	}
+	else
+	{
+	  strlcpy(temp, src + 1, sizeof(temp));

-	for (tempptr = temp; *tempptr; tempptr ++)
-	  if (!isalnum(*tempptr & 255) && *tempptr != '-' && *tempptr != '_')
-	    break;
+	  for (tempptr = temp; *tempptr; tempptr ++)
+	    if (!isalnum(*tempptr & 255) && *tempptr != '-' && *tempptr != '_')
+	      break;

-        if (*tempptr)
-	  *tempptr = '\0';
+	  if (*tempptr)
+	    *tempptr = '\0';
+        }

 	if (!strcmp(temp, "uri"))
 	  value = vars->uri;
@@ -4713,6 +4803,10 @@ usage(void)
  _cupsLangPuts(stderr, _("Usage: ipptool [options] URI filename [ ... "
 		          "filenameN ]"));
  _cupsLangPuts(stderr, _("Options:"));
+  _cupsLangPuts(stderr, _("  --help                  Show help."));
+  _cupsLangPuts(stderr, _("  --stop-after-include-error\n"
+                          "                          Stop tests after a failed INCLUDE."));
+  _cupsLangPuts(stderr, _("  --version               Show version."));
  _cupsLangPuts(stderr, _("  -4                      Connect using IPv4."));
  _cupsLangPuts(stderr, _("  -6                      Connect using IPv6."));
  _cupsLangPuts(stderr, _("  -C                      Send requests using "
@@ -4722,6 +4816,7 @@ usage(void)
  _cupsLangPuts(stderr, _("  -I                      Ignore errors."));
  _cupsLangPuts(stderr, _("  -L                      Send requests using "
                          "content-length."));
+  _cupsLangPuts(stderr, _("  -P filename.plist       Produce XML plist to a file and test report to standard output."));
  _cupsLangPuts(stderr, _("  -S                      Test with SSL "
 			  "encryption."));
  _cupsLangPuts(stderr, _("  -T seconds              Set the receive/send "
@@ -4730,12 +4825,14 @@ usage(void)
                          "version."));
  _cupsLangPuts(stderr, _("  -X                      Produce XML plist instead "
                          "of plain text."));
+  _cupsLangPuts(stderr, _("  -c                      Produce CSV output."));
  _cupsLangPuts(stderr, _("  -d name=value           Set named variable to "
                          "value."));
  _cupsLangPuts(stderr, _("  -f filename             Set default request "
                          "filename."));
  _cupsLangPuts(stderr, _("  -i seconds              Repeat the last file with "
                          "the given time interval."));
+  _cupsLangPuts(stderr, _("  -l                      Produce plain text output."));
  _cupsLangPuts(stderr, _("  -n count                Repeat the last file the "
                          "given number of times."));
  _cupsLangPuts(stderr, _("  -q                      Run silently."));
@@ -5769,5 +5866,5 @@ with_value(FILE            *outfile,	/* I - Output file */


 /*
- * End of "$Id: ipptool.c 12031 2014-07-15 19:57:59Z msweet $".
+ * End of "$Id: ipptool.c 12143 2014-09-02 13:37:30Z msweet $".
 */
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: run-stp-tests.sh 12065 2014-07-30 17:56:35Z msweet $"
+# "$Id: run-stp-tests.sh 12101 2014-08-20 15:10:51Z msweet $"
 #
 # Perform the complete set of IPP compliance tests specified in the
 # CUPS Software Test Plan.
@@ -623,8 +623,7 @@ echo "    $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_l
 echo ""

 if test `uname` = Darwin -a "x$VALGRIND" = x; then
-	DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib
-	../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
+	DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib MallocStackLogging=1 ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
 else
 	$VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
 fi
@@ -767,6 +766,13 @@ for file in 5*.sh; do
 	fi
 done

+#
+# Log all allocations made by the scheduler...
+#
+if test `uname` = Darwin -a "x$VALGRIND" = x; then
+	malloc_history $cupsd -callTree -showContent >$BASE/log/malloc_log 2>&1
+fi
+
 #
 # Restart the server...
 #
@@ -778,12 +784,12 @@ echo "\"5.10-restart\":" >>$strfile
 kill -HUP $cupsd

 while true; do
+	sleep 10
+
 	running=`../systemv/lpstat -r 2>/dev/null`
 	if test "x$running" = "xscheduler is running"; then
 		break
 	fi
-
-	sleep 10
 done

 description="`lpstat -l -p Test1 | grep Description | sed -e '1,$s/^[^:]*: //g'`"
@@ -1060,5 +1066,5 @@ if test $fail != 0; then
 fi

 #
-# End of "$Id: run-stp-tests.sh 12065 2014-07-30 17:56:35Z msweet $"
+# End of "$Id: run-stp-tests.sh 12101 2014-08-20 15:10:51Z msweet $"
 #
@@ -1,9 +1,9 @@
 /*
- * "$Id: config.h 12031 2014-07-15 19:57:59Z msweet $"
+ * "$Id: config.h 12136 2014-08-29 15:19:40Z msweet $"
 *
 * Configuration file for CUPS on Windows.
 *
- * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2007-2014 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -53,6 +53,15 @@
 #define write		_write


+/*
+ * Map the POSIX strcasecmp() and strncasecmp() functions to the Win32 stricmp()
+ * and strnicmp() functions...
+ */
+
+#define strcasecmp	stricmp
+#define strncasecmp	strnicmp
+
+
 /*
 * Map the POSIX sleep() and usleep() functions to the Win32 Sleep() function...
 */
@@ -71,7 +80,7 @@ typedef unsigned long useconds_t;
 #  define R_OK		04
 #  define O_RDONLY	_O_RDONLY
 #  define O_WRONLY	_O_WRONLY
-#  define O_CREATE	_O_CREAT
+#  define O_CREAT	_O_CREAT
 #  define O_TRUNC	_O_TRUNC


@@ -163,7 +172,7 @@ typedef unsigned long useconds_t;


 /*
- * Do we have domain socket support?
+ * Do we have domain socket support, and if so what is the default one?
 */

 #undef CUPS_DEFAULT_DOMAINSOCKET
@@ -197,6 +206,13 @@ typedef unsigned long useconds_t;
 #define CUPS_STATEDIR "C:/CUPS/run"


+/*
+ * Do we have posix_spawn?
+ */
+
+/* #undef HAVE_POSIX_SPAWN */
+
+
 /*
 * Do we have ZLIB?
 */
@@ -209,10 +225,7 @@ typedef unsigned long useconds_t;
 * Do we have PAM stuff?
 */

-#ifndef HAVE_LIBPAM
 #define HAVE_LIBPAM 0
-#endif /* !HAVE_LIBPAM */
-
 /* #undef HAVE_PAM_PAM_APPL_H */
 /* #undef HAVE_PAM_SET_ITEM */
 /* #undef HAVE_PAM_SETCRED */
@@ -360,6 +373,13 @@ typedef unsigned long useconds_t;
 #define HAVE_SSL


+/*
+ * Do we have the gnutls_transport_set_pull_timeout_function function?
+ */
+
+/* #undef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION */
+
+
 /*
 * What Security framework headers do we have?
 */
@@ -382,6 +402,20 @@ typedef unsigned long useconds_t;
 /* #undef HAVE_CSSMERRORSTRING */


+/*
+ * Do we have the SecGenerateSelfSignedCertificate function?
+ */
+
+/* #undef HAVE_SECGENERATESELFSIGNEDCERTIFICATE */
+
+
+/*
+ * Do we have the SecKeychainOpen function?
+ */
+
+/* #undef HAVE_SECKEYCHAINOPEN */
+
+
 /*
 * Do we have libpaper?
 */
@@ -502,6 +536,13 @@ typedef unsigned long useconds_t;
 /* #undef HAVE_LAUNCHD */


+/*
+ * Do we have systemd support?
+ */
+
+/* #undef HAVE_SYSTEMD */
+
+
 /*
 * Various scripting languages...
 */
@@ -579,6 +620,7 @@ typedef unsigned long useconds_t;

 /* #undef HAVE_DBUS */
 /* #undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND */
+/* #undef HAVE_DBUS_THREADS_INIT */


 /*
@@ -750,5 +792,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */

 /*
- * End of "$Id: config.h 12031 2014-07-15 19:57:59Z msweet $".
+ * End of "$Id: config.h 12136 2014-08-29 15:19:40Z msweet $".
 */
@@ -50,6 +50,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippfind", "ippfind.vcproj",
 		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
 	EndProjectSection
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "sw-ippeveselfcert10", "sw-ippeveselfcert10.vdproj", "{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippserver", "ippserver.vcproj", "{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -137,6 +144,22 @@ Global
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|Win32.Build.0 = Release|Win32
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|x64.ActiveCfg = Release|x64
 		{B484DA0C-62C8-4C32-83B6-CCEB58968B85}.Release|x64.Build.0 = Release|x64
+		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Debug|Win32.ActiveCfg = Debug
+		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Debug|Win32.Build.0 = Debug
+		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Debug|x64.ActiveCfg = Debug
+		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Debug|x64.Build.0 = Debug
+		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Release|Win32.ActiveCfg = Release
+		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Release|Win32.Build.0 = Release
+		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Release|x64.ActiveCfg = Release
+		{7F6DD7F5-7DCC-4C7A-8647-E253E4E00A37}.Release|x64.Build.0 = Release
+		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Debug|Win32.Build.0 = Debug|Win32
+		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Debug|x64.ActiveCfg = Debug|x64
+		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Debug|x64.Build.0 = Debug|x64
+		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Release|Win32.ActiveCfg = Release|Win32
+		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Release|Win32.Build.0 = Release|Win32
+		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Release|x64.ActiveCfg = Release|x64
+		{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ippserver"
+	ProjectGUID="{82A03BC7-0746-4B85-8908-3C7A3FAA58A9}"
+	RootNamespace="ippserver"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="1"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="dnssd.lib ws2_32.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="1"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="dnssd.lib ws2_32.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="1"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="dnssd.lib ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="1"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="dnssd.lib ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{5129820B-88C2-40AE-BE81-C7957F76540D}"
+			>
+			<File
+				RelativePath="..\test\ippserver.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{CAF4FFBF-7D66-4368-A03A-3FD0971B59A0}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{17D3B9CD-53D2-47AF-9D2A-4516D777D695}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
@@ -1530,6 +1530,10 @@
 				RelativePath=".\config.h"
 				>
 			</File>
+			<File
+				RelativePath="..\cups\cups-private.h"
+				>
+			</File>
 			<File
 				RelativePath="..\cups\cups.h"
 				>
@@ -30,6 +30,7 @@
 			);
 			dependencies = (
 				274FF5E313332D4300317ECB /* PBXTargetDependency */,
+				72BEA8D819AFA8BB0085F0F3 /* PBXTargetDependency */,
 				72F75A711336FACD004BB496 /* PBXTargetDependency */,
 				274FF5E513332D4300317ECB /* PBXTargetDependency */,
 				274FF622133331D300317ECB /* PBXTargetDependency */,
@@ -44,6 +45,8 @@
 				274FF65E13333A3400317ECB /* PBXTargetDependency */,
 				724379531333FECE009631B9 /* PBXTargetDependency */,
 				724379111333E4EA009631B9 /* PBXTargetDependency */,
+				72BEA8D619AFA8A00085F0F3 /* PBXTargetDependency */,
+				72BEA8D419AFA89C0085F0F3 /* PBXTargetDependency */,
 				276683FF1337F7C5000D33D0 /* PBXTargetDependency */,
 				7243792B1333E962009631B9 /* PBXTargetDependency */,
 				276683D71337B24A000D33D0 /* PBXTargetDependency */,
@@ -893,6 +896,27 @@
 			remoteGlobalIDString = 274FF6891333B1C400317ECB;
 			remoteInfo = libcups_static;
 		};
+		72BEA8D319AFA89C0085F0F3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 726AD6F6135E88F0002C930D;
+			remoteInfo = ippserver;
+		};
+		72BEA8D519AFA8A00085F0F3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 72CF95E618A19134000FCAE4;
+			remoteInfo = ippfind;
+		};
+		72BEA8D719AFA8BB0085F0F3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 274FF6891333B1C400317ECB;
+			remoteInfo = libcups_static;
+		};
 		72CF95E818A19134000FCAE4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
@@ -3925,6 +3949,21 @@
 			target = 274FF6891333B1C400317ECB /* libcups_static */;
 			targetProxy = 726AD705135E8AC5002C930D /* PBXContainerItemProxy */;
 		};
+		72BEA8D419AFA89C0085F0F3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 726AD6F6135E88F0002C930D /* ippserver */;
+			targetProxy = 72BEA8D319AFA89C0085F0F3 /* PBXContainerItemProxy */;
+		};
+		72BEA8D619AFA8A00085F0F3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 72CF95E618A19134000FCAE4 /* ippfind */;
+			targetProxy = 72BEA8D519AFA8A00085F0F3 /* PBXContainerItemProxy */;
+		};
+		72BEA8D819AFA8BB0085F0F3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 274FF6891333B1C400317ECB /* libcups_static */;
+			targetProxy = 72BEA8D719AFA8BB0085F0F3 /* PBXContainerItemProxy */;
+		};
 		72CF95E718A19134000FCAE4 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 72220EAD1333047D00FCA411 /* libcups */;
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h 11591 2014-02-14 16:07:13Z msweet $"
+ * "$Id: config.h 12140 2014-08-30 01:51:22Z msweet $"
 *
 * Configuration file for CUPS and Xcode.
 *
@@ -624,13 +624,6 @@
 #endif /* HAVE_ARC4RANDOM */


-/*
- * Do we have vproc_transaction_begin/end?
- */
-
-#define HAVE_VPROC_TRANSACTION_BEGIN 1
-
-
 /*
 * Do we have libusb?
 */
@@ -706,5 +699,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */

 /*
- * End of "$Id: config.h 11591 2014-02-14 16:07:13Z msweet $".
+ * End of "$Id: config.h 12140 2014-08-30 01:51:22Z msweet $".
 */