Patchwork [meta-networking] proftpd: move pidfile from /var/ to /var/run/

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Nov. 27, 2013, 8:37 a.m.
Message ID <1385541430-19861-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/62463/
State Accepted, archived
Headers show

Comments

rongqing.li@windriver.com - Nov. 27, 2013, 8:37 a.m.
From: Roy Li <rongqing.li@windriver.com>

/var/run/ is more suitable to store pidfile for OE, and this fixes
"/etc/init.d/proftpd stop" failure too, since this script assumes
the pidfile is under /var/run

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 .../proftpd/files/move-pidfile-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-pidfile-to-var-run.patch
Joe MacDonald - Nov. 27, 2013, 8:54 p.m.
Merged, thanks.
-J.

[[oe] [PATCH meta-networking] proftpd: move pidfile from /var/ to /var/run/] On 13.11.27 (Wed 16:37) rongqing.li@windriver.com wrote:

> From: Roy Li <rongqing.li@windriver.com>
> 
> /var/run/ is more suitable to store pidfile for OE, and this fixes
> "/etc/init.d/proftpd stop" failure too, since this script assumes
> the pidfile is under /var/run
> 
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
>  .../proftpd/files/move-pidfile-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-pidfile-to-var-run.patch
> 
> diff --git a/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch b/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch
> new file mode 100644
> index 0000000..953bbdd
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch
> @@ -0,0 +1,39 @@
> +move pidfile to /var/run
> +
> +Upstream-Status: Inappropriate [configuration]
> +
> +Signed-off-by: Roy Li <rongqing.li@windriver.com>
> +---
> + configure    |    2 +-
> + configure.in |    2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/configure b/configure
> +index e6268f5..ebed38e 100755
> +--- a/configure
> ++++ b/configure
> +@@ -33587,7 +33587,7 @@ cat >>confdefs.h <<_ACEOF
> + _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 df9186a..e2ae868 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -2790,7 +2790,7 @@ AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
> + 
> + AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`")
> + AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
> +-AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`")
> ++AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`")
> + 
> + prefix="$pr_saved_prefix"
> + exec_prefix="$pr_saved_exec_prefix"
> +-- 
> +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 6571b9c..14d88cf 100644
> --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> @@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
>             file://contrib.patch \
>             file://proftpd-basic.init \
>             file://default \
> +           file://move-pidfile-to-var-run.patch \
>  "
>  
>  SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2"

Patch

diff --git a/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch b/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch
new file mode 100644
index 0000000..953bbdd
--- /dev/null
+++ b/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch
@@ -0,0 +1,39 @@ 
+move pidfile to /var/run
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index e6268f5..ebed38e 100755
+--- a/configure
++++ b/configure
+@@ -33587,7 +33587,7 @@ cat >>confdefs.h <<_ACEOF
+ _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 df9186a..e2ae868 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2790,7 +2790,7 @@ AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
+ 
+ AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`")
+ AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
+-AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`")
++AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`")
+ 
+ prefix="$pr_saved_prefix"
+ exec_prefix="$pr_saved_exec_prefix"
+-- 
+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 6571b9c..14d88cf 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -12,6 +12,7 @@  SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
            file://contrib.patch \
            file://proftpd-basic.init \
            file://default \
+           file://move-pidfile-to-var-run.patch \
 "
 
 SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2"