From 9524c0ed85592c87ff30b54ca705b5d1b447eb6f Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 13 Dec 2012 19:03:52 -0800 Subject: [PATCH] cups: Update to 1.6.1 License change was due to update of Date. Remove CVE patches as they where backports from this release Signed-off-by: Saul Wold --- .../cups/cups-1.4.6/use_echo_only_in_init.patch | 13 ------------- ...0001-don-t-try-to-run-generated-binaries.patch | 0 .../{cups-1.4.6 => cups}/cups-CVE-2011-2896.patch | 0 .../{cups-1.4.6 => cups}/cups-CVE-2011-3170.patch | 0 .../{cups-1.4.6 => cups}/cups-CVE-2012-5519.patch | 0 .../{cups-1.4.6 => cups}/cups_serverbin.patch | 0 .../cups/cups/use_echo_only_in_init.patch | 15 +++++++++++++++ .../cups/{cups14.inc => cups16.inc} | 2 +- .../cups/{cups_1.4.6.bb => cups_1.6.1.bb} | 12 ++++-------- 9 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch rename meta/recipes-extended/cups/{cups-1.4.6 => cups}/0001-don-t-try-to-run-generated-binaries.patch (100%) rename meta/recipes-extended/cups/{cups-1.4.6 => cups}/cups-CVE-2011-2896.patch (100%) rename meta/recipes-extended/cups/{cups-1.4.6 => cups}/cups-CVE-2011-3170.patch (100%) rename meta/recipes-extended/cups/{cups-1.4.6 => cups}/cups-CVE-2012-5519.patch (100%) rename meta/recipes-extended/cups/{cups-1.4.6 => cups}/cups_serverbin.patch (100%) create mode 100644 meta/recipes-extended/cups/cups/use_echo_only_in_init.patch rename meta/recipes-extended/cups/{cups14.inc => cups16.inc} (99%) rename meta/recipes-extended/cups/{cups_1.4.6.bb => cups_1.6.1.bb} (56%) diff --git a/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch b/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch deleted file mode 100644 index 26b57dd6ce..0000000000 --- a/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch +++ /dev/null @@ -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 diff --git a/meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch similarity index 100% rename from meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch rename to meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch diff --git a/meta/recipes-extended/cups/cups-1.4.6/cups-CVE-2011-2896.patch b/meta/recipes-extended/cups/cups/cups-CVE-2011-2896.patch similarity index 100% rename from meta/recipes-extended/cups/cups-1.4.6/cups-CVE-2011-2896.patch rename to meta/recipes-extended/cups/cups/cups-CVE-2011-2896.patch diff --git a/meta/recipes-extended/cups/cups-1.4.6/cups-CVE-2011-3170.patch b/meta/recipes-extended/cups/cups/cups-CVE-2011-3170.patch similarity index 100% rename from meta/recipes-extended/cups/cups-1.4.6/cups-CVE-2011-3170.patch rename to meta/recipes-extended/cups/cups/cups-CVE-2011-3170.patch diff --git a/meta/recipes-extended/cups/cups-1.4.6/cups-CVE-2012-5519.patch b/meta/recipes-extended/cups/cups/cups-CVE-2012-5519.patch similarity index 100% rename from meta/recipes-extended/cups/cups-1.4.6/cups-CVE-2012-5519.patch rename to meta/recipes-extended/cups/cups/cups-CVE-2012-5519.patch diff --git a/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch b/meta/recipes-extended/cups/cups/cups_serverbin.patch similarity index 100% rename from meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch rename to meta/recipes-extended/cups/cups/cups_serverbin.patch diff --git a/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch b/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch new file mode 100644 index 0000000000..696f1374d9 --- /dev/null +++ b/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch @@ -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 diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups16.inc similarity index 99% rename from meta/recipes-extended/cups/cups14.inc rename to meta/recipes-extended/cups/cups16.inc index 9fae880d22..9b0ae5b61d 100644 --- a/meta/recipes-extended/cups/cups14.inc +++ b/meta/recipes-extended/cups/cups16.inc @@ -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" diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.6.1.bb similarity index 56% rename from meta/recipes-extended/cups/cups_1.4.6.bb rename to meta/recipes-extended/cups/cups_1.6.1.bb index 75c23d39e6..42ce059230 100644 --- a/meta/recipes-extended/cups/cups_1.4.6.bb +++ b/meta/recipes-extended/cups/cups_1.6.1.bb @@ -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)}" -- 2.40.1