mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

pure-ftpd: update to 1.0.47

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