]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 3 Feb 2009 14:08:44 +0000 (15:08 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 3 Feb 2009 14:08:44 +0000 (15:08 +0100)
50 files changed:
config/etc/bashrc
config/etc/profile
config/etc/shells [new file with mode: 0644]
config/profile.d/i18n.sh
config/root/.bash_logout [new file with mode: 0644]
config/root/.bash_profile [new file with mode: 0644]
config/root/.bashrc [new file with mode: 0644]
config/udev/60-net.rules [new file with mode: 0644]
lfs/avahi [new file with mode: 0644]
lfs/binutils
lfs/bridge-utils
lfs/coreutils
lfs/dbus
lfs/dbus-glib
lfs/e2fsprogs
lfs/grep
lfs/groff
lfs/initscripts
lfs/intltool [new file with mode: 0644]
lfs/iputils
lfs/libdaemon [moved from lfs/libpri with 69% similarity]
lfs/pax-utils [new file with mode: 0644]
lfs/paxtest [new file with mode: 0644]
lfs/quagga
lfs/stage2
lfs/tcpdump [new file with mode: 0644]
lfs/xfsprogs
make.sh
src/initscripts/networking/ifdown [deleted file]
src/initscripts/networking/ifup [deleted file]
src/initscripts/networking/net-hotplug [new file with mode: 0644]
src/initscripts/networking/services/bonding [new file with mode: 0644]
src/rootfiles/core/avahi [new file with mode: 0644]
src/rootfiles/core/coreutils
src/rootfiles/core/dbus
src/rootfiles/core/dbus-glib
src/rootfiles/core/initscripts
src/rootfiles/core/intltool [new file with mode: 0644]
src/rootfiles/core/iputils
src/rootfiles/core/libdaemon [new file with mode: 0644]
src/rootfiles/core/stage2
src/rootfiles/core/strongswan
src/rootfiles/core/udev
src/rootfiles/core/xfsprogs
src/rootfiles/debug/pax-utils [new file with mode: 0644]
src/rootfiles/extras/htop
src/rootfiles/extras/quagga [new file with mode: 0644]
src/rootfiles/extras/tcpdump [new file with mode: 0644]
tools/make-compilers
tools/make-cron

index e35209f335ff37d689d61bd4156548a1183650bc..dce7184d927cb4d2c42a09bbb2b4bef28fcf8b5b 100644 (file)
@@ -1,13 +1,4 @@
 # Begin /etc/bashrc
-# Written for Beyond Linux From Scratch
-# by James Robertson <jameswrobertson@earthlink.net>
-# updated by Bruce Dubbs <bdubbs@linuxfromscratch.org>
-
-# Make sure that the terminal is set up properly for each shell
-
-if [ -f /etc/profile.d/tinker-term.sh ]; then
-  source /etc/profile.d/tinker-term.sh
-fi
 
 # System wide aliases and functions.
 
@@ -20,19 +11,6 @@ fi
 # /etc/profile.
 
 alias ls='ls --color=auto'
-alias ll='ls -la'
-alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
-
-# Make the shell a little bit more interactive 
-# to prevent the deletion of some files
-alias mv='mv -i'
-alias rm='rm -i'
-alias cp='cp -i'
-
-# Midnight Commander isn't compatible to UTF8.
-# So we use it in ACSII-Mode.
-
-alias mc='mc -a'
 
 # Provides prompt for non-login shells, specifically shells started
 # in the X environment. [Review the LFS archive thread titled
index 3c2921908ac65b4d25f326a4c23873513a639f43..70ff901bbce7ffc1ec38213a8baaf198fac06d45 100644 (file)
@@ -1,7 +1,4 @@
 # Begin /etc/profile
-# Written for Beyond Linux From Scratch
-# by James Robertson <jameswrobertson@earthlink.net>
-# modifications by Dagmar d'Surreal <rivyqntzne@pbzpnfg.arg>
 
 # System wide environment variables and startup programs.
 
@@ -49,6 +46,7 @@ fi
 # Setup some environment variables.
 export HISTSIZE=1000
 export HISTIGNORE="&:[bf]g:exit"
+
 export PS1="[\u@\h \w]\\$ "
 #export PS1='\u@\h:\w\$ '
 
diff --git a/config/etc/shells b/config/etc/shells
new file mode 100644 (file)
index 0000000..1805018
--- /dev/null
@@ -0,0 +1,7 @@
+# Begin /etc/shells
+
+/bin/sh
+/bin/bash
+/sbin/nologin
+
+# End /etc/shells
index ac68d67820231e17ec94006fcb773a3375f237da..2f66e89c3b673a5fb7c1095caf4a7407e77ce9ca 100644 (file)
@@ -1,2 +1,10 @@
 # Set up i18n variables
-export LANG=en_US.utf8
+
+if [ -f "/etc/sysconfig/console" ]; then
+       . /etc/sysconfig/console
+else
+       LANG=en_US.UTF-8
+fi
+
+unset KEYMAP FONT UNICODE KEYMAP_CORRECTIONS LEGACY_CHARSET
+export LANG
diff --git a/config/root/.bash_logout b/config/root/.bash_logout
new file mode 100644 (file)
index 0000000..3762d94
--- /dev/null
@@ -0,0 +1,7 @@
+# Begin ~/.bash_logout
+
+# Personal items to perform on logout.
+
+echo "Bye bye."
+
+# End ~/.bash_logout
diff --git a/config/root/.bash_profile b/config/root/.bash_profile
new file mode 100644 (file)
index 0000000..8201233
--- /dev/null
@@ -0,0 +1,33 @@
+# Begin ~/.bash_profile
+
+# Personal environment variables and startup programs.
+
+# Personal aliases and functions should go in ~/.bashrc.  System wide
+# environment variables and startup programs are in /etc/profile.
+# System wide aliases and functions are in /etc/bashrc.
+
+append () {
+  # First remove the directory
+  local IFS=':'
+  local NEWPATH
+  for DIR in $PATH; do
+     if [ "$DIR" != "$1" ]; then
+       NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
+     fi
+  done
+
+  # Then append the directory
+  export PATH=$NEWPATH:$1
+}
+
+if [ -f "$HOME/.bashrc" ] ; then
+  source $HOME/.bashrc
+fi
+
+if [ -d "$HOME/bin" ] ; then
+  append $HOME/bin
+fi
+
+unset append
+
+# End ~/.bash_profile
diff --git a/config/root/.bashrc b/config/root/.bashrc
new file mode 100644 (file)
index 0000000..d89eefd
--- /dev/null
@@ -0,0 +1,14 @@
+# Begin ~/.bashrc
+
+# Personal aliases and functions.
+
+# Personal environment variables and startup programs should go in
+# ~/.bash_profile.  System wide environment variables and startup
+# programs are in /etc/profile.  System wide aliases and functions are
+# in /etc/bashrc.
+
+if [ -f "/etc/bashrc" ] ; then
+  source /etc/bashrc
+fi
+
+# End ~/.bashrc
diff --git a/config/udev/60-net.rules b/config/udev/60-net.rules
new file mode 100644 (file)
index 0000000..a606a6e
--- /dev/null
@@ -0,0 +1 @@
+SUBSYSTEM=="net", RUN+="/etc/init.d/networking/net-hotplug"
diff --git a/lfs/avahi b/lfs/avahi
new file mode 100644 (file)
index 0000000..b93964b
--- /dev/null
+++ b/lfs/avahi
@@ -0,0 +1,102 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 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
+
+PKG_NAME   = avahi
+VER        = 0.6.24
+PKG_VER    = 0
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+MAINTAINER =
+GROUP      = Networking/Zeroconf
+EXTRA      = no
+DEBUG      = no
+DEPS       = dbus dbus-glib libdaemon python-dbus
+
+URL        = http://avahi.org/
+LICENSE    = LGPLv2
+SHORT_DESC = Local network service discovery.
+
+define LONG_DESC
+       Avahi is a system which facilitates service discovery on \
+       a local network -- this means that you can plug your laptop or \
+       computer into a network and instantly be able to view other people who \
+       you can chat with, find printers to print to or find files being \
+       shared. This kind of technology is already found in MacOS X (branded \
+       'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very \
+       convenient.
+endef
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
+
+package:
+       @$(DO_PACKAGE)
+
+$(objects):
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(OBJECT): $(objects)
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --prefix=/usr \
+                       --sysconfdir=/etc \
+                       --localstatedir=/var \
+                       --disable-static \
+                       --with-distro=none \
+                       --disable-gdbm \
+                       --disable-qt3 \
+                       --disable-qt4 \
+                       --disable-gtk \
+                       --disable-pygtk \
+                       --disable-mono
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
+
+       $(PYTHON_COMPILE)
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index 6e32b8494893be173addf60aab5803321fbb4ee5..c8ccbcdc0cd111be8762a5b22d422d421bd8f48a 100644 (file)
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = binutils
-VER        = 2.19
+VER        = 2.19.1
 PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
@@ -62,7 +62,6 @@ endef
 ###############################################################################
 
 objects = $(DL_FILE) \
-       $(THISAPP)-branch_update.patch \
        $(THISAPP)-ld_makefile.patch \
        $(THISAPP)-pt_pax-1.patch \
        $(THISAPP)-lazy-1.patch \
@@ -91,10 +90,6 @@ $(OBJECT): $(objects)
        @rm -rf $(DIR_SRC)/binutils-build
        -mkdir -v $(DIR_SRC)/binutils-build
 
-       # We add some fixes from upstream that should fix many bugs with this
-       # binutils release.
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-branch_update.patch
-
        # Add PT_PaX header marking support. These markings are using by the PaX
        # kernel, and Pax-utils, to identify which programs need things like executable
        # stack, etc. Without this patch the PaX kernel must use legacy mode, and this
index 21a9b3095a2c58743c3d5316207e2f19e222e054..153d4f9c55a4b7b908884e08fae78c855cab88a5 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+# Copyright (C) 2007, 2008, 2009 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        #
index 9c2b64b3389526d9cf30d1003c66085bb86c7b5c..38630a95882e7611733ba6b8377bff14cf40e9ab 100644 (file)
@@ -110,6 +110,9 @@ ifeq "$(STAGE)" "base"
        mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
        mv -v /usr/bin/chroot /usr/sbin
        mv -v /usr/bin/{head,sleep,nice} /bin
+
+       # Dump /etc/dircolors.
+       dircolors -p > /etc/dircolors
 endif
        
        @rm -rf $(DIR_APP)
index e12feff4c717820db795b98bd937f7c7e7399a91..ed8bbfa76640ea4567e6f6a2c445e873e03b52a0 100644 (file)
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -81,7 +81,8 @@ $(OBJECT): $(objects)
                        $(CONFIGURE_ARCH) \
                        --prefix=/usr \
                        --sysconfdir=/etc \
-                       --localstatedir=/var
+                       --localstatedir=/var \
+                       --libexecdir=/usr/lib
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
index c7cc8930b0028c7e0c5c75a9ede48867737b8290..dd1d9b1d213d5596e0549c92bc7786f69c987aae 100644 (file)
@@ -79,7 +79,8 @@ $(OBJECT): $(objects)
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=/usr \
-                       --sysconfdir=/etc
+                       --sysconfdir=/etc \
+                       --libexecdir=/usr/lib
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
index 4e030dd9936139ec94504d1b32426d854aae0f3c..7c209cad9251df15040d8f06d116c426ba0f2b38 100644 (file)
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = e2fsprogs
-VER        = 1.41.2
+VER        = 1.41.4
 PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
index 7754156326a1e40d2b70544665c29d8ab2501678..c5fd34eaabce1db077525b6268ed337b257caf56 100644 (file)
--- a/lfs/grep
+++ b/lfs/grep
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 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        #
@@ -26,6 +26,7 @@ include Config
 
 PKG_NAME   = grep
 VER        = 2.5.3
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,6 +34,23 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+
+MAINTAINER =
+GROUP      = Applications/Text
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        = http://www.gnu.org/software/grep/
+LICENSE    = GPLv3+
+SHORT_DESC = A pattern matching utilities.
+
+define LONG_DESC
+       The GNU versions of commonly used grep utilities. Grep searches through \
+       textual input for lines which contain a match to a specified pattern and then \
+       prints the matching lines. GNU's grep utilities include grep, egrep and fgrep.
+endef
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -41,20 +59,26 @@ objects = $(DL_FILE) \
        $(THISAPP)-upstream_fixes-1.patch \
        $(THISAPP)-debian_fixes-1.patch
 
-install : $(OBJECT)
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
 
-download : $(objects)
+package:
+       @$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 
 ifeq "$(STAGE)" "toolchain"
        # --without-included-regex makes Grep use libc for regex. This gets rid of
index 375beecdecf472f8bcbde6e661028d8efe8fbb49..c431ccb37ed61445cd51b700f6912ffb1d761013 100644 (file)
--- a/lfs/groff
+++ b/lfs/groff
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 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        #
@@ -26,6 +26,7 @@ include Config
 
 PKG_NAME   = groff
 VER        = 1.18.1.4
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,11 +34,31 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      = Applications/Text
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        = http://groff.ffii.org/
+LICENSE    = GPLv2 and GFDL
+SHORT_DESC = A document formatting system.
+
+define LONG_DESC
+       Groff is a document formatting system. Groff takes standard text and \
+       formatting commands as input and produces formatted output. The \
+       created documents can be shown on a display or printed on a printer. \
+       Groff's formatting commands allow you to specify font type and size, \
+       bold type, italic type, the number and size of columns on a page, and \
+       more.
+endef
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-debian_fixes-1.patch
+objects = $(DL_FILE) \
+       $(THISAPP)-debian_fixes-1.patch
 
 install : $(OBJECT)
 
@@ -53,7 +74,7 @@ $(objects) :
 $(OBJECT) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-debian_fixes-1.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-debian_fixes-1.patch
        cd $(DIR_APP) && sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
                                -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto
        cd $(DIR_APP) && PAGE=A4 \
@@ -61,7 +82,7 @@ $(OBJECT) :
                        $(CONFIGURE_ARCH) \
                        --prefix=/usr \
                        --enable-multibyte
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make #$(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        ln -sv eqn /usr/bin/geqn
        ln -sv tbl /usr/bin/gtbl
index f96468d3bcc8a21cb50b148c9d0d5ccf2cb064ab..db5a98a70a0255dbcf90f1dd92d465293109ceb9 100644 (file)
@@ -92,7 +92,7 @@ $(OBJECT) :
        chmod 644 /etc/init.d/ipfire-functions
 
        # Install networking scripts
-       for i in $(DIR_APP)/networking/{br,if}{down,up}; do \
+       for i in $(DIR_APP)/networking/{br{down,up},net-hotplug}; do \
                install -v -m 754 $$i /etc/init.d/networking; \
        done
 
diff --git a/lfs/intltool b/lfs/intltool
new file mode 100644 (file)
index 0000000..99aae15
--- /dev/null
@@ -0,0 +1,87 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 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
+
+PKG_NAME   = intltool
+VER        = 0.40.5
+PKG_VER    = 0
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+MAINTAINER =
+GROUP      = Localization/Tools
+EXTRA      = no
+DEBUG      = no
+DEPS       = gettext perl-xml-parser
+
+URL        = http://www.gnome.org/
+LICENSE    = GPLv2 with exceptions
+SHORT_DESC = Utility for internationalizing various kinds of data files.
+
+define LONG_DESC
+       This tool automatically extracts translatable strings from oaf, glade, \
+       bonobo ui, nautilus theme, .desktop, and other data files and puts \
+       them in the po files.
+endef
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
+
+package:
+       @$(DO_PACKAGE)
+
+$(objects):
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(OBJECT): $(objects)
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --prefix=/usr \
+                       --disable-static
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index 359684dbb7155823cb63ac45485fbc8ce5f05e72..1c22d9876fbe0e06f8f272e077ec1b03f251bf24 100644 (file)
@@ -38,6 +38,7 @@ OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 ###############################################################################
 
 objects = $(DL_FILE) \
+       ifenslave-20090202.tar.gz \
        $(THISAPP)-addrcache.patch \
        $(THISAPP)-arping-infiniband.patch \
        $(THISAPP)-arping_timeout.patch \
@@ -49,7 +50,8 @@ objects = $(DL_FILE) \
        $(THISAPP)-ping_cleanup.patch \
        $(THISAPP)-rh.patch \
        $(THISAPP)-traffic_class.patch \
-       $(THISAPP)-warnings.patch
+       $(THISAPP)-warnings.patch \
+       iputils-ifenslave-20090202.patch
 
 install : $(OBJECT)
 
@@ -66,6 +68,8 @@ $(OBJECT) :
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && $(EXTRACTOR) $(DIR_DL)/ifenslave-20090202.tar.gz
+
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-addrcache.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-arping-infiniband.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-arping_timeout.patch
@@ -78,11 +82,14 @@ $(OBJECT) :
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-traffic_class.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-warnings.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-output.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/iputils-ifenslave-20090202.patch
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && gcc -Wall $(CLFAGS) ifenslave.c -o ifenslave
 
        cd $(DIR_APP) && install -cp clockdiff  /usr/sbin/
        cd $(DIR_APP) && install -cp arping             /sbin/
+       cd $(DIR_APP) && install -cp ifenslave          /sbin/
        cd $(DIR_APP) && install -cp ping               /bin/
        cd $(DIR_APP) && install -cp rdisc              /sbin/
        cd $(DIR_APP) && install -cp ping6              /bin/
@@ -93,6 +100,6 @@ $(OBJECT) :
        ln -svf ../../bin/tracepath             /usr/sbin/
        ln -svf ../../bin/tracepath6    /usr/sbin/
 
-       #setcap cap_net_admin=ep /bin/ping
+       setcap cap_net_admin=ep /bin/ping
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
similarity index 69%
rename from lfs/libpri
rename to lfs/libdaemon
index b3b04ae9967e5e8917d8fba6aa2d849fb8e20d75..7ba25398aca9bc06b5da68792c8b5dccfabb2689 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008 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        #
 
 include Config
 
-VER        = 1.4.1
+PKG_NAME   = libdaemon
+VER        = 0.13
+PKG_VER    = 0
 
-THISAPP    = libpri-$(VER)
+THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-OBJECT     = $(DIR_INFO)/$(THISAPP)
-PROG       = libpri
-PAK_VER    = 1
 
-DEPS       = ""
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+MAINTAINER =
+GROUP      = System/Libaries
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        = http://0pointer.de/lennart/projects/libdaemon/
+LICENSE    = LGPLv2+
+SHORT_DESC = Library for writing UNIX daemons.
+
+define LONG_DESC
+       libdaemon is a lightweight C library which eases the writing of UNIX daemons.
+endef
 
 ###############################################################################
 # Top-level Rules
@@ -42,42 +54,32 @@ DEPS       = ""
 
 objects = $(DL_FILE)
 
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 9e5da1f2267711d9aaaf91ffa925b219
-
-install : $(OBJECT)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+download: $(objects)
 
-download : $(objects)
+info:
+       $(DO_PKG_INFO)
 
-md5 : $(subst %,%_MD5,$(objects))
+install: $(OBJECT)
 
-dist: 
-       $(PAK)
+package:
+       @$(DO_PACKAGE)
 
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(objects) :
+$(objects):
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)
-       cd $(DIR_APP) && make install KVERS=$(KVER)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --prefix=/usr \
+                       --disable-static
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/pax-utils b/lfs/pax-utils
new file mode 100644 (file)
index 0000000..7ff93ed
--- /dev/null
@@ -0,0 +1,80 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 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
+
+PKG_NAME   = pax-utils
+VER        = 0.1.19
+PKG_VER    = 0
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+MAINTAINER =
+GROUP      = Security/Tools
+EXTRA      = no
+DEBUG      = yes
+DEPS       =
+
+URL        = http://www.gentoo.org/proj/en/hardened/pax-utils.xml
+LICENSE    = GPLv2+
+SHORT_DESC = Utilities for checking PaX features.
+
+define LONG_DESC
+       This package contains several utilities for checking PaX features.
+endef
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
+
+package:
+       @$(DO_PACKAGE)
+
+$(objects):
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(OBJECT): $(objects)
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/paxtest b/lfs/paxtest
new file mode 100644 (file)
index 0000000..67ab7c5
--- /dev/null
@@ -0,0 +1,81 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 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
+
+PKG_NAME   = paxtest
+VER        = 0.9.7-pre4
+PKG_VER    = 0
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+MAINTAINER =
+GROUP      = Security/Tools
+EXTRA      = no
+DEBUG      = yes
+DEPS       =
+
+URL        = http://pax.grsecurity.org/
+LICENSE    = GPLv2+
+SHORT_DESC = Utilities for testing PaX configuration.
+
+define LONG_DESC
+       This package contains several files for checking the PaX configuration \
+       and checks if it all works correctly.
+endef
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
+
+package:
+       @$(DO_PACKAGE)
+
+$(objects):
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(OBJECT): $(objects)
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make -f Makefile.generic RUNDIR=/usr/lib/paxtest
+       cd $(DIR_APP) && make -f Makefile.generic install DESTDIR=/ RUNDIR=/usr/lib/paxtest BINDIR=/usr/bin
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index fcb603420123d8a041781b55ae792e989f168ad3..6e437657d468c813e829af31d7903184a531a2d3 100644 (file)
@@ -36,7 +36,7 @@ OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 MAINTAINER =
 GROUP      = Networking/Routing
-EXTRA      = no
+EXTRA      = yes
 DEBUG      = no
 DEPS       = pam
 
@@ -77,11 +77,14 @@ $(objects):
 $(OBJECT): $(objects)
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       # ac_cv_have_decl_TCP_MD5SIG=no was set to work around a bug
        cd $(DIR_APP) && \
+               ac_cv_have_decl_TCP_MD5SIG=no \
+               ac_cv_func_working_mktime=yes \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --prefix=/usr \
-                       --sysconfdir=/etc \
+                       --sysconfdir=/etc/quagga \
                        --disable-static \
                        --enable-netlink \
                        --with-libpam
index 7a66e220e67af75c926e56ac40906b5a1b8fe432..12f0c3d880901ecb6d6d2517e8fef1dca24f5e73 100644 (file)
@@ -79,8 +79,11 @@ $(OBJECT) :
        rm -fr /dev1
 
        # Config files
-       for i in $(DIR_SRC)/config/etc/*; do \
-               [ -f $$i ] && cp $$i /etc; \
+       for i in $$(find $(DIR_SRC)/config/etc/ -type f); do \
+               cp -vf $$i /etc; \
+       done
+       for i in $$(find $(DIR_CONFIG)/root/ -type f); do \
+               cp -vf $$i /root; \
        done
        -mkdir -pv /etc/modprobe.d
        cp -av $(DIR_CONF)/modprobe.d/* /etc/modprobe.d/
@@ -95,6 +98,7 @@ endif
        echo "\n running on \s \r \m"          >> /etc/issue
 
        echo "$(NAME) Release $(VERSION) ($(SLOGAN))" > /etc/$(SNAME)-release
+       ln -svf $(SNAME)-release /etc/system-release
 
        touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
        #chgrp -v utmp /var/run/utmp /var/log/lastlog
diff --git a/lfs/tcpdump b/lfs/tcpdump
new file mode 100644 (file)
index 0000000..eb9156c
--- /dev/null
@@ -0,0 +1,91 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 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
+
+PKG_NAME   = tcpdump
+VER        = 4.0.0
+PKG_VER    = 0
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+MAINTAINER =
+GROUP      = Networking/Sniffer
+EXTRA      = yes
+DEBUG      = no
+DEPS       = libpcap openssl
+
+URL        = http://www.tcpdump.org/
+LICENSE    = BSD with advertising
+SHORT_DESC = A network traffic monitoring tool.
+
+define LONG_DESC
+       Tcpdump is a command-line tool for monitoring network traffic. \
+       Tcpdump can capture and display the packet headers on a particular \
+       network interface or on all interfaces.  Tcpdump can display all of \
+       the packet headers, or just the ones that match particular criteria.
+endef
+
+CFLAGS    += -fno-strict-aliasing
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE) \
+       $(THISAPP)-ipv6-build.patch
+
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
+
+package:
+       @$(DO_PACKAGE)
+
+$(objects):
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(OBJECT): $(objects)
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_PATCHES)/$(THISAPP)-ipv6-build.patch
+       cd $(DIR_APP) && \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --prefix=/usr
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index b41475d5f924ecfa1de2ede9ee6fb74378dfd5fe..98c50276b73fbcfc1a3b3c596e0658b736671dc7 100644 (file)
 include Config
 
 PKG_NAME   = xfsprogs
-VER        = 2.10.1
+VER        = 2.10.2
 
 THISAPP    = $(PKG_NAME)-$(VER)
-DL_FILE    = $(THISAPP)-1.tar.gz
+DL_FILE    = $(THISAPP)-1.tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -37,7 +37,8 @@ OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+       $(THISAPP)-parallel-build.patch
 
 info:
        $(DO_PKG_INFO)
@@ -55,7 +56,10 @@ $(objects) :
 
 $(OBJECT) : 
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np2 -i $(DIR_PATCHES)/$(THISAPP)-parallel-build.patch
+       # XXX We compile xfsprogs STATIC at the moment because there is a bug with
+       # installation of the shared libs (may be it is libtool's fault).
        cd $(DIR_APP) && DEBUG=-DNDEBUG \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -64,11 +68,11 @@ $(OBJECT) :
                        --sbindir=/sbin \
                        --libdir=/lib \
                        --libexecdir=/usr/lib \
-                       --enable-readline=yes
+                       --enable-shared=no
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install #install-dev
-       chmod -v 755 /lib/libhandle.so*
-       rm -f /lib/libhandle.{a,la,so}
-       ln -svf ../../lib/libhandle.so.1 /usr/lib/libhandle.so
+       #chmod -v 755 /lib/libhandle.so*
+       #rm -f /lib/libhandle.{a,la,so}
+       #ln -svf ../../lib/libhandle.so.1 /usr/lib/libhandle.so
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index c0263b9cd3a69a39d3ff043784490e0957f47b54..3723db90113b031dc6998fba9107f5d0839aa7c8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -193,12 +193,14 @@ ipfire_build() {
 
        ### Building some general stuff
        #   STAGE 1
+       ipfire_make libdaemon
        ipfire_make pcre
        ipfire_make expat
        ipfire_make dbus
        ipfire_make dbus-glib
        ipfire_make openssl
        ipfire_make perl-xml-parser
+       ipfire_make intltool
        ipfire_make python
        ipfire_make python-dbus
        ipfire_make python-urlgrabber
@@ -230,6 +232,7 @@ ipfire_build() {
        ipfire_make vlan
        ipfire_make bind
        ipfire_make whois
+       ipfire_make avahi
        
        ### Building some general stuff
        #   STAGE 2
@@ -356,7 +359,7 @@ misc_build() {
        #ipfire_make traceroute
        #ipfire_make nmap
        #ipfire_make rsync
-       #ipfire_make tcpdump
+       ipfire_make tcpdump
        ipfire_make htop
        ipfire_make nano
        ipfire_make squid
@@ -433,6 +436,8 @@ misc_build() {
 
        ### Debugging
        #
+       ipfire_make pax-utils
+       ipfire_make paxtest
        ipfire_make gdb
        ipfire_make strace
        ipfire_make pychecker
diff --git a/src/initscripts/networking/ifdown b/src/initscripts/networking/ifdown
deleted file mode 100644 (file)
index 28d1f18..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $NETWORK_DEVICES/ifdown
-#
-# Description : Interface Down
-#
-# Authors     : Nathan Coulson - nathan@linuxfromscratch.org
-#               Kevin P. Fleming - kpfleming@linuxfromscratch.org
-#
-# Version     : 00.01
-#
-# Notes       : the IFCONFIG variable is passed to the scripts found
-#               in the services directory, to indicate what file the
-#               service should source to get environmental variables.
-#
-########################################################################
-
-. /lib/lsb/init-functions
-
-# Collect a list of configuration files for our interface
-if [ -n "${2}" ]; then
-    for file in ${@#$1}; do # All parameters except $1
-        FILES="${FILES} ${NETWORK_DEVICES}/ifconfig.${1}/${file}"
-    done
-elif [ -d "${NETWORK_DEVICES}/ifconfig.${1}" ]; then
-    FILES=`echo ${NETWORK_DEVICES}/ifconfig.${1}/*`
-else
-    FILES="${NETWORK_DEVICES}/ifconfig.${1}"
-fi
-
-# Reverse the order configuration files are processed in
-for file in ${FILES}; do
-    FILES2="${file} ${FILES2}"
-done
-FILES=${FILES2}
-
-# Process each configuration file
-for file in ${FILES}; do
-    # skip backup files
-    if [ "${file}" != "${file%""~""}" ]; then
-        continue
-    fi
-
-    if [ ! -f "${file}" ]; then
-        message="${file} is not a network configuration file or directory."
-        log_warning_msg
-    fi
-    (
-        . ${file}
-
-        # Will not process this service if started by boot, and ONBOOT
-        # is not set to yes
-        if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
-            continue
-        fi
-
-        # Will not process this service if started by hotplug, and 
-        # ONHOTPLUG is not set to yes
-        if [ "${IN_HOTPLUG}" = "1" -a "${ONHOTPLUG}" != "yes" ]; then
-            continue
-        fi
-    
-        # This will run the service script, if SERVICE is set
-        if [ -n "${SERVICE}" -a -x "${NETWORK_DEVICES}/services/${SERVICE}" ]; then
-            if ip link show ${1} > /dev/null 2>&1
-            then
-                IFCONFIG=${file} ${NETWORK_DEVICES}/services/${SERVICE} ${1} down
-            else
-                message="Interface ${1} doesn't exist."
-                log_warning_msg
-            fi
-        else
-            echo -e "${FAILURE}Unable to process ${file}.  Either"
-            echo -e "${FAILURE}the SERVICE variable was not set,"
-            echo -e "${FAILURE}or the specified service cannot be executed."
-            message=""
-            log_failure_msg
-        fi
-    )
-done
-
-if [ -z "${2}" ]; then
-    link_status=`ip link show $1`
-    if [ -n "${link_status}" ]; then
-        if echo "${link_status}" | grep -q UP; then
-            message="Bringing down the ${1} interface..."
-            ip link set ${1} down
-            evaluate_retval standard
-        fi
-    fi
-fi
-
-# End $NETWORK_DEVICES/ifdown
diff --git a/src/initscripts/networking/ifup b/src/initscripts/networking/ifup
deleted file mode 100644 (file)
index 50e173c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $NETWORK_DEVICES/ifup
-#
-# Description : Interface Up
-#
-# Authors     : Nathan Coulson - nathan@linuxfromscratch.org
-#               Kevin P. Fleming - kpfleming@linuxfromscratch.org
-#
-# Version     : 00.00
-#
-# Notes       : the IFCONFIG variable is passed to the scripts found
-#               in the services directory, to indicate what file the
-#               service should source to get environmental variables.
-#
-########################################################################
-
-. /lib/lsb/init-functions 
-
-# Collect a list of configuration files for our interface
-if [ -n "${2}" ]; then
-    for file in ${@#$1} # All parameters except $1
-  do
-        FILES="${FILES} ${NETWORK_DEVICES}/ifconfig.${1}/${file}"
-    done
-elif [ -d "${NETWORK_DEVICES}/ifconfig.${1}" ]; then
-    FILES=`echo ${NETWORK_DEVICES}/ifconfig.${1}/*`
-else 
-    FILES="${NETWORK_DEVICES}/ifconfig.${1}"
-fi
-
-message="Bringing up the ${1} interface..."
-
-# Process each configruation file
-for file in ${FILES}; do
-    # skip backup files
-    if [ "${file}" != "${file%""~""}" ]; then
-        continue
-    fi
-
-    if [ ! -f "${file}" ]; then
-        log_warning_msg
-        message="${file} is not a network configuration file or directory."
-        log_warning_msg
-    fi
-
-    (
-        . ${file}
-
-        # Will not process this service if started by boot, and ONBOOT
-        # is not set to yes
-        if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
-            continue
-        fi
-        # Will not process this service if started by hotplug, and 
-        # ONHOTPLUG is not set to yes
-        if [ "${IN_HOTPLUG}" = "1" -a "${ONHOTPLUG}" != "yes" -a "${HOSTNAME}" != "(none)" ]; then
-             continue
-        fi
-
-        if [ -n "${SERVICE}" -a -x "${NETWORK_DEVICES}/services/${SERVICE}" ]; then
-            if [ -z "${CHECK_LINK}" -o "${CHECK_LINK}" = "y" -o "${CHECK_LINK}" = "yes" -o "${CHECK_LINK}" = "1" ]; then
-                if ip link show ${1} > /dev/null 2>&1; then
-                    link_status=`ip link show ${1}`
-                    if [ -n "${link_status}" ]; then
-                        if ! echo "${link_status}" | grep -q UP; then
-                            ip link set ${1} up
-                            evaluate_retval standard
-                        fi
-                    fi
-                else
-                    message="${message}Interface ${1} doesn't exist."
-                    log_warning_msg
-                fi
-            fi
-            IFCONFIG=${file} ${NETWORK_DEVICES}/services/${SERVICE} ${1} up
-        else
-            echo -e "${FAILURE}Unable to process ${file}.  Either"
-            echo -e "${FAILURE}the SERVICE variable was not set,"
-            echo -e "${FAILURE}or the specified service cannot be executed."
-            message=""
-            log_failure_msg
-        fi
-    )
-done
-
-# End $NETWORK_DEVICES/ifup
diff --git a/src/initscripts/networking/net-hotplug b/src/initscripts/networking/net-hotplug
new file mode 100644 (file)
index 0000000..8b89510
--- /dev/null
@@ -0,0 +1,58 @@
+#!/bin/bash
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008, 2009 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/>.       #
+#                                                                             #
+###############################################################################
+
+if [ "$INTERFACE" = "" ]; then
+       exit 1
+fi
+
+case $ACTION in
+       add|register)
+               case $INTERFACE in
+                       # interfaces that are brought up as a part of configuration
+                       ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*)
+                               exit 0
+                               ;;
+                       # interfaces that are registered then brought up
+                       *)
+                               export IN_HOTPLUG=1
+                               ## Put ifup code here
+                               ;;
+               esac
+               ;;
+
+       remove|unregister)
+               case $INTERFACE in
+                       # interfaces that are brought down as part of deconfiguration
+                       ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*)
+                               exit 0
+                               ;;
+                       *)
+                               export IN_HOTPLUG=1
+                               ## Put ifdown code here
+                               ;;
+               esac
+               ;;
+
+       *)
+               exit 1
+               ;;
+
+esac
diff --git a/src/initscripts/networking/services/bonding b/src/initscripts/networking/services/bonding
new file mode 100644 (file)
index 0000000..f5ac0f5
--- /dev/null
@@ -0,0 +1,38 @@
+#!/bin/sh
+########################################################################
+# Begin $NETWORK_DEVICES/services/bonding
+#
+# Description : Interface Bonding Script
+#
+# Authors     : Michael Tremer - michael.tremer@ipfire.org
+#
+# Version     : 00.00
+#
+# Notes       : This script collects two or more interfaces in one
+#               bonding intreface.
+#
+########################################################################
+
+. /lib/lsb/init-functions
+. ${IFCONFIG}
+
+case "${2}" in
+       up)
+               MESSAGE="Bringing up bonding interface ${1}..."
+               ifenslave ${1} ${SLAVE_INTERFACES}
+               evaluate_retval
+       ;;
+
+       down)
+               MESSAGE="Bringing down bonding interface ${1}..."
+               modprobe -r bonding 2>/dev/null
+               evaluate_retval
+       ;;
+
+       *)
+               echo "Usage: ${0} [interface] {up|down}"
+               exit 1
+       ;;
+esac
+
+# End $NETWORK_DEVICES/services/bonding
diff --git a/src/rootfiles/core/avahi b/src/rootfiles/core/avahi
new file mode 100644 (file)
index 0000000..27bb1ac
--- /dev/null
@@ -0,0 +1,145 @@
+etc/avahi
+etc/avahi/avahi-autoipd.action
+etc/avahi/avahi-daemon.conf
+etc/avahi/avahi-dnsconfd.action
+etc/avahi/hosts
+etc/avahi/services
+etc/avahi/services/sftp-ssh.service
+etc/avahi/services/ssh.service
+etc/dbus-1/system.d/avahi-dbus.conf
+usr/bin/avahi-bookmarks
+usr/bin/avahi-browse
+usr/bin/avahi-browse-domains
+usr/bin/avahi-publish
+usr/bin/avahi-publish-address
+usr/bin/avahi-publish-service
+usr/bin/avahi-resolve
+usr/bin/avahi-resolve-address
+usr/bin/avahi-resolve-host-name
+usr/bin/avahi-set-host-name
+#usr/include/avahi-client
+#usr/include/avahi-client/client.h
+#usr/include/avahi-client/lookup.h
+#usr/include/avahi-client/publish.h
+#usr/include/avahi-common
+#usr/include/avahi-common/address.h
+#usr/include/avahi-common/alternative.h
+#usr/include/avahi-common/cdecl.h
+#usr/include/avahi-common/defs.h
+#usr/include/avahi-common/domain.h
+#usr/include/avahi-common/error.h
+#usr/include/avahi-common/gccmacro.h
+#usr/include/avahi-common/llist.h
+#usr/include/avahi-common/malloc.h
+#usr/include/avahi-common/rlist.h
+#usr/include/avahi-common/simple-watch.h
+#usr/include/avahi-common/strlst.h
+#usr/include/avahi-common/thread-watch.h
+#usr/include/avahi-common/timeval.h
+#usr/include/avahi-common/watch.h
+#usr/include/avahi-core
+#usr/include/avahi-core/core.h
+#usr/include/avahi-core/log.h
+#usr/include/avahi-core/lookup.h
+#usr/include/avahi-core/publish.h
+#usr/include/avahi-core/rr.h
+#usr/include/avahi-glib
+#usr/include/avahi-glib/glib-malloc.h
+#usr/include/avahi-glib/glib-watch.h
+#usr/include/avahi-gobject
+#usr/include/avahi-gobject/ga-client.h
+#usr/include/avahi-gobject/ga-entry-group.h
+#usr/include/avahi-gobject/ga-enums.h
+#usr/include/avahi-gobject/ga-error.h
+#usr/include/avahi-gobject/ga-record-browser.h
+#usr/include/avahi-gobject/ga-service-browser.h
+#usr/include/avahi-gobject/ga-service-resolver.h
+usr/lib/avahi
+#usr/lib/libavahi-client.la
+usr/lib/libavahi-client.so
+usr/lib/libavahi-client.so.3
+usr/lib/libavahi-client.so.3.2.5
+#usr/lib/libavahi-common.la
+usr/lib/libavahi-common.so
+usr/lib/libavahi-common.so.3
+usr/lib/libavahi-common.so.3.5.1
+#usr/lib/libavahi-core.la
+usr/lib/libavahi-core.so
+usr/lib/libavahi-core.so.6
+usr/lib/libavahi-core.so.6.0.0
+#usr/lib/libavahi-glib.la
+usr/lib/libavahi-glib.so
+usr/lib/libavahi-glib.so.1
+usr/lib/libavahi-glib.so.1.0.1
+#usr/lib/libavahi-gobject.la
+usr/lib/libavahi-gobject.so
+usr/lib/libavahi-gobject.so.0
+usr/lib/libavahi-gobject.so.0.0.1
+#usr/lib/pkgconfig/avahi-client.pc
+#usr/lib/pkgconfig/avahi-core.pc
+#usr/lib/pkgconfig/avahi-glib.pc
+#usr/lib/pkgconfig/avahi-gobject.pc
+usr/lib/python2.6/site-packages/avahi
+usr/lib/python2.6/site-packages/avahi/__init__.py
+usr/lib/python2.6/site-packages/avahi/__init__.pyc
+usr/lib/python2.6/site-packages/avahi/__init__.pyo
+usr/sbin/avahi-autoipd
+usr/sbin/avahi-daemon
+usr/sbin/avahi-dnsconfd
+#usr/share/applications
+usr/share/avahi
+usr/share/avahi/avahi-service.dtd
+usr/share/avahi/interfaces
+usr/share/avahi/introspection
+usr/share/avahi/introspection/AddressResolver.introspect
+usr/share/avahi/introspection/DomainBrowser.introspect
+usr/share/avahi/introspection/EntryGroup.introspect
+usr/share/avahi/introspection/HostNameResolver.introspect
+usr/share/avahi/introspection/RecordBrowser.introspect
+usr/share/avahi/introspection/Server.introspect
+usr/share/avahi/introspection/ServiceBrowser.introspect
+usr/share/avahi/introspection/ServiceResolver.introspect
+usr/share/avahi/introspection/ServiceTypeBrowser.introspect
+usr/share/avahi/service-types
+#usr/share/locale/ca/LC_MESSAGES/avahi.mo
+#usr/share/locale/de/LC_MESSAGES/avahi.mo
+#usr/share/locale/el/LC_MESSAGES/avahi.mo
+#usr/share/locale/en_AU
+#usr/share/locale/en_AU/LC_MESSAGES
+#usr/share/locale/en_AU/LC_MESSAGES/avahi.mo
+#usr/share/locale/en_CA/LC_MESSAGES/avahi.mo
+#usr/share/locale/en_GB/LC_MESSAGES/avahi.mo
+#usr/share/locale/en_NZ
+#usr/share/locale/en_NZ/LC_MESSAGES
+#usr/share/locale/en_NZ/LC_MESSAGES/avahi.mo
+#usr/share/locale/es/LC_MESSAGES/avahi.mo
+#usr/share/locale/fi/LC_MESSAGES/avahi.mo
+#usr/share/locale/fr/LC_MESSAGES/avahi.mo
+#usr/share/locale/hu/LC_MESSAGES/avahi.mo
+#usr/share/locale/it/LC_MESSAGES/avahi.mo
+#usr/share/locale/ms/LC_MESSAGES/avahi.mo
+#usr/share/locale/pl/LC_MESSAGES/avahi.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo
+#usr/share/locale/ru/LC_MESSAGES/avahi.mo
+#usr/share/locale/sr/LC_MESSAGES/avahi.mo
+#usr/share/locale/sr@latin/LC_MESSAGES/avahi.mo
+#usr/share/locale/sv/LC_MESSAGES/avahi.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo
+#usr/share/man/man1/avahi-bookmarks.1
+#usr/share/man/man1/avahi-browse-domains.1
+#usr/share/man/man1/avahi-browse.1
+#usr/share/man/man1/avahi-publish-address.1
+#usr/share/man/man1/avahi-publish-service.1
+#usr/share/man/man1/avahi-publish.1
+#usr/share/man/man1/avahi-resolve-address.1
+#usr/share/man/man1/avahi-resolve-host-name.1
+#usr/share/man/man1/avahi-resolve.1
+#usr/share/man/man1/avahi-set-host-name.1
+#usr/share/man/man5/avahi-daemon.conf.5
+#usr/share/man/man5/avahi.hosts.5
+#usr/share/man/man5/avahi.service.5
+#usr/share/man/man8/avahi-autoipd.8
+#usr/share/man/man8/avahi-autoipd.action.8
+#usr/share/man/man8/avahi-daemon.8
+#usr/share/man/man8/avahi-dnsconfd.8
+#usr/share/man/man8/avahi-dnsconfd.action.8
index 7ba8a6adc3ecd4aaa8006bdf43ada0304bb54a29..5608568b42ef5201d15835757ab84ddcb7642a00 100644 (file)
@@ -25,6 +25,7 @@ bin/stty
 bin/sync
 bin/true
 bin/uname
+etc/dircolors
 usr/bin/[
 #usr/bin/base64
 usr/bin/basename
index 3af59cc3e29747c4113b23262327c334957b9450..91d0ef815589b09689e7de875244b529f87195c9 100644 (file)
@@ -27,19 +27,18 @@ usr/bin/dbus-uuidgen
 #usr/include/dbus-1.0/dbus/dbus-threads.h
 #usr/include/dbus-1.0/dbus/dbus-types.h
 #usr/include/dbus-1.0/dbus/dbus.h
+#usr/lib/dbus-1
 #usr/lib/dbus-1.0
 #usr/lib/dbus-1.0/include
 #usr/lib/dbus-1.0/include/dbus
 #usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
+usr/lib/dbus-daemon-launch-helper
 #usr/lib/libdbus-1.a
 #usr/lib/libdbus-1.la
 usr/lib/libdbus-1.so
 usr/lib/libdbus-1.so.3
 usr/lib/libdbus-1.so.3.4.0
 #usr/lib/pkgconfig/dbus-1.pc
-usr/libexec
-usr/libexec/dbus-1
-usr/libexec/dbus-daemon-launch-helper
 usr/share/dbus-1
 usr/share/dbus-1/services
 usr/share/dbus-1/system-services
index ee6c6f4b1696748636bc93a015dec00204cf711a..b40b31c00903754b4e267f21de794bbb3be3185e 100644 (file)
@@ -5,13 +5,13 @@ usr/bin/dbus-binding-tool
 #usr/include/dbus-1.0/dbus/dbus-glib-lowlevel.h
 #usr/include/dbus-1.0/dbus/dbus-glib.h
 #usr/include/dbus-1.0/dbus/dbus-gtype-specialized.h
+usr/lib/dbus-bash-completion-helper
 #usr/lib/libdbus-glib-1.a
 #usr/lib/libdbus-glib-1.la
 usr/lib/libdbus-glib-1.so
 usr/lib/libdbus-glib-1.so.2
 usr/lib/libdbus-glib-1.so.2.1.0
 #usr/lib/pkgconfig/dbus-glib-1.pc
-usr/libexec/dbus-bash-completion-helper
 #usr/share/gtk-doc/html/dbus-glib
 #usr/share/gtk-doc/html/dbus-glib/ch01.html
 #usr/share/gtk-doc/html/dbus-glib/ch02.html
index 9ac0cb247543f5b5836e339fc9917d475380fd58..d43850189b5f4b5a6d97c4c51dd36eb2a2bc10ab 100644 (file)
@@ -16,9 +16,9 @@ etc/init.d/network
 etc/init.d/networking
 etc/init.d/networking/brdown
 etc/init.d/networking/brup
-etc/init.d/networking/ifdown
-etc/init.d/networking/ifup
+etc/init.d/networking/net-hotplug
 etc/init.d/networking/services
+etc/init.d/networking/services/bonding
 etc/init.d/networking/services/bridge-slave
 etc/init.d/networking/services/ipv4-static
 etc/init.d/networking/services/ipv4-static-route
diff --git a/src/rootfiles/core/intltool b/src/rootfiles/core/intltool
new file mode 100644 (file)
index 0000000..545c642
--- /dev/null
@@ -0,0 +1,13 @@
+#usr/bin/intltool-extract
+#usr/bin/intltool-merge
+#usr/bin/intltool-prepare
+#usr/bin/intltool-update
+#usr/bin/intltoolize
+#usr/share/aclocal/intltool.m4
+#usr/share/intltool
+#usr/share/intltool/Makefile.in.in
+#usr/share/man/man8/intltool-extract.8
+#usr/share/man/man8/intltool-merge.8
+#usr/share/man/man8/intltool-prepare.8
+#usr/share/man/man8/intltool-update.8
+#usr/share/man/man8/intltoolize.8
index fed867e058318c9d258c31c43c40c6bc80acaa11..d9e5c34482e454519730d014de193abbdfa02b18 100644 (file)
@@ -3,6 +3,7 @@ bin/ping6
 bin/tracepath
 bin/tracepath6
 sbin/arping
+sbin/ifenslave
 #sbin/rdisc
 usr/sbin/arping
 usr/sbin/clockdiff
diff --git a/src/rootfiles/core/libdaemon b/src/rootfiles/core/libdaemon
new file mode 100644 (file)
index 0000000..5c3cd45
--- /dev/null
@@ -0,0 +1,13 @@
+#usr/include/libdaemon
+#usr/include/libdaemon/daemon.h
+#usr/include/libdaemon/dexec.h
+#usr/include/libdaemon/dfork.h
+#usr/include/libdaemon/dlog.h
+#usr/include/libdaemon/dnonblock.h
+#usr/include/libdaemon/dpid.h
+#usr/include/libdaemon/dsignal.h
+#usr/lib/libdaemon.la
+usr/lib/libdaemon.so
+usr/lib/libdaemon.so.0
+usr/lib/libdaemon.so.0.4.0
+#usr/lib/pkgconfig/libdaemon.pc
index 813f01ca42ca1246a81812c136d878a0f328a045..840ac17da238624d9c2f2ea87be54af17da330a4 100644 (file)
@@ -29,9 +29,11 @@ etc/profile.d/readline.sh
 etc/profile.d/umask.sh
 etc/resolv.conf
 etc/securetty
+etc/shells
 etc/sysconfig
 etc/sysctl.conf
 etc/syslog.conf
+etc/system-release
 home
 home/nobody
 lib
@@ -41,6 +43,9 @@ media/floppy
 mnt
 opt
 root
+root/.bash_logout
+root/.bash_profile
+root/.bashrc
 sbin
 srv
 usr/bin
index 31e612792b18e1178730404a8d3a76b5a2ff591c..069aeeb89f1a17b989d78f0c7bc124fd014a1c9c 100644 (file)
@@ -37,6 +37,10 @@ usr/lib/ipsec/plugins/libstrongswan-gmp.so.0.0.0
 usr/lib/ipsec/plugins/libstrongswan-hmac.so
 usr/lib/ipsec/plugins/libstrongswan-hmac.so.0
 usr/lib/ipsec/plugins/libstrongswan-hmac.so.0.0.0
+#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.la
+usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
+usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so.0
+usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so.0.0.0
 #usr/lib/ipsec/plugins/libstrongswan-md5.la
 usr/lib/ipsec/plugins/libstrongswan-md5.so
 usr/lib/ipsec/plugins/libstrongswan-md5.so.0
@@ -61,6 +65,10 @@ usr/lib/ipsec/plugins/libstrongswan-sha2.so.0.0.0
 usr/lib/ipsec/plugins/libstrongswan-stroke.so
 usr/lib/ipsec/plugins/libstrongswan-stroke.so.0
 usr/lib/ipsec/plugins/libstrongswan-stroke.so.0.0.0
+#usr/lib/ipsec/plugins/libstrongswan-updown.la
+usr/lib/ipsec/plugins/libstrongswan-updown.so
+usr/lib/ipsec/plugins/libstrongswan-updown.so.0
+usr/lib/ipsec/plugins/libstrongswan-updown.so.0.0.0
 #usr/lib/ipsec/plugins/libstrongswan-x509.la
 usr/lib/ipsec/plugins/libstrongswan-x509.so
 usr/lib/ipsec/plugins/libstrongswan-x509.so.0
index aac72ca5bbb41d07574becc335a7cc0fa5b57ebd..68a822fb1a83b91bcfc6e84e07e2316fe8ee58ed 100644 (file)
@@ -35,6 +35,7 @@ lib/udev/rules.d/50-firmware.rules
 lib/udev/rules.d/50-udev-default.rules
 lib/udev/rules.d/55-ipfire.rules
 lib/udev/rules.d/60-cdrom_id.rules
+lib/udev/rules.d/60-net.rules
 lib/udev/rules.d/60-persistent-input.rules
 lib/udev/rules.d/60-persistent-serial.rules
 lib/udev/rules.d/60-persistent-storage-tape.rules
index ac3ff20c23c3ec113c4339f921bf28bfad4136ad..638138d1d826c4da29fddda16024258ff86feb64 100644 (file)
@@ -1,5 +1,3 @@
-lib/libhandle.so.1
-lib/libhandle.so.1.0.3
 sbin/fsck.xfs
 sbin/mkfs.xfs
 sbin/xfs_admin
@@ -19,7 +17,6 @@ sbin/xfs_ncheck
 sbin/xfs_quota
 sbin/xfs_repair
 sbin/xfs_rtcp
-usr/lib/libhandle.so
 #usr/share/doc/xfsprogs
 #usr/share/doc/xfsprogs/CHANGES.gz
 #usr/share/doc/xfsprogs/COPYING
diff --git a/src/rootfiles/debug/pax-utils b/src/rootfiles/debug/pax-utils
new file mode 100644 (file)
index 0000000..26d0954
--- /dev/null
@@ -0,0 +1,13 @@
+usr/bin/dumpelf
+usr/bin/lddtree.sh
+usr/bin/pspax
+usr/bin/scanelf
+usr/bin/scanmacho
+#usr/share/doc/pax-utils
+#usr/share/doc/pax-utils/BUGS
+#usr/share/doc/pax-utils/README
+#usr/share/doc/pax-utils/TODO
+#usr/share/man/man1/dumpelf.1
+#usr/share/man/man1/pspax.1
+#usr/share/man/man1/scanelf.1
+#usr/share/man/man1/scanmacho.1
index 6014eee3ed66e2f60a7e5f561c74e41739c4551d..a7d13893b960b5ac0467c19fff50be5f5e0dbe74 100644 (file)
@@ -1,5 +1,4 @@
 usr/bin/htop
-#usr/share/applications
 #usr/share/applications/htop.desktop
 #usr/share/man/man1/htop.1
 #usr/share/pixmaps
diff --git a/src/rootfiles/extras/quagga b/src/rootfiles/extras/quagga
new file mode 100644 (file)
index 0000000..c144ebc
--- /dev/null
@@ -0,0 +1,79 @@
+etc/quagga
+#etc/quagga/bgpd.conf.sample
+#etc/quagga/bgpd.conf.sample2
+#etc/quagga/ospfd.conf.sample
+#etc/quagga/ripd.conf.sample
+#etc/quagga/zebra.conf.sample
+#usr/include/quagga
+#usr/include/quagga/buffer.h
+#usr/include/quagga/checksum.h
+#usr/include/quagga/command.h
+#usr/include/quagga/distribute.h
+#usr/include/quagga/filter.h
+#usr/include/quagga/getopt.h
+#usr/include/quagga/hash.h
+#usr/include/quagga/if.h
+#usr/include/quagga/if_rmap.h
+#usr/include/quagga/jhash.h
+#usr/include/quagga/keychain.h
+#usr/include/quagga/linklist.h
+#usr/include/quagga/log.h
+#usr/include/quagga/md5.h
+#usr/include/quagga/memory.h
+#usr/include/quagga/memtypes.h
+#usr/include/quagga/network.h
+#usr/include/quagga/ospfd
+#usr/include/quagga/ospfd/ospf_api.h
+#usr/include/quagga/ospfd/ospf_asbr.h
+#usr/include/quagga/ospfd/ospf_dump.h
+#usr/include/quagga/ospfd/ospf_ism.h
+#usr/include/quagga/ospfd/ospf_lsa.h
+#usr/include/quagga/ospfd/ospf_lsdb.h
+#usr/include/quagga/ospfd/ospf_nsm.h
+#usr/include/quagga/ospfd/ospf_opaque.h
+#usr/include/quagga/ospfd/ospfd.h
+#usr/include/quagga/plist.h
+#usr/include/quagga/pqueue.h
+#usr/include/quagga/prefix.h
+#usr/include/quagga/privs.h
+#usr/include/quagga/route_types.h
+#usr/include/quagga/routemap.h
+#usr/include/quagga/sigevent.h
+#usr/include/quagga/smux.h
+#usr/include/quagga/sockopt.h
+#usr/include/quagga/sockunion.h
+#usr/include/quagga/str.h
+#usr/include/quagga/stream.h
+#usr/include/quagga/table.h
+#usr/include/quagga/thread.h
+#usr/include/quagga/vector.h
+#usr/include/quagga/version.h
+#usr/include/quagga/vty.h
+#usr/include/quagga/workqueue.h
+#usr/include/quagga/zassert.h
+#usr/include/quagga/zclient.h
+#usr/include/quagga/zebra.h
+#usr/lib/libospf.la
+usr/lib/libospf.so
+usr/lib/libospf.so.0
+usr/lib/libospf.so.0.0.0
+#usr/lib/libzebra.la
+usr/lib/libzebra.so
+usr/lib/libzebra.so.0
+usr/lib/libzebra.so.0.0.0
+usr/sbin/bgpd
+usr/sbin/ospfd
+usr/sbin/ripd
+usr/sbin/watchquagga
+usr/sbin/zebra
+#usr/share/info/quagga.info
+#usr/share/info/quagga.info-1
+#usr/share/info/quagga.info-2
+#usr/share/man/man1/vtysh.1
+#usr/share/man/man8/bgpd.8
+#usr/share/man/man8/isisd.8
+#usr/share/man/man8/ospf6d.8
+#usr/share/man/man8/ospfd.8
+#usr/share/man/man8/ripd.8
+#usr/share/man/man8/ripngd.8
+#usr/share/man/man8/zebra.8
diff --git a/src/rootfiles/extras/tcpdump b/src/rootfiles/extras/tcpdump
new file mode 100644 (file)
index 0000000..8fa969b
--- /dev/null
@@ -0,0 +1,3 @@
+usr/sbin/tcpdump
+#usr/sbin/tcpdump.4.0.0
+#usr/share/man/man1/tcpdump.1
index 1a86ccf8aae9be7ff167bd65aed4080b7754b5f4..4400b9da1839acee57c8c44ef7f27042e1a4dc90 100755 (executable)
@@ -32,6 +32,15 @@ ccache_stats() {
 
 distcc_mon() {
 
+       # run gnome thing if we can...
+       if [ -n "$DISPLAY" ]; then
+               monitor=$(which distccmon-gnome 2>/dev/null)
+               if [ -n "$monitor" ]; then
+                       DISTCC_DIR=$BASEDIR/distcc $monitor &
+                       return 0
+               fi
+       fi
+
        INTERVAL=1 # in seconds
 
        if [ -e $BASEDIR/distcc ]; then
index b375862b43dfc2a865ff816873befaafbbc5a0ec..c2f20fd4888b441e9677f774b50a0545eff1ab05 100644 (file)
@@ -33,7 +33,7 @@ cron_run() {
                exit 1
        fi
 
-       if [ -e "$RUNNING" ]; then
+       if [ -f "$RUNNING" ]; then
                dialogerror "Build is already running at the moment..." 2>&1
                exit 0
        fi
@@ -43,7 +43,7 @@ cron_run() {
        git checkout -f # Remove all local changes !!!
        git_pull --batch
 
-       if [ -e "$FAILED" ]; then
+       if [ -f "$FAILED" ]; then
                dialogerror "Build failed..." 2>&1
                exit 0
        fi