diff --git a/35497604d80090a02619024aeec069b32568e4b4.diff b/35497604d80090a02619024aeec069b32568e4b4.diff deleted file mode 100644 index e769057..0000000 --- a/35497604d80090a02619024aeec069b32568e4b4.diff +++ /dev/null @@ -1,247 +0,0 @@ -diff --git a/src/lib/murmurhash3.c b/src/lib/murmurhash3.c -index 45dcc22fd1..6f6133bd5c 100644 ---- a/src/lib/murmurhash3.c -+++ b/src/lib/murmurhash3.c -@@ -23,7 +23,7 @@ - - static inline uint32_t getblock32(const uint32_t *p, int i) - { -- return p[i]; -+ return le32_to_cpu(p[i]); - } - - //----------------------------------------------------------------------------- -@@ -94,6 +94,8 @@ void murmurhash3_32 (const void *key, size_t len, uint32_t seed, - - h1 = fmix32(h1); - -+ h1 = cpu32_to_be(h1); -+ - memcpy(out, &h1, sizeof(h1)); - } - -@@ -103,7 +105,7 @@ void murmurhash3_32 (const void *key, size_t len, uint32_t seed, - - static inline uint64_t getblock64(const uint64_t *p, int i) - { -- return p[i]; -+ return le64_to_cpu(p[i]); - } - - static inline uint64_t fmix64(uint64_t k) -@@ -206,6 +208,9 @@ void murmurhash3_128(const void *key, size_t len, uint32_t seed, - h1 += h2; - h2 += h1; - -+ h1 = cpu64_to_be(h1); -+ h2 = cpu64_to_be(h2); -+ - memcpy(out, &h1, sizeof(h1)); - memcpy(out+sizeof(h1), &h2, sizeof(h2)); - } -@@ -323,6 +328,11 @@ void murmurhash3_128(const void *key, size_t len, uint32_t seed, - h1 += h2; h1 += h3; h1 += h4; - h2 += h1; h3 += h1; h4 += h1; - -+ h1 = cpu32_to_be(h1); -+ h2 = cpu32_to_be(h2); -+ h3 = cpu32_to_be(h3); -+ h4 = cpu32_to_be(h4); -+ - memcpy(out, &h1, sizeof(h1)); - memcpy(out+sizeof(h1), &h2, sizeof(h2)); - memcpy(out+sizeof(h1)*2, &h3, sizeof(h3)); -diff --git a/src/lib/test-murmurhash3.c b/src/lib/test-murmurhash3.c -index 9da3d28e3c..2a60d9840b 100644 ---- a/src/lib/test-murmurhash3.c -+++ b/src/lib/test-murmurhash3.c -@@ -7,7 +7,7 @@ struct murmur3_test_vectors { - const char *input; - size_t len; - uint32_t seed; -- uint32_t result[4]; /* fits all results */ -+ uint8_t result[MURMURHASH3_128_RESULTBYTES]; /* fits all results */ - }; - - static void test_murmurhash3_algorithm(const char *name, -@@ -30,23 +30,23 @@ static void test_murmurhash3_algorithm(const char *name, - static void test_murmurhash3_32(void) - { - struct murmur3_test_vectors vectors[] = { -- { "", 0, 0, { 0, 0, 0, 0}}, -- { "", 0, 0x1, { 0x514E28B7, 0, 0, 0 }}, -- { "", 0, 0xFFFFFFFF, { 0x81F16F39, 0, 0, 0 }}, -- { "\0\0\0\0", 4, 0, { 0x2362F9DE, 0, 0, 0 }}, -- { "aaaa", 4, 0x9747b28c, { 0x5A97808A, 0, 0, 0 }}, -- { "aaa", 3, 0x9747b28c, { 0x283E0130, 0, 0, 0 }}, -- { "aa", 2, 0x9747b28c, { 0x5D211726, 0, 0, 0 }}, -- { "a", 1, 0x9747b28c, { 0x7FA09EA6, 0, 0, 0 }}, -- { "abcd", 4, 0x9747b28c, { 0xF0478627, 0, 0, 0 }}, -- { "abc", 3, 0x9747b28c, { 0xC84A62DD, 0, 0, 0 }}, -- { "ab", 2, 0x9747b28c, { 0x74875592, 0, 0, 0 }}, -- { "Hello, world!", 13, 0x9747b28c, { 0x24884CBA, 0, 0, 0 }}, -+ { "", 0, 0, { 0, }}, -+ { "", 0, 0x1, { 0x51, 0x4E, 0x28, 0xB7, }}, -+ { "", 0, 0xFFFFFFFF, { 0x81, 0xF1, 0x6F, 0x39, }}, -+ { "\0\0\0\0", 4, 0, { 0x23, 0x62, 0xF9, 0xDE, }}, -+ { "aaaa", 4, 0x9747b28c, { 0x5A, 0x97, 0x80, 0x8A, }}, -+ { "aaa", 3, 0x9747b28c, { 0x28, 0x3E, 0x01, 0x30, }}, -+ { "aa", 2, 0x9747b28c, { 0x5D, 0x21, 0x17, 0x26, }}, -+ { "a", 1, 0x9747b28c, { 0x7F, 0xA0, 0x9E, 0xA6, }}, -+ { "abcd", 4, 0x9747b28c, { 0xF0, 0x47, 0x86, 0x27, }}, -+ { "abc", 3, 0x9747b28c, { 0xC8, 0x4A, 0x62, 0xDD, }}, -+ { "ab", 2, 0x9747b28c, { 0x74, 0x87, 0x55, 0x92, }}, -+ { "Hello, world!", 13, 0x9747b28c, { 0x24, 0x88, 0x4C, 0xBA, }}, - { - "\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80", - 16, - 0x9747b28c, -- { 0xD58063C1, 0, 0, 0 } -+ { 0xD5, 0x80, 0x63, 0xC1, } - }, /* 8 U+03C0 (Greek Small Letter Pi) */ - { - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -@@ -56,7 +56,7 @@ static void test_murmurhash3_32(void) - "aaaaaaaaaaaaaaaaaaaa", - 256, - 0x9747b28c, -- { 0x37405BDC, 0, 0, 0 } -+ { 0x37, 0x40, 0x5B, 0xDC, } - }, - }; - -@@ -69,23 +69,46 @@ static void test_murmurhash3_128(void) - { - struct murmur3_test_vectors vectors[] = { - #ifdef _LP64 -- { "", 0, 0x00000000, { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }}, -- { "", 0, 0x00000001, { 0x6eff5cb5, 0x4610abe5, 0x78f83583, 0x51622daa }}, -- { "", 0, 0xffffffff, { 0x9d3bc9ec, 0x6af1df4d, 0x1ee6446b, 0x85742112 }}, -- { "\0\0\0\0", 4, 0x00000000, { 0xd84c76bc, 0xcfa0f7dd, 0x1cf526f1, 0x58962316 }}, -- { "aaaa", 4, 0x9747b28c, { 0x5e649bf0, 0xb4e0a5f7, 0x038c569f, 0xa5d3e8e9 }}, -- { "aaa", 3, 0x9747b28c, { 0xe4c7466b, 0x8ea5e37a, 0x35dc931c, 0xf925bef0 }}, -- { "aa", 2, 0x9747b28c, { 0xbee5bb1f, 0x12a698a9, 0x5e269401, 0xe93630ff }}, -- { "a", 1, 0x9747b28c, { 0x2db25a1d, 0x5ce8d851, 0x9208f004, 0x9e6dab0f }}, -- { "abcd", 4, 0x9747b28c, { 0xac553791, 0x49b4709e, 0xe9d3a7bb, 0x8a7e67e7 }}, -- { "abc", 3, 0x9747b28c, { 0xbfc3cedc, 0x3743630d, 0x20b504bf, 0xcde0a234 }}, -- { "ab", 2, 0x9747b28c, { 0x1a44280b, 0x8434eead, 0x63ce372b, 0x7eb933e7 }}, -- { "Hello, world!", 13, 0x9747b28c, { 0x62a8392e, 0xedc485d6, 0x31d576ba, 0xf85e7e76 }}, -+ { "", 0, 0x00000000, { 0, }}, -+ { "", 0, 0x00000001, -+ { 0x46, 0x10, 0xab, 0xe5, 0x6e, 0xff, 0x5c, 0xb5, -+ 0x51, 0x62, 0x2d, 0xaa, 0x78, 0xf8, 0x35, 0x83 }}, -+ { "", 0, 0xffffffff, -+ { 0x6a, 0xf1, 0xdf, 0x4d, 0x9d, 0x3b, 0xc9, 0xec, -+ 0x85, 0x74, 0x21, 0x12, 0x1e, 0xe6, 0x44, 0x6b }}, -+ { "\0\0\0\0", 4, 0x00000000, -+ { 0xcf, 0xa0, 0xf7, 0xdd, 0xd8, 0x4c, 0x76, 0xbc, -+ 0x58, 0x96, 0x23, 0x16, 0x1c, 0xf5, 0x26, 0xf1 }}, -+ { "aaaa", 4, 0x9747b28c, -+ { 0xb4, 0xe0, 0xa5, 0xf7, 0x5e, 0x64, 0x9b, 0xf0, -+ 0xa5, 0xd3, 0xe8, 0xe9, 0x03, 0x8c, 0x56, 0x9f }}, -+ { "aaa", 3, 0x9747b28c, -+ { 0x8e, 0xa5, 0xe3, 0x7a, 0xe4, 0xc7, 0x46, 0x6b, -+ 0xf9, 0x25, 0xbe, 0xf0, 0x35, 0xdc, 0x93, 0x1c }}, -+ { "aa", 2, 0x9747b28c, -+ { 0x12, 0xa6, 0x98, 0xa9, 0xbe, 0xe5, 0xbb, 0x1f, -+ 0xe9, 0x36, 0x30, 0xff, 0x5e, 0x26, 0x94, 0x01 }}, -+ { "a", 1, 0x9747b28c, -+ { 0x5c, 0xe8, 0xd8, 0x51, 0x2d, 0xb2, 0x5a, 0x1d, -+ 0x9e, 0x6d, 0xab, 0x0f, 0x92, 0x08, 0xf0, 0x04 }}, -+ { "abcd", 4, 0x9747b28c, -+ { 0x49, 0xb4, 0x70, 0x9e, 0xac, 0x55, 0x37, 0x91, -+ 0x8a, 0x7e, 0x67, 0xe7, 0xe9, 0xd3, 0xa7, 0xbb }}, -+ { "abc", 3, 0x9747b28c, -+ { 0x37, 0x43, 0x63, 0x0d, 0xbf, 0xc3, 0xce, 0xdc, -+ 0xcd, 0xe0, 0xa2, 0x34, 0x20, 0xb5, 0x04, 0xbf }}, -+ { "ab", 2, 0x9747b28c, -+ { 0x84, 0x34, 0xee, 0xad, 0x1a, 0x44, 0x28, 0x0b, -+ 0x7e, 0xb9, 0x33, 0xe7, 0x63, 0xce, 0x37, 0x2b }}, -+ { "Hello, world!", 13, 0x9747b28c, -+ { 0xed, 0xc4, 0x85, 0xd6, 0x62, 0xa8, 0x39, 0x2e, -+ 0xf8, 0x5e, 0x7e, 0x76, 0x31, 0xd5, 0x76, 0xba }}, - { - "\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80", - 16, - 0x9747b28c, -- { 0xc0361a1f, 0x96ea5bd8, 0x094be17b, 0xf8b72bd0 } -+ { 0x96, 0xea, 0x5b, 0xd8, 0xc0, 0x36, 0x1a, 0x1f, -+ 0xf8, 0xb7, 0x2b, 0xd0, 0x09, 0x4b, 0xe1, 0x7b } - }, - { - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -@@ -95,26 +118,50 @@ static void test_murmurhash3_128(void) - "aaaaaaaaaaaaaaaaaaaa", - 256, - 0x9747b28c, -- { 0xa5dec1c4, 0x07bd957c, 0x1f6cee55, 0xc4d8bb8d } -+ { 0x07, 0xbd, 0x95, 0x7c, 0xa5, 0xde, 0xc1, 0xc4, -+ 0xc4, 0xd8, 0xbb, 0x8d, 0x1f, 0x6c, 0xee, 0x55 } - }, - #else /* 32 bit test vectors */ -- { "", 0, 0x00000000, { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }}, -- { "", 0, 0x00000001, { 0x88c4adec, 0x54d201b9, 0x54d201b9, 0x54d201b9 }}, -- { "", 0, 0xffffffff, { 0x051e08a9, 0x989d49f7, 0x989d49f7, 0x989d49f7 }}, -- { "\0\0\0\0", 4, 0x00000000, { 0xcc066f1f, 0x9e517840, 0x9e517840, 0x9e517840 }}, -- { "aaaa", 4, 0x9747b28c, { 0x36804cef, 0x2a61c224, 0x2a61c224, 0x2a61c224 }}, -- { "aaa", 3, 0x9747b28c, { 0x838389be, 0x9aad7f88, 0x9aad7f88, 0x9aad7f88 }}, -- { "aa", 2, 0x9747b28c, { 0xdfbe4a86, 0x4a9c350b, 0x4a9c350b, 0x4a9c350b }}, -- { "a", 1, 0x9747b28c, { 0x084ef944, 0x21a1186e, 0x21a1186e, 0x21a1186e }}, -- { "abcd", 4, 0x9747b28c, { 0x4795c529, 0xcec1885e, 0xcec1885e, 0xcec1885e }}, -- { "abc", 3, 0x9747b28c, { 0xd6359eaf, 0x48fc3ac3, 0x48fc3ac3, 0x48fc3ac3 }}, -- { "ab", 2, 0x9747b28c, { 0x3837d795, 0xc7fe5896, 0xc7fe5896, 0xc7fe5896 }}, -- { "Hello, world!", 13, 0x9747b28c, { 0x756d5460, 0xbb872216, 0xb7d48b7c, 0x53c8c636 }}, -+ { "", 0, 0x00000000, { 0, }}, -+ { "", 0, 0x00000001, -+ { 0x88, 0xc4, 0xad, 0xec, 0x54, 0xd2, 0x01, 0xb9, -+ 0x54, 0xd2, 0x01, 0xb9, 0x54, 0xd2, 0x01, 0xb9 }}, -+ { "", 0, 0xffffffff, -+ { 0x05, 0x1e, 0x08, 0xa9, 0x98, 0x9d, 0x49, 0xf7, -+ 0x98, 0x9d, 0x49, 0xf7, 0x98, 0x9d, 0x49, 0xf7 }}, -+ { "\0\0\0\0", 4, 0x00000000, -+ { 0xcc, 0x06, 0x6f, 0x1f, 0x9e, 0x51, 0x78, 0x40, -+ 0x9e, 0x51, 0x78, 0x40, 0x9e, 0x51, 0x78, 0x40 }}, -+ { "aaaa", 4, 0x9747b28c, -+ { 0x36, 0x80, 0x4c, 0xef, 0x2a, 0x61, 0xc2, 0x24, -+ 0x2a, 0x61, 0xc2, 0x24, 0x2a, 0x61, 0xc2, 0x24 }}, -+ { "aaa", 3, 0x9747b28c, -+ { 0x83, 0x83, 0x89, 0xbe, 0x9a, 0xad, 0x7f, 0x88, -+ 0x9a, 0xad, 0x7f, 0x88, 0x9a, 0xad, 0x7f, 0x88 }}, -+ { "aa", 2, 0x9747b28c, -+ { 0xdf, 0xbe, 0x4a, 0x86, 0x4a, 0x9c, 0x35, 0x0b, -+ 0x4a, 0x9c, 0x35, 0x0b, 0x4a, 0x9c, 0x35, 0x0b }}, -+ { "a", 1, 0x9747b28c, -+ { 0x08, 0x4e, 0xf9, 0x44, 0x21, 0xa1, 0x18, 0x6e, -+ 0x21, 0xa1, 0x18, 0x6e, 0x21, 0xa1, 0x18, 0x6e }}, -+ { "abcd", 4, 0x9747b28c, -+ { 0x47, 0x95, 0xc5, 0x29, 0xce, 0xc1, 0x88, 0x5e, -+ 0xce, 0xc1, 0x88, 0x5e, 0xce, 0xc1, 0x88, 0x5e }}, -+ { "abc", 3, 0x9747b28c, -+ { 0xd6, 0x35, 0x9e, 0xaf, 0x48, 0xfc, 0x3a, 0xc3, -+ 0x48, 0xfc, 0x3a, 0xc3, 0x48, 0xfc, 0x3a, 0xc3 }}, -+ { "ab", 2, 0x9747b28c, -+ { 0x38, 0x37, 0xd7, 0x95, 0xc7, 0xfe, 0x58, 0x96, -+ 0xc7, 0xfe, 0x58, 0x96, 0xc7, 0xfe, 0x58, 0x96 }}, -+ { "Hello, world!", 13, 0x9747b28c, -+ { 0x75, 0x6d, 0x54, 0x60, 0xbb, 0x87, 0x22, 0x16, -+ 0xb7, 0xd4, 0x8b, 0x7c, 0x53, 0xc8, 0xc6, 0x36 }}, - { - "\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80", - 16, - 0x9747b28c, -- { 0xaf2ad325, 0x3a74df88, 0x38cc7534, 0xf197cc0d } -+ { 0xaf, 0x2a, 0xd3, 0x25, 0x3a, 0x74, 0xdf, 0x88, -+ 0x38, 0xcc, 0x75, 0x34, 0xf1, 0x97, 0xcc, 0x0d } - }, - { - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -@@ -124,7 +171,8 @@ static void test_murmurhash3_128(void) - "aaaaaaaaaaaaaaaaaaaa", - 256, - 0x9747b28c, -- { 0xd3f2b7bb, 0xf666c0cc, 0xd4a40060, 0x5ec8d32a } -+ { 0xd3, 0xf2, 0xb7, 0xbb, 0xf6, 0x66, 0xc0, 0xcc, -+ 0xd4, 0xa4, 0x00, 0x60, 0x5e, 0xc8, 0xd3, 0x2a } - }, - #endif - }; diff --git a/5522b8b3d3ed1a99c3b63bb120216af0bd427403.diff b/5522b8b3d3ed1a99c3b63bb120216af0bd427403.diff deleted file mode 100644 index 7b78732..0000000 --- a/5522b8b3d3ed1a99c3b63bb120216af0bd427403.diff +++ /dev/null @@ -1,234 +0,0 @@ -diff --git a/src/lib/test-murmurhash3.c b/src/lib/test-murmurhash3.c -index 2a60d9840b..4848fbd678 100644 ---- a/src/lib/test-murmurhash3.c -+++ b/src/lib/test-murmurhash3.c -@@ -7,7 +7,19 @@ struct murmur3_test_vectors { - const char *input; - size_t len; - uint32_t seed; -- uint8_t result[MURMURHASH3_128_RESULTBYTES]; /* fits all results */ -+ -+ /* murmurhash3_128() produces a different output on ILP32 and LP64 -+ systems (by design). Therefore, we must use different expected -+ results based on what system we're on. We define both all the -+ time, but use the below pre-processor magic to select which -+ version we'll use. */ -+ uint8_t result_ilp32[MURMURHASH3_128_RESULTBYTES]; /* fits all results */ -+ uint8_t result_lp64[MURMURHASH3_128_RESULTBYTES]; /* fits all results */ -+#ifdef _LP64 -+#define result result_lp64 -+#else -+#define result result_ilp32 -+#endif - }; - - static void test_murmurhash3_algorithm(const char *name, -@@ -29,23 +41,48 @@ static void test_murmurhash3_algorithm(const char *name, - - static void test_murmurhash3_32(void) - { -+ /* murmurhash3_32() produces the same output on both ILP32 and LP64 -+ systems, so use the same expected outputs for both */ - struct murmur3_test_vectors vectors[] = { -- { "", 0, 0, { 0, }}, -- { "", 0, 0x1, { 0x51, 0x4E, 0x28, 0xB7, }}, -- { "", 0, 0xFFFFFFFF, { 0x81, 0xF1, 0x6F, 0x39, }}, -- { "\0\0\0\0", 4, 0, { 0x23, 0x62, 0xF9, 0xDE, }}, -- { "aaaa", 4, 0x9747b28c, { 0x5A, 0x97, 0x80, 0x8A, }}, -- { "aaa", 3, 0x9747b28c, { 0x28, 0x3E, 0x01, 0x30, }}, -- { "aa", 2, 0x9747b28c, { 0x5D, 0x21, 0x17, 0x26, }}, -- { "a", 1, 0x9747b28c, { 0x7F, 0xA0, 0x9E, 0xA6, }}, -- { "abcd", 4, 0x9747b28c, { 0xF0, 0x47, 0x86, 0x27, }}, -- { "abc", 3, 0x9747b28c, { 0xC8, 0x4A, 0x62, 0xDD, }}, -- { "ab", 2, 0x9747b28c, { 0x74, 0x87, 0x55, 0x92, }}, -- { "Hello, world!", 13, 0x9747b28c, { 0x24, 0x88, 0x4C, 0xBA, }}, -+ { "", 0, 0, { 0, }, { 0, } }, -+ { "", 0, 0x1, -+ { 0x51, 0x4E, 0x28, 0xB7, }, -+ { 0x51, 0x4E, 0x28, 0xB7, } }, -+ { "", 0, 0xFFFFFFFF, -+ { 0x81, 0xF1, 0x6F, 0x39, }, -+ { 0x81, 0xF1, 0x6F, 0x39, } }, -+ { "\0\0\0\0", 4, 0, -+ { 0x23, 0x62, 0xF9, 0xDE, }, -+ { 0x23, 0x62, 0xF9, 0xDE, } }, -+ { "aaaa", 4, 0x9747b28c, -+ { 0x5A, 0x97, 0x80, 0x8A, }, -+ { 0x5A, 0x97, 0x80, 0x8A, } }, -+ { "aaa", 3, 0x9747b28c, -+ { 0x28, 0x3E, 0x01, 0x30, }, -+ { 0x28, 0x3E, 0x01, 0x30, } }, -+ { "aa", 2, 0x9747b28c, -+ { 0x5D, 0x21, 0x17, 0x26, }, -+ { 0x5D, 0x21, 0x17, 0x26, } }, -+ { "a", 1, 0x9747b28c, -+ { 0x7F, 0xA0, 0x9E, 0xA6, }, -+ { 0x7F, 0xA0, 0x9E, 0xA6, } }, -+ { "abcd", 4, 0x9747b28c, -+ { 0xF0, 0x47, 0x86, 0x27, }, -+ { 0xF0, 0x47, 0x86, 0x27, } }, -+ { "abc", 3, 0x9747b28c, -+ { 0xC8, 0x4A, 0x62, 0xDD, }, -+ { 0xC8, 0x4A, 0x62, 0xDD, } }, -+ { "ab", 2, 0x9747b28c, -+ { 0x74, 0x87, 0x55, 0x92, }, -+ { 0x74, 0x87, 0x55, 0x92, } }, -+ { "Hello, world!", 13, 0x9747b28c, -+ { 0x24, 0x88, 0x4C, 0xBA, }, -+ { 0x24, 0x88, 0x4C, 0xBA, } }, - { - "\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80", - 16, - 0x9747b28c, -+ { 0xD5, 0x80, 0x63, 0xC1, }, - { 0xD5, 0x80, 0x63, 0xC1, } - }, /* 8 U+03C0 (Greek Small Letter Pi) */ - { -@@ -56,6 +93,7 @@ static void test_murmurhash3_32(void) - "aaaaaaaaaaaaaaaaaaaa", - 256, - 0x9747b28c, -+ { 0x37, 0x40, 0x5B, 0xDC, }, - { 0x37, 0x40, 0x5B, 0xDC, } - }, - }; -@@ -67,46 +105,71 @@ static void test_murmurhash3_32(void) - - static void test_murmurhash3_128(void) - { -+ /* murmurhash3_128() produces a different output on ILP32 and LP64 -+ systems (by design). */ - struct murmur3_test_vectors vectors[] = { --#ifdef _LP64 -- { "", 0, 0x00000000, { 0, }}, -+ { "", 0, 0x00000000, { 0, }, { 0, }}, - { "", 0, 0x00000001, -+ { 0x88, 0xc4, 0xad, 0xec, 0x54, 0xd2, 0x01, 0xb9, -+ 0x54, 0xd2, 0x01, 0xb9, 0x54, 0xd2, 0x01, 0xb9 }, - { 0x46, 0x10, 0xab, 0xe5, 0x6e, 0xff, 0x5c, 0xb5, - 0x51, 0x62, 0x2d, 0xaa, 0x78, 0xf8, 0x35, 0x83 }}, - { "", 0, 0xffffffff, -+ { 0x05, 0x1e, 0x08, 0xa9, 0x98, 0x9d, 0x49, 0xf7, -+ 0x98, 0x9d, 0x49, 0xf7, 0x98, 0x9d, 0x49, 0xf7 }, - { 0x6a, 0xf1, 0xdf, 0x4d, 0x9d, 0x3b, 0xc9, 0xec, - 0x85, 0x74, 0x21, 0x12, 0x1e, 0xe6, 0x44, 0x6b }}, - { "\0\0\0\0", 4, 0x00000000, -+ { 0xcc, 0x06, 0x6f, 0x1f, 0x9e, 0x51, 0x78, 0x40, -+ 0x9e, 0x51, 0x78, 0x40, 0x9e, 0x51, 0x78, 0x40 }, - { 0xcf, 0xa0, 0xf7, 0xdd, 0xd8, 0x4c, 0x76, 0xbc, - 0x58, 0x96, 0x23, 0x16, 0x1c, 0xf5, 0x26, 0xf1 }}, - { "aaaa", 4, 0x9747b28c, -+ { 0x36, 0x80, 0x4c, 0xef, 0x2a, 0x61, 0xc2, 0x24, -+ 0x2a, 0x61, 0xc2, 0x24, 0x2a, 0x61, 0xc2, 0x24 }, - { 0xb4, 0xe0, 0xa5, 0xf7, 0x5e, 0x64, 0x9b, 0xf0, - 0xa5, 0xd3, 0xe8, 0xe9, 0x03, 0x8c, 0x56, 0x9f }}, - { "aaa", 3, 0x9747b28c, -+ { 0x83, 0x83, 0x89, 0xbe, 0x9a, 0xad, 0x7f, 0x88, -+ 0x9a, 0xad, 0x7f, 0x88, 0x9a, 0xad, 0x7f, 0x88 }, - { 0x8e, 0xa5, 0xe3, 0x7a, 0xe4, 0xc7, 0x46, 0x6b, - 0xf9, 0x25, 0xbe, 0xf0, 0x35, 0xdc, 0x93, 0x1c }}, - { "aa", 2, 0x9747b28c, -+ { 0xdf, 0xbe, 0x4a, 0x86, 0x4a, 0x9c, 0x35, 0x0b, -+ 0x4a, 0x9c, 0x35, 0x0b, 0x4a, 0x9c, 0x35, 0x0b }, - { 0x12, 0xa6, 0x98, 0xa9, 0xbe, 0xe5, 0xbb, 0x1f, - 0xe9, 0x36, 0x30, 0xff, 0x5e, 0x26, 0x94, 0x01 }}, - { "a", 1, 0x9747b28c, -+ { 0x08, 0x4e, 0xf9, 0x44, 0x21, 0xa1, 0x18, 0x6e, -+ 0x21, 0xa1, 0x18, 0x6e, 0x21, 0xa1, 0x18, 0x6e }, - { 0x5c, 0xe8, 0xd8, 0x51, 0x2d, 0xb2, 0x5a, 0x1d, - 0x9e, 0x6d, 0xab, 0x0f, 0x92, 0x08, 0xf0, 0x04 }}, - { "abcd", 4, 0x9747b28c, -+ { 0x47, 0x95, 0xc5, 0x29, 0xce, 0xc1, 0x88, 0x5e, -+ 0xce, 0xc1, 0x88, 0x5e, 0xce, 0xc1, 0x88, 0x5e }, - { 0x49, 0xb4, 0x70, 0x9e, 0xac, 0x55, 0x37, 0x91, - 0x8a, 0x7e, 0x67, 0xe7, 0xe9, 0xd3, 0xa7, 0xbb }}, - { "abc", 3, 0x9747b28c, -+ { 0xd6, 0x35, 0x9e, 0xaf, 0x48, 0xfc, 0x3a, 0xc3, -+ 0x48, 0xfc, 0x3a, 0xc3, 0x48, 0xfc, 0x3a, 0xc3 }, - { 0x37, 0x43, 0x63, 0x0d, 0xbf, 0xc3, 0xce, 0xdc, - 0xcd, 0xe0, 0xa2, 0x34, 0x20, 0xb5, 0x04, 0xbf }}, - { "ab", 2, 0x9747b28c, -+ { 0x38, 0x37, 0xd7, 0x95, 0xc7, 0xfe, 0x58, 0x96, -+ 0xc7, 0xfe, 0x58, 0x96, 0xc7, 0xfe, 0x58, 0x96 }, - { 0x84, 0x34, 0xee, 0xad, 0x1a, 0x44, 0x28, 0x0b, - 0x7e, 0xb9, 0x33, 0xe7, 0x63, 0xce, 0x37, 0x2b }}, - { "Hello, world!", 13, 0x9747b28c, -+ { 0x75, 0x6d, 0x54, 0x60, 0xbb, 0x87, 0x22, 0x16, -+ 0xb7, 0xd4, 0x8b, 0x7c, 0x53, 0xc8, 0xc6, 0x36 }, - { 0xed, 0xc4, 0x85, 0xd6, 0x62, 0xa8, 0x39, 0x2e, - 0xf8, 0x5e, 0x7e, 0x76, 0x31, 0xd5, 0x76, 0xba }}, - { - "\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80", - 16, - 0x9747b28c, -+ { 0xaf, 0x2a, 0xd3, 0x25, 0x3a, 0x74, 0xdf, 0x88, -+ 0x38, 0xcc, 0x75, 0x34, 0xf1, 0x97, 0xcc, 0x0d }, - { 0x96, 0xea, 0x5b, 0xd8, 0xc0, 0x36, 0x1a, 0x1f, - 0xf8, 0xb7, 0x2b, 0xd0, 0x09, 0x4b, 0xe1, 0x7b } - }, -@@ -118,63 +181,11 @@ static void test_murmurhash3_128(void) - "aaaaaaaaaaaaaaaaaaaa", - 256, - 0x9747b28c, -+ { 0xd3, 0xf2, 0xb7, 0xbb, 0xf6, 0x66, 0xc0, 0xcc, -+ 0xd4, 0xa4, 0x00, 0x60, 0x5e, 0xc8, 0xd3, 0x2a }, - { 0x07, 0xbd, 0x95, 0x7c, 0xa5, 0xde, 0xc1, 0xc4, - 0xc4, 0xd8, 0xbb, 0x8d, 0x1f, 0x6c, 0xee, 0x55 } - }, --#else /* 32 bit test vectors */ -- { "", 0, 0x00000000, { 0, }}, -- { "", 0, 0x00000001, -- { 0x88, 0xc4, 0xad, 0xec, 0x54, 0xd2, 0x01, 0xb9, -- 0x54, 0xd2, 0x01, 0xb9, 0x54, 0xd2, 0x01, 0xb9 }}, -- { "", 0, 0xffffffff, -- { 0x05, 0x1e, 0x08, 0xa9, 0x98, 0x9d, 0x49, 0xf7, -- 0x98, 0x9d, 0x49, 0xf7, 0x98, 0x9d, 0x49, 0xf7 }}, -- { "\0\0\0\0", 4, 0x00000000, -- { 0xcc, 0x06, 0x6f, 0x1f, 0x9e, 0x51, 0x78, 0x40, -- 0x9e, 0x51, 0x78, 0x40, 0x9e, 0x51, 0x78, 0x40 }}, -- { "aaaa", 4, 0x9747b28c, -- { 0x36, 0x80, 0x4c, 0xef, 0x2a, 0x61, 0xc2, 0x24, -- 0x2a, 0x61, 0xc2, 0x24, 0x2a, 0x61, 0xc2, 0x24 }}, -- { "aaa", 3, 0x9747b28c, -- { 0x83, 0x83, 0x89, 0xbe, 0x9a, 0xad, 0x7f, 0x88, -- 0x9a, 0xad, 0x7f, 0x88, 0x9a, 0xad, 0x7f, 0x88 }}, -- { "aa", 2, 0x9747b28c, -- { 0xdf, 0xbe, 0x4a, 0x86, 0x4a, 0x9c, 0x35, 0x0b, -- 0x4a, 0x9c, 0x35, 0x0b, 0x4a, 0x9c, 0x35, 0x0b }}, -- { "a", 1, 0x9747b28c, -- { 0x08, 0x4e, 0xf9, 0x44, 0x21, 0xa1, 0x18, 0x6e, -- 0x21, 0xa1, 0x18, 0x6e, 0x21, 0xa1, 0x18, 0x6e }}, -- { "abcd", 4, 0x9747b28c, -- { 0x47, 0x95, 0xc5, 0x29, 0xce, 0xc1, 0x88, 0x5e, -- 0xce, 0xc1, 0x88, 0x5e, 0xce, 0xc1, 0x88, 0x5e }}, -- { "abc", 3, 0x9747b28c, -- { 0xd6, 0x35, 0x9e, 0xaf, 0x48, 0xfc, 0x3a, 0xc3, -- 0x48, 0xfc, 0x3a, 0xc3, 0x48, 0xfc, 0x3a, 0xc3 }}, -- { "ab", 2, 0x9747b28c, -- { 0x38, 0x37, 0xd7, 0x95, 0xc7, 0xfe, 0x58, 0x96, -- 0xc7, 0xfe, 0x58, 0x96, 0xc7, 0xfe, 0x58, 0x96 }}, -- { "Hello, world!", 13, 0x9747b28c, -- { 0x75, 0x6d, 0x54, 0x60, 0xbb, 0x87, 0x22, 0x16, -- 0xb7, 0xd4, 0x8b, 0x7c, 0x53, 0xc8, 0xc6, 0x36 }}, -- { -- "\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80\xcf\x80", -- 16, -- 0x9747b28c, -- { 0xaf, 0x2a, 0xd3, 0x25, 0x3a, 0x74, 0xdf, 0x88, -- 0x38, 0xcc, 0x75, 0x34, 0xf1, 0x97, 0xcc, 0x0d } -- }, -- { -- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -- "aaaaaaaaaaaaaaaaaaaa", -- 256, -- 0x9747b28c, -- { 0xd3, 0xf2, 0xb7, 0xbb, 0xf6, 0x66, 0xc0, 0xcc, -- 0xd4, 0xa4, 0x00, 0x60, 0x5e, 0xc8, 0xd3, 0x2a } -- }, --#endif - }; - - test_murmurhash3_algorithm("murmurhash3_128", murmurhash3_128, diff --git a/847790d5aab84df38256a6f9b4849af0eb408419.patch b/847790d5aab84df38256a6f9b4849af0eb408419.patch deleted file mode 100644 index b85ec07..0000000 --- a/847790d5aab84df38256a6f9b4849af0eb408419.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 847790d5aab84df38256a6f9b4849af0eb408419 Mon Sep 17 00:00:00 2001 -From: Stephan Bosch -Date: Mon, 14 May 2018 23:56:21 +0200 -Subject: [PATCH] lmtp: Fix segfault occurring when a user turns out to be over - quota at DATA transfer. - -The LMTP recipient context was not updated with the final recipient address when -the RCPT command was accepted. This left a dangling struct smtp_address pointer -which triggered the segfault when used. ---- - src/lmtp/lmtp-common.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lmtp/lmtp-common.c b/src/lmtp/lmtp-common.c -index b3f13dec41..39ed6c1b4f 100644 ---- a/src/lmtp/lmtp-common.c -+++ b/src/lmtp/lmtp-common.c -@@ -22,6 +22,7 @@ void lmtp_recipient_finish(struct lmtp_recipient *rcpt, - { - trcpt->context = rcpt; - -+ rcpt->path = trcpt->path; - rcpt->rcpt = trcpt; - rcpt->index = index; - rcpt->rcpt_cmd = NULL; diff --git a/dovecot-2.3-pigeonhole-0.5.1.tar.gz b/dovecot-2.3-pigeonhole-0.5.1.tar.gz deleted file mode 100644 index 7f324ff..0000000 --- a/dovecot-2.3-pigeonhole-0.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3b0aa59261881bcb0d33a6c398f3cb5f9f75e077e67bae175cf33c362577547 -size 1792702 diff --git a/dovecot-2.3-pigeonhole-0.5.1.tar.gz.sig b/dovecot-2.3-pigeonhole-0.5.1.tar.gz.sig deleted file mode 100644 index fc2218a..0000000 --- a/dovecot-2.3-pigeonhole-0.5.1.tar.gz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJausY5AAoJEATWKx49+7T0VvQIAKzBCxGmq0MDrvYg3nFREQOs -qQ+MJARnyPXxxu2lKdCdUUzT8Yg3zlKlLwjHRASq34yztTUOhbp0JdctIFU5ykbM -MZ/GsPvUBKpA0y1UoRDKibE1giM818S7q3RWi7KMVCOXvAJtSlemHZRlVEAdtwnC -OMteFYVo+zARPAgk7YKlghbKID16JErmjFQzr4QZE8+p1dI22G5OKHP9G5cC7VSN -HYntFc5LhBMhzIv19hZWghWNJdmOxCqpI5999sx+moQNfe3uN1esKcEB1AHFzrvl -Uf67NE8jK1wLVeE+d8syB7omC4uL/Y/shcgpjCQ7SUDrDENyfBMoC5Pc/Hlb0iY= -=+XOK ------END PGP SIGNATURE----- diff --git a/dovecot-2.3-pigeonhole-0.5.2.tar.gz b/dovecot-2.3-pigeonhole-0.5.2.tar.gz new file mode 100644 index 0000000..759cd62 --- /dev/null +++ b/dovecot-2.3-pigeonhole-0.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:950e8e15c58e539761255e140dd3678dd2477fa432a5f2b804e53821bdc02535 +size 1814618 diff --git a/dovecot-2.3-pigeonhole-0.5.2.tar.gz.sig b/dovecot-2.3-pigeonhole-0.5.2.tar.gz.sig new file mode 100644 index 0000000..0441070 --- /dev/null +++ b/dovecot-2.3-pigeonhole-0.5.2.tar.gz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJbNd5gAAoJEATWKx49+7T0FAsH/RTJSMhVswyOOTGXPrU8EqNv +cNb5oWxoI+UOw1UuxOHqYvaXPDHVo5rB8eY9uUelNbaz28CxKjJmOABJbqwHIuNc +R4WSdgTBLX/Yo196rkIDtZhM8mlEUDDPIgLIztcoILNJ6nllAC6ftft5gTcQ1QKy +f3Fvbsf9YkEsVHKoaDWz/8/Twq2QvHiGaa1jhtdPDnjyLqT6OxHStTiitMQ9Lzvn +881OVRrpJxmKkuEPNcP/hl4b6FrPxFsfzD4VdwZOavmPDQOVh43dNyCnORBxIjCe +pTQO/LO4XUHyMkGOePbViXIAnygqcunXUoV1Vwgh8BgB0zoJSyFxHuxnSJ0fy/0= +=eD05 +-----END PGP SIGNATURE----- diff --git a/dovecot-2.3.0-better_ssl_defaults.patch b/dovecot-2.3.0-better_ssl_defaults.patch index 56c346e..7625e7a 100644 --- a/dovecot-2.3.0-better_ssl_defaults.patch +++ b/dovecot-2.3.0-better_ssl_defaults.patch @@ -1,7 +1,7 @@ -Index: dovecot-2.3.0.rc1/doc/example-config/conf.d/10-ssl.conf +Index: dovecot-2.3.2/doc/example-config/conf.d/10-ssl.conf =================================================================== ---- dovecot-2.3.0.rc1.orig/doc/example-config/conf.d/10-ssl.conf -+++ dovecot-2.3.0.rc1/doc/example-config/conf.d/10-ssl.conf +--- dovecot-2.3.2.orig/doc/example-config/conf.d/10-ssl.conf ++++ dovecot-2.3.2/doc/example-config/conf.d/10-ssl.conf @@ -9,8 +9,8 @@ # dropping root privileges, so keep the key file unreadable by anyone but # root. Included doc/mkcert.sh can be used to easily generate self-signed @@ -34,13 +34,13 @@ Index: dovecot-2.3.0.rc1/doc/example-config/conf.d/10-ssl.conf # no_ticket - Disable SSL session tickets. #ssl_options = +ssl_options = no_compression -Index: dovecot-2.3.0.rc1/src/lib-master/master-service-ssl-settings.c +Index: dovecot-2.3.2/src/lib-master/master-service-ssl-settings.c =================================================================== ---- dovecot-2.3.0.rc1.orig/src/lib-master/master-service-ssl-settings.c -+++ dovecot-2.3.0.rc1/src/lib-master/master-service-ssl-settings.c -@@ -55,7 +55,7 @@ static const struct master_service_ssl_s - .ssl_client_ca_file = "", - .ssl_client_ca_dir = "", +--- dovecot-2.3.2.orig/src/lib-master/master-service-ssl-settings.c ++++ dovecot-2.3.2/src/lib-master/master-service-ssl-settings.c +@@ -59,7 +59,7 @@ static const struct master_service_ssl_s + .ssl_client_cert = "", + .ssl_client_key = "", .ssl_dh = "", - .ssl_cipher_list = "ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH", + .ssl_cipher_list = "ALL:!LOW:!SSLv2:!EXP:!aNULL:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH", diff --git a/dovecot-2.3.1.tar.gz b/dovecot-2.3.1.tar.gz deleted file mode 100644 index 5e68353..0000000 --- a/dovecot-2.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0883821b97fd02a084a84b9469a681f7e6edc56541d854b5419d98891c51fb93 -size 6703089 diff --git a/dovecot-2.3.1.tar.gz.sig b/dovecot-2.3.1.tar.gz.sig deleted file mode 100644 index 5ee7451..0000000 --- a/dovecot-2.3.1.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJLBAABCAA1FiEEK+dKqz7nVN+5yA0zGKNIru1AnaEFAlq6eFAXHGRvdmVjb3Qt -Y2VAZG92ZWNvdC5vcmcACgkQGKNIru1AnaFrRQ//fN5gD247sLNRVDDdkG9JpoOT -nVLV1m9DX5jxPcWxir3vovP8WnVO6qrBYk/d+uJvtgBT6e09yW6wF1PozD1HrBXA -6JqTE/DmBXSvuX4Zf7ENq90Th/jYOdZ/jWrb3nGeDq9uCqW3KjGI6Yry3zumu+XH -G4RaV6tfenOBuhUM8V5yo8+JqfUXZgdYtF9Wx+x8JkWjChdPE1kJX2lt8RTrqw9K -l51m5KqiQavbw7EppLwYa58n6+UDaufsgN8w5OWhuPsPaWHd3KZhd+POTL8ClORQ -DOIyzmBj0JS+97gv0kktMxSq1sqEBnRtwbIJ37YGqYZsJencGJZYX8ZARPx3XXbh -e0iugv5rB+g8U6521KNx3c/0vzGswe5YqcVuDJPRusEvTpiHeYGpA87kCnCmpQ+M -77+lS/NNvS3BsBUU4dWVLZKBx6XZ/fvVcVJyHF2+l+UrDf8uK9lnr+B1oQgmXyR5 -tZ0LwqKq6uAp0+E7kK0Uscm3d1skguOz1QMAELQ3v0G8M04it2Ijzu+/0qWFIM46 -UuqITWhpxX6jZQLNRY+AtJTxCFxZzomPGCBSdc86nYV9803zE+ReWZooVNnZprOT -IYlt//fXIA4acvCGU4yU2pE7RaZaULbG/nLpWZo8AylqIjxjhpv6BvgMFf1U8RAi -PbLbr+SGtMuB1fQ0HTw= -=eRuT ------END PGP SIGNATURE----- diff --git a/dovecot-2.3.2.tar.gz b/dovecot-2.3.2.tar.gz new file mode 100644 index 0000000..31b57af --- /dev/null +++ b/dovecot-2.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e48f0fa60768427f03035b0a3e93d1ae29b972bb2bd9ca998ccc6a0f6dae393 +size 6796744 diff --git a/dovecot-2.3.2.tar.gz.sig b/dovecot-2.3.2.tar.gz.sig new file mode 100644 index 0000000..e18a905 --- /dev/null +++ b/dovecot-2.3.2.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJLBAABCAA1FiEEK+dKqz7nVN+5yA0zGKNIru1AnaEFAls0948XHGRvdmVjb3Qt +Y2VAZG92ZWNvdC5vcmcACgkQGKNIru1AnaFvzhAA133ft6j3NSOKej57FynWPg48 +qgc6C6/cmeoIgn59DbDbC3ckrhBh0bu8qLEhyj968gL6S1ea/H9nbYEpPDmdmB/7 +mnXmKUoJXGWD7EMh/rpd5l7HVkgSvFyvYgpluVco6CwaWeFTs+LczgzxQxAacDwo +3MBD7eSYDpVoR3TZVxjeCkBYlFdB+YMj1N7QAhzTuf+XOYpOYlW9qOlq0ZnEgM0O +IWgAm2QLeWyLVeQA6RkaIDU0jg/4b+2Q9DjfdU8mpkiVfyUxlokg48veO336vxnn +GPn4kR6cBauCxE/pVys0uVAd7H4Zm95EVV8ReT49BGwLIS17geWdbqSnI9S2F6Lh +xzVCgIAuMKnMKI5fRyCVnUY2h3TykLZtB1uoHyizhUPLD0G6DF56raTAcr4N1bDx +2Yol/ATDcw9Jd5ugCJB2ZAupinOqErEhuJpallCwdzCLFNezffoK4nAdwFAmkqhI +oRwPhsVgbMFjces1GdWL0IS4MGndRg2XJF/pP7i+czFvcHF/rs+3CnH0khmr1egd +0cddIcScBH3gRmgMCLTUt51H5f/nBFlw+qpgSLarmjPq2//v5fskmSl4gqUOKzHr +wMD2vE9Y69hGT0NzFJrLsYcGr8+CQa5RJ7orFDHtEmTsCrndTUQDXqE35y1KHw2m +YH5uymS/eiTX40hKD9Y= +=CfFN +-----END PGP SIGNATURE----- diff --git a/dovecot23.changes b/dovecot23.changes index 1acb2f1..0e78a92 100644 --- a/dovecot23.changes +++ b/dovecot23.changes @@ -1,3 +1,96 @@ +------------------------------------------------------------------- +Sat Jun 30 20:06:40 UTC 2018 - mrueckert@suse.de + +- update to 2.3.2 + * old-stats plugin: Don't temporarily enable PR_SET_DUMPABLE + while opening /proc/self/io. This may still cause security + problems if the process is ptrace()d at the same time. + Instead, open it while still running as root. + + doveadm: Added mailbox cache decision&remove commands. See + doveadm-mailbox(1) man page for details. + + doveadm: Added rebuild attachments command for rebuilding + $HasAttachment or $HasNoAttachment flags for matching mails. + See doveadm-rebuild(1) man page for details. + + cassandra: Use fallback_consistency on more types of errors + + lmtp proxy: Support outgoing SSL/TLS connections + + lmtp: Add lmtp_rawlog_dir and lmtp_proxy_rawlog_dir settings. + + submission: Add support for rawlog_dir + + submission: Add submission_client_workarounds setting. + + lua auth: Add password_verify() function and additional fields + in auth request. + - doveadm-server: TCP connections are hanging when there is a lot + of network output. This especially caused hangs in + dsync-replication. + - Using multiple type=shared mdbox namespaces crashed + - mail_fsync setting was ignored. It was always set to + "optimized". + - lua auth: Fix potential crash at deinit + - SSL/TLS servers may have crashed if client disconnected during + handshake. + - SSL/TLS servers: Don't send extraneous certificates to client + when alt certs are used. + - lda, lmtp: Return-Path header without '<' may have + assert-crashed. + - lda, lmtp: Unencoded UTF-8 in email address headers may + assert-crash + - lda: -f parameter didn't allow empty/null/domainless address + - lmtp, submission: Message size limit was hardcoded to 40 MB. + Exceeding it caused the connection to get dropped during + transfer. + - lmtp: Fix potential crash when delivery fails at DATA stage + - lmtp: login_greeting setting was ignored + - Fix to work with OpenSSL v1.0.2f + - systemd unit restrictions were too strict by default + - Fix potential crashes when a lot of log output was produced + - SMTP client may have assert-crashed when sending mail + - IMAP COMPRESS: Send "end of compression" marker when + disconnecting. + - cassandra: Fix consistency=quorum to work + - dsync: Lock file generation failed if home directory didn't + exist + - Snippet generation for HTML mails didn't ignore &entities + inside blockquotes, producing strange looking snippets. + - imapc: Fix assert-crash if getting disconnected and after + reconnection all mails in the selected mailbox are gone. + - pop3c: Handle unexpected server disconnections without + assert-crash + - fts: Fixes to indexing mails via virtual mailboxes. + - fts: If mails contained NUL characters, the text around it + wasn't indexed. + - Obsolete dovecot.index.cache offsets were sometimes used. + Trying to fetch a field that was just added to cache file may + not have always found it. +- update pigeonhole to 0.5.2 + + Implement plugin for the a vendor-defined IMAP capability + called "FILTER=SIEVE". It adds the ability to manually invoke + Sieve filtering in IMAP. More information can be found in + doc/plugins/imap_filter_sieve.txt. + - The Sieve addess test caused an assertion panic for invalid + addresses with UTF-8 codepoints in the localpart. Fixed by + properly detecting invalid addresses with UTF-8 codepoints in + the localpart and skipping these like other invalid addresses + while iterating addresses for the address test. + - Make the length of the subject header for the vacation response + configurable and enforce the limit in UTF-8 codepoints rather + than bytes. The subject header for a vacation response was + statically truncated to 256 bytes, which is too limited for + multi-byte UTF-8 characters. + - Sieve editheader extension: Fix assertion panic occurring when + it is used to manipulate a message header with a very large + header field. + - Properly abort execution of the sieve_discard script upon + error. Before, the LDA Sieve plugin attempted to execute the + sieve_discard script when an error occurs. This can lead to the + message being lost. + - Fix the interaction between quota and the sieve_discard script. + When quota was used together with a sieve_discard script, the + message delivery did not bounce when the quota was exceeded. +- refreshed to apply cleanly again dovecot-2.3.0-better_ssl_defaults.patch +- dropped patches: + - 35497604d80090a02619024aeec069b32568e4b4.diff + - 5522b8b3d3ed1a99c3b63bb120216af0bd427403.diff + - 847790d5aab84df38256a6f9b4849af0eb408419.patch + ------------------------------------------------------------------- Sun May 27 09:31:02 UTC 2018 - mrueckert@suse.de diff --git a/dovecot23.spec b/dovecot23.spec index 4435c9e..e259b4c 100644 --- a/dovecot23.spec +++ b/dovecot23.spec @@ -17,11 +17,11 @@ Name: dovecot23 -Version: 2.3.1 +Version: 2.3.2 Release: 0 %define pkg_name dovecot -%define dovecot_version 2.3.1 -%define dovecot_pigeonhole_version 0.5.1 +%define dovecot_version 2.3.2 +%define dovecot_pigeonhole_version 0.5.2 %define dovecot_branch 2.3 %define dovecot_pigeonhole_source_dir %{pkg_name}-%{dovecot_branch}-pigeonhole-%{dovecot_pigeonhole_version} %define dovecot_pigeonhole_docdir %{_docdir}/%{pkg_name}/dovecot-pigeonhole @@ -136,9 +136,6 @@ Source11: http://pigeonhole.dovecot.org/releases/%{dovecot_branch}/%{dovec Source12: dovecot23.keyring Patch: dovecot-2.3.0-dont_use_etc_ssl_certs.patch Patch1: dovecot-2.3.0-better_ssl_defaults.patch -Patch2: 35497604d80090a02619024aeec069b32568e4b4.diff -Patch3: 5522b8b3d3ed1a99c3b63bb120216af0bd427403.diff -Patch4: 847790d5aab84df38256a6f9b4849af0eb408419.patch Summary: IMAP and POP3 Server Written Primarily with Security in Mind License: BSD-3-Clause AND LGPL-2.1-or-later AND MIT Group: Productivity/Networking/Email/Servers @@ -318,9 +315,6 @@ dovecot tree. %setup -q -n %{pkg_name}-%{dovecot_version} -a 1 %patch -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 gzip -9v ChangeLog # Fix plugins dir. sed -i 's|#mail_plugin_dir = /usr/lib/dovecot|mail_plugin_dir = %{_libdir}/dovecot/modules|' doc/example-config/conf.d/10-mail.conf @@ -623,6 +617,7 @@ fi %{_libdir}/%{pkg_name}/modules/lib90_sieve_plugin.so %{_libdir}/%{pkg_name}/modules/lib90_old_stats_plugin.so %{_libdir}/%{pkg_name}/modules/lib95_imap_sieve_plugin.so +%{_libdir}/%{pkg_name}/modules/lib95_imap_filter_sieve_plugin.so %{_libdir}/%{pkg_name}/modules/lib95_imap_old_stats_plugin.so %{_libdir}/%{pkg_name}/modules/lib99_welcome_plugin.so %{_libdir}/%{pkg_name}/modules/libfs_compress.so