Commit Graph

29 Commits

Author SHA1 Message Date
Khem Raj
de124b8dba proftpd: Update to 1.3.6 release
Use the new gnu-config files for musl support

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2017-06-28 10:27:42 -04:00
Peter Kjellerstedt
0c31f55bcf Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-07 13:30:26 +01:00
Mingli Yu
e4365a234e proftpd: remove the script ftpmail
* Remove the ftpmail script to avoid confusion
  about it fails to run because it lacks a dependency
  on Mail/Sendmail.pm which is not shipped by default.
  Also it has not been maintained for more than 10 years as
  http://search.cpan.org/~mivkovic/Mail-Sendmail/Sendmail.pm.

* And it's bad to add the dependency perl module
  Mail/Sendmail.pm as it's too old and also send email to
  Proftp-devel@lists.sourceforge.net to ask guidance about
  ftpmail as below:
    Q: In my environment, the ftpmail fails to run as
       it lacks the dependency on Mail/Sendmail.pm which
       is not shipped by default and also not maintained more
       than 10 years as
       http://search.cpan.org/~mivkovic/Mail-Sendmail/Sendmail.pm.
    A: Patches for updates to the ftpmail script are highly
       encouraged!  If the Mail-Sendmail package is not to
       your preference, what would you suggest/prefer using
       instead?
  We don't plan to do more improvements about the perl module
  Mail-Sendmail now since it's not something we, or other distros
  apparently need as other distribution also not include the
  ftpmail script.

* The ftpmail is initially added as a perl script to send an email
  notification when upload proftpd log as below commit in
  https://github.com/proftpd/proftpd.git:

  commit 8d602d4bf01ef0c6464c7a16dbbe570a0322dc17
  Author: castaglia <castaglia>
  Date:   Thu Mar 6 03:06:14 2008 +0000

    Added ftpmail, a Perl script which reads a TransferLog FIFO and sends
    automatic email notifications for uploads.

Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-09-12 10:43:38 -04:00
Mingli Yu
5fdc25afc6 proftpd: 1.3.5a -> 1.3.5b
* Upgrade proftpd from 1.3.5a to 1.3.5b
* Remove two backport patches

Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-08-16 21:26:15 -04:00
Mingli Yu
1ea6e9a5d2 proftpd: fix system account login failure
When pam is enabled,
  1, Customize the proftpd.conf to use pam to authenticate
  2, Add proftpd pam configuration file /etc/pam.d/proftpd

Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-08-16 21:26:11 -04:00
Joe MacDonald
da81d9ef8d proftpd: return stderr to syslog
Commit f8dd8cde90 removed the StandardError
option from the proftpd service file, re-introduce it.

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-08-05 09:34:51 -04:00
Jackie Huang
9fb484ed57 proftpd: clean the host path in prxs
prxs (PRoftpd eXtenSion tool) is a perl script,
in which the host path should be avoided.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-08-05 09:13:17 -04:00
Joe Slater
85d96d1cea proftpd: fix PACKAGECONFIG settings
When using '??=' to set a variable, '+=' will cause
the '??=' value to be discarded.  We change how PACKAGECONFIG
is defined.  We also do not make sia support a default
since it is not likely to be available.

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-08-05 09:06:50 -04:00
Joe Slater
f8dd8cde90 proftpd: start at boot time
Add information to proftpd.service so that it will
be started at boot time.

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-08-05 09:06:50 -04:00
Catalin Enache
8fe7d1e60b proftpd: fix mod_tls build issue
Backported upstream commit:
253e6ef6a4

Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-05-18 10:53:51 -04:00
Catalin Enache
6830c3bc6f proftpd: CVE-2016-3125
The mod_tls module in ProFTPD before 1.3.5b and 1.3.6 before
1.3.6rc2 does not properly handle the TLSDHParamFile directive,
which might cause a weaker than intended Diffie-Hellman (DH) key
to be used and consequently allow attackers to have unspecified
impact via unknown vectors.

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3125

Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-05-05 11:41:28 -04:00
Roy Li
420ad67ab8 proftpd: upgrade to 1.3.5a
1. 1.3.5a includes the fix for CVE-2015-3306:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-3306
2. replace the proftpd generated libtool with the native libtool
which support the sysroot

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2015-07-06 12:30:37 -04:00
Joe MacDonald
8980f0d2a2 meta-networking: standardize SECTION values
SECTION has been used inconsistently throughout the recipes in this layer.
Convert them to all use the same convention.

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2015-06-05 20:42:25 -04:00
Roy Li
de5d7d91ba proftpd: add systemd support
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2015-02-11 21:25:41 -05:00
Armin Kuster
f2833950be 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 <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2014-12-29 14:51:53 -05:00
Hongxu Jia
af971abbf0 proftpd: fix integer overflow CVE-2013-4359
Integrate a patch from proftpd upstream to fix an integer overflow bug
described in the CVE-2013-4359, which allows remote attachers to cause
a denial of service (memory consumption) attack.

Refer: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-4359

Signed-off-by: Shan Hai <shan.hai@windriver.com>

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-09-26 05:41:52 +02:00
Robert Yang
57b9899fcb proftpd: add perl to RDEPENDS_proftpd
Perl:
proftpd/usr/bin/ftpasswd:#!/usr/bin/perl
proftpd/usr/bin/ftpquota:#!/usr/bin/perl

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-09-26 05:41:51 +02:00
Robert Yang
13813da08e proftpd: inherit autotools-brokensep
It needs autotools-brokensep, otherwise do_compile error:

proftpd-1.3.4b/include/version.h:1:24: fatal error: buildstamp.h: No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2014-06-15 23:21:33 -04:00
Roy Li
3ffe8dbceb proftpd: move the runing created file under /var/run
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2014-02-12 20:09:26 -05:00
Roy Li
ac3a5d4301 proftpd: use /bin/false as the login shell and add home-dir
Use /bin/false as the login shell, just like what Ubuntu does,
otherwise there might be secure issue; add /var/lib/ftp as user
ftp home-dir.

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2013-12-09 16:17:44 -05:00
Roy Li
9b3e284c58 proftpd: move pidfile from /var/ to /var/run/
/var/run/ is more suitable to store pidfile for OE, and this fixes
"/etc/init.d/proftpd stop" failure too, since this script assumes
the pidfile is under /var/run

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2013-11-27 15:27:36 -05:00
Qiang Chen
6026617ea3 proftpd: Convert proftpd group to system scope
Proftpd is meant to be a system user, not a normal user of the
system so lets pass the correct parameters to the system.
Just add --system param when creating ftp group.

Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
2013-11-25 21:52:39 -05:00
Martin Jansa
d08092bc30 proftpd: Add PACKAGECONFIG for curses
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-17 19:14:32 +02:00
Andreas Müller
b0683dcba3 proftpd: pack missing files
WARNING: QA Issue: proftpd: Files/directories were installed but not shipped
  /home
  /home/ftp
  /home/ftp/pub

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
2013-05-15 14:08:13 -04:00
Andreas Müller
8c709eb9fd proftpd: remove postinst - directory can be setup offline in do_install
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-10 11:02:39 +02:00
Martin Jansa
a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Randy MacLeod
7448ece404 multilib: Fix PN - BPN to make fetch work.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
2013-02-04 10:52:13 -05:00
Paul Eggleton
c75fc2573b proftpd: fix do_install failure after libexecdir change
As of OE-Core commit id 406bd38b4232f9f399ef5ffe0b4fac72ed605a23
libexecdir has been changed to ${libdir}/${BPN}. As we are already
deleting ${libdir}/proftpd which is the same as ${libdir}/${BPN} in this
case, introduce a check to see if ${libexecdir} still exists before
attempting to remove it possibly a second time. This will handle if
libexecdir is set to its original value or a custom value in the distro
config.

Based on a patch by Kevin Strasser <kevin.strasser@linux.intel.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-12-05 14:13:21 -05:00
Paul Eggleton
3d851fe4ce 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>
2012-11-27 14:43:59 -05:00