[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2d6fd519f945bcd2a10b8ffd5f00dee4385dc137

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2d6fd519f945bcd2a10b8ffd5f00dee4385dc137

[git]

[-- Attachment #1: Type: text/plain, Size: 5484 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  2d6fd519f945bcd2a10b8ffd5f00dee4385dc137 (commit)
       via  b916d61d44e66d11b4fdc834fb0d10bb9195f59d (commit)
       via  33c4c3fa4a9147feda7295707ada5e56955a2d2c (commit)
      from  210155684c82a1717227ca92cdb2718362d0e787 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2d6fd519f945bcd2a10b8ffd5f00dee4385dc137
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 25 01:05:54 2012 +0200

    binutils: Update to latest prerelease 2.22.52.0.4.

commit b916d61d44e66d11b4fdc834fb0d10bb9195f59d
Merge: 33c4c3f 2101556
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 25 01:05:40 2012 +0200

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 33c4c3fa4a9147feda7295707ada5e56955a2d2c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jun 24 20:11:32 2012 +0200

    rp-pppoe: Fix the plugin dir.

-----------------------------------------------------------------------

Summary of changes:
 binutils/binutils.nm                               |    4 +-
 ...inutils-2.22.52.0.2-pt-pax-flags-20120425.patch |   40 --------------------
 rp-pppoe/rp-pppoe.nm                               |    4 +-
 3 files changed, 4 insertions(+), 44 deletions(-)

Difference in files:
diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index 993f973..e03ac50 100644
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = binutils
-version    = 2.22.52.0.3
-release    = 2
+version    = 2.22.52.0.4
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = Development/Tools
diff --git a/binutils/patches/binutils-2.22.52.0.2-pt-pax-flags-20120425.patch b/binutils/patches/binutils-2.22.52.0.2-pt-pax-flags-20120425.patch
index 4c3ffa7..00494cb 100644
--- a/binutils/patches/binutils-2.22.52.0.2-pt-pax-flags-20120425.patch
+++ b/binutils/patches/binutils-2.22.52.0.2-pt-pax-flags-20120425.patch
@@ -1466,15 +1466,6 @@
 + 18000[0-9a-f]{2}:	48 00 00 08 	b       .*
 + 18000[0-9a-f]{2}:	38 63 90 08 	addi    r3,r3,-28664
  #pass
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsso32.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsso32.d
-@@ -42,5 +42,5 @@ Disassembly of section \.got:
- .* <\.got>:
- 	\.\.\.
- .*:	4e 80 00 21 	blrl
--.*:	00 01 03 ec 	.*
-+.*:	00 01 [0-9a-f]{2} [0-9a-f]{2} 	.*
- 	\.\.\.
 --- binutils-2.22/ld/testsuite/ld-powerpc/tlsso32.g
 +++ binutils-2.22/ld/testsuite/ld-powerpc/tlsso32.g
 @@ -9,5 +9,5 @@
@@ -1484,37 +1475,6 @@
 -.* 00000000 4e800021 000103ec 00000000  .*
 +.* 00000000 4e800021 00010[0-9a-f]{3} 00000000  .*
  .* 00000000                             .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsso32.r
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsso32.r
-@@ -35,6 +35,7 @@ Program Headers:
-  +LOAD .* RWE 0x10000
-  +DYNAMIC .* RW +0x4
-  +TLS .* 0x0+1c 0x0+38 R +0x4
-+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
- 
-  Section to Segment mapping:
-  +Segment Sections\.\.\.
-@@ -42,6 +43,7 @@ Program Headers:
-  +01 +\.tdata \.dynamic \.got \.plt 
-  +02 +\.dynamic 
-  +03 +\.tdata \.tbss 
-+ +04 +
- 
- Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
-  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-@@ -52,9 +54,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
- [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0
- [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0
- [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0
--[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4
--[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8
--[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8
-+[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
-+[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
-+[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
- [0-9a-f ]+R_PPC_DTPMOD32 +0+
- [0-9a-f ]+R_PPC_DTPREL32 +0+
- [0-9a-f ]+R_PPC_DTPMOD32 +0+
 --- binutils-2.22/ld/testsuite/ld-powerpc/tlstoc.g
 +++ binutils-2.22/ld/testsuite/ld-powerpc/tlstoc.g
 @@ -8,8 +8,8 @@
diff --git a/rp-pppoe/rp-pppoe.nm b/rp-pppoe/rp-pppoe.nm
index aa433c2..af16c6c 100644
--- a/rp-pppoe/rp-pppoe.nm
+++ b/rp-pppoe/rp-pppoe.nm
@@ -5,7 +5,7 @@
 
 name       = rp-pppoe
 version    = 3.10
-release    = 2
+release    = 3
 
 groups     = Networking/Dialin
 url        = http://www.roaringpenguin.com/pppoe/
@@ -36,7 +36,7 @@ build
 	prepare_cmds
 		# PLUGIN_DIR defaults to /etc/ppp/plugins, which is not what we want.
 		sed -i Makefile.in \
-			-e "s@^PLUGIN_DIR=.*@PLUGIN_DIR=%{libdir}/pppd/$(pppd --version | awk '{ print $NF }')@"
+			-e "s@^PLUGIN_DIR=.*@PLUGIN_DIR=%{libdir}/pppd/$(pppd --version 2>&1 | awk '{ print $NF }')@"
 
 		# Always enable kernel mode PPPoE for the server, because we
 		# don't ship the userspace component.


hooks/post-receive
--
IPFire 3.x development tree