* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a451d8433c92444bd38b78e51bf9a4c6f07708b
@ 2013-02-08 18:23 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-02-08 18:23 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 12904 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 3a451d8433c92444bd38b78e51bf9a4c6f07708b (commit)
via f2cd1800473a75c5e73bb1feff6237056ca57ef8 (commit)
via 8435c437d3f8990d47219e4804a96457cf1417b5 (commit)
via 670d5144851ea2bddb5bb23d929524a112164521 (commit)
via df64bfd3966104ccc75f8dcb02ed08fd37457387 (commit)
via 3d9d58848197475b46980cb3207979d4207d84a0 (commit)
from a0ef4c5bb6f17494172148fe0a5b09e6278c0e92 (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 3a451d8433c92444bd38b78e51bf9a4c6f07708b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 8 19:22:40 2013 +0100
IPFire 2.13rc2.
commit f2cd1800473a75c5e73bb1feff6237056ca57ef8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 8 19:21:52 2013 +0100
core66: add changed initskripts to updater.
commit 8435c437d3f8990d47219e4804a96457cf1417b5
Merge: 670d514 a0ef4c5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 8 15:49:38 2013 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 670d5144851ea2bddb5bb23d929524a112164521
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 7 20:28:11 2013 +0100
leds: setup alix:1 as heartbeat.
commit df64bfd3966104ccc75f8dcb02ed08fd37457387
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 7 20:25:54 2013 +0100
syslinux: update to 4.06.
commit 3d9d58848197475b46980cb3207979d4207d84a0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 7 20:23:01 2013 +0100
network-skripts: fix gateway replace in /etc/hosts.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/i586/syslinux | 37 ++++++++++++++++++++++++++++
config/rootfiles/core/66/filelists/files | 3 +++
lfs/syslinux | 10 ++++----
make.sh | 2 +-
src/initscripts/init.d/leds | 2 ++
src/initscripts/init.d/networking/dhcpcd.exe | 4 +--
src/initscripts/init.d/networking/red | 4 +--
7 files changed, 52 insertions(+), 10 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/i586/syslinux b/config/rootfiles/common/i586/syslinux
index a4a8254..0c43b88 100644
--- a/config/rootfiles/common/i586/syslinux
+++ b/config/rootfiles/common/i586/syslinux
@@ -36,12 +36,14 @@
#usr/share/syslinux/com32/include/bitsize/stdint.h
#usr/share/syslinux/com32/include/bitsize/stdintconst.h
#usr/share/syslinux/com32/include/bitsize/stdintlimits.h
+#usr/share/syslinux/com32/include/bufprintf.h
#usr/share/syslinux/com32/include/colortbl.h
#usr/share/syslinux/com32/include/com32.h
#usr/share/syslinux/com32/include/console.h
#usr/share/syslinux/com32/include/cpufeature.h
#usr/share/syslinux/com32/include/ctype.h
#usr/share/syslinux/com32/include/dev.h
+#usr/share/syslinux/com32/include/dhcp.h
#usr/share/syslinux/com32/include/dirent.h
#usr/share/syslinux/com32/include/dprintf.h
#usr/share/syslinux/com32/include/elf.h
@@ -51,6 +53,24 @@
#usr/share/syslinux/com32/include/getopt.h
#usr/share/syslinux/com32/include/gplinclude
#usr/share/syslinux/com32/include/gplinclude/README
+#usr/share/syslinux/com32/include/gplinclude/acpi
+#usr/share/syslinux/com32/include/gplinclude/acpi/acpi.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/boot.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/dsdt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/ecdt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/facs.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/fadt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/hpet.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/madt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/mcfg.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/rsdp.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/rsdt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/sbst.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/slic.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/ssdt.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/structs.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/tcpa.h
+#usr/share/syslinux/com32/include/gplinclude/acpi/xsdt.h
#usr/share/syslinux/com32/include/gplinclude/cpuid.h
#usr/share/syslinux/com32/include/gplinclude/disk
#usr/share/syslinux/com32/include/gplinclude/disk/bootloaders.h
@@ -79,6 +99,8 @@
#usr/share/syslinux/com32/include/gplinclude/memory.h
#usr/share/syslinux/com32/include/gplinclude/vpd
#usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
+#usr/share/syslinux/com32/include/gplinclude/zzjson
+#usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h
#usr/share/syslinux/com32/include/ilog2.h
#usr/share/syslinux/com32/include/inttypes.h
#usr/share/syslinux/com32/include/klibc
@@ -104,7 +126,9 @@
#usr/share/syslinux/com32/include/stdio.h
#usr/share/syslinux/com32/include/stdlib.h
#usr/share/syslinux/com32/include/string.h
+#usr/share/syslinux/com32/include/suffix_number.h
#usr/share/syslinux/com32/include/sys
+#usr/share/syslinux/com32/include/sys/bitops.h
#usr/share/syslinux/com32/include/sys/cpu.h
#usr/share/syslinux/com32/include/sys/dirent.h
#usr/share/syslinux/com32/include/sys/elf32.h
@@ -126,6 +150,7 @@
#usr/share/syslinux/com32/include/syslinux/bootpm.h
#usr/share/syslinux/com32/include/syslinux/bootrm.h
#usr/share/syslinux/com32/include/syslinux/config.h
+#usr/share/syslinux/com32/include/syslinux/disk.h
#usr/share/syslinux/com32/include/syslinux/features.h
#usr/share/syslinux/com32/include/syslinux/idle.h
#usr/share/syslinux/com32/include/syslinux/io.h
@@ -149,11 +174,16 @@
#usr/share/syslinux/com32/include/zlib.h
#usr/share/syslinux/com32/libcom32.a
#usr/share/syslinux/com32/libcom32gpl.a
+#usr/share/syslinux/com32/libcom32upload.a
#usr/share/syslinux/com32/libutil_com.a
#usr/share/syslinux/com32/libutil_lnx.a
#usr/share/syslinux/config.c32
#usr/share/syslinux/cpuid.c32
#usr/share/syslinux/cpuidtest.c32
+#usr/share/syslinux/diag
+#usr/share/syslinux/diag/geodsp1s.img.xz
+#usr/share/syslinux/diag/geodspms.img.xz
+#usr/share/syslinux/diag/handoff.bin
#usr/share/syslinux/disk.c32
#usr/share/syslinux/dmitest.c32
#usr/share/syslinux/dosutil
@@ -168,10 +198,12 @@
#usr/share/syslinux/gptmbr_f.bin
#usr/share/syslinux/gpxecmd.c32
#usr/share/syslinux/gpxelinux.0
+#usr/share/syslinux/gpxelinuxk.0
#usr/share/syslinux/hdt.c32
#usr/share/syslinux/host.c32
#usr/share/syslinux/ifcpu.c32
#usr/share/syslinux/ifcpu64.c32
+#usr/share/syslinux/ifmemdsk.c32
#usr/share/syslinux/ifplop.c32
#usr/share/syslinux/int18.com
#usr/share/syslinux/isohdpfx.bin
@@ -183,6 +215,7 @@
#usr/share/syslinux/isolinux-debug.bin
#usr/share/syslinux/isolinux.bin
#usr/share/syslinux/kbdmap.c32
+#usr/share/syslinux/kontron_wdt.c32
#usr/share/syslinux/linux.c32
#usr/share/syslinux/ls.c32
#usr/share/syslinux/lua.c32
@@ -197,8 +230,10 @@
#usr/share/syslinux/pcitest.c32
#usr/share/syslinux/pmload.c32
#usr/share/syslinux/poweroff.com
+#usr/share/syslinux/prdhcp.c32
#usr/share/syslinux/pwd.c32
#usr/share/syslinux/pxechain.com
+#usr/share/syslinux/pxechn.c32
#usr/share/syslinux/pxelinux.0
#usr/share/syslinux/reboot.c32
#usr/share/syslinux/rosh.c32
@@ -208,7 +243,9 @@
#usr/share/syslinux/syslinux.com
#usr/share/syslinux/syslinux.exe
#usr/share/syslinux/syslinux64.exe
+#usr/share/syslinux/ver.com
#usr/share/syslinux/vesainfo.c32
#usr/share/syslinux/vesamenu.c32
#usr/share/syslinux/vpdtest.c32
#usr/share/syslinux/whichsys.c32
+#usr/share/syslinux/zzjson.c32
diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files
index 5e38af7..a7f3664 100644
--- a/config/rootfiles/core/66/filelists/files
+++ b/config/rootfiles/core/66/filelists/files
@@ -1,12 +1,15 @@
etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/issue
etc/modprobe.d/cfg80211
+etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/firewall
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/halt
etc/rc.d/init.d/leds
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/network
+etc/rc.d/init.d/networking/dhcpcd.exe
+etc/rc.d/init.d/networking/red
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/partresize
diff --git a/lfs/syslinux b/lfs/syslinux
index ba739ea..43bcde9 100644
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2013 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,10 +24,10 @@
include Config
-VER = 4.02
+VER = 4.06
THISAPP = syslinux-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 52912c03f5c275d6c0ac09180ebab81f
+$(DL_FILE)_MD5 = 77d33140860621cd850c3a7ab0ebb7d6
install : $(TARGET)
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index f48f4ed..8d42e47 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
-VERSION="2.13rc1" # Version number
+VERSION="2.13rc2" # Version number
CORE="65" # Core Level (Filename)
PAKFIRE_CORE="65" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds
index 0d6ee72..3bd27a4 100644
--- a/src/initscripts/init.d/leds
+++ b/src/initscripts/init.d/leds
@@ -53,6 +53,7 @@ disable_led_trigger ()
case "${1}" in
start)
# Alix LED start
+ setup_heartbeat_trigger alix:1
setup_netdev_trigger alix:2 ${RED_DEV} rx
setup_netdev_trigger alix:3 ${RED_DEV} tx
@@ -78,6 +79,7 @@ case "${1}" in
stop)
# Alix LED stop
+ disable_led_trigger alix:1
disable_led_trigger alix:2
disable_led_trigger alix:3
diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index d61c3d5..a7bad47 100644
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -64,8 +64,8 @@ dhcpcd_up()
echo -n "$new_ip_address" > /var/ipfire/red/local-ipaddress
#Get default gateway
- grep -v " gateway$" /etc/hosts > /tmp/hosts
- echo "$new_routers gateway" >> /tmp/hosts
+ grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
+ echo "$new_routers gateway" >> /tmp/hosts
mv /tmp/hosts /etc/hosts
fi
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 2b342c8..421c6f6 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -120,8 +120,8 @@ case "${1}" in
echo -n "${DEVICE}" > /var/ipfire/red/iface
echo -n "${ADDRESS}" > /var/ipfire/red/local-ipaddress
echo -n "${GATEWAY}" > /var/ipfire/red/remote-ipaddress
- grep -v "gateway" /etc/hosts > /tmp/hosts
- echo "$GATEWAY gateway" >> /tmp/hosts
+ grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
+ echo "$GATEWAY gateway" >> /tmp/hosts
mv /tmp/hosts /etc/hosts
echo -n "${DNS1}" > /var/ipfire/red/dns1
echo -n "${DNS2}" > /var/ipfire/red/dns2
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-08 18:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-08 18:23 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a451d8433c92444bd38b78e51bf9a4c6f07708b git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox