diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
| commit | 1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch) | |
| tree | dd26d5bc619271f8cccf0c9d7abdda9a1749d13f /package/dovecot | |
| parent | 57dcad243e6daefefbe21109e1fc97272053a7a0 (diff) | |
| parent | 787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff) | |
| download | buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.tar.gz buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.zip | |
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release
cycle back into the master branch.
A few conflicts had to be resolved:
- In the DEVELOPERS file, because Fabrice Fontaine was added as a
developer for libupnp in master, and for libupnp18 in
next. Resolution is simple: add him for both.
- linux/Config.in, because we updated the 4.13.x release used by
default in master, while we moved to 4.14 in next. Resolution: use
4.14.
- package/libupnp/libupnp.hash: a hash for the license file was added
in master, while the package was bumped into next. Resolution: keep
the hash for the license file, and keep the hash for the newest
version of libupnp.
- package/linux-headers/Config.in.host: default version of the kernel
headers for 4.13 was bumped to the latest 4.13.x in master, but was
changed to 4.14 in next. Resolution: use 4.14.
- package/samba4/: samba was bumped to 4.6.11 in master for security
reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/dovecot')
| -rw-r--r-- | package/dovecot/0001-byteorder.h-fix-uclibc-build.patch | 32 | ||||
| -rw-r--r-- | package/dovecot/dovecot.hash | 5 | ||||
| -rw-r--r-- | package/dovecot/dovecot.mk | 2 |
3 files changed, 37 insertions, 2 deletions
diff --git a/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch b/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch new file mode 100644 index 0000000000..b6d3ed3ec0 --- /dev/null +++ b/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch @@ -0,0 +1,32 @@ +From 902917880ca29f1007750a70cf46e7246b2d0a2a Mon Sep 17 00:00:00 2001 +From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi> +Date: Tue, 14 Nov 2017 06:01:21 +0100 +Subject: [PATCH] byteorder.h: fix uclibc build + +Patch suggested on upstream mailinglist: +https://www.dovecot.org/pipermail/dovecot/2017-November/110019.html + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + src/lib/byteorder.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lib/byteorder.h b/src/lib/byteorder.h +index 2f5dc7c17..4ffe8da21 100644 +--- a/src/lib/byteorder.h ++++ b/src/lib/byteorder.h +@@ -23,6 +23,11 @@ + #ifndef BYTEORDER_H + #define BYTEORDER_H + ++#undef bswap_8 ++#undef bswap_16 ++#undef bswap_32 ++#undef bswap_64 ++ + /* + * These prototypes exist to catch bugs in the code generating macros below. + */ +-- +2.11.0 + diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 184745b394..33163d6d8c 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,2 +1,5 @@ # Locally computed after checking signature -sha256 034be40907748128d65088a4f59789b2f99ae7b33a88974eae0b6a68ece376a1 dovecot-2.2.31.tar.gz +sha256 fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84 dovecot-2.2.33.2.tar.gz +sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index fa69acfa20..71a76c2818 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).31 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).33.2 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 |
