Patchwork [meta-networking] proftpd: move the runing created file under /var/run

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Feb. 11, 2014, 5:41 a.m.
Message ID <1392097295-32258-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/66565/
State Accepted
Headers show

Comments

rongqing.li@windriver.com - Feb. 11, 2014, 5:41 a.m.
From: Roy Li <rongqing.li@windriver.com>

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 .../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
Koen Kooi - Feb. 11, 2014, 9:25 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

rongqing.li@windriver.com schreef op 11-02-14 06:41:
> From: Roy Li <rongqing.li@windriver.com>
> 
> Signed-off-by: Roy Li <rongqing.li@windriver.com>

Looks good to me:

Acked-by: Koen Kooi <koen@dominion.thruhere.net>

> --- .../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
>
>  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@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"
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFS+ex9MkyGM64RGpERAtFhAJ4tLBnVXI5xKc0iYoO3yshkzptqpQCgsttg
h+XRSssUW4vt2C7+O6LKyiI=
=y2I2
-----END PGP SIGNATURE-----
Joe MacDonald - Feb. 13, 2014, 3:55 a.m.
Merged, thanks.
-J.

[Re: [oe] [meta-networking][PATCH] proftpd: move the runing created file under /var/run] On 14.02.11 (Tue 10:25) Koen Kooi wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> rongqing.li@windriver.com schreef op 11-02-14 06:41:
> > From: Roy Li <rongqing.li@windriver.com>
> > 
> > Signed-off-by: Roy Li <rongqing.li@windriver.com>
> 
> Looks good to me:
> 
> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
> 
> > --- .../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
> >
> >  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@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"
> > 
> 
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
> 
> iD8DBQFS+ex9MkyGM64RGpERAtFhAJ4tLBnVXI5xKc0iYoO3yshkzptqpQCgsttg
> h+XRSssUW4vt2C7+O6LKyiI=
> =y2I2
> -----END PGP SIGNATURE-----
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

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@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"