Hinzugefügt:

  * HTOP - http://htop.sourceforge.net

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@141 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f72273f9c88a023e0f320f5d8c4336f154b3b34b..c1689185cc0ec5067493e08c5b3e3f3758557189 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -96,6 +96,7 @@
   * grub-0.95
   * gzip-1.3.5
   * hdparm-6.3
+  * htop-0.6.2
   * iana-etc-2.00
   * ibod
   * inetutils-1.4.2

diff --git a/lfs/GeoIP b/lfs/GeoIP
index ef7651248e1bdf36b4e3b2a300c724a092068092..55d4ba420a099542b8a95d348354e22c0247f8d8 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -80,6 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && perl Makefile.PL
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && mkdir -p /usr/local/share/GeoIP && mv $(DIR_DL)/GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat
+       cd $(DIR_APP) && mkdir -p /usr/local/share/GeoIP && cp -f $(DIR_DL)/GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/htop b/lfs/htop
new file mode 100644 (file)
index 0000000..24cd5a8
--- /dev/null
+++ b/lfs/htop
@@ -0,0 +1,82 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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 IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.6.2
+
+THISAPP    = htop-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 995e76b7fd18c05fb7fb5ef10a2166ca
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+#dist: 
+#      make-packages.sh htop $(THISAPP)-ipfire-beta-1
+
+###############################################################################
+# 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) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 15eafd74f3d3f4a9d2be90ca548ebb4f462b2cfd..b8132b7749d1db994f55f997a58a943dee9d212d 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -705,6 +705,7 @@ buildipcop() {
   ipcopmake tcpwrapper
   ipcopmake portmap
   ipcopmake nmap
+  ipcopmake htop
   ipcopmake nfs
   ipcopmake ncftp
   ipcopmake ethereal

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 12473fdadd6c724797596c33632cce14db04091b..688f8b67559c7922060aa7fb9cdac72123216b5b 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -26641,3 +26641,29 @@ usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/IO/Stringy/.packlist
 #usr/share/man/man3/IO::Stringy.3
 #usr/share/man/man3/IO::Wrap.3
 #usr/share/man/man3/IO::WrapTie.3
+##
+## htop
+##
+usr/bin/htop
+#usr/share/applications
+#usr/share/applications/htop.desktop
+#usr/share/man/man1/htop.1
+#usr/share/pixmaps
+#usr/share/pixmaps/htop.png
+##
+## GeoIP
+##
+usr/bin/geoip-lookup
+usr/lib/perl5/5.8.5/i686-linux/perllocal.pod
+usr/lib/perl5/site_perl/5.8.5/Geo
+usr/lib/perl5/site_perl/5.8.5/Geo/IP
+usr/lib/perl5/site_perl/5.8.5/Geo/IP/PurePerl.pm
+usr/lib/perl5/site_perl/5.8.5/i686-linux/auto
+usr/lib/perl5/site_perl/5.8.5/i686-linux/auto/Geo
+usr/lib/perl5/site_perl/5.8.5/i686-linux/auto/Geo/IP
+usr/lib/perl5/site_perl/5.8.5/i686-linux/auto/Geo/IP/PurePerl
+usr/lib/perl5/site_perl/5.8.5/i686-linux/auto/Geo/IP/PurePerl/.packlist
+usr/local/share/GeoIP
+usr/local/share/GeoIP/GeoIP.dat
+#usr/share/man/man1/geoip-lookup.1
+#usr/share/man/man3/Geo::IP::PurePerl.3