diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-05-14 20:26:32 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-18 12:42:47 -0700 |
commit | fcd06d5821d204454427090d7b599ab420efee48 (patch) | |
tree | f29fb3f0d4d45b53ec6376f8d428062616420011 /meta-networking/recipes-daemons | |
parent | ec1a8aa09846ff3f1f984ae094dd9144c7ad54f3 (diff) | |
download | meta-openembedded-fcd06d5821d204454427090d7b599ab420efee48.tar.gz |
pure-ftpd: update to 1.0.47
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons')
-rw-r--r-- | meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch | 14 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch | 13 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb (renamed from meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb) | 9 |
3 files changed, 16 insertions, 20 deletions
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch index 76523fb99..16a611e3c 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1bafadf2502334a3e972ff667061469316d0d2ca Mon Sep 17 00:00:00 2001 | 1 | From a45e086661a3eed29193546c525998d7525ef6d9 Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | 2 | From: Tudor Florea <tudor.florea@enea.com> |
3 | Date: Tue, 4 Aug 2015 02:46:39 +0200 | 3 | Date: Tue, 4 Aug 2015 02:46:39 +0200 |
4 | Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac | 4 | Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac |
@@ -7,17 +7,18 @@ Upstream-Status: Inappropriate [config] | |||
7 | 7 | ||
8 | Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> | 8 | Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> |
9 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | 9 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
10 | |||
10 | --- | 11 | --- |
11 | configure.ac | 12 ------------ | 12 | configure.ac | 12 ------------ |
12 | 1 file changed, 12 deletions(-) | 13 | 1 file changed, 12 deletions(-) |
13 | 14 | ||
14 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
15 | index 6c78e8c..851d45d 100644 | 16 | index 3a4209b..695ce68 100644 |
16 | --- a/configure.ac | 17 | --- a/configure.ac |
17 | +++ b/configure.ac | 18 | +++ b/configure.ac |
18 | @@ -100,18 +100,6 @@ AC_ARG_VAR(PYTHON,local path to the python interpreter) | 19 | @@ -91,18 +91,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) |
19 | python_possible_path="/usr/bin:/usr/local/bin:/bin:/opt/python/bin:/opt/python/usr/bin:/opt/python/usr/local/bin" | 20 | AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"]) |
20 | AC_PATH_PROG(PYTHON,python,/usr/bin/env python,$python_possible_path) | 21 | AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]) |
21 | 22 | ||
22 | -if test -d /usr/local/include; then | 23 | -if test -d /usr/local/include; then |
23 | - CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 24 | - CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
@@ -34,6 +35,3 @@ index 6c78e8c..851d45d 100644 | |||
34 | CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" | 35 | CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" |
35 | 36 | ||
36 | dnl Checks for header files | 37 | dnl Checks for header files |
37 | -- | ||
38 | 1.9.1 | ||
39 | |||
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch index 4cb33bc5c..32d714f6f 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 0290bd6f4ceddff2c52dff833c9d31d24de7d0e1 Mon Sep 17 00:00:00 2001 | 1 | From 79fd22c0def26eba130db98e312bb00fec32ac0a Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | 2 | From: Tudor Florea <tudor.florea@enea.com> |
3 | Date: Tue, 4 Aug 2015 03:07:01 +0200 | 3 | Date: Tue, 4 Aug 2015 03:07:01 +0200 |
4 | Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is specified | 4 | Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is |
5 | specified | ||
5 | 6 | ||
6 | We especially don't want stripping enabled. | 7 | We especially don't want stripping enabled. |
7 | 8 | ||
@@ -9,15 +10,16 @@ Upstream-Status: Inappropriate [config] | |||
9 | 10 | ||
10 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
11 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | 12 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
13 | |||
12 | --- | 14 | --- |
13 | configure.ac | 2 -- | 15 | configure.ac | 2 -- |
14 | 1 file changed, 2 deletions(-) | 16 | 1 file changed, 2 deletions(-) |
15 | 17 | ||
16 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
17 | index 851d45d..dc410a1 100644 | 19 | index 695ce68..0f28b55 100644 |
18 | --- a/configure.ac | 20 | --- a/configure.ac |
19 | +++ b/configure.ac | 21 | +++ b/configure.ac |
20 | @@ -423,8 +423,6 @@ AC_ARG_WITH(minimal, | 22 | @@ -414,8 +414,6 @@ AC_ARG_WITH(minimal, |
21 | AC_DEFINE(NO_FTP_USERS) | 23 | AC_DEFINE(NO_FTP_USERS) |
22 | AC_DEFINE(WITHOUT_ASCII) | 24 | AC_DEFINE(WITHOUT_ASCII) |
23 | AC_DEFINE(BORING_MODE) | 25 | AC_DEFINE(BORING_MODE) |
@@ -26,6 +28,3 @@ index 851d45d..dc410a1 100644 | |||
26 | fi ]) | 28 | fi ]) |
27 | 29 | ||
28 | AC_ARG_WITH(paranoidmsg, | 30 | AC_ARG_WITH(paranoidmsg, |
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb index e5c561646..43be44ea3 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb | |||
@@ -3,20 +3,19 @@ DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and | |||
3 | HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" | 3 | HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" |
4 | SECTION = "net" | 4 | SECTION = "net" |
5 | LICENSE = "BSD" | 5 | LICENSE = "BSD" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=90352fb2bfe17f4261687a0d6e09f489" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=0595b4261a04bc2d27f30b9c90796c1f" |
7 | 7 | ||
8 | DEPENDS = "libcap virtual/crypt" | 8 | DEPENDS = "libcap virtual/crypt" |
9 | 9 | ||
10 | |||
11 | SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ | 10 | SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ |
12 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ | 11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ |
13 | file://nostrip.patch \ | 12 | file://nostrip.patch \ |
14 | " | 13 | " |
15 | SRC_URI[md5sum] = "4195af8f0e5ee2a798b1014071dae3a3" | 14 | SRC_URI[md5sum] = "f000e519918682ee6b65090352177d4a" |
16 | SRC_URI[sha256sum] = "7be73a8e58b190a7054d2ae00c5e650cb9e091980420082d02ec3c3b68d8e7f9" | 15 | SRC_URI[sha256sum] = "4740c316f5df879a2d68464489fb9b8b90113fe7dce58e2cdd2054a4768f27ad" |
17 | 16 | ||
18 | inherit autotools | 17 | inherit autotools |
19 | 18 | ||
20 | EXTRA_OECONF = "--with-minimal" | 19 | EXTRA_OECONF = "--with-minimal" |
21 | PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ | 20 | PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ |
22 | ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" | 21 | ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" |