Update CUPS to 2.2.2

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 0604867e9c4e5a93dc76c68cf1cfcd32586f04b1..b4a50bbb0e6cc1d405e4afadff5c568d986b94a3 100644 (file)
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -31,17 +31,13 @@ usr/bin/ppdpo
 #usr/include/cups/adminutil.h
 #usr/include/cups/array.h
 #usr/include/cups/backend.h
 #usr/include/cups/adminutil.h
 #usr/include/cups/array.h
 #usr/include/cups/backend.h

-#usr/include/cups/cgi.h

 #usr/include/cups/cups.h
 #usr/include/cups/dir.h
 #usr/include/cups/file.h
 #usr/include/cups/cups.h
 #usr/include/cups/dir.h
 #usr/include/cups/file.h

-#usr/include/cups/help-index.h

 #usr/include/cups/http.h
 #usr/include/cups/ipp.h
 #usr/include/cups/language.h
 #usr/include/cups/http.h
 #usr/include/cups/ipp.h
 #usr/include/cups/language.h

-#usr/include/cups/mime.h

 #usr/include/cups/ppd.h
 #usr/include/cups/ppd.h

-#usr/include/cups/ppdc.h

 #usr/include/cups/pwg.h
 #usr/include/cups/raster.h
 #usr/include/cups/sidechannel.h
 #usr/include/cups/pwg.h
 #usr/include/cups/raster.h
 #usr/include/cups/sidechannel.h


@@ -107,16 +103,10 @@ usr/sbin/lpc
 usr/sbin/lpinfo
 usr/sbin/lpmove
 usr/sbin/reject
 usr/sbin/lpinfo
 usr/sbin/lpmove
 usr/sbin/reject

+#usr/share/applications/cups.desktop

 usr/share/cups
 usr/share/cups/banners
 usr/share/cups
 usr/share/cups/banners

-usr/share/cups/banners/classified
-usr/share/cups/banners/confidential
-usr/share/cups/banners/secret
-usr/share/cups/banners/standard
-usr/share/cups/banners/topsecret
-usr/share/cups/banners/unclassified

 usr/share/cups/data
 usr/share/cups/data

-usr/share/cups/data/testprint

 usr/share/cups/drv
 usr/share/cups/drv/sample.drv
 usr/share/cups/examples
 usr/share/cups/drv
 usr/share/cups/drv/sample.drv
 usr/share/cups/examples


@@ -218,6 +208,7 @@ usr/share/cups/templates/de/error.tmpl
 usr/share/cups/templates/de/header.tmpl
 usr/share/cups/templates/de/help-header.tmpl
 usr/share/cups/templates/de/help-printable.tmpl
 usr/share/cups/templates/de/header.tmpl
 usr/share/cups/templates/de/help-header.tmpl
 usr/share/cups/templates/de/help-printable.tmpl

+usr/share/cups/templates/de/help-trailer.tmpl

 usr/share/cups/templates/de/job-cancel.tmpl
 usr/share/cups/templates/de/job-hold.tmpl
 usr/share/cups/templates/de/job-move.tmpl
 usr/share/cups/templates/de/job-cancel.tmpl
 usr/share/cups/templates/de/job-hold.tmpl
 usr/share/cups/templates/de/job-move.tmpl


@@ -446,6 +437,77 @@ usr/share/cups/templates/printer-stop.tmpl
 usr/share/cups/templates/printer.tmpl
 usr/share/cups/templates/printers-header.tmpl
 usr/share/cups/templates/printers.tmpl
 usr/share/cups/templates/printer.tmpl
 usr/share/cups/templates/printers-header.tmpl
 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
+usr/share/cups/templates/pt_BR/choose-model.tmpl
+usr/share/cups/templates/pt_BR/choose-serial.tmpl
+usr/share/cups/templates/pt_BR/choose-uri.tmpl
+usr/share/cups/templates/pt_BR/class-added.tmpl
+usr/share/cups/templates/pt_BR/class-confirm.tmpl
+usr/share/cups/templates/pt_BR/class-deleted.tmpl
+usr/share/cups/templates/pt_BR/class-jobs-header.tmpl
+usr/share/cups/templates/pt_BR/class-modified.tmpl
+usr/share/cups/templates/pt_BR/class.tmpl
+usr/share/cups/templates/pt_BR/classes-header.tmpl
+usr/share/cups/templates/pt_BR/classes.tmpl
+usr/share/cups/templates/pt_BR/command.tmpl
+usr/share/cups/templates/pt_BR/edit-config.tmpl
+usr/share/cups/templates/pt_BR/error-op.tmpl
+usr/share/cups/templates/pt_BR/error.tmpl
+usr/share/cups/templates/pt_BR/header.tmpl
+usr/share/cups/templates/pt_BR/help-header.tmpl
+usr/share/cups/templates/pt_BR/help-printable.tmpl
+usr/share/cups/templates/pt_BR/help-trailer.tmpl
+usr/share/cups/templates/pt_BR/job-cancel.tmpl
+usr/share/cups/templates/pt_BR/job-hold.tmpl
+usr/share/cups/templates/pt_BR/job-move.tmpl
+usr/share/cups/templates/pt_BR/job-moved.tmpl
+usr/share/cups/templates/pt_BR/job-release.tmpl
+usr/share/cups/templates/pt_BR/job-restart.tmpl
+usr/share/cups/templates/pt_BR/jobs-header.tmpl
+usr/share/cups/templates/pt_BR/jobs.tmpl
+usr/share/cups/templates/pt_BR/list-available-printers.tmpl
+usr/share/cups/templates/pt_BR/modify-class.tmpl
+usr/share/cups/templates/pt_BR/modify-printer.tmpl
+usr/share/cups/templates/pt_BR/norestart.tmpl
+usr/share/cups/templates/pt_BR/option-boolean.tmpl
+usr/share/cups/templates/pt_BR/option-conflict.tmpl
+usr/share/cups/templates/pt_BR/option-header.tmpl
+usr/share/cups/templates/pt_BR/option-pickmany.tmpl
+usr/share/cups/templates/pt_BR/option-pickone.tmpl
+usr/share/cups/templates/pt_BR/option-trailer.tmpl
+usr/share/cups/templates/pt_BR/pager.tmpl
+usr/share/cups/templates/pt_BR/printer-accept.tmpl
+usr/share/cups/templates/pt_BR/printer-added.tmpl
+usr/share/cups/templates/pt_BR/printer-cancel-jobs.tmpl
+usr/share/cups/templates/pt_BR/printer-configured.tmpl
+usr/share/cups/templates/pt_BR/printer-confirm.tmpl
+usr/share/cups/templates/pt_BR/printer-default.tmpl
+usr/share/cups/templates/pt_BR/printer-deleted.tmpl
+usr/share/cups/templates/pt_BR/printer-jobs-header.tmpl
+usr/share/cups/templates/pt_BR/printer-modified.tmpl
+usr/share/cups/templates/pt_BR/printer-reject.tmpl
+usr/share/cups/templates/pt_BR/printer-start.tmpl
+usr/share/cups/templates/pt_BR/printer-stop.tmpl
+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

 usr/share/cups/templates/restart.tmpl
 usr/share/cups/templates/ru
 usr/share/cups/templates/ru/add-class.tmpl
 usr/share/cups/templates/restart.tmpl
 usr/share/cups/templates/ru
 usr/share/cups/templates/ru/add-class.tmpl


@@ -472,6 +534,7 @@ usr/share/cups/templates/ru/error.tmpl
 usr/share/cups/templates/ru/header.tmpl
 usr/share/cups/templates/ru/help-header.tmpl
 usr/share/cups/templates/ru/help-printable.tmpl
 usr/share/cups/templates/ru/header.tmpl
 usr/share/cups/templates/ru/help-header.tmpl
 usr/share/cups/templates/ru/help-printable.tmpl

+usr/share/cups/templates/ru/help-trailer.tmpl

 usr/share/cups/templates/ru/job-cancel.tmpl
 usr/share/cups/templates/ru/job-hold.tmpl
 usr/share/cups/templates/ru/job-move.tmpl
 usr/share/cups/templates/ru/job-cancel.tmpl
 usr/share/cups/templates/ru/job-hold.tmpl
 usr/share/cups/templates/ru/job-move.tmpl


@@ -539,19 +602,17 @@ 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/es/index.html
 usr/share/doc/cups/help
 usr/share/doc/cups/help/accounting.html

+usr/share/doc/cups/help/api-admin.html

 usr/share/doc/cups/help/api-array.html
 usr/share/doc/cups/help/api-array.html

-usr/share/doc/cups/help/api-cgi.html

 usr/share/doc/cups/help/api-cups.html
 usr/share/doc/cups/help/api-cups.html

-usr/share/doc/cups/help/api-driver.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-filedir.html
 usr/share/doc/cups/help/api-filter.html
 usr/share/doc/cups/help/api-httpipp.html

-usr/share/doc/cups/help/api-mime.html

 usr/share/doc/cups/help/api-overview.html
 usr/share/doc/cups/help/api-ppd.html
 usr/share/doc/cups/help/api-overview.html
 usr/share/doc/cups/help/api-ppd.html

-usr/share/doc/cups/help/api-ppdc.html

 usr/share/doc/cups/help/api-raster.html
 usr/share/doc/cups/help/cgi.html
 usr/share/doc/cups/help/api-raster.html
 usr/share/doc/cups/help/cgi.html

+usr/share/doc/cups/help/encryption.html

 usr/share/doc/cups/help/glossary.html
 usr/share/doc/cups/help/kerberos.html
 usr/share/doc/cups/help/license.html
 usr/share/doc/cups/help/glossary.html
 usr/share/doc/cups/help/kerberos.html
 usr/share/doc/cups/help/license.html


@@ -607,7 +668,6 @@ usr/share/doc/cups/help/ref-ppdcfile.html
 usr/share/doc/cups/help/security.html
 usr/share/doc/cups/help/sharing.html
 usr/share/doc/cups/help/spec-banner.html
 usr/share/doc/cups/help/security.html
 usr/share/doc/cups/help/sharing.html
 usr/share/doc/cups/help/spec-banner.html

-usr/share/doc/cups/help/spec-cmp.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-command.html
 usr/share/doc/cups/help/spec-design.html
 usr/share/doc/cups/help/spec-ipp.html


@@ -638,6 +698,8 @@ usr/share/doc/cups/images/wait.gif
 usr/share/doc/cups/index.html
 usr/share/doc/cups/ja
 usr/share/doc/cups/ja/index.html
 usr/share/doc/cups/index.html
 usr/share/doc/cups/ja
 usr/share/doc/cups/ja/index.html

+usr/share/doc/cups/pt_BR
+usr/share/doc/cups/pt_BR/index.html

 usr/share/doc/cups/robots.txt
 usr/share/doc/cups/ru
 usr/share/doc/cups/ru/index.html
 usr/share/doc/cups/robots.txt
 usr/share/doc/cups/ru
 usr/share/doc/cups/ru/index.html


@@ -648,6 +710,7 @@ 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/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/locale/ru/cups_ru.po
 #usr/share/man/man1/cancel.1.gz
 #usr/share/man/man1/cups-config.1.gz


@@ -706,11 +769,12 @@ var/cache/cups
 var/cache/cups/rss
 #var/ipfire/cups
 var/ipfire/cups/cups-files.conf
 var/cache/cups/rss
 #var/ipfire/cups
 var/ipfire/cups/cups-files.conf

+var/ipfire/cups/cups-files.conf.default

 var/ipfire/cups/cupsd.conf
 #var/ipfire/cups/cupsd.conf.default
 var/ipfire/cups/cupsd.conf
 #var/ipfire/cups/cupsd.conf.default

-var/ipfire/cups/interfaces

 var/ipfire/cups/ppd
 var/ipfire/cups/snmp.conf
 var/ipfire/cups/ppd
 var/ipfire/cups/snmp.conf

+var/ipfire/cups/snmp.conf.default

 var/ipfire/cups/ssl
 var/log/cups
 var/spool/cups
 var/ipfire/cups/ssl
 var/log/cups
 var/spool/cups

diff --git a/config/rootfiles/packages/cups-filters b/config/rootfiles/packages/cups-filters
index fd85fb89ef60185346083e0fe617818f66297e7f..85564cebcf349b64966b859aafa22b92d0c035ec 100644 (file)
--- a/config/rootfiles/packages/cups-filters
+++ b/config/rootfiles/packages/cups-filters
@@ -59,7 +59,6 @@ usr/lib/cups/filter/texttobrf
 usr/lib/cups/filter/texttopdf
 usr/lib/cups/filter/texttops
 usr/lib/cups/filter/texttotext
 usr/lib/cups/filter/texttopdf
 usr/lib/cups/filter/texttops
 usr/lib/cups/filter/texttotext

-usr/lib/cups/filter/urftopdf

 #usr/lib/libcupsfilters.a
 #usr/lib/libcupsfilters.la
 #usr/lib/libcupsfilters.so
 #usr/lib/libcupsfilters.a
 #usr/lib/libcupsfilters.la
 #usr/lib/libcupsfilters.so


@@ -73,7 +72,13 @@ usr/lib/libfontembed.so.1.0.0
 #usr/lib/pkgconfig/libcupsfilters.pc
 #usr/lib/pkgconfig/libfontembed.pc
 #usr/sbin/cups-browsed
 #usr/lib/pkgconfig/libcupsfilters.pc
 #usr/lib/pkgconfig/libfontembed.pc
 #usr/sbin/cups-browsed

+usr/share/cups/banners/classified
+usr/share/cups/banners/confidential

 usr/share/cups/banners/form
 usr/share/cups/banners/form

+usr/share/cups/banners/secret
+usr/share/cups/banners/standard
+usr/share/cups/banners/topsecret
+usr/share/cups/banners/unclassified

 usr/share/cups/braille
 usr/share/cups/braille/cups-braille.sh
 usr/share/cups/braille/index.sh
 usr/share/cups/braille
 usr/share/cups/braille/cups-braille.sh
 usr/share/cups/braille/index.sh


@@ -93,6 +98,7 @@ usr/share/cups/data/form_russian.pdf
 usr/share/cups/data/form_russian_in.odt
 usr/share/cups/data/secret.pdf
 usr/share/cups/data/standard.pdf
 usr/share/cups/data/form_russian_in.odt
 usr/share/cups/data/secret.pdf
 usr/share/cups/data/standard.pdf

+usr/share/cups/data/testprint

 usr/share/cups/data/topsecret.pdf
 usr/share/cups/data/unclassified.pdf
 usr/share/cups/drv/cupsfilters.drv
 usr/share/cups/data/topsecret.pdf
 usr/share/cups/data/unclassified.pdf
 usr/share/cups/drv/cupsfilters.drv

diff --git a/lfs/cups b/lfs/cups
index e1311af80ad42ff2befceed01d26fe08dd8b41a9..5f900048b703cc0755d9ef03289284cd59bceef5 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,15 +24,15 @@
 
 include Config
 
 
 include Config
 

-VER        = 2.0.4
+VER        = 2.2.2

 
 THISAPP    = cups-$(VER)
 
 THISAPP    = cups-$(VER)

-DL_FILE    = $(THISAPP)-source.tar.bz2
+DL_FILE    = $(THISAPP)-source.tar.gz

 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups

-PAK_VER    = 14
+PAK_VER    = 15

 
 DEPS       = "cups-filters ghostscript"
 
 
 DEPS       = "cups-filters ghostscript"
 


@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = f5c847d9a4fac6c4c66fb0526a7afaae
+$(DL_FILE)_MD5 = 036f6bda6202ae3e280ac00c710b5ca4

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)

-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)

        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \