diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-11-27 11:25:52 +0000 | 
|---|---|---|
| committer | Joe MacDonald <joe.macdonald@windriver.com> | 2012-11-27 14:43:59 -0500 | 
| commit | 3d851fe4cec6f3c166c9fb76e767265dbeab5b69 (patch) | |
| tree | 5854ed85ec3f992d2a96df1f066344c77dc06e55 /meta-networking/recipes-daemons/proftpd/files/contrib.patch | |
| parent | 3761a24e1c25fd388f70aec4f1f7b81d89e3caad (diff) | |
| download | meta-openembedded-3d851fe4cec6f3c166c9fb76e767265dbeab5b69.tar.gz | |
proftpd: add from meta-baryon
This was originally from OE-Classic. Improvements over the OE-Classic
recipe for reference:
* Update to 1.3.4b
* Add workaround for proftpd host IP resolution
* Add initscript, borrowed from Debian with some modifications for
  compatibility and handling for hardcoded paths
* Use autotools.bbclass and remove unnecessary configure options
* PARALLEL_MAKE = "" is no longer needed, the bug was fixed in 1.3.3c
* Set SUMMARY (which sets DESCRIPTION) and base it on the short
  description from the website
* Use useradd.bbclass to add ftp user/group
* Add HOMEPAGE
* Add/fix description in some patches and improve recipe indentation
* Make LICENSE more accurate
* Add LIC_FILES_CHKSUM
Some of this work was done by Dexuan Cui <dexuan.cui@intel.com> and
Kevin Strasser <kevin.strasser@linux.intel.com>.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-networking/recipes-daemons/proftpd/files/contrib.patch')
| -rw-r--r-- | meta-networking/recipes-daemons/proftpd/files/contrib.patch | 42 | 
1 files changed, 42 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-networking/recipes-daemons/proftpd/files/contrib.patch new file mode 100644 index 0000000000..7e2a8e3ce0 --- /dev/null +++ b/meta-networking/recipes-daemons/proftpd/files/contrib.patch  | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | The contrib directory now contains its own Makefile which is | ||
| 2 | used during installation. It was required to pass DESTDIR through | ||
| 3 | when it gets called from the base Makefile. | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> | ||
| 8 | --- | ||
| 9 | Makefile.in | 2 +- | ||
| 10 | contrib/Makefile.in | 6 +++--- | ||
| 11 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/Makefile.in b/Makefile.in | ||
| 14 | index 5b2e683..ee72fe1 100644 | ||
| 15 | --- a/Makefile.in | ||
| 16 | +++ b/Makefile.in | ||
| 17 | @@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) | ||
| 18 | test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install) | ||
| 19 | |||
| 20 | install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) | ||
| 21 | - cd contrib/ && $(MAKE) install-utils | ||
| 22 | + cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils | ||
| 23 | $(INSTALL_BIN) ftpcount $(DESTDIR)$(bindir)/ftpcount | ||
| 24 | $(INSTALL_BIN) ftpdctl $(DESTDIR)$(bindir)/ftpdctl | ||
| 25 | $(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub | ||
| 26 | diff --git a/contrib/Makefile.in b/contrib/Makefile.in | ||
| 27 | index 5bcc038..51d248c 100644 | ||
| 28 | --- a/contrib/Makefile.in | ||
| 29 | +++ b/contrib/Makefile.in | ||
| 30 | @@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status | ||
| 31 | cd ../ && ./config.status | ||
| 32 | |||
| 33 | install-utils: | ||
| 34 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd | ||
| 35 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail | ||
| 36 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota | ||
| 37 | + $(INSTALL) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd | ||
| 38 | + $(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail | ||
| 39 | + $(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota | ||
| 40 | -- | ||
| 41 | 1.7.9.5 | ||
| 42 | |||
