diff --git a/.gitignore b/.gitignore index 2d11c9c..328b7d4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ amanda-*.*.*/ /amanda-3.4.tar.gz /amanda-3.4.1.tar.gz /amanda-3.4.2.tar.gz +/amanda-3.4.3.tar.gz diff --git a/amanda-3.4.2-fix-sse.patch b/amanda-3.4.2-fix-sse.patch deleted file mode 100644 index 6b58323..0000000 --- a/amanda-3.4.2-fix-sse.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/common-src/amutil.c b/common-src/amutil.c -index 864d78f..25d9fca 100644 ---- a/common-src/amutil.c -+++ b/common-src/amutil.c -@@ -2096,6 +2096,11 @@ static int get_sse42(void) - #endif - return (ecx >> 20) & 1; - } -+#else -+static int get_sse42(void) -+{ -+ return 0; -+} - #endif - - static uint32_t crc_table[16][256]; diff --git a/amanda-3.4.2-local-security-gid.patch b/amanda-3.4.2-local-security-gid.patch deleted file mode 100644 index 87ff91c..0000000 --- a/amanda-3.4.2-local-security-gid.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp old/common-src/local-security.c new/common-src/local-security.c ---- old/common-src/local-security.c 2017-01-31 16:05:21.000000000 +0100 -+++ new/common-src/local-security.c 2017-02-17 13:22:59.318412325 +0100 -@@ -277,7 +277,7 @@ runlocal( - initgroups(CLIENT_LOGIN, gid); - } - if (gid != 0) -- setregid(uid, gid); -+ setregid(gid, gid); - if (uid != 0) - setreuid(uid, uid); - #endif diff --git a/amanda-3.4.2-planner-segfault.patch b/amanda-3.4.2-planner-segfault.patch deleted file mode 100644 index a2743ef..0000000 --- a/amanda-3.4.2-planner-segfault.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/server-src/tapefile.c -+++ a/server-src/tapefile.c -@@ -1199,8 +1199,7 @@ nb_tape_in_storage( - int nb_tapes = 0; - - for (tp = tape_list; tp != NULL; tp = tp->next) { -- if (tp->storage && -- g_str_equal(storage_name, tp->storage)) { -+ if (g_strcmp0(storage_name,tp->storage) == 0) { - nb_tapes++; - } - } diff --git a/amanda.spec b/amanda.spec index 8dfa317..1d91ab2 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.4.2 -Release: 4%{?dist} +Version: 3.4.3 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -28,13 +28,6 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch # Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch -# Fails to build on non-x86 due to sse-related things. This patch comes from -# upstream. -Patch5: amanda-3.4.2-fix-sse.patch -# Patch from upstream to fix segfault in planner. -Patch6: amanda-3.4.2-planner-segfault.patch -# Fix problem with local authentication -Patch7: amanda-3.4.2-local-security-gid.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -444,6 +437,9 @@ make check %changelog +* Thu Mar 02 2017 Josef Ridky - 3.4.3-1 +- New upstream release 3.4.3 (#1428185) + * Wed Mar 1 2017 Josef Ridky - 3.4.2-4 - Fix issue with local authentication (#1427775) diff --git a/sources b/sources index 285bc00..0433e39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.4.2.tar.gz) = dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd +SHA512 (amanda-3.4.3.tar.gz) = 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a