diff --git a/cups.spec b/cups.spec index 63ca877597401f34e3f41c43e3d03f90b2acac99..7ba2b4037dd849174d69f338ed17911cd6ffaf1d 100644 --- a/cups.spec +++ b/cups.spec @@ -3,7 +3,7 @@ Name: cups Epoch: 1 Version: 2.4.7 -Release: 4 +Release: 5 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: Apache-2.0 Url: https://openprinting.github.io/cups/ @@ -27,6 +27,7 @@ Patch10: cups-web-devices-timeout.patch Patch6004: fix-httpAddrGetList-test-case-fail.patch Patch6005: backport-Fix-CVE-2024-35235.patch Patch6006: backport-Fix-CVE-2024-35235-regression.patch +Patch6007: fix-clang-incompatible-integer-to-pointer-error.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 @@ -449,6 +450,9 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Fri Sep 06 2024 yanying <201250106@smail.nju.edu.cn> - 1:2.4.7-5 +- fix clang incompatible integer to pointer conversion error + * Wed Aug 14 2024 Funda Wang - 1:2.4.7-4 - Fix regression of fixing CVE-2024-35235 (upstream issue#985) diff --git a/fix-clang-incompatible-integer-to-pointer-error.patch b/fix-clang-incompatible-integer-to-pointer-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..bb35b5f2a72ce1769396e6a095c0e46fc0c20e4c --- /dev/null +++ b/fix-clang-incompatible-integer-to-pointer-error.patch @@ -0,0 +1,26 @@ +From 14e531aa6268f487f644f985c5ec9713080bc045 Mon Sep 17 00:00:00 2001 +From: yanying <201250106@smail.nju.edu.cn> +Date: Fri, 6 Sep 2024 03:14:11 +0800 +Subject: [PATCH] fix clang incompatible integer to pointer error + +--- + cups/testhttp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cups/testhttp.c b/cups/testhttp.c +index 1b1b2e4..da49957 100644 +--- a/cups/testhttp.c ++++ b/cups/testhttp.c +@@ -392,7 +392,8 @@ main(int argc, /* I - Number of command-line arguments */ + + printf("httpAddrGetList(%s): ", hostname); + +- addrlist = httpAddrGetList(gethostname(localhostname, sizeof(localhostname)), AF_UNSPEC, NULL); ++ gethostname(localhostname, sizeof(localhostname)); ++ addrlist = httpAddrGetList(localhostname, AF_UNSPEC, NULL); + if (addrlist) + { + for (i = 0, addr = addrlist; addr; i ++, addr = addr->next) +-- +2.41.0.windows.1 +