diff options
| -rw-r--r-- | meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch | 15 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb (renamed from meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb) | 4 |
2 files changed, 11 insertions, 8 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 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 <tudor.florea@enea.com> | |||
| 11 | Update for 1.0.49. | 11 | Update for 1.0.49. |
| 12 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 12 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> |
| 13 | 13 | ||
| 14 | Update for 1.0.51. | ||
| 15 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
| 14 | --- | 16 | --- |
| 15 | configure.ac | 15 --------------- | 17 | configure.ac | 16 ---------------- |
| 16 | 1 file changed, 15 deletions(-) | 18 | 1 file changed, 16 deletions(-) |
| 17 | 19 | ||
| 18 | diff --git a/configure.ac b/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
| 19 | index 079e6f0..9a1ec06 100644 | 21 | index 62768c8..efaeee5 100644 |
| 20 | --- a/configure.ac | 22 | --- a/configure.ac |
| 21 | +++ b/configure.ac | 23 | +++ b/configure.ac |
| 22 | @@ -96,21 +96,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) | 24 | @@ -97,22 +97,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) |
| 23 | AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"]) | 25 | AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"]) |
| 24 | AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]) | 26 | AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]) |
| 25 | 27 | ||
| @@ -27,7 +29,8 @@ index 079e6f0..9a1ec06 100644 | |||
| 27 | - for path in \ | 29 | - for path in \ |
| 28 | - /usr/kerberos \ | 30 | - /usr/kerberos \ |
| 29 | - /usr/local /opt /usr/local/opt \ | 31 | - /usr/local /opt /usr/local/opt \ |
| 30 | - /usr/openssl@1.1 /opt/openssl@1.1 /usr/local/opt/openssl@1.1 \ | 32 | - /opt/homebrew/opt/openssl@3 /usr/local/opt/openssl@3 \ |
| 33 | - /opt/homebrew/opt/openssl@1.1 /usr/local/opt/openssl@1.1 \ | ||
| 31 | - /usr/openssl /opt/openssl /usr/local/opt/openssl; do | 34 | - /usr/openssl /opt/openssl /usr/local/opt/openssl; do |
| 32 | - if test -d $path/include; then | 35 | - if test -d $path/include; then |
| 33 | - CPPFLAGS="$CPPFLAGS -I${path}/include" | 36 | - CPPFLAGS="$CPPFLAGS -I${path}/include" |
| @@ -42,5 +45,5 @@ index 079e6f0..9a1ec06 100644 | |||
| 42 | 45 | ||
| 43 | dnl Checks for header files | 46 | dnl Checks for header files |
| 44 | -- | 47 | -- |
| 45 | 2.7.4 | 48 | 2.25.1 |
| 46 | 49 | ||
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.51.bb index edc2af3a34..6f03f73db5 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb | |||
| @@ -3,7 +3,7 @@ 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 = "0BSD" | 5 | LICENSE = "0BSD" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=a4496a14dea009df36c612707d455d02" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=194bc994ad6bbd4ff5a021082fe52156" |
| 7 | 7 | ||
| 8 | DEPENDS = "libcap virtual/crypt" | 8 | DEPENDS = "libcap virtual/crypt" |
| 9 | 9 | ||
| @@ -11,7 +11,7 @@ SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.t | |||
| 11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ | 11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ |
| 12 | file://nostrip.patch \ | 12 | file://nostrip.patch \ |
| 13 | " | 13 | " |
| 14 | SRC_URI[sha256sum] = "abe2f94eb40b330d4dc22b159991f44e5e515212f8e887049dccdef266d0ea23" | 14 | SRC_URI[sha256sum] = "4160f66b76615eea2397eac4ea3f0a146b7928207b79bc4cc2f99ad7b7bd9513" |
| 15 | 15 | ||
| 16 | inherit autotools | 16 | inherit autotools |
| 17 | 17 | ||
