From c6f8f4b545838df172cbe707ae2de6fdec6b9eab Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 23 Dec 2019 14:29:27 -0700 Subject: [PATCH] Move init.d and sudo.pp to the etc dir. --- MANIFEST | 8 ++++---- Makefile.in | 8 ++++---- configure | 8 ++++---- configure.ac | 4 ++-- {init.d => etc/init.d}/aix.sh.in | 0 {init.d => etc/init.d}/hpux.sh.in | 0 {init.d => etc/init.d}/sudo.conf.in | 0 sudo.pp => etc/sudo.pp | 0 src/Makefile.in | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) rename {init.d => etc/init.d}/aix.sh.in (100%) rename {init.d => etc/init.d}/hpux.sh.in (100%) rename {init.d => etc/init.d}/sudo.conf.in (100%) rename sudo.pp => etc/sudo.pp (100%) diff --git a/MANIFEST b/MANIFEST index 688c6f212..b1f916c28 100644 --- a/MANIFEST +++ b/MANIFEST @@ -57,6 +57,10 @@ doc/sudoreplay.man.in doc/sudoreplay.mdoc.in doc/visudo.man.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/pam.conf examples/sudo.conf @@ -89,9 +93,6 @@ include/sudo_plugin.h include/sudo_queue.h include/sudo_rand.h include/sudo_util.h -init.d/aix.sh.in -init.d/hpux.sh.in -init.d/sudo.conf.in install-sh lib/iolog/Makefile.in lib/iolog/iolog_fileio.c @@ -871,4 +872,3 @@ src/tcsetpgrp_nobg.c src/tgetpass.c src/ttyname.c src/utmp.c -sudo.pp diff --git a/Makefile.in b/Makefile.in index 746d3fd45..30a3f1bb4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -360,12 +360,12 @@ force-dist: ChangeLog $(srcdir)/MANIFEST gzip -9f ../$(PACKAGE_TARNAME)-$(VERSION).tar && \ 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; \ $(MAKE) install INSTALL_OWNER= DESTDIR=$$DESTDIR && \ $(SHELL) $(srcdir)/pp $(PPFLAGS) \ --destdir=$$DESTDIR \ - $(srcdir)/sudo.pp \ + $(srcdir)/etc/sudo.pp \ prefix=$(prefix) \ bindir=$(bindir) \ sbindir=$(sbindir) \ @@ -398,8 +398,8 @@ distclean: config.status (cd $$d && exec $(MAKE) $@); \ done -rm -rf autom4te.cache ChangeLog config.cache config.h config.log \ - config.status init.d/*.sh init.d/sudo.conf libtool Makefile \ - pathnames.h stamp-* + config.status etc/init.d/*.sh etc/init.d/sudo.conf libtool \ + Makefile pathnames.h stamp-* cleandir: distclean diff --git a/configure b/configure index d6a8454a0..924a20d8e 100755 --- a/configure +++ b/configure @@ -27621,10 +27621,10 @@ test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var' test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' 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 - ac_config_files="$ac_config_files init.d/sudo.conf" + ac_config_files="$ac_config_files etc/init.d/sudo.conf" fi @@ -28622,8 +28622,8 @@ do "$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/Makefile") CONFIG_FILES="$CONFIG_FILES lib/zlib/Makefile" ;; - "init.d/$INIT_SCRIPT") CONFIG_FILES="$CONFIG_FILES init.d/$INIT_SCRIPT" ;; - "init.d/sudo.conf") CONFIG_FILES="$CONFIG_FILES init.d/sudo.conf" ;; + "etc/init.d/$INIT_SCRIPT") CONFIG_FILES="$CONFIG_FILES etc/init.d/$INIT_SCRIPT" ;; + "etc/init.d/sudo.conf") CONFIG_FILES="$CONFIG_FILES etc/init.d/sudo.conf" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; diff --git a/configure.ac b/configure.ac index 510de90d2..18c5fc234 100644 --- a/configure.ac +++ b/configure.ac @@ -4566,9 +4566,9 @@ dnl dnl Substitute into the Makefile and man pages dnl 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 - AC_CONFIG_FILES([init.d/sudo.conf]) + AC_CONFIG_FILES([etc/init.d/sudo.conf]) 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]) diff --git a/init.d/aix.sh.in b/etc/init.d/aix.sh.in similarity index 100% rename from init.d/aix.sh.in rename to etc/init.d/aix.sh.in diff --git a/init.d/hpux.sh.in b/etc/init.d/hpux.sh.in similarity index 100% rename from init.d/hpux.sh.in rename to etc/init.d/hpux.sh.in diff --git a/init.d/sudo.conf.in b/etc/init.d/sudo.conf.in similarity index 100% rename from init.d/sudo.conf.in rename to etc/init.d/sudo.conf.in diff --git a/sudo.pp b/etc/sudo.pp similarity index 100% rename from sudo.pp rename to etc/sudo.pp diff --git a/src/Makefile.in b/src/Makefile.in index 6c1bb549e..4be7075a7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -208,13 +208,13 @@ install-dirs: install-rc: install-dirs # We only create the rc.d link when installing to the actual system dir 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 \ rm -f $(RC_LINK); \ ln -s $(INIT_DIR)/sudo $(RC_LINK); \ fi; \ 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 install-binaries: install-dirs $(PROGS)