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

Install /usr/lib/tmpfiles.d/sudo.conf on systems with systemd but

Browse Source 
do not package it.  For packages we create /usr/lib/tmpfiles.d/sudo.conf
as needed in the postinstall script.
This commit is contained in:
Todd C. Miller
2015-04-06 15:08:37 -06:00
parent cd669526e5
commit f63896e7d8
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile.in
View File

@@ -24,6 +24,7 @@ devdir = @devdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
incdir = $(top_srcdir)/include incdir = $(top_srcdir)/include
rundir = @rundir@
cross_compiling = @CROSS_COMPILING@ cross_compiling = @CROSS_COMPILING@
# Compiler & tools to use # Compiler & tools to use
@@ -146,6 +147,9 @@ install: install-binaries install-rc @INSTALL_NOEXEC@
install-dirs: install-dirs:
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \
$(DESTDIR)$(libexecdir)/sudo $(DESTDIR)$(noexecdir) $(DESTDIR)$(libexecdir)/sudo $(DESTDIR)$(noexecdir)
@if [ -r /usr/lib/tmpfiles.d/systemd.conf ]; then \
mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d; \
fi
install-rc: install-rc:
@if [ -n "$(INIT_SCRIPT)" ]; then \ @if [ -n "$(INIT_SCRIPT)" ]; then \
@@ -155,6 +159,10 @@ install-rc:
rm -f $(DESTDIR)$(RC_LINK); \ rm -f $(DESTDIR)$(RC_LINK); \
ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \ ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \
fi fi
@if [ -r /usr/lib/tmpfiles.d/systemd.conf ]; then \
echo "d $(DESTDIR)$(rundir) 0711 root root" > $(DESTDIR)/usr/lib/tmpfiles.d/sudo.conf; \
echo "D $(DESTDIR)$(rundir)/ts 0700 root root" >> $(DESTDIR)/usr/lib/tmpfiles.d/sudo.conf; \
fi
install-binaries: install-dirs $(PROGS) install-binaries: install-dirs $(PROGS)
INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 04755 sudo $(DESTDIR)$(bindir)/sudo INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 04755 sudo $(DESTDIR)$(bindir)/sudo
@@ -180,7 +188,8 @@ uninstall:
$(DESTDIR)$(bindir)/sudoedit \ $(DESTDIR)$(bindir)/sudoedit \
$(DESTDIR)$(libexecdir)/sudo/sesh \ $(DESTDIR)$(libexecdir)/sudo/sesh \
$(DESTDIR)$(libexecdir)/sudo/sesh~ \ $(DESTDIR)$(libexecdir)/sudo/sesh~ \
$(DESTDIR)$(noexecdir)/sudo_noexec.so~ $(DESTDIR)$(noexecdir)/sudo_noexec.so~ \
$(DESTDIR)/usr/lib/tmpfiles.d/sudo.conf
@if [ -n "$(INIT_SCRIPT)" ]; then \ @if [ -n "$(INIT_SCRIPT)" ]; then \
rm -f $(DESTDIR)$(RC_LINK) $(DESTDIR)$(INIT_DIR)/sudo; \ rm -f $(DESTDIR)$(RC_LINK) $(DESTDIR)$(INIT_DIR)/sudo; \
fi fi

4
sudo.pp
View File

@@ -314,6 +314,10 @@ still allow people to get their work done."
/sbin/init.d/ ignore /sbin/init.d/ ignore
/sbin/init.d/sudo 0755 root: /sbin/init.d/sudo 0755 root:
%endif %endif
%if -d ${pp_destdir}/usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/ ignore
/usr/lib/tmpfiles.d/* ignore
%endif
%files [!aix] %files [!aix]
$mandir/man*/* 0644 $mandir/man*/* 0644