Bump version to 2.3rc1.

Prep for v2.3rc1
Update localization files.
2019-05-21 12:59:32 -04:00 · 2019-05-21 12:59:04 -04:00 · 2019-05-17 10:17:40 -04:00 · 2019-05-17 10:02:27 -04:00 · 2019-05-17 07:53:30 -04:00 · 2019-05-17 07:43:00 -04:00
@@ -1,11 +1,6 @@
 *.a
 *.bck
 *.cgi
-*.1.gz
-*.3.gz
-*.5.gz
-*.7.gz
-*.8.gz
 *.o
 autom4te.cache
 config.h
@@ -132,7 +127,6 @@ scheduler/testlpd
 scheduler/testmime
 scheduler/testspeed
 scheduler/testsub
-systemv/accept
 systemv/cancel
 systemv/cupsaccept
 systemv/cupsaddsmb
@@ -148,7 +142,6 @@ systemv/lpinfo
 systemv/lpmove
 systemv/lpoptions
 systemv/lpstat
-systemv/reject
 templates/header.tmpl
 templates/*/header.tmpl
 test/cups-str-*.html
@@ -1,5 +1,26 @@
-CHANGES - 2.3b8 - 2019-05-02
-============================
+CHANGES - 2.3rc1 - 2019-05-21
+=============================
+
+
+Changes in CUPS v2.3rc1
+-----------------------
+
+- The `cups-config` script no longer adds extra libraries when linking against
+  shared libraries (Issue #5261)
+- The supplied example print documents have been optimized for size
+  (Issue #5529)
+- The `cupsctl` command now prevents setting "cups-files.conf" directives
+  (Issue #5530)
+- The "forbidden" message in the web interface is now explained (Issue #5547)
+- The footer in the web interface covered some content on small displays
+  (Issue #5574)
+- The libusb-based USB backend now enforces read limits, improving print speed
+  in many cases (Issue #5583)
+- The `ippeveprinter` command now looks for print commands in the "command"
+  subdirectory.
+- The `ipptool` command now supports `$date-current` and `$date-start` variables
+  to insert the current and starting date and time values, as well as ISO-8601
+  relative time values such as "PT30S" for 30 seconds in the future.


 Changes in CUPS v2.3b8
@@ -1,5 +1,5 @@
-INSTALL - CUPS v2.3b8 - 2019-05-02
-==================================
+INSTALL - CUPS v2.3rc1 - 2019-05-21
+===================================

 This file describes how to compile and install CUPS from source code. For more
 information on CUPS see the file called "README.md".  A complete change log can
@@ -168,14 +168,13 @@ DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
 DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
 DNSSD_BACKEND	=	@DNSSD_BACKEND@
 DSOFLAGS	=	@DSOFLAGS@
-DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS	=	@DNSSDLIBS@
 IPPFIND_BIN	=	@IPPFIND_BIN@
 IPPFIND_MAN	=	@IPPFIND_MAN@
 LDFLAGS		=	@LDFLAGS@
-LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
-LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
-LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+LINKCUPS	=	@LINKCUPS@
+LINKCUPSSTATIC	=	../cups/$(LIBCUPSSTATIC) $(LIBS)
+LIBS		=	$(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ) $(COMMONLIBS)
 ONDEMANDFLAGS	=	@ONDEMANDFLAGS@
 ONDEMANDLIBS	=	@ONDEMANDLIBS@
 OPTIM		=	@OPTIM@
@@ -265,7 +264,7 @@ USBQUIRKS	=	@USBQUIRKS@
 #

 .SILENT:
-.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+.SUFFIXES:	.a .c .cxx .h .o

 .c.o:
 	echo Compiling $<...
@@ -274,13 +273,3 @@ USBQUIRKS	=	@USBQUIRKS@
 .cxx.o:
 	echo Compiling $<...
 	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
-
-.man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
-	echo Linking $<...
-	$(RM) $@
-	$(LN) $< $@
-
-.man.1.gz .man.1m.gz .man.3.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
-	echo -n Compressing $<...
-	$(RM) $@
-	gzip -v9 <$< >$@
@@ -1,5 +1,5 @@
-README - CUPS v2.3b8 - 2019-05-02
-=================================
+README - CUPS v2.3rc1 - 2019-05-21
+==================================

 > **Note:** CUPS v2.3b8 is not production code.  Do not use on production
 > systems.  For a production version of CUPS, please see the CUPS 2.2.x
@@ -201,8 +201,7 @@ uninstall:

 test1284:	test1284.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o test1284 test1284.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -212,8 +211,7 @@ test1284:	test1284.o ../cups/$(LIBCUPSSTATIC)

 testbackend:	testbackend.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o testbackend testbackend.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -224,8 +222,7 @@ testbackend:	testbackend.o ../cups/$(LIBCUPSSTATIC)
 testsupplies:	testsupplies.o libbackend.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
 	$(LD_CC) $(ALL_LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
-		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-		$(COMMONLIBS) $(LIBZ)
+		$(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -246,7 +243,7 @@ libbackend.a:	$(LIBOBJS)

 dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(DNSSDLIBS) $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	if test `uname` = Darwin; then \
 		$(RM) mdns; \
@@ -260,7 +257,7 @@ dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a

 ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o ipp ipp.o libbackend.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	$(RM) http https ipps
 	for file in $(IPPALIASES); do \
@@ -274,7 +271,7 @@ ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a

 lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o lpd lpd.o libbackend.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -284,7 +281,7 @@ lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a

 snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o snmp snmp.o libbackend.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -294,14 +291,13 @@ snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a

 socket:	socket.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o socket socket.o libbackend.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

 socket-static:	socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
 	echo Linking $@...
 	$(LD_CC) $(ALL_LDFLAGS) -o socket-static socket.o libbackend.a \
-		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-		$(COMMONLIBS) $(LIBZ)
+		$(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -312,7 +308,7 @@ socket-static:	socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
 usb:	usb.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
 	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
-		$(BACKLIBS) $(LIBS)
+		$(BACKLIBS) $(COMMONLIBS) $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c

@@ -1,9 +1,10 @@
 /*
 * LIBUSB interface code for CUPS.
 *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2019 by Apple Inc.
 *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
 */

 /*
@@ -1742,8 +1743,7 @@ static void *read_thread(void *reference)
    * Make sure this loop executes no more than once every 250 miliseconds...
    */

-    if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) &&
-        (g.wait_eof || !g.read_thread_stop))
+    if ((g.wait_eof || !g.read_thread_stop))
    {
      gettimeofday(&now, NULL);
      if (timercmp(&now, &end, <))
@@ -120,7 +120,7 @@ uninstall:

 lpc:	lpc.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o lpc lpc.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o lpc lpc.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -130,7 +130,7 @@ lpc:	lpc.o ../cups/$(LIBCUPS)

 lpq:	lpq.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o lpq lpq.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o lpq lpq.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -140,7 +140,7 @@ lpq:	lpq.o ../cups/$(LIBCUPS)

 lpr:	lpr.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o lpr lpr.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o lpr lpr.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -150,7 +150,7 @@ lpr:	lpr.o ../cups/$(LIBCUPS)

 lprm:	lprm.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o lprm lprm.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o lprm lprm.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -158,7 +158,7 @@ libcupscgi.a:	$(LIBOBJS)

 admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ admin.o libcupscgi.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ admin.o libcupscgi.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -168,7 +168,7 @@ admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a

 classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ classes.o libcupscgi.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ classes.o libcupscgi.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -178,7 +178,7 @@ classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a

 help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ help.o libcupscgi.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ help.o libcupscgi.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -188,7 +188,7 @@ help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a

 jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ jobs.o libcupscgi.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ jobs.o libcupscgi.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -198,7 +198,7 @@ jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a

 printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ printers.o libcupscgi.a $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ printers.o libcupscgi.a $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -209,8 +209,7 @@ printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
 	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcgi.o libcupscgi.a \
-		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
-		$(LIBZ) $(LIBGSSAPI)
+		$(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Testing CGI API...
 	./testcgi
@@ -223,8 +222,7 @@ testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
 	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhi.o libcupscgi.a \
-		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
-		$(LIBZ) $(LIBGSSAPI)
+		$(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Testing help index API...
 	./testhi
@@ -236,8 +234,7 @@ testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)

 testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
-		$(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testtemplate.o libcupscgi.a $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -78,45 +78,20 @@ AC_SUBST(LIBCUPSIMAGE)
 AC_SUBST(LIBCUPSSTATIC)

 if test x$enable_shared = xno; then
-	LINKCUPS="../cups/lib$cupsbase.a"
-	EXTLINKCUPS="-lcups"
-
-	if test "x$cupsimagebase" != x; then
-		LINKCUPSIMAGE="../cups/lib$cupsimagebase.a"
-		EXTLINKCUPSIMAGE="-l$cupsimagebase"
-	else
-		LINKCUPSIMAGE=""
-		EXTLINKCUPSIMAGE=""
-	fi
+	LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)"
+	EXTLINKCUPS="-lcups \$LIBS"
 else
-	LINKCUPS="-l${cupsbase}"
+	LINKCUPS="-L../cups -l${cupsbase}"
 	EXTLINKCUPS="-lcups"
-
-	if test "x$cupsimagebase" != x; then
-		LINKCUPSIMAGE="-l$cupsimagebase"
-		EXTLINKCUPSIMAGE="-l$cupsimagebase"
-	else
-		LINKCUPSIMAGE=""
-		EXTLINKCUPSIMAGE=""
-	fi
 fi

 AC_SUBST(EXTLINKCUPS)
-AC_SUBST(EXTLINKCUPSIMAGE)
 AC_SUBST(LINKCUPS)
-AC_SUBST(LINKCUPSIMAGE)

 dnl Update libraries for DSOs...
 EXPORT_LDFLAGS=""

 if test "$DSO" != ":"; then
-	# When using DSOs the image libraries are linked to libcupsimage.so
-	# rather than to the executables.  This makes things smaller if you
-	# are using any static libraries, and it also allows us to distribute
-	# a single DSO rather than a bunch...
-	DSOLIBS="\$(LIBZ)"
-	IMGLIBS=""
-
 	# Tell the run-time linkers where to find a DSO.  Some platforms
 	# need this option, even when the library is installed in a
 	# standard location...
@@ -146,11 +121,6 @@ if test "$DSO" != ":"; then
 			fi
 			;;
 	esac
-else
-	DSOLIBS=""
-	IMGLIBS="\$(LIBZ)"
 fi

-AC_SUBST(DSOLIBS)
-AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for CUPS 2.3b8.
+# Generated by GNU Autoconf 2.68 for CUPS 2.3rc1.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.3b8'
-PACKAGE_STRING='CUPS 2.3b8'
+PACKAGE_VERSION='2.3rc1'
+PACKAGE_STRING='CUPS 2.3rc1'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'

@@ -682,11 +682,7 @@ LIBTOOL
 LD_CXX
 LD_CC
 EXPORT_LDFLAGS
-IMGLIBS
-DSOLIBS
-LINKCUPSIMAGE
 LINKCUPS
-EXTLINKCUPSIMAGE
 EXTLINKCUPS
 LIBCUPSSTATIC
 LIBCUPSIMAGE
@@ -1453,7 +1449,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures CUPS 2.3b8 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.3rc1 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1518,7 +1514,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.3b8:";;
+     short | recursive ) echo "Configuration of CUPS 2.3rc1:";;
   esac
  cat <<\_ACEOF

@@ -1699,7 +1695,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-CUPS configure 2.3b8
+CUPS configure 2.3rc1
 generated by GNU Autoconf 2.68

 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2163,7 +2159,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by CUPS $as_me 2.3b8, which was
+It was created by CUPS $as_me 2.3rc1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was

  $ $0 $@
@@ -2680,7 +2676,7 @@ done
 ac_config_headers="$ac_config_headers config.h"


-CUPS_VERSION="2.3b8"
+CUPS_VERSION="2.3rc1"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"

@@ -6546,44 +6542,19 @@ fi


 if test x$enable_shared = xno; then
-	LINKCUPS="../cups/lib$cupsbase.a"
-	EXTLINKCUPS="-lcups"
-
-	if test "x$cupsimagebase" != x; then
-		LINKCUPSIMAGE="../cups/lib$cupsimagebase.a"
-		EXTLINKCUPSIMAGE="-l$cupsimagebase"
-	else
-		LINKCUPSIMAGE=""
-		EXTLINKCUPSIMAGE=""
-	fi
+	LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)"
+	EXTLINKCUPS="-lcups \$LIBS"
 else
-	LINKCUPS="-l${cupsbase}"
+	LINKCUPS="-L../cups -l${cupsbase}"
 	EXTLINKCUPS="-lcups"
-
-	if test "x$cupsimagebase" != x; then
-		LINKCUPSIMAGE="-l$cupsimagebase"
-		EXTLINKCUPSIMAGE="-l$cupsimagebase"
-	else
-		LINKCUPSIMAGE=""
-		EXTLINKCUPSIMAGE=""
-	fi
 fi




-
-
 EXPORT_LDFLAGS=""

 if test "$DSO" != ":"; then
-	# When using DSOs the image libraries are linked to libcupsimage.so
-	# rather than to the executables.  This makes things smaller if you
-	# are using any static libraries, and it also allows us to distribute
-	# a single DSO rather than a bunch...
-	DSOLIBS="\$(LIBZ)"
-	IMGLIBS=""
-
 	# Tell the run-time linkers where to find a DSO.  Some platforms
 	# need this option, even when the library is installed in a
 	# standard location...
@@ -6613,16 +6584,11 @@ if test "$DSO" != ":"; then
 			fi
 			;;
 	esac
-else
-	DSOLIBS=""
-	IMGLIBS="\$(LIBZ)"
 fi




-
-
 # Check whether --enable-libtool_unsupported was given.
 if test "${enable_libtool_unsupported+set}" = set; then :
  enableval=$enable_libtool_unsupported; if test x$enable_libtool_unsupported != xno; then
@@ -10411,7 +10377,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CUPS $as_me 2.3b8, which was
+This file was extended by CUPS $as_me 2.3rc1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -10474,7 +10440,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-CUPS config.status 2.3b8
+CUPS config.status 2.3rc1
 configured by $0, generated by GNU Autoconf 2.68,
  with options \\"\$ac_cs_config\\"

@@ -12,7 +12,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)

 dnl Package name and version...
-AC_INIT([CUPS], [2.3b8], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.3rc1], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])

 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
@@ -26,10 +26,10 @@ cups_serverbin=@CUPS_SERVERBIN@
 cups_serverroot=@CUPS_SERVERROOT@
 INSTALLSTATIC=@INSTALLSTATIC@

-# flags for C++ compiler:
+# flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"

 # Check for local invocation...
 selfdir=`dirname $0`
@@ -71,7 +71,6 @@ fi

 # Parse command line options
 static=no
-image=no

 while test $# -gt 0; do
    case $1 in
@@ -98,7 +97,7 @@ while test $# -gt 0; do
 	    ;;
 	--libs)
 	    if test $static = no; then
-	        libs="@EXTLINKCUPS@ $LIBS";
+	        libs="@EXTLINKCUPS@";
 	    else
 	        libs="$libdir/libcups.a $LIBS";
 	    fi
@@ -112,7 +111,7 @@ while test $# -gt 0; do
 	    ;;
 	--static)
 	    if test -z "$INSTALLSTATIC"; then
-	        echo "WARNING: Static libraries not installed!" >&2
+	        echo "WARNING: Static libraries not installed." >&2
 	    else
 	        static=yes
 	    fi
@@ -365,8 +365,7 @@ uninstall:

 libcups.so.2:	$(LIBOBJS)
 	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(LIBOBJS) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`

@@ -381,8 +380,7 @@ libcups.2.dylib:	$(LIBOBJS)
 		-install_name $(libdir)/$@ \
 		-current_version 2.14.0 \
 		-compatibility_version 2.0.0 \
-		$(LIBOBJS) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+		$(LIBOBJS) $(LIBS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	$(RM) libcups.dylib
 	$(LN) $@ libcups.dylib
@@ -395,8 +393,7 @@ libcups.2.dylib:	$(LIBOBJS)
 libcups.la:    $(LIBOBJS)
 	echo Linking $@...
 	$(LD_CC) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
-		-rpath $(LIBDIR) -version-info 2:14 $(LIBGSSAPI) $(SSLLIBS) \
-		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+		-rpath $(LIBDIR) -version-info 2:14 $(LIBS)


 #
@@ -420,7 +417,8 @@ libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile
 	echo "VERSION 2.14" >>libcups2.def
 	echo "EXPORTS" >>libcups2.def
 	(nm $(LIBOBJS) $(IMAGEOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
-	 echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy) | \
+	 echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy; \
+	 echo __cups_snprintf; echo __cups_vsnprintf; echo __cups_gettimeofday) | \
 		grep -v -E \
 		    -e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel|SNMP' \
 		    -e 'Block$$' | \
@@ -433,7 +431,7 @@ libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile

 libcupsimage.so.2:	$(IMAGEOBJS) libcups.so.2
 	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) $(LINKCUPS)
+	$(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS) $(LINKCUPS)
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`

@@ -448,7 +446,7 @@ libcupsimage.2.dylib:	$(IMAGEOBJS) libcups.2.dylib
 		-install_name $(libdir)/$@ \
 		-current_version 2.3.0 \
 		-compatibility_version 2.0.0 \
-		$(IMAGEOBJS) $(DSOLIBS) $(LINKCUPS)
+		$(IMAGEOBJS) $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	$(RM) libcupsimage.dylib
 	$(LN) $@ libcupsimage.dylib
@@ -460,7 +458,7 @@ libcupsimage.2.dylib:	$(IMAGEOBJS) libcups.2.dylib

 libcupsimage.la:       $(IMAGEOBJS) libcups.la
 	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+	$(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) \
 		$(LINKCUPS) -rpath $(LIBDIR) -version-info 2:3


@@ -481,8 +479,7 @@ libcupsimage.a:	$(IMAGEOBJS)

 rasterbench:	rasterbench.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ rasterbench.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ rasterbench.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -492,8 +489,7 @@ rasterbench:	rasterbench.o $(LIBCUPSSTATIC)

 testadmin:	testadmin.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testadmin.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -503,8 +499,7 @@ testadmin:	testadmin.o $(LIBCUPSSTATIC)

 testarray:	testarray.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testarray.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running array API tests...
 	./testarray
@@ -516,8 +511,7 @@ testarray:	testarray.o $(LIBCUPSSTATIC)

 testcache:	testcache.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testcache.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -527,8 +521,7 @@ testcache:	testcache.o $(LIBCUPSSTATIC)

 testclient:	testclient.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testclient.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testclient.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -538,8 +531,7 @@ testclient:	testclient.o $(LIBCUPSSTATIC)

 testconflicts:	testconflicts.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testconflicts.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -549,8 +541,7 @@ testconflicts:	testconflicts.o $(LIBCUPSSTATIC)

 testcreds:	testcreds.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcreds.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -560,8 +551,7 @@ testcreds:	testcreds.o $(LIBCUPSSTATIC)

 testcups:	testcups.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testcups.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -571,8 +561,7 @@ testcups:	testcups.o $(LIBCUPSSTATIC)

 testdest:	testdest.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testdest.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -582,8 +571,7 @@ testdest:	testdest.o $(LIBCUPSSTATIC)

 testfile:	testfile.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testfile.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running file API tests...
 	./testfile
@@ -595,8 +583,7 @@ testfile:	testfile.o $(LIBCUPSSTATIC)

 testgetdests:	testgetdests.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testgetdests.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testgetdests.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -606,8 +593,7 @@ testgetdests:	testgetdests.o $(LIBCUPSSTATIC)

 testhttp:	testhttp.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhttp.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running HTTP API tests...
 	./testhttp
@@ -619,8 +605,7 @@ testhttp:	testhttp.o $(LIBCUPSSTATIC)

 testipp:	testipp.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testipp.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running IPP API tests...
 	./testipp
@@ -632,8 +617,7 @@ testipp:	testipp.o $(LIBCUPSSTATIC)

 testi18n:	testi18n.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testi18n.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running internationalization API tests...
 	./testi18n
@@ -645,8 +629,7 @@ testi18n:	testi18n.o $(LIBCUPSSTATIC)

 testlang:	testlang.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testlang.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Creating locale directory structure...
 	$(RM) -r locale
@@ -665,8 +648,7 @@ testlang:	testlang.o $(LIBCUPSSTATIC)

 testoptions:	testoptions.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testoptions.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running option API tests...
 	./testoptions
@@ -678,8 +660,7 @@ testoptions:	testoptions.o $(LIBCUPSSTATIC)

 testppd:	testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testppd.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running PPD API tests...
 	./testppd
@@ -691,8 +672,7 @@ testppd:	testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd

 testpwg:	testpwg.o $(LIBCUPSSTATIC) test.ppd
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testpwg.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running PWG API tests...
 	./testpwg test.ppd
@@ -704,9 +684,7 @@ testpwg:	testpwg.o $(LIBCUPSSTATIC) test.ppd

 testraster:	testraster.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testraster.o \
-		$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
-		$(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testraster.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running raster API tests...
 	./testraster
@@ -718,8 +696,7 @@ testraster:	testraster.o $(LIBCUPSSTATIC)

 testsnmp:	testsnmp.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ testsnmp.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -729,8 +706,7 @@ testsnmp:	testsnmp.o $(LIBCUPSSTATIC)

 tlscheck:	tlscheck.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ tlscheck.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -1,7 +1,7 @@
 /*
 * IPP data file parsing functions.
 *
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
 * Copyright © 1997-2007 by Easy Software Products.
 *
 * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -303,7 +303,10 @@ _ippFileReadToken(_ipp_file_t *f,	/* I - File to read from */
      * Start of quoted text or regular expression...
      */

-      quote = ch;
+      if (ch == '<')
+        quote = '>';
+      else
+        quote = ch;

      DEBUG_printf(("1_ippFileReadToken: Start of quoted string, quote=%c, pos=%ld", quote, (long)cupsFileTell(f->fp)));
    }
@@ -366,6 +369,20 @@ _ippFileReadToken(_ipp_file_t *f,	/* I - File to read from */
 	  f->linenum ++;
 	  DEBUG_printf(("1_ippFileReadToken: quoted LF, linenum=%d, pos=%ld", f->linenum, (long)cupsFileTell(f->fp)));
 	}
+	else if (ch == 'a')
+	  ch = '\a';
+	else if (ch == 'b')
+	  ch = '\b';
+	else if (ch == 'f')
+	  ch = '\f';
+	else if (ch == 'n')
+	  ch = '\n';
+	else if (ch == 'r')
+	  ch = '\r';
+	else if (ch == 't')
+	  ch = '\t';
+	else if (ch == 'v')
+	  ch = '\v';
      }

      if (tokptr < tokend)
@@ -445,14 +462,14 @@ parse_collection(

      if (!_ippFileReadToken(f, syntax, sizeof(syntax)))
      {
-        report_error(f, v, user_data, "Missing ATTR syntax on line %d of \"%s\".", f->linenum, f->filename);
+        report_error(f, v, user_data, "Missing MEMBER syntax on line %d of \"%s\".", f->linenum, f->filename);
 	ippDelete(col);
 	col = NULL;
 	break;
      }
      else if ((value_tag = ippTagValue(syntax)) < IPP_TAG_UNSUPPORTED_VALUE)
      {
-        report_error(f, v, user_data, "Bad ATTR syntax \"%s\" on line %d of \"%s\".", syntax, f->linenum, f->filename);
+        report_error(f, v, user_data, "Bad MEMBER syntax \"%s\" on line %d of \"%s\".", syntax, f->linenum, f->filename);
 	ippDelete(col);
 	col = NULL;
 	break;
@@ -460,7 +477,7 @@ parse_collection(

      if (!_ippFileReadToken(f, name, sizeof(name)) || !name[0])
      {
-        report_error(f, v, user_data, "Missing ATTR name on line %d of \"%s\".", f->linenum, f->filename);
+        report_error(f, v, user_data, "Missing MEMBER name on line %d of \"%s\".", f->linenum, f->filename);
 	ippDelete(col);
 	col = NULL;
 	break;
@@ -535,8 +552,11 @@ parse_value(_ipp_file_t      *f,	/* I  - IPP data file */
            ipp_attribute_t  **attr,	/* IO - IPP attribute */
            int              element)	/* I  - Element number */
 {
-  char	value[1024],			/* Value string */
-	temp[1024];			/* Temporary string */
+  char		value[2049],		/* Value string */
+		*valueptr,		/* Pointer into value string */
+		temp[2049],		/* Temporary string */
+		*tempptr;		/* Pointer into temporary string */
+  size_t	valuelen;		/* Length of value */


  if (!_ippFileReadToken(f, temp, sizeof(temp)))
@@ -569,8 +589,80 @@ parse_value(_ipp_file_t      *f,	/* I  - IPP data file */
 		utc_offset = 0;		/* Timezone offset from UTC */
          ipp_uchar_t date[11];		/* dateTime value */

-          if (sscanf(value, "%d-%d-%dT%d:%d:%d%d", &year, &month, &day, &hour, &minute, &second, &utc_offset) < 6)
+          if (*value == 'P')
          {
+           /*
+            * Time period...
+            */
+
+            time_t	curtime;	/* Current time in seconds */
+            int		period = 0,	/* Current period value */
+			saw_T = 0;	/* Saw time separator */
+
+            curtime = time(NULL);
+
+            for (valueptr = value + 1; *valueptr; valueptr ++)
+            {
+              if (isdigit(*valueptr & 255))
+              {
+                period = (int)strtol(valueptr, &valueptr, 10);
+
+                if (!valueptr || period < 0)
+                {
+		  report_error(f, v, user_data, "Bad dateTime value \"%s\" on line %d of \"%s\".", value, f->linenum, f->filename);
+		  return (0);
+		}
+              }
+
+              if (*valueptr == 'Y')
+              {
+                curtime += 365 * 86400 * period;
+                period  = 0;
+              }
+              else if (*valueptr == 'M')
+              {
+                if (saw_T)
+                  curtime += 60 * period;
+                else
+                  curtime += 30 * 86400 * period;
+
+                period = 0;
+              }
+              else if (*valueptr == 'D')
+              {
+                curtime += 86400 * period;
+                period  = 0;
+              }
+              else if (*valueptr == 'H')
+              {
+                curtime += 3600 * period;
+                period  = 0;
+              }
+              else if (*valueptr == 'S')
+              {
+                curtime += period;
+                period = 0;
+              }
+              else if (*valueptr == 'T')
+              {
+                saw_T  = 1;
+                period = 0;
+              }
+              else
+	      {
+		report_error(f, v, user_data, "Bad dateTime value \"%s\" on line %d of \"%s\".", value, f->linenum, f->filename);
+		return (0);
+	      }
+	    }
+
+	    return (ippSetDate(ipp, attr, element, ippTimeToDate(curtime)));
+          }
+          else if (sscanf(value, "%d-%d-%dT%d:%d:%d%d", &year, &month, &day, &hour, &minute, &second, &utc_offset) < 6)
+          {
+           /*
+            * Date/time value did not parse...
+            */
+
 	    report_error(f, v, user_data, "Bad dateTime value \"%s\" on line %d of \"%s\".", value, f->linenum, f->filename);
 	    return (0);
          }
@@ -644,7 +736,44 @@ parse_value(_ipp_file_t      *f,	/* I  - IPP data file */
 	break;

    case IPP_TAG_STRING :
-        return (ippSetOctetString(ipp, attr, element, value, (int)strlen(value)));
+        valuelen = strlen(value);
+
+        if (value[0] == '<' && value[strlen(value) - 1] == '>')
+        {
+          if (valuelen & 1)
+          {
+	    report_error(f, v, user_data, "Bad octetString value on line %d of \"%s\".", f->linenum, f->filename);
+	    return (0);
+          }
+
+          valueptr = value + 1;
+          tempptr  = temp;
+
+          while (*valueptr && *valueptr != '>')
+          {
+	    if (!isxdigit(valueptr[0] & 255) || !isxdigit(valueptr[1] & 255))
+	    {
+	      report_error(f, v, user_data, "Bad octetString value on line %d of \"%s\".", f->linenum, f->filename);
+	      return (0);
+	    }
+
+            if (valueptr[0] >= '0' && valueptr[0] <= '9')
+              *tempptr = (char)((valueptr[0] - '0') << 4);
+	    else
+              *tempptr = (char)((tolower(valueptr[0]) - 'a' + 10) << 4);
+
+            if (valueptr[1] >= '0' && valueptr[1] <= '9')
+              *tempptr |= (valueptr[1] - '0');
+	    else
+              *tempptr |= (tolower(valueptr[1]) - 'a' + 10);
+
+            tempptr ++;
+          }
+
+          return (ippSetOctetString(ipp, attr, element, temp, (int)(tempptr - temp)));
+        }
+        else
+          return (ippSetOctetString(ipp, attr, element, value, (int)valuelen));
        break;

    case IPP_TAG_TEXTLANG :
@@ -667,7 +796,7 @@ parse_value(_ipp_file_t      *f,	/* I  - IPP data file */

          if (strcmp(value, "{"))
          {
-	    report_error(f, v, user_data, "Bad ATTR collection value on line %d of \"%s\".", f->linenum, f->filename);
+	    report_error(f, v, user_data, "Bad collection value on line %d of \"%s\".", f->linenum, f->filename);
 	    return (0);
          }

@@ -682,7 +811,7 @@ parse_value(_ipp_file_t      *f,	/* I  - IPP data file */
 	break;

    default :
-        report_error(f, v, user_data, "Unsupported ATTR value on line %d of \"%s\".", f->linenum, f->filename);
+        report_error(f, v, user_data, "Unsupported value on line %d of \"%s\".", f->linenum, f->filename);
        return (0);
  }

@@ -1779,6 +1779,12 @@ ippCreateRequestedArray(ipp_t *request)	/* I - IPP request */
    "requesting-user-name-allowed",	/* CUPS extension */
    "requesting-user-name-denied",	/* CUPS extension */
    "requesting-user-uri-supported",
+    "smi2699-auth-print-group",		/* PWG ippserver extension */
+    "smi2699-auth-proxy-group",		/* PWG ippserver extension */
+    "smi2699-device-command",		/* PWG ippserver extension */
+    "smi2699-device-format",		/* PWG ippserver extension */
+    "smi2699-device-name",		/* PWG ippserver extension */
+    "smi2699-device-uri",		/* PWG ippserver extension */
    "subordinate-printers-supported",
    "subscription-privacy-attributes",	/* IPP Privacy Attributes */
    "subscription-privacy-scope",	/* IPP Privacy Attributes */
@@ -1874,6 +1880,11 @@ ippCreateRequestedArray(ipp_t *request)	/* I - IPP request */
    "power-timeout-policy-col",
    "printer-creation-attributes-supported",
    "resource-settable-attributes-supported",
+    "smi2699-auth-group-supported",	/* PWG ippserver extension */
+    "smi2699-device-command-supported",	/* PWG ippserver extension */
+    "smi2699-device-format-format",	/* PWG ippserver extension */
+    "smi2699-device-uri-schemes-supported",
+					/* PWG ippserver extension */
    "system-contact-col",
    "system-current-time",
    "system-default-printer-id",
@@ -69,13 +69,16 @@ _cupsThreadCreate
 _cupsThreadDetach
 _cupsThreadWait
 _cupsUserDefault
+_cups_gettimeofday
 _cups_safe_vsnprintf
+_cups_snprintf
 _cups_strcasecmp
 _cups_strcpy
 _cups_strcpy
 _cups_strlcat
 _cups_strlcpy
 _cups_strncasecmp
+_cups_vsnprintf
 _httpAddrSetPort
 _httpCreateCredentials
 _httpDecodeURI
@@ -278,16 +281,28 @@ cupsPrintFiles2
 cupsPutFd
 cupsPutFile
 cupsRasterClose
+cupsRasterClose
+cupsRasterErrorString
 cupsRasterErrorString
 cupsRasterInitPWGHeader
+cupsRasterInitPWGHeader
+cupsRasterInterpretPPD
 cupsRasterInterpretPPD
 cupsRasterOpen
+cupsRasterOpen
+cupsRasterOpenIO
 cupsRasterOpenIO
 cupsRasterReadHeader
+cupsRasterReadHeader
+cupsRasterReadHeader2
 cupsRasterReadHeader2
 cupsRasterReadPixels
+cupsRasterReadPixels
+cupsRasterWriteHeader
 cupsRasterWriteHeader
 cupsRasterWriteHeader2
+cupsRasterWriteHeader2
+cupsRasterWritePixels
 cupsRasterWritePixels
 cupsReadResponseData
 cupsRemoveDest
@@ -79,6 +79,7 @@
  float: left;
  margin-left: 0.5%;
  margin-right: 0;
+  padding-bottom: 40px;
  width: 33%;
 }
 .row .thirds:first-child {
@@ -89,6 +90,7 @@
  float: left;
  margin-left: 0.5%;
  margin-right: 0;
+  padding-bottom: 40px;
  width: 49.75%;
 }
 .row .halves:first-child {
@@ -49,6 +49,6 @@
 	</div>
      </div>
    </div>
-    <div class="footer">CUPS og CUPS-logoet er varemærker som tilhører <a href="http://www.apple.com">Apple Inc.</a> Ophavsret &copy; 2007-2018 Apple Inc. Alle rettigheder forbeholdt.</div>
+    <div class="footer">CUPS og CUPS-logoet er varemærker som tilhører <a href="http://www.apple.com">Apple Inc.</a> Ophavsret &copy; 2007-2019 Apple Inc. Alle rettigheder forbeholdt.</div>
  </body>
 </html>
@@ -49,6 +49,6 @@
 	</div>
      </div>
    </div>
-    <div class="footer">CUPS und das CUPS Logo sind Warenzeichen der <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2018 Apple Inc. Alle Rechte vorbehalten.</div>
+    <div class="footer">CUPS und das CUPS Logo sind Warenzeichen der <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2019 Apple Inc. Alle Rechte vorbehalten.</div>
  </body>
 </html>
@@ -49,6 +49,6 @@
 	</div>
      </div>
    </div>
-    <div class="footer">CUPS y el logo de CUPS son marcas registradas de <a href="http://www.apple.com">Apple Inc.</a> Derechos de autor &copy; 2007-2018 Apple Inc. Todos los derechos reservados.</div>
+    <div class="footer">CUPS y el logo de CUPS son marcas registradas de <a href="http://www.apple.com">Apple Inc.</a> Derechos de autor &copy; 2007-2019 Apple Inc. Todos los derechos reservados.</div>
  </body>
 </html>
@@ -178,7 +178,7 @@ programs to send print jobs or
 <b>lpinfo</b>(8)
 to query for available printers using the backend.
 The one exception is the SNMP backend - see
-<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8)</a>
+<b>cups-snmp</b>(8)
 for more information.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS.
@@ -75,9 +75,9 @@ Cancel all jobs:
 </pre>
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 Administrators wishing to prevent unauthorized cancellation of jobs via the <i>-u</i> option should require authentication for Cancel-Jobs operations in
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5).</a>
+<b>cupsd.conf</b>(5).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cupsd.conf</b>(5),
 <b>lp</b>(1),
 <b>lpmove</b>(8),
 <b>lpstat</b>(1),
@@ -12,14 +12,14 @@ classes.conf - class configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>classes.conf</b> file defines the local printer classes that are available.
 It is normally located in the <i>/etc/cups</i> directory and is maintained by the
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 program.
 This file is not intended to be edited or managed manually.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),
@@ -11,7 +11,7 @@
 cups-files.conf - file and directory configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>cups-files.conf</b> file configures the files and directories used by the CUPS scheduler,
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
+<b>cupsd</b>(8).
 It is normally located in the <i>/etc/cups</i> directory.
 <p>Each line in the file can be a configuration directive, a blank line, or a comment.
 Configuration directives typically consist of a name and zero or more values separated by whitespace.
@@ -19,7 +19,7 @@ The configuration directive name and values are case-insensitive.
 Comment lines start with the # character.
 <h3><a name="DIRECTIVES">Directives</a></h3>
 The following directives are understood by
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <dl class="man">
 <dt><a name="AccessLog"></a><b>AccessLog</b>
 <dd style="margin-left: 5.0em"><dt><b>AccessLog </b><i>filename</i>
@@ -201,8 +201,8 @@ command is used instead.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>classes.conf</b>(5),
 <b>cups</b>(1),
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),
@@ -103,7 +103,7 @@ Simply enable the
 service using the corresponding control program.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>cups</b>(1),
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 <b>inetconv</b>(1m),
 <b>inetd</b>(8),
 <b>launchd</b>(8),
@@ -15,7 +15,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the <i>/etc/cups</i> directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 <p>The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
-<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8).</a>
+<b>cups-snmp</b>(8).
 <h2 class="title"><a name="DIRECTIVES">Directives</a></h2>
 The following directives are understood by the CUPS network backends:
 <dl class="man">
@@ -51,7 +51,7 @@ CUPS backends are deprecated and will no longer be supported in a future feature
 Printers that do not support IPP can be supported using applications such as
 <b>ippeveprinter</b>(1).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8),</a>
+<b>cups-snmp</b>(8),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
@@ -47,7 +47,7 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>backend</b>(7),
 <b>cups-snmp.conf</b>(5),
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 <b>lpinfo</b>(8),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
@@ -102,13 +102,13 @@ Printers that do not support IPP can be supported using applications such as
 <b>ippeveprinter</b>(1).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>cancel</b>(1),
-<a href="man-client.conf.html?TOPIC=Man+Pages"><b>client.conf</b>(7),</a>
+<b>client.conf</b>(7),
 <b>cupsctl</b>(8),
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 <b>lp</b>(1),
 <b>lpadmin</b>(8),
 <b>lpinfo</b>(8),
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
+<b>lpoptions</b>(1),
 <b>lpr</b>(1),
 <b>lprm</b>(1),
 <b>lpq</b>(1),
@@ -83,8 +83,8 @@ Disable printer sharing:
 <h2 class="title"><a name="KNOWN_ISSUES">Known Issues</a></h2>
 You cannot set the Listen or Port directives using <b>cupsctl</b>.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd.conf</b>(5),
+<b>cupsd</b>(8),
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
@@ -44,7 +44,7 @@ cupsd-helper - cupsd helper programs (deprecated)
 <i>argvN</i>
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>cupsd-helper</b> programs perform long-running operations on behalf of the scheduler,
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
+<b>cupsd</b>(8).
 The <b>cups-deviced</b> helper program runs each CUPS
 <b>backend</b>(7)
 with no arguments in order to discover the available printers.
@@ -76,8 +76,8 @@ Printers that do not support IPP can be supported using applications such as
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>backend</b>(7),
 <b>cups</b>(1),
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <b>filter</b>(7),
 <b>ppdcfile</b>(5),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
@@ -10,12 +10,12 @@
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsd-logs - cupsd log files (access_log, error_log, and page_log)
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 normally maintains three log files: <i>access_log</i> to track requests that are submitted to the scheduler, <i>error_log</i> to track progress and errors, and <i>page_log</i> to track pages that are printed.
 Configuration directives in
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
+<b>cupsd.conf</b>(5)
 and
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 control what information is logged and where it is stored.
 <h3><a name="ACCESS_LOG_FILE_FORMAT">Access Log File Format</a></h3>
 The <i>access_log</i> file lists each HTTP resource that is accessed by a web browser or client.
@@ -93,7 +93,7 @@ For POST requests the bytes field contains the number of bytes of non-IPP data t
 <p>The <i>ipp-status</i> field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 <h3><a name="ERROR_LOG_FILE_FORMAT">Error Log File Format</a></h3>
 The <i>error_log</i> file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
+<b>cupsd.conf</b>(5)
 file controls which messages are logged:
 <pre class="man">

@@ -158,7 +158,7 @@ For example the entry for a two page job called "myjob" might look like:

 </pre>
 The PageLogFormat directive in the
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
+<b>cupsd.conf</b>(5)
 file can be used to change this information.
 <p>The <i>printer</i> field contains the name of the printer that printed the page.
 If you send a job to a printer class, this field will contain the name of the printer that was assigned the job.
@@ -173,9 +173,9 @@ The format of this field is identical to the data-time field in the <i>access_lo
 <p>The <i>media</i> field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
 <p>The <i>sides</i> field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
+<b>cups-files.conf</b>(5),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
@@ -13,7 +13,7 @@ cupsd.conf - server configuration file for cups
 The
 <i>cupsd.conf</i>
 file configures the CUPS scheduler,
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
+<b>cupsd</b>(8).
 It is normally located in the
 <i>/etc/cups</i>
 directory.
@@ -23,7 +23,7 @@ The configuration directive name and values are case-insensitive.
 Comment lines start with the # character.
 <h3><a name="TOP_LEVEL_DIRECTIVES">Top-level Directives</a></h3>
 The following top-level directives are understood by
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <dl class="man">
 <dt><a name="AccessLogLevel"></a><b>AccessLogLevel config</b>
 <dd style="margin-left: 5.0em"><dt><b>AccessLogLevel actions</b>
@@ -119,7 +119,7 @@ The default service name is "http."
 <dd style="margin-left: 5.0em"><dt><b>HostNameLookups Double</b>
 <dd style="margin-left: 5.0em">Specifies whether to do reverse lookups on connecting clients.
 The "Double" setting causes
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 to verify that the hostname resolved from the address matches one of the addresses returned for that hostname.
 Double lookups also prevent clients with unregistered addresses from connecting to your server.
 The default is "Off" to avoid the potential server performance problems with hostname lookups.
@@ -128,7 +128,7 @@ Only set this option to "On" or "Double" if absolutely required.
 <dd style="margin-left: 5.0em">Specifies the length of time to wait before shutting down due to inactivity.
 The default is "60" seconds.
 Note: Only applicable when
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 is run on-demand (e.g., with <b>-l</b>).
 <dt><a name="JobKillDelay"></a><b>JobKillDelay </b><i>seconds</i>
 <dd style="margin-left: 5.0em">Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job.
@@ -307,7 +307,7 @@ The default is "No".
 </dl>
 <h3><a name="HTTP_METHOD_NAMES">Http Method Names</a></h3>
 The following HTTP methods are supported by
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <dl class="man">
 <dt>GET
 <dd style="margin-left: 5.0em">Used by a client to download icons and other printer resources and to access the CUPS web interface.
@@ -322,7 +322,7 @@ The following HTTP methods are supported by
 </dl>
 <h3><a name="IPP_OPERATION_NAMES">Ipp Operation Names</a></h3>
 The following IPP operations are supported by
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <dl class="man">
 <dt>CUPS-Accept-Jobs
 <dd style="margin-left: 5.0em">Allows a printer to accept new jobs.
@@ -415,7 +415,7 @@ The following IPP operations are supported by
 </dl>
 <h3><a name="LOCATION_PATHS">Location Paths</a></h3>
 The following paths are commonly used when configuring
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <dl class="man">
 <dt>/
 <dd style="margin-left: 5.0em">The path for all get operations (get-printers, get-jobs, etc.)
@@ -491,7 +491,7 @@ The default value is "IfRequested".
 <dt><b>Require user {</b><i>user-name</i>|<b>@</b><i>group-name</i>} ...
 <dd style="margin-left: 5.0em">Specifies that an authenticated user must match one of the named users or be a member of one of the named groups.
 The group name "@SYSTEM" corresponds to the list of groups defined by the SystemGroup directive in the
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 file.
 The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job.
 Note: The 'root' user is not special and must be granted privileges like any other user account.
@@ -514,7 +514,7 @@ The "default" access list is "@OWNER @SYSTEM".
 "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.
 "@OWNER" maps to the job's owner.
 "@SYSTEM" maps to the groups listed for the SystemGroup directive in the
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 file.
 <dt><b>JobPrivateValues all</b>
 <dd style="margin-left: 5.0em"><dt><b>JobPrivateValues default</b>
@@ -530,7 +530,7 @@ The "default" access list is "@OWNER @SYSTEM".
 "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.
 "@OWNER" maps to the job's owner.
 "@SYSTEM" maps to the groups listed for the SystemGroup directive in the
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 file.
 <dt><b>SubscriptionPrivateValues all</b>
 <dd style="margin-left: 5.0em"><dt><b>SubscriptionPrivateValues default</b>
@@ -577,7 +577,7 @@ The default is "128m".
 </dl>
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 File, directory, and user configuration directives that used to be allowed in the <b>cupsd.conf</b> file are now stored in the
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 file instead in order to prevent certain types of privilege escalation attacks.
 <p>The scheduler MUST be restarted manually after making changes to the <b>cupsd.conf</b> file.
 On Linux this is typically done using the
@@ -609,8 +609,8 @@ Require authentication for accesses from outside the 10. network:
 </pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>classes.conf</b>(5),
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cups-files.conf</b>(5),
+<b>cupsd</b>(8),
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),
@@ -104,9 +104,9 @@ in the foreground with a test configuration file called
 <b>backend</b>(7),
 <b>classes.conf</b>(5),
 <b>cups</b>(1),
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
-<a href="man-cups-lpd.html?TOPIC=Man+Pages"><b>cups-lpd</b>(8),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cups-files.conf</b>(5),
+<b>cups-lpd</b>(8),
+<b>cupsd.conf</b>(5),
 <b>cupsd-helper</b>(8),
 <b>cupsd-logs</b>(8),
 <b>filter</b>(7),
@@ -117,7 +117,7 @@ The following command will generate a PDF preview of job 42 for a printer named
 </pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>cups</b>(1),
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cupsd.conf</b>(5),
 <b>filter(7),</b>
 <b>mime.convs</b>(7),
 <b>mime.types</b>(7),
@@ -177,8 +177,8 @@ program to use the appropriate filters to do the conversions you need.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>backend</b>(7),
 <b>cups</b>(1),
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cups-files.conf</b>(5),
+<b>cupsd</b>(8),
 <b>cupsfilter</b>(8),
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
@@ -23,6 +23,9 @@ ippeveprinter - an ipp everywhere printer application for cups
 <b>-D</b>
 <i>device-uri</i>
 ] [
+<b>-F</b>
+<i>output-type/subtype</i>
+] [
 <b>-K</b>
 <i>keypath</i>
 ] [
@@ -94,6 +97,9 @@ The URI can be a filename, directory, or a network socket URI of the form "socke
 When specifying a directory,
 <b>ippeveprinter</b>
 will create an output file using the job ID and name.
+<dt><b>-F </b><i>output-type/subtype[,...]</i>
+<dd style="margin-left: 5.0em">Specifies the output MIME media type.
+The default is "application/postscript" when the <b>-P</b> option is specified.
 <dt><b>-M </b><i>manufacturer</i>
 <dd style="margin-left: 5.0em">Set the manufacturer of the printer.
 The default is "Example".
@@ -110,7 +116,7 @@ printer command ("-c ippeveps").
 <dd style="margin-left: 5.0em">Run the specified command for each document that is printed.
 If "command" is not an absolute path ("/path/to/command"),
 <b>ippeveprinter</b>
-looks for the command in the "ippeveprinter" subdirectory of the CUPS binary directory, typically /usr/lib/cups/ippeveprinter or /usr/libexec/cups/ippeveprinter.
+looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 <b>cups-config</b>(1)
 command can be used to discover the correct binary directory ("cups-config --serverbin").
@@ -169,12 +175,12 @@ program is unique to CUPS and conforms to the IPP Everywhere (PWG 5100.14) speci
 <b>ippeveprinter</b>
 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.
-<p>In addition, all IPP "xxx-default" Printer Description attributes are added to the environment.
+<p>In addition, all IPP "xxx-default" and "pwg-xxx" Printer Description attributes are added to the environment.
 For example, the "IPP_MEDIA_DEFAULT" environment variable will be set to the default value for the "media" Job Template attribute.
 <p>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".
 This string conversion only happens for standard Job Template attributes, currently "finishings", "orientation-requested", and "print-quality".
-<p>Finally, the "CONTENT_TYPE" environment variable contains the MIME media type of the document being printed, the "DEVICE_URI" environment variable contains the device URI as specified with the "-D" option, and the "PPD" environment variable contains the PPD filename as specified with the "-P" option.
+<p>Finally, the "CONTENT_TYPE" environment variable contains the MIME media type of the document being printed, the "DEVICE_URI" environment variable contains the device URI as specified with the "-D" option, the "OUTPUT_FORMAT" environment variable contains the output MIME media type, and the "PPD" environment variable contains the PPD filename as specified with the "-P" option.
 <h2 class="title"><a name="COMMAND_OUTPUT">Command Output</a></h2>
 Unless they communicate directly with a printer, print commands send printer-ready data to the standard output.
 <p>Print commands can send messages back to
@@ -213,6 +219,8 @@ command whenever a job is sent to the server:
    ippeveprinter -c /usr/bin/file "My Cool Printer"
 </pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
+<b>ippevepcl</b>(7),
+<b>ippeveps</b>(7),
 PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp">http://www.pwg.org/ipp</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
@@ -490,6 +490,10 @@ program maintains a list of variables that can be used in any literal string or
 <dd style="margin-left: 5.0em">Inserts a single "$" character.
 <dt><b>$ENV[</b><i>name</i><b>]</b>
 <dd style="margin-left: 5.0em">Inserts the value of the named environment variable, or an empty string if the environment variable is not defined.
+<dt><b>$date-current</b>
+<dd style="margin-left: 5.0em">Inserts the current date and time using the ISO-8601 format ("yyyy-mm-ddThh:mm:ssZ").
+<dt><b>$date-start</b>
+<dd style="margin-left: 5.0em">Inserts the starting date and time using the ISO-8601 format ("yyyy-mm-ddThh:mm:ssZ").
 <dt><b>$filename</b>
 <dd style="margin-left: 5.0em">Inserts the filename provided to
 <b>ipptool</b>(8)
@@ -86,7 +86,7 @@ Use a filename of "-" to force printing from the standard input.
 <h3><a name="THE_DEFAULT_DESTINATION">The Default Destination</a></h3>
 CUPS provides many ways to set the default destination. The <b>LPDEST</b> and <b>PRINTER</b> environment variables are consulted first.
 If neither are set, the current default set using the
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 command is used, followed by the default set using the
 <b>lpadmin</b>(8)
 command.
@@ -138,7 +138,7 @@ The page numbers refer to the output pages and not the document's original pages
 </dl>
 <h3><a name="COMMON_JOB_OPTIONS">Common Job Options</a></h3>
 Aside from the printer-specific options reported by the
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 command, the following generic options are available:
 <dl class="man">
 <dt><b>-o job-sheets=</b><i>name</i>
@@ -190,7 +190,7 @@ Print a presentation document 2-up to a printer called "bar":
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>cancel</b>(1),
 <b>lpadmin</b>(8),
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
+<b>lpoptions</b>(1),
 <b>lpq</b>(1),
 <b>lpr</b>(1),
 <b>lprm</b>(1),
@@ -60,7 +60,7 @@ Subsequent print jobs submitted via the
 or
 <b>lpr</b>(1)
 commands will use this destination unless the user specifies otherwise with the
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 command.
 <p>The second form of the command (<i>-p</i>) configures the named printer or class.  The additional options are described below.
 <p>The third form of the command (<i>-x</i>) deletes the printer or class <i>destination</i>.
@@ -99,7 +99,7 @@ The value is an integer number of seconds; 86,400 seconds are in one day.
 <dt><b>-o </b><i>name</i><b>=</b><i>value</i>
 <dd style="margin-left: 5.0em">Sets a PPD option for the printer.
 PPD options can be listed using the <i>-l</i> option with the
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 command.
 <dt><b>-o </b><i>name</i><b>-default=</b><i>value</i>
 <dd style="margin-left: 5.0em">Sets a default server-side option for the destination.
@@ -189,7 +189,7 @@ Create an IPP Everywhere print queue:
 <b>cupsaccept</b>(8),
 <b>cupsenable</b>(8),
 <b>lpinfo</b>(8),
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
+<b>lpoptions</b>(1),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
@@ -56,7 +56,7 @@ If no files are listed on the command-line, <b>lpr</b> reads the print file from
 <h3><a name="THE_DEFAULT_DESTINATION">The Default Destination</a></h3>
 CUPS provides many ways to set the default destination. The <b>LPDEST</b> and <b>PRINTER</b> environment variables are consulted first.
 If neither are set, the current default set using the
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 command is used, followed by the default set using the
 <b>lpadmin</b>(8)
 command.
@@ -97,7 +97,7 @@ This option is equivalent to <i>-o prettyprint</i> and is only useful when print
 </dl>
 <h3><a name="COMMON_JOB_OPTIONS">Common Job Options</a></h3>
 Aside from the printer-specific options reported by the
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 command, the following generic options are available:
 <dl class="man">
 <dt><b>-o job-sheets=</b><i>name</i>
@@ -148,7 +148,7 @@ Print a presentation document 2-up to a printer called "foo":
 <b>cancel</b>(1),
 <b>lp</b>(1),
 <b>lpadmin</b>(8),
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
+<b>lpoptions</b>(1),
 <b>lpq</b>(1),
 <b>lprm</b>(1),
 <b>lpstat</b>(1),
@@ -33,7 +33,7 @@ If multiple lines are present, only the last one is used.
 <dd style="margin-left: 5.0em">Specifies a prefix string for the subject line of an email notification.
 </dl>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
@@ -46,9 +46,9 @@ CUPS filters are deprecated and will no longer be supported in a future feature
 Printers that do not support IPP can be supported using applications such as
 <b>ippeveprinter</b>(1).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cups-files.conf</b>(5),
+<b>cupsd.conf</b>(5),
+<b>cupsd</b>(8),
 <b>cupsfilter</b>(8),
 <b>mime.types</b>(5),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
@@ -84,9 +84,9 @@ Define two MIME media types for raster data, with one being a subset with higher
                                  string(4,PwgRaster&lt;00>) priority(150)
 </pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cups-files.conf</b>(5),
+<b>cupsd.conf</b>(5),
+<b>cupsd</b>(8),
 <b>cupsfilter</b>(8),
 <b>mime.convs</b>(5),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
@@ -27,7 +27,7 @@ Notifiers are encouraged to exit after a suitable period of inactivity, however
 Notifiers inherit the environment and can use the logging mechanism documented in
 <b>filter</b>(7).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 <b>filter</b>(7),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
@@ -11,15 +11,15 @@
 printers.conf - printer configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>printers.conf</b> file defines the local printers that are available. It is normally located in the <i>/etc/cups</i> directory and is maintained by the
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 program. This file is not intended to be edited or managed manually.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>classes.conf</b>(5),
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cups-files.conf</b>(5),
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>subscriptions.conf</b>(5),
@@ -12,16 +12,16 @@ subscriptions.conf - subscription configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>subscriptions.conf</b> file defines the local event notification subscriptions that are active.
 It is normally located in the <i>/etc/cups</i> directory and is maintained by the
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 program.
 This file is not intended to be edited or managed manually.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>classes.conf</b>(5),
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cups-files.conf</b>(5),
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),
@@ -49,6 +49,6 @@
 	</div>
      </div>
    </div>
-    <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2018 Apple Inc. All rights reserved.</div>
+    <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2019 Apple Inc. All rights reserved.</div>
  </body>
 </html>
@@ -49,6 +49,6 @@
 	</div>
      </div>
    </div>
-    <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2018 Apple Inc. All rights reserved.</div>
+    <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2019 Apple Inc. All rights reserved.</div>
  </body>
 </html>
@@ -49,6 +49,6 @@
 	</div>
      </div>
    </div>
-    <div class="footer">CUPS e o logo do CUPS s&atilde;o marcas registradas da <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2018 Apple Inc. Todos os direitos reservados.</div>
+    <div class="footer">CUPS e o logo do CUPS s&atilde;o marcas registradas da <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2019 Apple Inc. Todos os direitos reservados.</div>
  </body>
 </html>
@@ -49,6 +49,6 @@
 </div>
      </div>
    </div>
-    <div class="footer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2018) компании Apple Inc. Все права защищены.</div>
+    <div class="footer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2019) компании Apple Inc. Все права защищены.</div>
  </body>
 </html>
@@ -158,7 +158,7 @@ apihelp:

 commandtops:	commandtops.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ commandtops.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ commandtops.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -168,7 +168,7 @@ commandtops:	commandtops.o ../cups/$(LIBCUPS)

 gziptoany:	gziptoany.o ../Makedefs ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ gziptoany.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -178,7 +178,7 @@ gziptoany:	gziptoany.o ../Makedefs ../cups/$(LIBCUPS)

 pstops:	pstops.o common.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ pstops.o common.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ pstops.o common.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -186,9 +186,9 @@ pstops:	pstops.o common.o ../cups/$(LIBCUPS)
 # rastertoepson
 #

-rastertoepson:	rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+rastertoepson:	rastertoepson.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertoepson.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -196,9 +196,9 @@ rastertoepson:	rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 # rastertohp
 #

-rastertohp:	rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+rastertohp:	rastertohp.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertohp.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -206,9 +206,9 @@ rastertohp:	rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 # rastertolabel
 #

-rastertolabel:	rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+rastertolabel:	rastertolabel.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertolabel.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -216,16 +216,14 @@ rastertolabel:	rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 # rastertopwg
 #

-rastertopwg:	rastertopwg.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+rastertopwg:	rastertopwg.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

-rastertopwg-static:	rastertopwg.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
+rastertopwg-static:	rastertopwg.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o ../cups/libcupsimage.a \
-		../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
-		$(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -160,8 +160,7 @@ cups.strings: cups_en.po po2strings
 checkpo:	checkpo.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
 	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o checkpo checkpo.o \
-		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-		$(COMMONLIBS) $(LIBZ)
+		$(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

 checkall:	checkpo
@@ -178,8 +177,7 @@ checkall:	checkpo
 po2strings:	po2strings.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
 	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o po2strings po2strings.o \
-		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-		$(COMMONLIBS) $(LIBZ)
+		$(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -409,6 +409,7 @@
 "-E                      Encrypt the connection to the server" = "-E                      Encrypt the connection to the server";
 "-E                      Test with encryption using HTTP Upgrade to TLS" = "-E                      Test with encryption using HTTP Upgrade to TLS";
 "-F                      Run in the foreground but detach from console." = "-F                      Run in the foreground but detach from console.";
+"-F output-type/subtype  Set the output format for the printer" = "-F output-type/subtype  Set the output format for the printer";
 "-H                      Show the default server and port" = "-H                      Show the default server and port";
 "-H HH:MM                Hold the job until the specified UTC time" = "-H HH:MM                Hold the job until the specified UTC time";
 "-H hold                 Hold the job until released/resumed" = "-H hold                 Hold the job until released/resumed";
@@ -1499,7 +1500,9 @@
 "Warning: This program will be removed in a future version of CUPS." = "Warning: This program will be removed in a future version of CUPS.";
 "Web Interface is Disabled" = "Web Interface is Disabled";
 "Yes" = "Yes";
+"You cannot access this page." = "You cannot access this page.";
 "You must access this page using the URL https://%s:%d%s." = "You must access this page using the URL https://%s:%d%s.";
+"Your account does not have the necessary privileges." = "Your account does not have the necessary privileges.";
 "ZPL Label Printer" = "ZPL Label Printer";
 "Zebra" = "Zebra";
 "aborted" = "aborted";
@@ -1645,7 +1648,7 @@
 "covering-name.pre-printed" = "Pre-printed";
 "cups-deviced failed to execute." = "cups-deviced failed to execute.";
 "cups-driverd failed to execute." = "cups-driverd failed to execute.";
-"cupsctl: Cannot set Listen or Port directly." = "cupsctl: Cannot set Listen or Port directly.";
+"cupsctl: Cannot set %s directly." = "cupsctl: Cannot set %s directly.";
 "cupsctl: Unable to connect to server: %s" = "cupsctl: Unable to connect to server: %s";
 "cupsctl: Unknown option \"%s\"" = "cupsctl: Unknown option “%s”";
 "cupsctl: Unknown option \"-%c\"" = "cupsctl: Unknown option “-%c”";
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-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"
@@ -1771,6 +1771,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5312,10 +5315,16 @@ msgstr "La interfície web està deshabilitada"
 msgid "Yes"
 msgstr "Sí"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "Heu d'accedir a aquesta pagina a través de la URL https://%s:%d%s."

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "Impressora d'etiquetes ZPL"

@@ -5613,8 +5622,9 @@ msgstr "no s'ha pogut executar correctament la cups-deviced."
 msgid "cups-driverd failed to execute."
 msgstr "no s'ha pogut executar correctament la cups-driverd"

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: no es pot establir Listen o Port directament."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15619,5 +15629,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Exportar les impressores al Samba"

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: no es pot establir Listen o Port directament."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: no s'ha pogut obrir el fitxer PPD «%s» - %s"
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-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"
@@ -1620,6 +1620,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5111,10 +5114,16 @@ msgstr ""
 msgid "Yes"
 msgstr "Ano"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "Pro přístup k této stránce, použijte adresu URL https://%s:%d%s."

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "Tiskárna štítků ZPL"

@@ -5412,7 +5421,8 @@ msgstr "Nepodařilo se spustit \"cups-deviced\"."
 msgid "cups-driverd failed to execute."
 msgstr "Nepodařilo se spustit \"cups-driverd\"."

-msgid "cupsctl: Cannot set Listen or Port directly."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
 msgstr ""

 #, c-format
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: 2017-10-25 14:57+0200\n"
 "Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n"
 "Language-Team: German <LL@li.org>\n"
@@ -1687,6 +1687,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5226,10 +5229,16 @@ msgstr "Web-Schnittstelle ist deaktiviert"
 msgid "Yes"
 msgstr "Ja"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "Auf diese Seite greifen Sie zu über die URL https://%s:%d%s."

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "ZPL-Etikettendrucker"

@@ -5527,8 +5536,9 @@ msgstr "„cups-deviced“ konnte nicht ausgeführt werden."
 msgid "cups-driverd failed to execute."
 msgstr "„cups-driverd“ konnte nicht ausgeführt werden."

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Kann nicht direkt auf dem Port hören."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15492,5 +15502,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Drucker zu Samba exportieren"

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Kann nicht direkt auf dem Port hören."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: Kann PPD Datei \"%s\" - %s nicht öffnen"
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3b6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
@@ -1797,6 +1797,9 @@ msgstr "-E                      Test with encryption using HTTP Upgrade to TLS"
 msgid "-F                      Run in the foreground but detach from console."
 msgstr "-F                      Run in the foreground but detach from console."

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr "-H                      Show the default server and port"

@@ -5390,10 +5393,16 @@ msgstr "Web Interface is Disabled"
 msgid "Yes"
 msgstr "Yes"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "You must access this page using the URL https://%s:%d%s."

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "ZPL Label Printer"

@@ -5691,8 +5700,9 @@ msgstr "cups-deviced failed to execute."
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd failed to execute."

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Cannot set Listen or Port directly."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15702,5 +15712,8 @@ msgstr "~/.cups/lpoptions file names default destination that does not exist."
 #~ "You must access this page using the URL <A HREF=\"https://%s:%d%s"
 #~ "\">https://%s:%d%s</A>."

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Cannot set Listen or Port directly."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: Unable to open PPD file \"%s\" - %s"
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: 2016-06-26 21:17+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <jpgriopedre@yahoo.es>\n"
 "Language-Team: Spanish\n"
@@ -1774,6 +1774,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5324,10 +5327,16 @@ msgstr "La interfaz web está desactivada."
 msgid "Yes"
 msgstr "Si"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "Debe acceder a esta página usando el URL https://%s:%d%s."

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "Impresora de etiquetas ZPL"

@@ -5625,8 +5634,9 @@ msgstr "Ha fallado al ejecutarse cups-deviced."
 msgid "cups-driverd failed to execute."
 msgstr "Ha fallado al ejecutarse cups-driverd."

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: No se puede establecer Listen o Port directamente."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15630,5 +15640,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Exportar impresoras a Samba"

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: No se puede establecer Listen o Port directamente."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: No se ha podido abrir el archivo PPD \"%s\" - %s"
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: Stéphane Blondon <stephane.blondon@gmail.com>\n"
 "Language-Team: French <LL@li.org>\n"
@@ -1631,6 +1631,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5129,10 +5132,16 @@ msgstr ""
 msgid "Yes"
 msgstr "Oui"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "Vous devez accéder à cette page par l’URL https://%s:%d%s."

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "Imprimante pour étiquettes ZPL"

@@ -5430,7 +5439,8 @@ msgstr "L’exécution de « cups-deviced » a échoué."
 msgid "cups-driverd failed to execute."
 msgstr "L’exécution de « cups-driverd » a échoué."

-msgid "cupsctl: Cannot set Listen or Port directly."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
 msgstr ""

 #, c-format
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Italian - Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -1771,6 +1771,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5314,10 +5317,16 @@ msgstr "L'interfaccia web è stata disabilitata"
 msgid "Yes"
 msgstr "Sì"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "Bisogna accedere a questa pagina, usando l'URL https://%s:%d%s."

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "ZPL Label Printer"

@@ -5615,8 +5624,9 @@ msgstr "cups-deviced ha smesso di funzionare."
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd ha smesso di funzionare."

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: non è possibile impostare direttamente Listen o Port."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15609,5 +15619,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Esporta le stampanti per Samba"

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: non è possibile impostare direttamente Listen o Port."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: non è possibile aprile il file PPD \"%s\" - %s"
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: 2014-11-15 19:27+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: Japanese - OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -1765,6 +1765,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5293,11 +5296,17 @@ msgstr "Web インターフェイスが無効になっています"
 msgid "Yes"
 msgstr "はい"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr ""
 "このページには URL https://%s:%d%s を使ってアクセスする必要があります。"

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "ZPL ラベルプリンター"

@@ -5595,8 +5604,9 @@ msgstr "cups-deviced の実行に失敗しました。"
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd の実行に失敗しました。"

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Listen あるいは Port を直接設定できません。"
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15627,5 +15637,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Samba へプリンターをエクスポート"

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Listen あるいは Port を直接設定できません。"
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: PPD ファイル \"%s\" を開けません - %s"
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: 2016-01-31 16:45-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <traducao-cups-pt-br@googlegroups.com>\n"
@@ -1778,6 +1778,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5320,10 +5323,16 @@ msgstr "Interface web está desabilitada"
 msgid "Yes"
 msgstr "Sim"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "Você tem que acessar esta página usando a URL https://%s:%d%s."

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "Impressora de etiqueta ZPL"

@@ -5621,8 +5630,9 @@ msgstr "cups-deviced falhou na execução."
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd falhou na execução."

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Não foi possível definir diretamente Porta ou Listen."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15606,5 +15616,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Exportar impressoras para o Samba"

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Não foi possível definir diretamente Porta ou Listen."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: Não foi possível abrir o arquivo PPD \"%s\" - %s"
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: Russian - PuppyRus Linux Team\n"
@@ -1746,6 +1746,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5270,11 +5273,17 @@ msgstr "Web интерфейс отключен"
 msgid "Yes"
 msgstr "Да"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr ""
 "Вы должны получить доступ к этой странице с помощью URL https://%s:%d%s"

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "Принтер для печати этикеток ZPL"

@@ -5572,8 +5581,9 @@ msgstr "Не удалось выполнить cups-deviced."
 msgid "cups-driverd failed to execute."
 msgstr "Не удалось выполнить cups-driverd."

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Не удается задать Listen или Port."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15556,5 +15566,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Экспортировать принтеры в Samba"

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Не удается задать Listen или Port."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: Не удается открыть PPD-файл \"%s\" - %s"
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-17 10:17-0400\n"
 "PO-Revision-Date: 2018-10-09 00:21-0500\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.io>\n"
 "Language-Team: Chinese (Simplified)\n"
@@ -1730,6 +1730,9 @@ msgstr ""
 msgid "-F                      Run in the foreground but detach from console."
 msgstr ""

+msgid "-F output-type/subtype  Set the output format for the printer"
+msgstr ""
+
 msgid "-H                      Show the default server and port"
 msgstr ""

@@ -5243,10 +5246,16 @@ msgstr "网页界面被禁用"
 msgid "Yes"
 msgstr "是"

+msgid "You cannot access this page."
+msgstr ""
+
 #, c-format
 msgid "You must access this page using the URL https://%s:%d%s."
 msgstr "你必须通过此 URL 访问此页面：https://%s:%d%s"

+msgid "Your account does not have the necessary privileges."
+msgstr ""
+
 msgid "ZPL Label Printer"
 msgstr "ZPL 标签打印机"

@@ -5544,8 +5553,9 @@ msgstr "无法执行 cups-deviced。"
 msgid "cups-driverd failed to execute."
 msgstr "无法执行 cups-driverd。"

-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl：无法直接设置 Listen 或 Port 值。"
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""

 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15512,5 +15522,8 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ msgid "Export Printers to Samba"
 #~ msgstr "将打印机导出到 Samba"

+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl：无法直接设置 Listen 或 Port 值。"
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin：无法打开 PPD 文件“%s”- %s"
@@ -223,7 +223,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 	done

 mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o \
-		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
-		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -6,7 +6,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH ippeveprinter 1 "CUPS" "24 April 2019" "Apple Inc."
+.TH ippeveprinter 1 "CUPS" "17 May 2019" "Apple Inc."
 .SH NAME
 ippeveprinter \- an ipp everywhere printer application for cups
 .SH SYNOPSIS
@@ -23,6 +23,9 @@ ippeveprinter \- an ipp everywhere printer application for cups
 .B \-D
 .I device-uri
 ] [
+.B \-F
+.I output-type/subtype
+] [
 .B \-K
 .I keypath
 ] [
@@ -99,6 +102,10 @@ When specifying a directory,
 .B ippeveprinter
 will create an output file using the job ID and name.
 .TP 5
+\fB\-F \fIoutput-type/subtype[,...]\fR
+Specifies the output MIME media type.
+The default is "application/postscript" when the \fB\-P\fR option is specified.
+.TP 5
 \fB\-M \fImanufacturer\fR
 Set the manufacturer of the printer.
 The default is "Example".
@@ -119,7 +126,7 @@ Specifies the maximum IPP version to report.
 Run the specified command for each document that is printed.
 If "command" is not an absolute path ("/path/to/command"),
 .B ippeveprinter
-looks for the command in the "ippeveprinter" subdirectory of the CUPS binary directory, typically /usr/lib/cups/ippeveprinter or /usr/libexec/cups/ippeveprinter.
+looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
 command can be used to discover the correct binary directory ("cups-config --serverbin").
@@ -189,14 +196,14 @@ program is unique to CUPS and conforms to the IPP Everywhere (PWG 5100.14) speci
 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
-In addition, all IPP "xxx-default" Printer Description attributes are added to the environment.
+In addition, all IPP "xxx-default" and "pwg-xxx" Printer Description attributes are added to the environment.
 For example, the "IPP_MEDIA_DEFAULT" environment variable will be set to the default value for the "media" Job Template 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".
 This string conversion only happens for standard Job Template attributes, currently "finishings", "orientation-requested", and "print-quality".
 .LP
-Finally, the "CONTENT_TYPE" environment variable contains the MIME media type of the document being printed, the "DEVICE_URI" environment variable contains the device URI as specified with the "\-D" option, and the "PPD" environment variable contains the PPD filename as specified with the "\-P" option.
+Finally, the "CONTENT_TYPE" environment variable contains the MIME media type of the document being printed, the "DEVICE_URI" environment variable contains the device URI as specified with the "\-D" option, the "OUTPUT_FORMAT" environment variable contains the output MIME media type, and the "PPD" environment variable contains the PPD filename as specified with the "\-P" option.
 .SH COMMAND OUTPUT
 Unless they communicate directly with a printer, print commands send printer-ready data to the standard output.
 .LP
@@ -242,6 +249,8 @@ command whenever a job is sent to the server:
    ippeveprinter \-c /usr/bin/file "My Cool Printer"
 .fi
 .SH SEE ALSO
+.BR ippevepcl (7),
+.BR ippeveps (7),
 PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 .SH COPYRIGHT
 Copyright \[co] 2007-2019 by Apple Inc.
@@ -6,7 +6,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH ipptoolfile 5 "CUPS" "26 April 2019" "Apple Inc."
+.TH ipptoolfile 5 "CUPS" "13 May 2019" "Apple Inc."
 .SH NAME
 ipptoolfile \- ipptool file format
 .SH DESCRIPTION
@@ -594,6 +594,12 @@ Inserts a single "$" character.
 \fB$ENV[\fIname\fB]\fR
 Inserts the value of the named environment variable, or an empty string if the environment variable is not defined.
 .TP 5
+\fB$date-current\fR
+Inserts the current date and time using the ISO-8601 format ("yyyy-mm-ddThh:mm:ssZ").
+.TP 5
+\fB$date-start\fR
+Inserts the starting date and time using the ISO-8601 format ("yyyy-mm-ddThh:mm:ssZ").
+.TP 5
 \fB$filename\fR
 Inserts the filename provided to
 .BR ipptool (8)
@@ -115,7 +115,7 @@ uninstall:

 bcp:	bcp.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ bcp.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ bcp.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -125,7 +125,7 @@ bcp:	bcp.o ../cups/$(LIBCUPS)

 tbcp:	tbcp.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ tbcp.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ tbcp.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -119,7 +119,7 @@ depend:

 dbus:	dbus.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -129,7 +129,7 @@ dbus:	dbus.o ../cups/$(LIBCUPS)

 mailto:	mailto.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o mailto mailto.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o mailto mailto.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -139,7 +139,7 @@ mailto:	mailto.o ../cups/$(LIBCUPS)

 rss:	rss.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o rss rss.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o rss rss.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -149,7 +149,7 @@ rss:	rss.o ../cups/$(LIBCUPS)

 testnotify:	testnotify.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o testnotify testnotify.o $(LIBS)
+	$(LD_CC) $(ALL_LDFLAGS) -o testnotify testnotify.o $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


@@ -278,6 +278,9 @@ f 0555 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi
 f 0555 root sys $SERVERBIN/cgi-bin/help.cgi cgi-bin/help.cgi
 f 0555 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
 f 0555 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi
+d 0755 root sys $SERVERBIN/command -
+f 0555 root sys $SERVERBIN/command/ippevepcl tools/ippevepcl
+f 0555 root sys $SERVERBIN/command/ippeveps tools/ippeveps
 d 0755 root sys $SERVERBIN/daemon -
 f 0555 root sys $SERVERBIN/daemon/cups-deviced scheduler/cups-deviced
 f 0555 root sys $SERVERBIN/daemon/cups-driverd scheduler/cups-driverd
@@ -291,9 +294,6 @@ l 0755 root sys $SERVERBIN/filter/rastertodymo rastertolabel
 f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
 f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
 f 0555 root sys $SERVERBIN/filter/rastertopwg filter/rastertopwg
-d 0755 root sys $SERVERBIN/ippeveprinter -
-f 0555 root sys $SERVERBIN/ippeveprinter/ippevepcl tools/ippevepcl
-f 0555 root sys $SERVERBIN/ippeveprinter/ippeveps tools/ippeveps
 d 0755 root sys $SERVERBIN/notifier -
 f 0555 root sys $SERVERBIN/notifier/mailto notifier/mailto

--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Michael R Sweet	4d03c4ca90	Bump version to 2.3rc1.	2019-05-21 12:59:32 -04:00
Michael R Sweet	715dfb366b	Prep for v2.3rc1	2019-05-21 12:59:04 -04:00
Michael R Sweet	0d89470f82	Update localization files.	2019-05-17 10:17:40 -04:00
Michael R Sweet	ef4d439c3b	Normalize ippeveprinter environment with ippserver: - Add -F option to specify the output format (default is application/postscript when PPDs are used) - Add pwg-xxx attributes and output format to environment.	2019-05-17 10:02:27 -04:00
Michael R Sweet	b761dd43be	Enforce USB read limits (Issue #5583 )	2019-05-17 07:53:30 -04:00
Michael R Sweet	7c11d5aea4	Fix Linux build issues with new LINKCUPS macro (Issue #5261 )	2019-05-17 07:43:00 -04:00
Michael R Sweet	c674bfbe2b	Clean up error messages.	2019-05-16 17:00:21 -04:00
Michael R Sweet	1b032cbf87	Fix clang warning.	2019-05-16 08:13:59 -04:00
Michael R Sweet	bed16f192b	Fix Windows build errors.	2019-05-15 22:38:07 -04:00
Michael R Sweet	3894a88544	Merge branch 'master' of https://github.com/apple/cups	2019-05-15 22:24:48 -04:00
Michael R Sweet	6ac324a2e1	Update SDK.	2019-05-15 22:24:35 -04:00
Michael R Sweet	aa5e4fd677	Update source paths.	2019-05-15 22:23:58 -04:00
Michael R Sweet	c701f9b123	More tweaks.	2019-05-15 22:11:26 -04:00
Michael R Sweet	b1f826250f	Rename ippserver to ippeveprinter in Visual Studio projects.	2019-05-15 21:15:05 -04:00
Michael R Sweet	3e391a8e76	Update build system and cups-config script to not add extra libraries to the "--libs" output (Issue #5261)	2019-05-15 18:35:58 -04:00
Michael R Sweet	cb480624d3	Fix regression in ipptool - hex support needs to be limited to a single line.	2019-05-15 17:37:38 -04:00
Michael R Sweet	9914f0fe30	Use zopfli to further compress source archives, when available.	2019-05-15 17:07:55 -04:00
Michael R Sweet	c8a5a28c0a	Optimize compression of PWG Raster sample files (Issue #5529 )	2019-05-15 16:40:12 -04:00
Michael R Sweet	bf7c741159	Changelog.	2019-05-15 16:33:19 -04:00
Michael R Sweet	d29b58fc33	Optimize PDFs and default printer icon (Issue #5529 )	2019-05-15 16:32:22 -04:00
Michael R Sweet	aa15a57207	Optimize PNG files (Issue #5529 )	2019-05-15 16:29:00 -04:00
Michael R Sweet	e923f65f23	Explain the "forbidden" error better (Issue #5547 )	2019-05-15 10:42:54 -04:00
Michael R Sweet	d1d3862ca2	Update localization files.	2019-05-15 10:30:43 -04:00
Michael R Sweet	20c9da8184	Block cups-files.conf directives (Issue #5530 )	2019-05-15 10:30:24 -04:00
Michael R Sweet	9018ff94f1	Changelog.	2019-05-13 17:12:47 -04:00
Michael R Sweet	c8d7d4bf55	Add support for $date-current, $date-start, and ISO-8601 time period values for relative date/time values.	2019-05-13 17:10:48 -04:00
Michael R Sweet	bd51657148	Support <hex> strings in IPP files.	2019-05-13 16:24:19 -04:00
Michael R Sweet	e1074f486d	Tweak some ippeveprinter web interface content.	2019-05-13 09:04:07 -04:00
Michael R Sweet	657748179f	Update Windows DLL exports file.	2019-05-09 07:24:37 -04:00
Michael R Sweet	3f3b535383	Use CUPS_RAND macro instead of rand().	2019-05-08 21:49:14 -04:00
Michael R Sweet	d0f469a7cd	Another clang warning...	2019-05-08 21:47:34 -04:00
Michael R Sweet	f4f9631897	Fix another clang warning. Update Xcode project for new location of tools.	2019-05-08 21:45:46 -04:00
Michael R Sweet	3408121d8c	Fix clang warnings.	2019-05-08 21:14:54 -04:00
Michael R Sweet	bb73b8e008	Update copyrights.	2019-05-08 11:35:21 -04:00
Michael R Sweet	0e17f4c941	Fix CSS on short browsers (Issue #5574 )	2019-05-08 11:31:08 -04:00
Michael R Sweet	c2bcbdc519	Merge pull request #5577 from OdyX/fix-example-test-files Test: Fix *topdf filters to find the examples in the correct path	2019-05-08 07:44:25 -07:00
Didier 'OdyX' Raboud	98b1b6bafa	Test: Fix reference to onepage-letter-*.pwg away from their old .gz postfix This was changed in `ea75e93d17`	2019-05-08 14:32:44 +02:00
Didier 'OdyX' Raboud	b3f0b5a94f	Test: Fix *topdf filters to find the examples in the correct path	2019-05-08 14:17:27 +02:00
Michael R Sweet	16dbc94b92	Fill out the list of job creation attributes.	2019-05-06 15:16:36 -04:00
Michael R Sweet	0c178dec48	Support C-style character escapes in IPP files.	2019-05-03 14:35:04 -04:00
Michael R Sweet	5da48e4614	Move ippeveprinter commands to CUPS_SERVERBIN/command.	2019-05-03 12:29:58 -04:00
Michael R Sweet	69b84368d3	Don't ignore generated man page files anymore.	2019-05-03 12:25:54 -04:00
Michael R Sweet	661d608a65	Add PWG ippserver attributes to list of printer description and system description attributes.	2019-05-03 09:26:59 -04:00