helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

pure-ftpd: upgrade 1.0.47 -> 1.0.49

Browse Source 
1) Upgrade pure-ftpd from 1.0.47 to 1.0.49.

2) Update LIC_FILES_CHKSUM as date has been changed.

3) Update 0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch for 1.0.49.

4) Delete "--with-minimal" to fix error as follows:

/usr/src/debug/pure-ftpd/1.0.49-r0/build/src/../../pure-ftpd-1.0.49/src/ls.c:1080: undefined reference to `modernformat'

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zheng Ruoqin 2019-10-29 16:55:38 +08:00 committed by Khem Raj
parent 796fd089f2
commit f2a05125b7
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
View File

@ -8,30 +8,39 @@ Upstream-Status: Inappropriate [config]
Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Update for 1.0.49.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
configure.ac | 12 ------------
1 file changed, 12 deletions(-)
configure.ac | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3a4209b..695ce68 100644
index 079e6f0..9a1ec06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,18 +91,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
@@ -96,21 +96,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
-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"
-if test "x$cross_compiling" != "xyes"; then
- for path in \
- /usr/kerberos \
- /usr/local /opt /usr/local/opt \
- /usr/openssl@1.1 /opt/openssl@1.1 /usr/local/opt/openssl@1.1 \
- /usr/openssl /opt/openssl /usr/local/opt/openssl; do
- if test -d $path/include; then
- CPPFLAGS="$CPPFLAGS -I${path}/include"
- fi
- if test -d $path/lib; then
- LDFLAGS="$LDFLAGS -L${path}/lib"
- fi
- done
-fi
-
CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
dnl Checks for header files
--
2.7.4

7
meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb → meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb
View File

@ -3,7 +3,7 @@ DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and
HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd"
SECTION = "net"
LICENSE = "BSD-0-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=0595b4261a04bc2d27f30b9c90796c1f"
LIC_FILES_CHKSUM = "file://COPYING;md5=e25e28bc568d70eb26c3a91387c86ccb"
DEPENDS = "libcap virtual/crypt"
@ -11,11 +11,10 @@ SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.t
file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \
file://nostrip.patch \
"
SRC_URI[md5sum] = "f000e519918682ee6b65090352177d4a"
SRC_URI[sha256sum] = "4740c316f5df879a2d68464489fb9b8b90113fe7dce58e2cdd2054a4768f27ad"
SRC_URI[md5sum] = "451879495ba61c1d7dcfca8dd231119f"
SRC_URI[sha256sum] = "767bf458c70b24f80c0bb7a1bbc89823399e75a0a7da141d30051a2b8cc892a5"
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"