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>

1 files changed, 0 insertions, 23 deletions

diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
deleted file mode 100644
index 75c23d39e6..0000000000
--- a/meta/recipes-extended/cups/cups_1.4.6.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require cups14.inc
-
-PR = "r9"
-DEPENDS += "libusb \
-       ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9"
-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"
-
-EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb \
-       ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
-
-CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"