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. 1e908471f130ed4e90ca4bc9d88b36005ccdd7df
by git＠ipfire.org 04 Dec '10

04 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 1e908471f130ed4e90ca4bc9d88b36005ccdd7df (commit) from 6b1c728d88728451a86bebb5011c89de47721d5c (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 1e908471f130ed4e90ca4bc9d88b36005ccdd7df Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Sat Dec 4 20:24:14 2010 +0100 Fixed language string on pakfire.cgi. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/pakfire.cgi | 8 ++++---- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + langs/fr/cgi-bin/fr.pl | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) mode change 100644 => 100755 html/cgi-bin/pakfire.cgi Difference in files: diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi old mode 100644 new mode 100755 index 414958e..da761f0 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -244,10 +244,10 @@ print <<END; <tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire system state'}:</b> <td width="50%"> <tr><td align="center">$Lang::tr{'pakfire core update level'}: $core_release<hr /> - $Lang::tr{'pakfire last update'} $core_update_age ago<br /> - $Lang::tr{'pakfire last serverlist update'} $server_update_age ago<br /> - $Lang::tr{'pakfire last core list update'} $corelist_update_age ago<br /> - $Lang::tr{'pakfire last package update'} $packages_update_age ago + $Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}<br /> + $Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}<br /> + $Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}<br /> + $Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'} <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='update' /> <input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br /> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3910ef7..ddf3352 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1321,6 +1321,7 @@ 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?', +'pakfire ago' => 'her.', 'pakfire available addons' => 'Verfügbare Addons:', 'pakfire configuration' => 'Pakfire Konfiguration', 'pakfire core update auto' => 'Core und Addon Updates automatisch installieren:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index e73f741..f89d937 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1349,6 +1349,7 @@ 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', +'pakfire ago' => 'ago.', 'pakfire available addons' => 'Available Addons:', 'pakfire configuration' => 'Pakfire Configuration', 'pakfire core update auto' => 'Install core and addon updates automatically:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 058276f..8c3c378 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1346,6 +1346,7 @@ 'package failed to install' => 'L\'installation du paquet a échoué.', 'pagerefresh' => 'La page est entrain d\'être rafraichie, veuillez attendre.', 'pakfire accept all' => 'Voulez-vous installer tout les paquets?', +'pakfire ago' => '', 'pakfire available addons' => 'Addons disponibles :', 'pakfire configuration' => 'Configuration Pakfire', 'pakfire core update auto' => 'Installer les mises à jours du noyau et des addons automatiquement :', hooks/post-receive -- IPFire 2.x development tree

1 0

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

04 Dec '10

1 0

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

04 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 337305ef81675c30162e9ce7d373ade32bf643c1 (commit) from dfa59dbd1f12f3427c51215e76b4a825f8a169fc (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 337305ef81675c30162e9ce7d373ade32bf643c1 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Sat Dec 4 19:44:11 2010 +0100 Added messages into the webif to tell the user a reboot is required ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/index.cgi | 12 +++++++++++- html/cgi-bin/pakfire.cgi | 12 ++++++++++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + langs/es/cgi-bin/es.pl | 1 + langs/fr/cgi-bin/fr.pl | 1 + 6 files changed, 27 insertions(+), 1 deletions(-) mode change 100644 => 100755 html/cgi-bin/index.cgi Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi old mode 100644 new mode 100755 index dfe65bf..b85b22c --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -39,6 +39,7 @@ my $warnmessage = ''; my $refresh = ""; my $ipaddr=''; + &Header::showhttpheaders(); $cgiparams{'ACTION'} = ''; @@ -57,6 +58,12 @@ my %mainsettings = (); my $connstate = &Header::connectionstatus(); +# check if reboot is necessary +my $reboot = 0; +if (`find /var/run/need_reboot 2>/dev/null`) { + $reboot = 1; +} + if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { $refresh = "<meta http-equiv='refresh' content='300;'>"; } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ @@ -428,6 +435,7 @@ foreach my $file (@files) { } } + if ($warnmessage) { print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>"; } @@ -437,8 +445,10 @@ END ; &Pakfire::dblist("upgrade", "notice"); print <<END; - END +if ($reboot == 0) { + print "<br /><font color='red'>$Lang::tr{'needreboot'}!</font>"; +} } else { my $message=''; if ($death) { diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 9cfe83e..414958e 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -57,6 +57,12 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont &Header::openpage($Lang::tr{'pakfire configuration'}, 1); &Header::openbigbox('100%', 'left', '', $errormessage); +# check if reboot is necessary +my $reboot = 0; +if (`find /var/run/need_reboot 2>/dev/null`) { + $reboot = 1; +} + if ($pakfiresettings{'ACTION'} eq 'install'){ $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g; if ("$pakfiresettings{'FORCE'}" eq "on") { @@ -229,6 +235,12 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db" print <<END; <table width='95%' cellpadding='5' > +END +if ($reboot == 1) { + print "<tr><td align='center' colspan='2'><font color='red'>$Lang::tr{'needreboot'}!</font></td></tr>"; + print "<tr><td colspan='2'> </font></td></tr>" +} +print <<END; <tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire system state'}:</b> <td width="50%"> <tr><td align="center">$Lang::tr{'pakfire core update level'}: $core_release<hr /> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e02702c..3910ef7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1170,6 +1170,7 @@ 'name must only contain characters' => 'Name darf nur Buchstaben enthalten.', 'name too long' => 'Der volle Benutzername oder der System Hostname ist zu lang', 'nat-traversal' => 'Nat Traversal:', +'needreboot' => 'Ein Update benötigt einen Neustart', 'net' => 'Netz', 'net address' => 'Netzadresse', 'net config' => 'Netzwerk-Konfiguration', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index bbd01b1..e73f741 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1197,6 +1197,7 @@ 'name must only contain characters' => 'Name must only contain characters.', 'name too long' => 'User\'s full name or system hostname is too long', 'nat-traversal' => 'Nat Traversal:', +'needreboot' => 'An update requires a restart', 'net' => 'Net', 'net address' => 'net address', 'net config' => 'Network configuration', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 612f1bf..7787991 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1195,6 +1195,7 @@ 'name must only contain characters' => 'El nombre solo puede contener caracteres', 'name too long' => 'Nombre de usuario o de host es demasiado largo', 'nat-traversal' => 'NAT Transversal:', +'needreboot' => 'An update requires a restart', 'net' => 'Red', 'net address' => 'dirección de red', 'net config' => 'Configuración de red', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index ff07c8b..058276f 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1196,6 +1196,7 @@ 'name must only contain characters' => 'Le nom ne doit contenir que des caractères.', 'name too long' => 'Le nom d\'utilisateur ou du système hôte est trop long', 'nat-traversal' => 'Nat Traversal :', +'needreboot' => 'An update requires a restart', 'net' => 'Réseau', 'net address' => 'adresse net', 'net config' => 'Configuration réseau', hooks/post-receive -- IPFire 2.x development tree

1 0

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

04 Dec '10

1 0

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

04 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 8bb35e212c9870806f3111b1ba5e3795302cc606 (commit) via f8177749ef29d993a30674dd10a204bdd343c3f4 (commit) from 20c2b559121a4cc220f68b0ef8846adbe739cb00 (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 8bb35e212c9870806f3111b1ba5e3795302cc606 Merge: f817774 20c2b55 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 4 17:55:24 2010 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit f8177749ef29d993a30674dd10a204bdd343c3f4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 4 17:54:34 2010 +0100 v4l-dvb: removed backport warning. ----------------------------------------------------------------------- Summary of changes: lfs/v4l-dvb | 4 +++- src/patches/v4l-dvb_remove_backport_warning.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) create mode 100644 src/patches/v4l-dvb_remove_backport_warning.patch Difference in files: diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb index 50c116a..e8f2e54 100644 --- a/lfs/v4l-dvb +++ b/lfs/v4l-dvb @@ -84,7 +84,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX) + # Remove backported warning... + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_remove_backport_warning.patch + cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX) cd $(DIR_APP) && make $(MAKETUNING) all cd $(DIR_APP) && make install ln -sf $(DIR_APP)/ /usr/src/v4l-dvb diff --git a/src/patches/v4l-dvb_remove_backport_warning.patch b/src/patches/v4l-dvb_remove_backport_warning.patch new file mode 100644 index 0000000..7f57822 --- /dev/null +++ b/src/patches/v4l-dvb_remove_backport_warning.patch @@ -0,0 +1,12 @@ +diff -Naur v4l-dvb-abd3aac6644e.org/v4l/compat.h v4l-dvb-abd3aac6644e/v4l/compat.h +--- v4l-dvb-abd3aac6644e.org/v4l/compat.h 2010-07-02 05:38:54.000000000 +0200 ++++ v4l-dvb-abd3aac6644e/v4l/compat.h 2010-12-04 12:19:09.531056981 +0100 +@@ -14,8 +14,6 @@ + #define INIT_DELAYED_WORK(a,b,c) INIT_WORK(a,b,c) + #endif + +-#define EXPERIMENTAL_TREE +- + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) + #define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma) + #define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma) hooks/post-receive -- IPFire 2.x development tree

1 0

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

04 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 20c2b559121a4cc220f68b0ef8846adbe739cb00 (commit) via f840a7e2ee00b66fa9e8b270a35b974f7d2365e1 (commit) from 5dcde26d6e303fa42367afd884a368a23682c1b9 (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 20c2b559121a4cc220f68b0ef8846adbe739cb00 Merge: f840a7e 5dcde26 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 4 15:32:19 2010 +0100 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x commit f840a7e2ee00b66fa9e8b270a35b974f7d2365e1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 4 15:32:02 2010 +0100 fireinfo: Update to 0.6. ----------------------------------------------------------------------- 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 a4cd881..8736ba1 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 0.5 +VER = 0.6 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2eb12d3c4aeda93ee184a85b1e8b6a96 +$(DL_FILE)_MD5 = cc977df8dbe149be184c27105c879116 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. 5dcde26d6e303fa42367afd884a368a23682c1b9
by git＠ipfire.org 04 Dec '10

04 Dec '10

1 0

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

03 Dec '10

1 0

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

03 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 104a00cb8aaa9fe0d09d78913437d5adcc7d9d6d (commit) via 51cac9a1ce8b4baa0a214f7674d8a915a8030560 (commit) via 20651e22d4df1e8c5f38a1be63d3fb3826c27dcc (commit) via 6d29812d42fd09a1a1be4a8fa086e2d64d36e72f (commit) via 296e037fb1f404c7703508f5643b59832cf0bf81 (commit) from 473725f5b006ecfb13d08c17e03ef8c5c0d66b3a (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 104a00cb8aaa9fe0d09d78913437d5adcc7d9d6d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Dec 3 18:57:59 2010 +0100 Updated ipfireseeder to core43. commit 51cac9a1ce8b4baa0a214f7674d8a915a8030560 Merge: 473725f 20651e2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Dec 3 18:56:37 2010 +0100 Merge commit 'origin/core43' Conflicts: lfs/openssl make.sh ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/42/exclude | 3 +++ config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 8 ++++---- lfs/openssl | 4 ++-- make.sh | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/rootfiles/oldcore/42/exclude b/config/rootfiles/oldcore/42/exclude index e69de29..01b7a7f 100644 --- a/config/rootfiles/oldcore/42/exclude +++ b/config/rootfiles/oldcore/42/exclude @@ -0,0 +1,3 @@ +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index e1c32b7..e31f42c 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-core42.iso.torrent +var/ipfire/seeder/ipfire-2.7.i586-full-core43.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index ab0b7e2..37ba3d1 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2009 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 # @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.7.i586-full-core42.iso.torrent +DL_FILE = ipfire-2.7.i586-full-core43.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 17 +PAK_VER = 18 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7355dd415df3a3f28dc9223f79b5e053 +$(DL_FILE)_MD5 = 0a8d7e52332c12d29847b0a7ab263bc3 install : $(TARGET) diff --git a/lfs/openssl b/lfs/openssl index 34833ef..dc65ef5 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 0.9.8p +VER = 0.9.8q THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39 +$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998 install : $(TARGET) diff --git a/make.sh b/make.sh index 4d49eaa..979215c 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.8test" # Version number -CORE="43" # Core Level (Filename) -PAKFIRE_CORE="42" # Core Level (PAKFIRE) +CORE="44" # 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 CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core42, updated. 20651e22d4df1e8c5f38a1be63d3fb3826c27dcc
by git＠ipfire.org 03 Dec '10

03 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, core42 has been updated via 20651e22d4df1e8c5f38a1be63d3fb3826c27dcc (commit) from 6d29812d42fd09a1a1be4a8fa086e2d64d36e72f (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/{42 => 43}/exclude | 0 config/rootfiles/core/43/filelists/files | 1 + config/rootfiles/core/{38 => 43}/filelists/openssh | 0 config/rootfiles/core/{38 => 43}/filelists/openssl | 0 config/rootfiles/core/{38 => 43}/meta | 0 config/rootfiles/core/{42 => 43}/update.sh | 0 lfs/openssl | 4 ++-- make.sh | 4 ++-- 8 files changed, 5 insertions(+), 4 deletions(-) copy config/rootfiles/core/{42 => 43}/exclude (100%) create mode 100644 config/rootfiles/core/43/filelists/files copy config/rootfiles/core/{38 => 43}/filelists/openssh (100%) copy config/rootfiles/core/{38 => 43}/filelists/openssl (100%) copy config/rootfiles/core/{38 => 43}/meta (100%) copy config/rootfiles/core/{42 => 43}/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/43/exclude b/config/rootfiles/core/43/exclude new file mode 100644 index 0000000..01b7a7f --- /dev/null +++ b/config/rootfiles/core/43/exclude @@ -0,0 +1,3 @@ +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/43/filelists/files b/config/rootfiles/core/43/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/43/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/43/filelists/openssh b/config/rootfiles/core/43/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/43/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/openssl b/config/rootfiles/core/43/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/43/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/43/meta b/config/rootfiles/core/43/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/43/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/43/update.sh b/config/rootfiles/core/43/update.sh new file mode 100644 index 0000000..6b54995 --- /dev/null +++ b/config/rootfiles/core/43/update.sh @@ -0,0 +1,48 @@ +#!/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" + +#Rebuild module dep's +#depmod 2.6.32.15-ipfire +#depmod 2.6.32.15-ipfire-xen + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/lfs/openssl b/lfs/openssl index 34833ef..dc65ef5 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 0.9.8p +VER = 0.9.8q THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39 +$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998 install : $(TARGET) diff --git a/make.sh b/make.sh index b8035b6..42a188a 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.7" # Version number -CORE="42" # Core Level (Filename) -PAKFIRE_CORE="42" # Core Level (PAKFIRE) +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 CONFIG_ROOT=/var/ipfire # Configuration rootdir 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 December 2010