Changeset 73ace20 for patches

Timestamp:

Oct 10, 2012, 6:42:21 PM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

Location:

patches

Files:

• bash-4.2-branch_update-2.patch (deleted)
• bash-4.2-branch_update-5.patch (added)
• binutils-2.22-branch_update-1.patch (added)
• coreutils-8.12-uname-1.patch (deleted)
• coreutils-8.19-uname-1.patch (added)
• eglibc-2.15-fixes-1.patch (added)
• eglibc-2.15-r16526-dl_dep_fix-1.patch (moved) (moved from patches/eglibc-2.13-r13356-dl_dep_fix-1.patch ) (3 diffs)
• flex-2.5.35-gcc44-1.patch (deleted)
• gcc-4.6.0-branch_update-1.patch (deleted)
• gcc-4.6.3-branch_update-1.patch (added)
• gcc-4.6.3-mips_fix-1.patch (moved) (moved from patches/gcc-4.6.0-mips_fix-1.patch )
• gcc-4.6.3-pure64-1.patch (moved) (moved from patches/gcc-4.6.0-pure64-1.patch )
• gcc-4.6.3-pure64_specs-1.patch (moved) (moved from patches/gcc-4.6.0-pure64_specs-1.patch )
• gcc-4.6.3-specs-1.patch (moved) (moved from patches/gcc-4.6.0-specs-1.patch )
• iana-etc-2.30-get_fix-1.patch (added)
• iana-etc-2.30-numbers_update-20120610-2.patch (added)
• iproute2-3.4.0-libdir-1.patch (moved) (moved from patches/iproute2-2.6.38-libdir-1.patch ) (3 diffs)
• module-init-tools-3.15-zlib_fix-1.patch (added)
• ncurses-5.9-branch_update-2.patch (deleted)
• ncurses-5.9-branch_update-4.patch (added)
• perl-5.14.0-Configure_multilib-1.patch (deleted)
• perl-5.14.0-libc-1.patch (deleted)
• perl-5.16.1-Configure_multilib-1.patch (added)
• perl-5.16.1-libc-1.patch (added)
• readline-6.2-branch_update-1.patch (deleted)
• readline-6.2-branch_update-2.patch (added)
• silo-1.4.14-fixes-2.patch (deleted)
• silo-1.4.14-fixes-3.patch (added)
• vim-7.3-branch_update-2.patch (deleted)
• vim-7.3-branch_update-5.patch (added)
• yaboot-1.3.17-ofpath_path_prefix-1.patch (moved) (moved from patches/yaboot-1.3.14-ofpath_path_prefix-1.patch )

patches/eglibc-2.15-r16526-dl_dep_fix-1.patch

@@ -1 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2011-04-16
-Initial Package Version: 2.13 r13356
+Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)
+Date: 2012-02-26
+Initial Package Version: 2.15 r16526
 Origin: Andreas Schwab
         Via http://sourceware.org/ml/libc-hacker/2011-02/msg00002.html
@@ -7 +7 @@
 Description: If a ELF binaries dependencies are missing it was causing
              a signal too early.
+Rediffed by Jonathan Norman for Eglibc 2.15
 
-diff -Naur eglibc-2.13.orig/elf/dl-deps.c eglibc-2.13/elf/dl-deps.c
---- eglibc-2.13.orig/elf/dl-deps.c      2011-02-04 22:31:21.000000000 +0000
-+++ eglibc-2.13/elf/dl-deps.c   2011-04-16 23:44:34.479218974 +0000
-@@ -491,6 +491,10 @@
+
+diff -Naur eglibc-2.15.orig/elf/dl-deps.c eglibc-2.15/elf/dl-deps.c
+--- eglibc-2.15.orig/elf/dl-deps.c      2012-02-26 17:15:55.394189832 +0000
++++ eglibc-2.15/elf/dl-deps.c   2012-02-26 17:21:48.882756229 +0000
+@@ -502,6 +502,10 @@
    if (errno == 0 && errno_saved != 0)
      __set_errno (errno_saved);
@@ -17 +19 @@
 +  if (errno_reason)
 +    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
-+                     NULL, errstring);
++                     NULL, errstring);
 +
    struct link_map **old_l_initfini = NULL;
    if (map->l_initfini != NULL && map->l_type == lt_loaded)
      {
-@@ -683,8 +687,4 @@
-     }
+@@ -699,7 +703,4 @@
    if (old_l_initfini != NULL)
-     _dl_scope_free (old_l_initfini);
--
+       map->l_orig_initfini = old_l_initfini;
+ 
 -  if (errno_reason)
 -    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,

patches/iproute2-3.4.0-libdir-1.patch

@@ -9 +9 @@
              Updated for Iproute2-2.6.37 by Joe Ciccone
              Renamed for Iproute2-2.6.38 by Jonathan Norman
+             Rediffed for Iproute2-3.4.0 by William Harrington
 
-diff -Naur iproute2-2.6.37.orig/Makefile iproute2-2.6.37/Makefile
---- iproute2-2.6.37.orig/Makefile       2011-01-07 12:54:30.000000000 -0500
-+++ iproute2-2.6.37/Makefile    2011-01-08 19:22:59.954895722 -0500
-@@ -12,7 +12,7 @@
+diff -Naur iproute2-3.4.0.orig/Makefile iproute2-3.4.0/Makefile
+--- iproute2-3.4.0.orig/Makefile        2012-05-21 21:12:19.000000000 +0000
++++ iproute2-3.4.0/Makefile     2012-09-16 00:43:20.000000000 +0000
+@@ -13,7 +13,7 @@
  
  SHARED_LIBS = y
@@ -22 +23 @@
  DEFINES+= -DNO_SHARED_LIBS
  endif
-diff -Naur iproute2-2.6.37.orig/include/iptables.h iproute2-2.6.37/include/iptables.h
---- iproute2-2.6.37.orig/include/iptables.h     2011-01-07 12:54:30.000000000 -0500
-+++ iproute2-2.6.37/include/iptables.h  2011-01-08 19:22:59.954895722 -0500
+diff -Naur iproute2-3.4.0.orig/include/iptables.h iproute2-3.4.0/include/iptables.h
+--- iproute2-3.4.0.orig/include/iptables.h      2012-05-21 21:12:19.000000000 +0000
++++ iproute2-3.4.0/include/iptables.h   2012-09-16 00:43:20.000000000 +0000
 @@ -4,8 +4,12 @@
  #include "iptables_common.h"
@@ -39 +40 @@
  
  #ifndef IPPROTO_SCTP
-diff -Naur iproute2-2.6.37.orig/misc/arpd.c iproute2-2.6.37/misc/arpd.c
---- iproute2-2.6.37.orig/misc/arpd.c    2011-01-07 12:54:30.000000000 -0500
-+++ iproute2-2.6.37/misc/arpd.c 2011-01-08 19:22:59.954895722 -0500
+diff -Naur iproute2-3.4.0.orig/misc/arpd.c iproute2-3.4.0/misc/arpd.c
+--- iproute2-3.4.0.orig/misc/arpd.c     2012-05-21 21:12:19.000000000 +0000
++++ iproute2-3.4.0/misc/arpd.c  2012-09-16 00:43:20.000000000 +0000
 @@ -40,7 +40,7 @@
  int resolve_hosts;
  
- DB     *dbase;
--char   *dbname = "/var/lib/arpd/arpd.db";
-+char   *dbname = ARPDDIR "/arpd.db";
+ DB     *dbase;
+-char   *dbname = "/var/lib/arpd/arpd.db";
++char   *dbname = ARPDDIR "/arpd.db";
  
- int    ifnum;
- int    *ifvec;
+ int    ifnum;
+ int    *ifvec;