diff mbox series

[09/12] cups: Update to 2.3.3

Message ID	20200825095040.3854-9-michael.tremer@ipfire.org
State	Accepted
Commit	a92a4ecb3c413ff9664f25633f1142db53c04859
Headers	From: Michael Tremer <michael.tremer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 09/12] cups: Update to 2.3.3 Date: Tue, 25 Aug 2020 09:50:37 +0000 Message-Id: <20200825095040.3854-9-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Cc: Michael Tremer <michael.tremer@ipfire.org> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[01/12] fontconfig: update to 2.13.1 \| [01/12] fontconfig: update to 2.13.1 [02/12] freetype: Update to 2.10.2 [03/12] openjpeg: New package [04/12] qpdf: Update to 10.0.1 [05/12] lcms2: Update to 2.9 [06/12] poppler: Update to 0.89.0 [07/12] avahi: Update to 0.8 [08/12] poppler-data: New package [09/12] cups: Update to 2.3.3 [10/12] cups-filters: Update to 1.27.4 [11/12] foomatic: Drop files that are now provided by cups-filter [12/12] Rootfile update after fresh build

Commit Message

Michael Tremer Aug. 25, 2020, 9:50 a.m. UTC

  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/packages/cups | 273 ++++++++++++++++++++-------------
 lfs/cups                       |   8 +-
 2 files changed, 172 insertions(+), 109 deletions(-)

diff mbox series

Patch

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 8234be5e1..f9d15bc8b 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,4 +1,3 @@ 
-#etc/dbus-1/system.d
 etc/dbus-1/system.d/cups.conf
 etc/pam.d/cups
 etc/rc.d/init.d/cups
@@ -15,8 +14,8 @@  etc/rc.d/init.d/cups
 #etc/rc5.d/S81cups
 usr/bin/cancel
 #usr/bin/cups-config
-usr/bin/cupstestdsc
 usr/bin/cupstestppd
+usr/bin/ippeveprinter
 usr/bin/ippfind
 usr/bin/ipptool
 usr/bin/lp
@@ -64,6 +63,9 @@  usr/lib/cups/cgi-bin/classes.cgi
 usr/lib/cups/cgi-bin/help.cgi
 usr/lib/cups/cgi-bin/jobs.cgi
 usr/lib/cups/cgi-bin/printers.cgi
+usr/lib/cups/command
+usr/lib/cups/command/ippevepcl
+usr/lib/cups/command/ippeveps
 usr/lib/cups/daemon
 usr/lib/cups/daemon/cups-deviced
 usr/lib/cups/daemon/cups-driverd
@@ -74,7 +76,6 @@  usr/lib/cups/filter
 usr/lib/cups/filter/commandtops
 usr/lib/cups/filter/gziptoany
 usr/lib/cups/filter/pstops
-usr/lib/cups/filter/rastertodymo
 usr/lib/cups/filter/rastertoepson
 usr/lib/cups/filter/rastertohp
 usr/lib/cups/filter/rastertolabel
@@ -88,17 +89,9 @@  usr/lib/cups/notifier/mailto
 usr/lib/cups/notifier/rss
 #usr/lib/libcups.so
 usr/lib/libcups.so.2
-#usr/lib/libcupscgi.so
-usr/lib/libcupscgi.so.1
 #usr/lib/libcupsimage.so
 usr/lib/libcupsimage.so.2
-#usr/lib/libcupsmime.so
-usr/lib/libcupsmime.so.1
-#usr/lib/libcupsppdc.so
-usr/lib/libcupsppdc.so.1
-usr/sbin/accept
 usr/sbin/cupsaccept
-usr/sbin/cupsaddsmb
 usr/sbin/cupsctl
 usr/sbin/cupsd
 usr/sbin/cupsdisable
@@ -109,7 +102,6 @@  usr/sbin/lpadmin
 usr/sbin/lpc
 usr/sbin/lpinfo
 usr/sbin/lpmove
-usr/sbin/reject
 usr/share/cups
 usr/share/cups/banners
 usr/share/cups/data
@@ -128,30 +120,66 @@  usr/share/cups/examples/r300-basic.drv
 usr/share/cups/examples/r300-colorman.drv
 usr/share/cups/examples/r300-remote.drv
 usr/share/cups/ipptool
+usr/share/cups/ipptool/cancel-current-job.test
 usr/share/cups/ipptool/color.jpg
+usr/share/cups/ipptool/create-job-format.test
+usr/share/cups/ipptool/create-job-sheets.test
+usr/share/cups/ipptool/create-job-timeout.test
+usr/share/cups/ipptool/create-job.test
 usr/share/cups/ipptool/create-printer-subscription.test
+usr/share/cups/ipptool/cups-create-local-printer.test
 usr/share/cups/ipptool/document-a4.pdf
 usr/share/cups/ipptool/document-a4.ps
 usr/share/cups/ipptool/document-letter.pdf
 usr/share/cups/ipptool/document-letter.ps
+usr/share/cups/ipptool/fax-job.test
 usr/share/cups/ipptool/get-completed-jobs.test
+usr/share/cups/ipptool/get-devices.test
+usr/share/cups/ipptool/get-job-attributes.test
+usr/share/cups/ipptool/get-job-attributes2.test
+usr/share/cups/ipptool/get-job-template-attributes.test
 usr/share/cups/ipptool/get-jobs.test
 usr/share/cups/ipptool/get-notifications.test
+usr/share/cups/ipptool/get-ppd-printer.test
+usr/share/cups/ipptool/get-ppd.test
+usr/share/cups/ipptool/get-ppds-drv-only.test
+usr/share/cups/ipptool/get-ppds-language.test
+usr/share/cups/ipptool/get-ppds-make-and-model.test
+usr/share/cups/ipptool/get-ppds-make.test
+usr/share/cups/ipptool/get-ppds-product.test
+usr/share/cups/ipptool/get-ppds-psversion.test
+usr/share/cups/ipptool/get-ppds.test
+usr/share/cups/ipptool/get-printer-attributes-suite.test
 usr/share/cups/ipptool/get-printer-attributes.test
+usr/share/cups/ipptool/get-printer-description-attributes.test
+usr/share/cups/ipptool/get-printers-printer-id.test
+usr/share/cups/ipptool/get-printers.test
 usr/share/cups/ipptool/get-subscriptions.test
 usr/share/cups/ipptool/gray.jpg
+usr/share/cups/ipptool/identify-printer-display.test
+usr/share/cups/ipptool/identify-printer-multiple.test
+usr/share/cups/ipptool/identify-printer.test
 usr/share/cups/ipptool/ipp-1.1.test
 usr/share/cups/ipptool/ipp-2.0.test
 usr/share/cups/ipptool/ipp-2.1.test
 usr/share/cups/ipptool/ipp-2.2.test
+usr/share/cups/ipptool/ipp-backend.test
 usr/share/cups/ipptool/ipp-everywhere.test
 usr/share/cups/ipptool/onepage-a4.pdf
 usr/share/cups/ipptool/onepage-a4.ps
 usr/share/cups/ipptool/onepage-letter.pdf
 usr/share/cups/ipptool/onepage-letter.ps
+usr/share/cups/ipptool/print-job-and-wait.test
 usr/share/cups/ipptool/print-job-deflate.test
 usr/share/cups/ipptool/print-job-gzip.test
+usr/share/cups/ipptool/print-job-hold.test
+usr/share/cups/ipptool/print-job-letter.test
+usr/share/cups/ipptool/print-job-manual.test
+usr/share/cups/ipptool/print-job-media-col.test
+usr/share/cups/ipptool/print-job-password.test
 usr/share/cups/ipptool/print-job.test
+usr/share/cups/ipptool/print-uri.test
+usr/share/cups/ipptool/set-attrs-hold.test
 usr/share/cups/ipptool/testfile.jpg
 usr/share/cups/ipptool/testfile.pcl
 usr/share/cups/ipptool/testfile.pdf
@@ -173,7 +201,6 @@  usr/share/cups/profiles
 usr/share/cups/templates
 usr/share/cups/templates/add-class.tmpl
 usr/share/cups/templates/add-printer.tmpl
-usr/share/cups/templates/add-rss-subscription.tmpl
 usr/share/cups/templates/admin.tmpl
 usr/share/cups/templates/choose-device.tmpl
 usr/share/cups/templates/choose-make.tmpl
@@ -192,7 +219,6 @@  usr/share/cups/templates/command.tmpl
 usr/share/cups/templates/de
 usr/share/cups/templates/de/add-class.tmpl
 usr/share/cups/templates/de/add-printer.tmpl
-usr/share/cups/templates/de/add-rss-subscription.tmpl
 usr/share/cups/templates/de/admin.tmpl
 usr/share/cups/templates/de/choose-device.tmpl
 usr/share/cups/templates/de/choose-make.tmpl
@@ -250,13 +276,9 @@  usr/share/cups/templates/de/printer.tmpl
 usr/share/cups/templates/de/printers-header.tmpl
 usr/share/cups/templates/de/printers.tmpl
 usr/share/cups/templates/de/restart.tmpl
-usr/share/cups/templates/de/samba-export.tmpl
-usr/share/cups/templates/de/samba-exported.tmpl
 usr/share/cups/templates/de/search.tmpl
 usr/share/cups/templates/de/set-printer-options-header.tmpl
 usr/share/cups/templates/de/set-printer-options-trailer.tmpl
-usr/share/cups/templates/de/subscription-added.tmpl
-usr/share/cups/templates/de/subscription-canceled.tmpl
 usr/share/cups/templates/de/test-page.tmpl
 usr/share/cups/templates/de/trailer.tmpl
 usr/share/cups/templates/de/users.tmpl
@@ -266,7 +288,6 @@  usr/share/cups/templates/error.tmpl
 usr/share/cups/templates/es
 usr/share/cups/templates/es/add-class.tmpl
 usr/share/cups/templates/es/add-printer.tmpl
-usr/share/cups/templates/es/add-rss-subscription.tmpl
 usr/share/cups/templates/es/admin.tmpl
 usr/share/cups/templates/es/choose-device.tmpl
 usr/share/cups/templates/es/choose-make.tmpl
@@ -324,16 +345,78 @@  usr/share/cups/templates/es/printer.tmpl
 usr/share/cups/templates/es/printers-header.tmpl
 usr/share/cups/templates/es/printers.tmpl
 usr/share/cups/templates/es/restart.tmpl
-usr/share/cups/templates/es/samba-export.tmpl
-usr/share/cups/templates/es/samba-exported.tmpl
 usr/share/cups/templates/es/search.tmpl
 usr/share/cups/templates/es/set-printer-options-header.tmpl
 usr/share/cups/templates/es/set-printer-options-trailer.tmpl
-usr/share/cups/templates/es/subscription-added.tmpl
-usr/share/cups/templates/es/subscription-canceled.tmpl
 usr/share/cups/templates/es/test-page.tmpl
 usr/share/cups/templates/es/trailer.tmpl
 usr/share/cups/templates/es/users.tmpl
+usr/share/cups/templates/fr
+usr/share/cups/templates/fr/add-class.tmpl
+usr/share/cups/templates/fr/add-printer.tmpl
+usr/share/cups/templates/fr/admin.tmpl
+usr/share/cups/templates/fr/choose-device.tmpl
+usr/share/cups/templates/fr/choose-make.tmpl
+usr/share/cups/templates/fr/choose-model.tmpl
+usr/share/cups/templates/fr/choose-serial.tmpl
+usr/share/cups/templates/fr/choose-uri.tmpl
+usr/share/cups/templates/fr/class-added.tmpl
+usr/share/cups/templates/fr/class-confirm.tmpl
+usr/share/cups/templates/fr/class-deleted.tmpl
+usr/share/cups/templates/fr/class-jobs-header.tmpl
+usr/share/cups/templates/fr/class-modified.tmpl
+usr/share/cups/templates/fr/class.tmpl
+usr/share/cups/templates/fr/classes-header.tmpl
+usr/share/cups/templates/fr/classes.tmpl
+usr/share/cups/templates/fr/command.tmpl
+usr/share/cups/templates/fr/edit-config.tmpl
+usr/share/cups/templates/fr/error-op.tmpl
+usr/share/cups/templates/fr/error.tmpl
+usr/share/cups/templates/fr/header.tmpl
+usr/share/cups/templates/fr/help-header.tmpl
+usr/share/cups/templates/fr/help-printable.tmpl
+usr/share/cups/templates/fr/help-trailer.tmpl
+usr/share/cups/templates/fr/job-cancel.tmpl
+usr/share/cups/templates/fr/job-hold.tmpl
+usr/share/cups/templates/fr/job-move.tmpl
+usr/share/cups/templates/fr/job-moved.tmpl
+usr/share/cups/templates/fr/job-release.tmpl
+usr/share/cups/templates/fr/job-restart.tmpl
+usr/share/cups/templates/fr/jobs-header.tmpl
+usr/share/cups/templates/fr/jobs.tmpl
+usr/share/cups/templates/fr/list-available-printers.tmpl
+usr/share/cups/templates/fr/modify-class.tmpl
+usr/share/cups/templates/fr/modify-printer.tmpl
+usr/share/cups/templates/fr/norestart.tmpl
+usr/share/cups/templates/fr/option-boolean.tmpl
+usr/share/cups/templates/fr/option-conflict.tmpl
+usr/share/cups/templates/fr/option-header.tmpl
+usr/share/cups/templates/fr/option-pickmany.tmpl
+usr/share/cups/templates/fr/option-pickone.tmpl
+usr/share/cups/templates/fr/option-trailer.tmpl
+usr/share/cups/templates/fr/pager.tmpl
+usr/share/cups/templates/fr/printer-accept.tmpl
+usr/share/cups/templates/fr/printer-added.tmpl
+usr/share/cups/templates/fr/printer-cancel-jobs.tmpl
+usr/share/cups/templates/fr/printer-configured.tmpl
+usr/share/cups/templates/fr/printer-confirm.tmpl
+usr/share/cups/templates/fr/printer-default.tmpl
+usr/share/cups/templates/fr/printer-deleted.tmpl
+usr/share/cups/templates/fr/printer-jobs-header.tmpl
+usr/share/cups/templates/fr/printer-modified.tmpl
+usr/share/cups/templates/fr/printer-reject.tmpl
+usr/share/cups/templates/fr/printer-start.tmpl
+usr/share/cups/templates/fr/printer-stop.tmpl
+usr/share/cups/templates/fr/printer.tmpl
+usr/share/cups/templates/fr/printers-header.tmpl
+usr/share/cups/templates/fr/printers.tmpl
+usr/share/cups/templates/fr/restart.tmpl
+usr/share/cups/templates/fr/search.tmpl
+usr/share/cups/templates/fr/set-printer-options-header.tmpl
+usr/share/cups/templates/fr/set-printer-options-trailer.tmpl
+usr/share/cups/templates/fr/test-page.tmpl
+usr/share/cups/templates/fr/trailer.tmpl
+usr/share/cups/templates/fr/users.tmpl
 usr/share/cups/templates/header.tmpl
 usr/share/cups/templates/help-header.tmpl
 usr/share/cups/templates/help-printable.tmpl
@@ -341,7 +424,6 @@  usr/share/cups/templates/help-trailer.tmpl
 usr/share/cups/templates/ja
 usr/share/cups/templates/ja/add-class.tmpl
 usr/share/cups/templates/ja/add-printer.tmpl
-usr/share/cups/templates/ja/add-rss-subscription.tmpl
 usr/share/cups/templates/ja/admin.tmpl
 usr/share/cups/templates/ja/choose-device.tmpl
 usr/share/cups/templates/ja/choose-make.tmpl
@@ -399,13 +481,9 @@  usr/share/cups/templates/ja/printer.tmpl
 usr/share/cups/templates/ja/printers-header.tmpl
 usr/share/cups/templates/ja/printers.tmpl
 usr/share/cups/templates/ja/restart.tmpl
-usr/share/cups/templates/ja/samba-export.tmpl
-usr/share/cups/templates/ja/samba-exported.tmpl
 usr/share/cups/templates/ja/search.tmpl
 usr/share/cups/templates/ja/set-printer-options-header.tmpl
 usr/share/cups/templates/ja/set-printer-options-trailer.tmpl
-usr/share/cups/templates/ja/subscription-added.tmpl
-usr/share/cups/templates/ja/subscription-canceled.tmpl
 usr/share/cups/templates/ja/test-page.tmpl
 usr/share/cups/templates/ja/trailer.tmpl
 usr/share/cups/templates/ja/users.tmpl
@@ -446,7 +524,6 @@  usr/share/cups/templates/printers.tmpl
 usr/share/cups/templates/pt_BR
 usr/share/cups/templates/pt_BR/add-class.tmpl
 usr/share/cups/templates/pt_BR/add-printer.tmpl
-usr/share/cups/templates/pt_BR/add-rss-subscription.tmpl
 usr/share/cups/templates/pt_BR/admin.tmpl
 usr/share/cups/templates/pt_BR/choose-device.tmpl
 usr/share/cups/templates/pt_BR/choose-make.tmpl
@@ -504,13 +581,9 @@  usr/share/cups/templates/pt_BR/printer.tmpl
 usr/share/cups/templates/pt_BR/printers-header.tmpl
 usr/share/cups/templates/pt_BR/printers.tmpl
 usr/share/cups/templates/pt_BR/restart.tmpl
-usr/share/cups/templates/pt_BR/samba-export.tmpl
-usr/share/cups/templates/pt_BR/samba-exported.tmpl
 usr/share/cups/templates/pt_BR/search.tmpl
 usr/share/cups/templates/pt_BR/set-printer-options-header.tmpl
 usr/share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
-usr/share/cups/templates/pt_BR/subscription-added.tmpl
-usr/share/cups/templates/pt_BR/subscription-canceled.tmpl
 usr/share/cups/templates/pt_BR/test-page.tmpl
 usr/share/cups/templates/pt_BR/trailer.tmpl
 usr/share/cups/templates/pt_BR/users.tmpl
@@ -518,7 +591,6 @@  usr/share/cups/templates/restart.tmpl
 usr/share/cups/templates/ru
 usr/share/cups/templates/ru/add-class.tmpl
 usr/share/cups/templates/ru/add-printer.tmpl
-usr/share/cups/templates/ru/add-rss-subscription.tmpl
 usr/share/cups/templates/ru/admin.tmpl
 usr/share/cups/templates/ru/choose-device.tmpl
 usr/share/cups/templates/ru/choose-make.tmpl
@@ -576,23 +648,15 @@  usr/share/cups/templates/ru/printer.tmpl
 usr/share/cups/templates/ru/printers-header.tmpl
 usr/share/cups/templates/ru/printers.tmpl
 usr/share/cups/templates/ru/restart.tmpl
-usr/share/cups/templates/ru/samba-export.tmpl
-usr/share/cups/templates/ru/samba-exported.tmpl
 usr/share/cups/templates/ru/search.tmpl
 usr/share/cups/templates/ru/set-printer-options-header.tmpl
 usr/share/cups/templates/ru/set-printer-options-trailer.tmpl
-usr/share/cups/templates/ru/subscription-added.tmpl
-usr/share/cups/templates/ru/subscription-canceled.tmpl
 usr/share/cups/templates/ru/test-page.tmpl
 usr/share/cups/templates/ru/trailer.tmpl
 usr/share/cups/templates/ru/users.tmpl
-usr/share/cups/templates/samba-export.tmpl
-usr/share/cups/templates/samba-exported.tmpl
 usr/share/cups/templates/search.tmpl
 usr/share/cups/templates/set-printer-options-header.tmpl
 usr/share/cups/templates/set-printer-options-trailer.tmpl
-usr/share/cups/templates/subscription-added.tmpl
-usr/share/cups/templates/subscription-canceled.tmpl
 usr/share/cups/templates/test-page.tmpl
 usr/share/cups/templates/trailer.tmpl
 usr/share/cups/templates/users.tmpl
@@ -608,17 +672,15 @@  usr/share/doc/cups/es
 usr/share/doc/cups/es/index.html
 usr/share/doc/cups/help
 usr/share/doc/cups/help/accounting.html
+usr/share/doc/cups/help/admin.html
 usr/share/doc/cups/help/api-admin.html
-usr/share/doc/cups/help/api-array.html
-usr/share/doc/cups/help/api-cups.html
-usr/share/doc/cups/help/api-filedir.html
 usr/share/doc/cups/help/api-filter.html
-usr/share/doc/cups/help/api-httpipp.html
-usr/share/doc/cups/help/api-overview.html
 usr/share/doc/cups/help/api-ppd.html
 usr/share/doc/cups/help/api-raster.html
 usr/share/doc/cups/help/cgi.html
+usr/share/doc/cups/help/cupspm.html
 usr/share/doc/cups/help/encryption.html
+usr/share/doc/cups/help/firewalls.html
 usr/share/doc/cups/help/glossary.html
 usr/share/doc/cups/help/kerberos.html
 usr/share/doc/cups/help/license.html
@@ -632,15 +694,16 @@  usr/share/doc/cups/help/man-cups-lpd.html
 usr/share/doc/cups/help/man-cups-snmp.html
 usr/share/doc/cups/help/man-cups.html
 usr/share/doc/cups/help/man-cupsaccept.html
-usr/share/doc/cups/help/man-cupsaddsmb.html
 usr/share/doc/cups/help/man-cupsd-helper.html
 usr/share/doc/cups/help/man-cupsd-logs.html
 usr/share/doc/cups/help/man-cupsd.conf.html
 usr/share/doc/cups/help/man-cupsd.html
 usr/share/doc/cups/help/man-cupsenable.html
-usr/share/doc/cups/help/man-cupstestdsc.html
 usr/share/doc/cups/help/man-cupstestppd.html
 usr/share/doc/cups/help/man-filter.html
+usr/share/doc/cups/help/man-ippevepcl.html
+usr/share/doc/cups/help/man-ippeveprinter.html
+usr/share/doc/cups/help/man-ippfind.html
 usr/share/doc/cups/help/man-ipptool.html
 usr/share/doc/cups/help/man-ipptoolfile.html
 usr/share/doc/cups/help/man-lp.html
@@ -677,8 +740,6 @@  usr/share/doc/cups/help/spec-banner.html
 usr/share/doc/cups/help/spec-command.html
 usr/share/doc/cups/help/spec-design.html
 usr/share/doc/cups/help/spec-ipp.html
-usr/share/doc/cups/help/spec-pdf.html
-usr/share/doc/cups/help/spec-postscript.html
 usr/share/doc/cups/help/spec-ppd.html
 usr/share/doc/cups/help/spec-raster.html
 usr/share/doc/cups/help/spec-stp.html
@@ -712,66 +773,68 @@  usr/share/doc/cups/ru/index.html
 usr/share/locale/ca/cups_ca.po
 usr/share/locale/cs/cups_cs.po
 usr/share/locale/de/cups_de.po
+usr/share/locale/en
+usr/share/locale/en/cups_en.po
 usr/share/locale/es/cups_es.po
 usr/share/locale/fr/cups_fr.po
 usr/share/locale/it/cups_it.po
 usr/share/locale/ja/cups_ja.po
 usr/share/locale/pt_BR/cups_pt_BR.po
 usr/share/locale/ru/cups_ru.po
-#usr/share/man/man1/cancel.1.gz
-#usr/share/man/man1/cups-config.1.gz
-#usr/share/man/man1/cups.1.gz
-#usr/share/man/man1/cupstestdsc.1.gz
-#usr/share/man/man1/cupstestppd.1.gz
-#usr/share/man/man1/ippfind.1.gz
-#usr/share/man/man1/ipptool.1.gz
-#usr/share/man/man1/lp.1.gz
-#usr/share/man/man1/lpoptions.1.gz
-#usr/share/man/man1/lpq.1.gz
-#usr/share/man/man1/lpr.1.gz
-#usr/share/man/man1/lprm.1.gz
-#usr/share/man/man1/lpstat.1.gz
-#usr/share/man/man1/ppdc.1.gz
-#usr/share/man/man1/ppdhtml.1.gz
-#usr/share/man/man1/ppdi.1.gz
-#usr/share/man/man1/ppdmerge.1.gz
-#usr/share/man/man1/ppdpo.1.gz
-#usr/share/man/man5/classes.conf.5.gz
-#usr/share/man/man5/client.conf.5.gz
-#usr/share/man/man5/cups-files.conf.5.gz
-#usr/share/man/man5/cups-snmp.conf.5.gz
-#usr/share/man/man5/cupsd-logs.5.gz
-#usr/share/man/man5/cupsd.conf.5.gz
-#usr/share/man/man5/ipptoolfile.5.gz
-#usr/share/man/man5/mailto.conf.5.gz
-#usr/share/man/man5/mime.convs.5.gz
-#usr/share/man/man5/mime.types.5.gz
-#usr/share/man/man5/ppdcfile.5.gz
-#usr/share/man/man5/printers.conf.5.gz
-#usr/share/man/man5/subscriptions.conf.5.gz
-#usr/share/man/man7/backend.7.gz
-#usr/share/man/man7/filter.7.gz
-#usr/share/man/man7/notifier.7.gz
-#usr/share/man/man8/accept.8.gz
-#usr/share/man/man8/cups-deviced.8.gz
-#usr/share/man/man8/cups-driverd.8.gz
-#usr/share/man/man8/cups-exec.8.gz
-#usr/share/man/man8/cups-lpd.8.gz
-#usr/share/man/man8/cups-snmp.8.gz
-#usr/share/man/man8/cupsaccept.8.gz
-#usr/share/man/man8/cupsaddsmb.8.gz
-#usr/share/man/man8/cupsctl.8.gz
-#usr/share/man/man8/cupsd-helper.8.gz
-#usr/share/man/man8/cupsd.8.gz
-#usr/share/man/man8/cupsdisable.8.gz
-#usr/share/man/man8/cupsenable.8.gz
-#usr/share/man/man8/cupsfilter.8.gz
-#usr/share/man/man8/cupsreject.8.gz
-#usr/share/man/man8/lpadmin.8.gz
-#usr/share/man/man8/lpc.8.gz
-#usr/share/man/man8/lpinfo.8.gz
-#usr/share/man/man8/lpmove.8.gz
-#usr/share/man/man8/reject.8.gz
+usr/share/locale/zh_CN/cups_zh_CN.po
+#usr/share/man/man1/cancel.1
+#usr/share/man/man1/cups-config.1
+#usr/share/man/man1/cups.1
+#usr/share/man/man1/cupstestppd.1
+#usr/share/man/man1/ippeveprinter.1
+#usr/share/man/man1/ippfind.1
+#usr/share/man/man1/ipptool.1
+#usr/share/man/man1/lp.1
+#usr/share/man/man1/lpoptions.1
+#usr/share/man/man1/lpq.1
+#usr/share/man/man1/lpr.1
+#usr/share/man/man1/lprm.1
+#usr/share/man/man1/lpstat.1
+#usr/share/man/man1/ppdc.1
+#usr/share/man/man1/ppdhtml.1
+#usr/share/man/man1/ppdi.1
+#usr/share/man/man1/ppdmerge.1
+#usr/share/man/man1/ppdpo.1
+#usr/share/man/man5/classes.conf.5
+#usr/share/man/man5/client.conf.5
+#usr/share/man/man5/cups-files.conf.5
+#usr/share/man/man5/cups-snmp.conf.5
+#usr/share/man/man5/cupsd-logs.5
+#usr/share/man/man5/cupsd.conf.5
+#usr/share/man/man5/ipptoolfile.5
+#usr/share/man/man5/mailto.conf.5
+#usr/share/man/man5/mime.convs.5
+#usr/share/man/man5/mime.types.5
+#usr/share/man/man5/ppdcfile.5
+#usr/share/man/man5/printers.conf.5
+#usr/share/man/man5/subscriptions.conf.5
+#usr/share/man/man7/backend.7
+#usr/share/man/man7/filter.7
+#usr/share/man/man7/ippevepcl.7
+#usr/share/man/man7/ippeveps.7
+#usr/share/man/man7/notifier.7
+#usr/share/man/man8/cups-deviced.8
+#usr/share/man/man8/cups-driverd.8
+#usr/share/man/man8/cups-exec.8
+#usr/share/man/man8/cups-lpd.8
+#usr/share/man/man8/cups-snmp.8
+#usr/share/man/man8/cupsaccept.8
+#usr/share/man/man8/cupsctl.8
+#usr/share/man/man8/cupsd-helper.8
+#usr/share/man/man8/cupsd.8
+#usr/share/man/man8/cupsdisable.8
+#usr/share/man/man8/cupsenable.8
+#usr/share/man/man8/cupsfilter.8
+#usr/share/man/man8/cupsreject.8
+#usr/share/man/man8/lpadmin.8
+#usr/share/man/man8/lpc.8
+#usr/share/man/man8/lpinfo.8
+#usr/share/man/man8/lpmove.8
 var/cache/cups
 var/cache/cups/rss
 #var/ipfire/cups
diff --git a/lfs/cups b/lfs/cups
index 6841fae80..2c7138846 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 2.2.2
+VER        = 2.3.3
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.gz
@@ -32,7 +32,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 20
+PAK_VER    = 21
 
 DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
 
@@ -44,7 +44,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 036f6bda6202ae3e280ac00c710b5ca4
+$(DL_FILE)_MD5 = 412434ceefbdf3ec71bc9188a035f589
 
 install : $(TARGET)
 
@@ -88,7 +88,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--enable-gnutls \
 			--enable-libusb
 
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
 	cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb