1Upstream-Status: Inappropriate [configuration] 2 3combined the following patches into one: 4make, move-pidfile-to-var-run, move-runfile-to-var-run 5 6move pidfile to /var/run 7redefine PR_RUN_DIR as ${localstatedir}/run 8 9Signed-off-by: Armin Kuster <akuster808@gmail.com> 10 11 12diff --git a/Make.rules.in b/Make.rules.in 13index a5028ac..ccd7807 100644 14--- a/Make.rules.in 15+++ b/Make.rules.in 16@@ -30,9 +30,9 @@ INSTALL=@INSTALL@ 17 INSTALL_STRIP=@INSTALL_STRIP@ 18 INSTALL_USER=@install_user@ 19 INSTALL_GROUP=@install_group@ 20-INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 21-INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 22-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 23+INSTALL_BIN=$(INSTALL) -m 0755 24+INSTALL_SBIN=$(INSTALL) -m 0755 25+INSTALL_MAN=$(INSTALL) -m 0644 26 27 RM=rm -f 28 SHELL=@CONFIG_SHELL@ 29diff --git a/Makefile.in b/Makefile.in 30index 9434cbd..13f2e16 100644 31--- a/Makefile.in 32+++ b/Makefile.in 33@@ -123,7 +123,6 @@ check: proftpd$(EXEEXT) 34 $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: 35 @if [ ! -d $@ ]; then \ 36 mkdir -p $@; \ 37- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ 38 chmod 0755 $@; \ 39 fi 40 41@@ -133,7 +132,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate 42 rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ 43 fi 44 ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd 45- -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd 46 47 install-libs: $(DESTDIR)$(libdir)/proftpd 48 cd lib/ && $(MAKE) install 49@@ -170,11 +168,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) 50 $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut 51 $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop 52 $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho 53- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs 54+ $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs 55 56 install-conf: $(DESTDIR)$(sysconfdir) 57 if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ 58- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \ 59+ $(INSTALL) -m 0644 \ 60 $(top_srcdir)/sample-configurations/basic.conf \ 61 $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ 62 fi 63diff --git a/configure b/configure 64index 0a51670..69fa130 100755 65--- a/configure 66+++ b/configure 67@@ -25116,7 +25116,7 @@ _ACEOF 68 69 70 cat >>confdefs.h <<_ACEOF 71-#define PR_RUN_DIR "`eval echo "${localstatedir}"`" 72+#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`" 73 _ACEOF 74 75 76@@ -25126,7 +25126,7 @@ _ACEOF 77 78 79 cat >>confdefs.h <<_ACEOF 80-#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`" 81+#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`" 82 _ACEOF 83 84 85diff --git a/configure.in b/configure.in 86index 50561de..93cad3f 100644 87--- a/configure.in 88+++ b/configure.in 89@@ -4059,8 +4059,8 @@ locale_dir="`eval echo ${locale_dir}`" 90 AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) 91 92 AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) 93-AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path]) 94-AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path]) 95+AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`", [Define the configuration file path]) 96+AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`", [Define the PID file path]) 97 98 prefix="$pr_saved_prefix" 99 exec_prefix="$pr_saved_exec_prefix" 100