changing to bugfix branch of binutils

4 files changed, 91 insertions, 5 deletions

diff --git a/src/stage2/patches/generic/binutils.patch b/src/stage2/patches/generic/binutils.patch
index 178192d..0c3df6c 100644
--- a/src/stage2/patches/generic/binutils.patch
+++ b/src/stage2/patches/generic/binutils.patch
@@ -1,7 +1,33 @@
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-05-19 22:42:12.064158439 +0200
-+++ b/PKGBUILD	2018-05-19 22:47:21.014161521 +0200
-@@ -51,6 +51,7 @@ build() {
+--- a/PKGBUILD	2018-05-26 08:42:40.899690467 +0200
++++ b/PKGBUILD	2018-05-28 16:30:29.258361376 +0200
+@@ -20,13 +20,15 @@ options=(staticlibs !distcc !ccache)
+ source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig}
+         0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch
+         0002-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch
+-        0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch)
++        0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch
++        https://raw.githubusercontent.com/archlinux32/packages/master/core/binutils/binutils-2.30-branch.patch)
+ validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
+ md5sums=('ffc476dd46c96f932875d1b2e27e929f'
+          'SKIP'
+          '469164f3c93a0e92a697537b60c9806c'
+          '0c679b37e90fb23de60a4d28329b956a'
+-         '53b5682e09c0a27e9994c3efdfe01d29')
++         '53b5682e09c0a27e9994c3efdfe01d29'
++         'a5ba9fc9de327b2eff071e19429c6e67')
+ 
+ prepare() {
+   mkdir -p binutils-build
+@@ -45,12 +47,15 @@ prepare() {
+ 
+   # https://sourceware.org/bugzilla/show_bug.cgi?id=22836
+   patch -p1 -i "$srcdir/0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch"
++
++  patch -p1 -i "$srcdir/binutils-2.30-branch.patch"
+ }
+ 
+ build() {
    cd binutils-build
  
    "$srcdir/binutils-$pkgver/configure" \
@@ -9,7 +35,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
      --prefix=/usr \
      --with-lib-path=/usr/lib:/usr/local/lib \
      --with-bugurl=https://bugs.archlinux.org/ \
-@@ -66,7 +67,7 @@ build() {
+@@ -66,7 +71,7 @@ build() {
      --disable-gdb \
      --disable-werror \
      --with-pic \
diff --git a/src/stage3/makepkg.conf.in b/src/stage3/makepkg.conf.in
index 088712e..a61887c 100644
--- a/src/stage3/makepkg.conf.in
+++ b/src/stage3/makepkg.conf.in
@@ -7,7 +7,7 @@ VCSCLIENTS=('bzr::bzr'
             'git::git'
             'hg::mercurial'
             'svn::subversion')
-CPPFLAGS=""
+CPPFLAGS="-D_FORTIFY_SOURCE=2"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/src/stage3/patches/generic/binutils.patch b/src/stage3/patches/generic/binutils.patch
new file mode 100644
index 0000000..adfad3a
--- /dev/null
+++ b/src/stage3/patches/generic/binutils.patch
@@ -0,0 +1,30 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-05-26 08:42:40.899690467 +0200
++++ b/PKGBUILD	2018-05-28 16:32:59.548362875 +0200
+@@ -20,13 +20,15 @@ options=(staticlibs !distcc !ccache)
+ source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig}
+         0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch
+         0002-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch
+-        0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch)
++        0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch
++        https://raw.githubusercontent.com/archlinux32/packages/master/core/binutils/binutils-2.30-branch.patch)
+ validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
+ md5sums=('ffc476dd46c96f932875d1b2e27e929f'
+          'SKIP'
+          '469164f3c93a0e92a697537b60c9806c'
+          '0c679b37e90fb23de60a4d28329b956a'
+-         '53b5682e09c0a27e9994c3efdfe01d29')
++         '53b5682e09c0a27e9994c3efdfe01d29'
++         'a5ba9fc9de327b2eff071e19429c6e67')
+ 
+ prepare() {
+   mkdir -p binutils-build
+@@ -45,6 +47,8 @@ prepare() {
+ 
+   # https://sourceware.org/bugzilla/show_bug.cgi?id=22836
+   patch -p1 -i "$srcdir/0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch"
++
++  patch -p1 -i "$srcdir/binutils-2.30-branch.patch"
+ }
+ 
+ build() {
diff --git a/src/stage4/patches/generic/binutils.patch b/src/stage4/patches/generic/binutils.patch
new file mode 100644
index 0000000..adfad3a
--- /dev/null
+++ b/src/stage4/patches/generic/binutils.patch
@@ -0,0 +1,30 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-05-26 08:42:40.899690467 +0200
++++ b/PKGBUILD	2018-05-28 16:32:59.548362875 +0200
+@@ -20,13 +20,15 @@ options=(staticlibs !distcc !ccache)
+ source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig}
+         0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch
+         0002-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch
+-        0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch)
++        0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch
++        https://raw.githubusercontent.com/archlinux32/packages/master/core/binutils/binutils-2.30-branch.patch)
+ validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
+ md5sums=('ffc476dd46c96f932875d1b2e27e929f'
+          'SKIP'
+          '469164f3c93a0e92a697537b60c9806c'
+          '0c679b37e90fb23de60a4d28329b956a'
+-         '53b5682e09c0a27e9994c3efdfe01d29')
++         '53b5682e09c0a27e9994c3efdfe01d29'
++         'a5ba9fc9de327b2eff071e19429c6e67')
+ 
+ prepare() {
+   mkdir -p binutils-build
+@@ -45,6 +47,8 @@ prepare() {
+ 
+   # https://sourceware.org/bugzilla/show_bug.cgi?id=22836
+   patch -p1 -i "$srcdir/0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch"
++
++  patch -p1 -i "$srcdir/binutils-2.30-branch.patch"
+ }
+ 
+ build() {