| Upstream-Status: Inappropriate [configuration] |
| |
| combined the following patches into one: |
| make, move-pidfile-to-var-run, move-runfile-to-var-run |
| |
| move pidfile to /var/run |
| redefine PR_RUN_DIR as ${localstatedir}/run |
| |
| Signed-off-by: Armin Kuster <akuster808@gmail.com> |
| |
| |
| diff --git a/Make.rules.in b/Make.rules.in |
| index a5028ac..ccd7807 100644 |
| --- a/Make.rules.in |
| +++ b/Make.rules.in |
| @@ -30,9 +30,9 @@ INSTALL=@INSTALL@ |
| INSTALL_STRIP=@INSTALL_STRIP@ |
| INSTALL_USER=@install_user@ |
| INSTALL_GROUP=@install_group@ |
| -INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 |
| -INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 |
| -INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 |
| +INSTALL_BIN=$(INSTALL) -m 0755 |
| +INSTALL_SBIN=$(INSTALL) -m 0755 |
| +INSTALL_MAN=$(INSTALL) -m 0644 |
| |
| RM=rm -f |
| SHELL=@CONFIG_SHELL@ |
| diff --git a/Makefile.in b/Makefile.in |
| index 9434cbd..13f2e16 100644 |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -123,7 +123,6 @@ check: proftpd$(EXEEXT) |
| $(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: |
| @if [ ! -d $@ ]; then \ |
| mkdir -p $@; \ |
| - chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ |
| chmod 0755 $@; \ |
| fi |
| |
| @@ -133,7 +132,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate |
| rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ |
| fi |
| ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd |
| - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd |
| |
| install-libs: $(DESTDIR)$(libdir)/proftpd |
| cd lib/ && $(MAKE) install |
| @@ -170,11 +168,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) |
| $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut |
| $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop |
| $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho |
| - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs |
| + $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs |
| |
| install-conf: $(DESTDIR)$(sysconfdir) |
| if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ |
| - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \ |
| + $(INSTALL) -m 0644 \ |
| $(top_srcdir)/sample-configurations/basic.conf \ |
| $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ |
| fi |
| diff --git a/configure b/configure |
| index 0a51670..69fa130 100755 |
| --- a/configure |
| +++ b/configure |
| @@ -25116,7 +25116,7 @@ _ACEOF |
| |
| |
| cat >>confdefs.h <<_ACEOF |
| -#define PR_RUN_DIR "`eval echo "${localstatedir}"`" |
| +#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`" |
| _ACEOF |
| |
| |
| @@ -25126,7 +25126,7 @@ _ACEOF |
| |
| |
| cat >>confdefs.h <<_ACEOF |
| -#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`" |
| +#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`" |
| _ACEOF |
| |
| |
| diff --git a/configure.in b/configure.in |
| index 50561de..93cad3f 100644 |
| --- a/configure.in |
| +++ b/configure.in |
| @@ -4059,8 +4059,8 @@ locale_dir="`eval echo ${locale_dir}`" |
| AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) |
| |
| AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) |
| -AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path]) |
| -AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path]) |
| +AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`", [Define the configuration file path]) |
| +AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`", [Define the PID file path]) |
| |
| prefix="$pr_saved_prefix" |
| exec_prefix="$pr_saved_exec_prefix" |