diff --git a/sudo-1.9.15p5.tar.gz b/sudo-1.9.16.tar.gz similarity index 42% rename from sudo-1.9.15p5.tar.gz rename to sudo-1.9.16.tar.gz index 019ff8b9411925b5da3d1bf151fb529fea9ca63d..ca2287f1b5b4e682295b244618277499abfdd7fa 100644 Binary files a/sudo-1.9.15p5.tar.gz and b/sudo-1.9.16.tar.gz differ diff --git a/sudo.spec b/sudo.spec index cec1abea9922a84af85e611853a164e4cee7c16f..8be6529239c04a0b9be957e8f53bcac96ff03ee9 100644 --- a/sudo.spec +++ b/sudo.spec @@ -1,5 +1,5 @@ Name: sudo -Version: 1.9.15p5 +Version: 1.9.16 Release: 1 Summary: Allows restricted root access for specified users License: ISC @@ -11,8 +11,6 @@ Source2: sudo 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 @@ -41,7 +39,7 @@ plugins that use %{name}. %build autoreconf -I m4 -fv --install -export CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" +export CFLAGS="%{build_cflags} -fpie" LDFLAGS="%{build_ldflags} -pie" %configure \ --prefix=%{_prefix} \ --sbindir=%{_sbindir} \ @@ -68,17 +66,16 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" %make_build %check -make check +%make_build check %install -rm -rf $RPM_BUILD_ROOT %make_install install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g` chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* install -p -d -m 700 $RPM_BUILD_ROOT/var/db/sudo install -p -d -m 700 $RPM_BUILD_ROOT/var/db/sudo/lectured install -p -d -m 750 $RPM_BUILD_ROOT/etc/sudoers.d -install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers +install -p -c -m 0440 %{S:1} $RPM_BUILD_ROOT/etc/sudoers install -p -d -m 755 $RPM_BUILD_ROOT/etc/dnf/protected.d/ touch sudo.conf @@ -103,16 +100,14 @@ echo "/usr/libexec/sudo" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.con %find_lang sudoers mkdir -p $RPM_BUILD_ROOT/etc/pam.d -install -p -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sudo -install -p -c -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/sudo-i +install -p -c -m 0644 %{S:2} $RPM_BUILD_ROOT/etc/pam.d/sudo +install -p -c -m 0644 %{S:3} $RPM_BUILD_ROOT/etc/pam.d/sudo-i -chrpath -d $RPM_BUILD_ROOT/usr/bin/* -chrpath -d $RPM_BUILD_ROOT/usr/sbin/* -chrpath -d $RPM_BUILD_ROOT/usr/libexec/sudo/* +rm -f %{buildroot}%{_pkgdocdir}/ChangeLog %post /bin/chmod 0440 /etc/sudoers || : -/sbin/ldconfig || : +/sbin/ldconfig %postun -p /sbin/ldconfig @@ -133,7 +128,9 @@ chrpath -d $RPM_BUILD_ROOT/usr/libexec/sudo/* %attr(0644,root,root) %{_libexecdir}/sudo/group_file.so %attr(0644,root,root) %{_libexecdir}/sudo/system_group.so %attr(0644,root,root) %{_libexecdir}/sudo/audit_json.so -%attr(0644,root,root) %{_libexecdir}/sudo/libsudo_util.so* +%attr(0644,root,root) %{_libexecdir}/sudo/libsudo_util.so.?.?.? +%{_libexecdir}/sudo/libsudo_util.so.? +%{_libexecdir}/sudo/libsudo_util.so %dir /var/db/sudo %dir /var/db/sudo/lectured %dir %{_libexecdir}/sudo @@ -152,9 +149,11 @@ chrpath -d $RPM_BUILD_ROOT/usr/libexec/sudo/* %{_mandir}/man1/* %{_pkgdocdir}/* %doc plugins/sample/sample_plugin.c -%exclude %{_pkgdocdir}/ChangeLog %changelog +* Sun Sep 15 2024 Funda Wang - 1.9.16-1 +- update to 1.9.16 + * Mon Jan 8 2024 wangqingsan - 1.9.15p5-1 - Upgrade to 1.9.15p5 diff --git a/sudo.yaml b/sudo.yaml index 5ef0670cb7ae0cb428798263b41047f2a8987a2b..b9c8cdc644227136dd73b1284d8098178d8667ac 100644 --- a/sudo.yaml +++ b/sudo.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: "sudo-project/sudo" tag_prefix: "^SUDO_" -seperator: _ +separator: _