From 8a50039955ae8feb8cfa2b56969a9b8039d3f248 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 2 Aug 2022 21:41:09 +0800 Subject: pure-ftpd: upgrade 1.0.50 -> 1.0.51 0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch updated for new version. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...ardcoded-usr-local-includes-from-configure.a.patch | 15 +++++++++------ .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb | 19 ------------------- .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb 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 2606a36675..c213943d53 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 @@ -11,15 +11,17 @@ Signed-off-by: Tudor Florea Update for 1.0.49. Signed-off-by: Zheng Ruoqin +Update for 1.0.51. +Signed-off-by: Wang Mingyu --- - configure.ac | 15 --------------- - 1 file changed, 15 deletions(-) + configure.ac | 16 ---------------- + 1 file changed, 16 deletions(-) diff --git a/configure.ac b/configure.ac -index 079e6f0..9a1ec06 100644 +index 62768c8..efaeee5 100644 --- a/configure.ac +++ b/configure.ac -@@ -96,21 +96,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) +@@ -97,22 +97,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"]) @@ -27,7 +29,8 @@ index 079e6f0..9a1ec06 100644 - 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 \ +- /opt/homebrew/opt/openssl@3 /usr/local/opt/openssl@3 \ +- /opt/homebrew/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" @@ -42,5 +45,5 @@ index 079e6f0..9a1ec06 100644 dnl Checks for header files -- -2.7.4 +2.25.1 diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb deleted file mode 100644 index edc2af3a34..0000000000 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb +++ /dev/null @@ -1,19 +0,0 @@ -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 = "0BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=a4496a14dea009df36c612707d455d02" - -DEPENDS = "libcap virtual/crypt" - -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[sha256sum] = "abe2f94eb40b330d4dc22b159991f44e5e515212f8e887049dccdef266d0ea23" - -inherit autotools - -PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ - ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb new file mode 100644 index 0000000000..6f03f73db5 --- /dev/null +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb @@ -0,0 +1,19 @@ +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 = "0BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=194bc994ad6bbd4ff5a021082fe52156" + +DEPENDS = "libcap virtual/crypt" + +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[sha256sum] = "4160f66b76615eea2397eac4ea3f0a146b7928207b79bc4cc2f99ad7b7bd9513" + +inherit autotools + +PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ + ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" -- cgit v1.2.3-54-g00ecf