[oe-commits] Roy Li : proftpd: move the runing created file under /var/run

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 3ffe8dbceba9c8985f71c1a5eee5840a47354d19
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=3ffe8dbceba9c8985f71c1a5eee5840a47354d19

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Feb 11 13:41:34 2014 +0800

proftpd: move the runing created file under /var/run

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Acked-by: Koen Kooi <koen at dominion.thruhere.net>
Signed-off-by: Joe MacDonald <joe at deserted.net>

---

 .../proftpd/files/move-runfile-to-var-run.patch    | 39 ++++++++++++++++++++++
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |  1 +
 2 files changed, 40 insertions(+)

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 0000000..1561ed8
--- /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 <rongqing.li at windriver.com>
+---
+ 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 eb502d6..cfbadfb 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"