IPFire-SCM December 2010

ipfire-scm@lists.ipfire.org

1 participants
119 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1c0a5e3e6de12ffa6371ec5b3c409b495cda3b20
by git＠ipfire.org 11 Dec '10

11 Dec '10

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, master has been updated via 1c0a5e3e6de12ffa6371ec5b3c409b495cda3b20 (commit) from a479eb34feb1d020c83d7e2b0e492314302e8090 (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 1c0a5e3e6de12ffa6371ec5b3c409b495cda3b20 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 21:37:21 2010 +0100 fireinfo: Update to version 0.9.1. ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index d503150..2c168e4 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 0.9 +VER = 0.9.1 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b4ea55202d7ef82eef100925048d5d80 +$(DL_FILE)_MD5 = 20c84bc4fb41d35fc4049798f5c480ad install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-beta1, created. a479eb34feb1d020c83d7e2b0e492314302e8090
by git＠ipfire.org 11 Dec '10

11 Dec '10

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 tag, v2.9-beta1 has been created at a479eb34feb1d020c83d7e2b0e492314302e8090 (commit) - Log ----------------------------------------------------------------- commit a479eb34feb1d020c83d7e2b0e492314302e8090 Merge: d58d68b 29f1189 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 21:03:12 2010 +0100 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a479eb34feb1d020c83d7e2b0e492314302e8090
by git＠ipfire.org 11 Dec '10

11 Dec '10

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, master has been updated via a479eb34feb1d020c83d7e2b0e492314302e8090 (commit) via d58d68b533037da8bbce85221f61ec5311d9e189 (commit) from 29f11892eddd4d8f791acd6fb8d218cfdf37c63a (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 a479eb34feb1d020c83d7e2b0e492314302e8090 Merge: d58d68b 29f1189 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 21:03:12 2010 +0100 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x commit d58d68b533037da8bbce85221f61ec5311d9e189 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 21:02:54 2010 +0100 fireinfo: Update to 0.9. ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index 327ee46..d503150 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 0.8 +VER = 0.9 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = df263c5c43a9ea547f31fa555bfb5635 +$(DL_FILE)_MD5 = b4ea55202d7ef82eef100925048d5d80 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-beta1, created. 29f11892eddd4d8f791acd6fb8d218cfdf37c63a
by git＠ipfire.org 11 Dec '10

11 Dec '10

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 tag, v2.9-beta1 has been created at 29f11892eddd4d8f791acd6fb8d218cfdf37c63a (commit) - Log ----------------------------------------------------------------- commit 29f11892eddd4d8f791acd6fb8d218cfdf37c63a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 11 10:51:22 2010 +0100 Add fireinfo startscript to core updater. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 29f11892eddd4d8f791acd6fb8d218cfdf37c63a
by git＠ipfire.org 11 Dec '10

11 Dec '10

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, master has been updated via 29f11892eddd4d8f791acd6fb8d218cfdf37c63a (commit) from eab1db55d713a104f06d66b6623cb61fa360482f (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 29f11892eddd4d8f791acd6fb8d218cfdf37c63a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 11 10:51:22 2010 +0100 Add fireinfo startscript to core updater. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/44/filelists/files | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files index 340a33b..5bb9b0a 100644 --- a/config/rootfiles/core/44/filelists/files +++ b/config/rootfiles/core/44/filelists/files @@ -5,6 +5,7 @@ etc/rc.d/init.d/firewall etc/rc.d/init.d/squid etc/rc.d/init.d/networking/dhcpcd.exe etc/rc.d/init.d/networking/red +etc/rc.d/init.d/networking/red.up/99-fireinfo srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/pakfire.cgi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. eab1db55d713a104f06d66b6623cb61fa360482f
by git＠ipfire.org 11 Dec '10

11 Dec '10

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, master has been updated via eab1db55d713a104f06d66b6623cb61fa360482f (commit) from 3e0cef2a2673b6c434e10bc656b99a5feb550ff4 (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 eab1db55d713a104f06d66b6623cb61fa360482f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 10:58:07 2010 +0100 fireinfo: Update to 0.8. ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index 7db029a..327ee46 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 0.7 +VER = 0.8 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a0575923a1719be9ff75fb0bbc8d50eb +$(DL_FILE)_MD5 = df263c5c43a9ea547f31fa555bfb5635 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3e0cef2a2673b6c434e10bc656b99a5feb550ff4
by git＠ipfire.org 11 Dec '10

11 Dec '10

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, master has been updated via 3e0cef2a2673b6c434e10bc656b99a5feb550ff4 (commit) via b0849c98600896b22969ada84e04537e9847f411 (commit) via e9ef343f6de2d22519ea5021e184d2eae5437421 (commit) via 0652dff7e3c019ce551c89b15c79c1112928767f (commit) from 712829a1b84985bd800c84298f81a116d3a39810 (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 3e0cef2a2673b6c434e10bc656b99a5feb550ff4 Merge: b0849c9 712829a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 10:55:03 2010 +0100 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x commit b0849c98600896b22969ada84e04537e9847f411 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 10:54:43 2010 +0100 fireinfo: Send profile by default (for beta only). commit e9ef343f6de2d22519ea5021e184d2eae5437421 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 10:52:30 2010 +0100 Enable sending of profile on first connection startup. commit 0652dff7e3c019ce551c89b15c79c1112928767f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 11 10:40:35 2010 +0100 Add crontab entry for fireinfo. ----------------------------------------------------------------------- Summary of changes: config/cron/crontab | 3 +++ config/rootfiles/common/fireinfo | 1 + config/rootfiles/common/initscripts | 1 + lfs/fireinfo | 3 +++ .../init.d/networking/red.up/99-fireinfo | 13 +++++++++++++ 5 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 src/initscripts/init.d/networking/red.up/99-fireinfo Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index cbc92cb..16a5b96 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -52,3 +52,6 @@ HOME=/ # Reset Dialup Statistics &bootrun 0 0 1 * * /usr/local/bin/dialctrl.pl reset + +# fireinfo +%nightly,random * 23-4 /usr/bin/sendprofile >/dev/null 2>&1 diff --git a/config/rootfiles/common/fireinfo b/config/rootfiles/common/fireinfo index ea327e3..e4073dd 100644 --- a/config/rootfiles/common/fireinfo +++ b/config/rootfiles/common/fireinfo @@ -11,3 +11,4 @@ usr/lib/python2.7/site-packages/fireinfo/hypervisor.py usr/lib/python2.7/site-packages/fireinfo/hypervisor.pyc usr/lib/python2.7/site-packages/fireinfo/system.py usr/lib/python2.7/site-packages/fireinfo/system.pyc +var/ipfire/main/send_profile diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 90ecf19..3bd4142 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -86,6 +86,7 @@ etc/rc.d/init.d/networking/red.up/40-ipac etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl +etc/rc.d/init.d/networking/red.up/99-fireinfo etc/rc.d/init.d/networking/red.up/99-pakfire-update #etc/rc.d/init.d/nfs-server etc/rc.d/init.d/ntp diff --git a/lfs/fireinfo b/lfs/fireinfo index 8d45d6b..7db029a 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -76,5 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Remove egg-info rm -rvf /usr/lib/python*/site-packages/fireinfo*.egg-info + # XXX Set flag to send profile. + touch /var/ipfire/main/send_profile + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/init.d/networking/red.up/99-fireinfo b/src/initscripts/init.d/networking/red.up/99-fireinfo new file mode 100644 index 0000000..089affc --- /dev/null +++ b/src/initscripts/init.d/networking/red.up/99-fireinfo @@ -0,0 +1,13 @@ +#!/bin/bash + +# Send the fireinfo profile after first boot (if enabled) + +INDICATION="/var/run/fireinfo" + +if [ ! -e "${INDICATION}" ]; then + /usr/bin/sendprofile >/dev/null 2>&1 + + touch ${INDICATION} +fi + +exit 0 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 712829a1b84985bd800c84298f81a116d3a39810
by git＠ipfire.org 11 Dec '10

11 Dec '10

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, master has been updated via 712829a1b84985bd800c84298f81a116d3a39810 (commit) via 513d55e208e12d776601d82d343962e5d98724d0 (commit) from ebc3a12fcb97526c0bb8158bfb855b8ba48dc7e5 (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 712829a1b84985bd800c84298f81a116d3a39810 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 11 09:36:58 2010 +0100 Set iso back to core43. commit 513d55e208e12d776601d82d343962e5d98724d0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 11 09:35:22 2010 +0100 Changed ISO download path to normal server. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- src/install+setup/install/downloadsource.sh | 4 +--- src/scripts/backupiso | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 3993291..37a4600 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9beta1" # Version number -CORE="44" # Core Level (Filename) +CORE="43" # Core Level (Filename) PAKFIRE_CORE="43" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan diff --git a/src/install+setup/install/downloadsource.sh b/src/install+setup/install/downloadsource.sh index 8471df3..fad2609 100644 --- a/src/install+setup/install/downloadsource.sh +++ b/src/install+setup/install/downloadsource.sh @@ -19,9 +19,7 @@ # # ############################################################################### -# Path for testing. Need to be changed for release! -IPFireISO=people.ipfire.org/~arne_f/testing/next/ipfire.iso -#IPFireISO=download.ipfire.org/iso/ipfire.iso +IPFireISO=download.ipfire.org/iso/ipfire.iso #Get user defined download from boot cmdline grep "netinstall=" /proc/cmdline > /dev/null && CMDLINE=1 diff --git a/src/scripts/backupiso b/src/scripts/backupiso index c1cc35b..203748f 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -3,7 +3,7 @@ COREVER=`cat /opt/pakfire/db/core/mine` # FIXME: edit this lines before release URL=http://download.ipfire.org/iso/ -ISO=ipfire-2.7.i586-full-core$COREVER.iso +ISO=ipfire-2.9beta1.i586-full-core$COREVER.iso if [ -z "$1" ]; then echo usage: $0 backup-file hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ebc3a12fcb97526c0bb8158bfb855b8ba48dc7e5
by git＠ipfire.org 11 Dec '10

11 Dec '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6cd3f8f8d7a7fc1a78d03a4b7167859edd980354
by git＠ipfire.org 11 Dec '10

11 Dec '10

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2010