Revert "ncat: Update to 7.91"

[people/pmueller/ipfire-2.x.git] / lfs / procps

diff --git a/lfs/procps b/lfs/procps
index ae30f2f129b2b4a264116e9bf9b4faea9f49c7aa..4667917c8637d9876277fff3e9fc54e6d147340e 100644 (file)
--- a/lfs/procps
+++ b/lfs/procps
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.6
+VER        = v3.3.16
 
 THISAPP    = procps-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7ce39ea27d7b3da0e8ad74dd41d06783
+$(DL_FILE)_MD5 = 2af440d54f94a3b44020bf0ea1bf9de8
 
 install : $(TARGET)
 
@@ -70,9 +70,17 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_unknown_HZ_value.patch
-       cd $(DIR_APP) && make $(MAKETUNING) LIBPROC=proc/libproc-$(VER).so
+       cd $(DIR_APP) && ./autogen.sh
+       cd $(DIR_APP) && ./configure \
+                               --prefix=/usr \
+                               --libdir=/lib
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc
+
+       # Move some tools to /bin & /sbin
+       mv -v /usr/bin/{kill,ps} /bin
+       mv -v /usr/sbin/sysctl /sbin
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)