cups: Update to 1.6.1
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>
This commit is contained in:
parent
abbb4e178a
commit
02491b4ede
|
@ -1,13 +0,0 @@
|
|||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
--- a/init/cups.sh.in.orig 2008-10-04 16:50:46.000000000 -0300
|
||||
+++ b/init/cups.sh.in 2008-10-04 16:51:39.000000000 -0300
|
||||
@@ -68,7 +68,7 @@
|
||||
ECHO_ERROR=:
|
||||
;;
|
||||
|
||||
- Linux*)
|
||||
+ DISABLELinux*)
|
||||
IS_ON=/bin/true
|
||||
if test -f /etc/init.d/functions; then
|
||||
. /etc/init.d/functions
|
|
@ -0,0 +1,15 @@
|
|||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Index: cups-1.6.1/scheduler/cups.sh.in
|
||||
===================================================================
|
||||
--- cups-1.6.1.orig/scheduler/cups.sh.in
|
||||
+++ cups-1.6.1/scheduler/cups.sh.in
|
||||
@@ -67,7 +67,7 @@ case "`uname`" in
|
||||
ECHO_ERROR=:
|
||||
;;
|
||||
|
||||
- Linux*)
|
||||
+ DisableLinux*)
|
||||
IS_ON=/bin/true
|
||||
if test -f /etc/init.d/functions; then
|
||||
. /etc/init.d/functions
|
|
@ -1,7 +1,7 @@
|
|||
SUMMARY = "An Internet printing system for Unix"
|
||||
DESCRIPTION = "An Internet printing system for Unix."
|
||||
SECTION = "console/utils"
|
||||
LICENSE = "GPLv2 LGPLv2"
|
||||
LICENSE = "GPLv2 & LGPLv2"
|
||||
DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib"
|
||||
PROVIDES = "cups14"
|
||||
|
|
@ -1,21 +1,17 @@
|
|||
require cups14.inc
|
||||
require cups16.inc
|
||||
|
||||
PR = "r9"
|
||||
DEPENDS += "libusb \
|
||||
${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d"
|
||||
SRC_URI += " \
|
||||
file://use_echo_only_in_init.patch \
|
||||
file://0001-don-t-try-to-run-generated-binaries.patch \
|
||||
file://cups_serverbin.patch \
|
||||
file://cups-CVE-2011-2896.patch \
|
||||
file://cups-CVE-2011-3170.patch \
|
||||
file://cups-CVE-2012-5519.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1"
|
||||
SRC_URI[sha256sum] = "f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514"
|
||||
SRC_URI[md5sum] = "87ade07e3d1efd03c9c3add949cf9c00"
|
||||
SRC_URI[sha256sum] = "5842ab1144e653160fe667ee78b932ee036b054c0c2d20533d19e309149a7790"
|
||||
|
||||
EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb \
|
||||
${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
|
Loading…
Reference in New Issue