[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9bd0bfd233b2297a3c2e91e90b56fdfd96011c3b

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9bd0bfd233b2297a3c2e91e90b56fdfd96011c3b

[git]

[-- Attachment #1: Type: text/plain, Size: 2363 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 2.x development tree".

The branch, next has been updated
       via  9bd0bfd233b2297a3c2e91e90b56fdfd96011c3b (commit)
       via  6b271ee283d7b62b92d099f5140a3f4e1b95257e (commit)
      from  05370b30da58d10f9935cf1c4cb8f23ab769b32e (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 9bd0bfd233b2297a3c2e91e90b56fdfd96011c3b
Merge: 6b271ee 05370b3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Aug 22 09:17:27 2014 +0200

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
    
    Conflicts:
    	lfs/iputils

commit 6b271ee283d7b62b92d099f5140a3f4e1b95257e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Aug 20 21:56:35 2014 +0200

    iputils: Ship tracepath

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

Summary of changes:
 config/rootfiles/common/iputils | 1 +
 lfs/iputils                     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/common/iputils b/config/rootfiles/common/iputils
index 7fb0426..3484cbb 100644
--- a/config/rootfiles/common/iputils
+++ b/config/rootfiles/common/iputils
@@ -1,2 +1,3 @@
 bin/ping
 usr/bin/ping
+usr/bin/tracepath
diff --git a/lfs/iputils b/lfs/iputils
index 9310c1f..7741c0e 100644
--- a/lfs/iputils
+++ b/lfs/iputils
@@ -73,8 +73,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-20020927-headers.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-20020927-rh.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-glibckernheaders.patch
-	cd $(DIR_APP) && make ping
+	cd $(DIR_APP) && make ping tracepath
 	cd $(DIR_APP) && install -m 4755 ping /usr/bin
+	cd $(DIR_APP) && install -m 0755 tracepath /usr/bin
 
 	# Some scripts expect ping in /bin/ping.
 	ln -svf ../usr/bin/ping /bin/ping


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