Merge changes from CUPS 1.6svn-r10437.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3794 a1ca3aef-8c08-0410-bb20-df032aa958be

3 files changed, 82 insertions, 68 deletions

diff --git a/packaging/InstallationCheck b/packaging/InstallationCheck
index 4e3405caa..3458cbb5c 100755
--- a/packaging/InstallationCheck
+++ b/packaging/InstallationCheck
@@ -1,11 +1,11 @@
 #!/bin/sh
 case `uname -r` in
-	# Mac OS X 10.4.x
-	8.*) exit 0;;
+	# OS X 10.7.x
+	11.*) exit 0;;
 
-	# Mac OS X 10.5.x
-	9.*) exit 0;;
+	# OS X 10.8.x
+	12.*) exit 0;;
 
-	# Older Mac OS X...
+	# Older OS X...
 	*) exit 97;;
 esac
diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index e842e6206..8f1f4a106 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -26,7 +26,7 @@
 %version @CUPS_VERSION@
 %format all
 %description CUPS is the standards-based, open source printing system developed by
-%description Apple Inc. for Mac OS® X and other UNIX®-like operating systems.
+%description Apple Inc. for OS X and other UNIX®-like operating systems.
 
 %format rpm
 %provides lpd
@@ -277,7 +277,9 @@ l 0700 root sys $SERVERBIN/backend/ipps ipp
 f 0500 root sys $SERVERBIN/backend/lpd backend/lpd
 %if DNSSD_BACKEND
 f 0500 root sys $SERVERBIN/backend/dnssd backend/dnssd
+%system darwin
 l 0700 root sys $SERVERBIN/backend/mdns dnssd
+%system all
 %endif
 f 0555 root sys $SERVERBIN/backend/snmp backend/snmp
 f 0555 root sys $SERVERBIN/backend/socket backend/socket
@@ -420,27 +422,27 @@ d 0755 root $CUPS_GROUP $STATEDIR -
 d 0511 root $CUPS_PRIMARY_SYSTEM_GROUP $STATEDIR/certs -
 
 # Data files
-f 0444 root sys $LOCALEDIR/da/cups_da.po locale/cups_da.po
-f 0444 root sys $LOCALEDIR/de/cups_de.po locale/cups_de.po
-f 0444 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
+#f 0444 root sys $LOCALEDIR/da/cups_da.po locale/cups_da.po
+#f 0444 root sys $LOCALEDIR/de/cups_de.po locale/cups_de.po
+#f 0444 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
 #f 0444 root sys $LOCALEDIR/et/cups_et.po locale/cups_et.po
-f 0444 root sys $LOCALEDIR/eu/cups_eu.po locale/cups_eu.po
-f 0444 root sys $LOCALEDIR/fi/cups_fi.po locale/cups_fi.po
-f 0444 root sys $LOCALEDIR/fr/cups_fr.po locale/cups_fr.po
+#f 0444 root sys $LOCALEDIR/eu/cups_eu.po locale/cups_eu.po
+#f 0444 root sys $LOCALEDIR/fi/cups_fi.po locale/cups_fi.po
+#f 0444 root sys $LOCALEDIR/fr/cups_fr.po locale/cups_fr.po
 #f 0444 root sys $LOCALEDIR/he/cups_he.po locale/cups_he.po
-f 0444 root sys $LOCALEDIR/id/cups_id.po locale/cups_id.po
-f 0444 root sys $LOCALEDIR/it/cups_it.po locale/cups_it.po
-f 0444 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
-f 0444 root sys $LOCALEDIR/ko/cups_ko.po locale/cups_ko.po
-f 0444 root sys $LOCALEDIR/nl/cups_nl.po locale/cups_nl.po
-f 0444 root sys $LOCALEDIR/no/cups_no.po locale/cups_no.po
-f 0444 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
-f 0444 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po
-f 0444 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
-f 0444 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
-f 0444 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
-f 0444 root sys $LOCALEDIR/zh/cups_zh.po locale/cups_zh.po
-f 0444 root sys $LOCALEDIR/zh_TW/cups_zh_TW.po locale/cups_zh_TW.po
+#f 0444 root sys $LOCALEDIR/id/cups_id.po locale/cups_id.po
+#f 0444 root sys $LOCALEDIR/it/cups_it.po locale/cups_it.po
+#f 0444 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
+#f 0444 root sys $LOCALEDIR/ko/cups_ko.po locale/cups_ko.po
+#f 0444 root sys $LOCALEDIR/nl/cups_nl.po locale/cups_nl.po
+#f 0444 root sys $LOCALEDIR/no/cups_no.po locale/cups_no.po
+#f 0444 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
+#f 0444 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po
+#f 0444 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
+#f 0444 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
+#f 0444 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
+#f 0444 root sys $LOCALEDIR/zh/cups_zh.po locale/cups_zh.po
+#f 0444 root sys $LOCALEDIR/zh_TW/cups_zh_TW.po locale/cups_zh_TW.po
 
 d 0755 root sys $DATADIR -
 
@@ -465,8 +467,13 @@ d 0755 root sys $DATADIR/ipptool -
 f 0444 root sys $DATADIR/ipptool/create-printer-subscription.test test/create-printer-subscription.test
 f 0444 root sys $DATADIR/ipptool/get-completed-jobs.test test/get-completed-jobs.test
 f 0444 root sys $DATADIR/ipptool/get-jobs.test test/get-jobs.test
+f 0444 root sys $DATADIR/ipptool/get-printer-attributes.test test/get-printer-attributes.test
+f 0444 root sys $DATADIR/ipptool/print-job.test test/print-job.test
+f 0444 root sys $DATADIR/ipptool test/document-*.p*
 f 0444 root sys $DATADIR/ipptool test/ipp-*.test
-f 0444 root sys $DATADIR/ipptool test/testfile.*
+f 0444 root sys $DATADIR/ipptool test/onepage-*.p*
+f 0444 root sys $DATADIR/ipptool/color.jpg test/color.jpg
+f 0444 root sys $DATADIR/ipptool/gray.jpg test/gray.jpg
 
 d 0755 root sys $DATADIR/mime -
 f 0444 root sys $DATADIR/mime/mime.convs conf/mime.convs
@@ -482,17 +489,17 @@ d 0755 root sys $DATADIR/templates -
 f 0444 root sys $DATADIR/templates templates/*.tmpl
 
 ## Template files
-d 0755 root sys $DATADIR/templates/de
-f 0444 root sys $DATADIR/templates/de templates/de/*.tmpl
+#d 0755 root sys $DATADIR/templates/de
+#f 0444 root sys $DATADIR/templates/de templates/de/*.tmpl
 
-d 0755 root sys $DATADIR/templates/es
-f 0444 root sys $DATADIR/templates/es templates/es/*.tmpl
+#d 0755 root sys $DATADIR/templates/es
+#f 0444 root sys $DATADIR/templates/es templates/es/*.tmpl
 
 #d 0755 root sys $DATADIR/templates/et
 #f 0444 root sys $DATADIR/templates/et templates/et/*.tmpl
 
-d 0755 root sys $DATADIR/templates/eu
-f 0444 root sys $DATADIR/templates/eu templates/eu/*.tmpl
+#d 0755 root sys $DATADIR/templates/eu
+#f 0444 root sys $DATADIR/templates/eu templates/eu/*.tmpl
 
 #d 0755 root sys $DATADIR/templates/fr
 #f 0444 root sys $DATADIR/templates/fr templates/fr/*.tmpl
@@ -500,20 +507,20 @@ f 0444 root sys $DATADIR/templates/eu templates/eu/*.tmpl
 #d 0755 root sys $DATADIR/templates/he
 #f 0444 root sys $DATADIR/templates/he templates/he/*.tmpl
 
-d 0755 root sys $DATADIR/templates/id
-f 0444 root sys $DATADIR/templates/id templates/id/*.tmpl
+#d 0755 root sys $DATADIR/templates/id
+#f 0444 root sys $DATADIR/templates/id templates/id/*.tmpl
 
-d 0755 root sys $DATADIR/templates/it
-f 0444 root sys $DATADIR/templates/it templates/it/*.tmpl
+#d 0755 root sys $DATADIR/templates/it
+#f 0444 root sys $DATADIR/templates/it templates/it/*.tmpl
 
-d 0755 root sys $DATADIR/templates/ja
-f 0444 root sys $DATADIR/templates/ja templates/ja/*.tmpl
+#d 0755 root sys $DATADIR/templates/ja
+#f 0444 root sys $DATADIR/templates/ja templates/ja/*.tmpl
 
-d 0755 root sys $DATADIR/templates/pl
-f 0444 root sys $DATADIR/templates/pl templates/pl/*.tmpl
+#d 0755 root sys $DATADIR/templates/pl
+#f 0444 root sys $DATADIR/templates/pl templates/pl/*.tmpl
 
-d 0755 root sys $DATADIR/templates/ru
-f 0444 root sys $DATADIR/templates/ru templates/ru/*.tmpl
+#d 0755 root sys $DATADIR/templates/ru
+#f 0444 root sys $DATADIR/templates/ru templates/ru/*.tmpl
 
 #d 0755 root sys $DATADIR/templates/sv
 #f 0444 root sys $DATADIR/templates/sv templates/sv/*.tmpl
@@ -547,19 +554,16 @@ f 0444 root sys $INCLUDEDIR/cups/dir.h cups/dir.h
 f 0444 root sys $INCLUDEDIR/cups/file.h cups/file.h
 f 0444 root sys $INCLUDEDIR/cups/http.h cups/http.h
 f 0444 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h
-f 0444 root sys $INCLUDEDIR/cups/mime.h scheduler/mime.h
 f 0444 root sys $INCLUDEDIR/cups/language.h cups/language.h
 f 0444 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h
 f 0444 root sys $INCLUDEDIR/cups/raster.h cups/raster.h
+f 0444 root sys $INCLUDEDIR/cups/sidechannel.h cups/sidechannel.h
 f 0444 root sys $INCLUDEDIR/cups/transcode.h cups/transcode.h
+f 0444 root sys $INCLUDEDIR/cups/versioning.h cups/versioning.h
 
 %if INSTALLSTATIC
 f 0444 root sys $LIBDIR/libcups.a cups/libcups.a
-f 0444 root sys $LIBDIR/libcupscgi.a cgi-bin/libcupscgi.a
-f 0444 root sys $LIBDIR/libcupsdriver.a driver/libcupsdriver.a
 f 0444 root sys $LIBDIR/libcupsimage.a filter/libcupsimage.a
-f 0444 root sys $LIBDIR/libcupsmime.a scheduler/libcupsmime.a
-f 0444 root sys $LIBDIR/libcupsppdc.a ppdc/libcupsppdc.a
 %endif
 
 d 0755 root sys $DOCDIR/help -
@@ -598,17 +602,17 @@ f 0444 root sys $DOCDIR/images doc/images/*.png
 f 0444 root sys $DOCDIR/robots.txt doc/robots.txt
 
 # Localized documentation files
-d 0755 root sys $DOCDIR/de
-f 0444 root sys $DOCDIR/de doc/de/*.html
+#d 0755 root sys $DOCDIR/de
+#f 0444 root sys $DOCDIR/de doc/de/*.html
 
-d 0755 root sys $DOCDIR/es
-f 0444 root sys $DOCDIR/es doc/es/*.html
+#d 0755 root sys $DOCDIR/es
+#f 0444 root sys $DOCDIR/es doc/es/*.html
 
 #d 0755 root sys $DOCDIR/et
 #f 0444 root sys $DOCDIR/et doc/et/*.html
 
-d 0755 root sys $DOCDIR/eu
-f 0444 root sys $DOCDIR/eu doc/eu/*.html
+#d 0755 root sys $DOCDIR/eu
+#f 0444 root sys $DOCDIR/eu doc/eu/*.html
 
 #d 0755 root sys $DOCDIR/fr
 #f 0444 root sys $DOCDIR/fr doc/fr/*.html
@@ -617,20 +621,20 @@ f 0444 root sys $DOCDIR/eu doc/eu/*.html
 #f 0444 root sys $DOCDIR/he doc/he/*.html
 #f 0444 root sys $DOCDIR/he/cups.css doc/he/cups.css
 
-d 0755 root sys $DOCDIR/id
-f 0444 root sys $DOCDIR/id doc/id/*.html
+#d 0755 root sys $DOCDIR/id
+#f 0444 root sys $DOCDIR/id doc/id/*.html
 
-d 0755 root sys $DOCDIR/it
-f 0444 root sys $DOCDIR/it doc/it/*.html
+#d 0755 root sys $DOCDIR/it
+#f 0444 root sys $DOCDIR/it doc/it/*.html
 
-d 0755 root sys $DOCDIR/ja
-f 0444 root sys $DOCDIR/ja doc/ja/*.html
+#d 0755 root sys $DOCDIR/ja
+#f 0444 root sys $DOCDIR/ja doc/ja/*.html
 
-d 0755 root sys $DOCDIR/pl
-f 0444 root sys $DOCDIR/pl doc/pl/*.html
+#d 0755 root sys $DOCDIR/pl
+#f 0444 root sys $DOCDIR/pl doc/pl/*.html
 
-d 0755 root sys $DOCDIR/ru
-f 0444 root sys $DOCDIR/ru doc/ru/*.html
+#d 0755 root sys $DOCDIR/ru
+#f 0444 root sys $DOCDIR/ru doc/ru/*.html
 
 #d 0755 root sys $DOCDIR/sv
 #f 0444 root sys $DOCDIR/sv doc/sv/*.html
@@ -659,6 +663,7 @@ f 0444 root sys $MANDIR/man1/lpstat.$MAN1EXT man/lpstat.$MAN1EXT
 f 0444 root sys $MANDIR/man1/lp.$MAN1EXT man/lp.$MAN1EXT
 
 f 0444 root sys $MANDIR/man5/classes.conf.$MAN5EXT man/classes.conf.$MAN5EXT
+f 0444 root sys $MANDIR/man5/cups-snmp.conf.$MAN5EXT man/cups-snmp.conf.$MAN5EXT
 f 0444 root sys $MANDIR/man5/cupsd.conf.$MAN5EXT man/cupsd.conf.$MAN5EXT
 f 0444 root sys $MANDIR/man5/ipptoolfile.$MAN5EXT man/ipptoolfile.$MAN5EXT
 f 0444 root sys $MANDIR/man5/mailto.conf.$MAN5EXT man/mailto.conf.$MAN5EXT
@@ -672,7 +677,7 @@ l 0644 root sys $AMANDIR/man$MAN8DIR/cupsreject.$MAN8EXT cupsaccept.$MAN8EXT
 f 0444 root sys $AMANDIR/man$MAN8DIR/cupsaddsmb.$MAN8EXT man/cupsaddsmb.$MAN8EXT
 f 0444 root sys $AMANDIR/man$MAN8DIR/cupsctl.$MAN8EXT man/cupsctl.$MAN8EXT
 f 0444 root sys $AMANDIR/man$MAN8DIR/cupsfilter.$MAN8EXT man/cupsfilter.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cups-polld.$MAN8EXT man/cups-polld.$MAN8EXT
+f 0444 root sys $AMANDIR/man$MAN8DIR/cups-snmp.$MAN8EXT man/cups-snmp.$MAN8EXT
 f 0444 root sys $AMANDIR/man$MAN8DIR/cupsd.$MAN8EXT man/cupsd.$MAN8EXT
 f 0444 root sys $AMANDIR/man$MAN8DIR/cupsenable.$MAN8EXT man/cupsenable.$MAN8EXT
 l 0644 root sys $AMANDIR/man$MAN8DIR/cupsdisable.$MAN8EXT cupsenable.$MAN8EXT
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 6eb682395..3c8dc7e5a 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -5,7 +5,7 @@
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -18,11 +18,17 @@
 # Conditional build options (--with name/--without name):
 #
 #   dbus     - Enable/disable DBUS support (default = enable)
+#   dnssd    - Enable/disable DNS-SD support (default = enable)
+#   static   - Enable/disable static libraries (default = enable)
 
 %{!?_with_dbus: %{!?_without_dbus: %define _with_dbus --with-dbus}}
 %{?_with_dbus: %define _dbus --enable-dbus}
 %{!?_with_dbus: %define _dbus --disable-dbus}
 
+%{!?_with_dnssd: %{!?_without_dnssd: %define _without_dnssd --without-dnssd}}
+%{?_with_dnssd: %define _dnssd --enable-dnssd}
+%{!?_with_dnssd: %define _dnssd --disable-dnssd}
+
 %{!?_with_static: %{!?_without_static: %define _without_static --without-static}}
 %{?_with_static: %define _static --enable-static}
 %{!?_with_static: %define _static --disable-static}
@@ -34,7 +40,7 @@ Release: 0
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
+Source: http://ftp.cups.org/pub/cups/%{version}/cups-%{version}-source.tar.bz2
 Url: http://www.cups.org
 Packager: Anonymous <anonymous@foo.com>
 Vendor: Apple Inc.
@@ -67,7 +73,7 @@ Requires: %{name} = %{epoch}:%{version} xinetd
 
 %description
 CUPS is the standards-based, open source printing system developed by
-Apple Inc. for Mac OS® X and other UNIX®-like operating systems.
+Apple Inc. for OS X and other UNIX®-like operating systems.
 
 %description devel
 This package provides the CUPS headers and development environment.
@@ -83,7 +89,7 @@ This package provides LPD client support.
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \
-    ./configure %{_dbus} %{_static}
+    ./configure %{_dbus} %{_dnssd} %{_static}
 # If we got this far, all prerequisite libraries must be here.
 make
 
@@ -172,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/lp*
 %dir /usr/lib/cups
 %dir /usr/lib/cups/backend
+%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
+/usr/lib/cups/backend/dnssd
+%endif
 /usr/lib/cups/backend/http
 /usr/lib/cups/backend/https
 %attr(0700,root,root) /usr/lib/cups/backend/ipp