diff --git a/Fix-compilation-error-on-sw64-arch.patch b/Fix-compilation-error-on-sw64-arch.patch index d545087d35e23aaf53744ce3e1c852edac770a58..8ac1a9ff5da8003c1fe9936c2fe35c2530e8d997 100644 --- a/Fix-compilation-error-on-sw64-arch.patch +++ b/Fix-compilation-error-on-sw64-arch.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Fix compilation error on sw64 arch. 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/compat/endian.h b/include/compat/endian.h -index fe6ee83..76ce6e9 100644 +index fe6ee838e..76ce6e959 100644 --- a/include/compat/endian.h +++ b/include/compat/endian.h @@ -51,7 +51,7 @@ @@ -23,11 +23,11 @@ index fe6ee83..76ce6e9 100644 defined(MIPSEL) || defined(_MIPSEL) || defined(ns32000) || \ defined(__ns3200) || defined(sun386) || defined(vax) || \ diff --git a/plugins/sudoers/auth/secureware.c b/plugins/sudoers/auth/secureware.c -index 49a4b4e..b47c0b8 100644 +index a193e5561..a15101a90 100644 --- a/plugins/sudoers/auth/secureware.c +++ b/plugins/sudoers/auth/secureware.c @@ -46,7 +46,7 @@ - #include "sudoers.h" + #include #include "sudo_auth.h" -#ifdef __alpha @@ -35,7 +35,7 @@ index 49a4b4e..b47c0b8 100644 extern int crypt_type; #endif -@@ -59,7 +59,7 @@ sudo_secureware_init(struct passwd *pw, sudo_auth *auth) +@@ -60,7 +60,7 @@ sudo_secureware_init(const struct sudoers_context *ctx, struct passwd *pw, if (auth->data != NULL) debug_return_int(AUTH_SUCCESS); @@ -44,7 +44,7 @@ index 49a4b4e..b47c0b8 100644 if (crypt_type == INT_MAX) debug_return_int(AUTH_FAILURE); /* no shadow */ #endif -@@ -81,7 +81,7 @@ sudo_secureware_verify(struct passwd *pw, const char *pass, sudo_auth *auth, str +@@ -83,7 +83,7 @@ sudo_secureware_verify(const struct sudoers_context *ctx, struct passwd *pw, if (pass[0] == '\0') debug_return_int(pw_epasswd[0] ? AUTH_FAILURE : AUTH_SUCCESS); @@ -54,7 +54,7 @@ index 49a4b4e..b47c0b8 100644 epass = dispcrypt(pass, pw_epasswd, crypt_type); # else diff --git a/plugins/sudoers/getspwuid.c b/plugins/sudoers/getspwuid.c -index 650b3f3..f31dd5f 100644 +index dd5092d72..0b48cb8f7 100644 --- a/plugins/sudoers/getspwuid.c +++ b/plugins/sudoers/getspwuid.c @@ -51,7 +51,7 @@ @@ -78,4 +78,3 @@ index 650b3f3..f31dd5f 100644 -- 2.33.0 - diff --git a/sudo-1.9.14p1.tar.gz b/sudo-1.9.15p5.tar.gz similarity index 41% rename from sudo-1.9.14p1.tar.gz rename to sudo-1.9.15p5.tar.gz index 3a84c7d00ceef52a95393eca27369a50fb42f034..019ff8b9411925b5da3d1bf151fb529fea9ca63d 100644 Binary files a/sudo-1.9.14p1.tar.gz and b/sudo-1.9.15p5.tar.gz differ diff --git a/sudo.spec b/sudo.spec index 369d2ad7eb22723c72b13b844b77398eecd86dfe..cec1abea9922a84af85e611853a164e4cee7c16f 100644 --- a/sudo.spec +++ b/sudo.spec @@ -1,5 +1,5 @@ Name: sudo -Version: 1.9.14p1 +Version: 1.9.15p5 Release: 1 Summary: Allows restricted root access for specified users License: ISC @@ -155,6 +155,9 @@ chrpath -d $RPM_BUILD_ROOT/usr/libexec/sudo/* %exclude %{_pkgdocdir}/ChangeLog %changelog +* Mon Jan 8 2024 wangqingsan - 1.9.15p5-1 +- Upgrade to 1.9.15p5 + * Wed Jul 19 2023 zhoushuiqing - 1.9.14p1-1 - Upgrade to 1.9.14p1