diff mbox series

[1/1] package/proftpd: bump to version 1.3.8

Message ID 20221206222916.1375344-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/proftpd: bump to version 1.3.8 | expand

Commit Message

Fabrice Fontaine Dec. 6, 2022, 10:29 p.m. UTC 
Drop patch (already in version)

http://proftpd.org/docs/NEWS-1.3.8
http://proftpd.org/docs/RELEASE_NOTES-1.3.8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...tab-fix-build-failure-against-gcc-10.patch | 56 -------------------
 package/proftpd/proftpd.hash                  |  2 +-
 package/proftpd/proftpd.mk                    |  4 +-
 3 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch

Comments

Peter Korsgaard Dec. 9, 2022, 6:02 p.m. UTC | #1 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Drop patch (already in version)
 > http://proftpd.org/docs/NEWS-1.3.8
 > http://proftpd.org/docs/RELEASE_NOTES-1.3.8

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.
diff mbox series

Patch

diff --git a/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch b/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch
deleted file mode 100644
index 5f4eb66c71..0000000000
--- a/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch
+++ /dev/null
@@ -1,56 +0,0 @@ 
-From 9c9623c8a47fb5580dfea1a59296c6d224479504 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Mon, 2 Mar 2020 23:45:22 +0000
-Subject: [PATCH] mod_quotatab: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-$ ./configure --with-modules=mod_quotatab && make
-...
-ld: modules/module_glue.o:(.data.rel+0x68):
-  undefined reference to `quotatab_file_module'
-collect2: error: ld returned 1 exit status
-make: *** [Makefile:56: proftpd] Error 1
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-[Retrieved from:
-https://github.com/proftpd/proftpd/commit/9c9623c8a47fb5580dfea1a59296c6d224479504]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- contrib/mod_quotatab.c | 1 +
- contrib/mod_quotatab.h | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/mod_quotatab.c b/contrib/mod_quotatab.c
-index 4fa6c1f44..0ee480163 100644
---- a/contrib/mod_quotatab.c
-+++ b/contrib/mod_quotatab.c
-@@ -50,6 +50,7 @@ typedef struct regtab_obj {
- module quotatab_module;
- 
- /* Quota objects for the current session */
-+quota_deltas_t quotatab_deltas;
- static quota_table_t *limit_tab = NULL;
- static quota_limit_t sess_limit;
- 
-diff --git a/contrib/mod_quotatab.h b/contrib/mod_quotatab.h
-index ed30333f5..c818395a0 100644
---- a/contrib/mod_quotatab.h
-+++ b/contrib/mod_quotatab.h
-@@ -188,7 +188,7 @@ typedef struct table_obj {
- #define QUOTATAB_TALLY_SRC      0x0002
- 
- /* Quota objects for the current session. */
--quota_deltas_t quotatab_deltas;
-+extern quota_deltas_t quotatab_deltas;
- 
- /* Function prototypes necessary for quotatab sub-modules */
- int quotatab_log(const char *, ...)
diff --git a/package/proftpd/proftpd.hash b/package/proftpd/proftpd.hash
index 983500bb8e..f950f26b86 100644
--- a/package/proftpd/proftpd.hash
+++ b/package/proftpd/proftpd.hash
@@ -1,3 +1,3 @@ 
 # Locally calculated
-sha256  2dbe684034ab592742ebdb778a8a234b70f959efeb30feedee3ea77f26f74fbb  proftpd-1.3.6e.tar.gz
+sha256  f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748  proftpd-1.3.8.tar.gz
 sha256  391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80  COPYING
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 64c16a84eb..8e7d108c9e 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-PROFTPD_VERSION = 1.3.6e
-PROFTPD_SITE = $(call github,proftpd,proftpd,v$(PROFTPD_VERSION))
+PROFTPD_VERSION = 1.3.8
+PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source
 PROFTPD_LICENSE = GPL-2.0+
 PROFTPD_LICENSE_FILES = COPYING
 PROFTPD_CPE_ID_VENDOR = proftpd