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

Move init.d and sudo.pp to the etc dir.

Browse Source
This commit is contained in:
Todd C. Miller
2019-12-23 14:29:27 -07:00
parent 4690d3ecf6
commit c6f8f4b545
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MANIFEST
View File

@@ -57,6 +57,10 @@ doc/sudoreplay.man.in
doc/sudoreplay.mdoc.in doc/sudoreplay.mdoc.in
doc/visudo.man.in doc/visudo.man.in
doc/visudo.mdoc.in doc/visudo.mdoc.in
etc/init.d/aix.sh.in
etc/init.d/hpux.sh.in
etc/init.d/sudo.conf.in
etc/sudo.pp
examples/Makefile.in examples/Makefile.in
examples/pam.conf examples/pam.conf
examples/sudo.conf examples/sudo.conf
@@ -89,9 +93,6 @@ include/sudo_plugin.h
include/sudo_queue.h include/sudo_queue.h
include/sudo_rand.h include/sudo_rand.h
include/sudo_util.h include/sudo_util.h
init.d/aix.sh.in
init.d/hpux.sh.in
init.d/sudo.conf.in
install-sh install-sh
lib/iolog/Makefile.in lib/iolog/Makefile.in
lib/iolog/iolog_fileio.c lib/iolog/iolog_fileio.c
@@ -871,4 +872,3 @@ src/tcsetpgrp_nobg.c
src/tgetpass.c src/tgetpass.c
src/ttyname.c src/ttyname.c
src/utmp.c src/utmp.c
sudo.pp

8
Makefile.in
View File

@@ -360,12 +360,12 @@ force-dist: ChangeLog $(srcdir)/MANIFEST
gzip -9f ../$(PACKAGE_TARNAME)-$(VERSION).tar && \ gzip -9f ../$(PACKAGE_TARNAME)-$(VERSION).tar && \
ls -l ../$(PACKAGE_TARNAME)-$(VERSION).tar.gz ls -l ../$(PACKAGE_TARNAME)-$(VERSION).tar.gz
package: $(srcdir)/sudo.pp package: $(srcdir)/etc/sudo.pp
DESTDIR=`cd $(top_builddir) && pwd`/destdir; rm -rf $$DESTDIR; \ DESTDIR=`cd $(top_builddir) && pwd`/destdir; rm -rf $$DESTDIR; \
$(MAKE) install INSTALL_OWNER= DESTDIR=$$DESTDIR && \ $(MAKE) install INSTALL_OWNER= DESTDIR=$$DESTDIR && \
$(SHELL) $(srcdir)/pp $(PPFLAGS) \ $(SHELL) $(srcdir)/pp $(PPFLAGS) \
--destdir=$$DESTDIR \ --destdir=$$DESTDIR \
$(srcdir)/sudo.pp \ $(srcdir)/etc/sudo.pp \
prefix=$(prefix) \ prefix=$(prefix) \
bindir=$(bindir) \ bindir=$(bindir) \
sbindir=$(sbindir) \ sbindir=$(sbindir) \
@@ -398,8 +398,8 @@ distclean: config.status
(cd $$d && exec $(MAKE) $@); \ (cd $$d && exec $(MAKE) $@); \
done done
-rm -rf autom4te.cache ChangeLog config.cache config.h config.log \ -rm -rf autom4te.cache ChangeLog config.cache config.h config.log \
config.status init.d/*.sh init.d/sudo.conf libtool Makefile \ config.status etc/init.d/*.sh etc/init.d/sudo.conf libtool \
pathnames.h stamp-* Makefile pathnames.h stamp-*
cleandir: distclean cleandir: distclean

8
configure vendored
View File

@@ -27621,10 +27621,10 @@ test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'
test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
if test X"$INIT_SCRIPT" != X""; then if test X"$INIT_SCRIPT" != X""; then
ac_config_files="$ac_config_files init.d/$INIT_SCRIPT" ac_config_files="$ac_config_files etc/init.d/$INIT_SCRIPT"
elif test X"$TMPFILES_D" != X""; then elif test X"$TMPFILES_D" != X""; then
ac_config_files="$ac_config_files init.d/sudo.conf" ac_config_files="$ac_config_files etc/init.d/sudo.conf"
fi fi
@@ -28622,8 +28622,8 @@ do
"$PYTHON_PLUGIN_SRC/Makefile") CONFIG_FILES="$CONFIG_FILES $PYTHON_PLUGIN_SRC/Makefile" ;; "$PYTHON_PLUGIN_SRC/Makefile") CONFIG_FILES="$CONFIG_FILES $PYTHON_PLUGIN_SRC/Makefile" ;;
"lib/zlib/zconf.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/zlib/zconf.h" ;; "lib/zlib/zconf.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/zlib/zconf.h" ;;
"lib/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/zlib/Makefile" ;; "lib/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/zlib/Makefile" ;;
"init.d/$INIT_SCRIPT") CONFIG_FILES="$CONFIG_FILES init.d/$INIT_SCRIPT" ;; "etc/init.d/$INIT_SCRIPT") CONFIG_FILES="$CONFIG_FILES etc/init.d/$INIT_SCRIPT" ;;
"init.d/sudo.conf") CONFIG_FILES="$CONFIG_FILES init.d/sudo.conf" ;; "etc/init.d/sudo.conf") CONFIG_FILES="$CONFIG_FILES etc/init.d/sudo.conf" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;

4
configure.ac
View File

@@ -4566,9 +4566,9 @@ dnl
dnl Substitute into the Makefile and man pages dnl Substitute into the Makefile and man pages
dnl dnl
if test X"$INIT_SCRIPT" != X""; then if test X"$INIT_SCRIPT" != X""; then
AC_CONFIG_FILES([init.d/$INIT_SCRIPT]) AC_CONFIG_FILES([etc/init.d/$INIT_SCRIPT])
elif test X"$TMPFILES_D" != X""; then elif test X"$TMPFILES_D" != X""; then
AC_CONFIG_FILES([init.d/sudo.conf]) AC_CONFIG_FILES([etc/init.d/sudo.conf])
fi fi
AC_CONFIG_FILES([Makefile doc/Makefile examples/Makefile include/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers]) AC_CONFIG_FILES([Makefile doc/Makefile examples/Makefile include/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers])

0
init.d/aix.sh.in → etc/init.d/aix.sh.in
View File

0
init.d/hpux.sh.in → etc/init.d/hpux.sh.in
View File

0
init.d/sudo.conf.in → etc/init.d/sudo.conf.in
View File

0
sudo.pp → etc/sudo.pp
View File

4
src/Makefile.in
View File

@@ -208,13 +208,13 @@ install-dirs:
install-rc: install-dirs install-rc: install-dirs
# We only create the rc.d link when installing to the actual system dir # We only create the rc.d link when installing to the actual system dir
if [ -n "$(INIT_SCRIPT)" ]; then \ if [ -n "$(INIT_SCRIPT)" ]; then \
$(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_builddir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_builddir)/etc/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \
if test -z "$(DESTDIR)"; then \ if test -z "$(DESTDIR)"; then \
rm -f $(RC_LINK); \ rm -f $(RC_LINK); \
ln -s $(INIT_DIR)/sudo $(RC_LINK); \ ln -s $(INIT_DIR)/sudo $(RC_LINK); \
fi; \ fi; \
elif test -n "$(tmpfiles_d)"; then \ elif test -n "$(tmpfiles_d)"; then \
$(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_builddir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \ $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_builddir)/etc/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \
fi fi
install-binaries: install-dirs $(PROGS) install-binaries: install-dirs $(PROGS)