IPFire-SCM July 2011

ipfire-scm@lists.ipfire.org

1 participants
91 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. 531f08359c015e39fa51dd9b15ed6abedbc408e6
by git＠ipfire.org 26 Jul '11

26 Jul '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, openvpn-n2n has been updated via 531f08359c015e39fa51dd9b15ed6abedbc408e6 (commit) from 81a789d9315219cca58160ea2dbd005287ae4bd3 (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 531f08359c015e39fa51dd9b15ed6abedbc408e6 Author: Alfred Haas <alfred.haas(a)ipfire.org> Date: Tue Jul 26 11:53:32 2011 +0200 Import new version of ovpnmain.cgi. This fixes the import of the client package and creates all necessary directories on its own. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 850555c..2a9da01 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -528,9 +528,9 @@ my @ovsubnettemp = split(/\./,$cgiparams{'OVPN_SUBNET'}); my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; my $tunmtu = $cgiparams{'MTU'}; if ($tunmtu eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; - - if ( !-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") { - mkdir("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770); } + +unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} +unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770 or die "Unable to create dir $!";} open(SERVERCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; @@ -604,8 +604,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && my $tunmtu = $cgiparams{'MTU'}; if ($tunmtu eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; - if ( !-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") { - mkdir("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770); } +unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} +unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770 or die "Unable to create dir $!";} open(CLIENTCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; @@ -1549,7 +1549,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "persist-key\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; - print CLIENTCONF "remote $netsettings{'RED_ADDRESS'}\n"; + print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# IP Adressen des VPN Tunnels\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; @@ -1597,7 +1597,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "# Management Interface aktivieren\n"; print CLIENTCONF "# management localhost 4711\n"; print CLIENTCONF "# remsub $confighash{$cgiparams{'KEY'}}[11]\n"; - + close(CLIENTCONF); @@ -2471,8 +2471,8 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; $cgiparams{'LOCAL_SUBNET'} = $confighash{$cgiparams{'KEY'}}[8]; - $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; - $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; + $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; + $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; $cgiparams{'REMARK'} = $confighash{$cgiparams{'KEY'}}[25]; $cgiparams{'INTERFACE'} = $confighash{$cgiparams{'KEY'}}[26]; #new fields hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 96732a3ccf65072dbfa760f5eee123a718e3d403
by git＠ipfire.org 26 Jul '11

26 Jul '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 3.x development tree". The branch, master has been updated via 96732a3ccf65072dbfa760f5eee123a718e3d403 (commit) via bf9cb0594f500d9e56852350f664098bb3506b08 (commit) via 9d9e0884c3b15b47ac348558be2d760ac4bfffc9 (commit) via ddf84202880fa106ed923817ff33faba3a15042b (commit) from 130982925ef0775a618a90efa9afb3cb07132f24 (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 96732a3ccf65072dbfa760f5eee123a718e3d403 Merge: bf9cb05 9d9e088 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 26 11:03:55 2011 +0200 Merge remote-tracking branch 'stevee/updates' commit bf9cb0594f500d9e56852350f664098bb3506b08 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 26 11:02:47 2011 +0200 suricata: Update to 1.0.5. commit 9d9e0884c3b15b47ac348558be2d760ac4bfffc9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 24 16:49:55 2011 +0200 lm_sensors: Update to 3.3.1. Fixes #219. commit ddf84202880fa106ed923817ff33faba3a15042b Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 24 16:24:43 2011 +0200 glib2: Update to 2.9.14. Fixes #220 ----------------------------------------------------------------------- Summary of changes: pkgs/glib2/glib2.nm | 5 +++-- pkgs/lm-sensors/lm-sensors.nm | 2 +- pkgs/suricata/suricata.nm | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) Difference in files: diff --git a/pkgs/glib2/glib2.nm b/pkgs/glib2/glib2.nm index f20ea16..c4bbbce 100644 --- a/pkgs/glib2/glib2.nm +++ b/pkgs/glib2/glib2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = glib -PKG_VER = 2.28.8 +PKG_VER = 2.29.14 PKG_REL = 1 PKG_MAINTAINER = @@ -34,7 +34,8 @@ PKG_URL = http://www.gtk.org PKG_LICENSE = LGPLv2+ PKG_SUMMARY = A library of handy utility functions. -PKG_BUILD_DEPS+= gettext libselinux-devel pcre-devel pkg-config zlib-devel +PKG_BUILD_DEPS+= gettext libffi-devel libselinux-devel pcre-devel pkg-config\ + zlib-devel define PKG_DESCRIPTION GLib is the low-level core library that forms the basis \ diff --git a/pkgs/lm-sensors/lm-sensors.nm b/pkgs/lm-sensors/lm-sensors.nm index 9a0eeed..9023314 100644 --- a/pkgs/lm-sensors/lm-sensors.nm +++ b/pkgs/lm-sensors/lm-sensors.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = lm_sensors -PKG_VER = 3.3.0 +PKG_VER = 3.3.1 PKG_REL = 1 PKG_MAINTAINER = diff --git a/pkgs/suricata/suricata.nm b/pkgs/suricata/suricata.nm index 1c5cc43..468258b 100644 --- a/pkgs/suricata/suricata.nm +++ b/pkgs/suricata/suricata.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = suricata -PKG_VER = 1.0.2 -PKG_REL = 0 +PKG_VER = 1.0.5 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Networking/IDS hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 67a1b5b843fab82cd0f185a11aeced596fb3c507
by git＠ipfire.org 26 Jul '11

26 Jul '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 67a1b5b843fab82cd0f185a11aeced596fb3c507 (commit) via 91bba6b28db61b3e3644cf5c9e47fb036fe526ef (commit) via 1914416e85bea97c75db4dafc2f37c512a562c75 (commit) via c60fa4138d8a4dd4723e2758f27f65f9a5471f3d (commit) via 7fdcea4ef6f6bc7b3169fbc30647fd23b9002f13 (commit) via 0458115681ef6178b0423f04fc549053d3e43d8e (commit) via 27e5a0135381ea46c168e65fa669826d1606da48 (commit) via d52c5930012c2616d10cf811c5b99ee772fe18d1 (commit) via cbb914abe8dd48de5c055ba88d4d906e972a3c5a (commit) via 601099d677a3401b21a8579933c4b2d51f0a5799 (commit) via d9d5d3017b80f919500ed448bb6179ea5caab14a (commit) from e056ca737a5d9069df87665ac9486784d2bf07d5 (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 67a1b5b843fab82cd0f185a11aeced596fb3c507 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 26 07:51:45 2011 +0200 start core52. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/50/filelists/icons | 13 ------------- config/rootfiles/core/51/filelists/files | 1 + config/rootfiles/core/{49 => 52}/exclude | 0 config/rootfiles/core/{51 => 52}/filelists/files | 1 + config/rootfiles/core/{49 => 52}/meta | 0 config/rootfiles/core/{49 => 52}/update.sh | 8 ++++---- html/html/images/delete.gif | Bin 1879 -> 153 bytes html/html/images/document-save.png | Bin 1572 -> 911 bytes html/html/images/edit.gif | Bin 1726 -> 131 bytes html/html/images/floppy.gif | Bin 1179 -> 151 bytes html/html/images/forward.gif | Bin 1669 -> 609 bytes html/html/images/info.gif | Bin 1811 -> 1209 bytes html/html/images/list-add.png | Bin 932 -> 323 bytes html/html/images/list-remove.png | Bin 651 -> 247 bytes html/html/images/package-x-generic.png | Bin 1666 -> 540 bytes html/html/images/reload.gif | Bin 1859 -> 108 bytes html/html/images/stock_ok.png | Bin 2830 -> 672 bytes html/html/images/stock_stop.png | Bin 3051 -> 1379 bytes html/html/images/user-trash.png | Bin 1562 -> 655 bytes lfs/linux | 2 +- make.sh | 2 +- 21 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 config/rootfiles/core/50/filelists/icons copy config/rootfiles/core/{49 => 52}/exclude (100%) copy config/rootfiles/core/{51 => 52}/filelists/files (51%) copy config/rootfiles/core/{49 => 52}/meta (100%) copy config/rootfiles/core/{49 => 52}/update.sh (93%) Difference in files: diff --git a/config/rootfiles/core/50/filelists/icons b/config/rootfiles/core/50/filelists/icons deleted file mode 100644 index 52b22e0..0000000 --- a/config/rootfiles/core/50/filelists/icons +++ /dev/null @@ -1,13 +0,0 @@ -srv/web/ipfire/html/images/delete.gif -srv/web/ipfire/html/images/document-save.png -srv/web/ipfire/html/images/edit.gif -srv/web/ipfire/html/images/floppy.gif -srv/web/ipfire/html/images/forward.gif -srv/web/ipfire/html/images/info.gif -srv/web/ipfire/html/images/list-add.png -srv/web/ipfire/html/images/list-remove.png -srv/web/ipfire/html/images/package-x-generic.png -srv/web/ipfire/html/images/reload.gif -srv/web/ipfire/html/images/stock_ok.png -srv/web/ipfire/html/images/stock_stop.png -srv/web/ipfire/html/images/user-trash.png diff --git a/config/rootfiles/core/51/filelists/files b/config/rootfiles/core/51/filelists/files index 0037af1..f3cb1f0 100644 --- a/config/rootfiles/core/51/filelists/files +++ b/config/rootfiles/core/51/filelists/files @@ -1 +1,2 @@ etc/system-release +var/ipfire/langs/ diff --git a/config/rootfiles/core/52/exclude b/config/rootfiles/core/52/exclude new file mode 100644 index 0000000..ce199d8 --- /dev/null +++ b/config/rootfiles/core/52/exclude @@ -0,0 +1 @@ +srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files new file mode 100644 index 0000000..f3cb1f0 --- /dev/null +++ b/config/rootfiles/core/52/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +var/ipfire/langs/ diff --git a/config/rootfiles/core/52/meta b/config/rootfiles/core/52/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/52/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/52/update.sh b/config/rootfiles/core/52/update.sh new file mode 100644 index 0000000..16e8368 --- /dev/null +++ b/config/rootfiles/core/52/update.sh @@ -0,0 +1,59 @@ +#!/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) 2011 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=52 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#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.43-ipfire >/dev/null 2>&1 +#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/html/html/images/delete.gif b/html/html/images/delete.gif index edae2a7..855a9b3 100644 Binary files a/html/html/images/delete.gif and b/html/html/images/delete.gif differ diff --git a/html/html/images/document-save.png b/html/html/images/document-save.png index 65a42b2..22ff495 100644 Binary files a/html/html/images/document-save.png and b/html/html/images/document-save.png differ diff --git a/html/html/images/edit.gif b/html/html/images/edit.gif index 851d29e..c749f46 100644 Binary files a/html/html/images/edit.gif and b/html/html/images/edit.gif differ diff --git a/html/html/images/floppy.gif b/html/html/images/floppy.gif index d056222..7db2f32 100644 Binary files a/html/html/images/floppy.gif and b/html/html/images/floppy.gif differ diff --git a/html/html/images/forward.gif b/html/html/images/forward.gif index fdda6af..33d18b5 100644 Binary files a/html/html/images/forward.gif and b/html/html/images/forward.gif differ diff --git a/html/html/images/info.gif b/html/html/images/info.gif index 31e680c..94671ef 100644 Binary files a/html/html/images/info.gif and b/html/html/images/info.gif differ diff --git a/html/html/images/list-add.png b/html/html/images/list-add.png index 012cb2e..1aa7f09 100644 Binary files a/html/html/images/list-add.png and b/html/html/images/list-add.png differ diff --git a/html/html/images/list-remove.png b/html/html/images/list-remove.png index 2d0c780..00b654e 100644 Binary files a/html/html/images/list-remove.png and b/html/html/images/list-remove.png differ diff --git a/html/html/images/package-x-generic.png b/html/html/images/package-x-generic.png index 5febf95..9015426 100644 Binary files a/html/html/images/package-x-generic.png and b/html/html/images/package-x-generic.png differ diff --git a/html/html/images/reload.gif b/html/html/images/reload.gif index 1b04197..a456e7e 100644 Binary files a/html/html/images/reload.gif and b/html/html/images/reload.gif differ diff --git a/html/html/images/stock_ok.png b/html/html/images/stock_ok.png index 7a4acb5..d92d88d 100644 Binary files a/html/html/images/stock_ok.png and b/html/html/images/stock_ok.png differ diff --git a/html/html/images/stock_stop.png b/html/html/images/stock_stop.png index 8305ee8..89c2124 100644 Binary files a/html/html/images/stock_stop.png and b/html/html/images/stock_stop.png differ diff --git a/html/html/images/user-trash.png b/html/html/images/user-trash.png index 2a1c7b1..0e0953c 100644 Binary files a/html/html/images/user-trash.png and b/html/html/images/user-trash.png differ diff --git a/lfs/linux b/lfs/linux index ac85f20..dd01d9e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -35,7 +35,7 @@ CFLAGS = CXXFLAGS = PROG = linux-xen -PAK_VER = 16 +PAK_VER = 17 DEPS = "" # Normal build or XEN build. diff --git a/make.sh b/make.sh index 7ae5002..a9bc4be 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="51" # Core Level (Filename) +CORE="52" # Core Level (Filename) PAKFIRE_CORE="51" # 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

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-core51, created. 91bba6b28db61b3e3644cf5c9e47fb036fe526ef
by git＠ipfire.org 26 Jul '11

26 Jul '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-core51 has been created at 91bba6b28db61b3e3644cf5c9e47fb036fe526ef (commit) - Log ----------------------------------------------------------------- commit 91bba6b28db61b3e3644cf5c9e47fb036fe526ef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 22:41:35 2011 +0200 langs: add langs to core. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core51, created. 91bba6b28db61b3e3644cf5c9e47fb036fe526ef
by git＠ipfire.org 26 Jul '11

26 Jul '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, core51 has been created at 91bba6b28db61b3e3644cf5c9e47fb036fe526ef (commit) - Log ----------------------------------------------------------------- commit 91bba6b28db61b3e3644cf5c9e47fb036fe526ef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 22:41:35 2011 +0200 langs: add langs to core. commit 1914416e85bea97c75db4dafc2f37c512a562c75 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 22:40:49 2011 +0200 bump kernel package version. commit c60fa4138d8a4dd4723e2758f27f65f9a5471f3d Merge: 7fdcea4 e056ca7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 21:16:00 2011 +0200 Merge branch 'master' into core50 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 130982925ef0775a618a90efa9afb3cb07132f24
by git＠ipfire.org 25 Jul '11

25 Jul '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 3.x development tree". The branch, master has been updated via 130982925ef0775a618a90efa9afb3cb07132f24 (commit) from 5597dafa78a057353d8613d52eedac035e2bcbb9 (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 130982925ef0775a618a90efa9afb3cb07132f24 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 21:46:25 2011 +0200 chrony: Woops. Did not bump the release version in 1ad5a7c. ----------------------------------------------------------------------- Summary of changes: pkgs/chrony/chrony.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/chrony/chrony.nm b/pkgs/chrony/chrony.nm index 551cd63..ae3a269 100644 --- a/pkgs/chrony/chrony.nm +++ b/pkgs/chrony/chrony.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = chrony PKG_VER = 1.26 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = PKG_GROUPS = Base System/Daemons hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5597dafa78a057353d8613d52eedac035e2bcbb9
by git＠ipfire.org 25 Jul '11

25 Jul '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 3.x development tree". The branch, master has been updated via 5597dafa78a057353d8613d52eedac035e2bcbb9 (commit) via 1ad5a7c48e39b98d54e14d9e554f8927ebfd83d6 (commit) from 02013b2c25b7d7cd6933855ec5e23d8900569c5e (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 5597dafa78a057353d8613d52eedac035e2bcbb9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 21:19:49 2011 +0200 rsyslog: Add this to the base installation and fix files. commit 1ad5a7c48e39b98d54e14d9e554f8927ebfd83d6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 25 21:15:16 2011 +0200 chrony: Use the "ipfire ntp servers". ----------------------------------------------------------------------- Summary of changes: pkgs/chrony/chrony.conf | 8 ++-- pkgs/rsyslog/rsyslog.log | 67 +++------------------------------------ pkgs/rsyslog/rsyslog.nm | 4 +- pkgs/rsyslog/rsyslog.sysconfig | 65 +++----------------------------------- 4 files changed, 17 insertions(+), 127 deletions(-) Difference in files: diff --git a/pkgs/chrony/chrony.conf b/pkgs/chrony/chrony.conf index 7e3690b..3d58b81 100644 --- a/pkgs/chrony/chrony.conf +++ b/pkgs/chrony/chrony.conf @@ -1,9 +1,9 @@ # Use public servers from the pool.ntp.org project. # Please consider joining the pool (http://www.pool.ntp.org/join.html). -server 0.fedora.pool.ntp.org iburst -server 1.fedora.pool.ntp.org iburst -server 2.fedora.pool.ntp.org iburst -server 3.fedora.pool.ntp.org iburst +server 0.ipfire.pool.ntp.org iburst +server 1.ipfire.pool.ntp.org iburst +server 2.ipfire.pool.ntp.org iburst +server 3.ipfire.pool.ntp.org iburst # Ignore stratum in source selection. stratumweight 0 diff --git a/pkgs/rsyslog/rsyslog.log b/pkgs/rsyslog/rsyslog.log index 777a666..b2d41f1 100644 --- a/pkgs/rsyslog/rsyslog.log +++ b/pkgs/rsyslog/rsyslog.log @@ -1,61 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> - - -<head> -<meta http-equiv="content-type" content="text/html; charset=utf-8"/> -<meta name="generator" content="gitweb/1.7.0.2 git/1.7.2.1"/> -<meta name="robots" content="index, nofollow"/> -<title>Fedora Packages Git Repositories - rsyslog.git/blob - rsyslog.log</title> -<link rel="stylesheet" type="text/css" href="/gitweb/gitweb.css"/> -<link rel="alternate" title="rsyslog.git - history of rsyslog.log - RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log" type="application/rss+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.log - RSS feed (no merges)" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log;opt=--no-merges" type="application/rss+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.log - Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log;opt=--no-merges" type="application/atom+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.log - Atom feed (no merges)" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log;opt=--no-merges" type="application/atom+xml" /> -<link rel="shortcut icon" href="http://fedoraproject.org/static/images/favicon.ico" type="image/png" /> -</head> -<body> -<div class="page_header"> -<a title="Fedora" href="http://fedoraproject.org"><img src="http://fedoraproject.org/static/images/fedora-logo-27.png" width="72" height="27" alt="git" class="logo"/></a><a href="/gitweb/">git://pkgs.fedoraproject.org</a> / <a href="/gitweb/?p=rsyslog.git;a=summary">rsyslog.git</a> / blob -</div> -<form method="get" action="/gitweb/" enctype="application/x-www-form-urlencoded"> -<div class="search"> -<input name="p" type="hidden" value="rsyslog.git" /> -<input name="a" type="hidden" value="search" /> -<input name="h" type="hidden" value="HEAD" /> -<select name="st" > -<option selected="selected" value="commit">commit</option> -<option value="grep">grep</option> -<option value="author">author</option> -<option value="committer">committer</option> -<option value="pickaxe">pickaxe</option> -</select><sup><a href="/gitweb/?p=rsyslog.git;a=search_help">?</a></sup> search: -<input type="text" name="s" /> -<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div> -</form> -</div> -<div class="page_nav"> -<a href="/gitweb/?p=rsyslog.git;a=summary">summary</a> | <a href="/gitweb/?p=rsyslog.git;a=shortlog">shortlog</a> | <a href="/gitweb/?p=rsyslog.git;a=log">log</a> | <a href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">commit</a> | <a href="/gitweb/?p=rsyslog.git;a=commitdiff;h=HEAD">commitdiff</a> | <a href="/gitweb/?p=rsyslog.git;a=tree;h=4d7fc435d7037ee9c5baa895bb8d4cc3da575400;hb=HEAD">tree</a><br/> -<a href="/gitweb/?p=rsyslog.git;a=history;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD">history</a> | <a href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD">raw</a> | <a href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;hb=HEAD">HEAD</a><br/> -</div> -<div class="header"> -<a class="title" href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)</a> -</div> -<div class="page_path"><a title="tree root" href="/gitweb/?p=rsyslog.git;a=tree;hb=HEAD">[rsyslog.git]</a> / <a title="rsyslog.log" href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.log;hb=HEAD">rsyslog.log</a><br/></div> -<div class="page_body"> -<div class="pre"><a id="l1" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l1" class="linenr"> 1</a> /var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {</div> -<div class="pre"><a id="l2" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l2" class="linenr"> 2</a>     sharedscripts</div> -<div class="pre"><a id="l3" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l3" class="linenr"> 3</a>     postrotate</div> -<div class="pre"><a id="l4" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l4" class="linenr"> 4</a>         /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true</div> -<div class="pre"><a id="l5" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l5" class="linenr"> 5</a>     endscript</div> -<div class="pre"><a id="l6" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l6" class="linenr"> 6</a> }</div> -</div><div class="page_footer"> -<div class="cachetime">Cache Last Updated: Sat Mar 26 12:27:46 2011 GMT</div> -<div class="page_footer_text">rsyslog</div> -<a class="rss_logo" title="history of rsyslog.log RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log">RSS</a> -<a class="rss_logo" title="history of rsyslog.log Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log">Atom</a> -</div> -<script type="text/javascript" src="/gitweb/gitweb.js"></script> -</body> -</html> \ No newline at end of file +/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron { + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true + endscript +} diff --git a/pkgs/rsyslog/rsyslog.nm b/pkgs/rsyslog/rsyslog.nm index a356c8e..de7362c 100644 --- a/pkgs/rsyslog/rsyslog.nm +++ b/pkgs/rsyslog/rsyslog.nm @@ -26,10 +26,10 @@ include $(PKGROOT)/Include PKG_NAME = rsyslog PKG_VER = 5.8.0 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = -PKG_GROUPS = System/Daemons +PKG_GROUPS = Base System/Daemons PKG_URL = http://www.rsyslog.com/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = Enhanced system logging and kernel message trapping daemon. diff --git a/pkgs/rsyslog/rsyslog.sysconfig b/pkgs/rsyslog/rsyslog.sysconfig index 0eca916..ad9723f 100644 --- a/pkgs/rsyslog/rsyslog.sysconfig +++ b/pkgs/rsyslog/rsyslog.sysconfig @@ -1,60 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> - - -<head> -<meta http-equiv="content-type" content="text/html; charset=utf-8"/> -<meta name="generator" content="gitweb/1.7.0.2 git/1.7.2.1"/> -<meta name="robots" content="index, nofollow"/> -<title>Fedora Packages Git Repositories - rsyslog.git/blob - rsyslog.sysconfig</title> -<link rel="stylesheet" type="text/css" href="/gitweb/gitweb.css"/> -<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig" type="application/rss+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - RSS feed (no merges)" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig;opt=--no-merges" type="application/rss+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig;opt=--no-merges" type="application/atom+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - Atom feed (no merges)" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig;opt=--no-merges" type="application/atom+xml" /> -<link rel="shortcut icon" href="http://fedoraproject.org/static/images/favicon.ico" type="image/png" /> -</head> -<body> -<div class="page_header"> -<a title="Fedora" href="http://fedoraproject.org"><img src="http://fedoraproject.org/static/images/fedora-logo-27.png" width="72" height="27" alt="git" class="logo"/></a><a href="/gitweb/">git://pkgs.fedoraproject.org</a> / <a href="/gitweb/?p=rsyslog.git;a=summary">rsyslog.git</a> / blob -</div> -<form method="get" action="/gitweb/" enctype="application/x-www-form-urlencoded"> -<div class="search"> -<input name="p" type="hidden" value="rsyslog.git" /> -<input name="a" type="hidden" value="search" /> -<input name="h" type="hidden" value="HEAD" /> -<select name="st" > -<option selected="selected" value="commit">commit</option> -<option value="grep">grep</option> -<option value="author">author</option> -<option value="committer">committer</option> -<option value="pickaxe">pickaxe</option> -</select><sup><a href="/gitweb/?p=rsyslog.git;a=search_help">?</a></sup> search: -<input type="text" name="s" /> -<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div> -</form> -</div> -<div class="page_nav"> -<a href="/gitweb/?p=rsyslog.git;a=summary">summary</a> | <a href="/gitweb/?p=rsyslog.git;a=shortlog">shortlog</a> | <a href="/gitweb/?p=rsyslog.git;a=log">log</a> | <a href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">commit</a> | <a href="/gitweb/?p=rsyslog.git;a=commitdiff;h=HEAD">commitdiff</a> | <a href="/gitweb/?p=rsyslog.git;a=tree;h=4d7fc435d7037ee9c5baa895bb8d4cc3da575400;hb=HEAD">tree</a><br/> -<a href="/gitweb/?p=rsyslog.git;a=history;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD">history</a> | <a href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD">raw</a> | <a href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;hb=HEAD">HEAD</a><br/> -</div> -<div class="header"> -<a class="title" href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)</a> -</div> -<div class="page_path"><a title="tree root" href="/gitweb/?p=rsyslog.git;a=tree;hb=HEAD">[rsyslog.git]</a> / <a title="rsyslog.sysconfig" href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.sysconfig;hb=HEAD">rsyslog.sysconfig</a><br/></div> -<div class="page_body"> -<div class="pre"><a id="l1" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l1" class="linenr"> 1</a> # Options for rsyslogd</div> -<div class="pre"><a id="l2" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l2" class="linenr"> 2</a> # Syslogd options are deprecated since rsyslog v3.</div> -<div class="pre"><a id="l3" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l3" class="linenr"> 3</a> # If you want to use them, switch to compatibility mode 2 by "-c 2"</div> -<div class="pre"><a id="l4" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l4" class="linenr"> 4</a> # See rsyslogd(8) for more details</div> -<div class="pre"><a id="l5" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l5" class="linenr"> 5</a> SYSLOGD_OPTIONS="-c 5"</div> -</div><div class="page_footer"> -<div class="cachetime">Cache Last Updated: Sat Mar 26 12:28:03 2011 GMT</div> -<div class="page_footer_text">rsyslog</div> -<a class="rss_logo" title="history of rsyslog.sysconfig RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig">RSS</a> -<a class="rss_logo" title="history of rsyslog.sysconfig Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig">Atom</a> -</div> -<script type="text/javascript" src="/gitweb/gitweb.js"></script> -</body> -</html> \ No newline at end of file +# Options for rsyslogd +# Syslogd options are deprecated since rsyslog v3. +# If you want to use them, switch to compatibility mode 2 by "-c 2" +# See rsyslogd(8) for more details +SYSLOGD_OPTIONS="-c 5" hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e056ca737a5d9069df87665ac9486784d2bf07d5
by git＠ipfire.org 25 Jul '11

25 Jul '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 e056ca737a5d9069df87665ac9486784d2bf07d5 (commit) via f7e7a8909791a033f2a79233ea07db8f8f553d45 (commit) from e935465a7a5160a03d382f1e330accfae1aceea9 (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 e056ca737a5d9069df87665ac9486784d2bf07d5 Merge: f7e7a89 e935465 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 21:14:39 2011 +0200 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit f7e7a8909791a033f2a79233ea07db8f8f553d45 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 21:13:36 2011 +0200 close core 51. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index ee87961..7ae5002 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number CORE="51" # Core Level (Filename) -PAKFIRE_CORE="50" # Core Level (PAKFIRE) +PAKFIRE_CORE="51" # 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, master, updated. e935465a7a5160a03d382f1e330accfae1aceea9
by git＠ipfire.org 25 Jul '11

25 Jul '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 e935465a7a5160a03d382f1e330accfae1aceea9 (commit) from fe683b748f0945b4986833580ac890d111b2ac24 (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 e935465a7a5160a03d382f1e330accfae1aceea9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 20:54:10 2011 +0200 core51: update need a reboot. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/51/update.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh index 78e6a53..19fe898 100644 --- a/config/rootfiles/core/51/update.sh +++ b/config/rootfiles/core/51/update.sh @@ -68,7 +68,7 @@ rm -rf /boot/System.map-* rm -rf /boot/config-* rm -rf /boot/ipfirerd-* rm -rf /boot/vmlinuz-* -rm -rf /lib/modules/*-ipfire +rm -rf /lib/modules/* # # Backup grub.conf # @@ -147,6 +147,8 @@ rm -rf /etc/sysconfig/lm_sensors /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!" /usr/bin/logger -p syslog.emerg -t core-upgrade-51 " *** Please reboot... *** " +# This update need a reboot. +touch /var/run/need_reboot # #Finish hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fe683b748f0945b4986833580ac890d111b2ac24
by git＠ipfire.org 25 Jul '11

25 Jul '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 fe683b748f0945b4986833580ac890d111b2ac24 (commit) from 18520692cd1788be8b6bd3d9bc4c9f63826875f2 (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 fe683b748f0945b4986833580ac890d111b2ac24 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 25 20:42:46 2011 +0200 installer: increase nr of files. ----------------------------------------------------------------------- Summary of changes: src/install+setup/install/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index b993133..60b8cba 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -11,7 +11,7 @@ #include "install.h" #define _GNU_SOURCE -#define INST_FILECOUNT 8400 +#define INST_FILECOUNT 10700 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf" #define EXT2 0 hooks/post-receive -- IPFire 2.x development tree

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 July 2011