Commit Graph

124 Commits

Author SHA1 Message Date
Wang Mingyu
3122b38dfa cups: upgrade 2.4.11 -> 2.4.12
Changelog:
===========
- GnuTLS follows system crypto policies now
- Added 'NoSystem' SSLOptions value
- Now we raise alert for certificate issues
- Added Kyocera USB quirk
- The scheduler now logs a job's debugging history if the backend fails
- Fixed a potential timing issue with 'cupsEnumDests'
- Fixed a potential "lost PPD" condition in the scheduler
- Fixed a compressed file error handling bug
- Fixed a bug in the make-and-model whitespace trimming code
- Fixed a removal of IPP Everywhere permanent queue if installation failed
- Fixed 'ServerToken None' in scheduler
- Fixed invalid IPP keyword values created from PPD option names
- Fixed handling of "media" and "PageSize" in the same print request
- Fixed client raster printing from macOS
- Fixed the default User-Agent string.
- Fixed a recursion issue in 'ippReadIO'.
- Fixed handling incorrect radix in 'scan_ps()'
- Fixed validation of dateTime values with time zones more than UTC+11
- Fixed attributes returned by the Create-Xxx-Subscriptions requests
- Fixed 'ippDateToTime' when using a non GMT/UTC timezone
- Fixed 'job-completed' event notifications for jobs that are cancelled before
  started
- Fixed DNS-SD discovery with 'ippfind'

(From OE-Core rev: caab5dd2dd8705a58b2878a8d295117931114e65)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2025-05-13 10:29:20 +01:00
Alexander Kanavin
fd467c0d60 cups: upgrade 2.4.10 -> 2.4.11
(From OE-Core rev: a79dd46b65d897f62dbc8a89712229a08b735c85)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-12-05 17:07:10 +00:00
Wang Mingyu
1b9218a6a3 cups: upgrade 2.4.9 -> 2.4.10
Changelog:
===========
- Fixed error handling when reading a mixed "1setOf" attribute.
- Fixed scheduler start if there is only domain socket to listen on

0001-use-echo-only-in-init.patch
0002-don-t-try-to-run-generated-binaries.patch
0004-cups-fix-multilib-install-file-conflicts.patch
refreshed for 2.4.10.

(From OE-Core rev: dd7a978d2d7feb11f6c265ba812c8ca29912ebc6)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-07-16 11:25:29 +01:00
Siddharth Doshi
35faffd46c cups: Upgrade 2.4.8 -> 2.4.9
CVE's Fixed by upgrade:
CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777

Other Changes between 2.4.8 -> 2.4.9
====================================
https://github.com/OpenPrinting/cups/blob/2.4.x/CHANGES.md

(From OE-Core rev: 6e1f6b7166f4a17bbf99f4b17cb9ed1fba9bbf39)

Signed-off-by: Siddharth Doshi <sdoshi@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-06-18 08:44:41 +01:00
Chen Qi
857f34eb49 cups: upgrade from 2.4.7 to 2.4.8
(From OE-Core rev: ce1319344cc64b2ffcccba27423e61c93a3c6a36)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-05-22 10:21:26 +01:00
Richard Purdie
0ea63b6a43 recipes: Update WORKDIR references to UNPACKDIR
Since we want to be able to stop unpacking to WORKDIR, correct the WORKDIR
references in recipe do_compile/do_install tasks to use UNPACKDIR in the
appropraite places instead.

(From OE-Core rev: d73595df69667fe9d12ecd407b77a0b8dae2109c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-05-02 15:15:51 +01:00
Jonathan GUILLOT
8da6bd69dc cups: use LOCALE_PATHS to split localized HTML templates
Localized HTML templates in /usr/share/cups/templates are now part of
locale packages.

(From OE-Core rev: beb21ac92e95b6f4bf64e4932b154f78e2c6c2ef)

Signed-off-by: Jonathan GUILLOT <jonathan@joggee.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-02-14 13:53:36 +00:00
Markus Volk
4371f927bc cups: Add root,sys,wheel to system groups
The Cups documentation states:
The default contains "admin", "lpadmin", "root", "sys" and/or "system".
https://www.cups.org/doc/man-cups-files.conf.html#:~:text=SystemGroup

Add root and sys accordingly
Also add wheel group. This is required for systems with polkit support in order to
control the printer settings with cups-pk-helper.
Not only for gnome-control-center, but also when using plain system-config-printer on
a system with running polkit, cups-pk-helper would be a required rdepend.

(From OE-Core rev: 572fed0ac6dbcf5749e19c7b624826fc30cf301e)

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-12-02 17:18:57 +00:00
Markus Volk
35fa9488cb cups: Upgrade 2.4.6 -> 2.4.7
- enable tls by default to fix:
| hash.c:16:12: fatal error: gnutls/crypto.h: No such file or directory
|    16 | #  include <gnutls/crypto.h>

Changes in CUPS v2.4.7 (2023-09-20)
-----------------------------------

- CVE-2023-4504 - Fixed Heap-based buffer overflow when reading Postscript
  in PPD files
- Added OpenSSL support for cupsHashData (Issue #762)
- Fixed delays in lpd backend (Issue #741)
- Fixed extensive logging in scheduler (Issue #604)
- Fixed hanging of `lpstat` on IBM AIX (Issue #773)
- Fixed hanging of `lpstat` on Solaris (Issue #156)
- Fixed printing to stderr if we can't open cups-files.conf (Issue #777)
- Fixed purging job files via `cancel -x` (Issue #742)
- Fixed RFC 1179 port reserving behavior in LPD backend (Issue #743)
- Fixed a bug in the PPD command interpretation code (Issue #768)

(From OE-Core rev: 0e33d6fc646e76390e5bf8a0f7b38bd15c83729c)

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-11-20 15:30:52 +00:00
Lee Chee Yang
83b4083fdc cups: fix CVE-2023-4504
(From OE-Core rev: d359aae352279f865f7dce33be293c3d26623737)

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-09-28 12:37:47 +01:00
Andrej Valek
c15e506a46 cve_check: convert CVE_CHECK_IGNORE to CVE_STATUS
- Try to add convert and apply statuses for old CVEs
- Drop some obsolete ignores, while they are not relevant for current
  version

(From OE-Core rev: 1634ed4048cf56788cd5c2c1bdc979b70afcdcd7)

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Reviewed-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-07-21 11:52:26 +01:00
Ross Burton
7379a88457 cups: upgrade to 2.4.6
This resolves CVE-2023-34241.

(From OE-Core rev: 829c742b5461c4599d304541e0da0915dc44146c)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-07-10 11:36:34 +01:00
schitrod=cisco.com@lists.openembedded.org
c4b4a638ba cups: Fix CVE-2023-32324
OpenPrinting CUPS is an open source printing system. In versions 2.4.2
and prior, a heap buffer overflow vulnerability would allow a remote
attacker to launch a denial of service (DoS) attack. A buffer overflow
vulnerability in the function `format_log_line` could allow remote
attackers to cause a DoS on the affected system. Exploitation of the
vulnerability can be triggered when the configuration file `cupsd.conf`
sets the value of `loglevel `to `DEBUG`. No known patches or
workarounds exist at time of publication.

References:
https://nvd.nist.gov/vuln/detail/CVE-2023-32324
https://security-tracker.debian.org/tracker/CVE-2023-32324

Upstream Patch:
https://github.com/OpenPrinting/cups/commit/fd8bc2d32589

(From OE-Core rev: a4bdbc82f7e5cc9a5cb603cb720f09b0216b0a0e)

Signed-off-by: Sanjay Chitroda <schitrod@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-06-13 22:11:26 +01:00
Trevor Woerner
ea40bc3c75 cups: add/fix web interface packaging
cups includes a web server. Users can surf to port 631 (default) of a
machine running cups to (potentially, based on configuration, default off)
view jobs, add printers, and perform other forms of administration.

The location of the various resources that are used by the built-in web server
(e.g. index.html) are installed under ${datadir}/doc/cups. By default these
artifacts would be included in the ${PN}-doc package. The comments in this
recipe, however, would suggest an attempt was made to have them added to
${PN}; albeit unsuccessfully.

These resources add roughly 1.8M to an image.

Since cups does include a configuration option to disable the web interface
(--enable-webif), add a PACKAGECONFIG (default off) to allow the user to
decide whether or not they would like the web interface configured and its
pieces added to the image. Enabling this PACKAGECONFIG both enables the
web interface to be configured and built into cups, and also adds (by way
of a recommendation) the web interface package to the image. Considering
that the previous intention was not working, defaulting this option to off
preserves the existing behaviour. Previously in order to have the web
interface data included in an image, a user would have needed to explicitly
add the ${PN}-doc package to their image.

(From OE-Core rev: 2c9bd267ec532cd86a4a1be1d4e499e2aae89aba)

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-03-11 00:08:40 +00:00
Trevor Woerner
51553b3f28 cups: check PACKAGECONFIG for pam feature
The cups' PACKAGECONFIG is populated based on DISTRO_FEATURES, but a user
is free to enable or disable PACKAGECONFIGs at will. In theory it is
possible that pam is enabled globally in DISTRO_FEATURES but disabled in
cups' PACKAGECONFIG. Checking the PACKAGECONFIG to determine whether or not
pam is enabled would be a safer check rather than relying on DISTRO_FEATURES.

(From OE-Core rev: a053dd177ddc99ced11e68914079be0ffe261262)

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-03-11 00:08:40 +00:00
Trevor Woerner
75ef02a983 cups: use BUILDROOT instead of DESTDIR
The cups documentation is clear that the correct way to install into an
alternate root directory is to use the BUILDROOT variable. From INSTALL.md:

	Use the `BUILDROOT` variable to install to an alternate root directory:

	    make BUILDROOT=/some/other/root/directory install

DESTDIR works, but we should use the mechanism the project specifically
created for this purpose.

(From OE-Core rev: f8fc70674e0ea5df46969a06da62f8ed135cae4e)

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-03-11 00:08:40 +00:00
Alexander Kanavin
afefe7de28 meta: fix version checks in all github recipes using the github-releases class
(From OE-Core rev: b04316bdd28b7945c2c91b4e43c007b650eedc14)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-09-28 08:01:10 +01:00
Ross Burton
1d2b1161a9 cups: ignore CVE-2022-26691
This is fixed in 2.4.2, which we have, but the complex CPE in that CVE
isn't parsed by cve-check correctly so it thinks that we're vulnerable.

(From OE-Core rev: b40dd920f8b40eabe78db363249257818c63c074)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-06-30 10:27:17 +01:00
wangmy
ead9e7443f cups: upgrade 2.4.1 -> 2.4.2
Changelog:
==========
- Fixed certificate strings comparison for Local authorization (CVE-2022-26691)
- The cupsFileOpen function no longer opens files for append in read-write
  mode (Issue #291)
- The cupsd daemon removed processing temporary queue (Issue #364)
- Fixed delay in IPP backend if GNUTLS is used and endpoint doesn't confirm
  closing the connection (Issue #365)
- Fixed conditional jump based on uninitialized value in cups/ppd.c (Issue #329)
- Fixed CSS related issues in CUPS Web UI (Issue #344)
- Fixed copyright in CUPS Web UI trailer template (Issue #346)
- mDNS hostname in device uri is not resolved when installaling a permanent
- IPP Everywhere queue (Issues #340, #343)
- The lpstat command now reports when the scheduler is not running
  (Issue #352)
- Updated the man pages concerning the -h option (Issue #357)
- Re-added LibreSSL/OpenSSL support (Issue #362)
- Updated the Solaris smf service file (Issue #368)
- Fixed a regression in lpoptions option support (Issue #370)
- The scheduler now regenerates the PPD cache information after changing the
  "cupsd.conf" file (Issue #371)
- Updated the scheduler to set "auth-info-required" to "username,password" if a
  backend reports it needs authentication info but doesn't set a method for
  authentication (Issue #373)
- Updated the configure script to look for the OpenSSL library the old way if
  pkg-config is not available (Issue #375)
- Fixed the prototype for the httpWriteResponse function (Issue #380)
- Brought back minimal AIX support (Issue #389)
  cupsGetResponse did not always set the last error.
- Fixed a number of old references to the Apple CUPS web page.
- Restored the default/generic printer icon file for the web interface.
- Removed old stylesheet classes that are no longer used by the web
  interface.

(From OE-Core rev: 6f4131e73553f47709e19871c23a411275ab3857)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-05-31 15:24:18 +01:00
Robert Yang
bd9f71fedc cups: Add --with-dbusdir to EXTRA_OECONF for deterministic build
The configure checks /etc/dbus-1 and set DBUSDIR is null:
        if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then
            DBUSDIR="/etc/dbus-1"
        fi

So that the build resutl would be different w/o /etc/dbus-1:

/etc/dbus-1/system.d/cups.conf (Only exists when DBUSDIR is set)

Add --with-dbusdir to EXTRA_OECONF to fix the issue

(From OE-Core rev: 0e4b2464138601c4c20882c001ef11eef5100395)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-03-02 18:43:24 +00:00
Richard Purdie
71ef319193 meta/scripts: Automated conversion of OE renamed variables
(From OE-Core rev: aa52af4518604b5bf13f3c5e885113bf868d6c81)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-21 23:37:27 +00:00
Alexander Kanavin
910c7f8e8f cups: upgrade 2.4.0 -> 2.4.1
(From OE-Core rev: 7ed9248d2a9865b3ff4c99b6e708aaec995bacb1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-05 17:46:05 +00:00
S. Lockwood-Childs
5de2528a4b cups: fix typo in flags to disable avahi
one too many 's': dnsssd -> dnssd

(From OE-Core rev: 88da9b61b469654805fd51869790b1fd6d34c5a3)

Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-12-14 22:46:38 +00:00
Alexander Kanavin
c8f8d1bbb8 cups: update 2.3.3op2 -> 2.4.0
Mark no-hardcode-lib patch as upstreamable.

(From OE-Core rev: 2d0475f9575a6679b4a9d5400220584597b84887)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-12-08 20:22:11 +00:00
Claus Stovgaard
6c220ed3f4 cups: Fix missing installation of cups sysv init scripts
The packageconfig needs to be --disable-systemd as documented in
configure file for cups. With the current value "--without-systemd" the
SYSTEM_DIR variable ends up being set to "no"

It is caused by the --without-* section in configure file resulting in
eval with_$ac_useropt=no ;;

$ac_useropt is "systemd" causing the variable $with_systemd to be set
to "no", because of below test

if test ${with_systemd+y}
then :
  withval=$with_systemd; SYSTEMD_DIR="$withval"
else $as_nop
  SYSTEMD_DIR=""
fi

cups configure test for i if SYSTEMD_DIR is empty to decide if the init
scripts need to be installed. A value of "no" results in that no init
scripts is installed.

With --disable-systemd it works as expected - installing the init files.
Though cups should properly improve their configure script.

(From OE-Core rev: 967fdd2ba12f22d8e46600ff085833993a32cfeb)

Signed-off-by: Claus Stovgaard <clst@ambu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-15 12:55:27 +00:00
Alexander Kanavin
c98d05523f cups: exclude beta/rc versions from version check
(From OE-Core rev: d651eea3dce926399cd42c62494e4ce1940bcf06)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-28 14:16:31 +01:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Ross Burton
494e73fbc9 cups: update to 2.3.3op2
Apple are no longer maintaining CUPS, and future development is now
happening under the OpenPrinting project:

https://ftp.pwg.org/pub/pwg/liaison/openprinting/presentations/cups-plenary-may-2021.pdf

Also stop disabling the manpage installation as manpages are useful, and
remove some patch chunks that are not required.

The CVE-2020-10001 patch is dropped as this is incorporated into 2.3.3op2.

(From OE-Core rev: 53bd9a96a003a7103b8475f9c1ad7ef999e34f87)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-07-19 13:34:26 +01:00
Ross Burton
3a461e071e cups: whitelist CVE-2021-25317
This CVE relates to bad ownership of /var/log/cups, which we don't have.

(From OE-Core rev: 0792312f3637ec160d2ef90781a8cb1f75b84940)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-18 12:43:00 +01:00
Khem Raj
2d07f91008 cups: Turn gnutls into a packageconfig knob
Disable it by default

(From OE-Core rev: 438d00af14a0cc108a25b36bf37502f1383865be)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-20 13:56:48 +01:00
Stefan Ghinea
39a67849e9 cups: fix CVE-2020-10001
A buffer (read) overflow in the ippReadIO function.

References:
https://nvd.nist.gov/vuln/detail/CVE-2020-10001

Upstream patches:
efbea1742b

(From OE-Core rev: 90eba79bf6f623aa3021eafd0141dad1c3059001)

Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-26 15:21:20 +00:00
Richard Purdie
a23b63bd71 cups: Fix reproducibility issues
configure inspects the host's /etc/group for these configuration
options, fix this to the correct values by using configure options.

(From OE-Core rev: f16f9c727569414cd52862dcba18d8e423f4e961)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-26 15:21:20 +00:00
Richard Purdie
fd4989e5ea cups: Mark CVE-2008-1033 as a non-issue
It only applies to MacOS.

(From OE-Core rev: cad1162f41c4c060744b98109514f761aa64d34a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-12-21 22:29:57 +00:00
Richard Purdie
dc1cdd233a cups: Mark CVE-2009-0032 as a non-issue
The CVE was against a cups plugin which is obsolete and we don't include.

(From OE-Core rev: 5f7cb9f6ec4b14f992d265b8c67a9f5589f9b842)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-12-21 22:29:57 +00:00
Steve Sakoman
1e41bd793f cups: whitelist CVE-2018-6553
This an Ububtu specific issue:

The CUPS AppArmor profile incorrectly confined the dnssd backend
due to use of hard links. A local attacker could possibly use this
issue to escape confinement. This flaw affects versions prior to
2.2.7-1ubuntu2.1 in Ubuntu 18.04 LTS, prior to 2.2.4-7ubuntu3.1
in Ubuntu 17.10, prior to 2.1.3-4ubuntu0.5 in Ubuntu 16.04 LTS,
 and prior to 1.7.2-0ubuntu1.10 in Ubuntu 14.04 LTS

(From OE-Core rev: 22e89983a8f83a369d83bc67e4f3492bc50db648)

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-11-24 10:27:45 +00:00
Chen Qi
a5b9fa3c45 cups: use /run instead /var/run in systemd's unit file
/var/run has been deprecated by systemd, so use /run instead,
as suggested by systemd.

(From OE-Core rev: 6c3f56020da7a26c2daea73e39c2f324f1f597db)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-17 23:22:19 +01:00
Changqing Li
611d60f4c5 cups.inc: remove template service from SYSTEMD_SERVICE
this template service need to triggered by org.cups.cups-lpd.socket,
which will assigned an instance id for org.cups.cups-lpd@.service,
like org.cups.cups-lpd@0.service. add this in SYSTEMD_SERVICE will
cause post scriptlet fail as:
Failed to start org.cups.cups-lpd@.service: Unit name org.cups.cups-lpd@.service is missing the instance name.
See system logs and 'systemctl status org.cups.cups-lpd@.service' for details.

(From OE-Core rev: 4bb87c8b28b58a469c01f4a051361aa099cdfe1a)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-09 13:13:59 +01:00
Alexander Kanavin
13dbbb3ea6 cups: upgrade 2.3.1 -> 2.3.3
(From OE-Core rev: 3ed00a74bd226e6f84d80ff4c38241f87b589309)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:30 +01:00
Yi Zhao
f8c41e8e03 cups: add volatiles files to create /var/log/cups
Add volatiles files to create /var/log/cups directory rather than create
it directly when do_install.

(From OE-Core rev: 315689f58536dec4042ef9880c227a69e71e749d)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-04-24 14:10:08 +01:00
Jeremy Puhlman
8f796d8e8e cups: make cups-config a multilib script
cups-config encodes the library dir in the script.

(From OE-Core rev: 0e19b25fbf1d760c06dd6a2cb8e291c7482330c4)

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-02-29 13:04:48 +00:00
Diego Rondini
1128c128ce cups: fix crossscripts
Fix crossscripts to report the correct "serverbin" value.
While the packaged "cups-config --serverbin" reported
"/usr/libexec/cups" the crossscripts version reported
"/usr/lib/cups", causing packaging issues when building for example
cups-filters.
Also fix FILES_${PN} to use ${libexecdir}; previously it was working
just because "${libexecdir}/*" was part of the default values in
bitbake.conf.

(From OE-Core rev: 2ce6ef29b9bb4f16ed9d78e166d455b7a6d968bf)

Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-10 21:18:22 +00:00
Alexander Kanavin
53e3605eae cups: update to 2.3.1
License-Update: license changed to Apache 2.0

Remove no longer recognized configure options.

Refresh all patches.

(From OE-Core rev: 7ed28276e9fa6fc9b572bdf1ad566967964d9623)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-28 23:25:42 +00:00
Maxime Roussin-Bélanger
4ee045ce0b meta: add missing description in recipes-extended
(From OE-Core rev: 3a4a037450f2998342818248957e7500950b0a66)

Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-10-15 14:16:11 +01:00
Kai Kang
944a5b054c cups: redefine CUPS_SERVERBIN
Redefine CUPS_SERVERBIN to "$libexecdir/cups" for cups which solves file
confliction when multilib is enabled.

| Error: Transaction check error:
|   file /lib/systemd/system/org.cups.cups-lpd@.service conflicts between
    attempted installs of cups-2.2.11-r0.core2_64 and lib32-cups-2.2.11-r0.core2_32

(From OE-Core rev: 274bed042b9c2b50a8bdd11b42f1a62405fb5b11)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-09-07 07:47:24 +01:00
Oleksandr Kravchuk
95af995462 cups: update to 2.2.12
(From OE-Core rev: 5d24e011d9c547ac6339bdc1d40e7a613692da30)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-08-21 21:52:59 +01:00
Adrian Bunk
31a276fd45 cups: Remove unnecessary dependency on dbus-glib
(From OE-Core rev: 943e25f41129b9558c78f375ff80ddf1b21919ae)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-06-27 12:20:36 +01:00
Oleksandr Kravchuk
18e6026b6f cups: update to 2.2.11
CUPS 2.2.11 is a bug fix release that addresses issues in the scheduler,
IPP Everywhere support, CUPS library, and USB printer support.

(From OE-Core rev: 2904ffdffc829ee7a0f0228babe392535fb5e544)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-23 23:30:19 +01:00
Chen Qi
59a8a6a0cd cups: upgrade to 2.2.10
(From OE-Core rev: fbe7a0c9bab7c9be7fd2c0da8b2af61e66de1ebd)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-20 11:30:35 +00:00
Diego Rondini
fd9c016ddc cups: default to unix pam module
When pam PACKAGECONFIG is enabled a cups "pam.d" configuration file is
installed. The default configuration file uses a non-existing "pam_unknown.so",
but a different existing module can be selected by passing the
--with-pam-module parameter. Use the unix pam module when pam is enabled.

(From OE-Core rev: a7fb921e16e2eb4fa5a799b556d23d79801720b0)

Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-03 12:35:53 +00:00
Chen Qi
29e20d031f cups: upgrade to 2.2.9
The following patch is rebased.

  0001-don-t-try-to-run-generated-binaries.patch

(From OE-Core rev: ee57d79aec06e9b160cf2713636cda650ba68d5a)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-12-05 22:30:19 +00:00