diff options
Diffstat (limited to 'meta-networking/recipes-daemons/proftpd/files/build_fixup.patch')
-rw-r--r-- | meta-networking/recipes-daemons/proftpd/files/build_fixup.patch | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index 19617a6bb..9816d4d22 100644 --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch | |||
@@ -9,11 +9,11 @@ redefine PR_RUN_DIR as ${localstatedir}/run | |||
9 | Signed-off-By: Armin Kuster <akuster808@gmail.com> | 9 | Signed-off-By: Armin Kuster <akuster808@gmail.com> |
10 | 10 | ||
11 | 11 | ||
12 | Index: proftpd-1.3.5/Make.rules.in | 12 | Index: proftpd-1.3.6/Make.rules.in |
13 | =================================================================== | 13 | =================================================================== |
14 | --- proftpd-1.3.5.orig/Make.rules.in | 14 | --- proftpd-1.3.6.orig/Make.rules.in |
15 | +++ proftpd-1.3.5/Make.rules.in | 15 | +++ proftpd-1.3.6/Make.rules.in |
16 | @@ -29,9 +29,9 @@ INSTALL=@INSTALL@ | 16 | @@ -30,9 +30,9 @@ INSTALL=@INSTALL@ |
17 | INSTALL_STRIP=@INSTALL_STRIP@ | 17 | INSTALL_STRIP=@INSTALL_STRIP@ |
18 | INSTALL_USER=@install_user@ | 18 | INSTALL_USER=@install_user@ |
19 | INSTALL_GROUP=@install_group@ | 19 | INSTALL_GROUP=@install_group@ |
@@ -26,10 +26,10 @@ Index: proftpd-1.3.5/Make.rules.in | |||
26 | 26 | ||
27 | RM=rm -f | 27 | RM=rm -f |
28 | SHELL=@CONFIG_SHELL@ | 28 | SHELL=@CONFIG_SHELL@ |
29 | Index: proftpd-1.3.5/Makefile.in | 29 | Index: proftpd-1.3.6/Makefile.in |
30 | =================================================================== | 30 | =================================================================== |
31 | --- proftpd-1.3.5.orig/Makefile.in | 31 | --- proftpd-1.3.6.orig/Makefile.in |
32 | +++ proftpd-1.3.5/Makefile.in | 32 | +++ proftpd-1.3.6/Makefile.in |
33 | @@ -105,7 +105,6 @@ check: proftpd$(EXEEXT) | 33 | @@ -105,7 +105,6 @@ check: proftpd$(EXEEXT) |
34 | $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: | 34 | $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: |
35 | @if [ ! -d $@ ]; then \ | 35 | @if [ ! -d $@ ]; then \ |
@@ -60,11 +60,11 @@ Index: proftpd-1.3.5/Makefile.in | |||
60 | $(top_srcdir)/sample-configurations/basic.conf \ | 60 | $(top_srcdir)/sample-configurations/basic.conf \ |
61 | $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ | 61 | $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ |
62 | fi | 62 | fi |
63 | Index: proftpd-1.3.5/configure | 63 | Index: proftpd-1.3.6/configure |
64 | =================================================================== | 64 | =================================================================== |
65 | --- proftpd-1.3.5.orig/configure | 65 | --- proftpd-1.3.6.orig/configure |
66 | +++ proftpd-1.3.5/configure | 66 | +++ proftpd-1.3.6/configure |
67 | @@ -38255,7 +38255,7 @@ _ACEOF | 67 | @@ -41777,7 +41777,7 @@ _ACEOF |
68 | 68 | ||
69 | 69 | ||
70 | cat >>confdefs.h <<_ACEOF | 70 | cat >>confdefs.h <<_ACEOF |
@@ -72,9 +72,9 @@ Index: proftpd-1.3.5/configure | |||
72 | +#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`" | 72 | +#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`" |
73 | _ACEOF | 73 | _ACEOF |
74 | 74 | ||
75 | cat >>confdefs.h <<_ACEOF | 75 | |
76 | @@ -38263,7 +38263,7 @@ cat >>confdefs.h <<_ACEOF | 76 | @@ -41787,7 +41787,7 @@ _ACEOF |
77 | _ACEOF | 77 | |
78 | 78 | ||
79 | cat >>confdefs.h <<_ACEOF | 79 | cat >>confdefs.h <<_ACEOF |
80 | -#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`" | 80 | -#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`" |
@@ -82,25 +82,25 @@ Index: proftpd-1.3.5/configure | |||
82 | _ACEOF | 82 | _ACEOF |
83 | 83 | ||
84 | 84 | ||
85 | Index: proftpd-1.3.5/configure.in | 85 | Index: proftpd-1.3.6/configure.in |
86 | =================================================================== | 86 | =================================================================== |
87 | --- proftpd-1.3.5.orig/configure.in | 87 | --- proftpd-1.3.6.orig/configure.in |
88 | +++ proftpd-1.3.5/configure.in | 88 | +++ proftpd-1.3.6/configure.in |
89 | @@ -2971,8 +2971,8 @@ locale_dir="`eval echo ${locale_dir}`" | 89 | @@ -3833,8 +3833,8 @@ locale_dir="`eval echo ${locale_dir}`" |
90 | AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`") | 90 | AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) |
91 | 91 | ||
92 | AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`") | 92 | AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) |
93 | -AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") | 93 | -AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path]) |
94 | -AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") | 94 | -AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path]) |
95 | +AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`") | 95 | +AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`", [Define the configuration file path]) |
96 | +AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`") | 96 | +AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`", [Define the PID file path]) |
97 | 97 | ||
98 | prefix="$pr_saved_prefix" | 98 | prefix="$pr_saved_prefix" |
99 | exec_prefix="$pr_saved_exec_prefix" | 99 | exec_prefix="$pr_saved_exec_prefix" |
100 | Index: proftpd-1.3.5/lib/libcap/Makefile | 100 | Index: proftpd-1.3.6/lib/libcap/Makefile |
101 | =================================================================== | 101 | =================================================================== |
102 | --- proftpd-1.3.5.orig/lib/libcap/Makefile | 102 | --- proftpd-1.3.6.orig/lib/libcap/Makefile |
103 | +++ proftpd-1.3.5/lib/libcap/Makefile | 103 | +++ proftpd-1.3.6/lib/libcap/Makefile |
104 | @@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) | 104 | @@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) |
105 | all: $(LIBNAME) | 105 | all: $(LIBNAME) |
106 | 106 | ||