From 7142734671f89e1fb278e8ac6e52b8d93cc93360 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 8 May 2019 14:42:00 +0200
Subject: Tests: Fix *topdf filter to find the test files in their right paths

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/pull/5577
Patch-Name: tests-fix-topdf-filter-paths.patch
---
 test/run-stp-tests.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 64322d68c..2f9630f52 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -396,10 +396,10 @@ trap "" PIPE
 gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4.pdf"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4.pdf"
 		;;
 	*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter.pdf"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter.pdf"
 		;;
 esac
 EOF
@@ -413,10 +413,10 @@ trap "" PIPE
 gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4.ps"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4.ps"
 		;;
 	*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter.ps"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter.ps"
 		;;
 esac
 EOF
@@ -430,10 +430,10 @@ trap "" PIPE
 gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4-300-black-1.pwg.gz"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4-300-black-1.pwg"
 		;;
 	*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter-300-black-1.pwg.gz"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter-300-black-1.pwg"
 		;;
 esac
 EOF
-- 
cgit v1.2.3


From a6ac323440f3b012ab60b26bf64711df6982db51 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Last-Update: 2015-08-05

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 54469f85529074f5e4efe178bc4b684bd7934c60 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Last-Update: 2015-02-10

Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From 558fa41599f6e8d3f35aa6de9a0463d7beec24ce Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 6cc04d7742256d489756d0abdb9960d9a2d0130a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From e2010932abe1c3274148abebbf428ff351817e5e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Last-Update: 2016-08-09

Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 5bc6801651370bc1b5ae09df4e9ec6531f514bf2 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: http://bugs.debian.org/662996

Last-Update: 2015-10-02
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 7c236c7079c428eb4c0b5564342463bba2ebec7a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: http://bugs.debian.org/670878
Last-Update: 2015-02-10

Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..492982005 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 0ea5a8e2614023c3fa0c02c312064c948d099ae5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 914abbd42..13598c91b 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From f9a39c292ab9d66fcc586c9935c0ea31b310722a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Last-Update: 2016-08-05
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 72ff06eb3de1f2205f2e0210e86cdb8fccdb84dc Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Last-Update: 2016-07-11
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 18bcd33f91dff64d4c4d0b3f91d002cf05128226 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream

Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From bfc4c5409bd72c49eac5c35bd95f0d90a58204d0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://cups.org/str.php?L4342
Bug-Debian: http://bugs.debian.org/640124
Last-Update: 2015-02-10

Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f8c57639f..fa4d82c2d 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 5dc550723e711d5ad8eede56543b058b2d04a5f3 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: http://bugs.debian.org/700961
Bug: https://cups.org/str.php?L4341
Last-Update: 2015-02-10

Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 1984a659c..2578aa76b 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3811,7 +3811,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From c7d2479482048b92d177c28c53fc80749fe94c6e Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://www.cups.org/str.php?L3552
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 76762601727cf67a7ba90b5d6f8c98c0403fed81 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673

Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 776e79a91..ec6357ffe 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index 81acecdfa..c39bd09d3 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2578aa76b..149eaac7e 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1508,7 +1508,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 0908f3c0c..71892c7f4 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1084,7 +1084,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From bfa36b7d15bca23c2aafc2910692fc2467df42d4 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: http://www.cups.org/str.php?L2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Last-Update: 2014-01-16

Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 4df1b79e0fe31a3a36d902606b7ef2f57032c5e5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 5717ff09f09b2b45f4258eca978d573e0a7d481c Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586

Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 1be942dea723fc4e9b83c19712960e39b91b8cba Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Last-Update: 2015-02-10

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 936187bae112bf5415852825e773937f20630f52 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953

Last-Update: 2015-02-10
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index cdb5437dc..d53d1401c 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From f4da0001086bf720ebf6687ea419bbce9a1f4200 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Last-Update: 2015-02-10

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From a170a5718c91a51dfc2ae122d9be8a8e61e06784 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Last-Update: 2015-02-10

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 5b651b291af01d37ccae44a8f470c8b9c74f08bd Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index e345e2fd1..92850dbcc 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -264,7 +264,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.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
 
 .c.o:
-- 
cgit v1.2.3


From 79eed617a879d047f7f8a6ae9bbecd28bbdbc6cd Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:45 +0200
Subject: Make log debug history nearly unlimited

Last-Update: 2015-02-10
Patch-Name: log-debug-history-nearly-unlimited.patch
---
 scheduler/conf.c | 2 +-
 scheduler/conf.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..850d8cb59 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -721,7 +721,7 @@ cupsdReadConfiguration(void)
   KeepAlive                = TRUE;
   KeepAliveTimeout         = DEFAULT_KEEPALIVE;
   ListenBackLog            = SOMAXCONN;
-  LogDebugHistory          = 200;
+  LogDebugHistory          = 99999;
   LogFilePerm              = CUPS_DEFAULT_LOG_FILE_PERM;
   LogLevel                 = CUPSD_LOG_WARN;
   LogTimeFormat            = CUPSD_TIME_STANDARD;
diff --git a/scheduler/conf.h b/scheduler/conf.h
index b4e14eed9..c15226d10 100644
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -161,7 +161,7 @@ VAR cupsd_accesslog_t	AccessLogLevel		VALUE(CUPSD_ACCESSLOG_ACTIONS);
 					/* Access log level */
 VAR int			ClassifyOverride	VALUE(0),
 					/* Allow overrides? */
-			LogDebugHistory		VALUE(200),
+			LogDebugHistory		VALUE(99999),
 					/* Amount of automatic debug history */
 			FatalErrors		VALUE(CUPSD_FATAL_CONFIG),
 					/* Which errors are fatal? */
-- 
cgit v1.2.3


From ea4f9320dfa51cb939e3a8c24ee0a182e2720817 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Last-Update: 2015-02-10

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index 27a1b60da..d7995cbbe 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 850d8cb59..d90f41d7b 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 79c98928ef373d5db7097b25d1bd7745f3dd1b5a Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job", since it is less

 confusing and a better default on most machines.
 .
 Amend documentation accordingly.
Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Last-Update: 2016-07-03

Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index f889b866f..862d92e20 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 5788265fa..79f17ea0c 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index d90f41d7b..f4f6a410f 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 53cd557996e42b4f072484b024fff123066a5034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: http://bugs.debian.org/570157
Last-Update: 2015-10-02
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From e6b6427e190e1adebbd01991ef7f4f5813ee83a5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 64c893c0d..ce3b6f187 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for C++ compiler:
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
@@ -98,7 +99,7 @@ while test $# -gt 0; do
 	    ;;
 	--libs)
 	    if test $static = no; then
-	        libs="@EXTLINKCUPS@ $LIBS";
+	        libs="@EXTLINKCUPS@";
 	    else
 	        libs="$libdir/libcups.a $LIBS";
 	    fi
-- 
cgit v1.2.3


From adacfa16d130f6e32f901a0cc664156587745ef9 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  7 ++-----
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 92850dbcc..b8784ce5e 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 190e78da0..974f98dac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index efd9ca3bb..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,8 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o \
-		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
-		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 9a16a75e6195487a384423e157673585d9744b42 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: http://bugs.debian.org/478597

Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3