IPFire-SCM January 2011

ipfire-scm@lists.ipfire.org

1 participants
93 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 59ebbeccabe9b9bd8634c7609509eb664bc5fccf
by git＠ipfire.org 14 Jan '11

14 Jan '11

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 59ebbeccabe9b9bd8634c7609509eb664bc5fccf (commit) from 33359c68d9187d6ed8b0a1c2a3c31c792a6cfd29 (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 59ebbeccabe9b9bd8634c7609509eb664bc5fccf Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 14 22:11:18 2011 +0100 ipfireseeder: update for 2.9 core44. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index e31f42c..56480db 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.7.i586-full-core43.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core44.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 37ba3d1..d3ef490 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2011 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 # @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.7.i586-full-core43.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core44.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 18 +PAK_VER = 19 DEPS = "rtorrent" @@ -45,7 +45,8 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0a8d7e52332c12d29847b0a7ab263bc3 +$(DL_FILE)_MD5 = 414ee9455996e4fbc0a642bd4984dcb5 + 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. 33359c68d9187d6ed8b0a1c2a3c31c792a6cfd29
by git＠ipfire.org 14 Jan '11

14 Jan '11

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 33359c68d9187d6ed8b0a1c2a3c31c792a6cfd29 (commit) via 91040349aded2263ae30c01118e48c198596cec9 (commit) from 59c524d0293655ea2e01c7a639cf614060d393b0 (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 33359c68d9187d6ed8b0a1c2a3c31c792a6cfd29 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 14 16:40:03 2011 +0100 streamripper: add dependency (faad2). commit 91040349aded2263ae30c01118e48c198596cec9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 14 16:38:14 2011 +0100 hostapd: bump version because initskript was updated. ----------------------------------------------------------------------- Summary of changes: lfs/hostapd | 4 ++-- lfs/streamripper | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/hostapd b/lfs/hostapd index 57d511a..0ca035c 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 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 # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 20 +PAK_VER = 21 DEPS = "" diff --git a/lfs/streamripper b/lfs/streamripper index ed8452d..9ef65af 100644 --- a/lfs/streamripper +++ b/lfs/streamripper @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 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 # @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = streamripper PAK_VER = 1 -DEPS = "glib libmad libogg libvorbis" +DEPS = "glib libmad libogg libvorbis faad2" ############################################################################### # Top-level Rules hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 59c524d0293655ea2e01c7a639cf614060d393b0
by git＠ipfire.org 14 Jan '11

14 Jan '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-final, created. 59c524d0293655ea2e01c7a639cf614060d393b0
by git＠ipfire.org 14 Jan '11

14 Jan '11

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-final has been created at 59c524d0293655ea2e01c7a639cf614060d393b0 (commit) - Log ----------------------------------------------------------------- commit 59c524d0293655ea2e01c7a639cf614060d393b0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 14 10:39:23 2011 +0100 fireinfo: generate pakfire uuid if not present. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core44, updated. 59c524d0293655ea2e01c7a639cf614060d393b0
by git＠ipfire.org 14 Jan '11

14 Jan '11

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, core44 has been updated via 59c524d0293655ea2e01c7a639cf614060d393b0 (commit) from 9e9fca31e68417f33e708eccbe7dad997d8a9254 (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 59c524d0293655ea2e01c7a639cf614060d393b0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 14 10:39:23 2011 +0100 fireinfo: generate pakfire uuid if not present. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/fireinfo | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/fireinfo b/src/initscripts/init.d/fireinfo index bedf3a5..47565b3 100644 --- a/src/initscripts/init.d/fireinfo +++ b/src/initscripts/init.d/fireinfo @@ -19,6 +19,11 @@ case "${1}" in start) mkdir -p /var/ipfire/fireinfo 2>/dev/null + # Generate Pakfire uuid if not present + if [ ! -e /opt/pakfire/db/uuid ]; then + uuidgen > /opt/pakfire/db/uuid + fi + sendprofile --public-id > /var/ipfire/fireinfo/public_id sendprofile --dump > /var/ipfire/fireinfo/profile ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9e9fca31e68417f33e708eccbe7dad997d8a9254
by git＠ipfire.org 14 Jan '11

14 Jan '11

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 9e9fca31e68417f33e708eccbe7dad997d8a9254 (commit) from b3cd6e3382dd7145d5c2447599a4d91bb3295fef (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 9e9fca31e68417f33e708eccbe7dad997d8a9254 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 13 23:55:40 2011 +0100 set version to 2.9 core44 ----------------------------------------------------------------------- Summary of changes: lfs/linux | 2 +- make.sh | 6 +++--- src/scripts/backupiso | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index d01a046..1aec511 100644 --- a/lfs/linux +++ b/lfs/linux @@ -35,7 +35,7 @@ CFLAGS = CXXFLAGS = PROG = linux-xen -PAK_VER = 15 +PAK_VER = 16 DEPS = "" # Normal build or XEN build. diff --git a/make.sh b/make.sh index 854f4a2..fe473ae 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,9 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.9rc1" # Version number -CORE="43" # Core Level (Filename) -PAKFIRE_CORE="43" # Core Level (PAKFIRE) +VERSION="2.9" # Version number +CORE="44" # Core Level (Filename) +PAKFIRE_CORE="44" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 6aacf8d..72e6a0b 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.9rc1.i586-full-core$COREVER.iso +ISO=ipfire-2.9.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 tag, v2.9-final, created. 9e9fca31e68417f33e708eccbe7dad997d8a9254
by git＠ipfire.org 14 Jan '11

14 Jan '11

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-final has been created at 9e9fca31e68417f33e708eccbe7dad997d8a9254 (commit) - Log ----------------------------------------------------------------- commit 9e9fca31e68417f33e708eccbe7dad997d8a9254 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 13 23:55:40 2011 +0100 set version to 2.9 core44 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core44, created. 9e9fca31e68417f33e708eccbe7dad997d8a9254
by git＠ipfire.org 14 Jan '11

14 Jan '11

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, core44 has been created at 9e9fca31e68417f33e708eccbe7dad997d8a9254 (commit) - Log ----------------------------------------------------------------- commit 9e9fca31e68417f33e708eccbe7dad997d8a9254 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 13 23:55:40 2011 +0100 set version to 2.9 core44 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b3cd6e3382dd7145d5c2447599a4d91bb3295fef
by git＠ipfire.org 12 Jan '11

12 Jan '11

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 b3cd6e3382dd7145d5c2447599a4d91bb3295fef (commit) from 0972c65075108978eb7806867912db74cb0c3075 (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 b3cd6e3382dd7145d5c2447599a4d91bb3295fef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 12 14:58:08 2011 +0100 dracut/installer: remove cdrom waiting loop that reset some drives. ----------------------------------------------------------------------- Summary of changes: lfs/dracut | 3 ++- src/patches/dracut-006_remove_cdrom_wait.patch | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) create mode 100644 src/patches/dracut-006_remove_cdrom_wait.patch Difference in files: diff --git a/lfs/dracut b/lfs/dracut index 726eedb..c9816bd 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 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 # @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_cdrom_wait.patch cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c . diff --git a/src/patches/dracut-006_remove_cdrom_wait.patch b/src/patches/dracut-006_remove_cdrom_wait.patch new file mode 100644 index 0000000..23c084e --- /dev/null +++ b/src/patches/dracut-006_remove_cdrom_wait.patch @@ -0,0 +1,21 @@ +diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init +--- dracut-006.org/modules.d/99base/init 2010-06-17 10:46:29.000000000 +0200 ++++ dracut-006/modules.d/99base/init 2011-01-12 11:40:41.713190125 +0100 +@@ -190,17 +190,6 @@ + # no more udev jobs and queues empty. + sleep 0.5 + +- # dirty hack for some cdrom drives, +- # which report no medium for quiet +- # some time. +- for cdrom in /sys/block/sr*; do +- [ -e "$cdrom" ] || continue +- # skip, if cdrom medium was already found +- strstr "$(udevadm info --query=env --path=${cdrom##/sys})" \ +- ID_CDROM_MEDIA && continue +- echo change > "$cdrom/uevent" +- done +- + i=$(($i+1)) + [ $i -gt $RDRETRY ] \ + && { flock -s 9 ; emergency_shell "No root device found"; } 9>/.console_lock hooks/post-receive -- IPFire 2.x development tree

1 0

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

10 Jan '11

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2011