Bump to 4.3.25

Bug: CVE-2014-7169
Change-Id: Iee8ba36a4fde4751cfaa6e20beae94a18b0fa272
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/.gbs.conf b/.gbs.conf
new file mode 100644 (file)
index 0000000..3cdac5d
--- /dev/null
+++ b/.gbs.conf
@@ -0,0 +1,4 @@
+[general]
+upstream_branch = upstream
+upstream_tag = upstream/${upstreamversion}
+

diff --git a/packaging/bash-rpmlintrc b/packaging/bash-rpmlintrc
new file mode 100644 (file)
index 0000000..d3025ff
--- /dev/null
+++ b/packaging/bash-rpmlintrc
@@ -0,0 +1 @@
+addFilter("hidden-file-or-dir .*/usr/share/man/man1/..1.gz")

diff --git a/packaging/bash.spec b/packaging/bash.spec
index c653677..d672c41 100644 (file)
--- a/packaging/bash.spec
+++ b/packaging/bash.spec
@@ -1,16 +1,17 @@
 Name:           bash
-Version:        4.2
+Version:        4.3.25
 Release:        1
 License:        GPL-3.0+
 Summary:        The GNU Bourne Again shell
 Url:            http://www.gnu.org/software/bash
-Group:          Base/Tools
-Source0:        ftp://ftp.gnu.org/gnu/bash/%{name}-%{version}.tar.gz
+Group:          Base/Utilities
+Source0:        %{name}-%{version}.tar.gz
 Source1:        dot.bashrc
 Source2:        dot.profile
 Source1001:    bash.manifest
 BuildRequires:  autoconf
 BuildRequires:  bison
+BuildRequires:  fdupes
 Provides:      /bin/bash
 Provides:      /bin/sh
 
@@ -91,23 +92,14 @@ LONG_BIT=$(getconf LONG_BIT)
 mv %{buildroot}%{_bindir}/bashbug \
    %{buildroot}%{_bindir}/bashbug-"${LONG_BIT}"
 
-# Fix missing sh-bangs in example scripts (bug #225609).
-for script in \
-  examples/scripts/krand.bash \
-  examples/scripts/bcsh.sh \
-  examples/scripts/precedence \
-  examples/scripts/shprompt
-do
-  cp "$script" "$script"-orig
-  echo '#!/bin/bash' > "$script"
-  cat "$script"-orig >> "$script"
-  rm -f "$script"-orig
-done
-
 rm -rf %{buildroot}%{_bindir}/bashbug-*
 chmod a-x doc/*.sh
 
+# remove duplicate manpages
+%fdupes -s %{buildroot}/%{_mandir}
+
 %docs_package
+%doc %{_datadir}/doc/%{name}/*
 
 %post -p <lua>
 bashfound = false;
@@ -157,6 +149,7 @@ fi
 %license COPYING
 %{_bindir}/sh
 %{_bindir}/bash
-%{_sysconfdir}/skel
+%config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc
+%config %attr(644,root,root) %{_sysconfdir}/skel/.bash_profile
 %dir %{_sysconfdir}/bash_completion.d