Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / b48b7b4109868a8c0ddda090992e936e821c7ea6 / . / import-layers / meta-openembedded / meta-networking / recipes-daemons / proftpd / files / build_fixup.patch
blob: 19617a6bb7184b931353e05cae2a22257f542cce [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame^]1Upstream-Status: Inappropriate [configuration]
2
3combined the following patches into one:
4make, move-pidfile-to-var-run, move-runfile-to-var-run
5
6move pidfile to /var/run
7redefine PR_RUN_DIR as ${localstatedir}/run
8
9Signed-off-By: Armin Kuster <akuster808@gmail.com>
10
11
12Index: proftpd-1.3.5/Make.rules.in
13===================================================================
14--- proftpd-1.3.5.orig/Make.rules.in
15+++ proftpd-1.3.5/Make.rules.in
16@@ -29,9 +29,9 @@ INSTALL=@INSTALL@
17 INSTALL_STRIP=@INSTALL_STRIP@
18 INSTALL_USER=@install_user@
19 INSTALL_GROUP=@install_group@
20-INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
21-INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
22-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
23+INSTALL_BIN=$(INSTALL) -m 0755
24+INSTALL_SBIN=$(INSTALL) -m 0755
25+INSTALL_MAN=$(INSTALL) -m 0644
26
27 RM=rm -f
28 SHELL=@CONFIG_SHELL@
29Index: proftpd-1.3.5/Makefile.in
30===================================================================
31--- proftpd-1.3.5.orig/Makefile.in
32+++ proftpd-1.3.5/Makefile.in
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:
35 @if [ ! -d $@ ]; then \
36 mkdir -p $@; \
37- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
38 chmod 0755 $@; \
39 fi
40
41@@ -115,7 +114,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
42 rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
43 fi
44 ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd
45- -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
46
47 install-libs: $(DESTDIR)$(libdir)/proftpd
48 cd lib/ && $(MAKE) install
49@@ -152,11 +150,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
50 $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut
51 $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop
52 $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho
53- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
54+ $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
55
56 install-conf: $(DESTDIR)$(sysconfdir)
57 if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
58- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \
59+ $(INSTALL) -m 0644 \
60 $(top_srcdir)/sample-configurations/basic.conf \
61 $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
62 fi
63Index: proftpd-1.3.5/configure
64===================================================================
65--- proftpd-1.3.5.orig/configure
66+++ proftpd-1.3.5/configure
67@@ -38255,7 +38255,7 @@ _ACEOF
68
69
70 cat >>confdefs.h <<_ACEOF
71-#define PR_RUN_DIR "`eval echo "${localstatedir}"`"
72+#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`"
73 _ACEOF
74
75 cat >>confdefs.h <<_ACEOF
76@@ -38263,7 +38263,7 @@ cat >>confdefs.h <<_ACEOF
77 _ACEOF
78
79 cat >>confdefs.h <<_ACEOF
80-#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`"
81+#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`"
82 _ACEOF
83
84
85Index: proftpd-1.3.5/configure.in
86===================================================================
87--- proftpd-1.3.5.orig/configure.in
88+++ proftpd-1.3.5/configure.in
89@@ -2971,8 +2971,8 @@ locale_dir="`eval echo ${locale_dir}`"
90 AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
91
92 AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`")
93-AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
94-AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`")
95+AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`")
96+AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`")
97
98 prefix="$pr_saved_prefix"
99 exec_prefix="$pr_saved_exec_prefix"
100Index: proftpd-1.3.5/lib/libcap/Makefile
101===================================================================
102--- proftpd-1.3.5.orig/lib/libcap/Makefile
103+++ proftpd-1.3.5/lib/libcap/Makefile
104@@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES))
105 all: $(LIBNAME)
106
107 _makenames: _makenames.c cap_names.sed
108- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
109+ $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@
110
111 cap_names.h: _makenames
112 ./_makenames > cap_names.h