IPFire-SCM November 2011

ipfire-scm@lists.ipfire.org

1 participants
41 discussions

[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

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

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

02 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 eb5b3f95274ede9058dfd81401f7d3aa602a343d (commit) from 821f9f50ae367a8d353588e74a18661a18d8f576 (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 eb5b3f95274ede9058dfd81401f7d3aa602a343d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 2 16:44:54 2011 +0100 Asterisk: update to 1.4.42. removed some addons that works only with zaptel. ----------------------------------------------------------------------- Summary of changes: config/asterisk/asterisk.makeopts | 5 +++ config/rootfiles/packages/asterisk | 45 ++++++++++++++++++--------- lfs/asterisk | 58 +++++++++++++++--------------------- 3 files changed, 59 insertions(+), 49 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/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/lfs/asterisk b/lfs/asterisk index 496e47e..8b4a02f 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,12 +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/ - # Remove wrong cpu optimization (march=armv5tel) - cd $(DIR_APP) && sed -i -e "s|^PROC=.*||g" makeopts + # 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 @@ -123,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 @@ -152,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-* hooks/post-receive -- IPFire 2.x development tree

1 0

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

02 Nov '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core53, updated. 5fa6700d8c181f33fd35db6821a68b92679cf926
by git＠ipfire.org 02 Nov '11

02 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, core53 has been updated via 5fa6700d8c181f33fd35db6821a68b92679cf926 (commit) via 07590904f3f340434e057f1513d83e560bbf2db3 (commit) from 5485de953c93e39e96d18f2351390086b8b92c82 (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 5fa6700d8c181f33fd35db6821a68b92679cf926 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 2 12:58:15 2011 +0100 core53: add backupiso to updater. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/53/filelists/files | 1 + config/rootfiles/core/53/update.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) Difference in files: 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 fbf1995..a9e3dcb 100644 --- a/config/rootfiles/core/53/update.sh +++ b/config/rootfiles/core/53/update.sh @@ -26,7 +26,7 @@ # # Remove old core updates from pakfire cache to save space... -core=52 +core=53 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire hooks/post-receive -- IPFire 2.x development tree

1 0

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

01 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 6a0868472f76b05936bf571ffb5e61bdb4e5f9bb (commit) via 86b85e6e5300e5dabded7ba2bf78fac04f443e26 (commit) via 81d774856061df1a4029264ff50acad50b3bf03a (commit) via 98fe558a9890d5a070b2f0540f0724faeef91baa (commit) via ef0d695fe450619103b3248eda39992dfaae79c7 (commit) via cdfe238b7eb4a69b48d0f3251afce0b3564f702d (commit) via 172334166678d04894cf32eb8eda65148c2e6506 (commit) via fddc3ac8220191e0ecbe7d2b99c3edfb3dd091da (commit) via 2da105c2101b954ab99a3e5120ba9b8b48912267 (commit) via da3efef2683061027d41ee9c45da41caa8875ab2 (commit) via 26d6a9afc449ac32635b37042f4c4b5d68f46899 (commit) via 94234825157b13c9e1debcb7d901181b4c765465 (commit) via 1a011e61c7e92a77dc6ed0df00bd3ae3dcd116a7 (commit) via d9b8f00edea15f80d1819373140868117ec90e3b (commit) via 579d794a2f846a5ef4ce98cada64f553df365f5c (commit) from d3d2a06f30ed3a2676df7b3e6376973cfc6ee036 (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 6a0868472f76b05936bf571ffb5e61bdb4e5f9bb Merge: 86b85e6 81d7748 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 1 23:05:22 2011 +0100 Merge remote-tracking branch 'stevee/freeradius' commit 86b85e6e5300e5dabded7ba2bf78fac04f443e26 Merge: ef0d695 26d6a9a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 1 23:05:17 2011 +0100 Merge remote-tracking branch 'stevee/tmpfiles' commit 81d774856061df1a4029264ff50acad50b3bf03a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Nov 1 22:55:19 2011 +0100 freeradius: Splitt package, add scriptlets. * Splitt package into server and utils packages. * Add systemd scriptlet * Remove deprecated dependency to "make". In the past we used it for initial certificate generation. Now we do this with a script in the systemd file. Fixes #281 commit 98fe558a9890d5a070b2f0540f0724faeef91baa Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Nov 1 22:00:18 2011 +0100 freeradius: Rework package. * Run daemon as user/group radiusd * Add logfiles * Remove a lot of unneeded stuff, like unsopported conf file or development headers. * Create tmpfiles folder. Reference #281 Fixes #280 commit ef0d695fe450619103b3248eda39992dfaae79c7 Merge: cdfe238 1a011e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 1 22:26:37 2011 +0100 Merge remote-tracking branch 'stevee/initscripts' commit cdfe238b7eb4a69b48d0f3251afce0b3564f702d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 1 21:10:41 2011 +0100 openssh: Fix weird configuration files. Configuration files were not recognized as those and had invalid options. commit 172334166678d04894cf32eb8eda65148c2e6506 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Nov 1 21:05:41 2011 +0100 freeradius: Update to 2.1.12. Reference #281. commit fddc3ac8220191e0ecbe7d2b99c3edfb3dd091da Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 1 20:38:04 2011 +0100 radvd: Create tmpfiles in package. References #280. commit 2da105c2101b954ab99a3e5120ba9b8b48912267 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 1 20:37:42 2011 +0100 pdns-recursor: Create tmpfiles in package. References #280. commit da3efef2683061027d41ee9c45da41caa8875ab2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 1 20:35:50 2011 +0100 lldpd: Update to 0.5.4. The os-release patch was accepted upstream. References #280. commit 26d6a9afc449ac32635b37042f4c4b5d68f46899 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Nov 1 19:29:49 2011 +0100 named: Create tmpfiles in package. Reference #280 commit 94234825157b13c9e1debcb7d901181b4c765465 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Nov 1 19:08:45 2011 +0100 lighttpd: Add scriptlet for systemd, fix tmpfiles directory. Also ship directories from tmpfiles with the package. Reference #280 commit 1a011e61c7e92a77dc6ed0df00bd3ae3dcd116a7 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Nov 1 13:17:01 2011 +0100 initscripts: Add /etc/rc.local. This file allows own instructions and will be executed at the end of the boot process. Fixes #273 commit d9b8f00edea15f80d1819373140868117ec90e3b Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Nov 1 13:00:54 2011 +0100 initscripts: Remove sysctl.conf from package. The network settings from that file will be done by the network package. commit 579d794a2f846a5ef4ce98cada64f553df365f5c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Nov 1 12:58:23 2011 +0100 initscript: Cleanup package. * Removed obsolate functions file. * Removed deprecated /etc/sysconfig files. ----------------------------------------------------------------------- Summary of changes: bind/bind.nm | 23 ++- bind/named.tmpfiles | 2 +- freeradius/freeradius.nm | 146 ++++++++--- freeradius/freeradius.tmpfiles | 2 +- .../patches/freeradius-2.1.6-cert-config.patch | 68 ----- freeradius/patches/freeradius-cert-config.patch | 62 +++++ freeradius/systemd/freeradius.service | 8 +- initscripts/functions | 284 -------------------- initscripts/initscripts.nm | 35 ++- initscripts/rc.local | 4 + initscripts/sysconfig/clock | 1 - initscripts/sysconfig/createfiles | 28 -- initscripts/sysconfig/modules | 21 -- initscripts/sysconfig/network | 1 - initscripts/sysconfig/rc | 52 ---- initscripts/sysconfig/rc.local | 27 -- initscripts/sysconfig/rc.site | 71 ----- initscripts/sysctl.conf | 28 -- initscripts/systemd/rc-local.service | 15 + lighttpd/lighttpd.nm | 56 ++++- lighttpd/lighttpd.tmpfiles | 2 +- lldpd/lldpd.nm | 46 +++- lldpd/lldpd.tmpfiles | 2 +- lldpd/patches/lldpd-0.52.x-os-release.patch | 92 ------- lldpd/systemd/lldpd.service | 3 +- openssh/openssh.nm | 14 +- openssh/sshd_config | 117 -------- pdns-recursor/pdns-recursor.nm | 25 ++- radvd/radvd.nm | 29 ++- radvd/radvd.tmpfiles | 2 +- 30 files changed, 384 insertions(+), 882 deletions(-) delete mode 100644 freeradius/patches/freeradius-2.1.6-cert-config.patch create mode 100644 freeradius/patches/freeradius-cert-config.patch delete mode 100644 initscripts/functions create mode 100644 initscripts/rc.local delete mode 100644 initscripts/sysconfig/clock delete mode 100644 initscripts/sysconfig/createfiles delete mode 100644 initscripts/sysconfig/modules delete mode 100644 initscripts/sysconfig/network delete mode 100644 initscripts/sysconfig/rc delete mode 100644 initscripts/sysconfig/rc.local delete mode 100644 initscripts/sysconfig/rc.site delete mode 100644 initscripts/sysctl.conf create mode 100644 initscripts/systemd/rc-local.service delete mode 100644 lldpd/patches/lldpd-0.52.x-os-release.patch delete mode 100644 openssh/sshd_config Difference in files: diff --git a/bind/bind.nm b/bind/bind.nm index 92290af..2799b0e 100644 --- a/bind/bind.nm +++ b/bind/bind.nm @@ -5,7 +5,7 @@ name = bind version = 9.8.1 -release = 2 +release = 3 groups = Networking/Tools url = http://www.isc.org/products/BIND/ @@ -62,6 +62,7 @@ build libidn-devel pkg-config openssl-devel + shadow-utils end configure_options += \ @@ -97,6 +98,9 @@ build libtoolize -c -f aclocal -I m4 --force autoconf -f + + # Create user and group for /run directory. + %{create_user} end install @@ -150,9 +154,19 @@ build ln -svf ../../lib/libirs-export.so.80 %{BUILDROOT}/usr/lib/libirs-export.so ln -svf ../../lib/libisccfg-export.so.82 %{BUILDROOT}/usr/lib/libisccfg-export.so ln -svf ../../lib/libisc-export.so.83 %{BUILDROOT}/usr/lib/libisc-export.so + + # Create /run/named. + mkdir -pv %{BUILDROOT}/run/named + chown -Rv named.named %{BUILDROOT}/run/named/ end end +create_user + getent group named >/dev/null || /usr/sbin/groupadd -r named + getent passwd named >/dev/null || /usr/sbin/useradd -r -g named \ + -d /var/named -c "User for bind DNS server" -s /sbin/nologin named +end + packages package %{name} requires @@ -163,12 +177,7 @@ packages prerequires += shadow-utils script prein - # Create unprivileged user and group. - getent group named > /dev/null || groupadd -r named - getent passwd named > /dev/null || \ - useradd -r -g named -d /var/named -s /sbin/nologin \ - -c "User for bind DNS server" named - exit 0 + %{create_user} end # XXX Add systemd scriptlet if a service file becomes available diff --git a/bind/named.tmpfiles b/bind/named.tmpfiles index 8a7fa49..640a656 100644 --- a/bind/named.tmpfiles +++ b/bind/named.tmpfiles @@ -1 +1 @@ -d /var/run/named 0755 named named - +d /run/named 0755 named named - diff --git a/freeradius/freeradius.nm b/freeradius/freeradius.nm index e780786..62b7289 100644 --- a/freeradius/freeradius.nm +++ b/freeradius/freeradius.nm @@ -4,8 +4,8 @@ ############################################################################### name = freeradius-server -version = 2.1.9 -release = 2 +version = 2.1.12 +release = 3 groups = System/Daemons url = http://www.freeradius.org @@ -13,14 +13,14 @@ license = GPLv2+ and LGPLv2+ summary = High-performance and highly configurable free RADIUS server. description - The FreeRADIUS Server Project is a high performance and highly \ - configurable GPL'd free RADIUS server. \ - FreeRADIUS is an Internet authentication daemon, which implements \ - the RADIUS protocol, as defined in RFC 2865. It allows \ + The FreeRADIUS Server Project is a high performance and highly + configurable GPL'd free RADIUS server. + FreeRADIUS is an Internet authentication daemon, which implements + the RADIUS protocol, as defined in RFC 2865. It allows Network Access Servers to perform authentication for dial-up users. end -source_dl = +source_dl = ftp://ftp.freeradius.org/pub/freeradius/ build requires @@ -30,50 +30,126 @@ build libtool-devel openssl-devel perl + shadow-utils end - build - ./configure \ - %{CONFIGURE_ARCH} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib/freeradius \ - --localstatedir=/var \ - --with-system-libtool \ - --with-threads \ - --with-thread-pool \ - --disable-ltdl-install \ - --with-gnu-ld \ - --without-rlm_eap_ikev2 \ - --without-rlm_sql_iodbc \ - --without-rlm_sql_firebird \ - --without-rlm_sql_db2 \ - --without-rlm_sql_oracle - - make LIBTOOL="libtool --tag=CC" #%{PARALLELISMFLAGS} + PARALLELISMFLAGS = # Disabled + + configure_options +=\ + %{CONFIGURE_ARCH} \ + --sysconfdir=/etc \ + --libdir=/usr/lib/freeradius \ + --localstatedir=/var \ + --with-system-libtool \ + --with-threads \ + --with-thread-pool \ + --disable-ltdl-install \ + --with-gnu-ld \ + --without-rlm_eap_ikev2 \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_firebird \ + --without-rlm_sql_db2 \ + --without-rlm_sql_oracle + + prepare_cmds + %{create_user} end + make_build_targets = LINK_MODE=-pie + install - R=%{BUILDROOT} make install - end + make install R=%{BUILDROOT} + + # Change freeradius user and group. + perl -i -pe 's/^#user =.*$/user = radiusd/' %{BUILDROOT}/etc/raddb/radiusd.conf + perl -i -pe 's/^#group =.*$/group = radiusd/' %{BUILDROOT}/etc/raddb/radiusd.conf + + # Create emty logfiles. + mkdir -pv %{BUILDROOT}/var/log/radius/radacct + touch %{BUILDROOT}/var/log/radius/{radutmp,radius.log} + chown -Rv radiusd.radiusd %{BUILDROOT}/var/log/radius/ + + # Create tmpfiles folder. + mkdir -pv %{BUILDROOT}/run/radiusd + chown -Rv radiusd.radiusd %{BUILDROOT}/run/radiusd/ + + # Remove unneeded stuff. + rm -vf %{BUILDROOT}/usr/sbin/rc.radiusd + rm -rvf %{BUILDROOT}/etc/raddb/sql/ + rm -rvf %{BUILDROOT}/var/run/ + + # Remove header files, we don't ship a devel package. + rm -rvf %{BUILDROOT}/usr/include/ - install_cmds - mkdir -pv %{BUILDROOT}/etc/logrotate.d/ - cp -vf %{DIR_SOURCE}/logrotate/freeradius %{BUILDROOT}/etc/logrotate.d/ + # remove unsupported config file. + rm -vf %{BUILDROOT}/etc/raddb/experimental.conf + + # Fix permissions. + chown -Rv root.radiusd %{BUILDROOT}/etc/raddb end end +create_user + getent group radiusd >/dev/null || /usr/sbin/groupadd -r radiusd + getent passwd radiusd >/dev/null || /usr/sbin/useradd -r -g radiusd \ + -d /var/lib/radiusd -s /sbin/nologin radiusd +end + quality-agent whitelist_rpath /usr/lib/freeradius end end -# Generate certificates after installation -# Command: cd /etc/raddb/certs/ && make Makefile - packages package %{name} - requires = make + configfiles + /etc/raddb/radiusd.conf + end + + prerequires = shadow-utils systemd-units + + script prein + %{create_user} + end + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable freeradius.service >/dev/null 2>&1 || : + /bin/systemctl stop freeradius.service >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart freeradius.service >/dev/null 2>&1 || : + end + end + + package freeradius-utils + summary = FreeRADIUS utilities. + description + Additional utilities to configure and manage FreeRADUIS + Servers. + end + + files + /usr/bin/* + /usr/share/man/man1/radclient.1 + /usr/share/man/man1/radeapclient.1 + /usr/share/man/man1/radlast.1 + /usr/share/man/man1/radtest.1 + /usr/share/man/man1/radwho.1 + /usr/share/man/man1/radzap.1 + /usr/share/man/man1/smbencrypt.1 + /usr/share/man/man5/checkrad.5 + /usr/share/man/man8/radconf2xml.8 + /usr/share/man/man8/radcrypt.8 + /usr/share/man/man8/radsniff.8 + /usr/share/man/man8/radsqlrelay.8 + /usr/share/man/man8/rlm_ippool_tool.8 + end end end diff --git a/freeradius/freeradius.tmpfiles b/freeradius/freeradius.tmpfiles index f06f7f3..613d008 100644 --- a/freeradius/freeradius.tmpfiles +++ b/freeradius/freeradius.tmpfiles @@ -1,2 +1,2 @@ -d /var/run/radiusd 0750 root root - +d /run/radiusd 0750 radiusd radiusd diff --git a/freeradius/patches/freeradius-2.1.6-cert-config.patch b/freeradius/patches/freeradius-2.1.6-cert-config.patch deleted file mode 100644 index 8390beb..0000000 --- a/freeradius/patches/freeradius-2.1.6-cert-config.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -r -u freeradius-server-2.1.8.orig/raddb/certs/ca.cnf freeradius-server-2.1.8/raddb/certs/ca.cnf ---- freeradius-server-2.1.8.orig/raddb/certs/ca.cnf 2009-12-30 10:44:35.000000000 -0500 -+++ freeradius-server-2.1.8/raddb/certs/ca.cnf 2010-01-08 12:35:23.000000000 -0500 -@@ -14,9 +14,9 @@ - RANDFILE = $dir/.rand - name_opt = ca_default - cert_opt = ca_default --default_days = 365 -+default_days = 60 - default_crl_days = 30 --default_md = md5 -+default_md = sha1 - preserve = no - policy = policy_match - -Only in freeradius-server-2.1.8/raddb/certs: ca.cnf~ -diff -r -u freeradius-server-2.1.8.orig/raddb/certs/client.cnf freeradius-server-2.1.8/raddb/certs/client.cnf ---- freeradius-server-2.1.8.orig/raddb/certs/client.cnf 2009-12-30 10:44:35.000000000 -0500 -+++ freeradius-server-2.1.8/raddb/certs/client.cnf 2010-01-08 12:35:37.000000000 -0500 -@@ -14,9 +14,9 @@ - RANDFILE = $dir/.rand - name_opt = ca_default - cert_opt = ca_default --default_days = 365 -+default_days = 60 - default_crl_days = 30 --default_md = md5 -+default_md = sha1 - preserve = no - policy = policy_match - -Only in freeradius-server-2.1.8/raddb/certs: client.cnf~ -diff -r -u freeradius-server-2.1.8.orig/raddb/certs/server.cnf freeradius-server-2.1.8/raddb/certs/server.cnf ---- freeradius-server-2.1.8.orig/raddb/certs/server.cnf 2009-12-30 10:44:35.000000000 -0500 -+++ freeradius-server-2.1.8/raddb/certs/server.cnf 2010-01-08 12:35:05.000000000 -0500 -@@ -14,9 +14,9 @@ - RANDFILE = $dir/.rand - name_opt = ca_default - cert_opt = ca_default --default_days = 365 -+default_days = 60 - default_crl_days = 30 --default_md = md5 -+default_md = sha1 - preserve = no - policy = policy_match - -Only in freeradius-server-2.1.8/raddb/certs: server.cnf~ -diff -r -u freeradius-server-2.1.8.orig/raddb/eap.conf freeradius-server-2.1.8/raddb/eap.conf ---- freeradius-server-2.1.8.orig/raddb/eap.conf 2009-12-30 10:44:35.000000000 -0500 -+++ freeradius-server-2.1.8/raddb/eap.conf 2010-01-08 12:36:04.000000000 -0500 -@@ -251,15 +251,6 @@ - cipher_list = "DEFAULT" - - # -- -- # This configuration entry should be deleted -- # once the server is running in a normal -- # configuration. It is here ONLY to make -- # initial deployments easier. -- # -- make_cert_command = "${certdir}/bootstrap" -- -- # - # Session resumption / fast reauthentication - # cache. - # -Only in freeradius-server-2.1.8/raddb: eap.conf~ diff --git a/freeradius/patches/freeradius-cert-config.patch b/freeradius/patches/freeradius-cert-config.patch new file mode 100644 index 0000000..9967a15 --- /dev/null +++ b/freeradius/patches/freeradius-cert-config.patch @@ -0,0 +1,62 @@ +diff -r -u freeradius-server-2.1.12.orig/raddb/certs/ca.cnf freeradius-server-2.1.12/raddb/certs/ca.cnf +--- freeradius-server-2.1.12.orig/raddb/certs/ca.cnf 2011-09-07 06:59:21.000000000 -0400 ++++ freeradius-server-2.1.12/raddb/certs/ca.cnf 2011-09-07 10:28:28.000000000 -0400 +@@ -14,9 +14,9 @@ + RANDFILE = $dir/.rand + name_opt = ca_default + cert_opt = ca_default +-default_days = 365 ++default_days = 60 + default_crl_days = 30 +-default_md = md5 ++default_md = sha1 + preserve = no + policy = policy_match + +diff -r -u freeradius-server-2.1.12.orig/raddb/certs/client.cnf freeradius-server-2.1.12/raddb/certs/client.cnf +--- freeradius-server-2.1.12.orig/raddb/certs/client.cnf 2011-09-07 06:59:21.000000000 -0400 ++++ freeradius-server-2.1.12/raddb/certs/client.cnf 2011-09-07 10:28:28.000000000 -0400 +@@ -14,9 +14,9 @@ + RANDFILE = $dir/.rand + name_opt = ca_default + cert_opt = ca_default +-default_days = 365 ++default_days = 60 + default_crl_days = 30 +-default_md = md5 ++default_md = sha1 + preserve = no + policy = policy_match + +diff -r -u freeradius-server-2.1.12.orig/raddb/certs/server.cnf freeradius-server-2.1.12/raddb/certs/server.cnf +--- freeradius-server-2.1.12.orig/raddb/certs/server.cnf 2011-09-07 06:59:21.000000000 -0400 ++++ freeradius-server-2.1.12/raddb/certs/server.cnf 2011-09-07 10:28:28.000000000 -0400 +@@ -14,9 +14,9 @@ + RANDFILE = $dir/.rand + name_opt = ca_default + cert_opt = ca_default +-default_days = 365 ++default_days = 60 + default_crl_days = 30 +-default_md = md5 ++default_md = sha1 + preserve = no + policy = policy_match + +diff -r -u freeradius-server-2.1.12.orig/raddb/eap.conf freeradius-server-2.1.12/raddb/eap.conf +--- freeradius-server-2.1.12.orig/raddb/eap.conf 2011-09-07 06:59:21.000000000 -0400 ++++ freeradius-server-2.1.12/raddb/eap.conf 2011-09-07 10:28:28.000000000 -0400 +@@ -281,7 +281,11 @@ + # for the server to print out an error message, + # and refuse to start. + # +- make_cert_command = "${certdir}/bootstrap" ++ # Redhat RPM's run the bootstrap certificate creation ++ # as part of the RPM install (not upgrade), therefore ++ # the make_cert_command is commented out. ++ # ++ #make_cert_command = "${certdir}/bootstrap" + + # + # Elliptical cryptography configuration +Only in freeradius-server-2.1.12/raddb: eap.conf.orig diff --git a/freeradius/systemd/freeradius.service b/freeradius/systemd/freeradius.service index 0bdae0d..4f86f21 100644 --- a/freeradius/systemd/freeradius.service +++ b/freeradius/systemd/freeradius.service @@ -1,11 +1,13 @@ [Unit] -Description=Freeradius Server +Description=FreeRADIUS Server After=network.target [Service] -ExecStart=/usr/sbin/radiusd -f -d /etc/radvd/freeradius.conf +ExecStartPre=/etc/raddb/certs/bootstrap +ExecStartPre=/usr/sbin/radiusd -C +ExecStart=/usr/sbin/radiusd -f -d /etc/raddb +ExecReload=/usr/sbin/radiusd -C ExecReload=/bin/kill -HUP $MAINPID -ExecPostStop=/bin/rm -vf /var/run/radiusd/radiusd.sock [Install] WantedBy=multi-user.target diff --git a/initscripts/functions b/initscripts/functions deleted file mode 100644 index c5451ff..0000000 --- a/initscripts/functions +++ /dev/null @@ -1,284 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### -# -# Partly based on scripts by DJ Lucas - dj(a)linuxfromscratch.org -# - -# Distro Information -DISTRO="$(</etc/system-release)" # The distro name -DISTRO_CONTACT="http://bugtracker.ipfire.org" # Bug report address - -# This sets default terminal options. -# stty sane - this has been removed as nobody recalls -# the reason for it in the first place - if no problems arize, -# then it will be removed completely at a later date. - -# Setup default values for the environment -umask 022 - -# If we boot, we should only allow the -# use tools that are available in /bin:/sbin -if [ -n "${UPSTART_JOB}" ]; then - PATH="/bin:/sbin" -fi - -# Find current screen size -if [ -z "${COLUMNS}" ]; then - COLUMNS=$(stty size) - COLUMNS=${COLUMNS##* } -fi - -# When using remote connections, such as a serial port, stty size returns 0 -if [ "${COLUMNS}" = "0" ]; then - COLUMNS=80 -fi - -## Measurements for positioning result messages -COL=$((${COLUMNS} - 8)) -WCOL=$((${COL} - 2)) - -# Set Cursur Position Commands, used via echo -e -SET_COL="\\033[${COL}G" # at the $COL char -SET_WCOL="\\033[${WCOL}G" # at the $WCOL char -CURS_UP="\\033[1A\\033[0G" # Up one line, at the 0'th char - -# Normal colors -CLR_NORM_BLK="\\033[0;30m" # black -CLR_NORM_RED="\\033[0;31m" # red -CLR_NORM_GRN="\\033[0;32m" # green -CLR_NORM_YEL="\\033[0;33m" # yellow -CLR_NORM_BLU="\\033[0;34m" # blue -CLR_NORM_MAG="\\033[0;35m" # magenta -CLR_NORM_CYN="\\033[0;36m" # cyan -CLR_NORM_WHT="\\033[0;37m" # white -CLR_NORM_GRY="\\033[0;39m" # grey - -# Emphased colors -CLR_BOLD_BLK="\\033[1;30m" # black -CLR_BOLD_RED="\\033[1;31m" # red -CLR_BOLD_GRN="\\033[1;32m" # green -CLR_BOLD_YEL="\\033[1;33m" # yellow -CLR_BOLD_BLU="\\033[1;34m" # blue -CLR_BOLD_MAG="\\033[1;35m" # magenta -CLR_BOLD_CYN="\\033[1;36m" # cyan -CLR_BOLD_WHT="\\033[1;37m" # white -CLR_BOLD_GRY="\\033[1;39m" # grey - -# Background colors -CLR_BACK_BLK="\\033[40m" # black -CLR_BACK_RED="\\033[41m" # red -CLR_BACK_GRN="\\033[42m" # green -CLR_BACK_YEL="\\033[43m" # yellow -CLR_BACK_BLU="\\033[44m" # blue -CLR_BACK_MAG="\\033[45m" # magenta -CLR_BACK_CYN="\\033[46m" # cyan -CLR_BACK_WHT="\\033[47m" # white - -# Action colors -BOLD=$CLR_BOLD_GRY -DONE=$CLR_BOLD_GRN -SKIP=$CLR_BOLD_BLU -WARN=$CLR_BOLD_MAG -FAIL=$CLR_BOLD_RED -NORMAL=$CLR_NORM_GRY - -# Color hooks -BRACKET_L="${CLR_BOLD_BLU}[${NORMAL}" -BRACKET_R="${CLR_BOLD_BLU}]${NORMAL}" - -# Define custom colors used in messages printed to the screen -BRACKET=${CLR_BOLD_BLU} # Blue -FAILURE=${CLR_BOLD_RED} # Red -INFO=${CLR_BOLD_CYN} # Cyan -NORMAL=${CLR_NORM_GRY} # Grey -SUCCESS=${CLR_BOLD_GRN} # Green -WARNING=${CLR_BOLD_YEL} # Yellow - -# Prefix boot messages for easier reading on framebuffer consoles -PREFIX_SUCCESS=" ${SUCCESS}*${NORMAL} " -PREFIX_WARNING="${WARNING}**${NORMAL} " -PREFIX_FAILURE="${FAILURE}***${NORMAL}" - -welcome_message="Welcome to ${INFO}${DISTRO}${NORMAL}" -welcome_message_length=$((${#DISTRO} + 11)) - -# Error message displayed when a script's exit value is not zero -print_error_msg() { - # ${link} and ${error_value} are defined by the rc script - echo -e "${FAILURE}FAILURE: You should not be reading this error message." - echo -e "" - echo -e -n "${FAILURE}It means that an unforseen error took place in" - echo -e -n "${INFO} ${link}" - echo -e "${FAILURE}," - echo -e "${FAILURE}which exited with a return value of ${error_value}." - echo -e "" - echo -e -n "${FAILURE}If you are able to track this error down to a bug" - echo -e "${FAILURE}in one of the files" - echo -e -n "provided by ${INFO}${DISTRO}${FAILURE}, " - echo -e -n "${FAILURE}please be so kind to inform us at " - echo -e "${INFO}${DISTRO_CONTACT}${FAILURE}.${NORMAL}" - echo -e "" - echo -e "${INFO}Press Enter to continue..." - echo -e "${NORMAL}" - read ENTER -} - -################################################################################ -# log_success_msg() # -# Usage: log_success_msg [$MESSAGE | "message"] # -# # -# Purpose: Print a successful status message to the screen and optionally # -# a boot log file. # -# # -# Inputs: accepts one string value, either a quoted string or optionally # -# the value of $MESSAGE if set in the running environment. # -# # -# Return values: Not used # -################################################################################ -log_success_msg() { - echo -n -e "${PREFIX_SUCCESS}${INDENT}${@}" - echo -e "${SET_COL}${BRACKET}[${SUCCESS} OK ${BRACKET}]${NORMAL}" -} - -################################################################################ -# log_failure_msg() # -# Usage: log_failure_msg [$MESSAGE | "message"] # -# # -# Purpose: Print a failure status message to the screen and optionally # -# a boot log file. # -# # -# Inputs: accepts one string value, either a quoted string or optionally # -# the value of $MESSAGE if set in the running environment. # -# # -# Return values: Not used # -################################################################################ -log_failure_msg() { - echo -n -e "${PREFIX_FAILURE}${INDENT}${@}" - echo -e "${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}" -} - -################################################################################ -# log_warning_msg() # -# Usage: log_warning_msg [$MESSAGE | "message"] # -# # -# Purpose: Print a warning status message to the screen and optionally # -# a boot log file. # -# # -# Inputs: accepts one string value, either a quoted string or optionally # -# the value of $MESSAGE if set in the running environment. # -# # -# Return values: Not used # -################################################################################ -log_warning_msg() { - echo -n -e "${PREFIX_WARNING}${INDENT}${@}" - echo -e "${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}" -} - -############################## evaluate_retval() ############################### -# evaluate_retval requires that you pass exactly one evaluation parameter of # -# (start, stop, other) based on the previous action that is being evaluated. # -# This function is intended for use with start_daemon and killproc to # -# interpret the LSB exit codes properly, othewise the checks only for success # -# or failure. # -################################################################################ -evaluate_retval() { - local error_value="${?}" - - # Handle LSB defined return values - case "${1}" in - start) - case "${error_value}" in - 0) - log_success_msg "Starting ${MESSAGE} " - return "${error_value}" - ;; - 2) - log_failure_msg "Starting ${MESSAGE} Error: Invalid argument!" - return "${error_value}" - ;; - 5) - log_failure_msg "Starting ${MESSAGE} Error: Not available!" - return "${error_value}" - ;; - *) - log_failure_msg "Starting ${MESSAGE} Error: General failure!" - return "${error_value}" - ;; - esac - ;; - - stop) - case "${error_value}" in - 0) - log_success_msg "Stopping ${MESSAGE} " - return "${error_value}" - ;; - 2) - log_failure_msg "Stopping ${MESSAGE} Error: Invalid argument!" - return "${error_value}" - ;; - 5) - log_failure_msg "Stopping ${MESSAGE} Error: Not available!" - return "${error_value}" - ;; - 7) - log_warning_msg "Stopping ${MESSAGE} Warning: Not running!" - return "${error_value}" - ;; - *) - log_failure_msg "Stopping ${MESSAGE} Error: General failure!" - return "${error_value}" - ;; - esac - ;; - - force-reload) - message="Forcefully reloading " - ;; - - reload) - message="Reloading " - ;; - - restart) - message="Restarting " - ;; - - try-restart) - message="Trying restart " - ;; - - standard) - # $message or $MESSAGE must be set, but not both in order - # to use the 'standard' target. - ;; - esac - - # Print messages for the generic force-reload, reload, restart, - # and try-restart targets - if [ "${error_value}" = "0" ]; then - log_success_msg "${message}${MESSAGE} " - return "${error_value}" - else - log_failure_msg "${message}${MESSAGE} " - return "${error_value}" - fi -} diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm index dce2238..08850f8 100644 --- a/initscripts/initscripts.nm +++ b/initscripts/initscripts.nm @@ -6,7 +6,7 @@ name = initscripts epoch = 1 version = 2.99 -release = 8 +release = 11 groups = Base System/Boot url = @@ -44,16 +44,8 @@ build install cd src && make install clean DESTDIR=%{BUILDROOT} - mkdir -pv %{BUILDROOT}/etc/{init,sysconfig} - - cp -vf %{DIR_SOURCE}/functions %{BUILDROOT}/etc/init/ - - for i in %{DIR_SOURCE}/sysconfig/*; do - install -v -m 644 $i %{BUILDROOT}/etc/sysconfig/ - done - chmod -v 755 %{BUILDROOT}/etc/sysconfig/rc.local - - cp -vf %{DIR_SOURCE}/sysctl.conf %{BUILDROOT}/etc + # Install rc.local + install -v -m 755 %{DIR_SOURCE}/rc.local %{BUILDROT}/etc/rc.local # Install udev rules mkdir -pv %{BUILDROOT}/lib/udev/rules.d/ @@ -77,6 +69,10 @@ packages util-linux end + configfiles + /etc/rc.local + end + prerequires = coreutils shadow-utils script prein @@ -88,6 +84,23 @@ packages chown root:utmp /var/log/{b,w}tmp /var/run/utmp chmod 664 /var/log/wtmp /var/run/utmp chmod 600 /var/log/btmp + + # Just search for new unit files that were just installed. + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + + # Enable rc.local as default. + /bin/systemctl --no-reload enable rc-local.service >/dev/null 2>&1 || : + end + + # Disable the service that is to be removed and stop it if it is still running. + script preun + /bin/systemctl --no-reload disable rc-local.service >/dev/null 2>&1 || : + /bin/systemctl stop rc-local.service >/dev/null 2>&1 || : + end + + # Just tell systemd that unitfiles have been removed. + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : end end end diff --git a/initscripts/rc.local b/initscripts/rc.local new file mode 100644 index 0000000..0bd2d37 --- /dev/null +++ b/initscripts/rc.local @@ -0,0 +1,4 @@ +#!/bin/sh +# +# This script will be executed at the end of the boot process. +# You can put your own initialization stuff in here. diff --git a/initscripts/sysconfig/clock b/initscripts/sysconfig/clock deleted file mode 100644 index 99132e1..0000000 --- a/initscripts/sysconfig/clock +++ /dev/null @@ -1 +0,0 @@ -UTC=no diff --git a/initscripts/sysconfig/createfiles b/initscripts/sysconfig/createfiles deleted file mode 100644 index 8d1f89d..0000000 --- a/initscripts/sysconfig/createfiles +++ /dev/null @@ -1,28 +0,0 @@ -######################################################################## -# Begin /etc/sysconfig/createfiles -# -# Description : Createfiles script config file -# -# Authors : -# -# Version : 00.00 -# -# Notes : The syntax of this file is as follows: -# if type is equal to "file" or "dir" -# <filename> <type> <permissions> <user> <group> -# if type is equal to "dev" -# <filename> <type> <permissions> <user> <group> <devtype> <major> <minor> -# -# <filename> is the name of the file which is to be created -# <type> is either file, dir, or dev. -# file creates a new file -# dir creates a new directory -# dev creates a new device -# <devtype> is either block, char or pipe -# block creates a block device -# char creates a character deivce -# pipe creates a pipe, this will ignore the <major> and <minor> fields -# <major> and <minor> are the major and minor numbers used for the device. -######################################################################## - -# End /etc/sysconfig/createfiles diff --git a/initscripts/sysconfig/modules b/initscripts/sysconfig/modules deleted file mode 100644 index d6fc14c..0000000 --- a/initscripts/sysconfig/modules +++ /dev/null @@ -1,21 +0,0 @@ -######################################################################## -# Begin /etc/sysconfig/modules -# -# Description : Module auto-loading configuration -# -# Authors : -# -# Version : 00.00 -# -# Notes : The syntax of this file is as follows: -# <module> [<arg1> <arg2> ...] -# -# Each module should be on it's own line, and any options that you want -# passed to the module should follow it. The line deliminator is either -# a space or a tab. -######################################################################## - -# For dialin with pppd -ppp_generic - -# End /etc/sysconfig/modules diff --git a/initscripts/sysconfig/network b/initscripts/sysconfig/network deleted file mode 100644 index 45e537e..0000000 --- a/initscripts/sysconfig/network +++ /dev/null @@ -1 +0,0 @@ -HOSTNAME=ipfire.localdomain diff --git a/initscripts/sysconfig/rc b/initscripts/sysconfig/rc deleted file mode 100644 index ffb70d9..0000000 --- a/initscripts/sysconfig/rc +++ /dev/null @@ -1,52 +0,0 @@ -# Begin /etc/sysconfig/rc - -# Author: DJ Lucas - dj(a)linuxfromscratch.org -# Version: 1.0 LSB V.3.1 - -# Global variable inherited by initscripts are in caps -# Local variables for the rc script are in lowercase - -# Source site specific rc configuration -. /etc/sysconfig/rc.site - -# This sets default terminal options. -# stty sane - this has been removed as nobody recalls -# the reason for it in the first place - if no problems arize, -# then it will be removed completely at a later date. - -# Setup default values for the environment -umask 022 -PATH="/bin:/sbin" - -# Find current screen size -if [ -z "${COLUMNS}" ]; then - COLUMNS=$(stty size) - COLUMNS=${COLUMNS##* } -fi - -# When using remote connections, such as a serial port, stty size returns 0 -if [ "${COLUMNS}" = "0" ]; then - COLUMNS=80 -fi - -## Measurements for positioning result messages -COL=$((${COLUMNS} - 8)) -WCOL=$((${COL} - 2)) - -# Set Cursur Position Commands, used via echo -e -SET_COL="\\033[${COL}G" # at the $COL char -SET_WCOL="\\033[${WCOL}G" # at the $WCOL char -CURS_UP="\\033[1A\\033[0G" # Up one line, at the 0'th char - -# Bootlogging and interactive startup require a valid tempfs mount -# if this mount is not present, disable them -if [ "${TEMPFS_MOUNT}" = "" -o ! -d "${TEMPFS_MOUNT}" ]; then - TEMPFS_MOUNT="" - iprompt="" - BOOTLOG_ENAB="" -fi - -# Export the environment variables so they are inherited by the scripts -export PATH SET_COL SET_WCOL CURS_UP TEMPFS_MOUNT BOOTLOG_ENAB RUNLEVEL - -# End /etc/sysconfig/rc diff --git a/initscripts/sysconfig/rc.local b/initscripts/sysconfig/rc.local deleted file mode 100644 index 90347d7..0000000 --- a/initscripts/sysconfig/rc.local +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### -# Used for private calls after boot # -############################################################################### - -# power button shutdown -if grep -q '^button' /proc/modules ; then - head -1 /proc/acpi/event | grep -q 'button/power PWRF' && init 0 & -fi diff --git a/initscripts/sysconfig/rc.site b/initscripts/sysconfig/rc.site deleted file mode 100644 index 82b7cc7..0000000 --- a/initscripts/sysconfig/rc.site +++ /dev/null @@ -1,71 +0,0 @@ -# Set base directory information -RC_BASE="/etc" -RC_FUNCTIONS="${RC_BASE}/init.d/ipfire-functions" - -# Location of network device scripts and config files -NETWORK_SCRIPTS="/etc/init.d/networking" -NETWORK_DEVICES="/etc/sysconfig/network-devices" - -# Directory to store boot process accounting information -# Used for boot logging and interactive flag when rootfs -# is not writable -TEMPFS_MOUNT="${RC_BASE}/init.d/boottemp" - -# Bootlogging (requires a tempfs mount) -BOOTLOG_ENAB="yes" - -# Distro Information -DISTRO="$(cat /etc/system-release)" # The distro name -DISTRO_CONTACT="http://bugtracker.ipfire.org" # Bug report address -DISTRO_MINI="ipfire" # Short name used in filenames for distro config - -# Define custom colors used in messages printed to the screen -BRACKET="\\033[1;34m" # Blue -FAILURE="\\033[1;31m" # Red -INFO="\\033[1;36m" # Cyan -NORMAL="\\033[0;39m" # Grey -SUCCESS="\\033[1;32m" # Green -WARNING="\\033[1;33m" # Yellow - -# Prefix boot messages for easier reading on framebuffer consoles -PREFIX_SUCCESS=" ${SUCCESS}*${NORMAL} " -PREFIX_WARNING="${WARNING}**${NORMAL} " -PREFIX_FAILURE="${FAILURE}***${NORMAL}" - -# Export varialbles so that they are inherited by the initscripts -export RC_BASE RC_FUNCTIONS TEMPFS_MOUNT BOOTLOG_ENAB -export NETWORK_DEVICES NETWORK_SCRIPTS -export DISTRO DISTRO_CONTACT DISTRO_MINI -export BRACKET FAILURE INFO NORMAL SUCCESS WARNING -export PREFIX_SUCCESS PREFIX_WARNING PREFIX_FAILURE - -# Interactive startup -iprompt="yes" # Wether to display the interactive boot promp -itime="2" # The ammount of time (in seconds) to display the prompt -dlen="$(( 11 + ${#DISTRO} ))" # The total length of the distro welcome string -ilen="38" # The total length of the interactive message -welcome_message="Welcome to ${INFO}${DISTRO}${NORMAL}" -i_message="Press '${FAILURE}I${NORMAL}' to enter interactive startup" - -# Error message displayed when a script's exit value is not zero -print_error_msg() -{ - # ${link} and ${error_value} are defined by the rc script - echo -e "${FAILURE}FAILURE: You should not be reading this error message." - echo -e "" - echo -e -n "${FAILURE}It means that an unforseen error took place in" - echo -e -n "${INFO} ${link}" - echo -e "${FAILURE}," - echo -e "${FAILURE}which exited with a return value of ${error_value}." - echo -e "" - echo -e -n "${FAILURE}If you are able to track this error down to a bug" - echo -e "${FAILURE}in one of the files" - echo -e -n "provided by ${INFO}${DISTRO}${FAILURE}, " - echo -e -n "${FAILURE}please be so kind to inform us at " - echo -e "${INFO}${DISTRO_CONTACT}${FAILURE}.${NORMAL}" - echo -e "" - echo -e "${INFO}Press Enter to continue..." - echo -e "${NORMAL}" - read ENTER -} - diff --git a/initscripts/sysctl.conf b/initscripts/sysctl.conf deleted file mode 100644 index 25d8c92..0000000 --- a/initscripts/sysctl.conf +++ /dev/null @@ -1,28 +0,0 @@ -net.ipv4.ip_forward = 1 -net.ipv4.ip_dynaddr = 1 -net.ipv4.icmp_echo_ignore_broadcasts = 1 -net.ipv4.icmp_ignore_bogus_error_responses = 1 - -net.ipv4.tcp_sack = 0 -net.ipv4.tcp_timestamps = 0 -net.ipv4.tcp_syncookies = 1 -net.ipv4.tcp_fin_timeout = 30 -net.ipv4.tcp_window_scaling = 0 -net.ipv4.tcp_syn_retries = 3 -net.ipv4.tcp_synack_retries = 3 - -net.ipv4.conf.default.rp_filter = 0 -net.ipv4.conf.default.accept_redirects = 0 -net.ipv4.conf.default.accept_source_route = 0 -net.ipv4.conf.default.log_martians = 1 - -net.ipv4.conf.all.rp_filter = 0 -net.ipv4.conf.all.accept_redirects = 0 -net.ipv4.conf.all.accept_source_route = 0 -net.ipv4.conf.all.log_martians = 1 - -# IPv6 settings -net.ipv6.conf.default.forwarding = 1 -net.ipv6.conf.default.autoconf = 0 - -kernel.printk = 1 4 1 7 diff --git a/initscripts/systemd/rc-local.service b/initscripts/systemd/rc-local.service new file mode 100644 index 0000000..04daed0 --- /dev/null +++ b/initscripts/systemd/rc-local.service @@ -0,0 +1,15 @@ +[Unit] +Description=/etc/rc.local Compatiblity +ConditionFileIsExecuteable=/etc/rc.local +Requires=multi-user.target +After=multi-user.target network.target + +[Service] +Type=forking +ExecStart=/etc/rc.local +TimeoutSec=0 +StandardOutput=tty +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/lighttpd/lighttpd.nm b/lighttpd/lighttpd.nm index 9d4ce5c..1fb927d 100644 --- a/lighttpd/lighttpd.nm +++ b/lighttpd/lighttpd.nm @@ -5,7 +5,8 @@ name = lighttpd version = 1.4.29 -release = 1 +ver_major = 1.4 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Networking/Webservers @@ -14,15 +15,15 @@ license = BSD summary = Lightning fast webserver with light system requirements. description - Secure, fast, compliant and very flexible web-server which has been optimized \ - for high-performance environments. It has a very low memory footprint compared \ - to other webservers and takes care of cpu-load. Its advanced feature-set \ - (FastCGI, CGI, Auth, Output-Compression, URL-Rewriting and many more) make \ - it the perfect webserver-software for every server that is suffering load \ + Secure, fast, compliant and very flexible web-server which has been optimized + for high-performance environments. It has a very low memory footprint compared + to other webservers and takes care of cpu-load. Its advanced feature-set + (FastCGI, CGI, Auth, Output-Compression, URL-Rewriting and many more) make + it the perfect webserver-software for every server that is suffering load problems. end -source_dl = +source_dl = http://download.lighttpd.net/lighttpd/releases-%{ver_major}.x/ build requires @@ -32,6 +33,7 @@ build openssl-devel pcre-devel pkg-config + shadow-utils zlib-devel end @@ -40,19 +42,55 @@ build --with-ldap \ --with-openssl + prepare_cmds + %{create_user} + end + install_cmds mkdir -pv %{BUILDROOT}/etc cp -vf %{DIR_SOURCE}/%{name}.conf %{BUILDROOT}/etc/%{name}.conf mkdir -pv %{BUILDROOT}/var/log/%{name} touch %{BUILDROOT}/var/log/%{name}/{access,error}.log - chown nobody.nobody -R %{BUILDROOT}/var/log/%{name} + chown lighttpd.lighttpd -R %{BUILDROOT}/var/log/%{name} mkdir -pv %{BUILDROOT}/var/cache/lighttpd/compress - chown nobody.nobody -Rv %{BUILDROOT}/var/cache/lighttpd/ + chown lighttpd.lighttpd -Rv %{BUILDROOT}/var/cache/lighttpd/ + + mkdir -pv %{BUILDROOT}/run/lighttpd + chown lighttpd.lighttpd -Rv %{BUILDROOT}/run/lighttpd/ end end +create_user + getent group lighttpd >/dev/null || /usr/sbin/groupadd -r lighttpd + getent passwd lighttpd >/dev/null || /usr/sbin/useradd -r -g lighttpd \ + -d /var/www/lighttpd -s /sbin/nologin lighttpd +end + packages package %{name} + configfiles + /etc/lighttpd.conf + end + + prerequires = shadow-utils systemd-units + + script prein + %{create_user} + end + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable lighttpd.service >/dev/null 2>&1 || : + /bin/systemctl stop lighttpd.service >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart lighttpd.service >/dev/null 2>&1 || : + end end end diff --git a/lighttpd/lighttpd.tmpfiles b/lighttpd/lighttpd.tmpfiles index b1fdefd..4ba7262 100644 --- a/lighttpd/lighttpd.tmpfiles +++ b/lighttpd/lighttpd.tmpfiles @@ -1 +1 @@ -d /var/run/lighttpd 0750 lighttpd lighttpd - +d /run/lighttpd 0750 lighttpd lighttpd - diff --git a/lldpd/lldpd.nm b/lldpd/lldpd.nm index 271e9ad..3521db8 100644 --- a/lldpd/lldpd.nm +++ b/lldpd/lldpd.nm @@ -4,8 +4,8 @@ ############################################################################### name = lldpd -version = 0.5.2 -release = 5 +version = 0.5.4 +release = 1 groups = Networking/Tools url = https://trac.luffy.cx/lldpd/ @@ -13,7 +13,7 @@ license = GPL summary = Utilities for the Link Layer Discovery Protocol. description - The LLDPD project aims to provide a comprehensive implementation of \ + The LLDPD project aims to provide a comprehensive implementation of the IEEE standard 802.1AB Link Layer Discovery Protocol. end @@ -23,6 +23,7 @@ build requires libxml2-devel pkg-config + shadow-utils zlib-devel end @@ -30,9 +31,48 @@ build --with-xml \ --with-privsep-user=lldpd \ --with-privsep-group=lldpd + + prepare_cmds + %{create_user} + end + + install_cmds + # Create tmp directory. + mkdir -pv -m 700 %{BUILDROOT}/run/lldpd + chown -v lldpd.lldpd %{BUILDROOT}/run/lldpd + end +end + +create_user + getent group lldpd >/dev/null || groupadd -r lldpd + getent passwd lldpd >/dev/null || \ + useradd -r -g lldpd -d / -s /sbin/nologin lldpd end packages package %{name} + prerequires = shadow-utils systemd-units + + script prein + %{create_user} + end + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable lldpd.service >/dev/null 2>&1 || : + /bin/systemctl stop lldpd.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 lldpd.service >/dev/null 2>&1 || : + end end end diff --git a/lldpd/lldpd.tmpfiles b/lldpd/lldpd.tmpfiles index 0e95b5a..5e3af54 100644 --- a/lldpd/lldpd.tmpfiles +++ b/lldpd/lldpd.tmpfiles @@ -1 +1 @@ -d /var/run/lldpd 0700 lldpd lldpd - +d /run/lldpd 0700 lldpd lldpd - diff --git a/lldpd/patches/lldpd-0.52.x-os-release.patch b/lldpd/patches/lldpd-0.52.x-os-release.patch deleted file mode 100644 index 3d45fee..0000000 --- a/lldpd/patches/lldpd-0.52.x-os-release.patch +++ /dev/null @@ -1,92 +0,0 @@ -commit ae87586a12eaf4e8329b88f6e0c629e7b14f27bc -Author: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sat May 28 14:29:33 2011 +0200 - - Add support to read /etc/os-release for system information. - - /etc/os-release is introduced with systemd which will be in all the - major distributions, soon. For backwards-compatibility, the lsb_release - method is still there and will be used if no /etc/os-release is available. - -diff --git a/src/lldpd.c b/src/lldpd.c -index b19af11..1641f13 100644 ---- a/src/lldpd.c -+++ b/src/lldpd.c -@@ -89,6 +89,7 @@ static void lldpd_decode(struct lldpd *, char *, int, - static void lldpd_update_chassis(struct lldpd_chassis *, - const struct lldpd_chassis *); - static char *lldpd_get_lsb_release(void); -+static char *lldpd_get_os_release(void); - #ifdef ENABLE_LLDPMED - static void lldpd_med(struct lldpd_chassis *); - #endif -@@ -553,6 +554,46 @@ lldpd_get_lsb_release() { - return NULL; - } - -+/* Same like lldpd_get_lsb_release but reads /etc/os-release for PRETTY_NAME=. */ -+static char * -+lldpd_get_os_release() { -+ static char release[1024]; -+ -+ FILE *fp = fopen("/etc/os-release", "r"); -+ if (!fp) { -+ LLOG_WARN("Could not open /etc/os-release to read system information"); -+ return NULL; -+ } -+ -+ char line[1024]; -+ char *key, *val; -+ -+ while ((fgets(line, 1024, fp) != NULL)) { -+ key = strtok(line, "="); -+ val = strtok(NULL, "="); -+ -+ if (strncmp(key, "PRETTY_NAME", 1024) == 0) { -+ strncpy(release, val, 1024); -+ break; -+ } -+ } -+ fclose(fp); -+ -+ /* Remove trailing newline and all " in the string. */ -+ char *ptr1 = release; -+ char *ptr2 = release; -+ while (*ptr1 != 0) { -+ if ((*ptr1 == '"') || (*ptr1 == '\n')) { -+ ++ptr1; -+ } else { -+ *ptr2++ = *ptr1++; -+ } -+ } -+ *ptr2 = 0; -+ -+ return release; -+} -+ - int - lldpd_callback_add(struct lldpd *cfg, int fd, void(*fn)(CALLBACK_SIG), void *data) - { -@@ -889,7 +930,7 @@ lldpd_update_localchassis(struct lldpd *cfg) - fatal("failed to set full system description"); - } else { - if (cfg->g_advertise_version) { -- if (asprintf(&LOCAL_CHASSIS(cfg)->c_descr, "%s%s %s %s", -+ if (asprintf(&LOCAL_CHASSIS(cfg)->c_descr, "%s %s %s %s", - cfg->g_lsb_release?cfg->g_lsb_release:"", - un.sysname, un.release, un.machine) - == -1) -@@ -1189,7 +1230,12 @@ lldpd_main(int argc, char *argv[]) - close(pid); - } - -- lsb_release = lldpd_get_lsb_release(); -+ /* Try to read system information from /etc/os-release if possible. -+ Fall back to lsb_release for compatibility. */ -+ lsb_release = lldpd_get_os_release(); -+ if (!lsb_release) { -+ lsb_release = lldpd_get_lsb_release(); -+ } - - priv_init(PRIVSEP_CHROOT); - diff --git a/lldpd/systemd/lldpd.service b/lldpd/systemd/lldpd.service index 49b454b..fed63a5 100644 --- a/lldpd/systemd/lldpd.service +++ b/lldpd/systemd/lldpd.service @@ -5,7 +5,8 @@ After=network.target [Service] RemainAfterExit=yes ExecStartPre=/sbin/modprobe 8021q -ExecStart=/usr/sbin/lldpd -c +ExecStart=/usr/sbin/lldpd -d -c +Restart=on-failure [Install] WantedBy=multi-user.target diff --git a/openssh/openssh.nm b/openssh/openssh.nm index 2555f7e..59bdc3c 100644 --- a/openssh/openssh.nm +++ b/openssh/openssh.nm @@ -5,7 +5,7 @@ name = openssh version = 5.9p1 -release = 1 +release = 2 groups = Application/Internet url = http://www.openssh.com/portable.html @@ -81,8 +81,8 @@ build end install_cmds - mkdir -pv %{BUILDROOT}/etc/ssh - cp -vf %{DIR_SOURCE}/sshd_config %{BUILDROOT}/etc/ssh/sshd_config + # Disable GSS API authentication because KRB5 is required for that. + sed -e "s/^.*GSSAPIAuthentication/#&/" -i %{BUILDROOT}/etc/ssh/ssh_config # Install scriptfile for key generation install -m 754 %{DIR_SOURCE}/ssh-keygen %{BUILDROOT}/usr/lib/openssh/ @@ -121,6 +121,10 @@ packages /usr/share/man/cat5/ssh_config.5 /usr/share/man/cat8/ssh-pkcs11-helper.8 end + + configfiles + /etc/ssh/ssh_config + end end package openssh-server @@ -145,6 +149,10 @@ packages /var/lib/sshd end + configfiles + /etc/ssh/sshd_config + end + prerequires = shadow-utils systemd-units script prein diff --git a/openssh/sshd_config b/openssh/sshd_config deleted file mode 100644 index dbf3228..0000000 --- a/openssh/sshd_config +++ /dev/null @@ -1,117 +0,0 @@ -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options change a -# default value. - -Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -# Disable legacy (protocol version 1) support in the server for new -# installations. In future the default will change to require explicit -# activation of protocol 1 -Protocol 2 - -# HostKey for protocol version 1 -#HostKey /etc/ssh/ssh_host_key -# HostKeys for protocol version 2 -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_dsa_key - -# Lifetime and size of ephemeral version 1 server key -#KeyRegenerationInterval 1h -#ServerKeyBits 1024 - -# Logging -# obsoletes QuietMode and FascistLogging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -LoginGraceTime 30s -#PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -RSAAuthentication yes -PubkeyAuthentication yes -#AuthorizedKeysFile .ssh/authorized_keys - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#RhostsRSAAuthentication no -# similar for protocol version 2 -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# RhostsRSAAuthentication and HostbasedAuthentication -IgnoreUserKnownHosts yes -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -PasswordAuthentication yes -#PermitEmptyPasswords no - -# Change to no to disable s/key passwords -ChallengeResponseAuthentication yes - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -UsePAM yes - -#AllowAgentForwarding yes -AllowTcpForwarding yes -#GatewayPorts no -X11Forwarding no -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PrintMotd yes -#PrintLastLog yes -#TCPKeepAlive yes -#UseLogin no -#UsePrivilegeSeparation yes -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS yes -#PidFile /var/run/sshd.pid -MaxStartups 5 -#PermitTunnel no -#ChrootDirectory none - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/lib/openssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# ForceCommand cvs server diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm index 80f2952..bc0b950 100644 --- a/pdns-recursor/pdns-recursor.nm +++ b/pdns-recursor/pdns-recursor.nm @@ -5,7 +5,7 @@ name = pdns-recursor version = 3.3 -release = 5 +release = 6 groups = Networking/DNS url = http://powerdns.com/ @@ -17,7 +17,7 @@ description package if you need a dns cache for your network. end -source_dl = +source_dl = http://downloads.powerdns.com/releases/ sources = %{thisapp}.tar.bz2 build @@ -25,6 +25,11 @@ build gcc-c++ boost-devel lua-devel + shadow-utils + end + + prepare_cmds + %{create_user} end build @@ -47,9 +52,20 @@ build # Create folder for chroot mkdir -pv %{BUILDROOT}/var/lib/pdns-recursor + + # Create directory for socket and stuff. + mkdir -pv %{BUILDROOT}/run/pdns-recursor + chown -v pdns-recursor.pdns-recursor %{BUILDROOT}/run/pdns-recursor end end +create_user + getent group pdns-recursor >/dev/null || groupadd -r pdns-recursor + getent passwd pdns-recursor >/dev/null || \ + useradd -r -g pdns-recursor -d /var/lib/pdns-recursor -s /sbin/nologin \ + pdns-recursor +end + packages package %{name} configfiles @@ -59,10 +75,7 @@ packages prerequires = shadow-utils systemd-units script prein - getent group pdns-recursor >/dev/null || groupadd -r pdns-recursor - getent passwd pdns-recursor >/dev/null || \ - useradd -r -g pdns-recursor -d /var/lib/pdns-recursor -s /sbin/nologin \ - pdns-recursor + %{create_user} end script postin diff --git a/radvd/radvd.nm b/radvd/radvd.nm index 0835bd2..932c991 100644 --- a/radvd/radvd.nm +++ b/radvd/radvd.nm @@ -5,7 +5,7 @@ name = radvd version = 1.8.3 -release = 3 +release = 4 groups = System/Daemons url = http://www.litech.org/radvd/ @@ -28,6 +28,7 @@ build flex flex-devel bison + shadow-utils end configure_options += \ @@ -35,8 +36,25 @@ build --with-pidfile=/run/radvd/radvd.pid prepare_cmds + %{create_user} + sed -e "s/-lfl/-lfl_pic/g" -i Makefile.* end + + install_cmds + mkdir -pv -m 750 %{BUILDROOT}/run/radvd + chown -v radvd.radvd %{BUILDROOT}/run/radvd + end +end + +create_user + getent group radvd >/dev/null || groupadd -r radvd + + # The radvd user also needs to be in the wheel group to get access to + # /proc. + getent passwd radvd >/dev/null || \ + useradd -r -g radvd -G wheel -d / -s /sbin/nologin \ + -c "User for the Router Advertisement daemon." radvd end packages @@ -46,14 +64,7 @@ packages prerequires += shadow-utils script prein - getent group radvd >/dev/null || groupadd -r radvd - - # The radvd user also needs to be in the wheel group to get access to - # /proc. - getent passwd radvd >/dev/null || \ - useradd -r -g radvd -G wheel -d / -s /sbin/nologin \ - -c "User for the Router Advertisement daemon." radvd - exit 0 + %{create_user} end # Just search for new unit files that were just installed. diff --git a/radvd/radvd.tmpfiles b/radvd/radvd.tmpfiles index 8bab232..c2a3047 100644 --- a/radvd/radvd.tmpfiles +++ b/radvd/radvd.tmpfiles @@ -1,2 +1,2 @@ -d /var/run/radvd 0750 radvd radvd - +d /run/radvd 0750 radvd radvd - hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM November 2011