getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade cups from 2.1.4 to 2.2.1.
License checksum changes are not related to license changes.
(From OE-Core rev: 1b4427483349d4653a0060b045a7df964a779870)
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* While building following warning comes up
QA Issue: No GNU_HASH in the elf binary: '...libcups.so.2' [ldflags]
Fix this warning by settin DSOFLAGS.
(From OE-Core rev: 5dfbdf6d370125841d10120f39e8b771d1ed8aef)
Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add PACKAGECONFIG for systemd, enable it when systemd is enabled in
DISTRO_FEATURES. Pass the correct path to systemd units, ensure they're
installed into the package.
Drop custom systemd unit files, use those shipped by the upstream instead.
(From OE-Core rev: 39912b5f7b40210aefb8b248ab1a8643b61dfcbc)
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the autodebug package generation logic, specifically setting FILES_${PN}-dbg
isn't needed in most cases, we can remove them.
(From OE-Core rev: 3ab59d49dd7c18e194b58d1248b4b87709b5a738)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
cups configure looks at the *host* file system to decide if and how to install
xinetd files, resulting in non-deterministic builds.
Solve this by adding a PACKAGECONFIG for xinetd and pass it the correct path to
use if enabled.
(From OE-Core rev: 8779245ca404ec3851699b1e4309f9df3ff52a6c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The files under /etc/pam.d should be 0644. The /etc/pam.d/cups file has
0444 after 'make install'. This patch fixes this problem.
(From OE-Core rev: ba510849a8bc238997b6d1669300e24c46bcf328)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is no STRIP in Makedefs, no serial in backend/Makefile either, so
remove the sed commands.
(From OE-Core rev: 76c9c26530f704908d4afda8ec757e75db6afc48)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade cups from 2.0.2 to 2.0.3. In its release log, it fixes
CERT VU #810572/CVE-2015-1158/CVE-2015-1159.
(From OE-Core rev: d719d2d9bf7c57efd2bc249d06bf4f9e3876a766)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of hand-rolling a do_configure() simply use autotools and disable
autoheader (upstream uses a hand-generated config.h.in).
Also do_compile() doesn't need to pass SSLLIBS as configure uses pkgconfig to
find gnutls, LIBPNG and LIBJPEG are not used anywhere in the build system, and
LIBZ is detected correctly.
(From OE-Core rev: 9c25af5483280c5c753f981504eb373d6e58c7f3)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Removed the patch since upstream has fixed it:
0001-test-ippserver.c-check-avahi-before-use.patch
(From OE-Core rev: e1a8de7d55710199d357c88c22f3f1887d562b61)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The fakeroot is already set in base.bbclass.
(From OE-Core rev: 921470e9a949d296cc9b829a8002ff289f01bdb7)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed the error when --disable-avahi:
ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll'
The avahi is optional, we need check whether it is enabled before use as
other code does.
(From OE-Core rev: e69a1a583bf65dd2b6358c1d925d8de6419e3d76)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
--disable-openssl was removed in 2.0, so don't pass it to configure.
(From OE-Core rev: 132f90b9bad068fc28c4b262c3b1dbd3e37a9169)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove backported patch and rebase gcrypt patch
Licence change updates the date and removes the OpenSSL exception
(From OE-Core rev: bcf7691bb6be86b88c7f6d08d35c229b3f30a9f6)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It turns out we have quite a number of Makefiles out there without a
clean target. Rather than have all cases code an empty do_configure, add
a CLEANBROKEN variable which when set to "1" will disable the attempt to
"make clean".
This patch also adjusts various recipes which either have this problem
fixed, or have been reported to have make clean failures.
(From OE-Core rev: 45b7d3add14eafc25da62bab68d4ae133f8dcb57)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add systemd unit files.
Also remove sysvinit related files if 'sysvinit' is not in
DISTRO_FEATURES.
(From OE-Core rev: 020065d3c57ccdc86c47cd0fc288071cdd194bbc)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The cups daemon needs the lpadmin group to start correctly.
Also add 'procps' to RDEPENDS if 'sysvinit' is in DISTRO_FEATURES,
because the init script shipped with cups needs it.
(From OE-Core rev: a8b2f086034585f3e115db3055575833922e3a59)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The existing patch backports a change to the m4 source file, but without
a forced autoconf before configure it has no effect.
(From OE-Core rev: 0262f83ec7d7e68c43c87d3b0a307744a32f6274)
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove "PROVIDES =" line that refers back to CUPS version 1.4.
(From OE-Core rev: 8e7898b2cf276977cf1c527b573a7192719a8c99)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch is used for fixing build errors without dnssd/avahi, we
already have this patch, but isn't added to SRC_URI:
meta/recipes-extended/cups/cups/cups-str4402.patch
(From OE-Core rev: 7c0fc920d41cdd74cb7bba72faef08afba09ed12)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
This addresses the cryto dependency seen during build.
(From OE-Core rev: e5f9166302baad837244e5a93bedb2797ab17e57)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.
This doesn't introduce any change in behaviour in its own right.
(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove the following 2 options:
* --disable-tiff
* --with-pdftops
The tiff and pdftops filters have been moved into another package
cups-filters, so these options are not valid any more.
Please visit here for more info:
http://www.cups.org/str.php?L3930
(From OE-Core rev: acf2aca0c6af216d2757b0591accd80608ac5898)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Setting DESCRIPTION to the same value as SUMMARY doesn't do anything,
since the value of DESCRIPTION will be derived from SUMMARY if not
specified.
(From OE-Core rev: e1e888585c84175580ad822d4a6c93f62e5ce16c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rename and consolidate cups16.inc to cups.inc use PACKAGECONFIG
for pam.
(From OE-Core rev: b749bed86efcdc063d720fa095ffa7a7984cd53c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* acl is autodetected from sysroot
* add PACKAGECONFIG to make it deterministic
(From OE-Core rev: 4f0b420b8a64862e6caa53ba0653c27a3d2387c3)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The /var/run/cups and /var/run/cups/certs directories don't need to be
included in the package as they are created by cupsd with the proper
permissions if they don't exist. The /var/run directory is already
created by base-files.
(From OE-Core rev: af99c290a0f589a5cb1d6426c78804f2d99ae02a)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
License change was due to update of Date.
Remove CVE patches as they where backports from this release
(From OE-Core rev: 9524c0ed85592c87ff30b54ca705b5d1b447eb6f)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Peter Kjellerstedt
Chen Qi
Ross Burton
Joshua Lock
Huang Qiyu
Alexander Kanavin
Noor Ahsan
Andrew Shadura
Richard Purdie
Robert Yang
Kai Kang
Chong Lu
Saul Wold
In Long
Peter A. Bigot
Robert P. J. Day
Armin Kuster
Otavio Salvador
Paul Eggleton
Martin Jansa
Jonathan Liu