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 83490805a4777090cf62be5b18ff0dd7abdc29c4 (commit) via 7f263dc736aa23fdfdf1697ed901c0d5278d6b56 (commit) via 048c2ff77d489be3086c3be9661b259db43e6b3e (commit) via 9b3ffc7457b5e63580569302c36255b93f0dc4cf (commit) from 6d7aff4a53e76c7c7a8b633553c0a9e7bc8e96f8 (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 83490805a4777090cf62be5b18ff0dd7abdc29c4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 19 18:51:38 2015 +0100
core94: Ship updated initscripts
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7f263dc736aa23fdfdf1697ed901c0d5278d6b56 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Sep 19 10:04:25 2015 +0200
Fixed some typos in initscript
"Createing= => "Creating"...
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 048c2ff77d489be3086c3be9661b259db43e6b3e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 19 18:50:14 2015 +0100
core94: Ship updated iproute2 package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9b3ffc7457b5e63580569302c36255b93f0dc4cf Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Sep 19 08:23:49 2015 +0200
iproute2: Update to 4.2.0
List of changes can be seen at http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/log/
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/iproute2 | 12 ++++++++++++ config/rootfiles/core/94/filelists/files | 1 + config/rootfiles/{oldcore/66 => core/94}/filelists/iproute2 | 0 lfs/iproute2 | 6 +++--- src/initscripts/init.d/networking/red | 6 +++--- 5 files changed, 19 insertions(+), 6 deletions(-) copy config/rootfiles/{oldcore/66 => core/94}/filelists/iproute2 (100%)
Difference in files: diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index bb4c05b..93dcaff 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -1,6 +1,7 @@ #etc/iproute2 etc/iproute2/ematch_map etc/iproute2/group +etc/iproute2/nl_protos etc/iproute2/rt_dsfield etc/iproute2/rt_protos etc/iproute2/rt_realms @@ -60,20 +61,27 @@ usr/sbin/arpd #usr/share/doc/iproute2/rtstat.sgml #usr/share/doc/iproute2/ss.sgml #usr/share/man/man3/libnetlink.3 +#usr/share/man/man7/tc-hfsc.7 #usr/share/man/man8/arpd.8 #usr/share/man/man8/bridge.8 #usr/share/man/man8/ctstat.8 #usr/share/man/man8/ip-address.8 #usr/share/man/man8/ip-addrlabel.8 +#usr/share/man/man8/ip-fou.8 +#usr/share/man/man8/ip-gue.8 +#usr/share/man/man8/ip-l2tp.8 #usr/share/man/man8/ip-link.8 #usr/share/man/man8/ip-maddress.8 #usr/share/man/man8/ip-monitor.8 #usr/share/man/man8/ip-mroute.8 #usr/share/man/man8/ip-neighbour.8 +#usr/share/man/man8/ip-netconf.8 #usr/share/man/man8/ip-netns.8 #usr/share/man/man8/ip-ntable.8 #usr/share/man/man8/ip-route.8 #usr/share/man/man8/ip-rule.8 +#usr/share/man/man8/ip-tcp_metrics.8 +#usr/share/man/man8/ip-token.8 #usr/share/man/man8/ip-tunnel.8 #usr/share/man/man8/ip-xfrm.8 #usr/share/man/man8/ip.8 @@ -86,17 +94,21 @@ usr/sbin/arpd #usr/share/man/man8/rtstat.8 #usr/share/man/man8/ss.8 #usr/share/man/man8/tc-bfifo.8 +#usr/share/man/man8/tc-bpf.8 #usr/share/man/man8/tc-cbq-details.8 #usr/share/man/man8/tc-cbq.8 #usr/share/man/man8/tc-choke.8 #usr/share/man/man8/tc-codel.8 #usr/share/man/man8/tc-drr.8 +#usr/share/man/man8/tc-ematch.8 #usr/share/man/man8/tc-fq_codel.8 #usr/share/man/man8/tc-hfsc.8 #usr/share/man/man8/tc-htb.8 +#usr/share/man/man8/tc-mqprio.8 #usr/share/man/man8/tc-netem.8 #usr/share/man/man8/tc-pfifo.8 #usr/share/man/man8/tc-pfifo_fast.8 +#usr/share/man/man8/tc-pie.8 #usr/share/man/man8/tc-prio.8 #usr/share/man/man8/tc-red.8 #usr/share/man/man8/tc-sfb.8 diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files index 8ea8582..540b8a3 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -1,5 +1,6 @@ etc/system-release etc/issue +etc/rc.d/init.d/networking/red etc/rc.d/init.d/snort etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/logs.cgi/log.dat diff --git a/config/rootfiles/core/94/filelists/iproute2 b/config/rootfiles/core/94/filelists/iproute2 new file mode 120000 index 0000000..05f0f71 --- /dev/null +++ b/config/rootfiles/core/94/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/lfs/iproute2 b/lfs/iproute2 index 42a8184..51f1f3d 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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 # @@ -24,7 +24,7 @@
include Config
-VER = 3.5.1 +VER = 4.2.0
THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d4425b44edd5eacd6099e672e4baacbf +$(DL_FILE)_MD5 = 51c54cc3245eff451154938fbc0f64f5
install : $(TARGET)
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index e0c66b6..9dfbad6 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -173,7 +173,7 @@ case "${1}" in if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then PPP_NIC=nas${ATM_DEV} DEVICE=nas${ATM_DEV} - boot_mesg "Createing ATM-Bridge as $PPP_NIC ..." + boot_mesg "Creating ATM-Bridge as $PPP_NIC ..." br2684ctl -c${ATM_DEV} -e${ENCAP} -a${ATM_DEV}.${VPI}.${VCI} >/dev/null 2>&1 & sleep 1
@@ -193,7 +193,7 @@ case "${1}" in fi
if [ "$TYPE" == "vdsl" ]; then - boot_mesg "Createing VLAN Interface ${DEVICE}.${INET_VLAN} ..." + boot_mesg "Creating VLAN Interface ${DEVICE}.${INET_VLAN} ..." modprobe 8021q vconfig add ${DEVICE} ${INET_VLAN} if [ -n "$MAC1" ]; then @@ -218,7 +218,7 @@ case "${1}" in fi
if [ ! -f "$PIDFILE" ]; then - boot_mesg "Createing VLAN Interface ${DEVICE}.${IPTV_VLAN} ..." + boot_mesg "Creating VLAN Interface ${DEVICE}.${IPTV_VLAN} ..." modprobe 8021q vconfig add ${DEVICE} ${IPTV_VLAN} if [ -n "$MAC2" ]; then
hooks/post-receive -- IPFire 2.x development tree