* [PATCH] iftop: This is an Update release to version 1.0pre4 .
@ 2017-08-10 12:16 Erik Kapfer
2017-08-10 12:29 ` ummeegge
0 siblings, 1 reply; 2+ messages in thread
From: Erik Kapfer @ 2017-08-10 12:16 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 9140 bytes --]
Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
config/rootfiles/packages/iftop | 2 +
config/rootfiles/packages/keepalived | 5 +-
lfs/iftop | 88 ++++++++++++++++++++++++++++++++++++
lfs/keepalived | 13 ++++--
lfs/nginx | 8 ++--
make.sh | 6 +++
6 files changed, 110 insertions(+), 12 deletions(-)
create mode 100644 config/rootfiles/packages/iftop
create mode 100644 lfs/iftop
diff --git a/config/rootfiles/packages/iftop b/config/rootfiles/packages/iftop
new file mode 100644
index 0000000..aaa4d9d
--- /dev/null
+++ b/config/rootfiles/packages/iftop
@@ -0,0 +1,2 @@
+usr/sbin/iftop
+#usr/share/man/man8/iftop.8
diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages/keepalived
index fbf5702..191ae3a 100644
--- a/config/rootfiles/packages/keepalived
+++ b/config/rootfiles/packages/keepalived
@@ -21,18 +21,17 @@ etc/keepalived/samples
#etc/keepalived/samples/keepalived.conf.vrrp.localcheck
#etc/keepalived/samples/keepalived.conf.vrrp.lvs_syncd
#etc/keepalived/samples/keepalived.conf.vrrp.routes
+#etc/keepalived/samples/keepalived.conf.vrrp.rules
#etc/keepalived/samples/keepalived.conf.vrrp.scripts
#etc/keepalived/samples/keepalived.conf.vrrp.static_ipaddress
#etc/keepalived/samples/keepalived.conf.vrrp.sync
#etc/keepalived/samples/root.pem
#etc/keepalived/samples/sample.misccheck.smbcheck.sh
-#etc/sysconfig/keepalived
etc/rc.d/init.d/keepalived
+#etc/sysconfig/keepalived
usr/bin/genhash
usr/sbin/keepalived
#usr/share/man/man1/genhash.1
#usr/share/man/man5/keepalived.conf.5
#usr/share/man/man8/keepalived.8
-#usr/share/snmp/mibs/KEEPALIVED-MIB
-#usr/share/snmp/mibs/VRRP-MIB
var/ipfire/backup/addons/includes/keepalived
diff --git a/lfs/iftop b/lfs/iftop
new file mode 100644
index 0000000..5b14c7f
--- /dev/null
+++ b/lfs/iftop
@@ -0,0 +1,88 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2017 IPFire Team <info(a)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 #
+# 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 = 1.0pre4
+
+THISAPP = iftop-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = iftop
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7e6decb4958e8a4890cccac335239f24
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# 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 $(MAKETUNING)
+ cd $(DIR_APP) && make install
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
+
diff --git a/lfs/keepalived b/lfs/keepalived
index 257ceb2..a4d457a 100644
--- a/lfs/keepalived
+++ b/lfs/keepalived
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2017 IPFire Team <info(a)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 = 1.2.17
+VER = 1.3.5
THISAPP = keepalived-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = keepalived
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8d6400e1be43fc303175164d69125dce
+$(DL_FILE)_MD5 = 9964d295ec9d34ed3408b57d28847b68
install : $(TARGET)
@@ -77,8 +77,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
--with-kernel-dir=/usr/include
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/nginx b/lfs/nginx
index d27e4de..5bc5426 100644
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-14 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2017 IPFire Team <info(a)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 = 1.8.1
+VER = 1.13.3
THISAPP = nginx-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nginx
-PAK_VER = 5
+PAK_VER = 6
###############################################################################
# Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2e91695074dbdfbf1bcec0ada9fda462
+$(DL_FILE)_MD5 = 1f8529568f825dfa4da4e99ba483678e
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 663f23f..5835d1a 100755
--- a/make.sh
+++ b/make.sh
@@ -789,6 +789,7 @@ buildipfire() {
lfsmake2 cacti
lfsmake2 openvmtools
lfsmake2 nagiosql
+ lfsmake2 iftop
lfsmake2 motion
lfsmake2 joe
lfsmake2 monit
@@ -885,6 +886,11 @@ buildipfire() {
lfsmake2 perl-common-sense
lfsmake2 perl-inotify2
lfsmake2 perl-Net-IP
+ lfsmake2 byacc
+ lfsmake2 flowd
+ lfsmake2 libconfuse
+ lfsmake2 bmon
+ lfsmake2 nDPI
}
buildinstaller() {
--
2.7.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] iftop: This is an Update release to version 1.0pre4 .
2017-08-10 12:16 [PATCH] iftop: This is an Update release to version 1.0pre4 Erik Kapfer
@ 2017-08-10 12:29 ` ummeegge
0 siblings, 0 replies; 2+ messages in thread
From: ummeegge @ 2017-08-10 12:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 121 bytes --]
Hi all,
sorry for this accident wanted to push only the iftop update. Come soon back with a clean one.
Erik
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-10 12:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-10 12:16 [PATCH] iftop: This is an Update release to version 1.0pre4 Erik Kapfer
2017-08-10 12:29 ` ummeegge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox