diff options
Diffstat (limited to 'meta-networking/recipes-daemons/proftpd/files/make.patch')
| -rw-r--r-- | meta-networking/recipes-daemons/proftpd/files/make.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/meta-networking/recipes-daemons/proftpd/files/make.patch b/meta-networking/recipes-daemons/proftpd/files/make.patch deleted file mode 100644 index c5ff0136da..0000000000 --- a/meta-networking/recipes-daemons/proftpd/files/make.patch +++ /dev/null | |||
| @@ -1,66 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | Index: proftpd-1.3.2/Makefile.in | ||
| 4 | =================================================================== | ||
| 5 | --- proftpd-1.3.2.orig/Makefile.in | ||
| 6 | +++ proftpd-1.3.2/Makefile.in | ||
| 7 | @@ -76,7 +76,6 @@ check: proftpd$(EXEEXT) | ||
| 8 | $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(rundir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: | ||
| 9 | @if [ ! -d $@ ]; then \ | ||
| 10 | mkdir -p $@; \ | ||
| 11 | - chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ | ||
| 12 | chmod 0755 $@; \ | ||
| 13 | fi | ||
| 14 | |||
| 15 | @@ -86,7 +85,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc | ||
| 16 | rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ | ||
| 17 | fi | ||
| 18 | ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd | ||
| 19 | - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd | ||
| 20 | |||
| 21 | install-libs: $(DESTDIR)$(libdir)/proftpd | ||
| 22 | cd lib/ && $(MAKE) install | ||
| 23 | @@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE | ||
| 24 | $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut | ||
| 25 | $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop | ||
| 26 | $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho | ||
| 27 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs | ||
| 28 | + $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs | ||
| 29 | |||
| 30 | install-conf: $(DESTDIR)$(sysconfdir) | ||
| 31 | if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ | ||
| 32 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \ | ||
| 33 | + $(INSTALL) -m 0644 \ | ||
| 34 | $(top_srcdir)/sample-configurations/basic.conf \ | ||
| 35 | $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ | ||
| 36 | fi | ||
| 37 | Index: proftpd-1.3.2/Make.rules.in | ||
| 38 | =================================================================== | ||
| 39 | --- proftpd-1.3.2.orig/Make.rules.in | ||
| 40 | +++ proftpd-1.3.2/Make.rules.in | ||
| 41 | @@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ | ||
| 42 | INSTALL=@INSTALL@ | ||
| 43 | INSTALL_USER=@install_user@ | ||
| 44 | INSTALL_GROUP=@install_group@ | ||
| 45 | -INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 | ||
| 46 | -INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 | ||
| 47 | -INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 | ||
| 48 | +INSTALL_BIN=$(INSTALL) -m 0755 | ||
| 49 | +INSTALL_SBIN=$(INSTALL) -m 0755 | ||
| 50 | +INSTALL_MAN=$(INSTALL) -m 0644 | ||
| 51 | |||
| 52 | RM=rm -f | ||
| 53 | SHELL=/bin/sh | ||
| 54 | Index: proftpd-1.3.2/lib/libcap/Makefile | ||
| 55 | =================================================================== | ||
| 56 | --- proftpd-1.3.2.orig/lib/libcap/Makefile | ||
| 57 | +++ proftpd-1.3.2/lib/libcap/Makefile | ||
| 58 | @@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) | ||
| 59 | all: $(LIBNAME) | ||
| 60 | |||
| 61 | _makenames: _makenames.c cap_names.sed | ||
| 62 | - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ | ||
| 63 | + $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@ | ||
| 64 | |||
| 65 | cap_names.h: _makenames | ||
| 66 | ./_makenames > cap_names.h | ||
