From 3ffe8dbceba9c8985f71c1a5eee5840a47354d19 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Tue, 11 Feb 2014 13:41:34 +0800 Subject: proftpd: move the runing created file under /var/run Signed-off-by: Roy Li Acked-by: Koen Kooi Signed-off-by: Joe MacDonald --- .../proftpd/files/move-runfile-to-var-run.patch | 39 ++++++++++++++++++++++ .../recipes-daemons/proftpd/proftpd_1.3.4b.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-networking/recipes-daemons/proftpd/files/move-runfile-to-var-run.patch (limited to 'meta-networking') diff --git a/meta-networking/recipes-daemons/proftpd/files/move-runfile-to-var-run.patch b/meta-networking/recipes-daemons/proftpd/files/move-runfile-to-var-run.patch new file mode 100644 index 0000000000..1561ed80e3 --- /dev/null +++ b/meta-networking/recipes-daemons/proftpd/files/move-runfile-to-var-run.patch @@ -0,0 +1,39 @@ +redefine PR_RUN_DIR as ${localstatedir}/run + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Roy Li +--- + configure | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index ebed38e..445d5bc 100755 +--- a/configure ++++ b/configure +@@ -33579,7 +33579,7 @@ _ACEOF + + + cat >>confdefs.h <<_ACEOF +-#define PR_RUN_DIR "`eval echo "${localstatedir}"`" ++#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`" + _ACEOF + + cat >>confdefs.h <<_ACEOF +diff --git a/configure.in b/configure.in +index c17929c..df9186a 100644 +--- a/configure.in ++++ b/configure.in +@@ -2788,7 +2788,7 @@ locale_dir="`eval echo ${localedir}`" + locale_dir="`eval echo ${locale_dir}`" + AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`") + +-AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`") ++AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/run"`") + AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") + AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`") + +-- +1.7.10.4 + diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb index eb502d6d90..cfbadfb089 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb @@ -14,6 +14,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ file://default \ file://move-pidfile-to-var-run.patch \ file://close-RequireValidShell-check.patch \ + file://move-runfile-to-var-run.patch \ " SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2" -- cgit 1.2.3-korg