IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7853 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a5427f542824b7e6c15ef90fe995f54c63f16fb
by git＠ipfire.org 09 Nov '11

09 Nov '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, next has been updated via 3a5427f542824b7e6c15ef90fe995f54c63f16fb (commit) from 57c22fd6d09880e89b9f4ee1385f060269ab2d30 (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 3a5427f542824b7e6c15ef90fe995f54c63f16fb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Nov 9 21:09:09 2011 +0100 vpnmain.cgi: Allow %any as remote host/IP. http://forum.ipfire.org/index.php?topic=5458.0 ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index e1a8200..eea2c01 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1351,7 +1351,7 @@ END } if ($cgiparams{'REMOTE'}) { - if (! &General::validip($cgiparams{'REMOTE'})) { + if (($cgiparams{'REMOTE'} ne '%any') && (! &General::validip($cgiparams{'REMOTE'}))) { if (! &General::validfqdn ($cgiparams{'REMOTE'})) { $errormessage = $Lang::tr{'invalid input for remote host/ip'}; goto VPNCONF_ERROR; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 57c22fd6d09880e89b9f4ee1385f060269ab2d30
by git＠ipfire.org 04 Nov '11

04 Nov '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, next has been updated via 57c22fd6d09880e89b9f4ee1385f060269ab2d30 (commit) from dd89e75ad3d1332c7a7bb0d1eda4aae8ccb86b1a (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 57c22fd6d09880e89b9f4ee1385f060269ab2d30 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 15:07:34 2011 +0100 dhcp: Fix syntax error in dhcpcd.exe. http://forum.ipfire.org/index.php?topic=5418.msg38636#msg38636 ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/networking/dhcpcd.exe | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe index ac835c5..d61c3d5 100644 --- a/src/initscripts/init.d/networking/dhcpcd.exe +++ b/src/initscripts/init.d/networking/dhcpcd.exe @@ -39,7 +39,7 @@ dhcpcd_up() fi #Check if we have to restart the services at update - [ ! -e "/var/ipfire/red/active" ] update=1; + [ ! -e "/var/ipfire/red/active" ] && update=1; if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then update=1; fi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dd89e75ad3d1332c7a7bb0d1eda4aae8ccb86b1a
by git＠ipfire.org 04 Nov '11

04 Nov '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, next has been updated via dd89e75ad3d1332c7a7bb0d1eda4aae8ccb86b1a (commit) from 0f1c4de9a91669e149efb3e631c4b4acc71660f9 (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 dd89e75ad3d1332c7a7bb0d1eda4aae8ccb86b1a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 14:51:10 2011 +0100 fcron: Fix permissions of configuration files. Some people had trouble with building the package on Ubuntu 10.10. http://forum.ipfire.org/index.php?topic=5107.msg38692#msg38692 ----------------------------------------------------------------------- Summary of changes: lfs/fcron | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/lfs/fcron b/lfs/fcron index 38343d4..d8fe8fb 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -102,6 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) echo "Place scripts run weekly here ..." > /etc/fcron.weekly/info.txt echo "Place scripts run monthly here ..." > /etc/fcron.monthly/info.txt + chmod 640 /etc/fcron.{conf,allow,deny} /usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0f1c4de9a91669e149efb3e631c4b4acc71660f9
by git＠ipfire.org 04 Nov '11

04 Nov '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, next has been updated via 0f1c4de9a91669e149efb3e631c4b4acc71660f9 (commit) from 6ee77762b57341c8e6e55fe114b1639495e86d1b (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 0f1c4de9a91669e149efb3e631c4b4acc71660f9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 14:46:30 2011 +0100 Don't load H323 conntrack modules by default. This happens to cause trouble with transmitting the audio through an IPsec tunnel. http://forum.ipfire.org/index.php?topic=5459.0 ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/network | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index 5542214..9de3994 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -31,6 +31,8 @@ init_networking() { if [ -e /var/ipfire/main/disable_nf_sip ]; then rmmod nf_nat_sip rmmod nf_conntrack_sip + rmmod nf_nat_h323 + rmmod nf_conntrack_h323 fi boot_mesg "Setting up firewall" hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b514fe3fba3fa2e631128a526a63cd1ad6a499cf
by git＠ipfire.org 04 Nov '11

04 Nov '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 b514fe3fba3fa2e631128a526a63cd1ad6a499cf (commit) via 920fb6e422d4bc38df6e855f03f3eea592ff56d2 (commit) via 726ea1a2dfe098cf2460546a8015986c72088329 (commit) via 6f5410eb5846b353985bb779d8bd3520a2ba21fa (commit) via b6fc6d25c8d1679854d0373e33f19bb2e5b5e801 (commit) via c18090e76d301d70b9e199823a8a7d2ce8f15592 (commit) via 5fa6700d8c181f33fd35db6821a68b92679cf926 (commit) via 2bcabb15f54897905a9ecb5f430e0a01c7429e6a (commit) via 02abce5474da9c48806009da8c70bcbabe1bf41f (commit) from 7aab235d4890ab127a204338c0225118d3c02f50 (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 b514fe3fba3fa2e631128a526a63cd1ad6a499cf Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Nov 4 12:29:28 2011 +0100 samba: update to 3.5.12. commit 920fb6e422d4bc38df6e855f03f3eea592ff56d2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Nov 4 12:39:55 2011 +0100 Asterisk: update to 1.4.42. removed some addons that works only with zaptel. commit 726ea1a2dfe098cf2460546a8015986c72088329 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Sun Oct 30 11:07:46 2011 +0100 guardian: Fixed and enhanced blocking of ssh scans. commit 6f5410eb5846b353985bb779d8bd3520a2ba21fa Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Sat Oct 29 12:04:25 2011 +0200 Updated french translation - thx to Lalsacien commit b6fc6d25c8d1679854d0373e33f19bb2e5b5e801 Merge: 2bcabb1 c18090e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Nov 4 12:32:09 2011 +0100 Merge branch 'core53' commit c18090e76d301d70b9e199823a8a7d2ce8f15592 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 3 16:33:34 2011 +0100 core53: update initrd. commit 2bcabb15f54897905a9ecb5f430e0a01c7429e6a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 28 00:30:19 2011 +0200 squid: update to 3.1.16. commit 02abce5474da9c48806009da8c70bcbabe1bf41f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 28 00:31:24 2011 +0200 mediatomb: update to 0.12.1. ----------------------------------------------------------------------- Summary of changes: config/asterisk/asterisk.makeopts | 5 + config/guardian/guardian.pl | 49 ++++++---- config/rootfiles/core/53/filelists/files | 1 + config/rootfiles/core/53/update.sh | 17 +++- config/rootfiles/packages/asterisk | 45 ++++++--- config/rootfiles/packages/mediatomb | 1 - config/rootfiles/packages/samba | 1 + langs/fr/cgi-bin/fr.pl | 148 +++++++++++++++--------------- lfs/asterisk | 57 +++++------- lfs/guardian | 2 +- lfs/mediatomb | 10 +- lfs/samba | 6 +- lfs/squid | 4 +- 13 files changed, 192 insertions(+), 154 deletions(-) Difference in files: diff --git a/config/asterisk/asterisk.makeopts b/config/asterisk/asterisk.makeopts index 2c5c800..cac9675 100644 --- a/config/asterisk/asterisk.makeopts +++ b/config/asterisk/asterisk.makeopts @@ -6,6 +6,7 @@ MENUSELECT_FORMATS= MENUSELECT_FUNCS=func_odbc MENUSELECT_PBX=pbx_gtkconsole MENUSELECT_RES=res_config_odbc res_config_pgsql res_jabber res_odbc +MENUSELECT_TESTS=test_astobj2 test_expr test_poll test_skel MENUSELECT_OPTS_app_voicemail= MENUSELECT_CFLAGS=LOADABLE_MODULES MENUSELECT_EMBED= @@ -30,3 +31,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_jabber MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2 +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl index c7fd5f8..86d93fe 100644 --- a/config/guardian/guardian.pl +++ b/config/guardian/guardian.pl @@ -95,8 +95,17 @@ for (;;) { if (seek(ALERT2,0,1)){ while (<ALERT2>) { chop; - if ($_=~/.*sshd.*Failed password for root from.*/) { - my @array=split(/ /,$_);&checkssh ($array[11], "possible SSH-Bruteforce Attack");} + if ($_=~/.*sshd.*Failed password for .* from.*/) { + my @array=split(/ /,$_); + my $temp = ""; + if ( $array[11] eq "port" ) { + $temp = $array[10]; + } elsif ( $array[11] eq "from" ) { + $temp = $array[12]; + } else { + $temp = $array[11]; + } + &checkssh ($temp, "possible SSH-Bruteforce Attack");} } } @@ -164,24 +173,28 @@ sub checkssh { return 1 if ($source eq $gatewayaddr); # or our gateway - if ($sshhash{$dest} eq "" ){ - $sshhash{$dest} = 1; + return 0 if ($sshhash{$source} > 4); # allready blocked + + if ( ($ignore{$source} == 1) ){ + &write_log("Ignoring attack because $source is in my ignore list\n"); + return 1; } - if ($sshhash{$dest} >= 3 ) { - &write_log ("source = $source, count $sshhash{$dest} - blocking for ssh attack.\n"); + + if ($sshhash{$source} == 4 ) { + &write_log ("source = $source, blocking for ssh attack.\n"); &ipchain ($source, "", $type); + $sshhash{$source} = $sshhash{$source}+1; + return 0; } -# you will see this if the destination was not in the $sshhash, and the -# packet was not ignored before the target check.. - else { - &write_log ("Odd.. source = $source, ssh count only $sshhash{$dest} - No action done.\n"); - if (defined ($opt_d)) { - foreach $key (keys %sshhash) { - &write_log ("sshhash{$key} = %sshhash{$key}\n"); - } - } - $sshhash{$key} = $sshhash{$key}+1; + + if ($sshhash{$source} eq "" ){ + $sshhash{$source} = 1; + &write_log ("SSH Attack = $source, ssh count only $sshhash{$source} - No action done.\n"); + return 0; } + + $sshhash{$source} = $sshhash{$source}+1; + &write_log ("SSH Attack = $source, ssh count only $sshhash{$source} - No action done.\n"); } sub ipchain { @@ -221,9 +234,9 @@ sub build_ignore_hash { $count++; } close (IGNORE); - print "Loaded $count addresses from $ignorefile\n"; + &write_log("Loaded $count addresses from $ignorefile\n"); } else { - print "No ignore file was loaded!\n"; + &write_log("No ignore file was loaded!\n"); } } diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files index 2d47486..741254d 100644 --- a/config/rootfiles/core/53/filelists/files +++ b/config/rootfiles/core/53/filelists/files @@ -23,3 +23,4 @@ usr/local/sbin/setup var/ipfire/main/routing var/ipfire/menu.d/30-network.menu opt/pakfire/etc/pakfire.conf +usr/local/bin/backupiso diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh index a9e3dcb..dae061b 100644 --- a/config/rootfiles/core/53/update.sh +++ b/config/rootfiles/core/53/update.sh @@ -76,9 +76,20 @@ fi perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's -depmod 2.6.32.45-ipfire >/dev/null 2>&1 -depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 -depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 +depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 + +#Rebuild initrd's because some compat-wireless modules are inside +/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +fi +if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +fi + +sync # # After pakfire has ended run it again and update the lists and do upgrade diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 789ec1b..896d900 100644 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -75,6 +75,7 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/rtp.h #usr/include/asterisk/say.h #usr/include/asterisk/sched.h +#usr/include/asterisk/select.h #usr/include/asterisk/sha1.h #usr/include/asterisk/slinfactory.h #usr/include/asterisk/smdi.h @@ -84,6 +85,7 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/strings.h #usr/include/asterisk/tdd.h #usr/include/asterisk/term.h +#usr/include/asterisk/test.h #usr/include/asterisk/threadstorage.h #usr/include/asterisk/time.h #usr/include/asterisk/tonezone_compat.h @@ -110,7 +112,6 @@ usr/lib/asterisk/modules/app_dahdibarge.so usr/lib/asterisk/modules/app_dahdiras.so usr/lib/asterisk/modules/app_dahdiscan.so usr/lib/asterisk/modules/app_db.so -usr/lib/asterisk/modules/app_devstate.so usr/lib/asterisk/modules/app_dial.so usr/lib/asterisk/modules/app_dictate.so usr/lib/asterisk/modules/app_directed_pickup.so @@ -120,7 +121,6 @@ usr/lib/asterisk/modules/app_dumpchan.so usr/lib/asterisk/modules/app_echo.so usr/lib/asterisk/modules/app_exec.so usr/lib/asterisk/modules/app_externalivr.so -usr/lib/asterisk/modules/app_fax.so usr/lib/asterisk/modules/app_festival.so usr/lib/asterisk/modules/app_flash.so usr/lib/asterisk/modules/app_followme.so @@ -139,11 +139,8 @@ usr/lib/asterisk/modules/app_mixmonitor.so usr/lib/asterisk/modules/app_morsecode.so usr/lib/asterisk/modules/app_mp3.so usr/lib/asterisk/modules/app_nbscat.so -usr/lib/asterisk/modules/app_nv_backgrounddetect.so -usr/lib/asterisk/modules/app_nv_faxdetect.so usr/lib/asterisk/modules/app_page.so usr/lib/asterisk/modules/app_parkandannounce.so -usr/lib/asterisk/modules/app_pickup2.so usr/lib/asterisk/modules/app_playback.so usr/lib/asterisk/modules/app_privacy.so usr/lib/asterisk/modules/app_queue.so @@ -171,7 +168,6 @@ usr/lib/asterisk/modules/app_test.so usr/lib/asterisk/modules/app_transfer.so usr/lib/asterisk/modules/app_url.so usr/lib/asterisk/modules/app_userevent.so -usr/lib/asterisk/modules/app_valetparking.so usr/lib/asterisk/modules/app_verbose.so usr/lib/asterisk/modules/app_voicemail.so usr/lib/asterisk/modules/app_waitforring.so @@ -226,7 +222,6 @@ usr/lib/asterisk/modules/func_channel.so usr/lib/asterisk/modules/func_curl.so usr/lib/asterisk/modules/func_cut.so usr/lib/asterisk/modules/func_db.so -usr/lib/asterisk/modules/func_devstate.so usr/lib/asterisk/modules/func_enum.so usr/lib/asterisk/modules/func_env.so usr/lib/asterisk/modules/func_global.so @@ -364,7 +359,7 @@ var/lib/asterisk/images/asterisk-intro.jpg var/lib/asterisk/keys/freeworlddialup.pub var/lib/asterisk/keys/iaxtel.pub #var/lib/asterisk/moh -var/lib/asterisk/moh/.asterisk-moh-opsound-gsm +var/lib/asterisk/moh/.asterisk-moh-opsound-gsm-2.03 var/lib/asterisk/moh/CHANGES-asterisk-moh-opsound-gsm var/lib/asterisk/moh/CREDITS-asterisk-moh-opsound-gsm var/lib/asterisk/moh/LICENSE-asterisk-moh-opsound-gsm @@ -374,14 +369,14 @@ var/lib/asterisk/moh/macroform-the_simplicity.gsm var/lib/asterisk/moh/manolo_camp-morning_coffee.gsm var/lib/asterisk/moh/reno_project-system.gsm #var/lib/asterisk/sounds -var/lib/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.16 -var/lib/asterisk/sounds/.asterisk-extra-sounds-en-gsm-1.4.9 +var/lib/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.20 +var/lib/asterisk/sounds/.asterisk-extra-sounds-en-gsm-1.4.11 var/lib/asterisk/sounds/1-for-am-2-for-pm.gsm var/lib/asterisk/sounds/1-yes-2-no.gsm -var/lib/asterisk/sounds/CHANGES-asterisk-core-en-1.4.16 -var/lib/asterisk/sounds/CHANGES-asterisk-extra-en-1.4.9 -var/lib/asterisk/sounds/CREDITS-asterisk-core-en-1.4.16 -var/lib/asterisk/sounds/LICENSE-asterisk-core-en-1.4.16 +var/lib/asterisk/sounds/CHANGES-asterisk-core-en-1.4.20 +var/lib/asterisk/sounds/CHANGES-asterisk-extra-en-1.4.11 +var/lib/asterisk/sounds/CREDITS-asterisk-core-en-1.4.20 +var/lib/asterisk/sounds/LICENSE-asterisk-core-en-1.4.20 var/lib/asterisk/sounds/T-changed-to.gsm var/lib/asterisk/sounds/T-is-not-available.gsm var/lib/asterisk/sounds/T-to-disable-ancmnt.gsm @@ -447,6 +442,7 @@ var/lib/asterisk/sounds/are-you-still-there2.gsm var/lib/asterisk/sounds/arizona.gsm var/lib/asterisk/sounds/arkansas.gsm var/lib/asterisk/sounds/arlington.gsm +var/lib/asterisk/sounds/ascending-2tone.gsm var/lib/asterisk/sounds/astcc-account-balance-is.gsm var/lib/asterisk/sounds/astcc-account-number-invalid.gsm var/lib/asterisk/sounds/astcc-balance-of-account-is.gsm @@ -538,7 +534,7 @@ var/lib/asterisk/sounds/carried-away-by-monkeys.gsm var/lib/asterisk/sounds/cause-code.gsm var/lib/asterisk/sounds/cc-amex.gsm var/lib/asterisk/sounds/cc-discover.gsm -var/lib/asterisk/sounds/cc-nastercard.gsm +var/lib/asterisk/sounds/cc-mastercard.gsm var/lib/asterisk/sounds/cc-visa.gsm var/lib/asterisk/sounds/celsius.gsm var/lib/asterisk/sounds/cent.gsm @@ -599,12 +595,16 @@ var/lib/asterisk/sounds/conf-lockednow.gsm var/lib/asterisk/sounds/conf-muted.gsm var/lib/asterisk/sounds/conf-noempty.gsm var/lib/asterisk/sounds/conf-nonextended.gsm +var/lib/asterisk/sounds/conf-now-muted.gsm +var/lib/asterisk/sounds/conf-now-recording.gsm +var/lib/asterisk/sounds/conf-now-unmuted.gsm var/lib/asterisk/sounds/conf-onlyone.gsm var/lib/asterisk/sounds/conf-onlyperson.gsm var/lib/asterisk/sounds/conf-onlypersonleft.gsm var/lib/asterisk/sounds/conf-otherinparty.gsm var/lib/asterisk/sounds/conf-peopleinconf.gsm var/lib/asterisk/sounds/conf-placeintoconf.gsm +var/lib/asterisk/sounds/conf-roll-callcomplete.gsm var/lib/asterisk/sounds/conf-sysop.gsm var/lib/asterisk/sounds/conf-sysopreq.gsm var/lib/asterisk/sounds/conf-sysopreqcancelled.gsm @@ -863,6 +863,7 @@ var/lib/asterisk/sounds/denver.gsm var/lib/asterisk/sounds/department-administrator.gsm var/lib/asterisk/sounds/department.gsm var/lib/asterisk/sounds/deposit.gsm +var/lib/asterisk/sounds/descending-2tone.gsm var/lib/asterisk/sounds/design.gsm var/lib/asterisk/sounds/detroit.gsm var/lib/asterisk/sounds/development.gsm @@ -926,6 +927,7 @@ var/lib/asterisk/sounds/digits/9.gsm var/lib/asterisk/sounds/digits/90.gsm var/lib/asterisk/sounds/digits/a-m.gsm var/lib/asterisk/sounds/digits/at.gsm +var/lib/asterisk/sounds/digits/billion.gsm var/lib/asterisk/sounds/digits/day-0.gsm var/lib/asterisk/sounds/digits/day-1.gsm var/lib/asterisk/sounds/digits/day-2.gsm @@ -1054,11 +1056,21 @@ var/lib/asterisk/sounds/digits/h-20.gsm var/lib/asterisk/sounds/digits/h-3.gsm var/lib/asterisk/sounds/digits/h-30.gsm var/lib/asterisk/sounds/digits/h-4.gsm +var/lib/asterisk/sounds/digits/h-40.gsm var/lib/asterisk/sounds/digits/h-5.gsm +var/lib/asterisk/sounds/digits/h-50.gsm var/lib/asterisk/sounds/digits/h-6.gsm +var/lib/asterisk/sounds/digits/h-60.gsm var/lib/asterisk/sounds/digits/h-7.gsm +var/lib/asterisk/sounds/digits/h-70.gsm var/lib/asterisk/sounds/digits/h-8.gsm +var/lib/asterisk/sounds/digits/h-80.gsm var/lib/asterisk/sounds/digits/h-9.gsm +var/lib/asterisk/sounds/digits/h-90.gsm +var/lib/asterisk/sounds/digits/h-billion.gsm +var/lib/asterisk/sounds/digits/h-hundred.gsm +var/lib/asterisk/sounds/digits/h-million.gsm +var/lib/asterisk/sounds/digits/h-thousand.gsm var/lib/asterisk/sounds/digits/hundred.gsm var/lib/asterisk/sounds/digits/million.gsm var/lib/asterisk/sounds/digits/minus.gsm @@ -1128,6 +1140,7 @@ var/lib/asterisk/sounds/el-paso.gsm var/lib/asterisk/sounds/eleventh.gsm var/lib/asterisk/sounds/email.gsm var/lib/asterisk/sounds/emergency.gsm +var/lib/asterisk/sounds/en_AU var/lib/asterisk/sounds/enabled.gsm var/lib/asterisk/sounds/encode.gsm var/lib/asterisk/sounds/engineering.gsm @@ -1763,6 +1776,7 @@ var/lib/asterisk/sounds/pascal2.gsm var/lib/asterisk/sounds/patchy.gsm var/lib/asterisk/sounds/pbx-invalid.gsm var/lib/asterisk/sounds/pbx-invalidpark.gsm +var/lib/asterisk/sounds/pbx-parkingfailed.gsm var/lib/asterisk/sounds/pbx-transfer.gsm var/lib/asterisk/sounds/pence.gsm var/lib/asterisk/sounds/pennies.gsm @@ -1955,6 +1969,7 @@ var/lib/asterisk/sounds/quarter.gsm var/lib/asterisk/sounds/queue-callswaiting.gsm var/lib/asterisk/sounds/queue-holdtime.gsm var/lib/asterisk/sounds/queue-less-than.gsm +var/lib/asterisk/sounds/queue-minute.gsm var/lib/asterisk/sounds/queue-minutes.gsm var/lib/asterisk/sounds/queue-periodic-announce.gsm var/lib/asterisk/sounds/queue-quantity1.gsm diff --git a/config/rootfiles/packages/mediatomb b/config/rootfiles/packages/mediatomb index 5f08e91..fd72752 100644 --- a/config/rootfiles/packages/mediatomb +++ b/config/rootfiles/packages/mediatomb @@ -3,7 +3,6 @@ usr/bin/mediatomb #usr/share/mediatomb #usr/share/mediatomb/js usr/share/mediatomb/js/common.js -usr/share/mediatomb/js/import-dvd.js usr/share/mediatomb/js/import.js usr/share/mediatomb/js/playlists.js usr/share/mediatomb/mappings.xml diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba index 22346c2..0616b4b 100644 --- a/config/rootfiles/packages/samba +++ b/config/rootfiles/packages/samba @@ -171,6 +171,7 @@ usr/sbin/winbindd #usr/share/man/man8/umount.cifs.8 #usr/share/man/man8/vfs_acl_tdb.8 #usr/share/man/man8/vfs_acl_xattr.8 +#usr/share/man/man8/vfs_aio_fork.8 #usr/share/man/man8/vfs_audit.8 #usr/share/man/man8/vfs_cacheprime.8 #usr/share/man/man8/vfs_cap.8 diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 04edb25..e7e5aed 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2,8 +2,8 @@ %tr, 'Act as' => 'Agir en tant que :', -'Add Level7 rule' => 'Ajouter une règle Level7', -'Add Port Rule' => 'Ajouter une règle de port', +'Add Level7 rule' => 'Ajouter une règle de Niveau 7', +'Add Port Rule' => 'Ajouter une règle de Port', 'Add Rule' => 'Ajouter une règle', 'Add a route' => 'Ajouter une route', 'Async logging enabled' => 'Activer l\'écriture asynchrone du fichier syslog', @@ -27,13 +27,13 @@ 'ConnSched weekdays' => 'Jours de la semaine :', 'Edit an existing route' => 'Modifier une route existante', 'Enter TOS' => 'Activer ou désactiver TOS-Bits puis appuyez sur Enregistrer .', -'Existing Files' => 'Fichiers dans la base de donnée', +'Existing Files' => 'Fichiers dans la base de données', 'HDD temperature' => 'Température Disque Dur', -'Level7 Protocol' => 'Protocole Level7', -'Level7 Rule' => 'Règle Level7', -'Level7 rule' => 'Règle Level7', -'Local VPN IP' => 'Reseau Interne (Vert):', -'MTU' => 'Taille MTU:', +'Level7 Protocol' => 'Protocole de Niveau 7', +'Level7 Rule' => 'Règle de Niveau 7', +'Level7 rule' => 'Règle de Niveau 7', +'Local VPN IP' => 'Réseau Interne (Vert):', +'MTU' => 'Taille du MTU:', 'Number of IPs for the pie chart' => 'Nombre d\'IPs pour le graphique circulaire', 'Number of Ports for the pie chart' => 'Nombre de Ports pour le graphique circulaire', 'OVPN' => 'OVPN', @@ -41,30 +41,30 @@ 'Pages' => 'Pages', 'Ping' => 'Ping :', 'Port Rule' => 'Règle de Port', -'QoS not enabled' => 'QoS n\'est pas actif!', +'QoS not enabled' => 'La QoS n\'est pas active!', 'Queuelenght' => 'Taille de la file d\'attente ', -'Remote IP' => ' IP / Nom Hote Distant (DynDNS):', -'Remote VPN IP' => 'Sous réseau VPN (ex. 10.0.10.0/255.255.255.0):', +'Remote IP' => ' IP / Nom Hôte Distant (DynDNS):', +'Remote VPN IP' => 'Sous-réseau VPN (ex. 10.0.10.0/255.255.255.0):', 'Resolv' => 'Résoudre/Réessayer:', 'Scan for Files' => 'Recherche de fichiers', 'Scan from Directory' => 'Recherche depuis le répertoire', -'Set time on boot' => 'Forcer le réglage de l\'heure sytème au démarrage', -'Subclass' => 'Sous classe', +'Set time on boot' => 'Forcer le réglage de l\'heure système au démarrage', +'Subclass' => 'Sous-classe', 'TOS Bits' => 'Bits TOS', -'TOS Rule' => 'Régle TOS', +'TOS Rule' => 'Règle TOS', 'TOS rule' => 'Règle TOS', 'The class number does not match the specified interface.' => 'Le numéro de classe ne correspond pas à l\'interface spécifiée.', -'The destination IP address is invalid.' => 'L\'adresse IP de destination est non valide.', -'The source IP address is invalid.' => 'L\'adresse IP source est non valide.', +'The destination IP address is invalid.' => 'L\'adresse IP de destination n\'est pas valide.', +'The source IP address is invalid.' => 'L\'adresse IP source n\'est pas valide.', 'Utilization on' => 'Utilisation actif', 'Verbose' => 'Bavard:', -'WakeOnLan' => 'Réveil par le réseau', +'WakeOnLan' => 'Réveil via le réseau', 'a ca certificate with this name already exists' => 'Un certificat de CA avec ce nom existe déjà.', 'a connection with this common name already exists' => 'Une connexion avec ce nom commun existe déjà.', 'a connection with this name already exists' => 'Une connexion avec ce nom existe déjà.', 'abort' => 'annuler', 'access allowed' => 'Accès autorisé de:', -'access refused with this oinkcode' => 'Accès refusé avec ce Oink Code', +'access refused with this oinkcode' => 'Accès refusé avec ce code Oink', 'accounting' => 'Comptage', 'accounting user nonpdc' => 'Comptage - pas en mode contrôleur principal de domaine', 'accounting user pdc' => 'Comptage - mode contrôleur principal de domaine', @@ -79,17 +79,17 @@ 'add device' => 'Ajouter un périphérique', 'add network' => 'Ajouter un réseau', 'add new alias' => 'Ajouter un nouvel alias:', -'add new lease' => 'Ajouter un nouveaux bail', +'add new lease' => 'Ajouter un nouveau bail', 'add new ovpn' => 'Ajouter un OpenVPN:', -'add printer' => 'Ajouter imprimante', -'add service' => 'Ajouter service', -'add share' => 'Ajouter partage', -'add subclass' => 'Ajouter sous-classe', +'add printer' => 'Ajouter une imprimante', +'add service' => 'Ajouter un service', +'add share' => 'Ajouter un partage', +'add subclass' => 'Ajouter une sous-classe', 'add user' => 'Ajouter un utilisateur', 'add xtaccess' => 'Ajouter un accès externe', 'add-route' => 'Ajouter route supplémentaire', 'added from dhcp lease list' => 'Ajouter à partir de la liste de baux DHCP', -'admin user password has been changed' => 'Le mot de passe ADMIN a été changé.', +'admin user password has been changed' => 'Le mot de passe admin a été changé.', 'admin users' => 'Utilisateur avec droits super-utilisateur', 'administrator user password' => 'Mot de passe de l\'administrateur:', 'adsl settings' => 'Réglages ADSL', @@ -327,7 +327,7 @@ 'alcatelusb upload' => 'Charger le Firmware Speedtouch USB', 'alias ip' => 'Alias IP', 'aliases' => 'Alias', -'aliases not active' => 'Les Alias ne seront pas actif tant que votre interface ROUGE est en mode STATIQUE', +'aliases not active' => 'Les Alias ne seront pas actifs tant que votre interface ROUGE est en mode STATIQUE', 'all' => 'Tous', 'all interfaces' => 'Toutes les Interfaces', 'all services' => 'Tous les Services', @@ -358,38 +358,38 @@ 'available updates' => 'Mises à jour Disponible :', 'average' => 'Moyenne', 'avoid dod' => 'Ne pas utiliser cette option avec connexion à la demande! Principalement utilisée si votre IPFire se trouve derrière un routeur. Votre IP ROUGE doit être au coeur de l\'un des trois numéros de réseau réservés par exemple 10 / 8, 172.16/12, 192.168/16', -'back' => 'RETOUR', +'back' => 'Retour', 'backup' => 'Sauvegarde', 'backup archive' => 'Fichier Sauvegarde (.dat)', 'backup clear archive' => 'Clear Backup File (.gz)', 'backup config floppy' => 'Sauvegarder la Configuration - Lecteur de Disquette', 'backup configuration' => 'Configuration de la sauvegarde :', -'backup erase key' => 'Effacer la cle', -'backup explain key' => 'Les sauvegardes sont chiffrées à l\'aide d\'une clef. Afin d\'éviter toute manipulation illégale, IPFire restaure uniquement les sauvegardes chiffrées avec la clef spécifiée ici. Vous avez trois options à votre disposition : ', -'backup explain key li1' => 'laissez IPFire créer une clef pour vous.', -'backup explain key li2' => 'importez une clef suavegardée (possiblement protégée par un mot de passe).', -'backup explain key li3' => 'extraire une clef depuis une sauvegarde 1.4.10 non chiffrée.', -'backup explain key no1' => 'vous devriez sauver cette clef si vous planifier une installation de nouvelles machines , IPFire n\'accepte qu\'une seule création/import de clef.', -'backup explain key no2' => 'les sauvegardes sur disquettes ne sont pas concernées par cette clef.', -'backup export key' => 'Exporter la clef', -'backup extract key' => 'Extraire la clef', +'backup erase key' => 'Effacer la clé', +'backup explain key' => 'Les sauvegardes sont chiffrées à l\'aide d\'une clé. Afin d\'éviter toute manipulation illégale, IPFire restaure uniquement les sauvegardes chiffrées avec la clé spécifiée ici. Vous avez trois options à votre disposition : ', +'backup explain key li1' => 'Laissez IPFire créer une clé pour vous.', +'backup explain key li2' => 'Importez une clé sauvegardée (peut-être protégée par un mot de passe).', +'backup explain key li3' => 'Extraire une clé depuis une sauvegarde 1.4.10 non chiffrée.', +'backup explain key no1' => 'Vous devriez sauver cette clé si vous planifier une installation de nouvelles machines ; IPFire n\'accepte qu\'une seule création/importation de clé.', +'backup explain key no2' => 'Les sauvegardes sur disquettes ne sont pas concernées par cette clé.', +'backup export key' => 'Exporter la clé', +'backup extract key' => 'Exporter la clé', 'backup from' => 'Sauvegarder depuis', -'backup generate key' => 'Générer la clef', +'backup generate key' => 'Générer la clé', 'backup import dat file' => 'Importer un fichier de Sauvegarde (.dat)', -'backup import key' => 'Importer une clef', -'backup key' => 'Sauvegarder la clef de chiffrement', -'backup key file' => 'Sauvegarder le fichier clef', -'backup key info' => 'IPFire restreint l\'accès au clef sauvegardées, ainsi vous devez connaitre le mot de passe root. Vous avez la possibilité de protéger cette clef à l\'extérieur d\'IPFire à l\'aide d\'un mot de passe.', -'backup media info' => 'Les disquettes et les médias non partitionnés peuvent afficher des tailles de partitons erronées. Dans ce cas, séléctionnez le périphérique en question. Souvenez vous qu\'il faut monter le disque dur avant d\'éjecter un périphérique. Remarque : les disquettes crées ici ne sont pas utilisables avec l\'installeur d\'IPFire!', -'backup missing key' => 'A besoin de la clef de sauvegarde pour restaurer la configuration', +'backup import key' => 'Importer une clé', +'backup key' => 'Sauvegarder la clé de chiffrement', +'backup key file' => 'Sauvegarder le fichier clé', +'backup key info' => 'IPFire restreint l\'accès aux clés sauvegardées, par conséquent vous devez connaitre le mot de passe root. Vous avez la possibilité de protéger cette clé à l\'extérieur d\'IPFire à l\'aide d\'un mot de passe.', +'backup media info' => 'Les disquettes et les supports non partitionnés peuvent afficher des tailles de partitions erronées. Dans ce cas, séléctionnez le périphérique en question. Souvenez vous qu\'il faut monter le disque dur avant d\'éjecter un périphérique. Remarque : les disquettes crées ici ne sont pas utilisables avec l\'installeur d\'IPFire!', +'backup missing key' => 'La clé de sauvegarde est nécessaire pour restaurer la configuration', 'backup password' => 'Mot de passe de sauvegarde', -'backup protect key password' => 'Sauvegarde du mot de passe de la clef', +'backup protect key password' => 'Sauvegarde du mot de passe de la clé', 'backup sets' => 'Configuration des sauvegardes', 'backup to floppy' => 'Sauvegarder sur disquettes', 'backupaddon' => 'Sauvegarde additionnelle', 'backupprofile' => 'Au cas ou la reconnexion échourrait, changez de profil', 'backups' => 'sauvegardes', -'backupwarning' => 'Veuillez restaurer votre sauvegarde principale et ensuite vos sauvegardes additionnelles. Veuillez garder le nom de fichier fournit lors du téléchargement.', +'backupwarning' => 'Veuillez restaurer votre sauvegarde principale et ensuite vos sauvegardes additionnelles. Veuillez conserver le nom de fichier fournit lors du téléchargement.', 'bad characters in' => 'Mauvais caractères dans ', 'bad characters in script field' => 'Mauvais caractères dans le champ de script', 'bad characters in the telephone number field' => 'Mauvais caractères dans le champ du numéro de téléphone', @@ -398,7 +398,7 @@ 'bad return code' => 'Le programme d\'aide retourne un code d\'erreur', 'bad source range' => 'La fourchette des ports sources à une première valeur supérieure ou égale à la deuxième valeur.', 'bandwidth usage' => 'utilisation de la bande passante (externe)', -'bandwitherror' => 'Vous ne pouvez pas changer les réglages de la bande passante tant que le Qos est activé. Désactivez d\'abord le Qos.', +'bandwitherror' => 'Vous ne pouvez pas changer les réglages de la bande passante tant que la Qos est activée. Désactivez d\'abord la Qos.', 'bandwithsettings' => 'Réglages de la bande passante', 'basic options' => 'Options de base', 'beep when ppp connects or disconnects' => 'Bipper quand IPFire se connecte ou se déconnecte', @@ -407,9 +407,9 @@ 'bewan adsl usb' => 'A SUPPRIMER', 'bitrate' => 'Echantillonage', 'bleeding rules' => 'Bleeding Edge règles de Snort', -'blue' => 'BLEU', +'blue' => 'Bleu', 'blue access' => 'Accès Bleu', -'blue access use hint' => 'Vous devez entrer l\'adresse IP ou MAC de votre périphérique. Vous pouvez également rentrer les deux', +'blue access use hint' => 'Vous devez saisir l\'adresse IP ou MAC de votre périphérique. Vous pouvez également saisir les deux', 'blue interface' => 'Interface Bleu', 'broadcast' => 'Diffusion', 'broken pipe' => 'Tuyau cassé', @@ -492,8 +492,8 @@ 'clear cache' => 'Vider le Cache', 'clear playlist' => 'Liste de lecture vide', 'clenabled' => 'Fournir du temps au réseau local', -'click to disable' => 'Activé (cliquez pour désactivé)', -'click to enable' => 'Désactivé (cliquez to activé)', +'click to disable' => 'Activé (cliquer pour désactiver)', +'click to enable' => 'Désactivé (cliquer pour activer)', 'client' => 'Nom de la Station (ordinateur)', 'clock has not been synchronized' => 'L\'horloge n\'est pas synchronisée', 'clock last synchronized at' => 'L\'horloge a été synchronisée à :', @@ -505,39 +505,39 @@ 'computer to modem rate' => 'Taux de l\'ordinateur au modem :', 'concentrator name' => 'Nom de concentrateur :', 'confirmation' => 'confirmation', -'connect' => 'OVPN Démarrage / Connection', -'connect the modem' => 'Connection au modem', +'connect' => 'OVPN Démarrage / Connexion', +'connect the modem' => 'Connexion au modem', 'connect timeout' => 'Temps de connexion dépassé :', 'connected' => 'Connecté', -'connecting' => 'Connection en cours...', +'connecting' => 'Connexion en cours...', 'connection' => 'Connection', 'connection closed' => 'Non connecté...', -'connection debugging' => 'Déboggage de la connection', -'connection status and controlc' => 'Etat et contrôle de connection :', +'connection debugging' => 'Déboggage de la connexion', +'connection status and controlc' => 'Etat et contrôle de connexion :', 'connection tracking' => 'Surveillance des connexions IPTables', -'connection type' => 'Type de Connection', +'connection type' => 'Type de Connexion', 'connection type is invalid' => 'Le type de connexion est non valide.', -'connections' => 'Connections', +'connections' => 'Connexions', 'connections are associated with this ca. deleting the ca will delete these connections as well.' => 'Les connexions sont associées avec cette CA. La suppression de cette CA entraînera la suppression des connexions associées.', 'connscheduler' => 'Planificateur de connexion', 'core notice 1' => 'Remarque: Il y a une mise à jour de', 'core notice 2' => 'pour', 'core notice 3' => 'disponible.', -'could not be opened' => 'ne peut pas etre ouvert', +'could not be opened' => 'ne peut pas être ouvert', 'could not connect to' => 'Impossible de se connecter à', 'could not connect to www ipcop org' => 'Impossible de se connecter à www.ipcop.org', 'could not connect to www ipfire org' => 'Impossible de se connecter à www.ipfire.org', 'could not create directory' => 'Impossible de créer le répertoire.', -'could not download latest patch list' => 'Ne peut pas télécharger la dernière liste de patchs (non connecté).', +'could not download latest patch list' => 'Ne peut pas télécharger la dernière liste de correctifs (non connecté).', 'could not download latest updates' => 'Impossible de télécharger les dernières mises à jour.', 'could not download the available updates list' => 'Impossible de télécharger la liste des mises à jour disponible.', -'could not open available updates file' => 'Impossible d\'ouvrir le fichier de mises à jour disponible.', -'could not open installed updates file' => 'Impossible d\'ouvrir le fichier de mises à jour installé', +'could not open available updates file' => 'Impossible d\'ouvrir le fichier des mises à jour disponibles.', +'could not open installed updates file' => 'Impossible d\'ouvrir le fichier des mises à jour installées', 'could not open update information file' => 'Impossible d\'ouvrir le fichier d\'information de mise à jour. Le fichier est corrompu.', 'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.', 'country' => 'Pays', 'cpu frequency per' => 'CPU fréquence par', -'cpu idle usage' => 'Pourcentage d\'inactivite CPU', +'cpu idle usage' => 'Pourcentage d\'inactivité CPU', 'cpu interrupt usage' => 'Utilisation des interruptions CPU', 'cpu iowait usage' => 'Le COU attend des IO', 'cpu irq usage' => 'Utilisation CPU IRQ', @@ -614,7 +614,7 @@ 'destination port overlaps' => 'La plage de ports de destination se superpose à une plage existante.', 'detail level' => 'Niveau du Détail', 'device' => 'Périphérique', -'devices on blue' => 'Périphériques en Bleu', +'devices on blue' => 'Périphériques sur Bleu', 'dhcp advopt add' => 'Ajouter une option DHCP', 'dhcp advopt added' => 'Option DHCP ajoutée', 'dhcp advopt blank value' => 'La valeur de l\'option DHCP ne peut pas être vide.', @@ -1082,8 +1082,8 @@ 'log lines per page' => 'Lignes par page', 'log server address' => 'Serveur Syslog', 'log settings' => 'Réglages des rapports', -'log summaries' => 'Compte-rendus des rapports', -'log summary' => 'Compte-rendu du rapport', +'log summaries' => 'Rapports de synthèse', +'log summary' => 'Rapport de synthèse', 'log var messages' => 'Paramètres des /var/log/messages', 'log view' => 'Vue du rapport', 'log viewer' => 'Visualisateur du rapport', @@ -1191,7 +1191,7 @@ 'monday' => 'Lundi', 'month' => 'Mois', 'month-graph' => 'Mois', -'monthly firewallhits' => 'Attaques mensuelle du pare-feu', +'monthly firewallhits' => 'Attaques mensuelles du pare-feu', 'monthly start day bad' => 'Le jour de début du mois est incorrect', 'monthly traffic bad' => 'Le trafic mensuel est incorrect', 'monthly volume' => 'Traffic mensuel', @@ -1245,7 +1245,7 @@ 'networks settings' => 'Réglages Pare-feu - Réseau', 'new optionsfw later' => 'Vos modifications seront actives au prochain redémarrage', 'new optionsfw must boot' => 'Vous devez redémarrer IPFire', -'newer' => 'Jamais', +'newer' => 'Récents', 'next' => 'suivant', 'no' => 'Non', 'no alcatelusb firmware' => 'aucun firmware Alcatel USB. Veuillez le charger.', @@ -1270,7 +1270,7 @@ 'notes' => 'Notes', 'november' => 'Novembre', 'ntp configuration' => 'Configuration NTP', -'ntp must be enabled to have clients' => 'Le NTP doit être activé pour avoir des clients.', +'ntp must be enabled to have clients' => 'NTP doit être activé pour avoir des clients.', 'ntp server' => 'Serveur NTP', 'ntp syncro disabled' => 'Synchronisation NTP désactivée', 'ntp syncro enabled' => 'Synchronisation NTP activée', @@ -1280,8 +1280,8 @@ 'o-yes' => 'Actif', 'october' => 'Octobre', 'off' => 'off', -'ok' => 'OK', -'older' => 'Vieux', +'ok' => 'Ok', +'older' => 'Anciens', 'on' => 'sur', 'online help en' => 'Aide en ligne (en Français)', 'only digits allowed in holdoff field' => 'Seuls les chiffres sont autorisés dans le champ holdoff', @@ -1723,7 +1723,7 @@ 'tone dial' => 'DTMF :', 'too long 80 char max' => ' est trop long, le maximum autorisé est de 80 caractères', 'total connection time' => 'Temps total de connexion', -'total hits for log section' => 'Nombre de clics total pour la section connexion', +'total hits for log section' => 'Nombre d\'occurrences pour la section', 'traffic back' => 'Retour', 'traffic calc time' => 'Temps de calcul', 'traffic calc time bad' => 'Le temps de calcul n\'est pas correct', @@ -2022,7 +2022,7 @@ 'urlfilter src error' => 'Source ne peut être vide', 'urlfilter sun' => 'Dim', 'urlfilter sunday' => 'Dimanche', -'urlfilter tar error' => 'Impossible d\'extraire les fichiers depuis archive tar', +'urlfilter tar error' => 'Impossible d\'extraire les fichiers depuis l\'archive tar', 'urlfilter thu' => 'Jeu', 'urlfilter thursday' => 'Jeudi', 'urlfilter time' => 'Temps', @@ -2034,7 +2034,7 @@ 'urlfilter tue' => 'Mar', 'urlfilter tuesday' => 'Mardi', 'urlfilter unfiltered clients' => 'Adresses IP non filtrées', -'urlfilter update information' => 'Une mise à jour est diponible au téléchargement. Visitez <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> pour plus d\'informations.', +'urlfilter update information' => 'Une mise à jour est disponible en téléchargement. Visitez <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> pour plus d\'informations.', 'urlfilter update notification' => 'Mise à jour !', 'urlfilter update now' => 'Mettre à jour', 'urlfilter update results' => 'Blacklist update results', @@ -2096,7 +2096,7 @@ 'vpi number' => 'Nombre VPI:', 'vpn' => 'VPN', 'vpn aggrmode' => 'Mode agressif IKE autorisé. Eviter si possible (la clé pré-partagée est transmise en clair) !', -'vpn altname syntax' => 'SubjectAltName est une liste séparée par des virgules d\'email, dns, uri, les objets du RID et de la propriété intellectuelle. E-mail: une adresse e-mail. Email Syntaxe: copie prend le champ email du certificat à être utilisé. DNS: un nom de domaine valide. URI: tout URI valide. RID: identificateur d\'objet enregistré. IP: une adresse IP. Remarque: jeu de caractères est limité et le cas est significatif. Exemple: e-mail: ipcop(a)foo.org , email: copier, DNS: www.ipcop.org , IP: 127.0.0.1 , URI: http://url/to / quelque chose', +'vpn altname syntax' => 'SubjectAltName est une liste séparée par des virgules d\'email, DNS, URI, RID et de les objets du IP. Email: une adresse d\'email. Email Syntaxe: copie prend le champ email du certificat à être utilisé. DNS: un nom de domaine valide. URI: tout URI valide. RID: identificateur d\'objet enregistré. IP: une adresse IP. Remarque: jeu de caractères est limité et le cas est significatif. Exemple: email:info(a)ipfire.org, email:copier,DNS:www.ipfire.org,IP:127.0.0.1,URI:http://url/quelque/chose', 'vpn auth-dn' => 'Le pair est identifié par soit IPV4_ADDR, FQDN, USER_FQDN ou la chaine DER_ASN1_DN dans le champ Remote ID', 'vpn configuration main' => 'VPN configuration - Principal', 'vpn delayed start' => 'Délai avant le lancement du VPN (seconds)', @@ -2117,7 +2117,7 @@ 'vpn watch' => 'Redémarrer net-to-net VPN si IP hôte distant change (dyndns).', 'waiting to synchronize clock' => 'Attendre la synchronisation de l\'horloge', 'warn when traffic reaches' => 'Avertir lorsque le trafic atteint x %', -'warning messages' => 'Messages d\Alerte', +'warning messages' => 'Messages d\'Alerte', 'was deleted' => 'a été effacé', 'web hits' => 'Nombre total de sites correspondant à des critères retenus pour', 'web proxy' => 'Proxy web', diff --git a/lfs/asterisk b/lfs/asterisk index 6b8d449..7f9c53b 100644 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -24,7 +24,7 @@ include Config -VER = 1.4.28 +VER = 1.4.42 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 5 +PAK_VER = 6 CHAN_CAPI = chan_capi-1.1.4 @@ -44,29 +44,26 @@ DEPS = "libpri libtiff libvorbis libogg spandsp netsnmpd" objects = $(DL_FILE) \ asterisk-1.4-de-prompts.tar.gz \ - asterisk-core-sounds-en-gsm-1.4.16.tar.gz \ - asterisk-extra-sounds-en-gsm-1.4.9.tar.gz \ - asterisk-moh-opsound-gsm.tar.gz \ - asterisk-addons-1.4.9.tar.gz \ - agx-ast-addons-svn65.tgz \ + asterisk-core-sounds-en-gsm-1.4.22.tar.gz \ + asterisk-extra-sounds-en-gsm-1.4.11.tar.gz \ + asterisk-moh-opsound-gsm-2.03.tar.gz \ + asterisk-addons-1.4.13.tar.gz \ $(CHAN_CAPI).tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -asterisk-core-sounds-en-gsm-1.4.16.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-gsm-1.4.16.tar.gz -asterisk-extra-sounds-en-gsm-1.4.9.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.9.tar.gz -asterisk-moh-opsound-gsm.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm.tar.gz +asterisk-core-sounds-en-gsm-1.4.22.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz +asterisk-extra-sounds-en-gsm-1.4.11.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz +asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz -asterisk-addons-1.4.9.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.9.tar.gz -agx-ast-addons-svn65.tgz = $(URL_IPFIRE)/agx-ast-addons-svn65.tgz +asterisk-addons-1.4.13.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.13.tar.gz $(CHAN_CAPI).tar.gz = $(URL_IPFIRE)/$(CHAN_CAPI).tar.gz -$(DL_FILE)_MD5 = e8006ce319e18ce07ce1335ad583330a -asterisk-core-sounds-en-gsm-1.4.16.tar.gz_MD5 = 87145c1775141613d1471864dae12bdd -asterisk-extra-sounds-en-gsm-1.4.9.tar.gz_MD5 = ffa11b9d0128735425c43b9ce445dedf -asterisk-moh-opsound-gsm.tar.gz_MD5 = 1fa8246f532a08ecc359f5e428bd7f60 +$(DL_FILE)_MD5 = 332f2f67e0eefe84b1e55320eab45166 +asterisk-core-sounds-en-gsm-1.4.22.tar.gz_MD5 = 2a99a45c0675135255bc65796b12f7c6 +asterisk-extra-sounds-en-gsm-1.4.11.tar.gz_MD5 = 5479cb4cb81d678304d96f35e4933a11 +asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c -asterisk-addons-1.4.9.tar.gz_MD5 = 0c0ddf2386a9541e416e122ca082e611 -agx-ast-addons-svn65.tgz_MD5 = 9372d818cc68337658110f793d0fd8e0 +asterisk-addons-1.4.13.tar.gz_MD5 = e59471b6f25901a82e45b9e5e0c73703 $(CHAN_CAPI).tar.gz_MD5 = 18fa835e724b7814deafbfa5b8cb01eb install : $(TARGET) @@ -110,9 +107,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts menuselect.makeopts # add additional sounds - cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-gsm-1.4.16.tar.gz $(DIR_APP)/sounds/ - cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.9.tar.gz $(DIR_APP)/sounds/ - cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm.tar.gz $(DIR_APP)/sounds/ + cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz $(DIR_APP)/sounds/ + cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz $(DIR_APP)/sounds/ + cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/ + + # Fix wrong cpu optimization (march=armv5tel) + cd $(DIR_APP) && sed -i -e "s|^PROC=armv5te.*|PROC=armv5te|g" makeopts + + # Add armv5te to gsm codecs + cd $(DIR_APP) && sed -i -e "s|armv5b |*armv5te |g" codecs/gsm/Makefile # compile and install cd $(DIR_APP) && make $(MAKETUNING) all @@ -120,7 +123,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make samples # extract and configure asterisk-addons - cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.9.tar.gz + cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.13.tar.gz cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr --sysconfdir=/var/ipfire # enable additional features (--> NOT NEEDED, DEFAULT CONFIG INCLUDES ALL) #cd $(DIR_SRC)/asterisk-addons-* && cp -f $(DIR_SRC)/config/asterisk/addons.makeopts menuselect.makeopts @@ -149,16 +152,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/$(CHAN_CAPI) && make install @rm -rf $(DIR_SRC)/$(CHAN_CAPI) - # build FAX stuff (TODO: get newer version... where to download source?) - cd $(DIR_SRC) && tar zxf $(DIR_DL)/agx-ast-addons-svn65.tgz - # bugfix: disable app_confcall (not supported with dahdi, but we can take meetme) - cd $(DIR_SRC)/agx-ast-addons && echo "project (agx-ast-addons-zaptel)" > ./app-dahdi/CMakeLists.txt - cd $(DIR_SRC)/agx-ast-addons && echo >> ./app-dahdi/CMakeLists.txt - # end bugfix - cd $(DIR_SRC)/agx-ast-addons && ./configure.sh - cd $(DIR_SRC)/agx-ast-addons && ./build.sh - @rm -rf $(DIR_SRC)/agx-ast-addons - # be sure all source is removed @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* diff --git a/lfs/guardian b/lfs/guardian index 251a56f..fea50db 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -30,7 +30,7 @@ THISAPP = guardian-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 7 +PAK_VER = 8 DEPS = "" diff --git a/lfs/mediatomb b/lfs/mediatomb index b327d72..2bfde66 100644 --- a/lfs/mediatomb +++ b/lfs/mediatomb @@ -24,15 +24,15 @@ include Config -VER = svn2020 +VER = 0.12.1 THISAPP = mediatomb-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mediatomb -PAK_VER = 3 +PAK_VER = 4 DEPS = "sqlite taglib ffmpeg-libs" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7fb4ef41da88f82eb1d0acb160104874 +$(DL_FILE)_MD5 = e927dd5dc52d3cfcebd8ca1af6f0d3c2 install : $(TARGET) @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/lfs/samba b/lfs/samba index bd2c32a..f31aac2 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.5.11 +VER = 3.5.12 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 36 +PAK_VER = 37 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 81bbd16048c6ca40baea8c59126ee385 +$(DL_FILE)_MD5 = b1b8c6238a5524d001b8518d2b999993 install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index a29109f..6b71f0d 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.15 +VER = 3.1.16 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 73d47363ddccc400bc0fb2f814c63a92 +$(DL_FILE)_MD5 = 675aef4411d41f5b55b15a29ad6e5261 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6ee77762b57341c8e6e55fe114b1639495e86d1b
by git＠ipfire.org 04 Nov '11

04 Nov '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, next has been updated via 6ee77762b57341c8e6e55fe114b1639495e86d1b (commit) from eb5b3f95274ede9058dfd81401f7d3aa602a343d (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 6ee77762b57341c8e6e55fe114b1639495e86d1b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Nov 4 12:29:28 2011 +0100 samba: update to 3.5.12. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/samba | 1 + lfs/samba | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba index 22346c2..0616b4b 100644 --- a/config/rootfiles/packages/samba +++ b/config/rootfiles/packages/samba @@ -171,6 +171,7 @@ usr/sbin/winbindd #usr/share/man/man8/umount.cifs.8 #usr/share/man/man8/vfs_acl_tdb.8 #usr/share/man/man8/vfs_acl_xattr.8 +#usr/share/man/man8/vfs_aio_fork.8 #usr/share/man/man8/vfs_audit.8 #usr/share/man/man8/vfs_cacheprime.8 #usr/share/man/man8/vfs_cap.8 diff --git a/lfs/samba b/lfs/samba index bd2c32a..f31aac2 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.5.11 +VER = 3.5.12 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 36 +PAK_VER = 37 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 81bbd16048c6ca40baea8c59126ee385 +$(DL_FILE)_MD5 = b1b8c6238a5524d001b8518d2b999993 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. df4ac56499194c0fe513ab746a62368e69ad7657
by git＠ipfire.org 03 Nov '11

03 Nov '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 df4ac56499194c0fe513ab746a62368e69ad7657 (commit) via ae18a4716f7d10391df592702915341623726e8d (commit) via cbaf2df91975cc6390ca0c61dac4e8c6b1042b41 (commit) via c79cbaa6cb20bed081e8a268378107318367fe19 (commit) via fb3daed39106ed3927f2558cf32487bcfb373aed (commit) from f45434a7d1f2b3f5de355871b0d6f273301ccfef (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 df4ac56499194c0fe513ab746a62368e69ad7657 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 00:27:59 2011 +0100 gettext: Don't ship bundled version of libcroco. commit ae18a4716f7d10391df592702915341623726e8d Merge: cbaf2df f45434a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 00:27:41 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit cbaf2df91975cc6390ca0c61dac4e8c6b1042b41 Merge: c79cbaa 6c6fef3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 00:07:22 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit c79cbaa6cb20bed081e8a268378107318367fe19 Merge: 15bf90d fb3daed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 00:06:14 2011 +0100 Merge remote-tracking branch 'maniacikarus/ids' commit fb3daed39106ed3927f2558cf32487bcfb373aed Author: Christian Schmidt <christian.schmidt(a)iipfire.org> Date: Wed Nov 2 18:38:32 2011 +0000 suricata: Added missing log directory fixes #277 ----------------------------------------------------------------------- Summary of changes: gettext/gettext.nm | 3 ++- suricata/suricata.nm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) Difference in files: diff --git a/gettext/gettext.nm b/gettext/gettext.nm index 0f13892..0732fdf 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -5,7 +5,7 @@ name = gettext version = 0.18.1.1 -release = 2 +release = 3 groups = System/Base url = http://www.gnu.org/software/gettext/ @@ -30,6 +30,7 @@ source_dl = http://ftp.gnu.org/pub/gnu/gettext/ build requires bison + libcroco-devel libxml2-devel end diff --git a/suricata/suricata.nm b/suricata/suricata.nm index c676d0c..5de62ef 100644 --- a/suricata/suricata.nm +++ b/suricata/suricata.nm @@ -5,7 +5,7 @@ name = suricata version = 1.1beta3 -release = 4 +release = 5 groups = Networking/IDS url = http://www.openinfosecfoundation.org/ @@ -44,6 +44,7 @@ build mkdir -pv %{BUILDROOT}/etc/suricata mkdir -pv %{BUILDROOT}/etc/suricata/rules cp -vf %{DIR_SOURCE}/%{name}.conf %{BUILDROOT}/etc/suricata + mkdir -pv %{BUILDROOT}/var/log/suricata end end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f45434a7d1f2b3f5de355871b0d6f273301ccfef
by git＠ipfire.org 03 Nov '11

03 Nov '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 f45434a7d1f2b3f5de355871b0d6f273301ccfef (commit) from 6c6fef3245ad5129939e6e68e16a81da1230df62 (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 f45434a7d1f2b3f5de355871b0d6f273301ccfef Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 00:26:41 2011 +0100 binutils: Move libs to main package. Some applications link against these and we don't want the -devel package to be around then. ----------------------------------------------------------------------- Summary of changes: binutils/binutils.nm | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) Difference in files: diff --git a/binutils/binutils.nm b/binutils/binutils.nm index 75158ec..82b8137 100644 --- a/binutils/binutils.nm +++ b/binutils/binutils.nm @@ -5,7 +5,7 @@ name = binutils version = 2.21.51.0.8 -release = 3 +release = 4 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Tools @@ -83,5 +83,13 @@ packages package %{name}-devel template DEVEL + + # Don't package libbfd and libopcodes in the -devel package. + files + /usr/include + /usr/lib/*.a + /usr/lib/libbfd.so + /usr/lib/libopcodes.so + end end end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6c6fef3245ad5129939e6e68e16a81da1230df62
by git＠ipfire.org 03 Nov '11

03 Nov '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 6c6fef3245ad5129939e6e68e16a81da1230df62 (commit) via d8b4c3fa3c5e56aabdc9903b1af56d3a35aa5758 (commit) via 893093d3bd2f19fa7c19f985b3afc27ef23cecda (commit) via 8735596f9b60f5bb5c3291dc64759e7c0f534b15 (commit) via c112dc71a456cd4ee88c4860bf3363d376d0ce28 (commit) via 9d7544babba6f6153707b52dbe76a9c5334204b9 (commit) from 15bf90daae2981cbebc043dfe630c4e05f87035f (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 6c6fef3245ad5129939e6e68e16a81da1230df62 Merge: d8b4c3f 893093d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 4 00:00:01 2011 +0100 Merge remote-tracking branch 'stevee/image-magick' commit d8b4c3fa3c5e56aabdc9903b1af56d3a35aa5758 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 3 23:49:59 2011 +0100 libpng: Update to 1.5.6. commit 893093d3bd2f19fa7c19f985b3afc27ef23cecda Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Nov 3 22:13:02 2011 +0100 ImageMagick: New package. commit 8735596f9b60f5bb5c3291dc64759e7c0f534b15 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Nov 3 22:12:35 2011 +0100 librsvg2: New package. commit c112dc71a456cd4ee88c4860bf3363d376d0ce28 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Nov 3 22:11:49 2011 +0100 gdk-pixbuf2: New package. gdk-pixfub2 is a dependency of librsvg2. commit 9d7544babba6f6153707b52dbe76a9c5334204b9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Nov 3 22:10:58 2011 +0100 libcroco: New package. libcroco is a dependency of librsvg2. ----------------------------------------------------------------------- Summary of changes: ImageMagick/ImageMagick.nm | 49 ++++++++++++++++++++++++++ pango/pango.nm => gdk-pixbuf2/gdk-pixbuf2.nm | 32 +++++++--------- eggdbus/eggdbus.nm => libcroco/libcroco.nm | 22 ++++++------ libpng/libpng.nm | 7 ++-- pango/pango.nm => librsvg2/librsvg2.nm | 33 ++++++++--------- 5 files changed, 92 insertions(+), 51 deletions(-) create mode 100644 ImageMagick/ImageMagick.nm copy pango/pango.nm => gdk-pixbuf2/gdk-pixbuf2.nm (58%) copy eggdbus/eggdbus.nm => libcroco/libcroco.nm (68%) copy pango/pango.nm => librsvg2/librsvg2.nm (60%) Difference in files: diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm new file mode 100644 index 0000000..dc5ecff --- /dev/null +++ b/ImageMagick/ImageMagick.nm @@ -0,0 +1,49 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = ImageMagick +version = 6.7.3 +release = 1 +patchlevel = 3 + +groups = Application/Multimedia +url = http://www.imagemagick.org/ +license = ImageMagick +summary = Command line programm to create and convert several image formats. + +description + ImageMagick also includes command line programs for creating + animated or transparent .gifs, creating composite images, creating + thumbnail images, and more. +end + +thisapp = %{name}-%{version}-%{patchlevel} + +source_dl = ftp://ftp.ImageMagick.org/pub/%{name}/ +sources = %{thisapp}.tar.xz + +build + requires + libjpeg-devel + libpng-devel + librsvg2-devel + libtiff-devel + libxml2-devel + end + + configure_options += \ + --sysconfdir=/etc \ + --enable-shared \ + --disable-static \ + --with-threads +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end +end diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm new file mode 100644 index 0000000..35172b7 --- /dev/null +++ b/gdk-pixbuf2/gdk-pixbuf2.nm @@ -0,0 +1,45 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = gdk-pixbuf2 +version = 2.24.0 +major_ver = 2.24 +release = 1 + +groups = System/Libraries +url = http://www.gtk.org/ +license = LGPLv2+ +summary = An image loading library. + +description + gdk-pixbuf is an image loading library that can be extended by loadable + modules for new image formats. +end + +thisapp = gdk-pixbuf-%{version} + +source_dl = http://download.gnome.org/sources/gdk-pixbuf/%{major_ver}/ +sources = %{thisapp}.tar.xz + +build + requires + glib2-devel + libpng-devel + libjpeg-devel + libtiff-devel + end + + configure_options += \ + --disable-rpath +end + +packages + package %{name} + end + + package %{name}-devel + template DEVEL + end +end diff --git a/libcroco/libcroco.nm b/libcroco/libcroco.nm new file mode 100644 index 0000000..4b775ba --- /dev/null +++ b/libcroco/libcroco.nm @@ -0,0 +1,41 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libcroco +version = 0.6.2 +major_ver = 0.6 +release = 1 + +groups = System/Libraries +url = +license = LGPLv2+ +summary = A CSS2 parsing library. + +description + libcroco is a CSS2 parsing and manipulation library. +end + +source_dl = http://download.gnome.org/sources/%{name}/%{major_ver}/ + +build + requires + glib2-devel + libxml2-devel + end + + configure_options += \ + --disable-static + test + make check + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end +end diff --git a/libpng/libpng.nm b/libpng/libpng.nm index 3b1ded2..31fdf84 100644 --- a/libpng/libpng.nm +++ b/libpng/libpng.nm @@ -4,7 +4,7 @@ ############################################################################### name = libpng -version = 1.5.4 +version = 1.5.6 release = 1 groups = System/Libraries @@ -20,7 +20,7 @@ description data compression algorithm. end -source_dl = +source_dl = http://downloads.sourceforge.net/project/libpng/libpng15/%{version}/ sources = %{thisapp}.tar.xz build @@ -32,8 +32,7 @@ end packages package %{name} - end - + package %{name}-devel template DEVEL diff --git a/librsvg2/librsvg2.nm b/librsvg2/librsvg2.nm new file mode 100644 index 0000000..92f6ea5 --- /dev/null +++ b/librsvg2/librsvg2.nm @@ -0,0 +1,46 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = librsvg2 +version = 2.34.1 +major_ver = 2.34 +release = 1 + +groups = System/Libraries +url = +license = LGPLv2+ +summary = A SVG library based on cairo. + +description + librsvg is a SVG library based on cairo. +end + +thisapp = librsvg-%{version} + +source_dl = http://download.gnome.org/sources/librsvg/%{major_ver}/ +sources = %{thisapp}.tar.xz + +build + requires + cairo-devel + gdk-pixbuf2-devel + glib2-devel + libcroco-devel + libxml2-devel + pango-devel + end + + configure_options += \ + --disable-static \ + --disable-gtk-theme +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end +end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 15bf90daae2981cbebc043dfe630c4e05f87035f
by git＠ipfire.org 03 Nov '11

03 Nov '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 15bf90daae2981cbebc043dfe630c4e05f87035f (commit) via 37d94d170783eadb6be37c39cce148527cd6c01c (commit) via 84f3809e6e13d93286911e2a142739472d9a0900 (commit) from 127d581f30c1e2d6f0e0f69161015021a3b1c387 (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 15bf90daae2981cbebc043dfe630c4e05f87035f Merge: 84f3809 37d94d1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 3 23:11:59 2011 +0100 Merge remote-tracking branch 'stevee/tcl-testsuite' commit 37d94d170783eadb6be37c39cce148527cd6c01c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Nov 3 20:21:15 2011 +0100 tcl: Remove remote tests from testsuite. Also remove unixInit-1.1 this test fails on a non supported command. Fixes #261 commit 84f3809e6e13d93286911e2a142739472d9a0900 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Nov 2 21:45:40 2011 +0100 icecream: Add service files, create logfiles. Fixes #266 ----------------------------------------------------------------------- Summary of changes: icecream/icecream.nm | 31 +++++++++++++++++++++++++++-- icecream/systemd/icecc-scheduler.service | 10 +++++++++ icecream/systemd/iceccd.service | 10 +++++++++ tcl/tcl.nm | 7 ++++- 4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 icecream/systemd/icecc-scheduler.service create mode 100644 icecream/systemd/iceccd.service Difference in files: diff --git a/icecream/icecream.nm b/icecream/icecream.nm index dad6c99..be1ee15 100644 --- a/icecream/icecream.nm +++ b/icecream/icecream.nm @@ -3,11 +3,9 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -# XXX initscripts for daemons are missing - name = icecream version = 0.9.7 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers @@ -77,6 +75,10 @@ build rm -rvf %{BUILDROOT}/usr/bin/cc rm -rvf %{BUILDROOT}/usr/bin/g++ rm -rvf %{BUILDROOT}/usr/bin/gcc + + # Create Logfiles. + mkdir -pv %{BUILDROOT}/var/log + touch %{BUILDROOT}/var/log/icecc{d,-scheduler}.log end end @@ -86,6 +88,29 @@ packages gcc-c++ /usr/bin/ldd end + + prerequires += systemd-units + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable iceccd.service \ + icecc-scheduler.service >/dev/null 2>&1 || : + /bin/systemctl stop iceccd.service \ + icecc-scheduler.service >/dev/null 2>&1 || : + end + + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart iceccd.service \ + icecc-scheduler.service >/dev/null 2>&1 || : + end end package %{name}-devel diff --git a/icecream/systemd/icecc-scheduler.service b/icecream/systemd/icecc-scheduler.service new file mode 100644 index 0000000..38a1402 --- /dev/null +++ b/icecream/systemd/icecc-scheduler.service @@ -0,0 +1,10 @@ +[Unit] +Description=Icecream job scheduler +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/icecc-scheduler -vvv -d -p 8765 -l /var/log/icecc-scheduler.log + +[Install] +WantedBy=multi-user.target diff --git a/icecream/systemd/iceccd.service b/icecream/systemd/iceccd.service new file mode 100644 index 0000000..aab8d30 --- /dev/null +++ b/icecream/systemd/iceccd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Icecream daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/iceccd -vvv -d -s localhost -m 2 -l /var/log/iceccd.log + +[Install] +WantedBy=multi-user.target diff --git a/tcl/tcl.nm b/tcl/tcl.nm index 7b941f2..528b3db 100644 --- a/tcl/tcl.nm +++ b/tcl/tcl.nm @@ -5,7 +5,7 @@ name = tcl version = 8.5.10 -release = 1 +release = 2 groups = Development/Languages url = http://tcl.sourceforge.net/ @@ -44,7 +44,10 @@ build end test - make test + # Skip remote tests http, httpold and socket. + # Also skip unixInit-1.1. This test fails because "kill -PIPE" + # will be executed and we don't support that. + make test TESTFLAGS="-skip 'http* socket* unixInit-1.1'" end install_cmds hooks/post-receive -- IPFire 3.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM