Skip to contentSkip to conversation

package/dovecot: bump version to 2.2.33.2

PATCH New Bernd Kuhls 3 participants 6 messages Nov 14, 2017 – Nov 24, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/dovecot: bump version to 2.2.33.2

Added license hashes.

Signed-off-by Bernd Kuhls <[email protected]>
---
 .../0001-byteorder.h-fix-uclibc-build.patch        | 32 ++++++++++++++++++++++
 package/dovecot/dovecot.hash                       |  5 +++-
 package/dovecot/dovecot.mk                         |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 package/dovecot/0001-byteorder.h-fix-uclibc-build.patch
package/dovecot/0001-byteorder.h-fix-uclibc-build.patch new file +32 -0
new file mode 100644
index 0000000000..7111031456
@@ -0,0 +1,32 @@
+From 902917880ca29f1007750a70cf46e7246b2d0a2a Mon Sep 17 00:00:00 2001
+From: Josef 'Jeff' Sipek <[email protected]>
+Date: Tue, 14 Nov 2017 06:01:21 +0100
+Subject: [PATCH 1/1] 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 <[email protected]>
+---
+ 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
+
package/dovecot/dovecot.hash +4 -1
index 184745b394..33163d6d8c 100644
@@ -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
package/dovecot/dovecot.mk +1 -1
index 4cc6ae4de7..25a78b9f78 100644
@@ -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
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 package/dovecot-pigeonhole: bump version to 0.4.21

Added license hash.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 3 ++-
 package/dovecot-pigeonhole/dovecot-pigeonhole.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/dovecot-pigeonhole/dovecot-pigeonhole.hash +2 -1
index 137870f987..a2b7eba9de 100644
@@ -1,2 +1,3 @@
 # Locally computed after checking signature
-sha256 629204bfbdcd3480e1ebcdc246da438323c3ea5fea57480ab859e8b201ad8793  dovecot-2.2-pigeonhole-0.4.19.tar.gz
+sha256 4ae09cb788c5334d167f5a89ee70b0616c3231e5904ad258ce408e4953cfdd6a  dovecot-2.2-pigeonhole-0.4.21.tar.gz
+sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a  COPYING
package/dovecot-pigeonhole/dovecot-pigeonhole.mk +1 -1
index 6b835d3b19..ea8b0077f0 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOVECOT_PIGEONHOLE_VERSION = 0.4.19
+DOVECOT_PIGEONHOLE_VERSION = 0.4.21
 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
 DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2
 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/2 package/dovecot: bump version to 2.2.33.2

In reply to Bernd Kuhls

Hi Bernd,

Quoted 4 lines · Bernd Kuhls

Added license hashes.

Signed-off-by Bernd Kuhls <[email protected]>

---

[...]

Quoted 16 lines
package/dovecot/dovecot.hash +4 -1
index 184745b394..33163d6d8c 100644
@@ -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
package/dovecot/dovecot.mk +0 -0
index 4cc6ae4de7..25a78b9f78 100644

package/dovecot/dovecot.mk line 11

Quoted 8 lines
package/dovecot/dovecot.mk +1 -1
@@ -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

Unrelated to this patch, but since COPYING.MIT is one of the license files, why isn't the MIT license mentioned here?

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#3 lore raw

PATCH 1/2 package/dovecot: bump version to 2.2.33.2

Hello,

Quoted 9 lines · Baruch Siach

package/dovecot/dovecot.mk line 11

Quoted 6 lines

DOVECOT_VERSION_MAJOR = 2.2

package/dovecot/dovecot.mk +1 -1
-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

Unrelated to this patch, but since COPYING.MIT is one of the license files, why isn't the MIT license mentioned here?

Good catch. The COPYING file explains pretty well was going on here. It says:

"""
Everything in src/lib/, src/auth/, src/lib-sql/ and src/lib-ntlm/ is under MIT license (see COPYING.MIT) unless otherwise mentioned at the beginning of the file.

Everything else is LGPLv2.1 (see COPYING.LGPL) unless otherwise mentioned at the beginning of the file.

Current exceptions are:

src/lib/md5.c : Public Domain

src/lib/sha1.c and sha2.c:
[... here the next of BSD-3c]

src/lib/UnicodeData.txt:
[... something that looks very similar to
https://spdx.org/licenses/Unicode-DFS-2015.html, but isn't exactly the same ...]

So perhaps:

DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, Unicode-DFS-2015

something like that ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#4 lore raw

PATCH 1/2 package/dovecot: bump version to 2.2.33.2

Hi Thomas,

Quoted 35 lines · Thomas Petazzoni
Quoted 9 lines · Baruch Siach

package/dovecot/dovecot.mk line 11

Quoted 6 lines

DOVECOT_VERSION_MAJOR = 2.2

package/dovecot/dovecot.mk +1 -1
-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

Unrelated to this patch, but since COPYING.MIT is one of the license files, why isn't the MIT license mentioned here?

Good catch. The COPYING file explains pretty well was going on here. It says:

"""
Everything in src/lib/, src/auth/, src/lib-sql/ and src/lib-ntlm/ is under MIT license (see COPYING.MIT) unless otherwise mentioned at the beginning of the file.

Everything else is LGPLv2.1 (see COPYING.LGPL) unless otherwise mentioned at the beginning of the file.

Current exceptions are:

src/lib/md5.c : Public Domain

src/lib/sha1.c and sha2.c:
[... here the next of BSD-3c]

src/lib/UnicodeData.txt:
[... something that looks very similar to
https://spdx.org/licenses/Unicode-DFS-2015.html, but isn't exactly the same ...]

Quoted 5 lines

So perhaps:

DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, Unicode-DFS-2015

something like that ?

I added also BSD-3-Clause that COPYING mentioned.

It turns out that SPDX lists[1] 5 variants of BSD-3c. The BSD-3-Clause identifier refers to '"New" or "Revised" License', which is not exactly the same as the text in COPYING. But I think this is good enough for our purpose.

[1] https://spdx.org/licenses/

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#5 lore raw

PATCH 1/2 package/dovecot: bump version to 2.2.33.2

In reply to Bernd Kuhls

Hello,

Quoted 9 lines · Bernd Kuhls

Added license hashes.

Signed-off-by Bernd Kuhls <[email protected]>
---
 .../0001-byteorder.h-fix-uclibc-build.patch        | 32 ++++++++++++++++++++++
 package/dovecot/dovecot.hash                       |  5 +++-
 package/dovecot/dovecot.mk                         |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 package/dovecot/0001-byteorder.h-fix-uclibc-build.patch

Both applied to next. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com