diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 15:04:38 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:32 +0000 |
commit | b48b7b4109868a8c0ddda090992e936e821c7ea6 (patch) | |
tree | 696be8ea782f2548c0f63bb0188f4c8d3eeed681 /import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd | |
parent | d849ec78de728ef9a2d383b92ccfeabf40f8f1d0 (diff) | |
download | talos-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.tar.gz talos-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.zip |
Squashed 'import-layers/meta-openembedded/' content from commit 247b126
Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0
git-subtree-dir: import-layers/meta-openembedded
git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd')
3 files changed, 92 insertions, 0 deletions
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch new file mode 100644 index 000000000..76523fb99 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch @@ -0,0 +1,39 @@ +From 1bafadf2502334a3e972ff667061469316d0d2ca Mon Sep 17 00:00:00 2001 +From: Tudor Florea <tudor.florea@enea.com> +Date: Tue, 4 Aug 2015 02:46:39 +0200 +Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> +Signed-off-by: Tudor Florea <tudor.florea@enea.com> +--- + configure.ac | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6c78e8c..851d45d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,18 +100,6 @@ AC_ARG_VAR(PYTHON,local path to the python interpreter) + python_possible_path="/usr/bin:/usr/local/bin:/bin:/opt/python/bin:/opt/python/usr/bin:/opt/python/usr/local/bin" + AC_PATH_PROG(PYTHON,python,/usr/bin/env python,$python_possible_path) + +-if test -d /usr/local/include; then +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +-fi +- +-if test -d /usr/kerberos/include; then +- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" +-fi +- +-if test -d /usr/local/lib; then +- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-fi +- + CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + + dnl Checks for header files +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch new file mode 100644 index 000000000..4cb33bc5c --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch @@ -0,0 +1,31 @@ +From 0290bd6f4ceddff2c52dff833c9d31d24de7d0e1 Mon Sep 17 00:00:00 2001 +From: Tudor Florea <tudor.florea@enea.com> +Date: Tue, 4 Aug 2015 03:07:01 +0200 +Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is specified + +We especially don't want stripping enabled. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +Signed-off-by: Tudor Florea <tudor.florea@enea.com> +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 851d45d..dc410a1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -423,8 +423,6 @@ AC_ARG_WITH(minimal, + AC_DEFINE(NO_FTP_USERS) + AC_DEFINE(WITHOUT_ASCII) + AC_DEFINE(BORING_MODE) +- CFLAGS="$CFLAGS -Os -fomit-frame-pointer -fno-unroll-loops " +- LDFLAGS="$LDFLAGS -s " + fi ]) + + AC_ARG_WITH(paranoidmsg, +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb new file mode 100644 index 000000000..c1f150405 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb @@ -0,0 +1,22 @@ +SUMMARY = "FTP Server with a strong focus on software security" +DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and standard-conformant FTP server." +HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" +SECTION = "net" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=90352fb2bfe17f4261687a0d6e09f489" + +DEPENDS = "libcap" + + +SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ + file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ + file://nostrip.patch \ +" +SRC_URI[md5sum] = "4195af8f0e5ee2a798b1014071dae3a3" +SRC_URI[sha256sum] = "7be73a8e58b190a7054d2ae00c5e650cb9e091980420082d02ec3c3b68d8e7f9" + +inherit autotools + +EXTRA_OECONF = "--with-minimal" +PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ + ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" |