isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install sudoedit and the sudoedit manual as symbolic links, not

Browse Source 
hard links and package them as such.
This commit is contained in:
Todd C. Miller
2012-05-31 15:50:16 -04:00
parent 3076dc2a4f
commit 61a3ed1c10
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Makefile.in
View File

@@ -251,10 +251,10 @@ install-doc: install-dirs
fi; \ fi; \
done; \ done; \
rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \ rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \ ln -s sudo.$(mansectsu)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
else \ else \
rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \ rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \ ln -s sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
fi fi
install-plugin: install-plugin:

2
src/Makefile.in
View File

@@ -113,7 +113,7 @@ install-dirs:
install-binaries: install-dirs $(PROGS) install-binaries: install-dirs $(PROGS)
$(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(bindir)/sudo $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(bindir)/sudo
rm -f $(DESTDIR)$(bindir)/sudoedit rm -f $(DESTDIR)$(bindir)/sudoedit
ln $(DESTDIR)$(bindir)/sudo $(DESTDIR)$(bindir)/sudoedit ln -s sudo $(DESTDIR)$(bindir)/sudoedit
if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi
install-doc: install-doc:

16
sudo.pp
View File

@@ -14,6 +14,8 @@ still allow people to get their work done."
vendor="Todd C. Miller" vendor="Todd C. Miller"
copyright="(c) 1993-1996,1998-2012 Todd C. Miller" copyright="(c) 1993-1996,1998-2012 Todd C. Miller"
shmode=0644 shmode=0644
sudoedit_man=`echo $mandir/*/sudoedit.*|sed 's:^${pp_destdir}::'`
sudoedit_man_target=`basename $sudoedit_man | sed 's/edit//'`
%if [aix] %if [aix]
# AIX package summary is limited to 40 characters # AIX package summary is limited to 40 characters
@@ -71,16 +73,14 @@ still allow people to get their work done."
# Create lintian override file # Create lintian override file
mkdir -p ${pp_wrkdir}/${name}/usr/share/lintian/overrides mkdir -p ${pp_wrkdir}/${name}/usr/share/lintian/overrides
cat >${pp_wrkdir}/${name}/usr/share/lintian/overrides/${name} <<-EOF cat >${pp_wrkdir}/${name}/usr/share/lintian/overrides/${name} <<-EOF
# The sudo binary must be setuid root (sudoedit is a link to sudo) # The sudo binary must be setuid root
$name: setuid-binary usr/bin/sudo 4755 root/root $name: setuid-binary usr/bin/sudo 4755 root/root
$name: setuid-binary usr/bin/sudoedit 4755 root/root
# Sudo configuration and data dirs must not be world-readable # Sudo configuration and data dirs must not be world-readable
$name: non-standard-file-perm etc/sudoers 0440 != 0644 $name: non-standard-file-perm etc/sudoers 0440 != 0644
$name: non-standard-dir-perm etc/sudoers.d/ 0750 != 0755 $name: non-standard-dir-perm etc/sudoers.d/ 0750 != 0755
$name: non-standard-dir-perm var/lib/sudo/ 0700 != 0755 $name: non-standard-dir-perm var/lib/sudo/ 0700 != 0755
# Sudo ships with debugging symbols # Sudo ships with debugging symbols
$name: unstripped-binary-or-object ./usr/bin/sudo $name: unstripped-binary-or-object ./usr/bin/sudo
$name: unstripped-binary-or-object ./usr/bin/sudoedit
$name: unstripped-binary-or-object ./usr/bin/sudoreplay $name: unstripped-binary-or-object ./usr/bin/sudoreplay
$name: unstripped-binary-or-object ./usr/lib/sudo/sudo_noexec.so $name: unstripped-binary-or-object ./usr/lib/sudo/sudo_noexec.so
$name: unstripped-binary-or-object ./usr/lib/sudo/sudoers.so $name: unstripped-binary-or-object ./usr/lib/sudo/sudoers.so
@@ -236,7 +236,7 @@ still allow people to get their work done."
%files %files
$osdirs - $osdirs -
$bindir/sudo 4755 root: $bindir/sudo 4755 root:
$bindir/sudoedit 4755 root: $bindir/sudoedit 4755 root: symlink sudo
$sbindir/visudo 0755 $sbindir/visudo 0755
$bindir/sudoreplay 0755 $bindir/sudoreplay 0755
$includedir/sudo_plugin.h 0644 $includedir/sudo_plugin.h 0644
@@ -260,12 +260,14 @@ still allow people to get their work done."
%endif %endif
%files [!aix] %files [!aix]
$mandir/man*/* 0644 $sudoedit_man 0644 symlink,ignore-others $sudoedit_man_target
$mandir/man*/* 0644
%files [aix] %files [aix]
# Some versions use catpages, some use manpages. # Some versions use catpages, some use manpages.
$mandir/cat*/* optional 0644 $sudoedit_man 0644 symlink,ignore-others $sudoedit_man_target
$mandir/man*/* optional 0644 $mandir/cat*/* 0644 optional
$mandir/man*/* 0644 optional
%post [!rpm,deb] %post [!rpm,deb]
# Don't overwrite an existing sudoers file # Don't overwrite an existing sudoers file