[git.ipfire.org] IPFire 2.x development tree branch, core78, updated. 34a5f039399d782e090be2fa42604de9380ccaec

[git.ipfire.org] IPFire 2.x development tree branch, core78, updated. 34a5f039399d782e090be2fa42604de9380ccaec

[git]

[-- Attachment #1: Type: text/plain, Size: 3326 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, core78 has been updated
       via  34a5f039399d782e090be2fa42604de9380ccaec (commit)
       via  e3b309978704e66a4c9bb616ccf25d069ed159aa (commit)
      from  43ea947fb413125d577225f81c138b449c7247f1 (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 34a5f039399d782e090be2fa42604de9380ccaec
Merge: 43ea947 e3b3099
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jun 5 08:42:56 2014 +0200

    Merge remote-tracking branch 'origin/master' into core78

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

Summary of changes:
 src/patches/net-tools-1.60-no-hostname.patch | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/patches/net-tools-1.60-no-hostname.patch

Difference in files:
diff --git a/src/patches/net-tools-1.60-no-hostname.patch b/src/patches/net-tools-1.60-no-hostname.patch
new file mode 100644
index 0000000..e2e34a1
--- /dev/null
+++ b/src/patches/net-tools-1.60-no-hostname.patch
@@ -0,0 +1,52 @@
+--- a/Makefile.bak	2014-06-03 19:01:39.758845492 +0000
++++ b/Makefile	2014-06-03 19:02:34.119171419 +0000
+@@ -76,7 +76,7 @@
+ NET_LIB_PATH = lib
+ NET_LIB_NAME = net-tools
+ 
+-PROGS	:= ifconfig hostname arp netstat route rarp slattach plipconfig nameif
++PROGS	:= ifconfig arp netstat route rarp slattach plipconfig nameif
+ 
+ -include config.make
+ ifeq ($(HAVE_IP_TOOLS),1)
+@@ -190,9 +190,6 @@
+ nameif:	nameif.o
+ 		$(CC) $(LDFLAGS) -o nameif nameif.o 
+ 
+-hostname:	hostname.o
+-		$(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB)
+-
+ route:		$(NET_LIB) route.o
+ 		$(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB)
+ 
+@@ -224,7 +221,6 @@
+ 	install -m 0755 -d ${BASEDIR}/sbin
+ 	install -m 0755 -d ${BASEDIR}/bin
+ 	install -m 0755 arp        ${BASEDIR}/sbin
+-	install -m 0755 hostname   ${BASEDIR}/bin
+ 	install -m 0755 ifconfig   ${BASEDIR}/sbin
+ 	install -m 0755 nameif     ${BASEDIR}/sbin
+ 	install -m 0755 netstat    ${BASEDIR}/bin
+@@ -239,21 +235,11 @@
+ ifeq ($(HAVE_MII),1)
+ 	install -m 0755 mii-tool   $(BASEDIR)/sbin
+ endif
+-	ln -fs hostname $(BASEDIR)/bin/dnsdomainname
+-	ln -fs hostname $(BASEDIR)/bin/ypdomainname
+-	ln -fs hostname $(BASEDIR)/bin/nisdomainname
+-	ln -fs hostname $(BASEDIR)/bin/domainname
+-ifeq ($(HAVE_AFDECnet),1)
+-	ln -fs hostname $(BASEDIR)/bin/nodename
+-endif
+ 
+ savebin:
+ 	@for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
+                  ${BASEDIR}/bin/netstat \
+-		 ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \
+-		 ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \
+-                 ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \
+-		 ${BASEDIR}/bin/domainname ; do \
++		 ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route; do \
+ 		 [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved.
+ 
+ installdata:


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