Attachment 683254 Details for Bug 901897 – Bunch of packaging fixes

[patch] Bunch of packaging fixes

0001-Build-with-system-zlib.patch (text/plain), 5.43 KB, created by Ville Skyttä on 2013-01-19 20:56:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2013-01-19 20:56:19 UTC

Size: 5.43 KB

patch

obsolete

>From 8155cb191a55df46b9b4ca4829198033d979cdad Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sat, 19 Jan 2013 22:53:06 +0200
>Subject: [PATCH] Build with system zlib.
>
>- Let rpmbuild strip libexecdir/*.so.
>- Own the %{_docdir}/sudo-* dir.
>- Fix some rpmlint warnings (spaces vs tabs, unescaped macros).
>- Fix bogus %changelog dates.
>---
> sudo.spec | 45 ++++++++++++++++++++++++++++-----------------
> 1 file changed, 28 insertions(+), 17 deletions(-)
>
>diff --git a/sudo.spec b/sudo.spec
>index 6c6cd1d..f22fdec 100644
>--- a/sudo.spec
>+++ b/sudo.spec
>@@ -1,7 +1,7 @@
> Summary: Allows restricted root access for specified users
> Name: sudo
> Version: 1.8.6p3
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> License: ISC
> Group: Applications/System
> URL: http://www.courtesan.com/sudo/
>@@ -20,6 +20,7 @@ BuildRequires: audit-libs-devel libcap-devel
> BuildRequires: libselinux-devel
> BuildRequires: sendmail
> BuildRequires: gettext
>+BuildRequires: zlib-devel
> 
> # don't strip
> Patch1: sudo-1.6.7p5-strip.patch
>@@ -72,22 +73,22 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
>         --prefix=%{_prefix} \
>         --sbindir=%{_sbindir} \
>         --libdir=%{_libdir} \
>-	--docdir=%{_datadir}/doc/%{name}-%{version} \
>+        --docdir=%{_datadir}/doc/%{name}-%{version} \
>         --with-logging=syslog \
>         --with-logfac=authpriv \
>         --with-pam \
>-	--with-pam-login \
>+        --with-pam-login \
>         --with-editor=/bin/vi \
>         --with-env-editor \
>         --with-ignore-dot \
>         --with-tty-tickets \
>         --with-ldap \
>-	--with-selinux \
>-	--with-passprompt="[sudo] password for %p: " \
>-	--with-linux-audit \
>-	--with-sssd
>-#	--without-kerb5 \
>-#	--without-kerb4
>+        --with-selinux \
>+        --with-passprompt="[sudo] password for %p: " \
>+        --with-linux-audit \
>+        --with-sssd
>+#        --without-kerb5 \
>+#        --without-kerb4
> make
> 
> %install
>@@ -99,6 +100,8 @@ install -p -d -m 700 $RPM_BUILD_ROOT/var/db/sudo
> install -p -d -m 750 $RPM_BUILD_ROOT/etc/sudoers.d
> install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
> 
>+chmod +x $RPM_BUILD_ROOT%{_libexecdir}/*.so # for stripping, reset in %%files
>+
> # Remove execute permission on this script so we don't pull in perl deps
> chmod -x $RPM_BUILD_ROOT%{_docdir}/sudo-*/sudoers2ldif
> 
>@@ -110,7 +113,7 @@ rm sudo.lang sudoers.lang
> 
> mkdir -p $RPM_BUILD_ROOT/etc/pam.d
> cat > $RPM_BUILD_ROOT/etc/pam.d/sudo << EOF
>-#%PAM-1.0
>+#%%PAM-1.0
> auth       include      system-auth
> account    include      system-auth
> password   include      system-auth
>@@ -119,7 +122,7 @@ session    required     pam_limits.so
> EOF
> 
> cat > $RPM_BUILD_ROOT/etc/pam.d/sudo-i << EOF
>-#%PAM-1.0
>+#%%PAM-1.0
> auth       include      sudo
> account    include      sudo
> password   include      sudo
>@@ -143,14 +146,15 @@ rm -rf $RPM_BUILD_ROOT
> %attr(0111,root,root) %{_bindir}/sudoreplay
> %attr(0755,root,root) %{_sbindir}/visudo
> %attr(0755,root,root) %{_libexecdir}/sesh
>-%{_libexecdir}/sudo_noexec.*
>-%{_libexecdir}/sudoers.*
>+%attr(0644,root,root) %{_libexecdir}/sudo_noexec.so
>+%attr(0644,root,root) %{_libexecdir}/sudoers.so
> %{_mandir}/man5/sudoers.5*
> %{_mandir}/man5/sudoers.ldap.5*
> %{_mandir}/man8/sudo.8*
> %{_mandir}/man8/sudoedit.8*
> %{_mandir}/man8/sudoreplay.8*
> %{_mandir}/man8/visudo.8*
>+%dir %{_docdir}/sudo-%{version}
> %{_docdir}/sudo-%{version}/*
> 
> 
>@@ -165,6 +169,13 @@ rm -rf $RPM_BUILD_ROOT
> %{_mandir}/man8/sudo_plugin.8*
> 
> %changelog
>+* Sat Jan 19 2013 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.8.6p3-3
>+- Build with system zlib.
>+- Let rpmbuild strip libexecdir/*.so.
>+- Own the %%{_docdir}/sudo-* dir.
>+- Fix some rpmlint warnings (spaces vs tabs, unescaped macros).
>+- Fix bogus %%changelog dates.
>+
> * Mon Nov 12 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6p3-2
> - added upstream patch for a regression
> - don't include arch specific files in the -devel subpackage
>@@ -208,7 +219,7 @@ rm -rf $RPM_BUILD_ROOT
> * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3p1-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-* Tue Nov 10 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-1
>+* Thu Nov 10 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-1
> - update to 1.8.3p1
> - disable output word wrapping if the output is piped 
> 
>@@ -341,7 +352,7 @@ rm -rf $RPM_BUILD_ROOT
> - upgrade to the latest upstream release
> - add selinux support
> 
>-* Mon Feb 02 2008 Dennis Gilmore <dennis@ausil.us> 1.6.9p4-6
>+* Mon Feb 04 2008 Dennis Gilmore <dennis@ausil.us> 1.6.9p4-6
> - sparc64 needs to be in the -fPIE list with s390
> 
> * Mon Jan 07 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p4-5
>@@ -467,7 +478,7 @@ rm -rf $RPM_BUILD_ROOT
> * Thu Apr  1 2004 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-25
> - fixed spec file: sesh in file section with selinux flag (#119682)
> 
>-* Thu Mar 30 2004 Colin Walters <walters@redhat.com> 1.6.7p5-24
>+* Tue Mar 30 2004 Colin Walters <walters@redhat.com> 1.6.7p5-24
> - Enhance sesh.c to fork/exec children itself, to avoid
>   having sudo reap all domains.
> - Only reinstall default signal handlers immediately before
>@@ -629,7 +640,7 @@ rm -rf $RPM_BUILD_ROOT
> * Tue Oct 27 1998 Preston Brown <pbrown@redhat.com>
> - fixed so it doesn't find /usr/bin/vi first, but instead /bin/vi (always installed)
> 
>-* Fri Oct 08 1998 Michael Maher <mike@redhat.com>
>+* Thu Oct 08 1998 Michael Maher <mike@redhat.com>
> - built package for 5.2 
> 
> * Mon May 18 1998 Michael Maher <mike@redhat.com>
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 901897: 683254