Skip to contentSkip to conversation

package/fetchmail: bump version to 6.4.0.beta5

PATCH New Bernd Kuhls 2 participants 2 messages Jul 20, 2019 – Aug 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/fetchmail: bump version to 6.4.0.beta5

This bump brings buildroot in-line with Debian stable which also provides this version after version 6.3 was removed from testing in 2017: https://tracker.debian.org/pkg/fetchmail

Removed patches applied upstream:
https://gitlab.com/fetchmail/fetchmail/commit/bcab21a977732e2fe24f37cb394f913af0d8b166
https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc

fetchmailconf.py received various python3-related patches:
https://gitlab.com/fetchmail/fetchmail/commits/legacy_64/fetchmailconf.py

Therefore FETCHMAIL_REMOVE_FETCHMAILCONF_PY is not needed anymore.

Added license hash.

---
 package/fetchmail/0001-enable-libressl.patch  | 67 ------------------
 ...re.ac-use-pkg-config-to-find-openssl.patch | 69 -------------------
 package/fetchmail/fetchmail.hash              |  3 +-
 package/fetchmail/fetchmail.mk                | 16 +----
 4 files changed, 4 insertions(+), 151 deletions(-)
 delete mode 100644 package/fetchmail/0001-enable-libressl.patch
 delete mode 100644 package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch
package/fetchmail/0001-enable-libressl.patch deleted +0 -67
deleted file mode 100644
index a98e19dda4..0000000000
@@ -1,67 +0,0 @@
-Fetched from upstream git and tweaked for the release:
-https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura fetchmail-6.3.26.orig/config.h.in fetchmail-6.3.26/config.h.in
---- fetchmail-6.3.26.orig/config.h.in	2015-12-30 10:44:33.467746835 -0300
-+++ fetchmail-6.3.26/config.h.in	2015-12-30 10:45:50.271403589 -0300
-@@ -53,6 +53,10 @@
-    if you don't. */
- #undef HAVE_DECL_SSLV2_CLIENT_METHOD
- 
-+/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0
-+   if you don't. */
-+#undef HAVE_DECL_SSLV3_CLIENT_METHOD
-+
- /* Define to 1 if you have the declaration of `strerror', and to 0 if you
-    don't. */
- #undef HAVE_DECL_STRERROR
-diff -Nura fetchmail-6.3.26.orig/configure.ac fetchmail-6.3.26/configure.ac
---- fetchmail-6.3.26.orig/configure.ac	2015-12-30 10:44:33.465746766 -0300
-+++ fetchmail-6.3.26/configure.ac	2015-12-30 10:46:03.708868409 -0300
-@@ -803,6 +803,7 @@
- 
- case "$LIBS" in *-lssl*)
- 	AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>])
-+	AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>])
- 	;;
- esac
- 
-diff -Nura fetchmail-6.3.26.orig/fetchmail.c fetchmail-6.3.26/fetchmail.c
---- fetchmail-6.3.26.orig/fetchmail.c	2015-12-30 10:44:33.469746904 -0300
-+++ fetchmail-6.3.26/fetchmail.c	2015-12-30 10:46:03.708868409 -0300
-@@ -263,6 +263,12 @@
- #ifdef SSL_ENABLE
- 	"+SSL"
- #endif
-+#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0
-+	"-SSLv2"
-+#endif
-+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0
-+	"-SSLv3"
-+#endif
- #ifdef OPIE_ENABLE
- 	"+OPIE"
- #endif /* OPIE_ENABLE */
-diff -Nura fetchmail-6.3.26.orig/socket.c fetchmail-6.3.26/socket.c
---- fetchmail-6.3.26.orig/socket.c	2015-12-30 10:44:33.464746731 -0300
-+++ fetchmail-6.3.26/socket.c	2015-12-30 10:46:03.709868443 -0300
-@@ -910,11 +910,16 @@
- #if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0
- 			_ctx[sock] = SSL_CTX_new(SSLv2_client_method());
- #else
--			report(stderr, GT_("Your operating system does not support SSLv2.\n"));
-+			report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n"));
- 			return -1;
- #endif
- 		} else if(!strcasecmp("ssl3",myproto)) {
-+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0
- 			_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
-+#else
-+			report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n"));
-+			return -1;
-+#endif
- 		} else if(!strcasecmp("tls1",myproto)) {
- 			_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
- 		} else if (!strcasecmp("ssl23",myproto)) {
package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch deleted +0 -69

69 lines not on this page · raw message

package/fetchmail/fetchmail.hash +2 -1
index c67ee1a4e1..1a9499ab29 100644
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256  79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850  fetchmail-6.3.26.tar.xz
+sha256 832fded80908670d0ae31b4ac4a4e292d4fdb1855578bb9ac0e9e2f63efa5a39  fetchmail-6.4.0.beta5.tar.xz
+sha256 8b9e9688c0fc566adfa56f9d9ebaabf60e5a58ca365a282cf5742bd22fd97378  COPYING
package/fetchmail/fetchmail.mk +2 -14
index 41505e8637..c008cd2c7c 100644
@@ -4,14 +4,12 @@
 #
 ################################################################################
 
-FETCHMAIL_VERSION_MAJOR = 6.3
-FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).26
+FETCHMAIL_VERSION_MAJOR = 6.4
+FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).0.beta5
 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz
 FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR)
 FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING
 FETCHMAIL_LICENSE_FILES = COPYING
-FETCHMAIL_AUTORECONF = YES
-FETCHMAIL_GETTEXTIZE = YES
 
 FETCHMAIL_CONF_OPTS = \
 	--with-ssl=$(STAGING_DIR)/usr
@@ -22,14 +20,4 @@ FETCHMAIL_DEPENDENCIES = \
 	openssl \
 	$(TARGET_NLS_DEPENDENCIES)
 
-# fetchmailconf.py script is not (yet) python3-compliant.
-# Prevent the pyc-compilation with python-3 from failing by removing this
-# non-critical script.
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
-define FETCHMAIL_REMOVE_FETCHMAILCONF_PY
-	$(RM) -f $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/fetchmailconf.py
-endef
-FETCHMAIL_POST_INSTALL_TARGET_HOOKS += FETCHMAIL_REMOVE_FETCHMAILCONF_PY
-endif
-
 $(eval $(autotools-package))
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/fetchmail: bump version to 6.4.0.beta5

Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

This bump brings buildroot in-line with Debian stable which also provides this version after version 6.3 was removed from testing in 2017: https://tracker.debian.org/pkg/fetchmail

Removed patches applied upstream:
https://gitlab.com/fetchmail/fetchmail/commit/bcab21a977732e2fe24f37cb394f913af0d8b166
https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc

Quoted 8 lines

fetchmailconf.py received various python3-related patches:
https://gitlab.com/fetchmail/fetchmail/commits/legacy_64/fetchmailconf.py

Therefore FETCHMAIL_REMOVE_FETCHMAILCONF_PY is not needed anymore.

Added license hash.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard