From f2833950bede6982a3cd761b92083d7be9ab33bf Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 25 Dec 2014 21:44:35 -0800 Subject: proftpd: update to 1.3.5 dropped proftpd-sftp.patch as it is included in update. combined make.patch, move-pidfile-to-var-run.patch, move-runfile-to-var-run.patch into build_fixup Added several packagesconfig options (too much eggnog) Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../proftpd/files/move-runfile-to-var-run.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 meta-networking/recipes-daemons/proftpd/files/move-runfile-to-var-run.patch (limited to '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 deleted file mode 100644 index 1561ed80e3..0000000000 --- a/meta-networking/recipes-daemons/proftpd/files/move-runfile-to-var-run.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - -- cgit 1.2.3-korg