IPFire-SCM January 2010

ipfire-scm@lists.ipfire.org

1 participants
80 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 62cc286871f1fc6b0789237a85529fee1c6166bc
by git＠ipfire.org 31 Jan '10

31 Jan '10

1 0

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

31 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 51e8c5aa5ddd4a31591212d23b21dd80ad059f31
by git＠ipfire.org 31 Jan '10

31 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 07f50f1102a5b32b399280901019f014fd52ada7
by git＠ipfire.org 29 Jan '10

29 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core36, updated. 9282906d9b82aff12804b743c36f2ce3e98a2ff4
by git＠ipfire.org 29 Jan '10

29 Jan '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, core36 has been updated via 9282906d9b82aff12804b743c36f2ce3e98a2ff4 (commit) from 25dea62ac0410f129840a752544040abd7182953 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/36/filelists/files | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/36/filelists/files b/config/rootfiles/core/36/filelists/files index 02dd1c9..a148850 100644 --- a/config/rootfiles/core/36/filelists/files +++ b/config/rootfiles/core/36/filelists/files @@ -1,2 +1,3 @@ etc/system-release etc/rc.d/init.d/firewall +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. 8afe69f7464c4a405e91d3fd2f77512d151dba15
by git＠ipfire.org 28 Jan '10

28 Jan '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 8afe69f7464c4a405e91d3fd2f77512d151dba15 (commit) via 25dea62ac0410f129840a752544040abd7182953 (commit) via 7bd26c33c169474ac56f5a7c667d07adb4484c4d (commit) from 7b7479628827354a5ce6b91e3a0b91af02d4b5a8 (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 8afe69f7464c4a405e91d3fd2f77512d151dba15 Merge: 7b7479628827354a5ce6b91e3a0b91af02d4b5a8 25dea62ac0410f129840a752544040abd7182953 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 29 00:13:12 2010 +0100 Merge branch 'core36' ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openssl | 2 +- html/cgi-bin/pakfire.cgi | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index 1dc51cf..016e841 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -9,7 +9,7 @@ #etc/ssl/misc/c_name etc/ssl/openssl.cnf #etc/ssl/private -#usr/bin/c_rehash +usr/bin/c_rehash usr/bin/openssl #usr/include/openssl #usr/include/openssl/aes.h diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 8f20d57..ca7a4ad 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -62,6 +62,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){ if ("$pakfiresettings{'FORCE'}" eq "on") { my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } else { &Header::openbox("100%", "center", "Abfrage"); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`; @@ -101,6 +102,7 @@ END if ("$pakfiresettings{'FORCE'}" eq "on") { my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } else { &Header::openbox("100%", "center", "Abfrage"); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`; @@ -138,10 +140,11 @@ END } elsif ($pakfiresettings{'ACTION'} eq 'update') { system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &"); - + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') { my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") { if ($pakfiresettings{'AUTOUPDATE'} eq 'on') { hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core36, updated. 25dea62ac0410f129840a752544040abd7182953
by git＠ipfire.org 28 Jan '10

28 Jan '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, core36 has been updated via 25dea62ac0410f129840a752544040abd7182953 (commit) from 7bd26c33c169474ac56f5a7c667d07adb4484c4d (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 25dea62ac0410f129840a752544040abd7182953 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 29 00:09:33 2010 +0100 Add delay to pakfire.cgi to prevent pakfire run's twice. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/pakfire.cgi | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 8f20d57..ca7a4ad 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -62,6 +62,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){ if ("$pakfiresettings{'FORCE'}" eq "on") { my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } else { &Header::openbox("100%", "center", "Abfrage"); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`; @@ -101,6 +102,7 @@ END if ("$pakfiresettings{'FORCE'}" eq "on") { my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } else { &Header::openbox("100%", "center", "Abfrage"); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`; @@ -138,10 +140,11 @@ END } elsif ($pakfiresettings{'ACTION'} eq 'update') { system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &"); - + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') { my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") { if ($pakfiresettings{'AUTOUPDATE'} eq 'on') { hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core36, updated. 7bd26c33c169474ac56f5a7c667d07adb4484c4d
by git＠ipfire.org 28 Jan '10

28 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core37, created. 7b7479628827354a5ce6b91e3a0b91af02d4b5a8
by git＠ipfire.org 28 Jan '10

28 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7b7479628827354a5ce6b91e3a0b91af02d4b5a8
by git＠ipfire.org 28 Jan '10

28 Jan '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 7b7479628827354a5ce6b91e3a0b91af02d4b5a8 (commit) from 382f7785575819d858745c4142cd172fae1208f8 (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 7b7479628827354a5ce6b91e3a0b91af02d4b5a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 28 21:21:30 2010 +0100 Started core37. ----------------------------------------------------------------------- Summary of changes: .../.placeholder => rootfiles/core/37/exclude} | 0 config/rootfiles/core/37/filelists/files | 1 + config/rootfiles/core/{34 => 37}/meta | 0 config/rootfiles/core/{35 => 37}/update.sh | 10 ++++------ make.sh | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) copy config/{nagiosql/etc/nagiosql/backup/hosts/.placeholder => rootfiles/core/37/exclude} (100%) create mode 100644 config/rootfiles/core/37/filelists/files copy config/rootfiles/core/{34 => 37}/meta (100%) copy config/rootfiles/core/{35 => 37}/update.sh (93%) Difference in files: diff --git a/config/rootfiles/core/37/exclude b/config/rootfiles/core/37/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/37/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/37/meta b/config/rootfiles/core/37/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/37/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/37/update.sh b/config/rootfiles/core/37/update.sh new file mode 100644 index 0000000..7ea483f --- /dev/null +++ b/config/rootfiles/core/37/update.sh @@ -0,0 +1,45 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +#Stop services + +# +#Extract files +extract_files +# +#Start services + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +#Run depmod to rebuld module informations +#depmod 2.6.27.42-ipfire +#depmod 2.6.27.42-ipfire-xen +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index d04d2bf..9e7293a 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.5" # Version number -CORE="36" # Core Level (Filename) +CORE="37" # Core Level (Filename) PAKFIRE_CORE="36" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2010