diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..ee5839968a2bf86c93283efc09d40fd050b7cfa2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,127 @@ + 木兰宽松许可证, 第2版 + + 木兰宽松许可证， 第2版 + 2020年1月 http://license.coscl.org.cn/MulanPSL2 + + + 您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束： + + 0. 定义 + + “软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。 + + “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + + “贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。 + + “法人实体”是指提交贡献的机构及其“关联实体”。 + + “关联实体”是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 + + 1. 授予版权许可 + + 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。 + + 2. 授予专利许可 + + 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。 + + 3. 无商标许可 + + “本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。 + + 4. 分发限制 + + 您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。 + + 5. 免责声明与责任限制 + + “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。 + + 6. 语言 + “本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。 + + 条款结束 + + 如何将木兰宽松许可证，第2版，应用到您的软件 + + 如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步： + + 1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字； + + 2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中； + + 3， 请将如下声明文本放入每个源文件的头部注释中。 + + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. + + + Mulan Permissive Software License，Version 2 + + Mulan Permissive Software License，Version 2 (Mulan PSL v2) + January 2020 http://license.coscl.org.cn/MulanPSL2 + + Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions: + + 0. Definition + + Software means the program and related documents which are licensed under this License and comprise all Contribution(s). + + Contribution means the copyrightable work licensed by a particular Contributor under this License. + + Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License. + + Legal Entity means the entity making a Contribution and all its Affiliates. + + Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity. + + 1. Grant of Copyright License + + Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not. + + 2. Grant of Patent License + + Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. + + 3. No Trademark License + + No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in Section 4. + + 4. Distribution Restriction + + You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software. + + 5. Disclaimer of Warranty and Limitation of Liability + + THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 6. Language + + THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL. + + END OF THE TERMS AND CONDITIONS + + How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software + + To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps: + + i Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; + + ii Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package; + + iii Attach the statement to the appropriate annotated syntax at the beginning of each source file. + + + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. diff --git a/backport-Also-fix-cupsfilter.patch b/backport-Also-fix-cupsfilter.patch deleted file mode 100644 index df8c7dcff1c8d6bd39027eaa20a58c11b5cfda0a..0000000000000000000000000000000000000000 --- a/backport-Also-fix-cupsfilter.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3a1a81d7b882c06451a39a19a87aca7ec44742e6 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Wed, 12 Jan 2022 08:33:58 -0500 -Subject: [PATCH] Also fix cupsfilter (Issue #323) - -Reference:https://github.com/OpenPrinting/cups/commit/3a1a81d7b882c06451a39a19a87aca7ec44742e6 - ---- - scheduler/cupsfilter.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c -index c6dbb8debb..a03e77de76 100644 ---- a/scheduler/cupsfilter.c -+++ b/scheduler/cupsfilter.c -@@ -981,7 +981,6 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ - printer_info[255], /* PRINTER_INFO env variable */ - printer_location[255], /* PRINTER_LOCATION env variable */ - printer_name[255], /* PRINTER env variable */ -- rip_max_cache[1024], /* RIP_MAX_CACHE */ - userenv[1024], /* USER */ - #if CUPS_SNAP - fontconfig_file[1024], /* FONTCONFIG_FILE */ -@@ -1133,7 +1132,6 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ - envp[i ++] = printer_info; - envp[i ++] = printer_location; - envp[i ++] = printer_name; -- envp[i ++] = rip_max_cache; - envp[i ++] = userenv; - envp[i ++] = "CHARSET=utf-8"; - if (final_content_type[0]) diff --git a/backport-CVE-2022-26691.patch b/backport-CVE-2022-26691.patch deleted file mode 100644 index 1152b2d262315646418ac7c11d1f4f18cb44d967..0000000000000000000000000000000000000000 --- a/backport-CVE-2022-26691.patch +++ /dev/null @@ -1,34 +0,0 @@ -From de4f8c196106033e4c372dce3e91b9d42b0b9444 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Thu, 26 May 2022 06:27:04 +0200 -Subject: [PATCH] scheduler/cert.c: Fix string comparison (fixes - CVE-2022-26691) - -The previous algorithm didn't expect the strings can have a different -length, so one string can be a substring of the other and such substring -was reported as equal to the longer string. - -Reference:https://github.com/OpenPrinting/cups/commit/de4f8c196106033e4c372dce3e91b9d42b0b9444 - ---- - scheduler/cert.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/scheduler/cert.c b/scheduler/cert.c -index b268bf1b2..9b65b96c9 100644 ---- a/scheduler/cert.c -+++ b/scheduler/cert.c -@@ -444,5 +444,12 @@ ctcompare(const char *a, /* I - First string */ - b ++; - } - -- return (result); -+ /* -+ * The while loop finishes when *a == '\0' or *b == '\0' -+ * so after the while loop either both *a and *b == '\0', -+ * or one points inside a string, so when we apply logical OR on *a, -+ * *b and result, we get a non-zero return value if the compared strings don't match. -+ */ -+ -+ return (result | *a | *b); - } diff --git a/backport-CVE-2023-32324.patch b/backport-CVE-2023-32324.patch deleted file mode 100644 index c5c2672964ced0dd90174bf15cd040201ba2de8f..0000000000000000000000000000000000000000 --- a/backport-CVE-2023-32324.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fd8bc2d32589d1fd91fe1c0521be2a7c0462109e Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Thu, 1 Jun 2023 12:04:00 +0200 -Subject: [PATCH] cups/string.c: Return if `size` is 0 (fixes CVE-2023-32324) - -Reference:https://github.com/OpenPrinting/cups/commit/fd8bc2d32589d1fd91fe1c0521be2a7c0462109e -Conflict:NA - ---- - cups/string.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/cups/string.c b/cups/string.c -index 93cdad1..5def888 100644 ---- a/cups/string.c -+++ b/cups/string.c -@@ -1,6 +1,7 @@ - /* - * String functions for CUPS. - * -+ * Copyright © 2023 by OpenPrinting. - * Copyright © 2007-2019 by Apple Inc. - * Copyright © 1997-2007 by Easy Software Products. - * -@@ -730,6 +731,9 @@ _cups_strlcpy(char *dst, /* O - Destination string */ - size_t srclen; /* Length of source string */ - - -+ if (size == 0) -+ return (0); -+ - /* - * Figure out how much room is needed... - */ --- -2.27.0 - diff --git a/backport-CVE-2023-34241.patch b/backport-CVE-2023-34241.patch deleted file mode 100644 index 8f1d863f45c34b6b9108044a5873d4a216062816..0000000000000000000000000000000000000000 --- a/backport-CVE-2023-34241.patch +++ /dev/null @@ -1,65 +0,0 @@ -From ffd290b4ab247f82722927ba9b21358daa16dbf1 Mon Sep 17 00:00:00 2001 -From: Rose <83477269+AtariDreams@users.noreply.github.com> -Date: Thu, 1 Jun 2023 11:33:39 -0400 -Subject: [PATCH] Log result of httpGetHostname BEFORE closing the connection - -httpClose frees the memory of con->http. This is problematic because httpGetHostname then tries to access the memory it points to. - -We have to log the hostname first. - -Reference:https://github.com/OpenPrinting/cups/commit/9809947a959e18409dcf562a3466ef246cb90cb2 -Conflict:NA ---- - scheduler/client.c | 16 +++++++--------- - 1 file changed, 7 insertions(+), 9 deletions(-) - -diff --git a/scheduler/client.c b/scheduler/client.c -index 91e441188c..327473a4d1 100644 ---- a/scheduler/client.c -+++ b/scheduler/client.c -@@ -193,13 +193,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ - /* - * Can't have an unresolved IP address with double-lookups enabled... - */ -- -- httpClose(con->http); -- - cupsdLogClient(con, CUPSD_LOG_WARN, -- "Name lookup failed - connection from %s closed!", -+ "Name lookup failed - closing connection from %s!", - httpGetHostname(con->http, NULL, 0)); - -+ httpClose(con->http); - free(con); - return; - } -@@ -235,11 +233,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ - * with double-lookups enabled... - */ - -- httpClose(con->http); -- - cupsdLogClient(con, CUPSD_LOG_WARN, -- "IP lookup failed - connection from %s closed!", -+ "IP lookup failed - closing connection from %s!", - httpGetHostname(con->http, NULL, 0)); -+ -+ httpClose(con->http); - free(con); - return; - } -@@ -256,11 +254,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ - - if (!hosts_access(&wrap_req)) - { -- httpClose(con->http); -- - cupsdLogClient(con, CUPSD_LOG_WARN, - "Connection from %s refused by /etc/hosts.allow and " - "/etc/hosts.deny rules.", httpGetHostname(con->http, NULL, 0)); -+ -+ httpClose(con->http); - free(con); - return; - } - diff --git a/backport-CVE-2023-4504.patch b/backport-CVE-2023-4504.patch deleted file mode 100644 index e254746c5658e21862e3406725bd6181b5891a94..0000000000000000000000000000000000000000 --- a/backport-CVE-2023-4504.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2431caddb7e6a87f04ac90b5c6366ad268b6ff31 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Wed, 20 Sep 2023 14:45:17 +0200 -Subject: [PATCH] raster-interpret.c: Fix CVE-2023-4504 - -We didn't check for end of buffer if it looks there is an escaped -character - check for NULL terminator there and if found, return NULL -as return value and in `ptr`, because a lone backslash is not -a valid PostScript character. - -Reference:https://github.com/OpenPrinting/cups/commit/2431caddb7e6a87f04ac90b5c6366ad268b6ff31 -Conflict:Patch context adaptation - ---- - cups/raster-interpret.c | 14 +++++++++++++- - 1 files changed, 14 insertions(+) - -diff --git a/cups/raster-interpret.c b/cups/raster-interpret.c -index 6fcf731b5..b8655c8c6 100644 ---- a/cups/raster-interpret.c -+++ b/cups/raster-interpret.c -@@ -1116,7 +1116,19 @@ scan_ps(_cups_ps_stack_t *st, /* I - Stack */ - - cur ++; - -- if (*cur == 'b') -+ /* -+ * Return NULL if we reached NULL terminator, a lone backslash -+ * is not a valid character in PostScript. -+ */ -+ -+ if (!*cur) -+ { -+ *ptr = NULL; -+ -+ return (NULL); -+ } -+ -+ if (*cur == 'b') - *valptr++ = '\b'; - else if (*cur == 'f') - *valptr++ = '\f'; - - diff --git a/cups-2.4.0-source.tar.gz b/cups-2.4.7-source.tar.gz similarity index 53% rename from cups-2.4.0-source.tar.gz rename to cups-2.4.7-source.tar.gz index aa8d49f82e0c9877bfb0cbd486201d3cf1fdff05..fea8d377aba092b611dfa1b8cac3c6737f2d33bf 100644 Binary files a/cups-2.4.0-source.tar.gz and b/cups-2.4.7-source.tar.gz differ diff --git a/cups.spec b/cups.spec index a8e9030ea4f185bf5c1ca1ce80fe420065e06ad9..8d69eb27c299dde9ceb3804bc192352e8937fd3c 100644 --- a/cups.spec +++ b/cups.spec @@ -2,8 +2,8 @@ Name: cups Epoch: 1 -Version: 2.4.0 -Release: 10 +Version: 2.4.7 +Release: 1 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: Apache-2.0 Url: https://openprinting.github.io/cups/ @@ -24,13 +24,7 @@ Patch8: cups-freebind.patch Patch9: cups-ipp-multifile.patch Patch10: cups-web-devices-timeout.patch -Patch6000: backport-CVE-2022-26691.patch -Patch6001: backport-Remove-legacy-code-for-RIP_MAX_CACHE-environment-variable.patch -Patch6002: backport-Also-fix-cupsfilter.patch -Patch6003: backport-CVE-2023-32324.patch Patch6004: fix-httpAddrGetList-test-case-fail.patch -Patch6005: backport-CVE-2023-34241.patch -Patch6006: backport-CVE-2023-4504.patch BuildRequires: pam-devel pkgconf-pkg-config pkgconfig(gnutls) libacl-devel openldap-devel pkgconfig(libusb-1.0) BuildRequires: krb5-devel pkgconfig(avahi-client) systemd pkgconfig(libsystemd) pkgconfig(dbus-1) python3-cups @@ -452,6 +446,11 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Fri Dec 29 2023 wangrui - 1:2.4.7-1 +- update to the latest version2.4.7，/scheduler/cupsfilter.c in backport-also-fix-cupsfilter.patch, /scheduler/cert.c in backport-CVE-2022-26691.patch, /cups/string.c in backport-CVE-2023-32324 .patch in /cups/string.c, /scheduler/client.c in backport-CVE-2023-34241.patch, /cups/raster-interpret.c in backport-CVE-2023-4504.patch, and /scheduler/job.c in /scheduler/client.c, backport-CVE-2023-4504.patch/cups/raster-interpret.c, and backport-Remove-legacy-code-for-RIP_MAX_CACHE-environment-variable.patch have been changed in the upstream code, so these patches are removed. + + + * Fri Sep 22 2023 zhouwenpei - 1:2.4.0-10 - fix CVE-2023-4504