diff --git a/Fix-compilation-error-on-sw64-arch.patch b/Fix-compilation-error-on-sw64-arch.patch index d545087d35e23aaf53744ce3e1c852edac770a58..eb2811a94f1c2b1d0e71461801162a4d1e34c6b2 100644 --- a/Fix-compilation-error-on-sw64-arch.patch +++ b/Fix-compilation-error-on-sw64-arch.patch @@ -1,7 +1,7 @@ -From 505355cce4fcc2c8f1103a88dd707758cba4907f Mon Sep 17 00:00:00 2001 -From: zhangzhixin -Date: Wed, 12 Apr 2023 11:52:01 +0800 -Subject: [PATCH] Fix compilation error on sw64 arch. +From 90740c1b6c310ccec855fb358e95f53ad39579ae Mon Sep 17 00:00:00 2001 +From: luojun +Date: Thu, 4 Jan 2024 21:52:51 +0800 +Subject: [PATCH] 2 --- include/compat/endian.h | 2 +- @@ -23,28 +23,28 @@ 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 a193e55..9af1cde 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 -+#if defined __alpha || defined __sw_64 ++#ifdef __alpha || defined __sw_64 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); -#ifdef __alpha -+#if defined __alpha || defined __sw_64 ++#ifdef __alpha || defined __sw_64 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 dd5092d..5893871 100644 --- a/plugins/sudoers/getspwuid.c +++ b/plugins/sudoers/getspwuid.c @@ -51,7 +51,7 @@ @@ -71,11 +71,10 @@ index 650b3f3..f31dd5f 100644 if ((spw = getprpwnam(pw->pw_name)) && spw->ufld.fd_encrypt) { -# ifdef __alpha -+# if defined __alpha || defined __sw_64 ++# ifdef __alpha || defined __sw_64 crypt_type = spw->ufld.fd_oldcrypt; # endif /* __alpha */ epw = spw->ufld.fd_encrypt; -- -2.33.0 - +2.39.2 diff --git a/sudo-1.9.14p1.tar.gz b/sudo-1.9.15p5.tar.gz similarity index 39% rename from sudo-1.9.14p1.tar.gz rename to sudo-1.9.15p5.tar.gz index 3a84c7d00ceef52a95393eca27369a50fb42f034..c7513d1c444afd5d4c044d62983a251704738d51 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..d253886c84467193f106a5237fdc60b34ee27f20 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 @@ -12,7 +12,6 @@ Source3: sudo-i Patch0: Fix-compilation-error-on-sw64-arch.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pam Recommends: vim-minimal Requires(post): coreutils @@ -47,6 +46,16 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" --sbindir=%{_sbindir} \ --libdir=%{_libdir} \ --docdir=%{_pkgdocdir} \ + --exec-prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libexecdir=%{_libexecdir} \ + --sysconfdir=%{_sysconfdir} \ + --includedir=%{_includedir} \ + --datarootdir=%{_datarootdir} \ + --localedir=%{_datarootdir}/locale\ + --mandir=%{_mandir} \ + --with-exampledir=%{_datarootdir}/doc/sudo/examples\ + --with-plugindir=%{_libexecdir}/sudo\ --disable-root-mailer \ --disable-intercept \ --disable-log-server \ @@ -155,6 +164,9 @@ chrpath -d $RPM_BUILD_ROOT/usr/libexec/sudo/* %exclude %{_pkgdocdir}/ChangeLog %changelog +* Thu Jan 4 2024 luojun -1.9.15p5-1 +- Upgrade to 1.9.15p3 and change the confilted patch + * Wed Jul 19 2023 zhoushuiqing - 1.9.14p1-1 - Upgrade to 1.9.14p1