Skip to contentSkip to conversation

cups-filters: upgrade 1.27.2 -> 1.28.11

PATCH New Wang Mingyu 1 participant 2 messages Jan 19, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cups-filters: upgrade 1.27.2 -> 1.28.11

License-Update:
"org.cups.cupsd.Notifier.xml" changed to "utils/org.cups.cupsd.Notifier.xml" "GNU Library" changed to "GNU Library General"
"GNU Lesser" changed to "GNU Lesser General"

Changelog:
URL of issues <https://github.com/OpenPrinting/cups-filters/pull/#####>
=========
Bug fix release, containing backports of many of the bugs recently fixed during the preparation of the cups-filters 2.x release.
Important is that cups-browsed's queue naming is aligned with CUPS' temporary queue naming now and several bugs affecting driverless printing are fixed.

-libcupsfilters: Let PPD generator take default ColorModel from printer
(CUPS issue #277).
-Braille: In vectortopdf check inkscape version to call inkscape with the
correct command line (Issue #315, Pull request #443).
-Build system: Make missing DejaVuSans.ttf non-fatal in ./configure as the font
is only needed for test programs, not for actual use of cups-filters (Issue #411).
-libcupsfilters: In imagetoraster() fixed crash with SGray (Issue #435). -cups-browsed: Naming of local queues is matched to CUPS' current naming of
temporary queues (no leading or trailing underscores), to avoid duplicates in print dialogs which support CUPS' temporary queues.
-libcupsfilters: Make cupsRasterParseIPPOptions() work correctly with PPDs
(Issue #436).
-libcupsfilters: Let colord_get_profile_for_device_id() not return empty file
name, to avoid error messages in CUPS error_log.
-foomatic-rip: Debug message was wrongly sent to stdout and not to log
(Issue #422).

---
 meta-oe/recipes-printing/cups/cups-filters.inc        | 2 +-
 meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb  | 4 ----
 meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb
 create mode 100644 meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb
meta-oe/recipes-printing/cups/cups-filters.inc +1 -1
index c01e2cd49..061c8a625 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "CUPS backends, filters, and other software"
 HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"
 
 LICENSE = "GPLv2 & LGPLv2 & MIT & GPLv2+ & GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=516215fd57564996d70327db19b368ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d77679ce6a2cc4d873d4ebbf2a401e6"
 
 SECTION = "console/utils"
 
meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb deleted +0 -4
deleted file mode 100644
index 35c4a929b..000000000
@@ -1,4 +0,0 @@
-include cups-filters.inc
-
-SRC_URI[md5sum] = "90ebcae31f2eabd802236408646b1dd9"
-SRC_URI[sha256sum] = "174a2a5c919bf88c63ced692a2170add6c2cd70ff06c49bcea32e9cf56960492"
meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb new file +3 -0
new file mode 100644
index 000000000..bfe5375b2
@@ -0,0 +1,3 @@
+include cups-filters.inc
+
+SRC_URI[sha256sum] = "472418f1a1e12c9ad91b01caa020eb668626776d85de9da488be38e6663102ca"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 libmodbus: upgrade 3.1.6 -> 3.1.7

Fix-typo.patch
f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch
removed since they're included in 3.1.7

Changelog:
=========
modbus_reply: fix copy & paste error in sanity check Add SECURITY.md
Fix typo in comment
Replace obsolete AC_PROG_CC_STDC by AC_PROG_CC Fix position of CC flags in documentation Remove duplicate ';'
Add the baud rate of 256k for Windows cosmetic changes in man page standardizing itemization Fix many typos
Replace .dir-locals.el (Emacs) by .editorconfig Include the test LICENSE in tarball
Install the NEWS and AUTHORS files
Update README.md
docs: fix simple typo, reponse -> response Add modbus_[get|set]_indication_timeout to doc build Fix warning issues
Move malloc before starting unit tests
Fixed MODBUS_GET_* macros in case of negative values
SPDX: change LGPL-2.1+ to LGPL-2.1-or-later

---
 .../libmodbus/libmodbus/Fix-typo.patch        | 52 -------------------
 ...4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch | 32 ------------
 .../libmodbus/libmodbus_3.1.6.bb              | 12 -----
 .../libmodbus/libmodbus_3.1.7.bb              |  9 ++++
 4 files changed, 9 insertions(+), 96 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch
 delete mode 100644 meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch
 delete mode 100644 meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb
 create mode 100644 meta-oe/recipes-extended/libmodbus/libmodbus_3.1.7.bb
meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch deleted +0 -52
deleted file mode 100644
index 384a4a40b..000000000
@@ -1,52 +0,0 @@
-From: =?utf-8?b?IlNaIExpbiAo5p6X5LiK5pm6KSI=?= <[email protected]>
-Date: Thu, 27 Sep 2018 14:51:32 +0800
-Subject: Fix typo
-
----
- doc/modbus_mapping_new_start_address.txt | 4 ++--
- doc/modbus_reply.txt                     | 2 +-
- doc/modbus_reply_exception.txt           | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/modbus_mapping_new_start_address.txt b/doc/modbus_mapping_new_start_address.txt
-index 4fa196a..94a81fb 100644
---- a/doc/modbus_mapping_new_start_address.txt
-+++ b/doc/modbus_mapping_new_start_address.txt
-@@ -21,9 +21,9 @@ The _modbus_mapping_new_start_address()_ function shall allocate four arrays to
- store bits, input bits, registers and inputs registers. The pointers are stored
- in modbus_mapping_t structure. All values of the arrays are initialized to zero.
- 
--The different starting adresses make it possible to place the mapping at any
-+The different starting addresses make it possible to place the mapping at any
- address in each address space. This way, you can give access to values stored
--at high adresses without allocating memory from the address zero, for eg. to
-+at high addresses without allocating memory from the address zero, for eg. to
- make available registers from 10000 to 10009, you can use:
- 
- [source,c]
-diff --git a/doc/modbus_reply.txt b/doc/modbus_reply.txt
-index 0b29d6f..6b71d11 100644
---- a/doc/modbus_reply.txt
-+++ b/doc/modbus_reply.txt
-@@ -3,7 +3,7 @@ modbus_reply(3)
- 
- NAME
- ----
--modbus_reply - send a reponse to the received request
-+modbus_reply - send a response to the received request
- 
- 
- SYNOPSIS
-diff --git a/doc/modbus_reply_exception.txt b/doc/modbus_reply_exception.txt
-index 7e6324f..b2170be 100644
---- a/doc/modbus_reply_exception.txt
-+++ b/doc/modbus_reply_exception.txt
-@@ -3,7 +3,7 @@ modbus_reply_exception(3)
- 
- NAME
- ----
--modbus_reply_exception - send an exception reponse
-+modbus_reply_exception - send an exception response
- 
- 
- SYNOPSIS
meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch deleted +0 -32
deleted file mode 100644
index 7fae34e7d..000000000
@@ -1,32 +0,0 @@
-From f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d Mon Sep 17 00:00:00 2001
-From: i-ky <[email protected]>
-Date: Tue, 10 Jul 2018 15:58:45 +0300
-Subject: [PATCH] Fixed MODBUS_GET_* macros in case of negative values
-
-In case resulting value should be negative it is incorrect to use '+' operator to construct it from pieces, because highest bytes will result in negative number after bitwise shift while others will stay positive. Replacing addition with '|' should solve the issue.
----
- src/modbus.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/modbus.h b/src/modbus.h
-index f6e9a5f5..c63f5ceb 100644
---- a/src/modbus.h
-+++ b/src/modbus.h
-@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req,
- #define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF)
- #define MODBUS_GET_LOW_BYTE(data) ((data) & 0xFF)
- #define MODBUS_GET_INT64_FROM_INT16(tab_int16, index) \
--    (((int64_t)tab_int16[(index)    ] << 48) + \
--     ((int64_t)tab_int16[(index) + 1] << 32) + \
--     ((int64_t)tab_int16[(index) + 2] << 16) + \
-+    (((int64_t)tab_int16[(index)    ] << 48) | \
-+     ((int64_t)tab_int16[(index) + 1] << 32) | \
-+     ((int64_t)tab_int16[(index) + 2] << 16) | \
-       (int64_t)tab_int16[(index) + 3])
--#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) + tab_int16[(index) + 1])
--#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) + tab_int8[(index) + 1])
-+#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) | tab_int16[(index) + 1])
-+#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) | tab_int8[(index) + 1])
- #define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value) \
-     do { \
-         tab_int8[(index)] = (value) >> 8;  \
meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb deleted +0 -12
deleted file mode 100644
index 8e42fdc5d..000000000
@@ -1,12 +0,0 @@
-require libmodbus.inc
-
-SRC_URI += "file://f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch \
-	    file://Fix-float-endianness-issue-on-big-endian-arch.patch \
-	    file://Fix-typo.patch"
-SRC_URI[md5sum] = "15c84c1f7fb49502b3efaaa668cfd25e"
-SRC_URI[sha256sum] = "d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16"
-
-# this file has been created one minute after the configure file, so it doesn't get recreated during configure step
-do_configure:prepend() {
-	rm -rf ${S}/tests/unit-test.h
-}
meta-oe/recipes-extended/libmodbus/libmodbus_3.1.7.bb new file +9 -0
new file mode 100644
index 000000000..6c0e315d7
@@ -0,0 +1,9 @@
+require libmodbus.inc
+
+SRC_URI += "file://Fix-float-endianness-issue-on-big-endian-arch.patch"
+SRC_URI[sha256sum] = "7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd"
+
+# this file has been created one minute after the configure file, so it doesn't get recreated during configure step
+do_configure:prepend() {
+	rm -rf ${S}/tests/unit-test.h
+}
Signature · 1 line
2.25.1