#25 Update to 1.9.9
Opened 9 months ago by ngompa. Modified 9 months ago
rpms/ ngompa/sudo update-to-1.9.9  into  rawhide

file modified
+1
@@ -28,3 +28,4 @@ 

  /sudo-1.9.5p1.tar.gz

  /sudo-1.9.5p2.tar.gz

  /sudo-1.9.8p2.tar.gz

+ /sudo-1.9.9.tar.gz

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (sudo-1.9.8p2.tar.gz) = 899b252e8c219226f658dff3dd34c97b07d42004998b45175b4c0c4de42a6bf9f909598e99b4056fa1171e63378e203854b0f8608b0f5c1b00e9d3677818f6d3

+ SHA512 (sudo-1.9.9.tar.gz) = 53064240431ae3d9409dc5cb7d72ab55d9ab5f802af4de99fadd987855461b3cca53f261d6256e3b6f35e30c7e162f4dfa3978ef6976415cf5be874fb2026614

file modified
+27 -38
@@ -1,15 +1,14 @@ 

  

  # comment out if no extra version

- %global extraver p2

+ #global extraver p2

  

  Summary: Allows restricted root access for specified users

  Name: sudo

- Version: 1.9.8

- # remove -b 3 after rebase !!!

+ Version: 1.9.9

  # use "-p -e % {?extraver}" when beta

  # use "-e % {?extraver}"" when patch version

  # use nothing special when normal version

- Release: %autorelease -e %{?extraver} -b 3

+ Release: %autorelease %{?extraver:-e %{extraver}}

  License: ISC

  URL: https://www.sudo.ws

  Source0: %{url}/dist/%{name}-%{version}%{?extraver}.tar.gz
@@ -71,19 +70,14 @@ 

  %{name}-python-plugin allows using sudo plugins written in Python.

  

  %prep

- %setup -q -n %{name}-%{version}%{?extraver}

+ %autosetup -n %{name}-%{version}%{?extraver}

  

  %build

  # Remove bundled copy of zlib

  rm -rf zlib/

  

- %ifarch s390 s390x sparc64

- F_PIE=-fPIE

- %else

- F_PIE=-fpie

- %endif

- 

- export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"

+ # Set all build hardening flags

+ %set_build_flags

  

  %configure \

          --prefix=%{_prefix} \
@@ -110,40 +104,39 @@ 

          --with-sssd

  #       --without-kerb5 \

  #       --without-kerb4

- make

+ %make_build

  

  %check

  make check

  

  %install

- rm -rf $RPM_BUILD_ROOT

- make install DESTDIR="$RPM_BUILD_ROOT" 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

+ %make_install install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`

+ 

+ chmod 755 %{buildroot}%{_bindir}/* %{buildroot}%{_sbindir}/*

+ install -p -d -m 700 %{buildroot}/var/db/sudo

+ install -p -d -m 700 %{buildroot}/var/db/sudo/lectured

+ install -p -d -m 750 %{buildroot}/etc/sudoers.d

+ install -p -c -m 0440 %{SOURCE1} %{buildroot}/etc/sudoers

  #add sudo to protected packages

- install -p -d -m 755 $RPM_BUILD_ROOT/etc/dnf/protected.d/

+ install -p -d -m 755 %{buildroot}/etc/dnf/protected.d/

  touch sudo.conf

  echo sudo > sudo.conf

- install -p -c -m 0644 sudo.conf $RPM_BUILD_ROOT/etc/dnf/protected.d/

+ install -p -c -m 0644 sudo.conf %{buildroot}/etc/dnf/protected.d/

  rm -f sudo.conf

  

- chmod +x $RPM_BUILD_ROOT%{_libexecdir}/sudo/*.so # for stripping, reset in %%files

+ chmod +x %{buildroot}%{_libexecdir}/sudo/*.so # for stripping, reset in %%files

  

- # Don't package LICENSE as a doc

- rm -rf $RPM_BUILD_ROOT%{_pkgdocdir}/LICENSE

+ # Don't package LICENSE.md as a doc

+ rm -f %{buildroot}%{_pkgdocdir}/LICENSE.md

  

  # Remove examples; Examples can be found in man pages too.

- rm -rf $RPM_BUILD_ROOT%{_datadir}/examples/sudo

+ rm -rf %{buildroot}%{_datadir}/examples/sudo

  

  #Remove all .la files

- find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

+ find %{buildroot} -name '*.la' -exec rm -f {} ';'

  

  # Remove sudoers.dist

- rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.dist

+ rm -f %{buildroot}%{_sysconfdir}/sudoers.dist

  

  %find_lang sudo

  %find_lang sudoers
@@ -151,8 +144,8 @@ 

  cat sudo.lang sudoers.lang > sudo_all.lang

  rm sudo.lang sudoers.lang

  

- mkdir -p $RPM_BUILD_ROOT/etc/pam.d

- cat > $RPM_BUILD_ROOT/etc/pam.d/sudo << EOF

+ mkdir -p %{buildroot}/etc/pam.d

+ cat > %{buildroot}/etc/pam.d/sudo << EOF

  #%%PAM-1.0

  auth       include      system-auth

  account    include      system-auth
@@ -162,7 +155,7 @@ 

  session    include      system-auth

  EOF

  

- cat > $RPM_BUILD_ROOT/etc/pam.d/sudo-i << EOF

+ cat > %{buildroot}/etc/pam.d/sudo-i << EOF

  #%%PAM-1.0

  auth       include      sudo

  account    include      sudo
@@ -173,7 +166,6 @@ 

  

  

  %files -f sudo_all.lang

- %defattr(-,root,root)

  %attr(0440,root,root) %config(noreplace) /etc/sudoers

  %attr(0750,root,root) %dir /etc/sudoers.d/

  %config(noreplace) /etc/pam.d/sudo
@@ -208,11 +200,8 @@ 

  %{_mandir}/man8/visudo.8*

  %{_mandir}/man1/cvtsudoers.1.gz

  %{_mandir}/man5/sudoers_timestamp.5.gz

- %dir %{_pkgdocdir}/

- %{_pkgdocdir}/*

- %{!?_licensedir:%global license %%doc}

- %license doc/LICENSE

- %exclude %{_pkgdocdir}/ChangeLog

+ %{_pkgdocdir}/

+ %license LICENSE.md

  

  %files devel

  %doc plugins/sample/sample_plugin.c

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci