cups: Update to version 2.4.1

Message ID 20220206123828.3456413-1-adolf.belka@ipfire.org
State Accepted
Commit 37b4810a1470bc3fd6e7f9f68b560136c5274e03
Headers
Series cups: Update to version 2.4.1 |

Commit Message

Adolf Belka Feb. 6, 2022, 12:38 p.m. UTC
  - Update from 2.3.3op2 to 2.4.1
- Update of rootfile
- Changelog
   Changes in CUPS v2.4.1 (27th January 2020)
     - The default color mode now is now configurable and defaults to the printer's
       reported default mode (Issue #277)
     - Configuration script now checks linking for -Wl,-pie flags (Issue #303)
     - Fixed memory leaks - in testi18n (Issue #313), in `cups_enum_dests()`
       (Issue #317), in `_cupsEncodeOption()` and `http_tls_upgrade()` (Issue #322)
     - Fixed missing bracket in de/index.html (Issue #299)
     - Fixed typos in configuration scripts (Issues #304, #316)
     - Removed remaining legacy code for `RIP_MAX_CACHE` environment variable
       (Issue #323)
     - Removed deprecated directives from cupsctl and cups-files.conf (Issue #300)
     - Removed `purge-jobs` legacy code from CGI scripts and templates (Issue #325)
   Changes in CUPS v2.4.0 (29th November 2021)
     - Added configure option --with-idle-exit-timeout (Issue #294)
     - Added --with-systemd-timeoutstartsec configure option (Issue #298)
     - DigestOptions now are applied for MD5 Digest authentication defined
       by RFC 2069 as well (Issue #287)
     - Fixed compilation on Solaris (Issue #293)
     - Fixed and improved German translations (Issue #296, Issue #297)
   Changes in CUPS v2.4rc1 (12th November 2021)
     - Added warning and debug messages when loading printers
      if the queue is raw or with driver (Issue #286)
     - Compilation now uses -fstack-protector-strong if available (Issue #285)
   Changes in CUPS v2.4b1 (27th October 2021)
     - Added support for CUPS running in a Snapcraft snap.
     - Added basic OAuth 2.0 client support (Issue #100)
     - Added support for AirPrint and Mopria clients (Issue #105)
     - Added configure support for specifying systemd dependencies in the CUPS
       service file (Issue #144)
     - Added several features and improvements to `ipptool` (Issue #153)
     - Added a JSON output mode for `ipptool`.
     - The `ipptool` command now correctly reports an error when a test file cannot
       be found.
     - CUPS library now uses thread safe `getpwnam_r` and `getpwuid_r` functions
       (Issue #274)
     - Fixed Kerberos authentication for the web interface (Issue #19)
     - The ZPL sample driver now supports more "standard" label sizes (Issue #70)
     - Fixed reporting of printer instances when enumerating and when no options are
       set for the main instance (Issue #71)
     - Reverted USB read limit enforcement change from CUPS 2.2.12 (Issue #72)
     - The IPP backend did not return the correct status code when a job was canceled
       at the printer/server (Issue #74)
     - The `testlang` unit test program now loops over all of the available locales
       by default (Issue #85)
     - The `cupsfilter` command now shows error messages when options are used
       incorrectly (Issue #88)
     - The PPD functions now treat boolean values as case-insensitive (Issue #106)
     - Temporary queue names no longer end with an underscore (Issue #110)
     - The USB backend now runs as root (Issue #121)
     - Added pkg-config file for libcups (Issue #122)
     - Fixed a PPD memory leak caused by emulator definitions (Issue #124)
     - Fixed a `DISPLAY` bug in `ipptool` (Issue #139)
     - The scheduler now includes the `[Job N]` prefix for job log messages, even
       when using syslog logging (Issue #154)
     - Added support for locales using the GB18030 character set (Issue #159)
     - `httpReconnect2` did not reset the socket file descriptor when the TLS
       negotiation failed (Apple #5907)
     - `httpUpdate` did not reset the socket file descriptor when the TLS
       negotiation failed (Apple #5915)
     - The IPP backend now retries Validate-Job requests (Issue #132)
     - Now show better error messages when a driver interface program fails to
       provide a PPD file (Issue #148)
     - Added dark mode support to the CUPS web interface (Issue #152)
     - Added a workaround for Solaris in `httpAddrConnect2` (Issue #156)
     - Fixed an interaction between `--remote-admin` and `--remote-any` for the
       `cupsctl` command (Issue #158)
     - Now use a 60 second timeout for reading USB backchannel data (Issue #160)
     - The USB backend now tries harder to find a serial number (Issue #170)
     - Fixed `@IF(name)` handling in `cupsd.conf` (Apple #5918)
     - Fixed documentation and added examples for CUPS' limited CGI support
       (Apple #5940)
     - Fixed the `lpc` command prompt (Apple #5946)
     - Now always pass "localhost" in the `Host:` header when talking over a domain
       socket or the loopback interface (Issue #185)
     - Fixed a job history update issue in the scheduler (Issue #187)
     - Fixed `job-pages-per-set` value for duplex print jobs.
     - Fixed an edge case in `ippReadIO` to make sure that only complete attributes
       and values are retained on an error (Issue #195)
     - Hardened `ippReadIO` to prevent invalid IPP messages from being propagated
       (Issue #195, Issue #196)
     - The scheduler now supports the "everywhere" model directly (Issue #201)
     - Fixed some IPP Everywhere option mapping problems (Issue #238)
     - Fixed support for "job-hold-until" with the Restart-Job operation (Issue #250)
     - Fixed the default color/grayscale presets for IPP Everywhere PPDs (Issue #262)
     - Fixed support for the 'offline-report' state for all USB backends (Issue #264)
     - Documentation fixes (Issue #92, Issue #163, Issue #177, Issue #184)
     - Localization updates (Issue #123, Issue #129, Issue #134, Issue #146,
       Issue #164)
     - USB quirk updates (Issue #192, Issue #270, Apple #5766, Apple #5838,
       Apple #5843, Apple #5867)
     - Web interface updates (Issue #142, Issue #218)
     - The `ippeveprinter` tool now automatically uses an available port.
     - Fixed several Windows TLS and hashing issues.
     - Deprecated cups-config (Issue #97)
     - Deprecated Kerberos (`AuthType Negotiate`) authentication (Issue #98)
     - Removed support for the (long deprecated and unused) `FontPath`,
       `ListenBackLog`, `LPDConfigFile`, `KeepAliveTimeout`, `RIPCache`, and
       `SMBConfigFile` directives in `cupsd.conf` and `cups-files.conf`.
     - Stubbed out deprecated `httpMD5` functions.
     - Add test for undefined page ranges during printing.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/packages/cups | 97 +++++++++++++++++++++++++++++++---
 lfs/cups                       |  6 +--
 2 files changed, 92 insertions(+), 11 deletions(-)
  

Comments

Peter Müller Feb. 6, 2022, 4:54 p.m. UTC | #1
Thank you for submitting this. Glad to see CUPS updated. :-)

Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> - Update from 2.3.3op2 to 2.4.1
> - Update of rootfile
> - Changelog
>    Changes in CUPS v2.4.1 (27th January 2020)
>      - The default color mode now is now configurable and defaults to the printer's
>        reported default mode (Issue #277)
>      - Configuration script now checks linking for -Wl,-pie flags (Issue #303)
>      - Fixed memory leaks - in testi18n (Issue #313), in `cups_enum_dests()`
>        (Issue #317), in `_cupsEncodeOption()` and `http_tls_upgrade()` (Issue #322)
>      - Fixed missing bracket in de/index.html (Issue #299)
>      - Fixed typos in configuration scripts (Issues #304, #316)
>      - Removed remaining legacy code for `RIP_MAX_CACHE` environment variable
>        (Issue #323)
>      - Removed deprecated directives from cupsctl and cups-files.conf (Issue #300)
>      - Removed `purge-jobs` legacy code from CGI scripts and templates (Issue #325)
>    Changes in CUPS v2.4.0 (29th November 2021)
>      - Added configure option --with-idle-exit-timeout (Issue #294)
>      - Added --with-systemd-timeoutstartsec configure option (Issue #298)
>      - DigestOptions now are applied for MD5 Digest authentication defined
>        by RFC 2069 as well (Issue #287)
>      - Fixed compilation on Solaris (Issue #293)
>      - Fixed and improved German translations (Issue #296, Issue #297)
>    Changes in CUPS v2.4rc1 (12th November 2021)
>      - Added warning and debug messages when loading printers
>       if the queue is raw or with driver (Issue #286)
>      - Compilation now uses -fstack-protector-strong if available (Issue #285)
>    Changes in CUPS v2.4b1 (27th October 2021)
>      - Added support for CUPS running in a Snapcraft snap.
>      - Added basic OAuth 2.0 client support (Issue #100)
>      - Added support for AirPrint and Mopria clients (Issue #105)
>      - Added configure support for specifying systemd dependencies in the CUPS
>        service file (Issue #144)
>      - Added several features and improvements to `ipptool` (Issue #153)
>      - Added a JSON output mode for `ipptool`.
>      - The `ipptool` command now correctly reports an error when a test file cannot
>        be found.
>      - CUPS library now uses thread safe `getpwnam_r` and `getpwuid_r` functions
>        (Issue #274)
>      - Fixed Kerberos authentication for the web interface (Issue #19)
>      - The ZPL sample driver now supports more "standard" label sizes (Issue #70)
>      - Fixed reporting of printer instances when enumerating and when no options are
>        set for the main instance (Issue #71)
>      - Reverted USB read limit enforcement change from CUPS 2.2.12 (Issue #72)
>      - The IPP backend did not return the correct status code when a job was canceled
>        at the printer/server (Issue #74)
>      - The `testlang` unit test program now loops over all of the available locales
>        by default (Issue #85)
>      - The `cupsfilter` command now shows error messages when options are used
>        incorrectly (Issue #88)
>      - The PPD functions now treat boolean values as case-insensitive (Issue #106)
>      - Temporary queue names no longer end with an underscore (Issue #110)
>      - The USB backend now runs as root (Issue #121)
>      - Added pkg-config file for libcups (Issue #122)
>      - Fixed a PPD memory leak caused by emulator definitions (Issue #124)
>      - Fixed a `DISPLAY` bug in `ipptool` (Issue #139)
>      - The scheduler now includes the `[Job N]` prefix for job log messages, even
>        when using syslog logging (Issue #154)
>      - Added support for locales using the GB18030 character set (Issue #159)
>      - `httpReconnect2` did not reset the socket file descriptor when the TLS
>        negotiation failed (Apple #5907)
>      - `httpUpdate` did not reset the socket file descriptor when the TLS
>        negotiation failed (Apple #5915)
>      - The IPP backend now retries Validate-Job requests (Issue #132)
>      - Now show better error messages when a driver interface program fails to
>        provide a PPD file (Issue #148)
>      - Added dark mode support to the CUPS web interface (Issue #152)
>      - Added a workaround for Solaris in `httpAddrConnect2` (Issue #156)
>      - Fixed an interaction between `--remote-admin` and `--remote-any` for the
>        `cupsctl` command (Issue #158)
>      - Now use a 60 second timeout for reading USB backchannel data (Issue #160)
>      - The USB backend now tries harder to find a serial number (Issue #170)
>      - Fixed `@IF(name)` handling in `cupsd.conf` (Apple #5918)
>      - Fixed documentation and added examples for CUPS' limited CGI support
>        (Apple #5940)
>      - Fixed the `lpc` command prompt (Apple #5946)
>      - Now always pass "localhost" in the `Host:` header when talking over a domain
>        socket or the loopback interface (Issue #185)
>      - Fixed a job history update issue in the scheduler (Issue #187)
>      - Fixed `job-pages-per-set` value for duplex print jobs.
>      - Fixed an edge case in `ippReadIO` to make sure that only complete attributes
>        and values are retained on an error (Issue #195)
>      - Hardened `ippReadIO` to prevent invalid IPP messages from being propagated
>        (Issue #195, Issue #196)
>      - The scheduler now supports the "everywhere" model directly (Issue #201)
>      - Fixed some IPP Everywhere option mapping problems (Issue #238)
>      - Fixed support for "job-hold-until" with the Restart-Job operation (Issue #250)
>      - Fixed the default color/grayscale presets for IPP Everywhere PPDs (Issue #262)
>      - Fixed support for the 'offline-report' state for all USB backends (Issue #264)
>      - Documentation fixes (Issue #92, Issue #163, Issue #177, Issue #184)
>      - Localization updates (Issue #123, Issue #129, Issue #134, Issue #146,
>        Issue #164)
>      - USB quirk updates (Issue #192, Issue #270, Apple #5766, Apple #5838,
>        Apple #5843, Apple #5867)
>      - Web interface updates (Issue #142, Issue #218)
>      - The `ippeveprinter` tool now automatically uses an available port.
>      - Fixed several Windows TLS and hashing issues.
>      - Deprecated cups-config (Issue #97)
>      - Deprecated Kerberos (`AuthType Negotiate`) authentication (Issue #98)
>      - Removed support for the (long deprecated and unused) `FontPath`,
>        `ListenBackLog`, `LPDConfigFile`, `KeepAliveTimeout`, `RIPCache`, and
>        `SMBConfigFile` directives in `cupsd.conf` and `cups-files.conf`.
>      - Stubbed out deprecated `httpMD5` functions.
>      - Add test for undefined page ranges during printing.
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>  config/rootfiles/packages/cups | 97 +++++++++++++++++++++++++++++++---
>  lfs/cups                       |  6 +--
>  2 files changed, 92 insertions(+), 11 deletions(-)
> 
> diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
> index f9d15bc8b..3974aa2a1 100644
> --- a/config/rootfiles/packages/cups
> +++ b/config/rootfiles/packages/cups
> @@ -91,6 +91,7 @@ usr/lib/cups/notifier/rss
>  usr/lib/libcups.so.2
>  #usr/lib/libcupsimage.so
>  usr/lib/libcupsimage.so.2
> +#usr/lib/pkgconfig/cups.pc
>  usr/sbin/cupsaccept
>  usr/sbin/cupsctl
>  usr/sbin/cupsd
> @@ -102,6 +103,8 @@ usr/sbin/lpadmin
>  usr/sbin/lpc
>  usr/sbin/lpinfo
>  usr/sbin/lpmove
> +#usr/share/applications
> +#usr/share/applications/cups.desktop
>  usr/share/cups
>  usr/share/cups/banners
>  usr/share/cups/data
> @@ -176,6 +179,7 @@ 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-media-needed.test
>  usr/share/cups/ipptool/print-job-password.test
>  usr/share/cups/ipptool/print-job.test
>  usr/share/cups/ipptool/print-uri.test
> @@ -216,6 +220,72 @@ usr/share/cups/templates/class.tmpl
>  usr/share/cups/templates/classes-header.tmpl
>  usr/share/cups/templates/classes.tmpl
>  usr/share/cups/templates/command.tmpl
> +usr/share/cups/templates/da
> +usr/share/cups/templates/da/add-class.tmpl
> +usr/share/cups/templates/da/add-printer.tmpl
> +usr/share/cups/templates/da/admin.tmpl
> +usr/share/cups/templates/da/choose-device.tmpl
> +usr/share/cups/templates/da/choose-make.tmpl
> +usr/share/cups/templates/da/choose-model.tmpl
> +usr/share/cups/templates/da/choose-serial.tmpl
> +usr/share/cups/templates/da/choose-uri.tmpl
> +usr/share/cups/templates/da/class-added.tmpl
> +usr/share/cups/templates/da/class-confirm.tmpl
> +usr/share/cups/templates/da/class-deleted.tmpl
> +usr/share/cups/templates/da/class-jobs-header.tmpl
> +usr/share/cups/templates/da/class-modified.tmpl
> +usr/share/cups/templates/da/class.tmpl
> +usr/share/cups/templates/da/classes-header.tmpl
> +usr/share/cups/templates/da/classes.tmpl
> +usr/share/cups/templates/da/command.tmpl
> +usr/share/cups/templates/da/edit-config.tmpl
> +usr/share/cups/templates/da/error-op.tmpl
> +usr/share/cups/templates/da/error.tmpl
> +usr/share/cups/templates/da/header.tmpl
> +usr/share/cups/templates/da/help-header.tmpl
> +usr/share/cups/templates/da/help-printable.tmpl
> +usr/share/cups/templates/da/help-trailer.tmpl
> +usr/share/cups/templates/da/job-cancel.tmpl
> +usr/share/cups/templates/da/job-hold.tmpl
> +usr/share/cups/templates/da/job-move.tmpl
> +usr/share/cups/templates/da/job-moved.tmpl
> +usr/share/cups/templates/da/job-release.tmpl
> +usr/share/cups/templates/da/job-restart.tmpl
> +usr/share/cups/templates/da/jobs-header.tmpl
> +usr/share/cups/templates/da/jobs.tmpl
> +usr/share/cups/templates/da/list-available-printers.tmpl
> +usr/share/cups/templates/da/modify-class.tmpl
> +usr/share/cups/templates/da/modify-printer.tmpl
> +usr/share/cups/templates/da/norestart.tmpl
> +usr/share/cups/templates/da/option-boolean.tmpl
> +usr/share/cups/templates/da/option-conflict.tmpl
> +usr/share/cups/templates/da/option-header.tmpl
> +usr/share/cups/templates/da/option-pickmany.tmpl
> +usr/share/cups/templates/da/option-pickone.tmpl
> +usr/share/cups/templates/da/option-trailer.tmpl
> +usr/share/cups/templates/da/pager.tmpl
> +usr/share/cups/templates/da/printer-accept.tmpl
> +usr/share/cups/templates/da/printer-added.tmpl
> +usr/share/cups/templates/da/printer-cancel-jobs.tmpl
> +usr/share/cups/templates/da/printer-configured.tmpl
> +usr/share/cups/templates/da/printer-confirm.tmpl
> +usr/share/cups/templates/da/printer-default.tmpl
> +usr/share/cups/templates/da/printer-deleted.tmpl
> +usr/share/cups/templates/da/printer-jobs-header.tmpl
> +usr/share/cups/templates/da/printer-modified.tmpl
> +usr/share/cups/templates/da/printer-reject.tmpl
> +usr/share/cups/templates/da/printer-start.tmpl
> +usr/share/cups/templates/da/printer-stop.tmpl
> +usr/share/cups/templates/da/printer.tmpl
> +usr/share/cups/templates/da/printers-header.tmpl
> +usr/share/cups/templates/da/printers.tmpl
> +usr/share/cups/templates/da/restart.tmpl
> +usr/share/cups/templates/da/search.tmpl
> +usr/share/cups/templates/da/set-printer-options-header.tmpl
> +usr/share/cups/templates/da/set-printer-options-trailer.tmpl
> +usr/share/cups/templates/da/test-page.tmpl
> +usr/share/cups/templates/da/trailer.tmpl
> +usr/share/cups/templates/da/users.tmpl
>  usr/share/cups/templates/de
>  usr/share/cups/templates/de/add-class.tmpl
>  usr/share/cups/templates/de/add-printer.tmpl
> @@ -666,17 +736,20 @@ usr/share/doc/cups
>  usr/share/doc/cups/apple-touch-icon.png
>  usr/share/doc/cups/cups-printable.css
>  usr/share/doc/cups/cups.css
> +usr/share/doc/cups/da
> +usr/share/doc/cups/da/index.html
>  usr/share/doc/cups/de
>  usr/share/doc/cups/de/index.html
>  usr/share/doc/cups/es
>  usr/share/doc/cups/es/index.html
> +usr/share/doc/cups/fr
> +usr/share/doc/cups/fr/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-filter.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
> @@ -745,22 +818,15 @@ usr/share/doc/cups/help/spec-raster.html
>  usr/share/doc/cups/help/spec-stp.html
>  usr/share/doc/cups/help/translation.html
>  usr/share/doc/cups/images
> -usr/share/doc/cups/images/color-wheel.png
>  usr/share/doc/cups/images/cups-block-diagram.png
>  usr/share/doc/cups/images/cups-command-chain.png
> -usr/share/doc/cups/images/cups-icon.png
>  usr/share/doc/cups/images/cups-postscript-chain.png
>  usr/share/doc/cups/images/cups-raster-chain.png
>  usr/share/doc/cups/images/cups.png
> -usr/share/doc/cups/images/generic.png
> -usr/share/doc/cups/images/left.gif
>  usr/share/doc/cups/images/raster-organization.png
>  usr/share/doc/cups/images/raster.png
> -usr/share/doc/cups/images/right.gif
>  usr/share/doc/cups/images/sample-image.png
> -usr/share/doc/cups/images/sel.gif
>  usr/share/doc/cups/images/smiley.jpg
> -usr/share/doc/cups/images/unsel.gif
>  usr/share/doc/cups/images/wait.gif
>  usr/share/doc/cups/index.html
>  usr/share/doc/cups/ja
> @@ -770,8 +836,23 @@ 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/icons
> +usr/share/icons/hicolor
> +usr/share/icons/hicolor/128x128
> +usr/share/icons/hicolor/128x128/apps
> +usr/share/icons/hicolor/128x128/apps/cups.png
> +usr/share/icons/hicolor/16x16
> +usr/share/icons/hicolor/16x16/apps
> +usr/share/icons/hicolor/16x16/apps/cups.png
> +usr/share/icons/hicolor/32x32
> +usr/share/icons/hicolor/32x32/apps
> +usr/share/icons/hicolor/32x32/apps/cups.png
> +usr/share/icons/hicolor/64x64
> +usr/share/icons/hicolor/64x64/apps
> +usr/share/icons/hicolor/64x64/apps/cups.png
>  usr/share/locale/ca/cups_ca.po
>  usr/share/locale/cs/cups_cs.po
> +usr/share/locale/da/cups_da.po
>  usr/share/locale/de/cups_de.po
>  usr/share/locale/en
>  usr/share/locale/en/cups_en.po
> diff --git a/lfs/cups b/lfs/cups
> index 99c9c8887..6210cd3b0 100644
> --- a/lfs/cups
> +++ b/lfs/cups
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 2.3.3op2
> +VER        = 2.4.1
>  
>  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    = 23
> +PAK_VER    = 24
>  
>  DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
>  
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 524266752cf243c968921547b18ee594
> +$(DL_FILE)_MD5 = c2e5143d06f21e19ea2b73913185656f
>  
>  install : $(TARGET)
>
  

Patch

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index f9d15bc8b..3974aa2a1 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -91,6 +91,7 @@  usr/lib/cups/notifier/rss
 usr/lib/libcups.so.2
 #usr/lib/libcupsimage.so
 usr/lib/libcupsimage.so.2
+#usr/lib/pkgconfig/cups.pc
 usr/sbin/cupsaccept
 usr/sbin/cupsctl
 usr/sbin/cupsd
@@ -102,6 +103,8 @@  usr/sbin/lpadmin
 usr/sbin/lpc
 usr/sbin/lpinfo
 usr/sbin/lpmove
+#usr/share/applications
+#usr/share/applications/cups.desktop
 usr/share/cups
 usr/share/cups/banners
 usr/share/cups/data
@@ -176,6 +179,7 @@  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-media-needed.test
 usr/share/cups/ipptool/print-job-password.test
 usr/share/cups/ipptool/print-job.test
 usr/share/cups/ipptool/print-uri.test
@@ -216,6 +220,72 @@  usr/share/cups/templates/class.tmpl
 usr/share/cups/templates/classes-header.tmpl
 usr/share/cups/templates/classes.tmpl
 usr/share/cups/templates/command.tmpl
+usr/share/cups/templates/da
+usr/share/cups/templates/da/add-class.tmpl
+usr/share/cups/templates/da/add-printer.tmpl
+usr/share/cups/templates/da/admin.tmpl
+usr/share/cups/templates/da/choose-device.tmpl
+usr/share/cups/templates/da/choose-make.tmpl
+usr/share/cups/templates/da/choose-model.tmpl
+usr/share/cups/templates/da/choose-serial.tmpl
+usr/share/cups/templates/da/choose-uri.tmpl
+usr/share/cups/templates/da/class-added.tmpl
+usr/share/cups/templates/da/class-confirm.tmpl
+usr/share/cups/templates/da/class-deleted.tmpl
+usr/share/cups/templates/da/class-jobs-header.tmpl
+usr/share/cups/templates/da/class-modified.tmpl
+usr/share/cups/templates/da/class.tmpl
+usr/share/cups/templates/da/classes-header.tmpl
+usr/share/cups/templates/da/classes.tmpl
+usr/share/cups/templates/da/command.tmpl
+usr/share/cups/templates/da/edit-config.tmpl
+usr/share/cups/templates/da/error-op.tmpl
+usr/share/cups/templates/da/error.tmpl
+usr/share/cups/templates/da/header.tmpl
+usr/share/cups/templates/da/help-header.tmpl
+usr/share/cups/templates/da/help-printable.tmpl
+usr/share/cups/templates/da/help-trailer.tmpl
+usr/share/cups/templates/da/job-cancel.tmpl
+usr/share/cups/templates/da/job-hold.tmpl
+usr/share/cups/templates/da/job-move.tmpl
+usr/share/cups/templates/da/job-moved.tmpl
+usr/share/cups/templates/da/job-release.tmpl
+usr/share/cups/templates/da/job-restart.tmpl
+usr/share/cups/templates/da/jobs-header.tmpl
+usr/share/cups/templates/da/jobs.tmpl
+usr/share/cups/templates/da/list-available-printers.tmpl
+usr/share/cups/templates/da/modify-class.tmpl
+usr/share/cups/templates/da/modify-printer.tmpl
+usr/share/cups/templates/da/norestart.tmpl
+usr/share/cups/templates/da/option-boolean.tmpl
+usr/share/cups/templates/da/option-conflict.tmpl
+usr/share/cups/templates/da/option-header.tmpl
+usr/share/cups/templates/da/option-pickmany.tmpl
+usr/share/cups/templates/da/option-pickone.tmpl
+usr/share/cups/templates/da/option-trailer.tmpl
+usr/share/cups/templates/da/pager.tmpl
+usr/share/cups/templates/da/printer-accept.tmpl
+usr/share/cups/templates/da/printer-added.tmpl
+usr/share/cups/templates/da/printer-cancel-jobs.tmpl
+usr/share/cups/templates/da/printer-configured.tmpl
+usr/share/cups/templates/da/printer-confirm.tmpl
+usr/share/cups/templates/da/printer-default.tmpl
+usr/share/cups/templates/da/printer-deleted.tmpl
+usr/share/cups/templates/da/printer-jobs-header.tmpl
+usr/share/cups/templates/da/printer-modified.tmpl
+usr/share/cups/templates/da/printer-reject.tmpl
+usr/share/cups/templates/da/printer-start.tmpl
+usr/share/cups/templates/da/printer-stop.tmpl
+usr/share/cups/templates/da/printer.tmpl
+usr/share/cups/templates/da/printers-header.tmpl
+usr/share/cups/templates/da/printers.tmpl
+usr/share/cups/templates/da/restart.tmpl
+usr/share/cups/templates/da/search.tmpl
+usr/share/cups/templates/da/set-printer-options-header.tmpl
+usr/share/cups/templates/da/set-printer-options-trailer.tmpl
+usr/share/cups/templates/da/test-page.tmpl
+usr/share/cups/templates/da/trailer.tmpl
+usr/share/cups/templates/da/users.tmpl
 usr/share/cups/templates/de
 usr/share/cups/templates/de/add-class.tmpl
 usr/share/cups/templates/de/add-printer.tmpl
@@ -666,17 +736,20 @@  usr/share/doc/cups
 usr/share/doc/cups/apple-touch-icon.png
 usr/share/doc/cups/cups-printable.css
 usr/share/doc/cups/cups.css
+usr/share/doc/cups/da
+usr/share/doc/cups/da/index.html
 usr/share/doc/cups/de
 usr/share/doc/cups/de/index.html
 usr/share/doc/cups/es
 usr/share/doc/cups/es/index.html
+usr/share/doc/cups/fr
+usr/share/doc/cups/fr/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-filter.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
@@ -745,22 +818,15 @@  usr/share/doc/cups/help/spec-raster.html
 usr/share/doc/cups/help/spec-stp.html
 usr/share/doc/cups/help/translation.html
 usr/share/doc/cups/images
-usr/share/doc/cups/images/color-wheel.png
 usr/share/doc/cups/images/cups-block-diagram.png
 usr/share/doc/cups/images/cups-command-chain.png
-usr/share/doc/cups/images/cups-icon.png
 usr/share/doc/cups/images/cups-postscript-chain.png
 usr/share/doc/cups/images/cups-raster-chain.png
 usr/share/doc/cups/images/cups.png
-usr/share/doc/cups/images/generic.png
-usr/share/doc/cups/images/left.gif
 usr/share/doc/cups/images/raster-organization.png
 usr/share/doc/cups/images/raster.png
-usr/share/doc/cups/images/right.gif
 usr/share/doc/cups/images/sample-image.png
-usr/share/doc/cups/images/sel.gif
 usr/share/doc/cups/images/smiley.jpg
-usr/share/doc/cups/images/unsel.gif
 usr/share/doc/cups/images/wait.gif
 usr/share/doc/cups/index.html
 usr/share/doc/cups/ja
@@ -770,8 +836,23 @@  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/icons
+usr/share/icons/hicolor
+usr/share/icons/hicolor/128x128
+usr/share/icons/hicolor/128x128/apps
+usr/share/icons/hicolor/128x128/apps/cups.png
+usr/share/icons/hicolor/16x16
+usr/share/icons/hicolor/16x16/apps
+usr/share/icons/hicolor/16x16/apps/cups.png
+usr/share/icons/hicolor/32x32
+usr/share/icons/hicolor/32x32/apps
+usr/share/icons/hicolor/32x32/apps/cups.png
+usr/share/icons/hicolor/64x64
+usr/share/icons/hicolor/64x64/apps
+usr/share/icons/hicolor/64x64/apps/cups.png
 usr/share/locale/ca/cups_ca.po
 usr/share/locale/cs/cups_cs.po
+usr/share/locale/da/cups_da.po
 usr/share/locale/de/cups_de.po
 usr/share/locale/en
 usr/share/locale/en/cups_en.po
diff --git a/lfs/cups b/lfs/cups
index 99c9c8887..6210cd3b0 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 2.3.3op2
+VER        = 2.4.1
 
 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    = 23
+PAK_VER    = 24
 
 DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
 
@@ -44,7 +44,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 524266752cf243c968921547b18ee594
+$(DL_FILE)_MD5 = c2e5143d06f21e19ea2b73913185656f
 
 install : $(TARGET)