- switch to official FSF binutils due to stability problems with Linux Kernel binutils

- pax patch needs love

diff --git a/binutils-libdir.patch b/binutils-libdir.patch
index f0e1b790b3440096fb0d503b31070e3d3c47a5ae..8347fe242c0cc7e4d9fbe2a288b22e68c4dbc79a 100644 (file)
--- a/binutils-libdir.patch
+++ b/binutils-libdir.patch
@@ -3,7 +3,7 @@
 @@ -52,7 +52,7 @@ ZLIBINC = @zlibinc@
  WARN_CFLAGS = @WARN_CFLAGS@
  NO_WERROR = @NO_WERROR@
- AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
+ AM_CFLAGS = $(WARN_CFLAGS)
 -AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
 +AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DLIBDIR='"$(libdir)"'
  if PLUGINS

diff --git a/binutils-pt_pax_flags.patch b/binutils-pt_pax_flags.patch
index 7708923a1512ebce148ba6ef5ed0abd671bed796..696702664bc454f69ce0c1c95e41f0b5f742537d 100644 (file)
--- a/binutils-pt_pax_flags.patch
+++ b/binutils-pt_pax_flags.patch
@@ -159,9 +159,9 @@
 --- binutils-2.15.94.0.2.2.orig/include/elf/common.h   2004-11-22 21:33:32.000000000 +0100
 +++ binutils-2.15.94.0.2.2/include/elf/common.h        2005-02-20 13:13:17.482539960 +0100
 @@ -423,6 +423,7 @@
+ #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
  #define PT_GNU_STACK  (PT_LOOS + 0x474e551) /* Stack flags */
  #define PT_GNU_RELRO  (PT_LOOS + 0x474e552) /* Read-only after relocation */
- #define PT_GNU_SHR    (PT_LOOS + 0x474e554) /* Sharable segment */
 +#define PT_PAX_FLAGS   (PT_LOOS + 0x5041580) /* PaX flags */
  
  /* Program segment permissions, in program header p_flags field.  */

diff --git a/binutils.spec b/binutils.spec
index 8a34ae67eb2293edc1c17e5a459d587fec6bac78..5cc989a979b56335d50efeeac75ddd35b4f3e401 100644 (file)
--- a/binutils.spec
+++ b/binutils.spec
@@ -23,19 +23,13 @@ Summary(ru.UTF-8):  Набор инструментов GNU для построе
 Summary(tr.UTF-8):     GNU geliştirme araçları
 Summary(uk.UTF-8):     Набір інструментів GNU для побудови виконуваних програм
 Name:          binutils
-Version:       2.25.51.0.2
+Version:       2.25.1
 Release:       1
-Epoch:         3
+Epoch:         4
 License:       GPL v3+
 Group:         Development/Tools
-# Source0:     https://www.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.xz
-
-# release with no tarball - https://sourceware.org/git/?p=binutils-gdb.git;a=summary
-# git clone git://sourceware.org/git/binutils-gdb.git && cd binutils-gdb
-# git archive --format tar --prefix binutils-2.25.51.0.2/ users/hjl/linux/release/2.25.51.0.2 | xz - > ~/rpm/packages/binutils/binutils-2.25.51.0.2.tar.xz
-Source0:       %{name}-%{version}.tar.xz
-# Source0-md5: c0b0040913d1256ce033093418a1f3d6
-
+Source0:       http://ftp.gnu.org/gnu/binutils/%{name}-%{version}.tar.bz2
+# Source0-md5: ac493a78de4fee895961d025b7905be4
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6
 Patch0:                %{name}-gasp.patch
@@ -171,8 +165,8 @@ niektórych pakietów.
 %{?with_gasp:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
-%{?with_pax:%patch3 -p1}
-%patch4 -p1
+#%{?with_pax:%patch3 -p1}
+#%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1