Update cups to 1.3.7

Add missing php-pear files to core11

diff --git a/config/rootfiles/core/11/files b/config/rootfiles/core/11/files
index ff6d3f9b9682a46c53ebb6d3d65a42ed12690583..897e7ef8cd25d1041ca2951906a1ced03ea08e1f 100644 (file)
--- a/config/rootfiles/core/11/files
+++ b/config/rootfiles/core/11/files
@@ -11,3 +11,11 @@ lib/libntfs-3g.so.24.0.0
 sbin/mount.ntfs-3g
 usr/bin/php
 usr/lib/apache/libphp5.so
+usr/bin/pear
+usr/bin/peardev
+usr/lib/php/.channels/.alias/pear.txt
+usr/lib/php/.channels/pear.php.net.reg
+usr/lib/php/.registry/pear.reg
+usr/lib/php/data/PEAR/package.dtd
+usr/lib/php/data/PEAR/template.spec
+usr/lib/php/pearcmd.php

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 30f598c89c27b29303f92684fdd7ba7d3d66b0ac..4904fcbfe95455c3f03aca8ae2194519268b8505 100644 (file)
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -140,32 +140,32 @@ usr/share/cups/charmaps/windows-936.txt
 usr/share/cups/charmaps/windows-949.txt
 usr/share/cups/charmaps/windows-950.txt
 #usr/share/cups/charsets
-usr/share/cups/charsets/iso-8859-1
-usr/share/cups/charsets/iso-8859-10
-usr/share/cups/charsets/iso-8859-13
-usr/share/cups/charsets/iso-8859-14
-usr/share/cups/charsets/iso-8859-15
-usr/share/cups/charsets/iso-8859-2
-usr/share/cups/charsets/iso-8859-3
-usr/share/cups/charsets/iso-8859-4
-usr/share/cups/charsets/iso-8859-5
-usr/share/cups/charsets/iso-8859-6
-usr/share/cups/charsets/iso-8859-7
-usr/share/cups/charsets/iso-8859-8
-usr/share/cups/charsets/iso-8859-9
-usr/share/cups/charsets/koi8-r
-usr/share/cups/charsets/koi8-u
+#usr/share/cups/charsets/iso-8859-1
+#usr/share/cups/charsets/iso-8859-10
+#usr/share/cups/charsets/iso-8859-13
+#usr/share/cups/charsets/iso-8859-14
+#usr/share/cups/charsets/iso-8859-15
+#usr/share/cups/charsets/iso-8859-2
+#usr/share/cups/charsets/iso-8859-3
+#usr/share/cups/charsets/iso-8859-4
+#usr/share/cups/charsets/iso-8859-5
+#usr/share/cups/charsets/iso-8859-6
+#usr/share/cups/charsets/iso-8859-7
+#usr/share/cups/charsets/iso-8859-8
+#usr/share/cups/charsets/iso-8859-9
+#usr/share/cups/charsets/koi8-r
+#usr/share/cups/charsets/koi8-u
 usr/share/cups/charsets/utf-8
-usr/share/cups/charsets/windows-1250
-usr/share/cups/charsets/windows-1251
-usr/share/cups/charsets/windows-1252
-usr/share/cups/charsets/windows-1253
-usr/share/cups/charsets/windows-1254
-usr/share/cups/charsets/windows-1255
-usr/share/cups/charsets/windows-1256
-usr/share/cups/charsets/windows-1257
-usr/share/cups/charsets/windows-1258
-usr/share/cups/charsets/windows-874
+#usr/share/cups/charsets/windows-1250
+#usr/share/cups/charsets/windows-1251
+#usr/share/cups/charsets/windows-1252
+#usr/share/cups/charsets/windows-1253
+#usr/share/cups/charsets/windows-1254
+#usr/share/cups/charsets/windows-1255
+#usr/share/cups/charsets/windows-1256
+#usr/share/cups/charsets/windows-1257
+#usr/share/cups/charsets/windows-1258
+#usr/share/cups/charsets/windows-874
 #usr/share/cups/data
 usr/share/cups/data/HPGLprolog
 usr/share/cups/data/psglyphs
@@ -178,7 +178,7 @@ usr/share/cups/fonts/Courier-Oblique
 usr/share/cups/fonts/Symbol
 #usr/share/cups/model
 usr/share/cups/model/deskjet.ppd
-usr/share/cups/model/deskjet2.ppd
+#usr/share/cups/model/deskjet2.ppd
 usr/share/cups/model/dymo.ppd
 usr/share/cups/model/epson24.ppd
 usr/share/cups/model/epson9.ppd
@@ -1034,3 +1034,184 @@ var/run/cups
 var/run/cups/certs
 var/spool/cups
 var/spool/cups/tmp
+#usr/include/cups/sidechannel.h
+usr/lib/cups/notifier/rss
+usr/sbin/cupsctl
+usr/sbin/cupsfilter
+#usr/share/applications/cups.desktop
+usr/share/cups/model/intelbar.ppd
+usr/share/cups/model/zebracpl.ppd
+usr/share/cups/templates/add-rss-subscription.tmpl
+usr/share/cups/templates/de/add-rss-subscription.tmpl
+usr/share/cups/templates/de/list-available-printers.tmpl
+usr/share/cups/templates/de/subscription-added.tmpl
+usr/share/cups/templates/de/subscription-canceled.tmpl
+#usr/share/cups/templates/es/add-rss-subscription.tmpl
+#usr/share/cups/templates/es/list-available-printers.tmpl
+#usr/share/cups/templates/es/subscription-added.tmpl
+#usr/share/cups/templates/es/subscription-canceled.tmpl
+#usr/share/cups/templates/he
+#usr/share/cups/templates/he/add-class.tmpl
+#usr/share/cups/templates/he/add-printer.tmpl
+#usr/share/cups/templates/he/admin.tmpl
+#usr/share/cups/templates/he/choose-device.tmpl
+#usr/share/cups/templates/he/choose-make.tmpl
+#usr/share/cups/templates/he/choose-model.tmpl
+#usr/share/cups/templates/he/choose-serial.tmpl
+#usr/share/cups/templates/he/choose-uri.tmpl
+#usr/share/cups/templates/he/class-added.tmpl
+#usr/share/cups/templates/he/class-confirm.tmpl
+#usr/share/cups/templates/he/class-deleted.tmpl
+#usr/share/cups/templates/he/class-jobs-header.tmpl
+#usr/share/cups/templates/he/class-modified.tmpl
+#usr/share/cups/templates/he/classes-header.tmpl
+#usr/share/cups/templates/he/classes.tmpl
+#usr/share/cups/templates/he/edit-config.tmpl
+#usr/share/cups/templates/he/error-op.tmpl
+#usr/share/cups/templates/he/error.tmpl
+#usr/share/cups/templates/he/header.tmpl
+#usr/share/cups/templates/he/help-header.tmpl
+#usr/share/cups/templates/he/help-printable.tmpl
+#usr/share/cups/templates/he/job-cancel.tmpl
+#usr/share/cups/templates/he/job-hold.tmpl
+#usr/share/cups/templates/he/job-move.tmpl
+#usr/share/cups/templates/he/job-moved.tmpl
+#usr/share/cups/templates/he/job-release.tmpl
+#usr/share/cups/templates/he/job-restart.tmpl
+#usr/share/cups/templates/he/jobs-header.tmpl
+#usr/share/cups/templates/he/jobs.tmpl
+#usr/share/cups/templates/he/maintenance.tmpl
+#usr/share/cups/templates/he/modify-class.tmpl
+#usr/share/cups/templates/he/modify-printer.tmpl
+#usr/share/cups/templates/he/norestart.tmpl
+#usr/share/cups/templates/he/option-boolean.tmpl
+#usr/share/cups/templates/he/option-conflict.tmpl
+#usr/share/cups/templates/he/option-header.tmpl
+#usr/share/cups/templates/he/option-pickmany.tmpl
+#usr/share/cups/templates/he/option-pickone.tmpl
+#usr/share/cups/templates/he/option-trailer.tmpl
+#usr/share/cups/templates/he/pager.tmpl
+#usr/share/cups/templates/he/printer-accept.tmpl
+#usr/share/cups/templates/he/printer-added.tmpl
+#usr/share/cups/templates/he/printer-configured.tmpl
+#usr/share/cups/templates/he/printer-confirm.tmpl
+#usr/share/cups/templates/he/printer-default.tmpl
+#usr/share/cups/templates/he/printer-deleted.tmpl
+#usr/share/cups/templates/he/printer-jobs-header.tmpl
+#usr/share/cups/templates/he/printer-modified.tmpl
+#usr/share/cups/templates/he/printer-purge.tmpl
+#usr/share/cups/templates/he/printer-reject.tmpl
+#usr/share/cups/templates/he/printer-start.tmpl
+#usr/share/cups/templates/he/printer-stop.tmpl
+#usr/share/cups/templates/he/printers-header.tmpl
+#usr/share/cups/templates/he/printers.tmpl
+#usr/share/cups/templates/he/restart.tmpl
+#usr/share/cups/templates/he/samba-export.tmpl
+#usr/share/cups/templates/he/samba-exported.tmpl
+#usr/share/cups/templates/he/search.tmpl
+#usr/share/cups/templates/he/set-printer-options-header.tmpl
+#usr/share/cups/templates/he/set-printer-options-trailer.tmpl
+#usr/share/cups/templates/he/test-page.tmpl
+#usr/share/cups/templates/he/trailer.tmpl
+#usr/share/cups/templates/he/users.tmpl
+#usr/share/cups/templates/ja/add-rss-subscription.tmpl
+#usr/share/cups/templates/ja/list-available-printers.tmpl
+#usr/share/cups/templates/ja/norestart.tmpl
+#usr/share/cups/templates/ja/subscription-added.tmpl
+#usr/share/cups/templates/ja/subscription-canceled.tmpl
+#usr/share/cups/templates/list-available-printers.tmpl
+#usr/share/cups/templates/subscription-added.tmpl
+#usr/share/cups/templates/subscription-canceled.tmpl
+#usr/share/doc/cups/de/images/button-add-rss-subscription.gif
+#usr/share/doc/cups/de/images/button-cancel-subscription.gif
+#usr/share/doc/cups/de/images/button-find-new-printers.gif
+#usr/share/doc/cups/de/images/button-use-default-config.gif
+#usr/share/doc/cups/es/images/button-add-rss-subscription.gif
+#usr/share/doc/cups/es/images/button-cancel-subscription.gif
+#usr/share/doc/cups/es/images/button-find-new-printers.gif
+#usr/share/doc/cups/he
+#usr/share/doc/cups/he/cups.css
+#usr/share/doc/cups/he/images
+#usr/share/doc/cups/he/images/button-accept-jobs.gif
+#usr/share/doc/cups/he/images/button-add-class.gif
+#usr/share/doc/cups/he/images/button-add-printer.gif
+#usr/share/doc/cups/he/images/button-add-this-printer.gif
+#usr/share/doc/cups/he/images/button-cancel-all-jobs.gif
+#usr/share/doc/cups/he/images/button-cancel-job.gif
+#usr/share/doc/cups/he/images/button-change-settings.gif
+#usr/share/doc/cups/he/images/button-clean-print-heads.gif
+#usr/share/doc/cups/he/images/button-clear.gif
+#usr/share/doc/cups/he/images/button-continue.gif
+#usr/share/doc/cups/he/images/button-delete-class.gif
+#usr/share/doc/cups/he/images/button-delete-printer.gif
+#usr/share/doc/cups/he/images/button-edit-configuration-file.gif
+#usr/share/doc/cups/he/images/button-export-samba.gif
+#usr/share/doc/cups/he/images/button-help.gif
+#usr/share/doc/cups/he/images/button-hold-job.gif
+#usr/share/doc/cups/he/images/button-manage-classes.gif
+#usr/share/doc/cups/he/images/button-manage-jobs.gif
+#usr/share/doc/cups/he/images/button-manage-printers.gif
+#usr/share/doc/cups/he/images/button-manage-server.gif
+#usr/share/doc/cups/he/images/button-modify-class.gif
+#usr/share/doc/cups/he/images/button-modify-printer.gif
+#usr/share/doc/cups/he/images/button-move-job.gif
+#usr/share/doc/cups/he/images/button-move-jobs.gif
+#usr/share/doc/cups/he/images/button-print-self-test-page.gif
+#usr/share/doc/cups/he/images/button-print-test-page.gif
+#usr/share/doc/cups/he/images/button-publish-printer.gif
+#usr/share/doc/cups/he/images/button-reject-jobs.gif
+#usr/share/doc/cups/he/images/button-release-job.gif
+#usr/share/doc/cups/he/images/button-restart-job.gif
+#usr/share/doc/cups/he/images/button-save-changes.gif
+#usr/share/doc/cups/he/images/button-search.gif
+#usr/share/doc/cups/he/images/button-set-allowed-users.gif
+#usr/share/doc/cups/he/images/button-set-as-default.gif
+#usr/share/doc/cups/he/images/button-set-printer-options.gif
+#usr/share/doc/cups/he/images/button-show-active.gif
+#usr/share/doc/cups/he/images/button-show-all.gif
+#usr/share/doc/cups/he/images/button-show-completed.gif
+#usr/share/doc/cups/he/images/button-show-next.gif
+#usr/share/doc/cups/he/images/button-show-previous.gif
+#usr/share/doc/cups/he/images/button-sort-ascending.gif
+#usr/share/doc/cups/he/images/button-sort-descending.gif
+#usr/share/doc/cups/he/images/button-start-class.gif
+#usr/share/doc/cups/he/images/button-start-printer.gif
+#usr/share/doc/cups/he/images/button-stop-class.gif
+#usr/share/doc/cups/he/images/button-stop-printer.gif
+#usr/share/doc/cups/he/images/button-unpublish-printer.gif
+#usr/share/doc/cups/he/images/button-use-default-config.gif
+#usr/share/doc/cups/he/images/button-view-access-log.gif
+#usr/share/doc/cups/he/images/button-view-error-log.gif
+#usr/share/doc/cups/he/images/button-view-page-log.gif
+#usr/share/doc/cups/he/images/button-view-printable-version.gif
+#usr/share/doc/cups/he/index.html
+#usr/share/doc/cups/help/accounting.html
+#usr/share/doc/cups/help/kerberos.html
+#usr/share/doc/cups/help/spec-postscript.html
+#usr/share/doc/cups/images/button-add-rss-subscription.gif
+#usr/share/doc/cups/images/button-cancel-subscription.gif
+#usr/share/doc/cups/images/button-find-new-printers.gif
+#usr/share/doc/cups/images/raster.png
+#usr/share/doc/cups/images/raster.svg
+#usr/share/doc/cups/ja/images/button-add-rss-subscription.gif
+#usr/share/doc/cups/ja/images/button-cancel-subscription.gif
+#usr/share/doc/cups/ja/images/button-clean-print-heads.gif
+#usr/share/doc/cups/ja/images/button-clear.gif
+#usr/share/doc/cups/ja/images/button-find-new-printers.gif
+#usr/share/doc/cups/ja/images/button-print-self-test-page.gif
+#usr/share/doc/cups/ja/images/button-view-printable-version.gif
+#usr/share/locale/da/cups_da.po
+#usr/share/locale/fi/cups_fi.po
+#usr/share/locale/he/cups_he.po
+#usr/share/locale/ko/cups_ko.po
+#usr/share/locale/nl/cups_nl.po
+#usr/share/locale/no/cups_no.po
+#usr/share/locale/pt/cups_pt.po
+#usr/share/locale/pt_BR/cups_pt_BR.po
+#usr/share/locale/ru/cups_ru.po
+#usr/share/locale/zh
+#usr/share/locale/zh/cups_zh.po
+#usr/share/man/man8/cupsctl.8.gz
+#usr/share/man/man8/cupsfilter.8.gz
+#var/cache/cups/rss
+var/ipfire/cups/snmp.conf

diff --git a/lfs/cups b/lfs/cups
index f6864f16a2167ec1b0ee58799d53954ae21ab777..4e94ed308faa2c9e3dd7881483ba3b949683ce26 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.12
+VER        = 1.3.7
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "ghostscript"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d410658468384b5ba5d04a808f6157fe
+$(DL_FILE)_MD5 = db4a45a17104f10f3ee599d88267c9e5
 
 install : $(TARGET)