From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0b2e986e3948cc19ab9ed02ce3da11de495bc33f
Date: Sun, 11 Aug 2013 13:40:23 +0200 [thread overview]
Message-ID: <20130811114025.61BC520310@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 12091 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 0b2e986e3948cc19ab9ed02ce3da11de495bc33f (commit)
via 54cdc7dea2b59ff05bf9e1b4d6308214826fc8a1 (commit)
via 9ff0db36c130cced27b667ac6b8ef8d423882380 (commit)
via 3b5b44904748a923e0555ad929608f642574adb3 (commit)
via dab66b75eef0f9d9fe42842ad67e14cb3591c0c9 (commit)
via 5b9c1b9ad48f3428420ce4a8f1773c451ccfe2c1 (commit)
via 71ce1f7a0e85cd00097acb3d68ff57ac1e5f60ee (commit)
via 9e49a099091af511fbb07f5b18fb7385bb41969d (commit)
via 7a6bb67a6be2c51053d6a1a432926f7231ba23e8 (commit)
via d0e3e64b1ec93ec93e62546fd52d37b2ad3232dd (commit)
via 2c5bb6037f5eb29bc71580f6937dac570ec6a919 (commit)
from d04fd3c956e262ddc5204645326f23923a353c56 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0b2e986e3948cc19ab9ed02ce3da11de495bc33f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 11 13:36:28 2013 +0200
iptraf-ng: Update to 1.1.4.
commit 54cdc7dea2b59ff05bf9e1b4d6308214826fc8a1
Merge: 9ff0db3 9e49a09
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 11 13:33:48 2013 +0200
Merge remote-tracking branch 'ummeegge/iptraf-ng' into next
Conflicts:
make.sh
commit 9ff0db36c130cced27b667ac6b8ef8d423882380
Merge: 3b5b449 7a6bb67
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 11 13:32:51 2013 +0200
Merge remote-tracking branch 'ummeegge/wavemon' into next
Conflicts:
make.sh
commit 3b5b44904748a923e0555ad929608f642574adb3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 11 13:25:56 2013 +0200
core73: Add updated language files.
commit dab66b75eef0f9d9fe42842ad67e14cb3591c0c9
Merge: 5b9c1b9 d0e3e64
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 11 13:25:34 2013 +0200
Merge remote-tracking branch 'ummeegge/langs' into next
commit 5b9c1b9ad48f3428420ce4a8f1773c451ccfe2c1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 11 13:23:55 2013 +0200
core73: Add updated list of user agents.
commit 71ce1f7a0e85cd00097acb3d68ff57ac1e5f60ee
Merge: d04fd3c 2c5bb60
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 11 13:22:10 2013 +0200
Merge remote-tracking branch 'ummeegge/useragent' into next
commit 9e49a099091af511fbb07f5b18fb7385bb41969d
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Jul 30 23:00:23 2013 +0200
New package: iptraf-ng a network monitoring utility
commit 7a6bb67a6be2c51053d6a1a432926f7231ba23e8
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Jul 30 15:24:30 2013 +0200
New package: wavemon monitor for wireless devices.
commit d0e3e64b1ec93ec93e62546fd52d37b2ad3232dd
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Jul 30 15:19:12 2013 +0200
langs: Fix ortohography for Fw-Loggraphs
Fixes #10383
commit 2c5bb6037f5eb29bc71580f6937dac570ec6a919
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Jul 30 15:09:37 2013 +0200
useragents: Fix the syntax for libww-perl
Fixes #10382
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/useragents | 2 +-
config/rootfiles/core/73/filelists/files | 2 ++
config/rootfiles/packages/iptraf-ng | 5 +++++
config/rootfiles/packages/wavemon | 10 +++++++++
langs/en/cgi-bin/en.pl | 2 +-
lfs/{sendEmail => iptraf-ng} | 36 ++++++++++++++++++++++++--------
lfs/{stress => wavemon} | 16 +++++++-------
make.sh | 2 ++
8 files changed, 57 insertions(+), 18 deletions(-)
create mode 100644 config/rootfiles/packages/iptraf-ng
create mode 100644 config/rootfiles/packages/wavemon
copy lfs/{sendEmail => iptraf-ng} (68%)
copy lfs/{stress => wavemon} (86%)
Difference in files:
diff --git a/config/cfgroot/useragents b/config/cfgroot/useragents
index 5fe3446..d5164fd 100644
--- a/config/cfgroot/useragents
+++ b/config/cfgroot/useragents
@@ -11,7 +11,7 @@ GOZILLA,Go!Zilla,(Go!Zilla)
GOOGLE,Google Toolbar,(Google\sToolbar)
JAVA,Java,(Java)
KONQUEROR,Konqueror,(Konqueror)
-LIBWWWPERL,libwww-perl,(libww-perl)
+LIBWWWPERL,libwww-perl,(libwww-perl)
LYNX,Lynx,(Lynx)
MSIE,Internet Explorer,(MSIE.*[)]$)
NETSCAPE,Netscape,(^Mozilla\/4.[7|8])|(Netscape)
diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files
index 409e5fe..d0fe965 100644
--- a/config/rootfiles/core/73/filelists/files
+++ b/config/rootfiles/core/73/filelists/files
@@ -1,2 +1,4 @@
etc/system-release
etc/issue
+var/ipfire/langs
+var/ipfire/proxy/advanced/useragents
diff --git a/config/rootfiles/packages/iptraf-ng b/config/rootfiles/packages/iptraf-ng
new file mode 100644
index 0000000..4ad3c86
--- /dev/null
+++ b/config/rootfiles/packages/iptraf-ng
@@ -0,0 +1,5 @@
+usr/sbin/iptraf-ng
+usr/sbin/rvnamed-ng
+var/lib/iptraf-ng
+var/lock/iptraf-ng
+var/log/iptraf-ng
diff --git a/config/rootfiles/packages/wavemon b/config/rootfiles/packages/wavemon
new file mode 100644
index 0000000..4f0fa3c
--- /dev/null
+++ b/config/rootfiles/packages/wavemon
@@ -0,0 +1,10 @@
+usr/bin/wavemon
+#usr/share/man/man1/wavemon.1
+#usr/share/man/man5/wavemonrc.5
+#usr/share/wavemon
+#usr/share/wavemon/AUTHORS
+#usr/share/wavemon/COPYING
+#usr/share/wavemon/ChangeLog
+#usr/share/wavemon/NEWS
+#usr/share/wavemon/README
+#usr/share/wavemon/THANKS
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b12ae7d..b84c6bb 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -897,7 +897,7 @@
'firewall log' => 'Firewall log',
'firewall log viewer' => 'Firewall Log Viewer',
'firewall logs' => 'Firewall Logs',
-'firewall logs ip' => 'Fw-Logdgraphs (IP)',
+'firewall logs ip' => 'Fw-Loggraphs (IP)',
'firewall logs port' => 'Fw-Loggraphs (Port)',
'firewallhits' => 'firewallhits',
'firmware' => 'Firmware',
diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng
new file mode 100644
index 0000000..d049173
--- /dev/null
+++ b/lfs/iptraf-ng
@@ -0,0 +1,87 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.1.4
+
+THISAPP = iptraf-ng-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = iptraf-ng
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = de27cfeeede96e2acfb0edc8439b034a
+
+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 xzf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr
+
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+
+ # Binary install
+ cd $(DIR_APP) && install -v -m750 -D iptraf-ng /usr/sbin/iptraf-ng
+ cd $(DIR_APP) && install -v -m750 -D rvnamed-ng /usr/sbin/rvnamed-ng
+
+ # Directory install
+ -mkdir -vp /var/log/iptraf-ng
+ chmod 750 /var/log/iptraf-ng
+ chown root.root /var/log/iptraf-ng
+ -mkdir -vp /var/lib/iptraf-ng
+ chmod 750 /var/lib/iptraf-ng
+ chown root.root /var/lib/iptraf-ng
+ -mkdir -vp /var/lock/iptraf-ng
+ chmod 755 /var/lock/iptraf-ng
+ chown root.root /var/lock/iptraf-ng
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/wavemon b/lfs/wavemon
new file mode 100644
index 0000000..a3df36e
--- /dev/null
+++ b/lfs/wavemon
@@ -0,0 +1,71 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.7.5
+
+THISAPP = wavemon-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = wavemon
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 77d4a0f099ca98cf98a915adc70694ba
+
+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 axf $(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/make.sh b/make.sh
index 7b63bd4..50a5878 100755
--- a/make.sh
+++ b/make.sh
@@ -782,6 +782,8 @@ buildipfire() {
ipfiremake swatch
ipfiremake tor
ipfiremake arm
+ ipfiremake wavemon
+ ipfiremake iptraf-ng
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-08-11 11:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130811114025.61BC520310@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox