IPFire-SCM May 2015

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core90, updated. 5f51d10373a8224027a14c055ec87e3109d58511
by git＠ipfire.org 16 May '15

16 May '15

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, core90 has been updated via 5f51d10373a8224027a14c055ec87e3109d58511 (commit) from e35d81be8c6ddb797e329ad1ad3288267ba23d05 (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 5f51d10373a8224027a14c055ec87e3109d58511 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 16 16:21:09 2015 +0200 core90: don't remove meta/meta-linux-pae part2. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index facefc8..fa67f6b 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -254,7 +254,7 @@ fi # Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae +rm -rf /opt/pakfire/db/installed/meta-linux-pae if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5f51d10373a8224027a14c055ec87e3109d58511
by git＠ipfire.org 16 May '15

16 May '15

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 5f51d10373a8224027a14c055ec87e3109d58511 (commit) from e35d81be8c6ddb797e329ad1ad3288267ba23d05 (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 5f51d10373a8224027a14c055ec87e3109d58511 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 16 16:21:09 2015 +0200 core90: don't remove meta/meta-linux-pae part2. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index facefc8..fa67f6b 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -254,7 +254,7 @@ fi # Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae +rm -rf /opt/pakfire/db/installed/meta-linux-pae if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core90, updated. e35d81be8c6ddb797e329ad1ad3288267ba23d05
by git＠ipfire.org 16 May '15

16 May '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. e35d81be8c6ddb797e329ad1ad3288267ba23d05
by git＠ipfire.org 16 May '15

16 May '15

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 e35d81be8c6ddb797e329ad1ad3288267ba23d05 (commit) via be131623add2c819e6433e8d593ddcfc5c5b0441 (commit) via 1af34aa810cc86fb182635cca0bb6ac783ab584d (commit) via 9f1f68f17ade67dbd52a58837f7a47a8458055e4 (commit) from b47472c1865f1777251a43376286ce884b8a4ba8 (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 e35d81be8c6ddb797e329ad1ad3288267ba23d05 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 16 13:03:34 2015 +0200 core90: don't remove meta-linux-pae. commit be131623add2c819e6433e8d593ddcfc5c5b0441 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 16 13:02:42 2015 +0200 core90: add updated pakfire file to update. commit 1af34aa810cc86fb182635cca0bb6ac783ab584d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 16 13:00:12 2015 +0200 pakfire: skip corrupt "meta-" file. This was created by a bug in dep resolve at upgrade. commit 9f1f68f17ade67dbd52a58837f7a47a8458055e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 16 12:57:28 2015 +0200 pakfire: fix dep resolve at upgrade. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/filelists/files | 2 ++ config/rootfiles/core/90/update.sh | 2 +- src/pakfire/lib/functions.pl | 24 +++++++++++++++++++++-- src/pakfire/pakfire | 33 ++++++++++++++++++-------------- 4 files changed, 44 insertions(+), 17 deletions(-) Difference in files: diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files index 431dcd6..ee596a0 100644 --- a/config/rootfiles/core/90/filelists/files +++ b/config/rootfiles/core/90/filelists/files @@ -5,6 +5,8 @@ etc/rc.d/init.d/network-trigger etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/red.up/99-geoip-database etc/rc.d/rcsysinit.d/S90network-trigger +opt/pakfire/pakfire +opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/firewall.cgi diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index e57bc17..facefc8 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -265,7 +265,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null +# rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null fi fi diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index d14e031..6bf85af 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2015 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 # @@ -393,6 +393,7 @@ sub dbgetlist { foreach $file (@files) { next if ( $file eq "." ); next if ( $file eq ".." ); + next if ( $file eq "meta-" ); next if ( $file =~ /^old/ ); open(FILE, "<$Conf::dbdir/meta/$file"); @meta = <FILE>; @@ -589,6 +590,25 @@ sub resolvedeps { return @all; } +sub resolvedeps_recursive { + my @packages = shift; + my @result = (); + + foreach my $pkg (@packages) { + my @deps = &Pakfire::resolvedeps($pkg); + + foreach my $dep (@deps) { + push(@result, $dep); + } + } + + # Sort the result array and remove dupes + my %sort = map{ $_, 1 } @result; + @result = keys %sort; + + return @result; +} + sub cleanup { my $dir = shift; my $path; @@ -695,7 +715,7 @@ sub getpak { } unless ($file) { - message("No filename given in meta-file. Please phone the developers."); + message("No filename given in meta-file."); exit 1; } diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 3d0270a..8bca061 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2015 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 # @@ -255,14 +255,11 @@ } elsif ("$ARGV[0]" eq "upgrade") { &Pakfire::upgradecore(); my @upgradepaks = &Pakfire::dblist("upgrade", "noweb"); - my @temp, $pak; - - foreach (@upgradepaks) { - @temp = &Pakfire::resolvedeps("$_"); - foreach (@temp) { push(@upgradepaks,$_) if $_; } - } - + if (@upgradepaks) { + # Resolve the dependencies of the to be upgraded packages + my @deps = &Pakfire::resolvedeps_recursive(@upgradepaks); + &Pakfire::message(""); &Pakfire::message("PAKFIRE UPGR: We are going to install all packages listed above."); if ($interactive) { @@ -277,16 +274,24 @@ } } - ### Download first + # Download packages foreach $pak (@upgradepaks) { - #system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak"); &Pakfire::getpak("$pak", ""); } - + + # Download dependencies + foreach $pak (@deps) { + &Pakfire::getpak("$pak", ""); + } + + # Install dependencies first + foreach $pak (@deps) { + &Pakfire::setuppak("$pak"); + } + + # Install all upgrades foreach $pak (@upgradepaks) { - if (&Pakfire::upgradepak("$pak")) { - #system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak"); - } + &Pakfire::upgradepak("$pak"); } } elsif ("$ARGV[0]" eq "list") { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core90, updated. b47472c1865f1777251a43376286ce884b8a4ba8
by git＠ipfire.org 13 May '15

13 May '15

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, core90 has been updated via b47472c1865f1777251a43376286ce884b8a4ba8 (commit) via 49d769c6e6eae844c6ffe30817024ea70bb2f60c (commit) via 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1 (commit) via 7b9233935e451d4305e7454bfbcc964cfb53d2bb (commit) via 8fba24ec1503d9cf3ace983d35dc0bab54a1e510 (commit) via 0ee211ee6be85fa6d12bc6f9278fc2c0a44ea420 (commit) via 51ff5115a0d7e8b5ea99d8a0b1aaac1823487304 (commit) via 5f0a2ba1048850620c0aa44e80e0a58ff36039c3 (commit) from ab8775b7bb13ecfff12c9e94e107bd86b488e04d (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 b47472c1865f1777251a43376286ce884b8a4ba8 Merge: 49d769c 8fba24e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 13 22:02:46 2015 +0200 Merge remote-tracking branch 'stevee/core90-fixes' commit 49d769c6e6eae844c6ffe30817024ea70bb2f60c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 13 19:51:42 2015 +0200 core90: work around dhcp client hang at shutdown after update. commit 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 13 19:46:18 2015 +0200 elinks/cyrus-imapd: bump package version openssl 0.9.8 drop. some old installation has this addon still linked against openssl 0.9.8 so we need to update it. commit 7b9233935e451d4305e7454bfbcc964cfb53d2bb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 13 19:44:15 2015 +0200 core90: fix missing filename in metafile. commit 8fba24ec1503d9cf3ace983d35dc0bab54a1e510 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue May 12 20:41:35 2015 +0200 country.cgi: Rework script. * Introduce new method to get all country codes. In the past just the countries has been used for which flag icons where available, which is just not what we want. * Finish column when the last element in the array has passed and we have an uneven amount of items * Improve code style. commit 0ee211ee6be85fa6d12bc6f9278fc2c0a44ea420 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue May 12 20:39:44 2015 +0200 geoip-block.cgi: Finish column after last element and uneven amount of items. commit 51ff5115a0d7e8b5ea99d8a0b1aaac1823487304 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 11 14:53:38 2015 +0200 core90: Remove old udev configuration This is not used any more and must be removed with the update so that the new script is taking effect. commit 5f0a2ba1048850620c0aa44e80e0a58ff36039c3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 11 12:57:29 2015 +0200 vpnmain.cgi: Do not use an other DH key exchange in ESP ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/exclude | 1 - config/rootfiles/core/90/update.sh | 11 +++-- html/cgi-bin/country.cgi | 88 ++++++++++++++++++-------------------- html/cgi-bin/geoip-block.cgi | 11 ++++- html/cgi-bin/vpnmain.cgi | 6 --- lfs/cyrus-imapd | 4 +- lfs/elinks | 4 +- src/initscripts/init.d/firstsetup | 3 -- 8 files changed, 63 insertions(+), 65 deletions(-) Difference in files: diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude index 56e840d..73b7b73 100644 --- a/config/rootfiles/core/90/exclude +++ b/config/rootfiles/core/90/exclude @@ -15,7 +15,6 @@ etc/sudoers etc/sysconfig/firewall.local etc/sysconfig/modules etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules srv/web/ipfire/html/proxy.pac var/ipfire/firewall/geoipblock var/ipfire/fwhosts/custmgeoipgrp diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 4835c5a..e57bc17 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -208,6 +208,13 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# Remove old udev configuration +rm -vf /etc/udev/rules.d/30-persistent-network.rules + +# Remove pids from dhcp client because it hang at normal shutdown +# so let the sysvinit kill it +rm -f /run/dhcpcd-*.pid + # # Start services # @@ -258,9 +265,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae + rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null fi fi diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 60c2e58..f2ae813 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -23,12 +23,9 @@ use strict; use Locale::Codes::Country; -my $flagdir = '/srv/web/ipfire/html/images/flags'; +my $col; my $lines = '1'; my $lines2 = ''; -my @flaglist=(); -my @flaglistfiles=(); -my $flag = ''; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/geoip-functions.pl"; @@ -41,44 +38,41 @@ require "${General::swroot}/header.pl"; &Header::openbigbox('100%', 'left'); &Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'}); -print "<table class='tbl'>"; -print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>"; -print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>"; -print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>"; -print "<th> </th>"; -print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>"; -print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>"; -print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>"; - -@flaglist = <$flagdir/*>; - -undef @flaglistfiles; - -foreach (@flaglist) -{ - if (!-d) { push(@flaglistfiles,substr($_,rindex($_,"/")+1)); } -} -my $col=""; -foreach $flag (@flaglistfiles) -{ + +print<<END; +<table class='tbl'> + <tr> + <th style='width=5%'><b>$Lang::tr{'flag'}</b></th> + <th style='width=5%'><b>$Lang::tr{'countrycode'}</b></th> + <th style='width=40% text-align:left'><b>$Lang::tr{'country'}</b></th> + <th> </th> + <th style='width=5%'><b>$Lang::tr{'flag'}</b></th> + <th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th> + <th style='width=40% text-align:left;'><b>$Lang::tr{'country'}</b></th> + </tr> +END + +# Get a list of all supported country codes. +my @countries = Locale::Codes::Country::all_country_codes(); + +# Loop through whole country list. +foreach my $country (@countries) { $lines++; - my $flagcode = uc(substr($flag, 0, 2)); - my $fcode = lc($flagcode); + # Convert country code into upper case. + my $country_uc = uc($country); # Get flag icon for of the country. - my $flag_icon = &GeoIP::get_flag_icon($fcode); + my $flag_icon = &GeoIP::get_flag_icon($country); + + # Get country name. + my $name = &GeoIP::get_full_country_name($country); - my $country = Locale::Country::code2country($fcode); - if($fcode eq 'eu') { $country = 'Europe'; } - if($fcode eq 'tp') { $country = 'East Timor'; } - if($fcode eq 'yu') { $country = 'Yugoslavia'; } if ($lines % 2) { - print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>"; - print "<td $col>$flagcode</td>"; - print "<td $col>$country</td></tr>\n"; - } - else { + print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>"; + print "<td $col>$country_uc</td>"; + print "<td $col>$name</td></tr>\n"; + } else { $lines2++; if($lines2 % 2) { $col="style='background-color:${Header::table2colour};'"; @@ -86,25 +80,25 @@ foreach $flag (@flaglistfiles) $col="style='background-color:${Header::table1colour};'"; } print "<tr>"; - print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>"; - print "<td $col>$flagcode</td>"; - print "<td $col>$country</td>"; + print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>"; + print "<td $col>$country_uc</td>"; + print "<td $col>$name</td>"; print "<td $col> </td>"; + + # Finish column when the last element in the array has passed and we have an uneven amount of items. + if ( $country eq $countries[-1] ) { + print "<td $col> </td>\n"; + print "<td $col> </td>\n"; + print "<td $col> </td></tr>\n"; + } } } - - print "</table>"; &Header::closebox(); &Header::closebigbox(); -print <<END -<div style='text-align:center'> -<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a> -</div> -END -; +print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n"; &Header::closepage(); diff --git a/html/cgi-bin/geoip-block.cgi b/html/cgi-bin/geoip-block.cgi index ccbfa92..056b333 100644 --- a/html/cgi-bin/geoip-block.cgi +++ b/html/cgi-bin/geoip-block.cgi @@ -225,7 +225,16 @@ foreach my $location (@locations) { print "<td align='center' $col>$flag</td>\n"; print "<td align='center' $col>$ccode_uc</td>\n"; print "<td align='left' $col>$cname</td>$line_end\n"; - + + # Finish column when the last element in the array has passed and we have an uneven amount of items. + if(! ($lines2 % 2) && ($location eq $locations[-1] )) { + print "<td $col> </td>\n"; + print "<td $col> </td>\n"; + print "<td $col> </td>\n"; + print "<td $col> </td>\n"; + print "<td $col> </td></tr>\n"; + } + $lines2++; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 2a020ea..9490076 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -3029,12 +3029,6 @@ sub make_algos($$$$$) { if (!$is_aead) { push(@algo, $int); } - - if ($grp =~ m/^e(.*)$/) { - push(@algo, "ecp$1"); - } else { - push(@algo, "modp$grp"); - } } push(@algos, join("-", @algo)); diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 2a826cd..8e61354 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 = cyrus-imapd -PAK_VER = 3 +PAK_VER = 4 DEPS = "" diff --git a/lfs/elinks b/lfs/elinks index 59f1426..2727423 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 = elinks -PAK_VER = 4 +PAK_VER = 5 DEPS = "" diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup index dca3e40..70c30b4 100644 --- a/src/initscripts/init.d/firstsetup +++ b/src/initscripts/init.d/firstsetup @@ -40,9 +40,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae fi fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b47472c1865f1777251a43376286ce884b8a4ba8
by git＠ipfire.org 13 May '15

13 May '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 49d769c6e6eae844c6ffe30817024ea70bb2f60c
by git＠ipfire.org 13 May '15

13 May '15

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 49d769c6e6eae844c6ffe30817024ea70bb2f60c (commit) from 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1 (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 49d769c6e6eae844c6ffe30817024ea70bb2f60c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 13 19:51:42 2015 +0200 core90: work around dhcp client hang at shutdown after update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/update.sh | 4 ++++ 1 file changed, 4 insertions(+) Difference in files: diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 460c017..e57bc17 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -211,6 +211,10 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Remove old udev configuration rm -vf /etc/udev/rules.d/30-persistent-network.rules +# Remove pids from dhcp client because it hang at normal shutdown +# so let the sysvinit kill it +rm -f /run/dhcpcd-*.pid + # # Start services # hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1
by git＠ipfire.org 13 May '15

13 May '15

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 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1 (commit) via 7b9233935e451d4305e7454bfbcc964cfb53d2bb (commit) from 51ff5115a0d7e8b5ea99d8a0b1aaac1823487304 (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 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 13 19:46:18 2015 +0200 elinks/cyrus-imapd: bump package version openssl 0.9.8 drop. some old installation has this addon still linked against openssl 0.9.8 so we need to update it. commit 7b9233935e451d4305e7454bfbcc964cfb53d2bb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 13 19:44:15 2015 +0200 core90: fix missing filename in metafile. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/update.sh | 4 +--- lfs/cyrus-imapd | 4 ++-- lfs/elinks | 4 ++-- src/initscripts/init.d/firstsetup | 3 --- 4 files changed, 5 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 52a8a8c..460c017 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -261,9 +261,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae + rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null fi fi diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 2a826cd..8e61354 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 = cyrus-imapd -PAK_VER = 3 +PAK_VER = 4 DEPS = "" diff --git a/lfs/elinks b/lfs/elinks index 59f1426..2727423 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 = elinks -PAK_VER = 4 +PAK_VER = 5 DEPS = "" diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup index dca3e40..70c30b4 100644 --- a/src/initscripts/init.d/firstsetup +++ b/src/initscripts/init.d/firstsetup @@ -40,9 +40,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae fi fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 51ff5115a0d7e8b5ea99d8a0b1aaac1823487304
by git＠ipfire.org 11 May '15

11 May '15

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 51ff5115a0d7e8b5ea99d8a0b1aaac1823487304 (commit) from 5f0a2ba1048850620c0aa44e80e0a58ff36039c3 (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 51ff5115a0d7e8b5ea99d8a0b1aaac1823487304 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 11 14:53:38 2015 +0200 core90: Remove old udev configuration This is not used any more and must be removed with the update so that the new script is taking effect. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/exclude | 1 - config/rootfiles/core/90/update.sh | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude index 56e840d..73b7b73 100644 --- a/config/rootfiles/core/90/exclude +++ b/config/rootfiles/core/90/exclude @@ -15,7 +15,6 @@ etc/sudoers etc/sysconfig/firewall.local etc/sysconfig/modules etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules srv/web/ipfire/html/proxy.pac var/ipfire/firewall/geoipblock var/ipfire/fwhosts/custmgeoipgrp diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 4835c5a..52a8a8c 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -208,6 +208,9 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# Remove old udev configuration +rm -vf /etc/udev/rules.d/30-persistent-network.rules + # # Start services # hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5f0a2ba1048850620c0aa44e80e0a58ff36039c3
by git＠ipfire.org 11 May '15

11 May '15

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 5f0a2ba1048850620c0aa44e80e0a58ff36039c3 (commit) from ab8775b7bb13ecfff12c9e94e107bd86b488e04d (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 5f0a2ba1048850620c0aa44e80e0a58ff36039c3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 11 12:57:29 2015 +0200 vpnmain.cgi: Do not use an other DH key exchange in ESP ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 6 ------ 1 file changed, 6 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 2a020ea..9490076 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -3029,12 +3029,6 @@ sub make_algos($$$$$) { if (!$is_aead) { push(@algo, $int); } - - if ($grp =~ m/^e(.*)$/) { - push(@algo, "ecp$1"); - } else { - push(@algo, "modp$grp"); - } } push(@algos, join("-", @algo)); 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 May 2015