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

diff --git a/config/etc/group b/config/etc/group
index 46e4b80295050eac06d90e8236fdba485152ad01..ab5f4af51175d8bf75c5ed6cc9760fbf3d6fbbfe 100644 (file)
--- a/config/etc/group
+++ b/config/etc/group
@@ -10,7 +10,7 @@ kmem:x:9:
 wheel:x:10:root
 mail:x:12:mail
 uucp:x:14:
-dialout:x:16:
+dialout:x:16:nobody
 floppy:x:19:
 tape:x:20:
 utmp:x:22:

diff --git a/config/rootfiles/common/hostname b/config/rootfiles/common/hostname
new file mode 100644 (file)
index 0000000..7c59b98
--- /dev/null
+++ b/config/rootfiles/common/hostname
@@ -0,0 +1,9 @@
+bin/dnsdomainname
+bin/domainname
+bin/hostname
+bin/nisdomainname
+bin/ypdomainname
+#usr/share/man/man1/dnsdomainname.1
+#usr/share/man/man1/domainname.1
+#usr/share/man/man1/nisdomainname.1
+#usr/share/man/man1/ypdomainname.1

diff --git a/config/rootfiles/common/net-tools b/config/rootfiles/common/net-tools
index 3cf72ac400dd22ec0d5745cd26b6c5ceed6e3a7d..4860b2f0a8e8e103f05da8787a22979b4fb2b061 100644 (file)
--- a/config/rootfiles/common/net-tools
+++ b/config/rootfiles/common/net-tools
@@ -1,9 +1,4 @@
-bin/dnsdomainname
-bin/domainname
-bin/hostname
 bin/netstat
-#bin/nisdomainname
-#bin/ypdomainname
 sbin/arp
 sbin/ifconfig
 #sbin/ipmaddr
@@ -14,10 +9,6 @@ sbin/nameif
 sbin/rarp
 sbin/route
 sbin/slattach
-#usr/share/man/man1/dnsdomainname.1
-#usr/share/man/man1/domainname.1
-#usr/share/man/man1/nisdomainname.1
-#usr/share/man/man1/ypdomainname.1
 #usr/share/man/man5/ethers.5
 #usr/share/man/man8/arp.8
 #usr/share/man/man8/ifconfig.8

diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/core/78/filelists/hostname
new file mode 120000 (symlink)
index 0000000..2a96fdd
--- /dev/null
+++ b/config/rootfiles/core/78/filelists/hostname
@@ -0,0 +1 @@
+../../../common/hostname
\ No newline at end of file

diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/core/78/update.sh
index 65643793d8f4631cb922d43f48f46217016f3a3c..f3e0593526d03506400b12811d3a564da54d2a2f 100644 (file)
--- a/config/rootfiles/core/78/update.sh
+++ b/config/rootfiles/core/78/update.sh
@@ -173,6 +173,9 @@ chmod 4755 /usr/bin/ping
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Add nobody to group dialout
+usermod -a -G dialout nobody
+
 #
 # Start services
 #

diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/icinga
index caddac38115a8d3d1461843ff617dbf44fa9df91..7a8ae9224c9dd6197e43fa16b0f1e71b31491870 100644 (file)
--- a/config/rootfiles/packages/icinga
+++ b/config/rootfiles/packages/icinga
@@ -20,7 +20,7 @@ etc/rc.d/init.d/icinga
 etc/rc.d/rc0.d/K33icinga
 etc/rc.d/rc3.d/S67icinga
 etc/rc.d/rc6.d/K33icinga
-#usr/bin/icinga
+usr/bin/icinga
 usr/bin/icingastats
 #usr/lib/icinga
 usr/lib/icinga/p1.pl

diff --git a/lfs/hostname b/lfs/hostname
new file mode 100644 (file)
index 0000000..feac3a0
--- /dev/null
+++ b/lfs/hostname
@@ -0,0 +1,77 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.15
+
+THISAPP    = hostname_$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/hostname
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = f93c87de2517850de5f47234e3bcb563
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/hostname-rh.patch
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install BINDIR=/bin
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/net-tools b/lfs/net-tools
index 08b4815f38bc0a8d2c7a3ebfa57b217f8ed34832..ae4d73850e416fc50388fa4588654f18a2ff2020 100644 (file)
--- a/lfs/net-tools
+++ b/lfs/net-tools
@@ -69,6 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch

diff --git a/make.sh b/make.sh
index 041a0f6a23163071c7c46ceda44a3789dc6a0bc2..c170076532f4c3995f1dd1cd2075779e19f04268 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -355,6 +355,7 @@ buildbase() {
     lfsmake2 groff
     lfsmake2 gperf
     lfsmake2 gzip
+    lfsmake2 hostname
     lfsmake2 iproute2
     lfsmake2 jwhois
     lfsmake2 kbd

diff --git a/src/patches/hostname-rh.patch b/src/patches/hostname-rh.patch
new file mode 100644 (file)
index 0000000..d56ae59
--- /dev/null
+++ b/src/patches/hostname-rh.patch
@@ -0,0 +1,69 @@
+diff -up hostname/Makefile.rh hostname/Makefile
+--- hostname/Makefile.rh       2013-11-04 10:12:59.670379153 +0100
++++ hostname/Makefile  2013-11-04 10:15:04.957314495 +0100
+@@ -10,21 +10,17 @@ OBJS=hostname.o
+ 
+ hostname: $(OBJS)
+       $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -lnsl
+-      ln -fs hostname dnsdomainname
+-      ln -fs hostname domainname
+-      ln -fs hostname ypdomainname
+-      ln -fs hostname nisdomainname
+ 
+ install: hostname
+       install -d ${BASEDIR}$(MANDIR)/man1
+-      install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
++      install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
+       ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1
+       ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1
+       ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1
+       ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1
+ 
+       install -d ${BASEDIR}$(BINDIR)
+-      install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR)
++      install -m 0755 hostname ${BASEDIR}$(BINDIR)
+       ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname
+       ln -fs hostname ${BASEDIR}$(BINDIR)/domainname
+       ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname
+diff -up hostname/hostname.1.rh hostname/hostname.1
+--- hostname/hostname.1.rh     2013-11-03 15:24:23.000000000 +0100
++++ hostname/hostname.1        2013-11-04 10:12:59.670379153 +0100
+@@ -80,6 +80,28 @@ complete FQDN of the system is returned
+ .B "THE FQDN"
+ below).
+ 
++.LP
++The function 
++.BR gethostname(2)
++is used to get the hostname.  When the 
++.BR "hostname \-a, \-d, \-f or \-i" 
++is called will 
++.BR gethostbyname(3)
++be called.  The difference in 
++.BR gethostname(2)
++and
++.BR gethostbyname(3)
++is that
++.BR gethostbyname(3)
++is network aware, so it consults 
++.IR /etc/nsswitch.conf
++and
++.IR /etc/host.conf
++to decide whether to read information in
++.IR /etc/hostname
++or
++.IR /etc/hosts
++
+ .SS "SET NAME"
+ When called with one argument or with the
+ .B \-\-file
+@@ -105,8 +127,7 @@ command (see
+ .B "THE FQDN"
+ below).
+ .LP
+-The host name is usually set once at system startup in
+-.I /etc/init.d/hostname.sh
++The host name is usually set once at system startup
+ (normally by reading the contents of a file which contains
+ the host name, e.g.
+ .IR /etc/hostname ).