Merge branch 'master' into core61

author Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>

Sun, 22 Jul 2012 08:30:29 +0000 (10:30 +0200)

committer Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>

Sun, 22 Jul 2012 08:30:29 +0000 (10:30 +0200)
author Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Sun, 22 Jul 2012 08:30:29 +0000 (10:30 +0200)
committer Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Sun, 22 Jul 2012 08:30:29 +0000 (10:30 +0200)
diff --git a/config/asterisk/asterisk.makeopts b/config/asterisk/asterisk.makeopts

index cac9675d553bc8f94607daebf854729ceadb1a61..6fa4c1108209d7cc9765f4519abf512403f07a84 100644 (file)
--- a/config/asterisk/asterisk.makeopts
+++ b/config/asterisk/asterisk.makeopts
@@ -1,37 +1,89 @@
-MENUSELECT_APPS=app_osplookup 
-MENUSELECT_CDR=cdr_odbc cdr_pgsql cdr_radius cdr_sqlite cdr_tds 
-MENUSELECT_CHANNELS=chan_gtalk chan_h323 chan_misdn chan_nbs chan_vpb 
-MENUSELECT_CODECS=codec_ilbc codec_speex 
+MENUSELECT_ADDONS=format_mp3
+MENUSELECT_APPS=app_fax app_jack app_osplookup 
+MENUSELECT_BRIDGES=
+MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite 
+MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds 
+MENUSELECT_CHANNELS=chan_console chan_gtalk chan_jingle chan_misdn chan_nbs chan_vpb chan_h323 
+MENUSELECT_CODECS=codec_ilbc codec_resample codec_speex 
  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_FUNCS=func_odbc func_speex 
+MENUSELECT_PBX=pbx_lua 
+MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_srtp res_timing_timerfd res_ais res_config_pgsql res_config_sqlite res_jabber res_timing_kqueue 
+MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils 
  MENUSELECT_CFLAGS=LOADABLE_MODULES 
+MENUSELECT_OPTS_app_voicemail=
+MENUSELECT_UTILS=
+MENUSELECT_AGIS=
  MENUSELECT_EMBED=
  MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM 
  MENUSELECT_MOH=MOH-OPSOUND-GSM 
  MENUSELECT_EXTRA_SOUNDS=EXTRA-SOUNDS-EN-GSM 
-MENUSELECT_BUILD_DEPS=res_adsi chan_local res_indications app_meetme res_monitor res_smdi res_features 
+MENUSELECT_BUILD_DEPS=chan_local app_voicemail app_meetme res_monitor res_agi res_adsi res_smdi res_crypto res_pktccops res_ael_share res_fax G711_NEW_ALGORITHM 
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
  MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc
  MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
  MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
  MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
  MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console
  MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_gtalk
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_jingle
  MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
  MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
  MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
+MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_resample
  MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
  MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar
  MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_srtp
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_timerfd
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_ais
  MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite
  MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_jabber
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce
  MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event
  MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_heap
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx
  MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events
  MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stringfields
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
+MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE
diff --git a/config/calamaris/mkreport b/config/calamaris/mkreport

index 53db9d5715d3c4cc064ad218267f2420b32213df..ee831624cc5d750a9797b9ed334f34b7682382c3 100644 (file)
--- a/config/calamaris/mkreport
+++ b/config/calamaris/mkreport
@@ -94,7 +94,7 @@ sub processlogfiles
                 {
                         if ($filestr =~ /access\.log/) {
                                 open (LOG,"gzip -dc $filestr |");
-                               foreach (<LOG>) {
+                               while (<LOG>) {
                                         if (substr($_,0,10) >= $date_from) { if (substr($_,0,10) <= $date_to) { print TMPLOG "$_"; } }
                                 }
                                 close(LOG);
@@ -106,7 +106,7 @@ sub processlogfiles
         {
                 if ($filestr =~ /access\.log/) {
                         open (LOG,$filestr);
-                       foreach (<LOG>) {
+                       while (<LOG>) {
                                 if (substr($_,0,10) >= $date_from) { if (substr($_,0,10) <= $date_to) { print TMPLOG "$_"; } }
                         }
                         close(LOG);
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl

index cd4bfd56610d0142944c3d21bfd0af07a96613ad..567f2e104ec5cb02bae2e588e0b18472a7ab7957 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -414,6 +414,14 @@ sub ipcidr
         return "$ip\/$cidr";
  }
  
+sub ipcidr2msk
+{
+       my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift);
+       my $netmask = &Net::IPv4Addr::ipv4_cidr2msk($cidr);
+       return "$ip\/$netmask";
+}
+
+
  sub validemail {
      my $mail = shift;
      return 0 if ( $mail !~ /^[0-9a-zA-Z\.\-\_]+\@[0-9a-zA-Z\.\-]+$/ );
diff --git a/config/rootfiles/common/Net-Telnet b/config/rootfiles/common/Net-Telnet

new file mode 100644 (file)

index 0000000..8769517
--- /dev/null
+++ b/config/rootfiles/common/Net-Telnet
@@ -0,0 +1,4 @@
+usr/lib/perl5/site_perl/5.12.3/Net/Telnet.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/Telnet
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/Telnet/.packlist
+#usr/share/man/man3/Net::Telnet.3
diff --git a/config/rootfiles/common/bison b/config/rootfiles/common/bison

index 89959cec7a969fae9ea9cee995a17525981e725c..ca8d5ee3b3d8e8bf7e5ceef19631b7af77ab4295 100644 (file)
--- a/config/rootfiles/common/bison
+++ b/config/rootfiles/common/bison
@@ -1,18 +1,32 @@
  #usr/bin/bison
  #usr/bin/yacc
-#usr/info/bison.info
  #usr/lib/liby.a
-#usr/man/man1/bison.1
  #usr/share/aclocal
  #usr/share/aclocal/bison-i18n.m4
  #usr/share/bison
  #usr/share/bison/README
+#usr/share/bison/bison.m4
+#usr/share/bison/c++-skel.m4
  #usr/share/bison/c++.m4
+#usr/share/bison/c-skel.m4
  #usr/share/bison/c.m4
  #usr/share/bison/glr.c
  #usr/share/bison/glr.cc
+#usr/share/bison/java-skel.m4
+#usr/share/bison/java.m4
  #usr/share/bison/lalr1.cc
+#usr/share/bison/lalr1.java
  #usr/share/bison/location.cc
  #usr/share/bison/m4sugar
+#usr/share/bison/m4sugar/foreach.m4
  #usr/share/bison/m4sugar/m4sugar.m4
+#usr/share/bison/stack.hh
+#usr/share/bison/xslt
+#usr/share/bison/xslt/bison.xsl
+#usr/share/bison/xslt/xml2dot.xsl
+#usr/share/bison/xslt/xml2text.xsl
+#usr/share/bison/xslt/xml2xhtml.xsl
  #usr/share/bison/yacc.c
+#usr/share/info/bison.info
+#usr/share/man/man1/bison.1
+#usr/share/man/man1/yacc.1
diff --git a/config/rootfiles/common/flex b/config/rootfiles/common/flex

index dfb21336952eea471087bb25ed67f3f8bc16d5ba..2b693dfef749f1aab56b0d3eb844b07d93f03f18 100644 (file)
--- a/config/rootfiles/common/flex
+++ b/config/rootfiles/common/flex
@@ -4,11 +4,7 @@
  #usr/info/flex.info
  #usr/info/flex.info-1
  #usr/info/flex.info-2
-#usr/info/flex.info-3
-#usr/info/flex.info-4
-#usr/info/flex.info-5
-#usr/info/flex.info-6
-#usr/info/flex.info-7
  #usr/lib/libfl.a
+#usr/lib/libfl_pic.a
  #usr/lib/libl.a
  #usr/man/man1/flex.1
diff --git a/config/rootfiles/common/m4 b/config/rootfiles/common/m4

index ff224c1457c8bfccaa07e46ba2b66f7e78d53b81..5e9acac223e1f0db68797d2b4b8394bb128cc77c 100644 (file)
--- a/config/rootfiles/common/m4
+++ b/config/rootfiles/common/m4
@@ -1,2 +1,5 @@
  #usr/bin/m4
-#usr/info/m4.info
+#usr/share/info/m4.info
+#usr/share/info/m4.info-1
+#usr/share/info/m4.info-2
+#usr/share/man/man1/m4.1
diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs

index adab51bc1eea62f39c70c0e8101a43476534b5ed..3c0b398d3aaf3270193dae2d9299103c12f14bb1 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -5,6 +5,7 @@ usr/local/bin/backupctrl
  usr/local/bin/dhcpctrl
  usr/local/bin/extrahdctrl
  usr/local/bin/fireinfoctrl
+usr/local/bin/getconntracktable
  usr/local/bin/getipstat
  usr/local/bin/getiptstate
  #usr/local/bin/iowrap
diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn

index 18f4d31972382cb38af90bf0d0cc1730cb46c980..6be9a102a7598252cd358ee484d3f294bf4dd5e3 100644 (file)
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -8,6 +8,7 @@ usr/sbin/openvpn
  var/ipfire/ovpn
  var/ipfire/ovpn/ca
  var/ipfire/ovpn/caconfig
+var/ipfire/ovpn/ccd
  #var/ipfire/ovpn/certs
  var/ipfire/ovpn/certs/index.txt
  var/ipfire/ovpn/certs/serial
diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam

index 3472453fcb10dbf05a95210383cbbe388beae4e1..a14302aab8b4b59500b34709187cd8eb89c8b864 100644 (file)
--- a/config/rootfiles/common/pam
+++ b/config/rootfiles/common/pam
@@ -1,3 +1,4 @@
+#etc/environment
  etc/pam.d
  #etc/pam.d/ftp
  #etc/pam.d/imap
@@ -9,12 +10,14 @@ etc/security
  #etc/security/access.conf
  #etc/security/group.conf
  #etc/security/limits.conf
+#etc/security/limits.d
+#etc/security/namespace.d
  #etc/security/pam_env.conf
  #etc/security/time.conf
  lib/libpam.so.0
-lib/libpam.so.0.81.3
+lib/libpam.so.0.81.10
  lib/libpam_misc.so.0
-lib/libpam_misc.so.0.81.2
+lib/libpam_misc.so.0.81.3
  lib/libpamc.so.0
  lib/libpamc.so.0.81.0
  #lib/security
@@ -30,6 +33,8 @@ lib/security/pam_deny.so
  lib/security/pam_env.so
  #lib/security/pam_exec.la
  lib/security/pam_exec.so
+#lib/security/pam_faildelay.la
+lib/security/pam_faildelay.so
  #lib/security/pam_filter
  #lib/security/pam_filter.la
  #lib/security/pam_filter.so
@@ -40,6 +45,8 @@ lib/security/pam_exec.so
  lib/security/pam_group.so
  #lib/security/pam_issue.la
  lib/security/pam_issue.so
+#lib/security/pam_keyinit.la
+lib/security/pam_keyinit.so
  #lib/security/pam_lastlog.la
  #lib/security/pam_lastlog.so
  #lib/security/pam_limits.la
@@ -48,6 +55,8 @@ lib/security/pam_limits.so
  #lib/security/pam_listfile.so
  #lib/security/pam_localuser.la
  #lib/security/pam_localuser.so
+#lib/security/pam_loginuid.la
+lib/security/pam_loginuid.so
  #lib/security/pam_mail.la
  lib/security/pam_mail.so
  #lib/security/pam_mkhomedir.la
@@ -58,8 +67,8 @@ lib/security/pam_mail.so
  lib/security/pam_nologin.so
  #lib/security/pam_permit.la
  lib/security/pam_permit.so
-#lib/security/pam_rhosts_auth.la
-#lib/security/pam_rhosts_auth.so
+#lib/security/pam_rhosts.la
+lib/security/pam_rhosts.so
  #lib/security/pam_rootok.la
  #lib/security/pam_rootok.so
  #lib/security/pam_securetty.la
@@ -87,6 +96,7 @@ lib/security/pam_unix.so
  #lib/security/pam_xauth.la
  #lib/security/pam_xauth.so
  lib/security/unix_chkpwd
+lib/security/unix_update
  #sbin/pam_tally
  #usr/include/security
  #usr/include/security/_pam_compat.h
@@ -96,7 +106,6 @@ lib/security/unix_chkpwd
  #usr/include/security/pam_client.h
  #usr/include/security/pam_ext.h
  #usr/include/security/pam_filter.h
-#usr/include/security/pam_malloc.h
  #usr/include/security/pam_misc.h
  #usr/include/security/pam_modules.h
  #usr/include/security/pam_modutil.h
@@ -106,10 +115,11 @@ usr/lib/libpam.so
  usr/lib/libpam_misc.so
  #usr/lib/libpamc.la
  usr/lib/libpamc.so
-#usr/share/doc/Linux-PAM-0.99.4.0
-#usr/share/doc/Linux-PAM-0.99.4.0/spec
-#usr/share/doc/Linux-PAM-0.99.4.0/spec/draft-morgan-pam-current.txt
-#usr/share/doc/Linux-PAM-0.99.4.0/spec/rfc86.0.txt
+#usr/share/doc/Linux-PAM
+#usr/share/doc/Linux-PAM/draft-morgan-pam-current.txt
+#usr/share/doc/Linux-PAM/index.html
+#usr/share/doc/Linux-PAM/rfc86.0.txt
+#usr/share/man/man3/misc_conv.3
  #usr/share/man/man3/pam.3
  #usr/share/man/man3/pam_acct_mgmt.3
  #usr/share/man/man3/pam_authenticate.3
@@ -125,6 +135,9 @@ usr/lib/libpamc.so
  #usr/share/man/man3/pam_getenv.3
  #usr/share/man/man3/pam_getenvlist.3
  #usr/share/man/man3/pam_info.3
+#usr/share/man/man3/pam_misc_drop_env.3
+#usr/share/man/man3/pam_misc_paste_env.3
+#usr/share/man/man3/pam_misc_setenv.3
  #usr/share/man/man3/pam_open_session.3
  #usr/share/man/man3/pam_prompt.3
  #usr/share/man/man3/pam_putenv.3
@@ -132,6 +145,11 @@ usr/lib/libpamc.so
  #usr/share/man/man3/pam_set_item.3
  #usr/share/man/man3/pam_setcred.3
  #usr/share/man/man3/pam_sm_acct_mgmt.3
+#usr/share/man/man3/pam_sm_authenticate.3
+#usr/share/man/man3/pam_sm_chauthtok.3
+#usr/share/man/man3/pam_sm_close_session.3
+#usr/share/man/man3/pam_sm_open_session.3
+#usr/share/man/man3/pam_sm_setcred.3
  #usr/share/man/man3/pam_start.3
  #usr/share/man/man3/pam_strerror.3
  #usr/share/man/man3/pam_syslog.3
@@ -139,21 +157,53 @@ usr/lib/libpamc.so
  #usr/share/man/man3/pam_vinfo.3
  #usr/share/man/man3/pam_vprompt.3
  #usr/share/man/man3/pam_vsyslog.3
+#usr/share/man/man3/pam_xauth_data.3
  #usr/share/man/man5/access.conf.5
+#usr/share/man/man5/group.conf.5
+#usr/share/man/man5/limits.conf.5
  #usr/share/man/man5/pam.conf.5
  #usr/share/man/man5/pam.d.5
  #usr/share/man/man5/pam_env.conf.5
+#usr/share/man/man5/time.conf.5
  #usr/share/man/man8/PAM.8
  #usr/share/man/man8/pam.8
  #usr/share/man/man8/pam_access.8
  #usr/share/man/man8/pam_cracklib.8
+#usr/share/man/man8/pam_debug.8
  #usr/share/man/man8/pam_deny.8
  #usr/share/man/man8/pam_echo.8
  #usr/share/man/man8/pam_env.8
  #usr/share/man/man8/pam_exec.8
+#usr/share/man/man8/pam_faildelay.8
+#usr/share/man/man8/pam_filter.8
+#usr/share/man/man8/pam_ftp.8
+#usr/share/man/man8/pam_group.8
+#usr/share/man/man8/pam_issue.8
+#usr/share/man/man8/pam_keyinit.8
+#usr/share/man/man8/pam_lastlog.8
+#usr/share/man/man8/pam_limits.8
+#usr/share/man/man8/pam_listfile.8
  #usr/share/man/man8/pam_localuser.8
+#usr/share/man/man8/pam_loginuid.8
+#usr/share/man/man8/pam_mail.8
+#usr/share/man/man8/pam_mkhomedir.8
+#usr/share/man/man8/pam_motd.8
  #usr/share/man/man8/pam_nologin.8
+#usr/share/man/man8/pam_permit.8
+#usr/share/man/man8/pam_rhosts.8
+#usr/share/man/man8/pam_rootok.8
  #usr/share/man/man8/pam_securetty.8
+#usr/share/man/man8/pam_shells.8
  #usr/share/man/man8/pam_succeed_if.8
+#usr/share/man/man8/pam_tally.8
+#usr/share/man/man8/pam_time.8
+#usr/share/man/man8/pam_tty_audit.8
+#usr/share/man/man8/pam_umask.8
+#usr/share/man/man8/pam_unix.8
+#usr/share/man/man8/pam_userdb.8
+#usr/share/man/man8/pam_warn.8
+#usr/share/man/man8/pam_wheel.8
  #usr/share/man/man8/pam_xauth.8
  #usr/share/man/man8/unix_chkpwd.8
+#usr/share/man/man8/unix_update.8
+#var/run/sepermit
diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid

index 2c37c171c49947fe3622a52fecf283baf10863b6..1e015bfcd0e1b73e9fb07cab30cb946ec1f7d484 100644 (file)
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -24,6 +24,9 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/TRANSLATORS
  #usr/lib/squid/errors/af
  #usr/lib/squid/errors/af/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/af/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/af/ERR_AGENT_WPAD
  #usr/lib/squid/errors/af/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/af/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/af/ERR_CANNOT_FORWARD
@@ -60,6 +63,7 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/af/ERR_URN_RESOLVE
  #usr/lib/squid/errors/af/ERR_WRITE_ERROR
  #usr/lib/squid/errors/af/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/af/error-details.txt
  #usr/lib/squid/errors/ar
  #usr/lib/squid/errors/ar-ae
  #usr/lib/squid/errors/ar-bh
@@ -78,6 +82,9 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/ar-tn
  #usr/lib/squid/errors/ar-ye
  #usr/lib/squid/errors/ar/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ar/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ar/ERR_AGENT_WPAD
  #usr/lib/squid/errors/ar/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/ar/ERR_CANNOT_FORWARD
@@ -114,9 +121,13 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/ar/ERR_URN_RESOLVE
  #usr/lib/squid/errors/ar/ERR_WRITE_ERROR
  #usr/lib/squid/errors/ar/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ar/error-details.txt
  #usr/lib/squid/errors/az
  #usr/lib/squid/errors/az-az
  #usr/lib/squid/errors/az/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/az/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/az/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/az/ERR_AGENT_WPAD
  #usr/lib/squid/errors/az/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/az/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/az/ERR_CANNOT_FORWARD
@@ -153,9 +164,13 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/az/ERR_URN_RESOLVE
  #usr/lib/squid/errors/az/ERR_WRITE_ERROR
  #usr/lib/squid/errors/az/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/az/error-details.txt
  #usr/lib/squid/errors/bg
  #usr/lib/squid/errors/bg-bg
  #usr/lib/squid/errors/bg/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/bg/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/bg/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/bg/ERR_AGENT_WPAD
  #usr/lib/squid/errors/bg/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/bg/ERR_CANNOT_FORWARD
@@ -192,8 +207,12 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/bg/ERR_URN_RESOLVE
  #usr/lib/squid/errors/bg/ERR_WRITE_ERROR
  #usr/lib/squid/errors/bg/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/bg/error-details.txt
  #usr/lib/squid/errors/ca
  #usr/lib/squid/errors/ca/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ca/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ca/ERR_AGENT_WPAD
  #usr/lib/squid/errors/ca/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/ca/ERR_CANNOT_FORWARD
@@ -230,9 +249,13 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/ca/ERR_URN_RESOLVE
  #usr/lib/squid/errors/ca/ERR_WRITE_ERROR
  #usr/lib/squid/errors/ca/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ca/error-details.txt
  #usr/lib/squid/errors/cs
  #usr/lib/squid/errors/cs-cz
  #usr/lib/squid/errors/cs/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/cs/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/cs/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/cs/ERR_AGENT_WPAD
  #usr/lib/squid/errors/cs/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/cs/ERR_CANNOT_FORWARD
@@ -269,9 +292,13 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/cs/ERR_URN_RESOLVE
  #usr/lib/squid/errors/cs/ERR_WRITE_ERROR
  #usr/lib/squid/errors/cs/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/cs/error-details.txt
  #usr/lib/squid/errors/da
  #usr/lib/squid/errors/da-dk
  #usr/lib/squid/errors/da/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/da/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/da/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/da/ERR_AGENT_WPAD
  #usr/lib/squid/errors/da/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/da/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/da/ERR_CANNOT_FORWARD
@@ -308,6 +335,7 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/da/ERR_URN_RESOLVE
  #usr/lib/squid/errors/da/ERR_WRITE_ERROR
  #usr/lib/squid/errors/da/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/da/error-details.txt
  #usr/lib/squid/errors/de
  #usr/lib/squid/errors/de-at
  #usr/lib/squid/errors/de-ch
@@ -315,6 +343,9 @@ usr/lib/squid/diskd
  #usr/lib/squid/errors/de-li
  #usr/lib/squid/errors/de-lu
  usr/lib/squid/errors/de/ERR_ACCESS_DENIED
+usr/lib/squid/errors/de/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/de/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/de/ERR_AGENT_WPAD
  usr/lib/squid/errors/de/ERR_CACHE_ACCESS_DENIED
  usr/lib/squid/errors/de/ERR_CACHE_MGR_ACCESS_DENIED
  usr/lib/squid/errors/de/ERR_CANNOT_FORWARD
@@ -351,9 +382,13 @@ usr/lib/squid/errors/de/ERR_UNSUP_REQ
  usr/lib/squid/errors/de/ERR_URN_RESOLVE
  usr/lib/squid/errors/de/ERR_WRITE_ERROR
  usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/de/error-details.txt
  #usr/lib/squid/errors/el
  #usr/lib/squid/errors/el-gr
  #usr/lib/squid/errors/el/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/el/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/el/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/el/ERR_AGENT_WPAD
  #usr/lib/squid/errors/el/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/el/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/el/ERR_CANNOT_FORWARD
@@ -390,6 +425,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/el/ERR_URN_RESOLVE
  #usr/lib/squid/errors/el/ERR_WRITE_ERROR
  #usr/lib/squid/errors/el/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/el/error-details.txt
  #usr/lib/squid/errors/en
  #usr/lib/squid/errors/en-au
  #usr/lib/squid/errors/en-bz
@@ -407,6 +443,9 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/en-za
  #usr/lib/squid/errors/en-zw
  usr/lib/squid/errors/en/ERR_ACCESS_DENIED
+usr/lib/squid/errors/en/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/en/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/en/ERR_AGENT_WPAD
  usr/lib/squid/errors/en/ERR_CACHE_ACCESS_DENIED
  usr/lib/squid/errors/en/ERR_CACHE_MGR_ACCESS_DENIED
  usr/lib/squid/errors/en/ERR_CANNOT_FORWARD
@@ -443,6 +482,7 @@ usr/lib/squid/errors/en/ERR_UNSUP_REQ
  usr/lib/squid/errors/en/ERR_URN_RESOLVE
  usr/lib/squid/errors/en/ERR_WRITE_ERROR
  usr/lib/squid/errors/en/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/en/error-details.txt
  #usr/lib/squid/errors/es
  #usr/lib/squid/errors/es-ar
  #usr/lib/squid/errors/es-bo
@@ -464,6 +504,9 @@ usr/lib/squid/errors/en/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/es-uy
  #usr/lib/squid/errors/es-ve
  usr/lib/squid/errors/es/ERR_ACCESS_DENIED
+usr/lib/squid/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/es/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/es/ERR_AGENT_WPAD
  usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED
  usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
  usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
@@ -500,9 +543,13 @@ usr/lib/squid/errors/es/ERR_UNSUP_REQ
  usr/lib/squid/errors/es/ERR_URN_RESOLVE
  usr/lib/squid/errors/es/ERR_WRITE_ERROR
  usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/es/error-details.txt
  #usr/lib/squid/errors/et
  #usr/lib/squid/errors/et-ee
  #usr/lib/squid/errors/et/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/et/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/et/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/et/ERR_AGENT_WPAD
  #usr/lib/squid/errors/et/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/et/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/et/ERR_CANNOT_FORWARD
@@ -539,10 +586,14 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/et/ERR_URN_RESOLVE
  #usr/lib/squid/errors/et/ERR_WRITE_ERROR
  #usr/lib/squid/errors/et/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/et/error-details.txt
  #usr/lib/squid/errors/fa
  #usr/lib/squid/errors/fa-fa
  #usr/lib/squid/errors/fa-ir
  #usr/lib/squid/errors/fa/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/fa/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/fa/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/fa/ERR_AGENT_WPAD
  #usr/lib/squid/errors/fa/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/fa/ERR_CANNOT_FORWARD
@@ -579,9 +630,13 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/fa/ERR_URN_RESOLVE
  #usr/lib/squid/errors/fa/ERR_WRITE_ERROR
  #usr/lib/squid/errors/fa/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/fa/error-details.txt
  #usr/lib/squid/errors/fi
  #usr/lib/squid/errors/fi-fi
  #usr/lib/squid/errors/fi/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/fi/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/fi/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/fi/ERR_AGENT_WPAD
  #usr/lib/squid/errors/fi/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/fi/ERR_CANNOT_FORWARD
@@ -618,6 +673,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/fi/ERR_URN_RESOLVE
  #usr/lib/squid/errors/fi/ERR_WRITE_ERROR
  #usr/lib/squid/errors/fi/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/fi/error-details.txt
  #usr/lib/squid/errors/fr
  #usr/lib/squid/errors/fr-be
  #usr/lib/squid/errors/fr-ca
@@ -626,6 +682,9 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/fr-lu
  #usr/lib/squid/errors/fr-mc
  usr/lib/squid/errors/fr/ERR_ACCESS_DENIED
+usr/lib/squid/errors/fr/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/fr/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/fr/ERR_AGENT_WPAD
  usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED
  usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
  usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
@@ -662,9 +721,13 @@ usr/lib/squid/errors/fr/ERR_UNSUP_REQ
  usr/lib/squid/errors/fr/ERR_URN_RESOLVE
  usr/lib/squid/errors/fr/ERR_WRITE_ERROR
  usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/fr/error-details.txt
  #usr/lib/squid/errors/he
  #usr/lib/squid/errors/he-il
  #usr/lib/squid/errors/he/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/he/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/he/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/he/ERR_AGENT_WPAD
  #usr/lib/squid/errors/he/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/he/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/he/ERR_CANNOT_FORWARD
@@ -701,9 +764,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/he/ERR_URN_RESOLVE
  #usr/lib/squid/errors/he/ERR_WRITE_ERROR
  #usr/lib/squid/errors/he/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/he/error-details.txt
  #usr/lib/squid/errors/hu
  #usr/lib/squid/errors/hu-hu
  #usr/lib/squid/errors/hu/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/hu/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/hu/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/hu/ERR_AGENT_WPAD
  #usr/lib/squid/errors/hu/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/hu/ERR_CANNOT_FORWARD
@@ -740,10 +807,14 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/hu/ERR_URN_RESOLVE
  #usr/lib/squid/errors/hu/ERR_WRITE_ERROR
  #usr/lib/squid/errors/hu/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/hu/error-details.txt
  #usr/lib/squid/errors/hy
  #usr/lib/squid/errors/hy-am
  #usr/lib/squid/errors/hy-armn
  #usr/lib/squid/errors/hy/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/hy/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/hy/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/hy/ERR_AGENT_WPAD
  #usr/lib/squid/errors/hy/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/hy/ERR_CANNOT_FORWARD
@@ -780,9 +851,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/hy/ERR_URN_RESOLVE
  #usr/lib/squid/errors/hy/ERR_WRITE_ERROR
  #usr/lib/squid/errors/hy/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/hy/error-details.txt
  #usr/lib/squid/errors/id
  #usr/lib/squid/errors/id-id
  #usr/lib/squid/errors/id/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/id/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/id/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/id/ERR_AGENT_WPAD
  #usr/lib/squid/errors/id/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/id/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/id/ERR_CANNOT_FORWARD
@@ -819,10 +894,14 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/id/ERR_URN_RESOLVE
  #usr/lib/squid/errors/id/ERR_WRITE_ERROR
  #usr/lib/squid/errors/id/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/id/error-details.txt
  #usr/lib/squid/errors/it
  #usr/lib/squid/errors/it-ch
  #usr/lib/squid/errors/it-it
  #usr/lib/squid/errors/it/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/it/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/it/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/it/ERR_AGENT_WPAD
  #usr/lib/squid/errors/it/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/it/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/it/ERR_CANNOT_FORWARD
@@ -859,9 +938,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/it/ERR_URN_RESOLVE
  #usr/lib/squid/errors/it/ERR_WRITE_ERROR
  #usr/lib/squid/errors/it/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/it/error-details.txt
  #usr/lib/squid/errors/ja
  #usr/lib/squid/errors/ja-jp
  #usr/lib/squid/errors/ja/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ja/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ja/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ja/ERR_AGENT_WPAD
  #usr/lib/squid/errors/ja/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/ja/ERR_CANNOT_FORWARD
@@ -898,10 +981,14 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/ja/ERR_URN_RESOLVE
  #usr/lib/squid/errors/ja/ERR_WRITE_ERROR
  #usr/lib/squid/errors/ja/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ja/error-details.txt
  #usr/lib/squid/errors/ko
  #usr/lib/squid/errors/ko-kp
  #usr/lib/squid/errors/ko-kr
  #usr/lib/squid/errors/ko/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ko/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ko/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ko/ERR_AGENT_WPAD
  #usr/lib/squid/errors/ko/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/ko/ERR_CANNOT_FORWARD
@@ -938,9 +1025,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/ko/ERR_URN_RESOLVE
  #usr/lib/squid/errors/ko/ERR_WRITE_ERROR
  #usr/lib/squid/errors/ko/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ko/error-details.txt
  #usr/lib/squid/errors/lt
  #usr/lib/squid/errors/lt-lt
  #usr/lib/squid/errors/lt/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/lt/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/lt/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/lt/ERR_AGENT_WPAD
  #usr/lib/squid/errors/lt/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/lt/ERR_CANNOT_FORWARD
@@ -977,9 +1068,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/lt/ERR_URN_RESOLVE
  #usr/lib/squid/errors/lt/ERR_WRITE_ERROR
  #usr/lib/squid/errors/lt/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/lt/error-details.txt
  #usr/lib/squid/errors/lv
  #usr/lib/squid/errors/lv-lv
  #usr/lib/squid/errors/lv/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/lv/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/lv/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/lv/ERR_AGENT_WPAD
  #usr/lib/squid/errors/lv/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/lv/ERR_CANNOT_FORWARD
@@ -1016,9 +1111,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/lv/ERR_URN_RESOLVE
  #usr/lib/squid/errors/lv/ERR_WRITE_ERROR
  #usr/lib/squid/errors/lv/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/lv/error-details.txt
  #usr/lib/squid/errors/ms
  #usr/lib/squid/errors/ms-my
  #usr/lib/squid/errors/ms/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ms/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ms/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ms/ERR_AGENT_WPAD
  #usr/lib/squid/errors/ms/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/ms/ERR_CANNOT_FORWARD
@@ -1055,9 +1154,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/ms/ERR_URN_RESOLVE
  #usr/lib/squid/errors/ms/ERR_WRITE_ERROR
  #usr/lib/squid/errors/ms/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ms/error-details.txt
  #usr/lib/squid/errors/nl
  #usr/lib/squid/errors/nl-nl
  #usr/lib/squid/errors/nl/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/nl/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/nl/ERR_AGENT_WPAD
  #usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD
@@ -1094,8 +1197,12 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/nl/ERR_URN_RESOLVE
  #usr/lib/squid/errors/nl/ERR_WRITE_ERROR
  #usr/lib/squid/errors/nl/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/nl/error-details.txt
  #usr/lib/squid/errors/oc
  #usr/lib/squid/errors/oc/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/oc/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/oc/ERR_AGENT_WPAD
  #usr/lib/squid/errors/oc/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/oc/ERR_CANNOT_FORWARD
@@ -1132,9 +1239,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/oc/ERR_URN_RESOLVE
  #usr/lib/squid/errors/oc/ERR_WRITE_ERROR
  #usr/lib/squid/errors/oc/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/oc/error-details.txt
  #usr/lib/squid/errors/pl
  #usr/lib/squid/errors/pl-pl
  usr/lib/squid/errors/pl/ERR_ACCESS_DENIED
+usr/lib/squid/errors/pl/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/pl/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/pl/ERR_AGENT_WPAD
  usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED
  usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED
  usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD
@@ -1171,9 +1282,13 @@ usr/lib/squid/errors/pl/ERR_UNSUP_REQ
  usr/lib/squid/errors/pl/ERR_URN_RESOLVE
  usr/lib/squid/errors/pl/ERR_WRITE_ERROR
  usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/pl/error-details.txt
  #usr/lib/squid/errors/pt
  #usr/lib/squid/errors/pt-br
  #usr/lib/squid/errors/pt-br/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/pt-br/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/pt-br/ERR_AGENT_WPAD
  #usr/lib/squid/errors/pt-br/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/pt-br/ERR_CANNOT_FORWARD
@@ -1210,8 +1325,12 @@ usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/pt-br/ERR_URN_RESOLVE
  #usr/lib/squid/errors/pt-br/ERR_WRITE_ERROR
  #usr/lib/squid/errors/pt-br/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/pt-br/error-details.txt
  #usr/lib/squid/errors/pt-pt
  #usr/lib/squid/errors/pt/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/pt/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/pt/ERR_AGENT_WPAD
  #usr/lib/squid/errors/pt/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/pt/ERR_CANNOT_FORWARD
@@ -1248,10 +1367,14 @@ usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/pt/ERR_URN_RESOLVE
  #usr/lib/squid/errors/pt/ERR_WRITE_ERROR
  #usr/lib/squid/errors/pt/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/pt/error-details.txt
  #usr/lib/squid/errors/ro
  #usr/lib/squid/errors/ro-md
  #usr/lib/squid/errors/ro-ro
  #usr/lib/squid/errors/ro/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ro/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ro/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ro/ERR_AGENT_WPAD
  #usr/lib/squid/errors/ro/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/ro/ERR_CANNOT_FORWARD
@@ -1288,9 +1411,13 @@ usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/ro/ERR_URN_RESOLVE
  #usr/lib/squid/errors/ro/ERR_WRITE_ERROR
  #usr/lib/squid/errors/ro/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ro/error-details.txt
  #usr/lib/squid/errors/ru
  #usr/lib/squid/errors/ru-ru
  usr/lib/squid/errors/ru/ERR_ACCESS_DENIED
+usr/lib/squid/errors/ru/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/ru/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/ru/ERR_AGENT_WPAD
  usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED
  usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
  usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD
@@ -1327,9 +1454,13 @@ usr/lib/squid/errors/ru/ERR_UNSUP_REQ
  usr/lib/squid/errors/ru/ERR_URN_RESOLVE
  usr/lib/squid/errors/ru/ERR_WRITE_ERROR
  usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/ru/error-details.txt
  #usr/lib/squid/errors/sk
  #usr/lib/squid/errors/sk-sk
  #usr/lib/squid/errors/sk/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sk/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sk/ERR_AGENT_WPAD
  #usr/lib/squid/errors/sk/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/sk/ERR_CANNOT_FORWARD
@@ -1366,9 +1497,56 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/sk/ERR_URN_RESOLVE
  #usr/lib/squid/errors/sk/ERR_WRITE_ERROR
  #usr/lib/squid/errors/sk/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sk/error-details.txt
+#usr/lib/squid/errors/sl
+#usr/lib/squid/errors/sl-si
+#usr/lib/squid/errors/sl/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sl/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sl/ERR_AGENT_WPAD
+#usr/lib/squid/errors/sl/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/sl/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sl/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/sl/ERR_DIR_LISTING
+#usr/lib/squid/errors/sl/ERR_DNS_FAIL
+#usr/lib/squid/errors/sl/ERR_ESI
+#usr/lib/squid/errors/sl/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/sl/ERR_FTP_DISABLED
+#usr/lib/squid/errors/sl/ERR_FTP_FAILURE
+#usr/lib/squid/errors/sl/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/sl/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/sl/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/sl/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/sl/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/sl/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/sl/ERR_GATEWAY_FAILURE
+#usr/lib/squid/errors/sl/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/sl/ERR_INVALID_REQ
+#usr/lib/squid/errors/sl/ERR_INVALID_RESP
+#usr/lib/squid/errors/sl/ERR_INVALID_URL
+#usr/lib/squid/errors/sl/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/sl/ERR_NO_RELAY
+#usr/lib/squid/errors/sl/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sl/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/sl/ERR_READ_ERROR
+#usr/lib/squid/errors/sl/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/sl/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/sl/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/sl/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/sl/ERR_TOO_BIG
+#usr/lib/squid/errors/sl/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/sl/ERR_UNSUP_REQ
+#usr/lib/squid/errors/sl/ERR_URN_RESOLVE
+#usr/lib/squid/errors/sl/ERR_WRITE_ERROR
+#usr/lib/squid/errors/sl/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sl/error-details.txt
  #usr/lib/squid/errors/sr
  #usr/lib/squid/errors/sr-cyrl
  #usr/lib/squid/errors/sr-cyrl/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sr-cyrl/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sr-cyrl/ERR_AGENT_WPAD
  #usr/lib/squid/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/sr-cyrl/ERR_CANNOT_FORWARD
@@ -1405,9 +1583,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/sr-cyrl/ERR_URN_RESOLVE
  #usr/lib/squid/errors/sr-cyrl/ERR_WRITE_ERROR
  #usr/lib/squid/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sr-cyrl/error-details.txt
  #usr/lib/squid/errors/sr-latn
  #usr/lib/squid/errors/sr-latn-cs
  #usr/lib/squid/errors/sr-latn/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sr-latn/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sr-latn/ERR_AGENT_WPAD
  #usr/lib/squid/errors/sr-latn/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/sr-latn/ERR_CANNOT_FORWARD
@@ -1444,11 +1626,15 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/sr-latn/ERR_URN_RESOLVE
  #usr/lib/squid/errors/sr-latn/ERR_WRITE_ERROR
  #usr/lib/squid/errors/sr-latn/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sr-latn/error-details.txt
  #usr/lib/squid/errors/sr-sp
  #usr/lib/squid/errors/sv
  #usr/lib/squid/errors/sv-fi
  #usr/lib/squid/errors/sv-se
  #usr/lib/squid/errors/sv/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sv/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sv/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sv/ERR_AGENT_WPAD
  #usr/lib/squid/errors/sv/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/sv/ERR_CANNOT_FORWARD
@@ -1485,8 +1671,12 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/sv/ERR_URN_RESOLVE
  #usr/lib/squid/errors/sv/ERR_WRITE_ERROR
  #usr/lib/squid/errors/sv/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sv/error-details.txt
  #usr/lib/squid/errors/templates
  #usr/lib/squid/errors/templates/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/templates/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/templates/ERR_AGENT_WPAD
  #usr/lib/squid/errors/templates/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/templates/ERR_CANNOT_FORWARD
@@ -1523,9 +1713,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/templates/ERR_URN_RESOLVE
  #usr/lib/squid/errors/templates/ERR_WRITE_ERROR
  #usr/lib/squid/errors/templates/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/templates/error-details.txt
  #usr/lib/squid/errors/th
  #usr/lib/squid/errors/th-th
  #usr/lib/squid/errors/th/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/th/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/th/ERR_AGENT_WPAD
  #usr/lib/squid/errors/th/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/th/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/th/ERR_CANNOT_FORWARD
@@ -1562,9 +1756,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/th/ERR_URN_RESOLVE
  #usr/lib/squid/errors/th/ERR_WRITE_ERROR
  #usr/lib/squid/errors/th/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/th/error-details.txt
  #usr/lib/squid/errors/tr
  #usr/lib/squid/errors/tr-tr
  #usr/lib/squid/errors/tr/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/tr/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/tr/ERR_AGENT_WPAD
  #usr/lib/squid/errors/tr/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/tr/ERR_CANNOT_FORWARD
@@ -1601,9 +1799,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/tr/ERR_URN_RESOLVE
  #usr/lib/squid/errors/tr/ERR_WRITE_ERROR
  #usr/lib/squid/errors/tr/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/tr/error-details.txt
  #usr/lib/squid/errors/uk
  #usr/lib/squid/errors/uk-ua
  #usr/lib/squid/errors/uk/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/uk/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/uk/ERR_AGENT_WPAD
  #usr/lib/squid/errors/uk/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/uk/ERR_CANNOT_FORWARD
@@ -1640,8 +1842,12 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/uk/ERR_URN_RESOLVE
  #usr/lib/squid/errors/uk/ERR_WRITE_ERROR
  #usr/lib/squid/errors/uk/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/uk/error-details.txt
  #usr/lib/squid/errors/uz
  #usr/lib/squid/errors/uz/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/uz/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/uz/ERR_AGENT_WPAD
  #usr/lib/squid/errors/uz/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/uz/ERR_CANNOT_FORWARD
@@ -1678,9 +1884,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/uz/ERR_URN_RESOLVE
  #usr/lib/squid/errors/uz/ERR_WRITE_ERROR
  #usr/lib/squid/errors/uz/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/uz/error-details.txt
  #usr/lib/squid/errors/vi
  #usr/lib/squid/errors/vi-vn
  #usr/lib/squid/errors/vi/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/vi/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/vi/ERR_AGENT_WPAD
  #usr/lib/squid/errors/vi/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/vi/ERR_CANNOT_FORWARD
@@ -1717,8 +1927,12 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/vi/ERR_URN_RESOLVE
  #usr/lib/squid/errors/vi/ERR_WRITE_ERROR
  #usr/lib/squid/errors/vi/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/vi/error-details.txt
  #usr/lib/squid/errors/zh-cn
  #usr/lib/squid/errors/zh-cn/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/zh-cn/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/zh-cn/ERR_AGENT_WPAD
  #usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/zh-cn/ERR_CANNOT_FORWARD
@@ -1755,11 +1969,15 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/zh-cn/ERR_URN_RESOLVE
  #usr/lib/squid/errors/zh-cn/ERR_WRITE_ERROR
  #usr/lib/squid/errors/zh-cn/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/zh-cn/error-details.txt
  #usr/lib/squid/errors/zh-hk
  #usr/lib/squid/errors/zh-mo
  #usr/lib/squid/errors/zh-sg
  #usr/lib/squid/errors/zh-tw
  #usr/lib/squid/errors/zh-tw/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/zh-tw/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/zh-tw/ERR_AGENT_WPAD
  #usr/lib/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
  #usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
  #usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD
@@ -1796,6 +2014,7 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
  #usr/lib/squid/errors/zh-tw/ERR_URN_RESOLVE
  #usr/lib/squid/errors/zh-tw/ERR_WRITE_ERROR
  #usr/lib/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/zh-tw/error-details.txt
  usr/lib/squid/fakeauth_auth
  usr/lib/squid/icons
  #usr/lib/squid/icons/anthony-binhex.gif
diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data

index 0ebcf62208b72a676d73cd157eb25a8ad849ff93..3d6af6db2c344879ce41b599812cb0328ef89d2d 100644 (file)
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -2,22 +2,26 @@ etc/usb_modeswitch.d
  lib/udev/rules.d/40-usb_modeswitch.rules
  #usr/share/usb_modeswitch
  usr/share/usb_modeswitch/03f0:002a
+usr/share/usb_modeswitch/0408:f000
  usr/share/usb_modeswitch/0421:060c
  usr/share/usb_modeswitch/0421:0610
  usr/share/usb_modeswitch/0421:0622
  usr/share/usb_modeswitch/0421:0627
  usr/share/usb_modeswitch/0421:062c
+usr/share/usb_modeswitch/0421:0637
  usr/share/usb_modeswitch/0471:1210:uMa=Philips
  usr/share/usb_modeswitch/0471:1210:uMa=Wisue
  usr/share/usb_modeswitch/0471:1237
  usr/share/usb_modeswitch/0482:024d
  usr/share/usb_modeswitch/04bb:bccd
+usr/share/usb_modeswitch/04e8:680c
  usr/share/usb_modeswitch/04e8:689a
  usr/share/usb_modeswitch/04e8:f000:sMo=U209
  usr/share/usb_modeswitch/057c:84ff
  usr/share/usb_modeswitch/05c6:1000:sVe=GT
  usr/share/usb_modeswitch/05c6:1000:sVe=Option
  usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA
+usr/share/usb_modeswitch/05c6:1000:uMa=CELOT
  usr/share/usb_modeswitch/05c6:1000:uMa=DGT
  usr/share/usb_modeswitch/05c6:1000:uMa=Option
  usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG
@@ -34,6 +38,7 @@ usr/share/usb_modeswitch/07d1:a804
  usr/share/usb_modeswitch/0930:0d46
  usr/share/usb_modeswitch/0ace:2011
  usr/share/usb_modeswitch/0ace:20ff
+usr/share/usb_modeswitch/0af0:4007
  usr/share/usb_modeswitch/0af0:6711
  usr/share/usb_modeswitch/0af0:6731
  usr/share/usb_modeswitch/0af0:6751
@@ -64,6 +69,7 @@ usr/share/usb_modeswitch/0af0:7801
  usr/share/usb_modeswitch/0af0:7901
  usr/share/usb_modeswitch/0af0:7a01
  usr/share/usb_modeswitch/0af0:7a05
+usr/share/usb_modeswitch/0af0:8006
  usr/share/usb_modeswitch/0af0:8200
  usr/share/usb_modeswitch/0af0:8201
  usr/share/usb_modeswitch/0af0:8300
@@ -95,6 +101,7 @@ usr/share/usb_modeswitch/0cf3:20ff
  usr/share/usb_modeswitch/0d46:45a1
  usr/share/usb_modeswitch/0d46:45a5
  usr/share/usb_modeswitch/0df7:0800
+usr/share/usb_modeswitch/0e8d:0002
  usr/share/usb_modeswitch/0e8d:7109
  usr/share/usb_modeswitch/0fce:d0cf
  usr/share/usb_modeswitch/0fce:d0e1
@@ -114,6 +121,7 @@ usr/share/usb_modeswitch/106c:3b03
  usr/share/usb_modeswitch/106c:3b05
  usr/share/usb_modeswitch/106c:3b06
  usr/share/usb_modeswitch/1076:7f40
+usr/share/usb_modeswitch/109b:f009
  usr/share/usb_modeswitch/1199:0fff
  usr/share/usb_modeswitch/1266:1000
  usr/share/usb_modeswitch/12d1:1001
@@ -129,6 +137,7 @@ usr/share/usb_modeswitch/12d1:14ad
  usr/share/usb_modeswitch/12d1:14b5
  usr/share/usb_modeswitch/12d1:14b7
  usr/share/usb_modeswitch/12d1:14c1
+usr/share/usb_modeswitch/12d1:14c3
  usr/share/usb_modeswitch/12d1:14c4
  usr/share/usb_modeswitch/12d1:14c5
  usr/share/usb_modeswitch/12d1:14d1
@@ -140,6 +149,7 @@ usr/share/usb_modeswitch/12d1:1523
  usr/share/usb_modeswitch/12d1:1553
  usr/share/usb_modeswitch/12d1:1557
  usr/share/usb_modeswitch/12d1:1c0b
+usr/share/usb_modeswitch/12d1:1c24
  usr/share/usb_modeswitch/12d1:1d50
  usr/share/usb_modeswitch/12d1:1da1
  usr/share/usb_modeswitch/12d1:1f01
@@ -164,9 +174,10 @@ usr/share/usb_modeswitch/198f:bccd
  usr/share/usb_modeswitch/19d2:0003
  usr/share/usb_modeswitch/19d2:0013
  usr/share/usb_modeswitch/19d2:0026
+usr/share/usb_modeswitch/19d2:0031
  usr/share/usb_modeswitch/19d2:0040
  usr/share/usb_modeswitch/19d2:0053
-usr/share/usb_modeswitch/19d2:0083
+usr/share/usb_modeswitch/19d2:0083:uPr=WCDMA
  usr/share/usb_modeswitch/19d2:0101
  usr/share/usb_modeswitch/19d2:0103
  usr/share/usb_modeswitch/19d2:0110
@@ -185,6 +196,7 @@ usr/share/usb_modeswitch/19d2:1179
  usr/share/usb_modeswitch/19d2:1201
  usr/share/usb_modeswitch/19d2:1216
  usr/share/usb_modeswitch/19d2:1224
+usr/share/usb_modeswitch/19d2:1514
  usr/share/usb_modeswitch/19d2:1517
  usr/share/usb_modeswitch/19d2:1520
  usr/share/usb_modeswitch/19d2:2000
@@ -203,6 +215,7 @@ usr/share/usb_modeswitch/1c9e:1001
  usr/share/usb_modeswitch/1c9e:6061
  usr/share/usb_modeswitch/1c9e:9200
  usr/share/usb_modeswitch/1c9e:9800
+usr/share/usb_modeswitch/1c9e:98ff
  usr/share/usb_modeswitch/1c9e:9e00
  usr/share/usb_modeswitch/1c9e:f000
  usr/share/usb_modeswitch/1da5:f000
@@ -214,13 +227,17 @@ usr/share/usb_modeswitch/1edf:6003
  usr/share/usb_modeswitch/1ee8:0009
  usr/share/usb_modeswitch/1ee8:0013
  usr/share/usb_modeswitch/1ee8:0040
+usr/share/usb_modeswitch/1ee8:0060
  usr/share/usb_modeswitch/1f28:0021
  usr/share/usb_modeswitch/1fac:0032
  usr/share/usb_modeswitch/1fac:0130
+usr/share/usb_modeswitch/2001:a80b
  usr/share/usb_modeswitch/201e:1023
  usr/share/usb_modeswitch/201e:2009
  usr/share/usb_modeswitch/2020:f00e
+usr/share/usb_modeswitch/2077:f000
  usr/share/usb_modeswitch/21f5:1000
+usr/share/usb_modeswitch/22f4:0021
  usr/share/usb_modeswitch/230d:0001
  usr/share/usb_modeswitch/230d:0007
  usr/share/usb_modeswitch/8888:6500
diff --git a/config/rootfiles/core/58/filelists/Net-Telnet b/config/rootfiles/core/58/filelists/Net-Telnet

new file mode 120000 (symlink)

index 0000000..66ca926
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/Net-Telnet
@@ -0,0 +1 @@
+../../../common/Net-Telnet
+\ No newline at end of file
diff --git a/config/rootfiles/core/59/update.sh b/config/rootfiles/core/59/update.sh

index 6764f1c20ca82e044c99d66dc1ab78c337e9f6ad..2f1d865a8e9eea3f90cb2cdda08cd39045659a11 100644 (file)
--- a/config/rootfiles/core/59/update.sh
+++ b/config/rootfiles/core/59/update.sh
@@ -39,6 +39,7 @@ done
  
  #
  #Extract files
+extract_files
  
  #
  #Start services
diff --git a/config/rootfiles/core/60/exclude b/config/rootfiles/core/60/exclude

new file mode 100644 (file)

index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/core/60/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/60/filelists/files b/config/rootfiles/core/60/filelists/files

new file mode 100644 (file)

index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/core/60/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/core/60/filelists/strongswan b/config/rootfiles/core/60/filelists/strongswan

new file mode 120000 (symlink)

index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/60/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
+\ No newline at end of file
diff --git a/config/rootfiles/core/60/meta b/config/rootfiles/core/60/meta

new file mode 100644 (file)

index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/60/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/60/update.sh b/config/rootfiles/core/60/update.sh

new file mode 100644 (file)

index 0000000..5aaa23e
--- /dev/null
+++ b/config/rootfiles/core/60/update.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=60
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/ipsec stop
+
+#
+#Extract files
+extract_files
+#
+#Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       /etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+#      depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+#      depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+#      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
+#fi
+
+
+#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
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/core/61/exclude b/config/rootfiles/core/61/exclude

new file mode 100644 (file)

index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/core/61/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/61/filelists/GeoIP b/config/rootfiles/core/61/filelists/GeoIP

new file mode 100644 (file)

index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/61/filelists/Net-Telnet b/config/rootfiles/core/61/filelists/Net-Telnet

new file mode 120000 (symlink)

index 0000000..66ca926
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/Net-Telnet
@@ -0,0 +1 @@
+../../../common/Net-Telnet
+\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files

new file mode 100644 (file)

index 0000000..55fbcf1
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/files
@@ -0,0 +1,15 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/collectd
+opt/pakfire/lib/functions.sh
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/services.cgi
+var/ipfire/general-functions.pl
+var/ipfire/langs
+var/ipfire/proxy/calamaris/bin/mkreport
+usr/local/bin/getconntracktable
+usr/sbin/redirect_wrapper
diff --git a/config/rootfiles/core/61/filelists/fireinfo b/config/rootfiles/core/61/filelists/fireinfo

new file mode 120000 (symlink)

index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
+\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/logwatch b/config/rootfiles/core/61/filelists/logwatch

new file mode 120000 (symlink)

index 0000000..f14eabd
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
+\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/openvpn b/config/rootfiles/core/61/filelists/openvpn

new file mode 120000 (symlink)

index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
+\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/pam b/config/rootfiles/core/61/filelists/pam

new file mode 120000 (symlink)

index 0000000..660a1d8
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/pam
@@ -0,0 +1 @@
+../../../common/pam
+\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/php b/config/rootfiles/core/61/filelists/php

new file mode 120000 (symlink)

index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/php
@@ -0,0 +1 @@
+../../../common/php
+\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/squid b/config/rootfiles/core/61/filelists/squid

new file mode 120000 (symlink)

index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
+\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/usb_modeswitch_data b/config/rootfiles/core/61/filelists/usb_modeswitch_data

new file mode 120000 (symlink)

index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
+\ No newline at end of file
diff --git a/config/rootfiles/core/61/meta b/config/rootfiles/core/61/meta

new file mode 100644 (file)

index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/61/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/61/update.sh b/config/rootfiles/core/61/update.sh

new file mode 100644 (file)

index 0000000..e6b504a
--- /dev/null
+++ b/config/rootfiles/core/61/update.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=61
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+#
+#Remove old usb_modeswitch_data
+rm -rf /usr/share/usb_modeswitch
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/squid restart &>/dev/null
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+#      depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+#      depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+#      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
+#fi
+
+
+#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
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk

index 896d900bb8cefe0af98115ce83408a28936e1f9e..7e7b25e963dc2c128e69b551ee4606e412230257 100644 (file)
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -5,49 +5,79 @@ etc/rc.d/rc3.d/S30asterisk
  etc/rc.d/rc6.d/K30asterisk
  #usr/include/asterisk
  #usr/include/asterisk.h
+#usr/include/asterisk/_private.h
  #usr/include/asterisk/abstract_jb.h
  #usr/include/asterisk/acl.h
  #usr/include/asterisk/adsi.h
  #usr/include/asterisk/ael_structs.h
-#usr/include/asterisk/aes.h
  #usr/include/asterisk/agi.h
  #usr/include/asterisk/alaw.h
+#usr/include/asterisk/aoc.h
  #usr/include/asterisk/app.h
  #usr/include/asterisk/ast_expr.h
+#usr/include/asterisk/ast_version.h
  #usr/include/asterisk/astdb.h
  #usr/include/asterisk/astmm.h
  #usr/include/asterisk/astobj.h
  #usr/include/asterisk/astobj2.h
  #usr/include/asterisk/astosp.h
  #usr/include/asterisk/audiohook.h
+#usr/include/asterisk/autochan.h
  #usr/include/asterisk/autoconfig.h
+#usr/include/asterisk/bridging.h
+#usr/include/asterisk/bridging_features.h
+#usr/include/asterisk/bridging_technology.h
  #usr/include/asterisk/build.h
+#usr/include/asterisk/buildinfo.h
  #usr/include/asterisk/buildopts.h
+#usr/include/asterisk/calendar.h
  #usr/include/asterisk/callerid.h
  #usr/include/asterisk/causes.h
+#usr/include/asterisk/ccss.h
  #usr/include/asterisk/cdr.h
+#usr/include/asterisk/cel.h
  #usr/include/asterisk/channel.h
+#usr/include/asterisk/channelstate.h
  #usr/include/asterisk/chanvars.h
  #usr/include/asterisk/cli.h
  #usr/include/asterisk/compat.h
  #usr/include/asterisk/compiler.h
  #usr/include/asterisk/config.h
  #usr/include/asterisk/crypto.h
-#usr/include/asterisk/dahdi_compat.h
+#usr/include/asterisk/data.h
+#usr/include/asterisk/datastore.h
  #usr/include/asterisk/devicestate.h
  #usr/include/asterisk/dial.h
+#usr/include/asterisk/dlinkedlists.h
  #usr/include/asterisk/dns.h
  #usr/include/asterisk/dnsmgr.h
+#usr/include/asterisk/doxygen
+#usr/include/asterisk/doxygen/architecture.h
+#usr/include/asterisk/doxygen/asterisk-git-howto.h
+#usr/include/asterisk/doxygen/commits.h
+#usr/include/asterisk/doxygen/licensing.h
+#usr/include/asterisk/doxygen/mantisworkflow.h
+#usr/include/asterisk/doxygen/releases.h
+#usr/include/asterisk/doxygen/reviewboard.h
  #usr/include/asterisk/doxyref.h
  #usr/include/asterisk/dsp.h
  #usr/include/asterisk/dundi.h
  #usr/include/asterisk/endian.h
  #usr/include/asterisk/enum.h
+#usr/include/asterisk/event.h
+#usr/include/asterisk/event_defs.h
+#usr/include/asterisk/extconf.h
  #usr/include/asterisk/features.h
  #usr/include/asterisk/file.h
  #usr/include/asterisk/frame.h
+#usr/include/asterisk/frame_defs.h
+#usr/include/asterisk/framehook.h
  #usr/include/asterisk/fskmodem.h
+#usr/include/asterisk/fskmodem_float.h
+#usr/include/asterisk/fskmodem_int.h
  #usr/include/asterisk/global_datastores.h
+#usr/include/asterisk/hashtab.h
+#usr/include/asterisk/heap.h
  #usr/include/asterisk/http.h
  #usr/include/asterisk/image.h
  #usr/include/asterisk/indications.h
@@ -61,34 +91,49 @@ etc/rc.d/rc6.d/K30asterisk
  #usr/include/asterisk/logger.h
  #usr/include/asterisk/manager.h
  #usr/include/asterisk/md5.h
+#usr/include/asterisk/mod_format.h
  #usr/include/asterisk/module.h
  #usr/include/asterisk/monitor.h
  #usr/include/asterisk/musiconhold.h
  #usr/include/asterisk/netsock.h
+#usr/include/asterisk/netsock2.h
+#usr/include/asterisk/network.h
+#usr/include/asterisk/optional_api.h
  #usr/include/asterisk/options.h
  #usr/include/asterisk/paths.h
  #usr/include/asterisk/pbx.h
+#usr/include/asterisk/pktccops.h
  #usr/include/asterisk/plc.h
  #usr/include/asterisk/poll-compat.h
  #usr/include/asterisk/privacy.h
+#usr/include/asterisk/pval.h
+#usr/include/asterisk/res_fax.h
  #usr/include/asterisk/res_odbc.h
-#usr/include/asterisk/rtp.h
+#usr/include/asterisk/res_srtp.h
+#usr/include/asterisk/rtp_engine.h
  #usr/include/asterisk/say.h
  #usr/include/asterisk/sched.h
+#usr/include/asterisk/security_events.h
+#usr/include/asterisk/security_events_defs.h
  #usr/include/asterisk/select.h
  #usr/include/asterisk/sha1.h
+#usr/include/asterisk/slin.h
  #usr/include/asterisk/slinfactory.h
  #usr/include/asterisk/smdi.h
  #usr/include/asterisk/speech.h
  #usr/include/asterisk/srv.h
  #usr/include/asterisk/stringfields.h
  #usr/include/asterisk/strings.h
+#usr/include/asterisk/stun.h
+#usr/include/asterisk/syslog.h
+#usr/include/asterisk/taskprocessor.h
+#usr/include/asterisk/tcptls.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
+#usr/include/asterisk/timing.h
  #usr/include/asterisk/transcap.h
  #usr/include/asterisk/translate.h
  #usr/include/asterisk/udptl.h
@@ -96,21 +141,23 @@ etc/rc.d/rc6.d/K30asterisk
  #usr/include/asterisk/unaligned.h
  #usr/include/asterisk/utils.h
  #usr/include/asterisk/version.h
+#usr/include/asterisk/xml.h
+#usr/include/asterisk/xmldoc.h
  #usr/lib/asterisk
  #usr/lib/asterisk/modules
-usr/lib/asterisk/modules/app_addon_sql_mysql.so
  usr/lib/asterisk/modules/app_adsiprog.so
  usr/lib/asterisk/modules/app_alarmreceiver.so
  usr/lib/asterisk/modules/app_amd.so
  usr/lib/asterisk/modules/app_authenticate.so
  usr/lib/asterisk/modules/app_cdr.so
+usr/lib/asterisk/modules/app_celgenuserevent.so
  usr/lib/asterisk/modules/app_chanisavail.so
  usr/lib/asterisk/modules/app_channelredirect.so
  usr/lib/asterisk/modules/app_chanspy.so
+usr/lib/asterisk/modules/app_confbridge.so
  usr/lib/asterisk/modules/app_controlplayback.so
  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_dial.so
  usr/lib/asterisk/modules/app_dictate.so
@@ -126,37 +173,35 @@ usr/lib/asterisk/modules/app_flash.so
  usr/lib/asterisk/modules/app_followme.so
  usr/lib/asterisk/modules/app_forkcdr.so
  usr/lib/asterisk/modules/app_getcpeid.so
-usr/lib/asterisk/modules/app_hasnewvoicemail.so
  usr/lib/asterisk/modules/app_ices.so
  usr/lib/asterisk/modules/app_image.so
  usr/lib/asterisk/modules/app_ivrdemo.so
-usr/lib/asterisk/modules/app_lookupblacklist.so
-usr/lib/asterisk/modules/app_lookupcidname.so
  usr/lib/asterisk/modules/app_macro.so
  usr/lib/asterisk/modules/app_meetme.so
  usr/lib/asterisk/modules/app_milliwatt.so
+usr/lib/asterisk/modules/app_minivm.so
  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_mysql.so
  usr/lib/asterisk/modules/app_nbscat.so
+usr/lib/asterisk/modules/app_originate.so
  usr/lib/asterisk/modules/app_page.so
  usr/lib/asterisk/modules/app_parkandannounce.so
  usr/lib/asterisk/modules/app_playback.so
+usr/lib/asterisk/modules/app_playtones.so
  usr/lib/asterisk/modules/app_privacy.so
  usr/lib/asterisk/modules/app_queue.so
-usr/lib/asterisk/modules/app_random.so
  usr/lib/asterisk/modules/app_read.so
+usr/lib/asterisk/modules/app_readexten.so
  usr/lib/asterisk/modules/app_readfile.so
-usr/lib/asterisk/modules/app_realtime.so
  usr/lib/asterisk/modules/app_record.so
-usr/lib/asterisk/modules/app_rpt.so
+usr/lib/asterisk/modules/app_saycounted.so
  usr/lib/asterisk/modules/app_saycountpl.so
  usr/lib/asterisk/modules/app_sayunixtime.so
  usr/lib/asterisk/modules/app_senddtmf.so
  usr/lib/asterisk/modules/app_sendtext.so
  usr/lib/asterisk/modules/app_setcallerid.so
-usr/lib/asterisk/modules/app_setcdruserfield.so
-usr/lib/asterisk/modules/app_settransfercapability.so
  usr/lib/asterisk/modules/app_skel.so
  usr/lib/asterisk/modules/app_sms.so
  usr/lib/asterisk/modules/app_softhangup.so
@@ -172,33 +217,48 @@ usr/lib/asterisk/modules/app_verbose.so
  usr/lib/asterisk/modules/app_voicemail.so
  usr/lib/asterisk/modules/app_waitforring.so
  usr/lib/asterisk/modules/app_waitforsilence.so
+usr/lib/asterisk/modules/app_waituntil.so
  usr/lib/asterisk/modules/app_while.so
  usr/lib/asterisk/modules/app_zapateller.so
-usr/lib/asterisk/modules/cdr_addon_mysql.so
+usr/lib/asterisk/modules/bridge_builtin_features.so
+usr/lib/asterisk/modules/bridge_multiplexed.so
+usr/lib/asterisk/modules/bridge_simple.so
+usr/lib/asterisk/modules/bridge_softmix.so
  usr/lib/asterisk/modules/cdr_csv.so
  usr/lib/asterisk/modules/cdr_custom.so
  usr/lib/asterisk/modules/cdr_manager.so
+usr/lib/asterisk/modules/cdr_mysql.so
+usr/lib/asterisk/modules/cdr_sqlite3_custom.so
+usr/lib/asterisk/modules/cdr_syslog.so
+usr/lib/asterisk/modules/cel_custom.so
+usr/lib/asterisk/modules/cel_manager.so
+usr/lib/asterisk/modules/cel_sqlite3_custom.so
  usr/lib/asterisk/modules/chan_agent.so
  usr/lib/asterisk/modules/chan_alsa.so
+usr/lib/asterisk/modules/chan_bridge.so
  usr/lib/asterisk/modules/chan_capi.so
  usr/lib/asterisk/modules/chan_dahdi.so
-usr/lib/asterisk/modules/chan_features.so
  usr/lib/asterisk/modules/chan_iax2.so
  usr/lib/asterisk/modules/chan_local.so
  usr/lib/asterisk/modules/chan_mgcp.so
+usr/lib/asterisk/modules/chan_mobile.so
+usr/lib/asterisk/modules/chan_multicast_rtp.so
  usr/lib/asterisk/modules/chan_ooh323.so
  usr/lib/asterisk/modules/chan_oss.so
  usr/lib/asterisk/modules/chan_phone.so
  usr/lib/asterisk/modules/chan_sip.so
  usr/lib/asterisk/modules/chan_skinny.so
+usr/lib/asterisk/modules/chan_unistim.so
  usr/lib/asterisk/modules/codec_a_mu.so
  usr/lib/asterisk/modules/codec_adpcm.so
  usr/lib/asterisk/modules/codec_alaw.so
  usr/lib/asterisk/modules/codec_dahdi.so
+usr/lib/asterisk/modules/codec_g722.so
  usr/lib/asterisk/modules/codec_g726.so
  usr/lib/asterisk/modules/codec_gsm.so
  usr/lib/asterisk/modules/codec_lpc10.so
  usr/lib/asterisk/modules/codec_ulaw.so
+usr/lib/asterisk/modules/format_g719.so
  usr/lib/asterisk/modules/format_g723.so
  usr/lib/asterisk/modules/format_g726.so
  usr/lib/asterisk/modules/format_g729.so
@@ -207,36 +267,56 @@ usr/lib/asterisk/modules/format_h263.so
  usr/lib/asterisk/modules/format_h264.so
  usr/lib/asterisk/modules/format_ilbc.so
  usr/lib/asterisk/modules/format_jpeg.so
-usr/lib/asterisk/modules/format_mp3.so
  usr/lib/asterisk/modules/format_ogg_vorbis.so
  usr/lib/asterisk/modules/format_pcm.so
+usr/lib/asterisk/modules/format_siren14.so
+usr/lib/asterisk/modules/format_siren7.so
  usr/lib/asterisk/modules/format_sln.so
+usr/lib/asterisk/modules/format_sln16.so
  usr/lib/asterisk/modules/format_vox.so
  usr/lib/asterisk/modules/format_wav.so
  usr/lib/asterisk/modules/format_wav_gsm.so
+usr/lib/asterisk/modules/func_aes.so
  usr/lib/asterisk/modules/func_audiohookinherit.so
  usr/lib/asterisk/modules/func_base64.so
+usr/lib/asterisk/modules/func_blacklist.so
+usr/lib/asterisk/modules/func_callcompletion.so
  usr/lib/asterisk/modules/func_callerid.so
  usr/lib/asterisk/modules/func_cdr.so
  usr/lib/asterisk/modules/func_channel.so
+usr/lib/asterisk/modules/func_config.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_dialgroup.so
+usr/lib/asterisk/modules/func_dialplan.so
  usr/lib/asterisk/modules/func_enum.so
  usr/lib/asterisk/modules/func_env.so
+usr/lib/asterisk/modules/func_extstate.so
+usr/lib/asterisk/modules/func_frame_trace.so
  usr/lib/asterisk/modules/func_global.so
  usr/lib/asterisk/modules/func_groupcount.so
-usr/lib/asterisk/modules/func_language.so
+usr/lib/asterisk/modules/func_iconv.so
+usr/lib/asterisk/modules/func_lock.so
  usr/lib/asterisk/modules/func_logic.so
  usr/lib/asterisk/modules/func_math.so
  usr/lib/asterisk/modules/func_md5.so
-usr/lib/asterisk/modules/func_moh.so
+usr/lib/asterisk/modules/func_module.so
+usr/lib/asterisk/modules/func_pitchshift.so
  usr/lib/asterisk/modules/func_rand.so
  usr/lib/asterisk/modules/func_realtime.so
  usr/lib/asterisk/modules/func_sha1.so
+usr/lib/asterisk/modules/func_shell.so
+usr/lib/asterisk/modules/func_sprintf.so
+usr/lib/asterisk/modules/func_srv.so
  usr/lib/asterisk/modules/func_strings.so
+usr/lib/asterisk/modules/func_sysinfo.so
  usr/lib/asterisk/modules/func_timeout.so
  usr/lib/asterisk/modules/func_uri.so
+usr/lib/asterisk/modules/func_version.so
+usr/lib/asterisk/modules/func_vmcount.so
+usr/lib/asterisk/modules/func_volume.so
  usr/lib/asterisk/modules/pbx_ael.so
  usr/lib/asterisk/modules/pbx_config.so
  usr/lib/asterisk/modules/pbx_dundi.so
@@ -244,58 +324,91 @@ usr/lib/asterisk/modules/pbx_loopback.so
  usr/lib/asterisk/modules/pbx_realtime.so
  usr/lib/asterisk/modules/pbx_spool.so
  usr/lib/asterisk/modules/res_adsi.so
+usr/lib/asterisk/modules/res_ael_share.so
  usr/lib/asterisk/modules/res_agi.so
+usr/lib/asterisk/modules/res_calendar.so
+usr/lib/asterisk/modules/res_clialiases.so
  usr/lib/asterisk/modules/res_clioriginate.so
+usr/lib/asterisk/modules/res_config_curl.so
+usr/lib/asterisk/modules/res_config_ldap.so
  usr/lib/asterisk/modules/res_config_mysql.so
  usr/lib/asterisk/modules/res_convert.so
  usr/lib/asterisk/modules/res_crypto.so
-usr/lib/asterisk/modules/res_features.so
-usr/lib/asterisk/modules/res_indications.so
+usr/lib/asterisk/modules/res_curl.so
+usr/lib/asterisk/modules/res_fax.so
+usr/lib/asterisk/modules/res_fax_spandsp.so
+usr/lib/asterisk/modules/res_limit.so
  usr/lib/asterisk/modules/res_monitor.so
  usr/lib/asterisk/modules/res_musiconhold.so
+usr/lib/asterisk/modules/res_mutestream.so
+usr/lib/asterisk/modules/res_phoneprov.so
+usr/lib/asterisk/modules/res_pktccops.so
+usr/lib/asterisk/modules/res_realtime.so
+usr/lib/asterisk/modules/res_rtp_asterisk.so
+usr/lib/asterisk/modules/res_rtp_multicast.so
+usr/lib/asterisk/modules/res_security_log.so
  usr/lib/asterisk/modules/res_smdi.so
  usr/lib/asterisk/modules/res_snmp.so
  usr/lib/asterisk/modules/res_speech.so
+usr/lib/asterisk/modules/res_stun_monitor.so
+usr/lib/asterisk/modules/res_timing_dahdi.so
+usr/lib/asterisk/modules/res_timing_pthread.so
  #usr/lib/pkgconfig/asterisk.pc
-usr/sbin/aelparse
  usr/sbin/asterisk
  usr/sbin/astgenkey
-usr/sbin/astman
  usr/sbin/autosupport
-usr/sbin/muted
  usr/sbin/rasterisk
  usr/sbin/safe_asterisk
-usr/sbin/smsq
-usr/sbin/stereorize
-usr/sbin/streamplayer
  #usr/share/man/man8/asterisk.8
  #usr/share/man/man8/astgenkey.8
  #usr/share/man/man8/autosupport.8
  #usr/share/man/man8/safe_asterisk.8
  var/ipfire/asterisk/adsi.conf
-var/ipfire/asterisk/adtranvofr.conf
  var/ipfire/asterisk/agents.conf
+var/ipfire/asterisk/ais.conf
  var/ipfire/asterisk/alarmreceiver.conf
  var/ipfire/asterisk/alsa.conf
  var/ipfire/asterisk/amd.conf
+var/ipfire/asterisk/app_mysql.conf
  var/ipfire/asterisk/asterisk.adsi
  var/ipfire/asterisk/asterisk.conf
  #var/ipfire/asterisk/asterisk.makeopts
+var/ipfire/asterisk/calendar.conf
+var/ipfire/asterisk/ccss.conf
  var/ipfire/asterisk/cdr.conf
+var/ipfire/asterisk/cdr_adaptive_odbc.conf
  var/ipfire/asterisk/cdr_custom.conf
  var/ipfire/asterisk/cdr_manager.conf
  var/ipfire/asterisk/cdr_mysql.conf
  var/ipfire/asterisk/cdr_odbc.conf
  var/ipfire/asterisk/cdr_pgsql.conf
+var/ipfire/asterisk/cdr_sqlite3_custom.conf
+var/ipfire/asterisk/cdr_syslog.conf
  var/ipfire/asterisk/cdr_tds.conf
+var/ipfire/asterisk/cel.conf
+var/ipfire/asterisk/cel_custom.conf
+var/ipfire/asterisk/cel_odbc.conf
+var/ipfire/asterisk/cel_pgsql.conf
+var/ipfire/asterisk/cel_sqlite3_custom.conf
+var/ipfire/asterisk/cel_tds.conf
  var/ipfire/asterisk/chan_dahdi.conf
+var/ipfire/asterisk/chan_mobile.conf
+var/ipfire/asterisk/chan_ooh323.conf
+var/ipfire/asterisk/cli.conf
+var/ipfire/asterisk/cli_aliases.conf
+var/ipfire/asterisk/cli_permissions.conf
  var/ipfire/asterisk/codecs.conf
+var/ipfire/asterisk/console.conf
+var/ipfire/asterisk/dbsep.conf
  var/ipfire/asterisk/dnsmgr.conf
+var/ipfire/asterisk/dsp.conf
  var/ipfire/asterisk/dundi.conf
  var/ipfire/asterisk/enum.conf
  var/ipfire/asterisk/extconfig.conf
  var/ipfire/asterisk/extensions.ael
  var/ipfire/asterisk/extensions.conf
+var/ipfire/asterisk/extensions.lua
+var/ipfire/asterisk/extensions_minivm.conf
  var/ipfire/asterisk/features.conf
  var/ipfire/asterisk/festival.conf
  var/ipfire/asterisk/followme.conf
@@ -307,26 +420,32 @@ var/ipfire/asterisk/iax.conf
  var/ipfire/asterisk/iaxprov.conf
  var/ipfire/asterisk/indications.conf
  var/ipfire/asterisk/jabber.conf
+var/ipfire/asterisk/jingle.conf
  var/ipfire/asterisk/logger.conf
  var/ipfire/asterisk/manager.conf
  var/ipfire/asterisk/meetme.conf
  var/ipfire/asterisk/mgcp.conf
+var/ipfire/asterisk/minivm.conf
  var/ipfire/asterisk/misdn.conf
  var/ipfire/asterisk/modules.conf
  var/ipfire/asterisk/musiconhold.conf
  var/ipfire/asterisk/muted.conf
-var/ipfire/asterisk/mysql.conf
-var/ipfire/asterisk/ooh323.conf
  var/ipfire/asterisk/osp.conf
  var/ipfire/asterisk/oss.conf
  var/ipfire/asterisk/phone.conf
-var/ipfire/asterisk/privacy.conf
+var/ipfire/asterisk/phoneprov.conf
+var/ipfire/asterisk/queuerules.conf
  var/ipfire/asterisk/queues.conf
-var/ipfire/asterisk/res_mysql.conf
+var/ipfire/asterisk/res_config_mysql.conf
+var/ipfire/asterisk/res_config_sqlite.conf
+var/ipfire/asterisk/res_curl.conf
+var/ipfire/asterisk/res_fax.conf
+var/ipfire/asterisk/res_ldap.conf
  var/ipfire/asterisk/res_odbc.conf
  var/ipfire/asterisk/res_pgsql.conf
+var/ipfire/asterisk/res_pktccops.conf
  var/ipfire/asterisk/res_snmp.conf
-var/ipfire/asterisk/rpt.conf
+var/ipfire/asterisk/res_stun_monitor.conf
  var/ipfire/asterisk/rtp.conf
  var/ipfire/asterisk/say.conf
  var/ipfire/asterisk/sip.conf
@@ -336,6 +455,7 @@ var/ipfire/asterisk/sla.conf
  var/ipfire/asterisk/smdi.conf
  var/ipfire/asterisk/telcordia-1.adsi
  var/ipfire/asterisk/udptl.conf
+var/ipfire/asterisk/unistim.conf
  var/ipfire/asterisk/users.conf
  var/ipfire/asterisk/voicemail.conf
  var/ipfire/asterisk/vpb.conf
@@ -347,17 +467,16 @@ var/ipfire/asterisk/wakeup/wakeup.sh
  var/ipfire/backup/addons/includes/asterisk
  #var/lib/asterisk
  #var/lib/asterisk/agi-bin
-var/lib/asterisk/agi-bin/agi-test.agi
-var/lib/asterisk/agi-bin/eagi-sphinx-test
-var/lib/asterisk/agi-bin/eagi-test
-var/lib/asterisk/agi-bin/jukebox.agi
+#var/lib/asterisk/documentation
+#var/lib/asterisk/documentation/appdocsxml.dtd
+#var/lib/asterisk/documentation/core-en_US.xml
+#var/lib/asterisk/documentation/thirdparty
  #var/lib/asterisk/firmware
  #var/lib/asterisk/firmware/iax
  #var/lib/asterisk/images
  var/lib/asterisk/images/asterisk-intro.jpg
+var/lib/asterisk/images/kpad2.jpg
  #var/lib/asterisk/keys
-var/lib/asterisk/keys/freeworlddialup.pub
-var/lib/asterisk/keys/iaxtel.pub
  #var/lib/asterisk/moh
  var/lib/asterisk/moh/.asterisk-moh-opsound-gsm-2.03
  var/lib/asterisk/moh/CHANGES-asterisk-moh-opsound-gsm
@@ -368,285 +487,15 @@ var/lib/asterisk/moh/macroform-robot_dity.gsm
  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/phoneprov
+var/lib/asterisk/phoneprov/000000000000-directory.xml
+var/lib/asterisk/phoneprov/000000000000-phone.cfg
+var/lib/asterisk/phoneprov/000000000000.cfg
+var/lib/asterisk/phoneprov/polycom.xml
+var/lib/asterisk/phoneprov/polycom_line.xml
+var/lib/asterisk/phoneprov/snom-mac.xml
  #var/lib/asterisk/sounds
-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.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
-var/lib/asterisk/sounds/T-to-enable-ancmnt.gsm
-var/lib/asterisk/sounds/T-to-hear-cur-ancmnt.gsm
-var/lib/asterisk/sounds/T-to-leave-msg.gsm
-var/lib/asterisk/sounds/T-to-reach-main-office.gsm
-var/lib/asterisk/sounds/T-to-rec-ancmnt.gsm
-var/lib/asterisk/sounds/T-to-rtrn-to-main-menu.gsm
-var/lib/asterisk/sounds/a-charge-for-this-svc.gsm
-var/lib/asterisk/sounds/a-collect-charge-of.gsm
-var/lib/asterisk/sounds/a-collect-charge.gsm
-var/lib/asterisk/sounds/a-connect-charge-of.gsm
-var/lib/asterisk/sounds/a-connect-charge.gsm
-var/lib/asterisk/sounds/abandon-all-hope.gsm
-var/lib/asterisk/sounds/abandons.gsm
-var/lib/asterisk/sounds/academic-support.gsm
-var/lib/asterisk/sounds/access-code.gsm
-var/lib/asterisk/sounds/access-denied.gsm
-var/lib/asterisk/sounds/access-granted.gsm
-var/lib/asterisk/sounds/accessible-through-system.gsm
-var/lib/asterisk/sounds/account-balance-is.gsm
-var/lib/asterisk/sounds/accounting.gsm
-var/lib/asterisk/sounds/accounts-payable.gsm
-var/lib/asterisk/sounds/accounts-receivable.gsm
-var/lib/asterisk/sounds/activated.gsm
-var/lib/asterisk/sounds/added-to.gsm
-var/lib/asterisk/sounds/added.gsm
-var/lib/asterisk/sounds/address.gsm
-var/lib/asterisk/sounds/administration.gsm
-var/lib/asterisk/sounds/advised-to-seek-shelter.gsm
-var/lib/asterisk/sounds/after-the-tone.gsm
-var/lib/asterisk/sounds/afternoon.gsm
-var/lib/asterisk/sounds/agent-alreadyon.gsm
-var/lib/asterisk/sounds/agent-incorrect.gsm
-var/lib/asterisk/sounds/agent-loggedoff.gsm
-var/lib/asterisk/sounds/agent-loginok.gsm
-var/lib/asterisk/sounds/agent-newlocation.gsm
-var/lib/asterisk/sounds/agent-pass.gsm
-var/lib/asterisk/sounds/agent-user.gsm
-var/lib/asterisk/sounds/airport.gsm
-var/lib/asterisk/sounds/alabama.gsm
-var/lib/asterisk/sounds/alaska.gsm
-var/lib/asterisk/sounds/albuquerque.gsm
-var/lib/asterisk/sounds/alert.gsm
-var/lib/asterisk/sounds/all-circuits-busy-now.gsm
-var/lib/asterisk/sounds/all-outgoing-lines-unavailable.gsm
-var/lib/asterisk/sounds/all-reps-busy.gsm
-var/lib/asterisk/sounds/all-your-base.gsm
-var/lib/asterisk/sounds/altitude.gsm
-var/lib/asterisk/sounds/ampersand.gsm
-var/lib/asterisk/sounds/an-error-has-occured.gsm
-var/lib/asterisk/sounds/an-error-has-occurred.gsm
-var/lib/asterisk/sounds/and-area-code.gsm
-var/lib/asterisk/sounds/and-or.gsm
-var/lib/asterisk/sounds/and-prs-pound-whn-finished.gsm
-var/lib/asterisk/sounds/and.gsm
-var/lib/asterisk/sounds/another-time.gsm
-var/lib/asterisk/sounds/approaching.gsm
-var/lib/asterisk/sounds/approximately.gsm
-var/lib/asterisk/sounds/are-you-still-there.gsm
-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
-var/lib/asterisk/sounds/astcc-card-number-invalid.gsm
-var/lib/asterisk/sounds/astcc-digit-account-number.gsm
-var/lib/asterisk/sounds/astcc-followed-by-pound.gsm
-var/lib/asterisk/sounds/astcc-followed-by-the-hash-key.gsm
-var/lib/asterisk/sounds/astcc-followed-by-the-pound-key.gsm
-var/lib/asterisk/sounds/astcc-login12pound.gsm
-var/lib/asterisk/sounds/astcc-please-enter-your.gsm
-var/lib/asterisk/sounds/astcc-skipping-any-punctuation.gsm
-var/lib/asterisk/sounds/asterisk-friend.gsm
-var/lib/asterisk/sounds/at-any-time.gsm
-var/lib/asterisk/sounds/at-customers-request.gsm
-var/lib/asterisk/sounds/at-following-number.gsm
-var/lib/asterisk/sounds/at-sign.gsm
-var/lib/asterisk/sounds/at-tone-time-exactly.gsm
-var/lib/asterisk/sounds/athletics.gsm
-var/lib/asterisk/sounds/atlanta.gsm
-var/lib/asterisk/sounds/atlantic.gsm
-var/lib/asterisk/sounds/attention-required.gsm
-var/lib/asterisk/sounds/auditing.gsm
-var/lib/asterisk/sounds/austin.gsm
-var/lib/asterisk/sounds/auth-incorrect.gsm
-var/lib/asterisk/sounds/auth-thankyou.gsm
-var/lib/asterisk/sounds/available-options.gsm
-var/lib/asterisk/sounds/available.gsm
-var/lib/asterisk/sounds/avg-speed-answer.gsm
-var/lib/asterisk/sounds/away-naughty-boy.gsm
-var/lib/asterisk/sounds/away-naughty-girl.gsm
-var/lib/asterisk/sounds/backslash.gsm
-var/lib/asterisk/sounds/bad.gsm
-var/lib/asterisk/sounds/baltimore.gsm
-var/lib/asterisk/sounds/bar.gsm
-var/lib/asterisk/sounds/barn.gsm
-var/lib/asterisk/sounds/barns.gsm
-var/lib/asterisk/sounds/barometric.gsm
-var/lib/asterisk/sounds/bearing.gsm
-var/lib/asterisk/sounds/beaufort.gsm
-var/lib/asterisk/sounds/because-paranoid.gsm
-var/lib/asterisk/sounds/beep.gsm
-var/lib/asterisk/sounds/beeperr.gsm
-var/lib/asterisk/sounds/before-the-number.gsm
-var/lib/asterisk/sounds/believe-its-free.gsm
-var/lib/asterisk/sounds/billing-and-collections.gsm
-var/lib/asterisk/sounds/billing.gsm
-var/lib/asterisk/sounds/billionth.gsm
-var/lib/asterisk/sounds/bits.gsm
-var/lib/asterisk/sounds/blue-eyed-polar-bear.gsm
-var/lib/asterisk/sounds/bookstore.gsm
-var/lib/asterisk/sounds/boston.gsm
-var/lib/asterisk/sounds/box.gsm
-var/lib/asterisk/sounds/brian.gsm
-var/lib/asterisk/sounds/business-development.gsm
-var/lib/asterisk/sounds/busy-hangovers.gsm
-var/lib/asterisk/sounds/busy-pls-hold.gsm
-var/lib/asterisk/sounds/but.gsm
-var/lib/asterisk/sounds/by.gsm
-var/lib/asterisk/sounds/bytes.gsm
-var/lib/asterisk/sounds/cafeteria.gsm
-var/lib/asterisk/sounds/california.gsm
-var/lib/asterisk/sounds/call-forward.gsm
-var/lib/asterisk/sounds/call-forwarding.gsm
-var/lib/asterisk/sounds/call-fwd-cancelled.gsm
-var/lib/asterisk/sounds/call-fwd-no-ans.gsm
-var/lib/asterisk/sounds/call-fwd-on-busy.gsm
-var/lib/asterisk/sounds/call-fwd-parallel.gsm
-var/lib/asterisk/sounds/call-fwd-unconditional.gsm
-var/lib/asterisk/sounds/call-preempted.gsm
-var/lib/asterisk/sounds/call-quality-menu.gsm
-var/lib/asterisk/sounds/call-requres.gsm
-var/lib/asterisk/sounds/call-terminated.gsm
-var/lib/asterisk/sounds/call-waiting.gsm
-var/lib/asterisk/sounds/call.gsm
-var/lib/asterisk/sounds/calling.gsm
-var/lib/asterisk/sounds/calls-taken-by.gsm
-var/lib/asterisk/sounds/calls-waiting-for-rep.gsm
-var/lib/asterisk/sounds/calls.gsm
-var/lib/asterisk/sounds/campground-office.gsm
-var/lib/asterisk/sounds/cancelled.gsm
-var/lib/asterisk/sounds/cannot-complete-as-dialed.gsm
-var/lib/asterisk/sounds/cannot-complete-network-error.gsm
-var/lib/asterisk/sounds/cannot-complete-otherend-error.gsm
-var/lib/asterisk/sounds/cannot-complete-temp-error.gsm
-var/lib/asterisk/sounds/card-balance-is.gsm
-var/lib/asterisk/sounds/card-is-invalid.gsm
-var/lib/asterisk/sounds/card-number.gsm
-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-mastercard.gsm
-var/lib/asterisk/sounds/cc-visa.gsm
-var/lib/asterisk/sounds/celsius.gsm
-var/lib/asterisk/sounds/cent.gsm
-var/lib/asterisk/sounds/central.gsm
-var/lib/asterisk/sounds/cents-per-minute.gsm
-var/lib/asterisk/sounds/cents.gsm
-var/lib/asterisk/sounds/ceo-office.gsm
-var/lib/asterisk/sounds/chance-of.gsm
-var/lib/asterisk/sounds/changing.gsm
-var/lib/asterisk/sounds/channel-insecure-warn.gsm
-var/lib/asterisk/sounds/channel-secure.gsm
-var/lib/asterisk/sounds/channel.gsm
-var/lib/asterisk/sounds/charlotte.gsm
-var/lib/asterisk/sounds/chat-room.gsm
-var/lib/asterisk/sounds/check-number-dial-again.gsm
-var/lib/asterisk/sounds/chemistry.gsm
-var/lib/asterisk/sounds/chicago.gsm
-var/lib/asterisk/sounds/chris.gsm
-var/lib/asterisk/sounds/claims.gsm
-var/lib/asterisk/sounds/clear.gsm
-var/lib/asterisk/sounds/clearing.gsm
-var/lib/asterisk/sounds/cleveland.gsm
-var/lib/asterisk/sounds/clli.gsm
-var/lib/asterisk/sounds/close-parenthesis.gsm
-var/lib/asterisk/sounds/clouds.gsm
-var/lib/asterisk/sounds/cloudy.gsm
-var/lib/asterisk/sounds/collections.gsm
-var/lib/asterisk/sounds/colorado-springs.gsm
-var/lib/asterisk/sounds/colorado.gsm
-var/lib/asterisk/sounds/columbus.gsm
-var/lib/asterisk/sounds/comma.gsm
-var/lib/asterisk/sounds/communications.gsm
-var/lib/asterisk/sounds/company-dir-411.gsm
-var/lib/asterisk/sounds/complaint.gsm
-var/lib/asterisk/sounds/compliance.gsm
-var/lib/asterisk/sounds/computer-friend1.gsm
-var/lib/asterisk/sounds/computer-friend2.gsm
-var/lib/asterisk/sounds/conditions.gsm
-var/lib/asterisk/sounds/conf-adminmenu-162.gsm
-var/lib/asterisk/sounds/conf-adminmenu.gsm
-var/lib/asterisk/sounds/conf-banned.gsm
-var/lib/asterisk/sounds/conf-enteringno.gsm
-var/lib/asterisk/sounds/conf-errormenu.gsm
-var/lib/asterisk/sounds/conf-extended.gsm
-var/lib/asterisk/sounds/conf-full.gsm
-var/lib/asterisk/sounds/conf-getchannel.gsm
-var/lib/asterisk/sounds/conf-getconfno.gsm
-var/lib/asterisk/sounds/conf-getpin.gsm
-var/lib/asterisk/sounds/conf-hasentered.gsm
-var/lib/asterisk/sounds/conf-hasjoin.gsm
-var/lib/asterisk/sounds/conf-hasleft.gsm
-var/lib/asterisk/sounds/conf-invalid.gsm
-var/lib/asterisk/sounds/conf-invalidpin.gsm
-var/lib/asterisk/sounds/conf-kicked.gsm
-var/lib/asterisk/sounds/conf-leaderhasleft.gsm
-var/lib/asterisk/sounds/conf-locked.gsm
-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
-var/lib/asterisk/sounds/conf-thereare.gsm
-var/lib/asterisk/sounds/conf-unlockednow.gsm
-var/lib/asterisk/sounds/conf-unmuted.gsm
-var/lib/asterisk/sounds/conf-usermenu-162.gsm
-var/lib/asterisk/sounds/conf-usermenu.gsm
-var/lib/asterisk/sounds/conf-userswilljoin.gsm
-var/lib/asterisk/sounds/conf-userwilljoin.gsm
-var/lib/asterisk/sounds/conf-waitforleader.gsm
-var/lib/asterisk/sounds/conf-youareinconfnum.gsm
-var/lib/asterisk/sounds/conference-call.gsm
-var/lib/asterisk/sounds/conference-reservations.gsm
-var/lib/asterisk/sounds/conference.gsm
-var/lib/asterisk/sounds/confirm-number-is.gsm
-var/lib/asterisk/sounds/connected.gsm
-var/lib/asterisk/sounds/connecticut.gsm
-var/lib/asterisk/sounds/connecting.gsm
-var/lib/asterisk/sounds/connection-failed.gsm
-var/lib/asterisk/sounds/connection-timed-out.gsm
-var/lib/asterisk/sounds/continue-english-press.gsm
-var/lib/asterisk/sounds/continue-in-english.gsm
-var/lib/asterisk/sounds/copy-center.gsm
-var/lib/asterisk/sounds/core-sounds-en.txt
-var/lib/asterisk/sounds/could-lose-a-few-pounds.gsm
-var/lib/asterisk/sounds/counseling-services.gsm
-var/lib/asterisk/sounds/count.gsm
-var/lib/asterisk/sounds/crash.gsm
-var/lib/asterisk/sounds/current-time-is.gsm
-var/lib/asterisk/sounds/currently.gsm
-var/lib/asterisk/sounds/customer-accounts.gsm
-var/lib/asterisk/sounds/customer-relations.gsm
-var/lib/asterisk/sounds/customer-service.gsm
-var/lib/asterisk/sounds/cyclone.gsm
-var/lib/asterisk/sounds/dallas.gsm
-var/lib/asterisk/sounds/date.gsm
-var/lib/asterisk/sounds/day.gsm
-var/lib/asterisk/sounds/daylight.gsm
-var/lib/asterisk/sounds/days.gsm
  #var/lib/asterisk/sounds/de
-var/lib/asterisk/sounds/de-activated.gsm
  var/lib/asterisk/sounds/de/.DS_Store
  var/lib/asterisk/sounds/de/agent-alreadyon.gsm
  var/lib/asterisk/sounds/de/agent-incorrect.gsm
@@ -843,33 +692,7 @@ var/lib/asterisk/sounds/de/vm-undeleted.gsm
  var/lib/asterisk/sounds/de/vm-unknown-caller.gsm
  var/lib/asterisk/sounds/de/vm-whichbox.gsm
  var/lib/asterisk/sounds/de/vm-youhave.gsm
-var/lib/asterisk/sounds/deadbeat.gsm
-var/lib/asterisk/sounds/decode.gsm
-var/lib/asterisk/sounds/default-attendant.gsm
-var/lib/asterisk/sounds/degrees.gsm
-var/lib/asterisk/sounds/delaware.gsm
-var/lib/asterisk/sounds/demo-abouttotry.gsm
-var/lib/asterisk/sounds/demo-congrats.gsm
-var/lib/asterisk/sounds/demo-echodone.gsm
-var/lib/asterisk/sounds/demo-echotest.gsm
-var/lib/asterisk/sounds/demo-enterkeywords.gsm
-var/lib/asterisk/sounds/demo-instruct.gsm
-var/lib/asterisk/sounds/demo-moreinfo.gsm
-var/lib/asterisk/sounds/demo-nogo.gsm
-var/lib/asterisk/sounds/demo-nomatch.gsm
-var/lib/asterisk/sounds/demo-thanks.gsm
-var/lib/asterisk/sounds/denial-of-service.gsm
-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
-var/lib/asterisk/sounds/dial-here-often.gsm
  #var/lib/asterisk/sounds/dictate
-var/lib/asterisk/sounds/dictate/both_help.gsm
  #var/lib/asterisk/sounds/dictate/de
  var/lib/asterisk/sounds/dictate/de/both_help.gsm
  var/lib/asterisk/sounds/dictate/de/enter_filename.gsm
@@ -883,58 +706,7 @@ var/lib/asterisk/sounds/dictate/de/record.gsm
  var/lib/asterisk/sounds/dictate/de/record_help.gsm
  var/lib/asterisk/sounds/dictate/de/record_mode.gsm
  var/lib/asterisk/sounds/dictate/de/truncating_audio.gsm
-var/lib/asterisk/sounds/dictate/enter_filename.gsm
-var/lib/asterisk/sounds/dictate/forhelp.gsm
-var/lib/asterisk/sounds/dictate/pause.gsm
-var/lib/asterisk/sounds/dictate/paused.gsm
-var/lib/asterisk/sounds/dictate/play_help.gsm
-var/lib/asterisk/sounds/dictate/playback.gsm
-var/lib/asterisk/sounds/dictate/playback_mode.gsm
-var/lib/asterisk/sounds/dictate/record.gsm
-var/lib/asterisk/sounds/dictate/record_help.gsm
-var/lib/asterisk/sounds/dictate/record_mode.gsm
-var/lib/asterisk/sounds/dictate/truncating_audio.gsm
-var/lib/asterisk/sounds/digit.gsm
  #var/lib/asterisk/sounds/digits
-var/lib/asterisk/sounds/digits.gsm
-var/lib/asterisk/sounds/digits/0.gsm
-var/lib/asterisk/sounds/digits/1.gsm
-var/lib/asterisk/sounds/digits/10.gsm
-var/lib/asterisk/sounds/digits/11.gsm
-var/lib/asterisk/sounds/digits/12.gsm
-var/lib/asterisk/sounds/digits/13.gsm
-var/lib/asterisk/sounds/digits/14.gsm
-var/lib/asterisk/sounds/digits/15.gsm
-var/lib/asterisk/sounds/digits/16.gsm
-var/lib/asterisk/sounds/digits/17.gsm
-var/lib/asterisk/sounds/digits/18.gsm
-var/lib/asterisk/sounds/digits/19.gsm
-var/lib/asterisk/sounds/digits/2.gsm
-var/lib/asterisk/sounds/digits/20.gsm
-var/lib/asterisk/sounds/digits/3.gsm
-var/lib/asterisk/sounds/digits/30.gsm
-var/lib/asterisk/sounds/digits/4.gsm
-var/lib/asterisk/sounds/digits/40.gsm
-var/lib/asterisk/sounds/digits/5.gsm
-var/lib/asterisk/sounds/digits/50.gsm
-var/lib/asterisk/sounds/digits/6.gsm
-var/lib/asterisk/sounds/digits/60.gsm
-var/lib/asterisk/sounds/digits/7.gsm
-var/lib/asterisk/sounds/digits/70.gsm
-var/lib/asterisk/sounds/digits/8.gsm
-var/lib/asterisk/sounds/digits/80.gsm
-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
-var/lib/asterisk/sounds/digits/day-3.gsm
-var/lib/asterisk/sounds/digits/day-4.gsm
-var/lib/asterisk/sounds/digits/day-5.gsm
-var/lib/asterisk/sounds/digits/day-6.gsm
  #var/lib/asterisk/sounds/digits/de
  var/lib/asterisk/sounds/digits/de/0.gsm
  var/lib/asterisk/sounds/digits/de/1.gsm
@@ -1039,502 +811,1815 @@ var/lib/asterisk/sounds/digits/de/xh-7x.gsm
  var/lib/asterisk/sounds/digits/de/xh-8x.gsm
  var/lib/asterisk/sounds/digits/de/xh-9x.gsm
  var/lib/asterisk/sounds/digits/de/yesterday.gsm
-var/lib/asterisk/sounds/digits/dollars.gsm
-var/lib/asterisk/sounds/digits/h-1.gsm
-var/lib/asterisk/sounds/digits/h-10.gsm
-var/lib/asterisk/sounds/digits/h-11.gsm
-var/lib/asterisk/sounds/digits/h-12.gsm
-var/lib/asterisk/sounds/digits/h-13.gsm
-var/lib/asterisk/sounds/digits/h-14.gsm
-var/lib/asterisk/sounds/digits/h-15.gsm
-var/lib/asterisk/sounds/digits/h-16.gsm
-var/lib/asterisk/sounds/digits/h-17.gsm
-var/lib/asterisk/sounds/digits/h-18.gsm
-var/lib/asterisk/sounds/digits/h-19.gsm
-var/lib/asterisk/sounds/digits/h-2.gsm
-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
-var/lib/asterisk/sounds/digits/mon-0.gsm
-var/lib/asterisk/sounds/digits/mon-1.gsm
-var/lib/asterisk/sounds/digits/mon-10.gsm
-var/lib/asterisk/sounds/digits/mon-11.gsm
-var/lib/asterisk/sounds/digits/mon-2.gsm
-var/lib/asterisk/sounds/digits/mon-3.gsm
-var/lib/asterisk/sounds/digits/mon-4.gsm
-var/lib/asterisk/sounds/digits/mon-5.gsm
-var/lib/asterisk/sounds/digits/mon-6.gsm
-var/lib/asterisk/sounds/digits/mon-7.gsm
-var/lib/asterisk/sounds/digits/mon-8.gsm
-var/lib/asterisk/sounds/digits/mon-9.gsm
-var/lib/asterisk/sounds/digits/oclock.gsm
-var/lib/asterisk/sounds/digits/oh.gsm
-var/lib/asterisk/sounds/digits/p-m.gsm
-var/lib/asterisk/sounds/digits/pound.gsm
-var/lib/asterisk/sounds/digits/star.gsm
-var/lib/asterisk/sounds/digits/thousand.gsm
-var/lib/asterisk/sounds/digits/today.gsm
-var/lib/asterisk/sounds/digits/tomorrow.gsm
-var/lib/asterisk/sounds/digits/yesterday.gsm
-var/lib/asterisk/sounds/dir-first.gsm
-var/lib/asterisk/sounds/dir-firstlast.gsm
-var/lib/asterisk/sounds/dir-instr.gsm
-var/lib/asterisk/sounds/dir-intro-fn.gsm
-var/lib/asterisk/sounds/dir-intro.gsm
-var/lib/asterisk/sounds/dir-last.gsm
-var/lib/asterisk/sounds/dir-multi1.gsm
-var/lib/asterisk/sounds/dir-multi2.gsm
-var/lib/asterisk/sounds/dir-multi3.gsm
-var/lib/asterisk/sounds/dir-multi9.gsm
-var/lib/asterisk/sounds/dir-nomatch.gsm
-var/lib/asterisk/sounds/dir-nomore.gsm
-var/lib/asterisk/sounds/dir-pls-enter.gsm
-var/lib/asterisk/sounds/dir-usingkeypad.gsm
-var/lib/asterisk/sounds/dir-welcome.gsm
-var/lib/asterisk/sounds/directory-assistance.gsm
-var/lib/asterisk/sounds/directory.gsm
-var/lib/asterisk/sounds/disabled.gsm
-var/lib/asterisk/sounds/discon-or-out-of-service.gsm
-var/lib/asterisk/sounds/disconnected.gsm
-var/lib/asterisk/sounds/disk.gsm
-var/lib/asterisk/sounds/distribution.gsm
-var/lib/asterisk/sounds/divided-by.gsm
-var/lib/asterisk/sounds/dns.gsm
-var/lib/asterisk/sounds/do-not-disturb.gsm
-var/lib/asterisk/sounds/doing-enum-lookup.gsm
-var/lib/asterisk/sounds/dont-know-who-sent.gsm
-var/lib/asterisk/sounds/doppler-radar.gsm
-var/lib/asterisk/sounds/down.gsm
-var/lib/asterisk/sounds/driving-directions.gsm
-var/lib/asterisk/sounds/duplex.gsm
-var/lib/asterisk/sounds/duplication.gsm
-var/lib/asterisk/sounds/early.gsm
-var/lib/asterisk/sounds/east.gsm
-var/lib/asterisk/sounds/easterly.gsm
-var/lib/asterisk/sounds/eastern.gsm
-var/lib/asterisk/sounds/echo-test.gsm
-var/lib/asterisk/sounds/ed.gsm
-var/lib/asterisk/sounds/eighteenth.gsm
-var/lib/asterisk/sounds/eighth.gsm
-var/lib/asterisk/sounds/eightieth.gsm
-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
-var/lib/asterisk/sounds/ent-target-attendant.gsm
-var/lib/asterisk/sounds/enter-a-time.gsm
-var/lib/asterisk/sounds/enter-conf-call-number.gsm
-var/lib/asterisk/sounds/enter-conf-pin-number.gsm
-var/lib/asterisk/sounds/enter-ext-of-person.gsm
-var/lib/asterisk/sounds/enter-num-blacklist.gsm
-var/lib/asterisk/sounds/enter-password.gsm
-var/lib/asterisk/sounds/enter-phone-number10.gsm
-var/lib/asterisk/sounds/entering-conf-number.gsm
-var/lib/asterisk/sounds/entr-num-rmv-blklist.gsm
-var/lib/asterisk/sounds/enum-lookup-failed.gsm
-var/lib/asterisk/sounds/enum-lookup-successful.gsm
-var/lib/asterisk/sounds/error-number.gsm
-#var/lib/asterisk/sounds/es
-var/lib/asterisk/sounds/est-hold-time-is.gsm
-var/lib/asterisk/sounds/euro.gsm
-var/lib/asterisk/sounds/european.gsm
-var/lib/asterisk/sounds/euros.gsm
-var/lib/asterisk/sounds/evening.gsm
-var/lib/asterisk/sounds/explanation.gsm
-var/lib/asterisk/sounds/ext-or-zero.gsm
-var/lib/asterisk/sounds/extension.gsm
-var/lib/asterisk/sounds/extensions.gsm
-var/lib/asterisk/sounds/extra-sounds-en.txt
-var/lib/asterisk/sounds/facilities.gsm
-var/lib/asterisk/sounds/fahrenheit.gsm
-var/lib/asterisk/sounds/falling.gsm
-var/lib/asterisk/sounds/fast.gsm
-var/lib/asterisk/sounds/feature-not-avail-line.gsm
-var/lib/asterisk/sounds/feet.gsm
-var/lib/asterisk/sounds/female.gsm
-var/lib/asterisk/sounds/fifteenth.gsm
-var/lib/asterisk/sounds/fifth.gsm
-var/lib/asterisk/sounds/fiftieth.gsm
-var/lib/asterisk/sounds/finals.gsm
-var/lib/asterisk/sounds/finance.gsm
-var/lib/asterisk/sounds/first-in-line.gsm
-var/lib/asterisk/sounds/first.gsm
-var/lib/asterisk/sounds/flagged-for-lea.gsm
-var/lib/asterisk/sounds/flooding.gsm
-var/lib/asterisk/sounds/florida.gsm
-var/lib/asterisk/sounds/fog.gsm
-var/lib/asterisk/sounds/foggy.gsm
-var/lib/asterisk/sounds/followed-by.gsm
-#var/lib/asterisk/sounds/followme
-var/lib/asterisk/sounds/followme/call-from.gsm
-var/lib/asterisk/sounds/followme/no-recording.gsm
-var/lib/asterisk/sounds/followme/options.gsm
-var/lib/asterisk/sounds/followme/pls-hold-while-try.gsm
-var/lib/asterisk/sounds/followme/sorry.gsm
-var/lib/asterisk/sounds/followme/status.gsm
-var/lib/asterisk/sounds/food-service.gsm
-var/lib/asterisk/sounds/food-services.gsm
-var/lib/asterisk/sounds/for-a-daily-wakeup-call.gsm
-var/lib/asterisk/sounds/for-a-list-of.gsm
-var/lib/asterisk/sounds/for-accounting.gsm
-var/lib/asterisk/sounds/for-billing.gsm
-var/lib/asterisk/sounds/for-english-press.gsm
-var/lib/asterisk/sounds/for-investor-relations.gsm
-var/lib/asterisk/sounds/for-louie-louie.gsm
-var/lib/asterisk/sounds/for-no-press.gsm
-var/lib/asterisk/sounds/for-qc-and-training-purposes.gsm
-var/lib/asterisk/sounds/for-quality-purposes.gsm
-var/lib/asterisk/sounds/for-sales.gsm
-var/lib/asterisk/sounds/for-service.gsm
-var/lib/asterisk/sounds/for-tech-support.gsm
-var/lib/asterisk/sounds/for-the-first.gsm
-var/lib/asterisk/sounds/for-the-weather.gsm
-var/lib/asterisk/sounds/for-wakeup-call.gsm
-var/lib/asterisk/sounds/for-yes-press.gsm
-var/lib/asterisk/sounds/for.gsm
-var/lib/asterisk/sounds/fort-worth.gsm
-var/lib/asterisk/sounds/fortieth.gsm
-var/lib/asterisk/sounds/fourteenth.gsm
-var/lib/asterisk/sounds/fourth.gsm
-#var/lib/asterisk/sounds/fr
-var/lib/asterisk/sounds/freeze.gsm
-var/lib/asterisk/sounds/freezing.gsm
-var/lib/asterisk/sounds/frequency.gsm
-var/lib/asterisk/sounds/fresno.gsm
-var/lib/asterisk/sounds/from-unknown-caller.gsm
-var/lib/asterisk/sounds/from.gsm
-var/lib/asterisk/sounds/ftp.gsm
-var/lib/asterisk/sounds/gale.gsm
-var/lib/asterisk/sounds/gambling-drunk.gsm
-var/lib/asterisk/sounds/georgia.gsm
-var/lib/asterisk/sounds/gigabits.gsm
-var/lib/asterisk/sounds/gigabytes.gsm
-var/lib/asterisk/sounds/gigahertz.gsm
-var/lib/asterisk/sounds/giggle1.gsm
-var/lib/asterisk/sounds/gmt.gsm
-var/lib/asterisk/sounds/go-away1.gsm
-var/lib/asterisk/sounds/go-away2.gsm
-var/lib/asterisk/sounds/good-afternoon.gsm
-var/lib/asterisk/sounds/good-evening.gsm
-var/lib/asterisk/sounds/good-morning.gsm
-var/lib/asterisk/sounds/good.gsm
-var/lib/asterisk/sounds/goodbye.gsm
-var/lib/asterisk/sounds/greater-than.gsm
-var/lib/asterisk/sounds/groovy.gsm
-#var/lib/asterisk/sounds/ha
-var/lib/asterisk/sounds/ha/ac.gsm
-var/lib/asterisk/sounds/ha/air-conditioner.gsm
-var/lib/asterisk/sounds/ha/alarm.gsm
-var/lib/asterisk/sounds/ha/amp.gsm
-var/lib/asterisk/sounds/ha/amps.gsm
-var/lib/asterisk/sounds/ha/attic.gsm
-var/lib/asterisk/sounds/ha/baby-sleeping-mode.gsm
-var/lib/asterisk/sounds/ha/back.gsm
-var/lib/asterisk/sounds/ha/basement.gsm
-var/lib/asterisk/sounds/ha/bathroom.gsm
-var/lib/asterisk/sounds/ha/bedroom.gsm
-var/lib/asterisk/sounds/ha/bright.gsm
-var/lib/asterisk/sounds/ha/callerid.gsm
-var/lib/asterisk/sounds/ha/carport.gsm
-var/lib/asterisk/sounds/ha/closet.gsm
-var/lib/asterisk/sounds/ha/coffee-pot.gsm
-var/lib/asterisk/sounds/ha/cool.gsm
-var/lib/asterisk/sounds/ha/cooling.gsm
-var/lib/asterisk/sounds/ha/dc.gsm
-var/lib/asterisk/sounds/ha/decibel.gsm
-var/lib/asterisk/sounds/ha/decibels.gsm
-var/lib/asterisk/sounds/ha/deck.gsm
-var/lib/asterisk/sounds/ha/degree.gsm
-var/lib/asterisk/sounds/ha/degrees.gsm
-var/lib/asterisk/sounds/ha/den.gsm
-var/lib/asterisk/sounds/ha/dim.gsm
-var/lib/asterisk/sounds/ha/dining-room.gsm
-var/lib/asterisk/sounds/ha/door.gsm
-var/lib/asterisk/sounds/ha/doors.gsm
-var/lib/asterisk/sounds/ha/down.gsm
-var/lib/asterisk/sounds/ha/driveway.gsm
-var/lib/asterisk/sounds/ha/dryer.gsm
-var/lib/asterisk/sounds/ha/fan.gsm
-var/lib/asterisk/sounds/ha/farad.gsm
-var/lib/asterisk/sounds/ha/farads.gsm
-var/lib/asterisk/sounds/ha/first-floor.gsm
-var/lib/asterisk/sounds/ha/floor.gsm
-var/lib/asterisk/sounds/ha/floors.gsm
-var/lib/asterisk/sounds/ha/for-extended-status-report.gsm
-var/lib/asterisk/sounds/ha/for-quick-status-report.gsm
-var/lib/asterisk/sounds/ha/for-wx-report.gsm
-var/lib/asterisk/sounds/ha/fountain.gsm
-var/lib/asterisk/sounds/ha/foyer.gsm
-var/lib/asterisk/sounds/ha/front.gsm
-var/lib/asterisk/sounds/ha/furnace.gsm
-var/lib/asterisk/sounds/ha/game-room.gsm
-var/lib/asterisk/sounds/ha/garage.gsm
-var/lib/asterisk/sounds/ha/great-room.gsm
-var/lib/asterisk/sounds/ha/guest-room.gsm
-var/lib/asterisk/sounds/ha/hall.gsm
-var/lib/asterisk/sounds/ha/has-been-left.gsm
-var/lib/asterisk/sounds/ha/heat-pump.gsm
-var/lib/asterisk/sounds/ha/heat.gsm
-var/lib/asterisk/sounds/ha/heating.gsm
-var/lib/asterisk/sounds/ha/hot-tub.gsm
-var/lib/asterisk/sounds/ha/house.gsm
-var/lib/asterisk/sounds/ha/intruder.gsm
-var/lib/asterisk/sounds/ha/is.gsm
-var/lib/asterisk/sounds/ha/kelvin.gsm
-var/lib/asterisk/sounds/ha/kitchen.gsm
-var/lib/asterisk/sounds/ha/lamp.gsm
-var/lib/asterisk/sounds/ha/lamps.gsm
-var/lib/asterisk/sounds/ha/landscape.gsm
-var/lib/asterisk/sounds/ha/laundry.gsm
-var/lib/asterisk/sounds/ha/library.gsm
-var/lib/asterisk/sounds/ha/light.gsm
-var/lib/asterisk/sounds/ha/lights.gsm
-var/lib/asterisk/sounds/ha/living-room.gsm
-var/lib/asterisk/sounds/ha/locked.gsm
-var/lib/asterisk/sounds/ha/locking.gsm
-var/lib/asterisk/sounds/ha/mailbox.gsm
-var/lib/asterisk/sounds/ha/master.gsm
-var/lib/asterisk/sounds/ha/off.gsm
-var/lib/asterisk/sounds/ha/office.gsm
-var/lib/asterisk/sounds/ha/ohm.gsm
-var/lib/asterisk/sounds/ha/ohms.gsm
-var/lib/asterisk/sounds/ha/on.gsm
-var/lib/asterisk/sounds/ha/open.gsm
-var/lib/asterisk/sounds/ha/patio.gsm
-var/lib/asterisk/sounds/ha/phone.gsm
-var/lib/asterisk/sounds/ha/play-room.gsm
-var/lib/asterisk/sounds/ha/play.gsm
-var/lib/asterisk/sounds/ha/pool.gsm
-var/lib/asterisk/sounds/ha/porch.gsm
-var/lib/asterisk/sounds/ha/power-failure.gsm
-var/lib/asterisk/sounds/ha/pressure.gsm
-var/lib/asterisk/sounds/ha/psi.gsm
-var/lib/asterisk/sounds/ha/quiet-mode.gsm
-var/lib/asterisk/sounds/ha/reset.gsm
-var/lib/asterisk/sounds/ha/roof.gsm
-var/lib/asterisk/sounds/ha/room.gsm
-var/lib/asterisk/sounds/ha/rooms.gsm
-var/lib/asterisk/sounds/ha/second-floor.gsm
-var/lib/asterisk/sounds/ha/secure.gsm
-var/lib/asterisk/sounds/ha/security-system.gsm
-var/lib/asterisk/sounds/ha/set.gsm
-var/lib/asterisk/sounds/ha/side.gsm
-var/lib/asterisk/sounds/ha/solar.gsm
-var/lib/asterisk/sounds/ha/sprinklers.gsm
-var/lib/asterisk/sounds/ha/still.gsm
-var/lib/asterisk/sounds/ha/stove.gsm
-var/lib/asterisk/sounds/ha/sump-pump.gsm
-var/lib/asterisk/sounds/ha/sun-room.gsm
-var/lib/asterisk/sounds/ha/system.gsm
-var/lib/asterisk/sounds/ha/systems.gsm
-var/lib/asterisk/sounds/ha/thermostat.gsm
-var/lib/asterisk/sounds/ha/to-control-environ-sys.gsm
-var/lib/asterisk/sounds/ha/to-control-lights-appl.gsm
-var/lib/asterisk/sounds/ha/tower.gsm
-var/lib/asterisk/sounds/ha/unlocked.gsm
-var/lib/asterisk/sounds/ha/unlocking.gsm
-var/lib/asterisk/sounds/ha/up.gsm
-var/lib/asterisk/sounds/ha/volt.gsm
-var/lib/asterisk/sounds/ha/volts.gsm
-var/lib/asterisk/sounds/ha/washing-machine.gsm
-var/lib/asterisk/sounds/ha/water-heater.gsm
-var/lib/asterisk/sounds/ha/watt.gsm
-var/lib/asterisk/sounds/ha/watts.gsm
-var/lib/asterisk/sounds/ha/well-pump.gsm
-var/lib/asterisk/sounds/ha/window.gsm
-var/lib/asterisk/sounds/ha/windows.gsm
-var/lib/asterisk/sounds/ha/xmas-lights.gsm
-var/lib/asterisk/sounds/ha/xmas-tree.gsm
-var/lib/asterisk/sounds/ha/yard.gsm
-var/lib/asterisk/sounds/hail.gsm
-var/lib/asterisk/sounds/half.gsm
-var/lib/asterisk/sounds/hang-on-a-second-angry.gsm
-var/lib/asterisk/sounds/hang-on-a-second.gsm
-var/lib/asterisk/sounds/hangup-try-again.gsm
-var/lib/asterisk/sounds/has-arrived-at.gsm
-var/lib/asterisk/sounds/has-been-changed-to.gsm
-var/lib/asterisk/sounds/has-been-cleared.gsm
-var/lib/asterisk/sounds/has-been-disconnected.gsm
-var/lib/asterisk/sounds/has-been-set-to.gsm
-var/lib/asterisk/sounds/has-been.gsm
-var/lib/asterisk/sounds/has-expired.gsm
-var/lib/asterisk/sounds/has-issued-a.gsm
-var/lib/asterisk/sounds/has-not-been-seen-for.gsm
-var/lib/asterisk/sounds/has.gsm
-var/lib/asterisk/sounds/hash.gsm
-var/lib/asterisk/sounds/hawaii.gsm
-var/lib/asterisk/sounds/headed-towards.gsm
-var/lib/asterisk/sounds/heading.gsm
-var/lib/asterisk/sounds/health-center.gsm
-var/lib/asterisk/sounds/hear-odd-noise.gsm
-var/lib/asterisk/sounds/hear-toilet-flush.gsm
-var/lib/asterisk/sounds/hectopascal.gsm
-var/lib/asterisk/sounds/hello-world.gsm
-var/lib/asterisk/sounds/hello.gsm
-var/lib/asterisk/sounds/helpdesk.gsm
-var/lib/asterisk/sounds/hertz.gsm
-var/lib/asterisk/sounds/high.gsm
-var/lib/asterisk/sounds/highway.gsm
-var/lib/asterisk/sounds/hit.gsm
-var/lib/asterisk/sounds/hold-or-dial-0.gsm
-var/lib/asterisk/sounds/home.gsm
-var/lib/asterisk/sounds/honolulu.gsm
-var/lib/asterisk/sounds/hours.gsm
-var/lib/asterisk/sounds/housekeeping.gsm
-var/lib/asterisk/sounds/houston.gsm
-var/lib/asterisk/sounds/http.gsm
-var/lib/asterisk/sounds/human-resources.gsm
-var/lib/asterisk/sounds/humidity.gsm
-var/lib/asterisk/sounds/hundredth.gsm
-var/lib/asterisk/sounds/hurricane.gsm
-var/lib/asterisk/sounds/hz.gsm
-var/lib/asterisk/sounds/i-dont-understand.gsm
-var/lib/asterisk/sounds/i-dont-understand2.gsm
-var/lib/asterisk/sounds/i-dont-understand3.gsm
-var/lib/asterisk/sounds/i-dont-understand4.gsm
-var/lib/asterisk/sounds/i-dont-understand5.gsm
-var/lib/asterisk/sounds/i-grow-bored.gsm
-var/lib/asterisk/sounds/ice.gsm
-var/lib/asterisk/sounds/icmp.gsm
-var/lib/asterisk/sounds/icy.gsm
-var/lib/asterisk/sounds/idaho.gsm
-var/lib/asterisk/sounds/if-correct-press.gsm
-var/lib/asterisk/sounds/if-grtg-played-indefinately.gsm
-var/lib/asterisk/sounds/if-grtg-should-expire-at.gsm
-var/lib/asterisk/sounds/if-maint-contract-or-emergency.gsm
-var/lib/asterisk/sounds/if-rotary-phone.gsm
-var/lib/asterisk/sounds/if-this-is-correct-press.gsm
-var/lib/asterisk/sounds/if-this-is-correct.gsm
-var/lib/asterisk/sounds/if-this-is-not-correct.gsm
-var/lib/asterisk/sounds/if-u-know-ext-dial.gsm
-var/lib/asterisk/sounds/if-unsuccessful-speak-to.gsm
-var/lib/asterisk/sounds/if-you-know-the.gsm
-var/lib/asterisk/sounds/if-you-need-help.gsm
-var/lib/asterisk/sounds/if-youd-like-to-make-a-call.gsm
-var/lib/asterisk/sounds/illinois.gsm
-var/lib/asterisk/sounds/im-sorry-unable-to-connect-to-eng.gsm
-var/lib/asterisk/sounds/im-sorry.gsm
-var/lib/asterisk/sounds/imap.gsm
-var/lib/asterisk/sounds/in-service.gsm
-var/lib/asterisk/sounds/in-the-line.gsm
-var/lib/asterisk/sounds/in-the-queue.gsm
-var/lib/asterisk/sounds/in-the.gsm
-var/lib/asterisk/sounds/in-your-city.gsm
-var/lib/asterisk/sounds/in-your-zip-code.gsm
-var/lib/asterisk/sounds/inbound.gsm
-var/lib/asterisk/sounds/indiana.gsm
-var/lib/asterisk/sounds/indianapolis.gsm
-var/lib/asterisk/sounds/indicated.gsm
-var/lib/asterisk/sounds/info-about-last-call.gsm
-var/lib/asterisk/sounds/information-technology.gsm
-var/lib/asterisk/sounds/information.gsm
-var/lib/asterisk/sounds/infuriate-tech-staff.gsm
-var/lib/asterisk/sounds/initiated.gsm
-var/lib/asterisk/sounds/initiating.gsm
-var/lib/asterisk/sounds/inside-sales.gsm
-var/lib/asterisk/sounds/internal-audit.gsm
-var/lib/asterisk/sounds/international-call.gsm
-var/lib/asterisk/sounds/interstate.gsm
-var/lib/asterisk/sounds/invalid-date.gsm
-var/lib/asterisk/sounds/invalid-featurecode.gsm
-var/lib/asterisk/sounds/invalid.gsm
-var/lib/asterisk/sounds/investor-relations.gsm
-var/lib/asterisk/sounds/iowa.gsm
-var/lib/asterisk/sounds/is-at.gsm
-var/lib/asterisk/sounds/is-curntly-busy.gsm
-var/lib/asterisk/sounds/is-curntly-unavail.gsm
-var/lib/asterisk/sounds/is-currently.gsm
-var/lib/asterisk/sounds/is-in-use.gsm
-var/lib/asterisk/sounds/is-not-in-the.gsm
-var/lib/asterisk/sounds/is-not-set.gsm
-var/lib/asterisk/sounds/is-now-being-recorded.gsm
-var/lib/asterisk/sounds/is-set-to.gsm
-var/lib/asterisk/sounds/is.gsm
-var/lib/asterisk/sounds/it-now.gsm
-var/lib/asterisk/sounds/it-services.gsm
-var/lib/asterisk/sounds/jacksonville.gsm
-var/lib/asterisk/sounds/janitorial.gsm
-var/lib/asterisk/sounds/jason.gsm
-var/lib/asterisk/sounds/jedi-extension-trick.gsm
-var/lib/asterisk/sounds/john.gsm
-var/lib/asterisk/sounds/just-kidding-not-upset.gsm
-var/lib/asterisk/sounds/just-kidding-not-upset2.gsm
-var/lib/asterisk/sounds/kansas-city.gsm
-var/lib/asterisk/sounds/kansas.gsm
-var/lib/asterisk/sounds/kentucky.gsm
-var/lib/asterisk/sounds/kilobits.gsm
-var/lib/asterisk/sounds/kilobytes.gsm
-var/lib/asterisk/sounds/kilohertz.gsm
-var/lib/asterisk/sounds/kilometer.gsm
-var/lib/asterisk/sounds/kilometers-per-hour.gsm
-var/lib/asterisk/sounds/knock-knock.gsm
-var/lib/asterisk/sounds/knots.gsm
-var/lib/asterisk/sounds/language.gsm
-var/lib/asterisk/sounds/las-vegas.gsm
-var/lib/asterisk/sounds/last-error-was.gsm
-var/lib/asterisk/sounds/last-num-to-call.gsm
-var/lib/asterisk/sounds/late.gsm
-var/lib/asterisk/sounds/later.gsm
-var/lib/asterisk/sounds/lea-may-request-info.gsm
-var/lib/asterisk/sounds/left-bracket.gsm
-var/lib/asterisk/sounds/legal.gsm
-var/lib/asterisk/sounds/len.gsm
-var/lib/asterisk/sounds/less-than.gsm
+var/lib/asterisk/sounds/en
+var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.22
+var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.11
+var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm
+var/lib/asterisk/sounds/en/1-yes-2-no.gsm
+var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.22
+var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.11
+var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.22
+var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.22
+var/lib/asterisk/sounds/en/T-changed-to.gsm
+var/lib/asterisk/sounds/en/T-is-not-available.gsm
+var/lib/asterisk/sounds/en/T-to-disable-ancmnt.gsm
+var/lib/asterisk/sounds/en/T-to-enable-ancmnt.gsm
+var/lib/asterisk/sounds/en/T-to-hear-cur-ancmnt.gsm
+var/lib/asterisk/sounds/en/T-to-leave-msg.gsm
+var/lib/asterisk/sounds/en/T-to-reach-main-office.gsm
+var/lib/asterisk/sounds/en/T-to-rec-ancmnt.gsm
+var/lib/asterisk/sounds/en/T-to-rtrn-to-main-menu.gsm
+var/lib/asterisk/sounds/en/a-charge-for-this-svc.gsm
+var/lib/asterisk/sounds/en/a-collect-charge-of.gsm
+var/lib/asterisk/sounds/en/a-collect-charge.gsm
+var/lib/asterisk/sounds/en/a-connect-charge-of.gsm
+var/lib/asterisk/sounds/en/a-connect-charge.gsm
+var/lib/asterisk/sounds/en/abandon-all-hope.gsm
+var/lib/asterisk/sounds/en/abandons.gsm
+var/lib/asterisk/sounds/en/academic-support.gsm
+var/lib/asterisk/sounds/en/access-code.gsm
+var/lib/asterisk/sounds/en/access-denied.gsm
+var/lib/asterisk/sounds/en/access-granted.gsm
+var/lib/asterisk/sounds/en/accessible-through-system.gsm
+var/lib/asterisk/sounds/en/account-balance-is.gsm
+var/lib/asterisk/sounds/en/accounting.gsm
+var/lib/asterisk/sounds/en/accounts-payable.gsm
+var/lib/asterisk/sounds/en/accounts-receivable.gsm
+var/lib/asterisk/sounds/en/activated.gsm
+var/lib/asterisk/sounds/en/added-to.gsm
+var/lib/asterisk/sounds/en/added.gsm
+var/lib/asterisk/sounds/en/address.gsm
+var/lib/asterisk/sounds/en/administration.gsm
+var/lib/asterisk/sounds/en/advised-to-seek-shelter.gsm
+var/lib/asterisk/sounds/en/after-the-tone.gsm
+var/lib/asterisk/sounds/en/afternoon.gsm
+var/lib/asterisk/sounds/en/agent-alreadyon.gsm
+var/lib/asterisk/sounds/en/agent-incorrect.gsm
+var/lib/asterisk/sounds/en/agent-loggedoff.gsm
+var/lib/asterisk/sounds/en/agent-loginok.gsm
+var/lib/asterisk/sounds/en/agent-newlocation.gsm
+var/lib/asterisk/sounds/en/agent-pass.gsm
+var/lib/asterisk/sounds/en/agent-user.gsm
+var/lib/asterisk/sounds/en/airport.gsm
+var/lib/asterisk/sounds/en/alabama.gsm
+var/lib/asterisk/sounds/en/alaska.gsm
+var/lib/asterisk/sounds/en/albuquerque.gsm
+var/lib/asterisk/sounds/en/alert.gsm
+var/lib/asterisk/sounds/en/all-circuits-busy-now.gsm
+var/lib/asterisk/sounds/en/all-outgoing-lines-unavailable.gsm
+var/lib/asterisk/sounds/en/all-reps-busy.gsm
+var/lib/asterisk/sounds/en/all-your-base.gsm
+var/lib/asterisk/sounds/en/altitude.gsm
+var/lib/asterisk/sounds/en/ampersand.gsm
+var/lib/asterisk/sounds/en/an-error-has-occured.gsm
+var/lib/asterisk/sounds/en/an-error-has-occurred.gsm
+var/lib/asterisk/sounds/en/and-area-code.gsm
+var/lib/asterisk/sounds/en/and-or.gsm
+var/lib/asterisk/sounds/en/and-prs-pound-whn-finished.gsm
+var/lib/asterisk/sounds/en/and.gsm
+var/lib/asterisk/sounds/en/another-time.gsm
+var/lib/asterisk/sounds/en/approaching.gsm
+var/lib/asterisk/sounds/en/approximately.gsm
+var/lib/asterisk/sounds/en/are-you-still-there.gsm
+var/lib/asterisk/sounds/en/are-you-still-there2.gsm
+var/lib/asterisk/sounds/en/arizona.gsm
+var/lib/asterisk/sounds/en/arkansas.gsm
+var/lib/asterisk/sounds/en/arlington.gsm
+var/lib/asterisk/sounds/en/ascending-2tone.gsm
+var/lib/asterisk/sounds/en/astcc-account-balance-is.gsm
+var/lib/asterisk/sounds/en/astcc-account-number-invalid.gsm
+var/lib/asterisk/sounds/en/astcc-balance-of-account-is.gsm
+var/lib/asterisk/sounds/en/astcc-card-number-invalid.gsm
+var/lib/asterisk/sounds/en/astcc-digit-account-number.gsm
+var/lib/asterisk/sounds/en/astcc-followed-by-pound.gsm
+var/lib/asterisk/sounds/en/astcc-followed-by-the-hash-key.gsm
+var/lib/asterisk/sounds/en/astcc-followed-by-the-pound-key.gsm
+var/lib/asterisk/sounds/en/astcc-login12pound.gsm
+var/lib/asterisk/sounds/en/astcc-please-enter-your.gsm
+var/lib/asterisk/sounds/en/astcc-skipping-any-punctuation.gsm
+var/lib/asterisk/sounds/en/asterisk-friend.gsm
+var/lib/asterisk/sounds/en/at-any-time.gsm
+var/lib/asterisk/sounds/en/at-customers-request.gsm
+var/lib/asterisk/sounds/en/at-following-number.gsm
+var/lib/asterisk/sounds/en/at-sign.gsm
+var/lib/asterisk/sounds/en/at-tone-time-exactly.gsm
+var/lib/asterisk/sounds/en/athletics.gsm
+var/lib/asterisk/sounds/en/atlanta.gsm
+var/lib/asterisk/sounds/en/atlantic.gsm
+var/lib/asterisk/sounds/en/attention-required.gsm
+var/lib/asterisk/sounds/en/auditing.gsm
+var/lib/asterisk/sounds/en/austin.gsm
+var/lib/asterisk/sounds/en/auth-incorrect.gsm
+var/lib/asterisk/sounds/en/auth-thankyou.gsm
+var/lib/asterisk/sounds/en/available-options.gsm
+var/lib/asterisk/sounds/en/available.gsm
+var/lib/asterisk/sounds/en/avg-speed-answer.gsm
+var/lib/asterisk/sounds/en/away-naughty-boy.gsm
+var/lib/asterisk/sounds/en/away-naughty-girl.gsm
+var/lib/asterisk/sounds/en/backslash.gsm
+var/lib/asterisk/sounds/en/bad.gsm
+var/lib/asterisk/sounds/en/baltimore.gsm
+var/lib/asterisk/sounds/en/bar.gsm
+var/lib/asterisk/sounds/en/barn.gsm
+var/lib/asterisk/sounds/en/barns.gsm
+var/lib/asterisk/sounds/en/barometric.gsm
+var/lib/asterisk/sounds/en/bearing.gsm
+var/lib/asterisk/sounds/en/beaufort.gsm
+var/lib/asterisk/sounds/en/because-paranoid.gsm
+var/lib/asterisk/sounds/en/beep.gsm
+var/lib/asterisk/sounds/en/beeperr.gsm
+var/lib/asterisk/sounds/en/before-the-number.gsm
+var/lib/asterisk/sounds/en/believe-its-free.gsm
+var/lib/asterisk/sounds/en/billing-and-collections.gsm
+var/lib/asterisk/sounds/en/billing.gsm
+var/lib/asterisk/sounds/en/billionth.gsm
+var/lib/asterisk/sounds/en/bits.gsm
+var/lib/asterisk/sounds/en/blue-eyed-polar-bear.gsm
+var/lib/asterisk/sounds/en/bookstore.gsm
+var/lib/asterisk/sounds/en/boston.gsm
+var/lib/asterisk/sounds/en/box.gsm
+var/lib/asterisk/sounds/en/brian.gsm
+var/lib/asterisk/sounds/en/business-development.gsm
+var/lib/asterisk/sounds/en/busy-hangovers.gsm
+var/lib/asterisk/sounds/en/busy-pls-hold.gsm
+var/lib/asterisk/sounds/en/but.gsm
+var/lib/asterisk/sounds/en/by.gsm
+var/lib/asterisk/sounds/en/bytes.gsm
+var/lib/asterisk/sounds/en/cafeteria.gsm
+var/lib/asterisk/sounds/en/california.gsm
+var/lib/asterisk/sounds/en/call-forward.gsm
+var/lib/asterisk/sounds/en/call-forwarding.gsm
+var/lib/asterisk/sounds/en/call-fwd-cancelled.gsm
+var/lib/asterisk/sounds/en/call-fwd-no-ans.gsm
+var/lib/asterisk/sounds/en/call-fwd-on-busy.gsm
+var/lib/asterisk/sounds/en/call-fwd-parallel.gsm
+var/lib/asterisk/sounds/en/call-fwd-unconditional.gsm
+var/lib/asterisk/sounds/en/call-preempted.gsm
+var/lib/asterisk/sounds/en/call-quality-menu.gsm
+var/lib/asterisk/sounds/en/call-requres.gsm
+var/lib/asterisk/sounds/en/call-terminated.gsm
+var/lib/asterisk/sounds/en/call-waiting.gsm
+var/lib/asterisk/sounds/en/call.gsm
+var/lib/asterisk/sounds/en/calling.gsm
+var/lib/asterisk/sounds/en/calls-taken-by.gsm
+var/lib/asterisk/sounds/en/calls-waiting-for-rep.gsm
+var/lib/asterisk/sounds/en/calls.gsm
+var/lib/asterisk/sounds/en/campground-office.gsm
+var/lib/asterisk/sounds/en/cancelled.gsm
+var/lib/asterisk/sounds/en/cannot-complete-as-dialed.gsm
+var/lib/asterisk/sounds/en/cannot-complete-network-error.gsm
+var/lib/asterisk/sounds/en/cannot-complete-otherend-error.gsm
+var/lib/asterisk/sounds/en/cannot-complete-temp-error.gsm
+var/lib/asterisk/sounds/en/card-balance-is.gsm
+var/lib/asterisk/sounds/en/card-is-invalid.gsm
+var/lib/asterisk/sounds/en/card-number.gsm
+var/lib/asterisk/sounds/en/carried-away-by-monkeys.gsm
+var/lib/asterisk/sounds/en/cause-code.gsm
+var/lib/asterisk/sounds/en/cc-amex.gsm
+var/lib/asterisk/sounds/en/cc-discover.gsm
+var/lib/asterisk/sounds/en/cc-mastercard.gsm
+var/lib/asterisk/sounds/en/cc-visa.gsm
+var/lib/asterisk/sounds/en/celsius.gsm
+var/lib/asterisk/sounds/en/cent.gsm
+var/lib/asterisk/sounds/en/central.gsm
+var/lib/asterisk/sounds/en/cents-per-minute.gsm
+var/lib/asterisk/sounds/en/cents.gsm
+var/lib/asterisk/sounds/en/ceo-office.gsm
+var/lib/asterisk/sounds/en/chance-of.gsm
+var/lib/asterisk/sounds/en/changing.gsm
+var/lib/asterisk/sounds/en/channel-insecure-warn.gsm
+var/lib/asterisk/sounds/en/channel-secure.gsm
+var/lib/asterisk/sounds/en/channel.gsm
+var/lib/asterisk/sounds/en/charlotte.gsm
+var/lib/asterisk/sounds/en/chat-room.gsm
+var/lib/asterisk/sounds/en/check-number-dial-again.gsm
+var/lib/asterisk/sounds/en/chemistry.gsm
+var/lib/asterisk/sounds/en/chicago.gsm
+var/lib/asterisk/sounds/en/chris.gsm
+var/lib/asterisk/sounds/en/claims.gsm
+var/lib/asterisk/sounds/en/clear.gsm
+var/lib/asterisk/sounds/en/clearing.gsm
+var/lib/asterisk/sounds/en/cleveland.gsm
+var/lib/asterisk/sounds/en/clli.gsm
+var/lib/asterisk/sounds/en/close-parenthesis.gsm
+var/lib/asterisk/sounds/en/clouds.gsm
+var/lib/asterisk/sounds/en/cloudy.gsm
+var/lib/asterisk/sounds/en/collections.gsm
+var/lib/asterisk/sounds/en/colorado-springs.gsm
+var/lib/asterisk/sounds/en/colorado.gsm
+var/lib/asterisk/sounds/en/columbus.gsm
+var/lib/asterisk/sounds/en/comma.gsm
+var/lib/asterisk/sounds/en/communications.gsm
+var/lib/asterisk/sounds/en/company-dir-411.gsm
+var/lib/asterisk/sounds/en/complaint.gsm
+var/lib/asterisk/sounds/en/compliance.gsm
+var/lib/asterisk/sounds/en/computer-friend1.gsm
+var/lib/asterisk/sounds/en/computer-friend2.gsm
+var/lib/asterisk/sounds/en/conditions.gsm
+var/lib/asterisk/sounds/en/conf-adminmenu-162.gsm
+var/lib/asterisk/sounds/en/conf-adminmenu.gsm
+var/lib/asterisk/sounds/en/conf-banned.gsm
+var/lib/asterisk/sounds/en/conf-enteringno.gsm
+var/lib/asterisk/sounds/en/conf-errormenu.gsm
+var/lib/asterisk/sounds/en/conf-extended.gsm
+var/lib/asterisk/sounds/en/conf-full.gsm
+var/lib/asterisk/sounds/en/conf-getchannel.gsm
+var/lib/asterisk/sounds/en/conf-getconfno.gsm
+var/lib/asterisk/sounds/en/conf-getpin.gsm
+var/lib/asterisk/sounds/en/conf-hasentered.gsm
+var/lib/asterisk/sounds/en/conf-hasjoin.gsm
+var/lib/asterisk/sounds/en/conf-hasleft.gsm
+var/lib/asterisk/sounds/en/conf-invalid.gsm
+var/lib/asterisk/sounds/en/conf-invalidpin.gsm
+var/lib/asterisk/sounds/en/conf-kicked.gsm
+var/lib/asterisk/sounds/en/conf-leaderhasleft.gsm
+var/lib/asterisk/sounds/en/conf-locked.gsm
+var/lib/asterisk/sounds/en/conf-lockednow.gsm
+var/lib/asterisk/sounds/en/conf-muted.gsm
+var/lib/asterisk/sounds/en/conf-noempty.gsm
+var/lib/asterisk/sounds/en/conf-nonextended.gsm
+var/lib/asterisk/sounds/en/conf-now-muted.gsm
+var/lib/asterisk/sounds/en/conf-now-recording.gsm
+var/lib/asterisk/sounds/en/conf-now-unmuted.gsm
+var/lib/asterisk/sounds/en/conf-onlyone.gsm
+var/lib/asterisk/sounds/en/conf-onlyperson.gsm
+var/lib/asterisk/sounds/en/conf-onlypersonleft.gsm
+var/lib/asterisk/sounds/en/conf-otherinparty.gsm
+var/lib/asterisk/sounds/en/conf-peopleinconf.gsm
+var/lib/asterisk/sounds/en/conf-placeintoconf.gsm
+var/lib/asterisk/sounds/en/conf-roll-callcomplete.gsm
+var/lib/asterisk/sounds/en/conf-sysop.gsm
+var/lib/asterisk/sounds/en/conf-sysopreq.gsm
+var/lib/asterisk/sounds/en/conf-sysopreqcancelled.gsm
+var/lib/asterisk/sounds/en/conf-thereare.gsm
+var/lib/asterisk/sounds/en/conf-unlockednow.gsm
+var/lib/asterisk/sounds/en/conf-unmuted.gsm
+var/lib/asterisk/sounds/en/conf-usermenu-162.gsm
+var/lib/asterisk/sounds/en/conf-usermenu.gsm
+var/lib/asterisk/sounds/en/conf-userswilljoin.gsm
+var/lib/asterisk/sounds/en/conf-userwilljoin.gsm
+var/lib/asterisk/sounds/en/conf-waitforleader.gsm
+var/lib/asterisk/sounds/en/conf-youareinconfnum.gsm
+var/lib/asterisk/sounds/en/confbridge-begin-glorious-a.gsm
+var/lib/asterisk/sounds/en/confbridge-begin-glorious-b.gsm
+var/lib/asterisk/sounds/en/confbridge-begin-glorious-c.gsm
+var/lib/asterisk/sounds/en/confbridge-begin-leader.gsm
+var/lib/asterisk/sounds/en/confbridge-conf-begin.gsm
+var/lib/asterisk/sounds/en/confbridge-conf-end.gsm
+var/lib/asterisk/sounds/en/confbridge-dec-list-vol-in.gsm
+var/lib/asterisk/sounds/en/confbridge-dec-list-vol-out.gsm
+var/lib/asterisk/sounds/en/confbridge-dec-talk-vol-in.gsm
+var/lib/asterisk/sounds/en/confbridge-dec-talk-vol-out.gsm
+var/lib/asterisk/sounds/en/confbridge-has-joined.gsm
+var/lib/asterisk/sounds/en/confbridge-has-left.gsm
+var/lib/asterisk/sounds/en/confbridge-inc-list-vol-in.gsm
+var/lib/asterisk/sounds/en/confbridge-inc-list-vol-out.gsm
+var/lib/asterisk/sounds/en/confbridge-inc-talk-vol-in.gsm
+var/lib/asterisk/sounds/en/confbridge-inc-talk-vol-out.gsm
+var/lib/asterisk/sounds/en/confbridge-invalid.gsm
+var/lib/asterisk/sounds/en/confbridge-join.gsm
+var/lib/asterisk/sounds/en/confbridge-leave-in.gsm
+var/lib/asterisk/sounds/en/confbridge-leave-out.gsm
+var/lib/asterisk/sounds/en/confbridge-leave.gsm
+var/lib/asterisk/sounds/en/confbridge-lock-extended.gsm
+var/lib/asterisk/sounds/en/confbridge-lock-in.gsm
+var/lib/asterisk/sounds/en/confbridge-lock-no-join.gsm
+var/lib/asterisk/sounds/en/confbridge-lock-out.gsm
+var/lib/asterisk/sounds/en/confbridge-locked.gsm
+var/lib/asterisk/sounds/en/confbridge-menu-exit-in.gsm
+var/lib/asterisk/sounds/en/confbridge-menu-exit-out.gsm
+var/lib/asterisk/sounds/en/confbridge-mute-extended.gsm
+var/lib/asterisk/sounds/en/confbridge-mute-in.gsm
+var/lib/asterisk/sounds/en/confbridge-mute-out.gsm
+var/lib/asterisk/sounds/en/confbridge-muted.gsm
+var/lib/asterisk/sounds/en/confbridge-only-one.gsm
+var/lib/asterisk/sounds/en/confbridge-only-participant.gsm
+var/lib/asterisk/sounds/en/confbridge-participants.gsm
+var/lib/asterisk/sounds/en/confbridge-pin-bad.gsm
+var/lib/asterisk/sounds/en/confbridge-pin.gsm
+var/lib/asterisk/sounds/en/confbridge-remove-last-in.gsm
+var/lib/asterisk/sounds/en/confbridge-remove-last-out.gsm
+var/lib/asterisk/sounds/en/confbridge-removed.gsm
+var/lib/asterisk/sounds/en/confbridge-rest-list-vol-in.gsm
+var/lib/asterisk/sounds/en/confbridge-rest-list-vol-out.gsm
+var/lib/asterisk/sounds/en/confbridge-rest-talk-vol-in.gsm
+var/lib/asterisk/sounds/en/confbridge-rest-talk-vol-out.gsm
+var/lib/asterisk/sounds/en/confbridge-there-are.gsm
+var/lib/asterisk/sounds/en/confbridge-unlocked.gsm
+var/lib/asterisk/sounds/en/confbridge-unmuted.gsm
+var/lib/asterisk/sounds/en/conference-call.gsm
+var/lib/asterisk/sounds/en/conference-reservations.gsm
+var/lib/asterisk/sounds/en/conference.gsm
+var/lib/asterisk/sounds/en/confirm-number-is.gsm
+var/lib/asterisk/sounds/en/connected.gsm
+var/lib/asterisk/sounds/en/connecticut.gsm
+var/lib/asterisk/sounds/en/connecting.gsm
+var/lib/asterisk/sounds/en/connection-failed.gsm
+var/lib/asterisk/sounds/en/connection-timed-out.gsm
+var/lib/asterisk/sounds/en/continue-english-press.gsm
+var/lib/asterisk/sounds/en/continue-in-english.gsm
+var/lib/asterisk/sounds/en/copy-center.gsm
+var/lib/asterisk/sounds/en/core-sounds-en.txt
+var/lib/asterisk/sounds/en/could-lose-a-few-pounds.gsm
+var/lib/asterisk/sounds/en/counseling-services.gsm
+var/lib/asterisk/sounds/en/count.gsm
+var/lib/asterisk/sounds/en/crash.gsm
+var/lib/asterisk/sounds/en/current-time-is.gsm
+var/lib/asterisk/sounds/en/currently.gsm
+var/lib/asterisk/sounds/en/customer-accounts.gsm
+var/lib/asterisk/sounds/en/customer-relations.gsm
+var/lib/asterisk/sounds/en/customer-service.gsm
+var/lib/asterisk/sounds/en/cyclone.gsm
+var/lib/asterisk/sounds/en/dallas.gsm
+var/lib/asterisk/sounds/en/date.gsm
+var/lib/asterisk/sounds/en/day.gsm
+var/lib/asterisk/sounds/en/daylight.gsm
+var/lib/asterisk/sounds/en/days.gsm
+var/lib/asterisk/sounds/en/de-activated.gsm
+var/lib/asterisk/sounds/en/deadbeat.gsm
+var/lib/asterisk/sounds/en/decode.gsm
+var/lib/asterisk/sounds/en/default-attendant.gsm
+var/lib/asterisk/sounds/en/degrees.gsm
+var/lib/asterisk/sounds/en/delaware.gsm
+var/lib/asterisk/sounds/en/demo-abouttotry.gsm
+var/lib/asterisk/sounds/en/demo-congrats.gsm
+var/lib/asterisk/sounds/en/demo-echodone.gsm
+var/lib/asterisk/sounds/en/demo-echotest.gsm
+var/lib/asterisk/sounds/en/demo-enterkeywords.gsm
+var/lib/asterisk/sounds/en/demo-instruct.gsm
+var/lib/asterisk/sounds/en/demo-moreinfo.gsm
+var/lib/asterisk/sounds/en/demo-nogo.gsm
+var/lib/asterisk/sounds/en/demo-nomatch.gsm
+var/lib/asterisk/sounds/en/demo-thanks.gsm
+var/lib/asterisk/sounds/en/denial-of-service.gsm
+var/lib/asterisk/sounds/en/denver.gsm
+var/lib/asterisk/sounds/en/department-administrator.gsm
+var/lib/asterisk/sounds/en/department.gsm
+var/lib/asterisk/sounds/en/deposit.gsm
+var/lib/asterisk/sounds/en/descending-2tone.gsm
+var/lib/asterisk/sounds/en/design.gsm
+var/lib/asterisk/sounds/en/detroit.gsm
+var/lib/asterisk/sounds/en/development.gsm
+var/lib/asterisk/sounds/en/dial-here-often.gsm
+var/lib/asterisk/sounds/en/dictate
+var/lib/asterisk/sounds/en/dictate/both_help.gsm
+var/lib/asterisk/sounds/en/dictate/enter_filename.gsm
+var/lib/asterisk/sounds/en/dictate/forhelp.gsm
+var/lib/asterisk/sounds/en/dictate/pause.gsm
+var/lib/asterisk/sounds/en/dictate/paused.gsm
+var/lib/asterisk/sounds/en/dictate/play_help.gsm
+var/lib/asterisk/sounds/en/dictate/playback.gsm
+var/lib/asterisk/sounds/en/dictate/playback_mode.gsm
+var/lib/asterisk/sounds/en/dictate/record.gsm
+var/lib/asterisk/sounds/en/dictate/record_help.gsm
+var/lib/asterisk/sounds/en/dictate/record_mode.gsm
+var/lib/asterisk/sounds/en/dictate/truncating_audio.gsm
+var/lib/asterisk/sounds/en/digit.gsm
+var/lib/asterisk/sounds/en/digits
+var/lib/asterisk/sounds/en/digits.gsm
+var/lib/asterisk/sounds/en/digits/0.gsm
+var/lib/asterisk/sounds/en/digits/1.gsm
+var/lib/asterisk/sounds/en/digits/10.gsm
+var/lib/asterisk/sounds/en/digits/11.gsm
+var/lib/asterisk/sounds/en/digits/12.gsm
+var/lib/asterisk/sounds/en/digits/13.gsm
+var/lib/asterisk/sounds/en/digits/14.gsm
+var/lib/asterisk/sounds/en/digits/15.gsm
+var/lib/asterisk/sounds/en/digits/16.gsm
+var/lib/asterisk/sounds/en/digits/17.gsm
+var/lib/asterisk/sounds/en/digits/18.gsm
+var/lib/asterisk/sounds/en/digits/19.gsm
+var/lib/asterisk/sounds/en/digits/2.gsm
+var/lib/asterisk/sounds/en/digits/20.gsm
+var/lib/asterisk/sounds/en/digits/3.gsm
+var/lib/asterisk/sounds/en/digits/30.gsm
+var/lib/asterisk/sounds/en/digits/4.gsm
+var/lib/asterisk/sounds/en/digits/40.gsm
+var/lib/asterisk/sounds/en/digits/5.gsm
+var/lib/asterisk/sounds/en/digits/50.gsm
+var/lib/asterisk/sounds/en/digits/6.gsm
+var/lib/asterisk/sounds/en/digits/60.gsm
+var/lib/asterisk/sounds/en/digits/7.gsm
+var/lib/asterisk/sounds/en/digits/70.gsm
+var/lib/asterisk/sounds/en/digits/8.gsm
+var/lib/asterisk/sounds/en/digits/80.gsm
+var/lib/asterisk/sounds/en/digits/9.gsm
+var/lib/asterisk/sounds/en/digits/90.gsm
+var/lib/asterisk/sounds/en/digits/a-m.gsm
+var/lib/asterisk/sounds/en/digits/at.gsm
+var/lib/asterisk/sounds/en/digits/billion.gsm
+var/lib/asterisk/sounds/en/digits/day-0.gsm
+var/lib/asterisk/sounds/en/digits/day-1.gsm
+var/lib/asterisk/sounds/en/digits/day-2.gsm
+var/lib/asterisk/sounds/en/digits/day-3.gsm
+var/lib/asterisk/sounds/en/digits/day-4.gsm
+var/lib/asterisk/sounds/en/digits/day-5.gsm
+var/lib/asterisk/sounds/en/digits/day-6.gsm
+var/lib/asterisk/sounds/en/digits/dollars.gsm
+var/lib/asterisk/sounds/en/digits/h-1.gsm
+var/lib/asterisk/sounds/en/digits/h-10.gsm
+var/lib/asterisk/sounds/en/digits/h-11.gsm
+var/lib/asterisk/sounds/en/digits/h-12.gsm
+var/lib/asterisk/sounds/en/digits/h-13.gsm
+var/lib/asterisk/sounds/en/digits/h-14.gsm
+var/lib/asterisk/sounds/en/digits/h-15.gsm
+var/lib/asterisk/sounds/en/digits/h-16.gsm
+var/lib/asterisk/sounds/en/digits/h-17.gsm
+var/lib/asterisk/sounds/en/digits/h-18.gsm
+var/lib/asterisk/sounds/en/digits/h-19.gsm
+var/lib/asterisk/sounds/en/digits/h-2.gsm
+var/lib/asterisk/sounds/en/digits/h-20.gsm
+var/lib/asterisk/sounds/en/digits/h-3.gsm
+var/lib/asterisk/sounds/en/digits/h-30.gsm
+var/lib/asterisk/sounds/en/digits/h-4.gsm
+var/lib/asterisk/sounds/en/digits/h-40.gsm
+var/lib/asterisk/sounds/en/digits/h-5.gsm
+var/lib/asterisk/sounds/en/digits/h-50.gsm
+var/lib/asterisk/sounds/en/digits/h-6.gsm
+var/lib/asterisk/sounds/en/digits/h-60.gsm
+var/lib/asterisk/sounds/en/digits/h-7.gsm
+var/lib/asterisk/sounds/en/digits/h-70.gsm
+var/lib/asterisk/sounds/en/digits/h-8.gsm
+var/lib/asterisk/sounds/en/digits/h-80.gsm
+var/lib/asterisk/sounds/en/digits/h-9.gsm
+var/lib/asterisk/sounds/en/digits/h-90.gsm
+var/lib/asterisk/sounds/en/digits/h-billion.gsm
+var/lib/asterisk/sounds/en/digits/h-hundred.gsm
+var/lib/asterisk/sounds/en/digits/h-million.gsm
+var/lib/asterisk/sounds/en/digits/h-thousand.gsm
+var/lib/asterisk/sounds/en/digits/hundred.gsm
+var/lib/asterisk/sounds/en/digits/million.gsm
+var/lib/asterisk/sounds/en/digits/minus.gsm
+var/lib/asterisk/sounds/en/digits/mon-0.gsm
+var/lib/asterisk/sounds/en/digits/mon-1.gsm
+var/lib/asterisk/sounds/en/digits/mon-10.gsm
+var/lib/asterisk/sounds/en/digits/mon-11.gsm
+var/lib/asterisk/sounds/en/digits/mon-2.gsm
+var/lib/asterisk/sounds/en/digits/mon-3.gsm
+var/lib/asterisk/sounds/en/digits/mon-4.gsm
+var/lib/asterisk/sounds/en/digits/mon-5.gsm
+var/lib/asterisk/sounds/en/digits/mon-6.gsm
+var/lib/asterisk/sounds/en/digits/mon-7.gsm
+var/lib/asterisk/sounds/en/digits/mon-8.gsm
+var/lib/asterisk/sounds/en/digits/mon-9.gsm
+var/lib/asterisk/sounds/en/digits/oclock.gsm
+var/lib/asterisk/sounds/en/digits/oh.gsm
+var/lib/asterisk/sounds/en/digits/p-m.gsm
+var/lib/asterisk/sounds/en/digits/pound.gsm
+var/lib/asterisk/sounds/en/digits/star.gsm
+var/lib/asterisk/sounds/en/digits/thousand.gsm
+var/lib/asterisk/sounds/en/digits/today.gsm
+var/lib/asterisk/sounds/en/digits/tomorrow.gsm
+var/lib/asterisk/sounds/en/digits/yesterday.gsm
+var/lib/asterisk/sounds/en/dir-first.gsm
+var/lib/asterisk/sounds/en/dir-firstlast.gsm
+var/lib/asterisk/sounds/en/dir-instr.gsm
+var/lib/asterisk/sounds/en/dir-intro-fn.gsm
+var/lib/asterisk/sounds/en/dir-intro.gsm
+var/lib/asterisk/sounds/en/dir-last.gsm
+var/lib/asterisk/sounds/en/dir-multi1.gsm
+var/lib/asterisk/sounds/en/dir-multi2.gsm
+var/lib/asterisk/sounds/en/dir-multi3.gsm
+var/lib/asterisk/sounds/en/dir-multi9.gsm
+var/lib/asterisk/sounds/en/dir-nomatch.gsm
+var/lib/asterisk/sounds/en/dir-nomore.gsm
+var/lib/asterisk/sounds/en/dir-pls-enter.gsm
+var/lib/asterisk/sounds/en/dir-usingkeypad.gsm
+var/lib/asterisk/sounds/en/dir-welcome.gsm
+var/lib/asterisk/sounds/en/directory-assistance.gsm
+var/lib/asterisk/sounds/en/directory.gsm
+var/lib/asterisk/sounds/en/disabled.gsm
+var/lib/asterisk/sounds/en/discon-or-out-of-service.gsm
+var/lib/asterisk/sounds/en/disconnected.gsm
+var/lib/asterisk/sounds/en/disk.gsm
+var/lib/asterisk/sounds/en/distribution.gsm
+var/lib/asterisk/sounds/en/divided-by.gsm
+var/lib/asterisk/sounds/en/dns.gsm
+var/lib/asterisk/sounds/en/do-not-disturb.gsm
+var/lib/asterisk/sounds/en/doing-enum-lookup.gsm
+var/lib/asterisk/sounds/en/dont-know-who-sent.gsm
+var/lib/asterisk/sounds/en/doppler-radar.gsm
+var/lib/asterisk/sounds/en/down.gsm
+var/lib/asterisk/sounds/en/driving-directions.gsm
+var/lib/asterisk/sounds/en/duplex.gsm
+var/lib/asterisk/sounds/en/duplication.gsm
+var/lib/asterisk/sounds/en/early.gsm
+var/lib/asterisk/sounds/en/east.gsm
+var/lib/asterisk/sounds/en/easterly.gsm
+var/lib/asterisk/sounds/en/eastern.gsm
+var/lib/asterisk/sounds/en/echo-test.gsm
+var/lib/asterisk/sounds/en/ed.gsm
+var/lib/asterisk/sounds/en/eighteenth.gsm
+var/lib/asterisk/sounds/en/eighth.gsm
+var/lib/asterisk/sounds/en/eightieth.gsm
+var/lib/asterisk/sounds/en/el-paso.gsm
+var/lib/asterisk/sounds/en/eleventh.gsm
+var/lib/asterisk/sounds/en/email.gsm
+var/lib/asterisk/sounds/en/emergency.gsm
+var/lib/asterisk/sounds/en/enabled.gsm
+var/lib/asterisk/sounds/en/encode.gsm
+var/lib/asterisk/sounds/en/engineering.gsm
+var/lib/asterisk/sounds/en/ent-target-attendant.gsm
+var/lib/asterisk/sounds/en/enter-a-time.gsm
+var/lib/asterisk/sounds/en/enter-conf-call-number.gsm
+var/lib/asterisk/sounds/en/enter-conf-pin-number.gsm
+var/lib/asterisk/sounds/en/enter-ext-of-person.gsm
+var/lib/asterisk/sounds/en/enter-num-blacklist.gsm
+var/lib/asterisk/sounds/en/enter-password.gsm
+var/lib/asterisk/sounds/en/enter-phone-number10.gsm
+var/lib/asterisk/sounds/en/entering-conf-number.gsm
+var/lib/asterisk/sounds/en/entr-num-rmv-blklist.gsm
+var/lib/asterisk/sounds/en/enum-lookup-failed.gsm
+var/lib/asterisk/sounds/en/enum-lookup-successful.gsm
+var/lib/asterisk/sounds/en/error-number.gsm
+var/lib/asterisk/sounds/en/est-hold-time-is.gsm
+var/lib/asterisk/sounds/en/euro.gsm
+var/lib/asterisk/sounds/en/european.gsm
+var/lib/asterisk/sounds/en/euros.gsm
+var/lib/asterisk/sounds/en/evening.gsm
+var/lib/asterisk/sounds/en/explanation.gsm
+var/lib/asterisk/sounds/en/ext-or-zero.gsm
+var/lib/asterisk/sounds/en/extension.gsm
+var/lib/asterisk/sounds/en/extensions.gsm
+var/lib/asterisk/sounds/en/extra-sounds-en.txt
+var/lib/asterisk/sounds/en/facilities.gsm
+var/lib/asterisk/sounds/en/fahrenheit.gsm
+var/lib/asterisk/sounds/en/falling.gsm
+var/lib/asterisk/sounds/en/fast.gsm
+var/lib/asterisk/sounds/en/feature-not-avail-line.gsm
+var/lib/asterisk/sounds/en/feet.gsm
+var/lib/asterisk/sounds/en/female.gsm
+var/lib/asterisk/sounds/en/fifteenth.gsm
+var/lib/asterisk/sounds/en/fifth.gsm
+var/lib/asterisk/sounds/en/fiftieth.gsm
+var/lib/asterisk/sounds/en/finals.gsm
+var/lib/asterisk/sounds/en/finance.gsm
+var/lib/asterisk/sounds/en/first-in-line.gsm
+var/lib/asterisk/sounds/en/first.gsm
+var/lib/asterisk/sounds/en/flagged-for-lea.gsm
+var/lib/asterisk/sounds/en/flooding.gsm
+var/lib/asterisk/sounds/en/florida.gsm
+var/lib/asterisk/sounds/en/fog.gsm
+var/lib/asterisk/sounds/en/foggy.gsm
+var/lib/asterisk/sounds/en/followed-by.gsm
+var/lib/asterisk/sounds/en/followme
+var/lib/asterisk/sounds/en/followme/call-from.gsm
+var/lib/asterisk/sounds/en/followme/no-recording.gsm
+var/lib/asterisk/sounds/en/followme/options.gsm
+var/lib/asterisk/sounds/en/followme/pls-hold-while-try.gsm
+var/lib/asterisk/sounds/en/followme/sorry.gsm
+var/lib/asterisk/sounds/en/followme/status.gsm
+var/lib/asterisk/sounds/en/food-service.gsm
+var/lib/asterisk/sounds/en/food-services.gsm
+var/lib/asterisk/sounds/en/for-a-daily-wakeup-call.gsm
+var/lib/asterisk/sounds/en/for-a-list-of.gsm
+var/lib/asterisk/sounds/en/for-accounting.gsm
+var/lib/asterisk/sounds/en/for-billing.gsm
+var/lib/asterisk/sounds/en/for-english-press.gsm
+var/lib/asterisk/sounds/en/for-investor-relations.gsm
+var/lib/asterisk/sounds/en/for-louie-louie.gsm
+var/lib/asterisk/sounds/en/for-no-press.gsm
+var/lib/asterisk/sounds/en/for-qc-and-training-purposes.gsm
+var/lib/asterisk/sounds/en/for-quality-purposes.gsm
+var/lib/asterisk/sounds/en/for-sales.gsm
+var/lib/asterisk/sounds/en/for-service.gsm
+var/lib/asterisk/sounds/en/for-tech-support.gsm
+var/lib/asterisk/sounds/en/for-the-first.gsm
+var/lib/asterisk/sounds/en/for-the-weather.gsm
+var/lib/asterisk/sounds/en/for-wakeup-call.gsm
+var/lib/asterisk/sounds/en/for-yes-press.gsm
+var/lib/asterisk/sounds/en/for.gsm
+var/lib/asterisk/sounds/en/fort-worth.gsm
+var/lib/asterisk/sounds/en/fortieth.gsm
+var/lib/asterisk/sounds/en/fourteenth.gsm
+var/lib/asterisk/sounds/en/fourth.gsm
+var/lib/asterisk/sounds/en/freeze.gsm
+var/lib/asterisk/sounds/en/freezing.gsm
+var/lib/asterisk/sounds/en/frequency.gsm
+var/lib/asterisk/sounds/en/fresno.gsm
+var/lib/asterisk/sounds/en/from-unknown-caller.gsm
+var/lib/asterisk/sounds/en/from.gsm
+var/lib/asterisk/sounds/en/ftp.gsm
+var/lib/asterisk/sounds/en/gale.gsm
+var/lib/asterisk/sounds/en/gambling-drunk.gsm
+var/lib/asterisk/sounds/en/georgia.gsm
+var/lib/asterisk/sounds/en/gigabits.gsm
+var/lib/asterisk/sounds/en/gigabytes.gsm
+var/lib/asterisk/sounds/en/gigahertz.gsm
+var/lib/asterisk/sounds/en/giggle1.gsm
+var/lib/asterisk/sounds/en/gmt.gsm
+var/lib/asterisk/sounds/en/go-away1.gsm
+var/lib/asterisk/sounds/en/go-away2.gsm
+var/lib/asterisk/sounds/en/good-afternoon.gsm
+var/lib/asterisk/sounds/en/good-evening.gsm
+var/lib/asterisk/sounds/en/good-morning.gsm
+var/lib/asterisk/sounds/en/good.gsm
+var/lib/asterisk/sounds/en/goodbye.gsm
+var/lib/asterisk/sounds/en/greater-than.gsm
+var/lib/asterisk/sounds/en/groovy.gsm
+var/lib/asterisk/sounds/en/ha
+var/lib/asterisk/sounds/en/ha/ac.gsm
+var/lib/asterisk/sounds/en/ha/air-conditioner.gsm
+var/lib/asterisk/sounds/en/ha/alarm.gsm
+var/lib/asterisk/sounds/en/ha/amp.gsm
+var/lib/asterisk/sounds/en/ha/amps.gsm
+var/lib/asterisk/sounds/en/ha/attic.gsm
+var/lib/asterisk/sounds/en/ha/baby-sleeping-mode.gsm
+var/lib/asterisk/sounds/en/ha/back.gsm
+var/lib/asterisk/sounds/en/ha/basement.gsm
+var/lib/asterisk/sounds/en/ha/bathroom.gsm
+var/lib/asterisk/sounds/en/ha/bedroom.gsm
+var/lib/asterisk/sounds/en/ha/bright.gsm
+var/lib/asterisk/sounds/en/ha/callerid.gsm
+var/lib/asterisk/sounds/en/ha/carport.gsm
+var/lib/asterisk/sounds/en/ha/closet.gsm
+var/lib/asterisk/sounds/en/ha/coffee-pot.gsm
+var/lib/asterisk/sounds/en/ha/cool.gsm
+var/lib/asterisk/sounds/en/ha/cooling.gsm
+var/lib/asterisk/sounds/en/ha/dc.gsm
+var/lib/asterisk/sounds/en/ha/decibel.gsm
+var/lib/asterisk/sounds/en/ha/decibels.gsm
+var/lib/asterisk/sounds/en/ha/deck.gsm
+var/lib/asterisk/sounds/en/ha/degree.gsm
+var/lib/asterisk/sounds/en/ha/degrees.gsm
+var/lib/asterisk/sounds/en/ha/den.gsm
+var/lib/asterisk/sounds/en/ha/dim.gsm
+var/lib/asterisk/sounds/en/ha/dining-room.gsm
+var/lib/asterisk/sounds/en/ha/door.gsm
+var/lib/asterisk/sounds/en/ha/doors.gsm
+var/lib/asterisk/sounds/en/ha/down.gsm
+var/lib/asterisk/sounds/en/ha/driveway.gsm
+var/lib/asterisk/sounds/en/ha/dryer.gsm
+var/lib/asterisk/sounds/en/ha/fan.gsm
+var/lib/asterisk/sounds/en/ha/farad.gsm
+var/lib/asterisk/sounds/en/ha/farads.gsm
+var/lib/asterisk/sounds/en/ha/first-floor.gsm
+var/lib/asterisk/sounds/en/ha/floor.gsm
+var/lib/asterisk/sounds/en/ha/floors.gsm
+var/lib/asterisk/sounds/en/ha/for-extended-status-report.gsm
+var/lib/asterisk/sounds/en/ha/for-quick-status-report.gsm
+var/lib/asterisk/sounds/en/ha/for-wx-report.gsm
+var/lib/asterisk/sounds/en/ha/fountain.gsm
+var/lib/asterisk/sounds/en/ha/foyer.gsm
+var/lib/asterisk/sounds/en/ha/front.gsm
+var/lib/asterisk/sounds/en/ha/furnace.gsm
+var/lib/asterisk/sounds/en/ha/game-room.gsm
+var/lib/asterisk/sounds/en/ha/garage.gsm
+var/lib/asterisk/sounds/en/ha/great-room.gsm
+var/lib/asterisk/sounds/en/ha/guest-room.gsm
+var/lib/asterisk/sounds/en/ha/hall.gsm
+var/lib/asterisk/sounds/en/ha/has-been-left.gsm
+var/lib/asterisk/sounds/en/ha/heat-pump.gsm
+var/lib/asterisk/sounds/en/ha/heat.gsm
+var/lib/asterisk/sounds/en/ha/heating.gsm
+var/lib/asterisk/sounds/en/ha/hot-tub.gsm
+var/lib/asterisk/sounds/en/ha/house.gsm
+var/lib/asterisk/sounds/en/ha/intruder.gsm
+var/lib/asterisk/sounds/en/ha/is.gsm
+var/lib/asterisk/sounds/en/ha/kelvin.gsm
+var/lib/asterisk/sounds/en/ha/kitchen.gsm
+var/lib/asterisk/sounds/en/ha/lamp.gsm
+var/lib/asterisk/sounds/en/ha/lamps.gsm
+var/lib/asterisk/sounds/en/ha/landscape.gsm
+var/lib/asterisk/sounds/en/ha/laundry.gsm
+var/lib/asterisk/sounds/en/ha/library.gsm
+var/lib/asterisk/sounds/en/ha/light.gsm
+var/lib/asterisk/sounds/en/ha/lights.gsm
+var/lib/asterisk/sounds/en/ha/living-room.gsm
+var/lib/asterisk/sounds/en/ha/locked.gsm
+var/lib/asterisk/sounds/en/ha/locking.gsm
+var/lib/asterisk/sounds/en/ha/mailbox.gsm
+var/lib/asterisk/sounds/en/ha/master.gsm
+var/lib/asterisk/sounds/en/ha/off.gsm
+var/lib/asterisk/sounds/en/ha/office.gsm
+var/lib/asterisk/sounds/en/ha/ohm.gsm
+var/lib/asterisk/sounds/en/ha/ohms.gsm
+var/lib/asterisk/sounds/en/ha/on.gsm
+var/lib/asterisk/sounds/en/ha/open.gsm
+var/lib/asterisk/sounds/en/ha/patio.gsm
+var/lib/asterisk/sounds/en/ha/phone.gsm
+var/lib/asterisk/sounds/en/ha/play-room.gsm
+var/lib/asterisk/sounds/en/ha/play.gsm
+var/lib/asterisk/sounds/en/ha/pool.gsm
+var/lib/asterisk/sounds/en/ha/porch.gsm
+var/lib/asterisk/sounds/en/ha/power-failure.gsm
+var/lib/asterisk/sounds/en/ha/pressure.gsm
+var/lib/asterisk/sounds/en/ha/psi.gsm
+var/lib/asterisk/sounds/en/ha/quiet-mode.gsm
+var/lib/asterisk/sounds/en/ha/reset.gsm
+var/lib/asterisk/sounds/en/ha/roof.gsm
+var/lib/asterisk/sounds/en/ha/room.gsm
+var/lib/asterisk/sounds/en/ha/rooms.gsm
+var/lib/asterisk/sounds/en/ha/second-floor.gsm
+var/lib/asterisk/sounds/en/ha/secure.gsm
+var/lib/asterisk/sounds/en/ha/security-system.gsm
+var/lib/asterisk/sounds/en/ha/set.gsm
+var/lib/asterisk/sounds/en/ha/side.gsm
+var/lib/asterisk/sounds/en/ha/solar.gsm
+var/lib/asterisk/sounds/en/ha/sprinklers.gsm
+var/lib/asterisk/sounds/en/ha/still.gsm
+var/lib/asterisk/sounds/en/ha/stove.gsm
+var/lib/asterisk/sounds/en/ha/sump-pump.gsm
+var/lib/asterisk/sounds/en/ha/sun-room.gsm
+var/lib/asterisk/sounds/en/ha/system.gsm
+var/lib/asterisk/sounds/en/ha/systems.gsm
+var/lib/asterisk/sounds/en/ha/thermostat.gsm
+var/lib/asterisk/sounds/en/ha/to-control-environ-sys.gsm
+var/lib/asterisk/sounds/en/ha/to-control-lights-appl.gsm
+var/lib/asterisk/sounds/en/ha/tower.gsm
+var/lib/asterisk/sounds/en/ha/unlocked.gsm
+var/lib/asterisk/sounds/en/ha/unlocking.gsm
+var/lib/asterisk/sounds/en/ha/up.gsm
+var/lib/asterisk/sounds/en/ha/volt.gsm
+var/lib/asterisk/sounds/en/ha/volts.gsm
+var/lib/asterisk/sounds/en/ha/washing-machine.gsm
+var/lib/asterisk/sounds/en/ha/water-heater.gsm
+var/lib/asterisk/sounds/en/ha/watt.gsm
+var/lib/asterisk/sounds/en/ha/watts.gsm
+var/lib/asterisk/sounds/en/ha/well-pump.gsm
+var/lib/asterisk/sounds/en/ha/window.gsm
+var/lib/asterisk/sounds/en/ha/windows.gsm
+var/lib/asterisk/sounds/en/ha/xmas-lights.gsm
+var/lib/asterisk/sounds/en/ha/xmas-tree.gsm
+var/lib/asterisk/sounds/en/ha/yard.gsm
+var/lib/asterisk/sounds/en/hail.gsm
+var/lib/asterisk/sounds/en/half.gsm
+var/lib/asterisk/sounds/en/hang-on-a-second-angry.gsm
+var/lib/asterisk/sounds/en/hang-on-a-second.gsm
+var/lib/asterisk/sounds/en/hangup-try-again.gsm
+var/lib/asterisk/sounds/en/has-arrived-at.gsm
+var/lib/asterisk/sounds/en/has-been-changed-to.gsm
+var/lib/asterisk/sounds/en/has-been-cleared.gsm
+var/lib/asterisk/sounds/en/has-been-disconnected.gsm
+var/lib/asterisk/sounds/en/has-been-set-to.gsm
+var/lib/asterisk/sounds/en/has-been.gsm
+var/lib/asterisk/sounds/en/has-expired.gsm
+var/lib/asterisk/sounds/en/has-issued-a.gsm
+var/lib/asterisk/sounds/en/has-not-been-seen-for.gsm
+var/lib/asterisk/sounds/en/has.gsm
+var/lib/asterisk/sounds/en/hash.gsm
+var/lib/asterisk/sounds/en/hawaii.gsm
+var/lib/asterisk/sounds/en/headed-towards.gsm
+var/lib/asterisk/sounds/en/heading.gsm
+var/lib/asterisk/sounds/en/health-center.gsm
+var/lib/asterisk/sounds/en/hear-odd-noise.gsm
+var/lib/asterisk/sounds/en/hear-toilet-flush.gsm
+var/lib/asterisk/sounds/en/hectopascal.gsm
+var/lib/asterisk/sounds/en/hello-world.gsm
+var/lib/asterisk/sounds/en/hello.gsm
+var/lib/asterisk/sounds/en/helpdesk.gsm
+var/lib/asterisk/sounds/en/hertz.gsm
+var/lib/asterisk/sounds/en/high.gsm
+var/lib/asterisk/sounds/en/highway.gsm
+var/lib/asterisk/sounds/en/hit.gsm
+var/lib/asterisk/sounds/en/hold-or-dial-0.gsm
+var/lib/asterisk/sounds/en/home.gsm
+var/lib/asterisk/sounds/en/honolulu.gsm
+var/lib/asterisk/sounds/en/hours.gsm
+var/lib/asterisk/sounds/en/housekeeping.gsm
+var/lib/asterisk/sounds/en/houston.gsm
+var/lib/asterisk/sounds/en/http.gsm
+var/lib/asterisk/sounds/en/human-resources.gsm
+var/lib/asterisk/sounds/en/humidity.gsm
+var/lib/asterisk/sounds/en/hundredth.gsm
+var/lib/asterisk/sounds/en/hurricane.gsm
+var/lib/asterisk/sounds/en/hz.gsm
+var/lib/asterisk/sounds/en/i-dont-understand.gsm
+var/lib/asterisk/sounds/en/i-dont-understand2.gsm
+var/lib/asterisk/sounds/en/i-dont-understand3.gsm
+var/lib/asterisk/sounds/en/i-dont-understand4.gsm
+var/lib/asterisk/sounds/en/i-dont-understand5.gsm
+var/lib/asterisk/sounds/en/i-grow-bored.gsm
+var/lib/asterisk/sounds/en/ice.gsm
+var/lib/asterisk/sounds/en/icmp.gsm
+var/lib/asterisk/sounds/en/icy.gsm
+var/lib/asterisk/sounds/en/idaho.gsm
+var/lib/asterisk/sounds/en/if-correct-press.gsm
+var/lib/asterisk/sounds/en/if-grtg-played-indefinately.gsm
+var/lib/asterisk/sounds/en/if-grtg-should-expire-at.gsm
+var/lib/asterisk/sounds/en/if-maint-contract-or-emergency.gsm
+var/lib/asterisk/sounds/en/if-rotary-phone.gsm
+var/lib/asterisk/sounds/en/if-this-is-correct-press.gsm
+var/lib/asterisk/sounds/en/if-this-is-correct.gsm
+var/lib/asterisk/sounds/en/if-this-is-not-correct.gsm
+var/lib/asterisk/sounds/en/if-u-know-ext-dial.gsm
+var/lib/asterisk/sounds/en/if-unsuccessful-speak-to.gsm
+var/lib/asterisk/sounds/en/if-you-know-the.gsm
+var/lib/asterisk/sounds/en/if-you-need-help.gsm
+var/lib/asterisk/sounds/en/if-youd-like-to-make-a-call.gsm
+var/lib/asterisk/sounds/en/illinois.gsm
+var/lib/asterisk/sounds/en/im-sorry-unable-to-connect-to-eng.gsm
+var/lib/asterisk/sounds/en/im-sorry.gsm
+var/lib/asterisk/sounds/en/imap.gsm
+var/lib/asterisk/sounds/en/in-service.gsm
+var/lib/asterisk/sounds/en/in-the-line.gsm
+var/lib/asterisk/sounds/en/in-the-queue.gsm
+var/lib/asterisk/sounds/en/in-the.gsm
+var/lib/asterisk/sounds/en/in-your-city.gsm
+var/lib/asterisk/sounds/en/in-your-zip-code.gsm
+var/lib/asterisk/sounds/en/inbound.gsm
+var/lib/asterisk/sounds/en/indiana.gsm
+var/lib/asterisk/sounds/en/indianapolis.gsm
+var/lib/asterisk/sounds/en/indicated.gsm
+var/lib/asterisk/sounds/en/info-about-last-call.gsm
+var/lib/asterisk/sounds/en/information-technology.gsm
+var/lib/asterisk/sounds/en/information.gsm
+var/lib/asterisk/sounds/en/infuriate-tech-staff.gsm
+var/lib/asterisk/sounds/en/initiated.gsm
+var/lib/asterisk/sounds/en/initiating.gsm
+var/lib/asterisk/sounds/en/inside-sales.gsm
+var/lib/asterisk/sounds/en/internal-audit.gsm
+var/lib/asterisk/sounds/en/international-call.gsm
+var/lib/asterisk/sounds/en/interstate.gsm
+var/lib/asterisk/sounds/en/invalid-date.gsm
+var/lib/asterisk/sounds/en/invalid-featurecode.gsm
+var/lib/asterisk/sounds/en/invalid.gsm
+var/lib/asterisk/sounds/en/investor-relations.gsm
+var/lib/asterisk/sounds/en/iowa.gsm
+var/lib/asterisk/sounds/en/is-at.gsm
+var/lib/asterisk/sounds/en/is-curntly-busy.gsm
+var/lib/asterisk/sounds/en/is-curntly-unavail.gsm
+var/lib/asterisk/sounds/en/is-currently.gsm
+var/lib/asterisk/sounds/en/is-in-use.gsm
+var/lib/asterisk/sounds/en/is-not-in-the.gsm
+var/lib/asterisk/sounds/en/is-not-set.gsm
+var/lib/asterisk/sounds/en/is-now-being-recorded.gsm
+var/lib/asterisk/sounds/en/is-set-to.gsm
+var/lib/asterisk/sounds/en/is.gsm
+var/lib/asterisk/sounds/en/it-now.gsm
+var/lib/asterisk/sounds/en/it-services.gsm
+var/lib/asterisk/sounds/en/jacksonville.gsm
+var/lib/asterisk/sounds/en/janitorial.gsm
+var/lib/asterisk/sounds/en/jason.gsm
+var/lib/asterisk/sounds/en/jedi-extension-trick.gsm
+var/lib/asterisk/sounds/en/john.gsm
+var/lib/asterisk/sounds/en/just-kidding-not-upset.gsm
+var/lib/asterisk/sounds/en/just-kidding-not-upset2.gsm
+var/lib/asterisk/sounds/en/kansas-city.gsm
+var/lib/asterisk/sounds/en/kansas.gsm
+var/lib/asterisk/sounds/en/kentucky.gsm
+var/lib/asterisk/sounds/en/kilobits.gsm
+var/lib/asterisk/sounds/en/kilobytes.gsm
+var/lib/asterisk/sounds/en/kilohertz.gsm
+var/lib/asterisk/sounds/en/kilometer.gsm
+var/lib/asterisk/sounds/en/kilometers-per-hour.gsm
+var/lib/asterisk/sounds/en/knock-knock.gsm
+var/lib/asterisk/sounds/en/knots.gsm
+var/lib/asterisk/sounds/en/language.gsm
+var/lib/asterisk/sounds/en/las-vegas.gsm
+var/lib/asterisk/sounds/en/last-error-was.gsm
+var/lib/asterisk/sounds/en/last-num-to-call.gsm
+var/lib/asterisk/sounds/en/late.gsm
+var/lib/asterisk/sounds/en/later.gsm
+var/lib/asterisk/sounds/en/lea-may-request-info.gsm
+var/lib/asterisk/sounds/en/left-bracket.gsm
+var/lib/asterisk/sounds/en/legal.gsm
+var/lib/asterisk/sounds/en/len.gsm
+var/lib/asterisk/sounds/en/less-than.gsm
+var/lib/asterisk/sounds/en/letters
+var/lib/asterisk/sounds/en/letters/a.gsm
+var/lib/asterisk/sounds/en/letters/ascii123.gsm
+var/lib/asterisk/sounds/en/letters/ascii124.gsm
+var/lib/asterisk/sounds/en/letters/ascii125.gsm
+var/lib/asterisk/sounds/en/letters/ascii126.gsm
+var/lib/asterisk/sounds/en/letters/ascii34.gsm
+var/lib/asterisk/sounds/en/letters/ascii36.gsm
+var/lib/asterisk/sounds/en/letters/ascii37.gsm
+var/lib/asterisk/sounds/en/letters/ascii38.gsm
+var/lib/asterisk/sounds/en/letters/ascii39.gsm
+var/lib/asterisk/sounds/en/letters/ascii40.gsm
+var/lib/asterisk/sounds/en/letters/ascii41.gsm
+var/lib/asterisk/sounds/en/letters/ascii42.gsm
+var/lib/asterisk/sounds/en/letters/ascii44.gsm
+var/lib/asterisk/sounds/en/letters/ascii58.gsm
+var/lib/asterisk/sounds/en/letters/ascii59.gsm
+var/lib/asterisk/sounds/en/letters/ascii60.gsm
+var/lib/asterisk/sounds/en/letters/ascii62.gsm
+var/lib/asterisk/sounds/en/letters/ascii63.gsm
+var/lib/asterisk/sounds/en/letters/ascii91.gsm
+var/lib/asterisk/sounds/en/letters/ascii92.gsm
+var/lib/asterisk/sounds/en/letters/ascii93.gsm
+var/lib/asterisk/sounds/en/letters/ascii94.gsm
+var/lib/asterisk/sounds/en/letters/ascii95.gsm
+var/lib/asterisk/sounds/en/letters/ascii96.gsm
+var/lib/asterisk/sounds/en/letters/asterisk.gsm
+var/lib/asterisk/sounds/en/letters/at.gsm
+var/lib/asterisk/sounds/en/letters/b.gsm
+var/lib/asterisk/sounds/en/letters/c.gsm
+var/lib/asterisk/sounds/en/letters/d.gsm
+var/lib/asterisk/sounds/en/letters/dash.gsm
+var/lib/asterisk/sounds/en/letters/dollar.gsm
+var/lib/asterisk/sounds/en/letters/dot.gsm
+var/lib/asterisk/sounds/en/letters/e.gsm
+var/lib/asterisk/sounds/en/letters/equals.gsm
+var/lib/asterisk/sounds/en/letters/exclaimation-point.gsm
+var/lib/asterisk/sounds/en/letters/f.gsm
+var/lib/asterisk/sounds/en/letters/g.gsm
+var/lib/asterisk/sounds/en/letters/h.gsm
+var/lib/asterisk/sounds/en/letters/i.gsm
+var/lib/asterisk/sounds/en/letters/j.gsm
+var/lib/asterisk/sounds/en/letters/k.gsm
+var/lib/asterisk/sounds/en/letters/l.gsm
+var/lib/asterisk/sounds/en/letters/m.gsm
+var/lib/asterisk/sounds/en/letters/n.gsm
+var/lib/asterisk/sounds/en/letters/o.gsm
+var/lib/asterisk/sounds/en/letters/p.gsm
+var/lib/asterisk/sounds/en/letters/plus.gsm
+var/lib/asterisk/sounds/en/letters/q.gsm
+var/lib/asterisk/sounds/en/letters/r.gsm
+var/lib/asterisk/sounds/en/letters/s.gsm
+var/lib/asterisk/sounds/en/letters/slash.gsm
+var/lib/asterisk/sounds/en/letters/space.gsm
+var/lib/asterisk/sounds/en/letters/t.gsm
+var/lib/asterisk/sounds/en/letters/u.gsm
+var/lib/asterisk/sounds/en/letters/v.gsm
+var/lib/asterisk/sounds/en/letters/w.gsm
+var/lib/asterisk/sounds/en/letters/x.gsm
+var/lib/asterisk/sounds/en/letters/y.gsm
+var/lib/asterisk/sounds/en/letters/z.gsm
+var/lib/asterisk/sounds/en/letters/zed.gsm
+var/lib/asterisk/sounds/en/library.gsm
+var/lib/asterisk/sounds/en/lightning.gsm
+var/lib/asterisk/sounds/en/limit-simul-calls.gsm
+var/lib/asterisk/sounds/en/lines-complaining-customers.gsm
+var/lib/asterisk/sounds/en/linux.gsm
+var/lib/asterisk/sounds/en/list.gsm
+var/lib/asterisk/sounds/en/load-average.gsm
+var/lib/asterisk/sounds/en/local-authorities.gsm
+var/lib/asterisk/sounds/en/location.gsm
+var/lib/asterisk/sounds/en/login-fail.gsm
+var/lib/asterisk/sounds/en/long-beach.gsm
+var/lib/asterisk/sounds/en/los-angeles.gsm
+var/lib/asterisk/sounds/en/loss-prevention.gsm
+var/lib/asterisk/sounds/en/loss.gsm
+var/lib/asterisk/sounds/en/lots-o-monkeys.gsm
+var/lib/asterisk/sounds/en/louisiana.gsm
+var/lib/asterisk/sounds/en/low.gsm
+var/lib/asterisk/sounds/en/lunch.gsm
+var/lib/asterisk/sounds/en/lyrics-louie-louie.gsm
+var/lib/asterisk/sounds/en/machine.gsm
+var/lib/asterisk/sounds/en/made-it-up.gsm
+var/lib/asterisk/sounds/en/mail.gsm
+var/lib/asterisk/sounds/en/mailroom.gsm
+var/lib/asterisk/sounds/en/main-menu.gsm
+var/lib/asterisk/sounds/en/maine.gsm
+var/lib/asterisk/sounds/en/maintenance.gsm
+var/lib/asterisk/sounds/en/male.gsm
+var/lib/asterisk/sounds/en/management.gsm
+var/lib/asterisk/sounds/en/manufacturing.gsm
+var/lib/asterisk/sounds/en/marketing.gsm
+var/lib/asterisk/sounds/en/marryme.gsm
+var/lib/asterisk/sounds/en/maryland.gsm
+var/lib/asterisk/sounds/en/massachusetts.gsm
+var/lib/asterisk/sounds/en/mathematics.gsm
+var/lib/asterisk/sounds/en/maximum.gsm
+var/lib/asterisk/sounds/en/megabits.gsm
+var/lib/asterisk/sounds/en/megabytes.gsm
+var/lib/asterisk/sounds/en/megahertz.gsm
+var/lib/asterisk/sounds/en/memory.gsm
+var/lib/asterisk/sounds/en/memphis.gsm
+var/lib/asterisk/sounds/en/menu.gsm
+var/lib/asterisk/sounds/en/mesa.gsm
+var/lib/asterisk/sounds/en/message-from.gsm
+var/lib/asterisk/sounds/en/message-number.gsm
+var/lib/asterisk/sounds/en/meter.gsm
+var/lib/asterisk/sounds/en/meters.gsm
+var/lib/asterisk/sounds/en/miami.gsm
+var/lib/asterisk/sounds/en/michigan.gsm
+var/lib/asterisk/sounds/en/midnight-tomorrow-night.gsm
+var/lib/asterisk/sounds/en/midnight-tonight.gsm
+var/lib/asterisk/sounds/en/midnight.gsm
+var/lib/asterisk/sounds/en/mike.gsm
+var/lib/asterisk/sounds/en/miles-per-hour.gsm
+var/lib/asterisk/sounds/en/miles.gsm
+var/lib/asterisk/sounds/en/millionth.gsm
+var/lib/asterisk/sounds/en/milwaukee.gsm
+var/lib/asterisk/sounds/en/minimum.gsm
+var/lib/asterisk/sounds/en/minneapolis.gsm
+var/lib/asterisk/sounds/en/minnesota.gsm
+var/lib/asterisk/sounds/en/minute.gsm
+var/lib/asterisk/sounds/en/minutes.gsm
+var/lib/asterisk/sounds/en/missed.gsm
+var/lib/asterisk/sounds/en/mississippi.gsm
+var/lib/asterisk/sounds/en/missouri.gsm
+var/lib/asterisk/sounds/en/misty.gsm
+var/lib/asterisk/sounds/en/monitored.gsm
+var/lib/asterisk/sounds/en/montana.gsm
+var/lib/asterisk/sounds/en/month.gsm
+var/lib/asterisk/sounds/en/months.gsm
+var/lib/asterisk/sounds/en/moo1.gsm
+var/lib/asterisk/sounds/en/moo2.gsm
+var/lib/asterisk/sounds/en/morning.gsm
+var/lib/asterisk/sounds/en/moron.gsm
+var/lib/asterisk/sounds/en/mostly.gsm
+var/lib/asterisk/sounds/en/motor-pool.gsm
+var/lib/asterisk/sounds/en/mountain.gsm
+var/lib/asterisk/sounds/en/moving.gsm
+var/lib/asterisk/sounds/en/ms.gsm
+var/lib/asterisk/sounds/en/nashville.gsm
+var/lib/asterisk/sounds/en/national-weather-service.gsm
+var/lib/asterisk/sounds/en/nautical-miles.gsm
+var/lib/asterisk/sounds/en/nbdy-avail-to-take-call.gsm
+var/lib/asterisk/sounds/en/near.gsm
+var/lib/asterisk/sounds/en/nebraska.gsm
+var/lib/asterisk/sounds/en/negative.gsm
+var/lib/asterisk/sounds/en/network-operations-center.gsm
+var/lib/asterisk/sounds/en/network-operations.gsm
+var/lib/asterisk/sounds/en/nevada.gsm
+var/lib/asterisk/sounds/en/new-accounts.gsm
+var/lib/asterisk/sounds/en/new-hampshire.gsm
+var/lib/asterisk/sounds/en/new-jersey.gsm
+var/lib/asterisk/sounds/en/new-mexico.gsm
+var/lib/asterisk/sounds/en/new-orleans.gsm
+var/lib/asterisk/sounds/en/new-york.gsm
+var/lib/asterisk/sounds/en/nineteenth.gsm
+var/lib/asterisk/sounds/en/ninetieth.gsm
+var/lib/asterisk/sounds/en/ninth.gsm
+var/lib/asterisk/sounds/en/no-112-1.gsm
+var/lib/asterisk/sounds/en/no-112-2.gsm
+var/lib/asterisk/sounds/en/no-911-1.gsm
+var/lib/asterisk/sounds/en/no-911-2.gsm
+var/lib/asterisk/sounds/en/no-empty-conferences.gsm
+var/lib/asterisk/sounds/en/no-info-about-number.gsm
+var/lib/asterisk/sounds/en/no-longer-in-service.gsm
+var/lib/asterisk/sounds/en/no-reply-no-mailbox.gsm
+var/lib/asterisk/sounds/en/no-route-exists-to-dest.gsm
+var/lib/asterisk/sounds/en/nobody-but-chickens.gsm
+var/lib/asterisk/sounds/en/node.gsm
+var/lib/asterisk/sounds/en/north-carolina.gsm
+var/lib/asterisk/sounds/en/north-dakota.gsm
+var/lib/asterisk/sounds/en/north.gsm
+var/lib/asterisk/sounds/en/northerly.gsm
+var/lib/asterisk/sounds/en/not-auth-pstn.gsm
+var/lib/asterisk/sounds/en/not-enough-credit.gsm
+var/lib/asterisk/sounds/en/not-necessary-1.gsm
+var/lib/asterisk/sounds/en/not-necessary-ac.gsm
+var/lib/asterisk/sounds/en/not-necessary-dial-1-or-ac.gsm
+var/lib/asterisk/sounds/en/not-rqsted-wakeup.gsm
+var/lib/asterisk/sounds/en/not-taking-your-call.gsm
+var/lib/asterisk/sounds/en/not-yet-assigned.gsm
+var/lib/asterisk/sounds/en/not-yet-connected.gsm
+var/lib/asterisk/sounds/en/nothing-recorded.gsm
+var/lib/asterisk/sounds/en/now.gsm
+var/lib/asterisk/sounds/en/num-not-in-db.gsm
+var/lib/asterisk/sounds/en/num-outside-area.gsm
+var/lib/asterisk/sounds/en/num-was-successfully.gsm
+var/lib/asterisk/sounds/en/number-not-answering.gsm
+var/lib/asterisk/sounds/en/number.gsm
+var/lib/asterisk/sounds/en/oakland.gsm
+var/lib/asterisk/sounds/en/octothorpe.gsm
+var/lib/asterisk/sounds/en/off-duty.gsm
+var/lib/asterisk/sounds/en/office-code.gsm
+var/lib/asterisk/sounds/en/office-iguanas.gsm
+var/lib/asterisk/sounds/en/office.gsm
+var/lib/asterisk/sounds/en/ohio.gsm
+var/lib/asterisk/sounds/en/oklahoma-city.gsm
+var/lib/asterisk/sounds/en/oklahoma.gsm
+var/lib/asterisk/sounds/en/omaha.gsm
+var/lib/asterisk/sounds/en/on-busy.gsm
+var/lib/asterisk/sounds/en/on-monthly-tel-stment.gsm
+var/lib/asterisk/sounds/en/on-no-answer.gsm
+var/lib/asterisk/sounds/en/on.gsm
+var/lib/asterisk/sounds/en/one-moment-please.gsm
+var/lib/asterisk/sounds/en/one-small-step.gsm
+var/lib/asterisk/sounds/en/one-small-step2.gsm
+var/lib/asterisk/sounds/en/oops1.gsm
+var/lib/asterisk/sounds/en/oops2.gsm
+var/lib/asterisk/sounds/en/oops3.gsm
+var/lib/asterisk/sounds/en/open-parenthesis.gsm
+var/lib/asterisk/sounds/en/operations.gsm
+var/lib/asterisk/sounds/en/option-is-invalid.gsm
+var/lib/asterisk/sounds/en/option-not-implemented.gsm
+var/lib/asterisk/sounds/en/or-press.gsm
+var/lib/asterisk/sounds/en/or.gsm
+var/lib/asterisk/sounds/en/order-desk.gsm
+var/lib/asterisk/sounds/en/orders.gsm
+var/lib/asterisk/sounds/en/oregon.gsm
+var/lib/asterisk/sounds/en/other-options-exercise.gsm
+var/lib/asterisk/sounds/en/otherwise-press.gsm
+var/lib/asterisk/sounds/en/otherwise.gsm
+var/lib/asterisk/sounds/en/our-business-hours-are.gsm
+var/lib/asterisk/sounds/en/outbound.gsm
+var/lib/asterisk/sounds/en/outside-sales.gsm
+var/lib/asterisk/sounds/en/outside-transfer.gsm
+var/lib/asterisk/sounds/en/pacific.gsm
+var/lib/asterisk/sounds/en/packet.gsm
+var/lib/asterisk/sounds/en/panic.gsm
+var/lib/asterisk/sounds/en/partially.gsm
+var/lib/asterisk/sounds/en/partly.gsm
+var/lib/asterisk/sounds/en/pascal.gsm
+var/lib/asterisk/sounds/en/pascal2.gsm
+var/lib/asterisk/sounds/en/patchy.gsm
+var/lib/asterisk/sounds/en/pbx-invalid.gsm
+var/lib/asterisk/sounds/en/pbx-invalidpark.gsm
+var/lib/asterisk/sounds/en/pbx-parkingfailed.gsm
+var/lib/asterisk/sounds/en/pbx-transfer.gsm
+var/lib/asterisk/sounds/en/pence.gsm
+var/lib/asterisk/sounds/en/pennies.gsm
+var/lib/asterisk/sounds/en/pennsylvania.gsm
+var/lib/asterisk/sounds/en/penny.gsm
+var/lib/asterisk/sounds/en/percent.gsm
+var/lib/asterisk/sounds/en/perhaps-we-are.gsm
+var/lib/asterisk/sounds/en/perhaps-we-are2.gsm
+var/lib/asterisk/sounds/en/period.gsm
+var/lib/asterisk/sounds/en/personnel.gsm
+var/lib/asterisk/sounds/en/persons-in-path-of.gsm
+var/lib/asterisk/sounds/en/philadelphia.gsm
+var/lib/asterisk/sounds/en/phoenix.gsm
+var/lib/asterisk/sounds/en/phonetic
+var/lib/asterisk/sounds/en/phonetic/9_p.gsm
+var/lib/asterisk/sounds/en/phonetic/a_p.gsm
+var/lib/asterisk/sounds/en/phonetic/b_p.gsm
+var/lib/asterisk/sounds/en/phonetic/c_p.gsm
+var/lib/asterisk/sounds/en/phonetic/d_p.gsm
+var/lib/asterisk/sounds/en/phonetic/e_p.gsm
+var/lib/asterisk/sounds/en/phonetic/f_p.gsm
+var/lib/asterisk/sounds/en/phonetic/g_p.gsm
+var/lib/asterisk/sounds/en/phonetic/h_p.gsm
+var/lib/asterisk/sounds/en/phonetic/i_p.gsm
+var/lib/asterisk/sounds/en/phonetic/j_p.gsm
+var/lib/asterisk/sounds/en/phonetic/k_p.gsm
+var/lib/asterisk/sounds/en/phonetic/l_p.gsm
+var/lib/asterisk/sounds/en/phonetic/m_p.gsm
+var/lib/asterisk/sounds/en/phonetic/n_p.gsm
+var/lib/asterisk/sounds/en/phonetic/o_p.gsm
+var/lib/asterisk/sounds/en/phonetic/p_p.gsm
+var/lib/asterisk/sounds/en/phonetic/q_p.gsm
+var/lib/asterisk/sounds/en/phonetic/r_p.gsm
+var/lib/asterisk/sounds/en/phonetic/s_p.gsm
+var/lib/asterisk/sounds/en/phonetic/t_p.gsm
+var/lib/asterisk/sounds/en/phonetic/u_p.gsm
+var/lib/asterisk/sounds/en/phonetic/v_p.gsm
+var/lib/asterisk/sounds/en/phonetic/w_p.gsm
+var/lib/asterisk/sounds/en/phonetic/x_p.gsm
+var/lib/asterisk/sounds/en/phonetic/y_p.gsm
+var/lib/asterisk/sounds/en/phonetic/z_p.gsm
+var/lib/asterisk/sounds/en/physics.gsm
+var/lib/asterisk/sounds/en/pin-invalid.gsm
+var/lib/asterisk/sounds/en/pin-number-accepted.gsm
+var/lib/asterisk/sounds/en/ping.gsm
+var/lib/asterisk/sounds/en/pipe.gsm
+var/lib/asterisk/sounds/en/planning.gsm
+var/lib/asterisk/sounds/en/please-answer-the-following.gsm
+var/lib/asterisk/sounds/en/please-contact-tech-supt.gsm
+var/lib/asterisk/sounds/en/please-enter-first-three-letters.gsm
+var/lib/asterisk/sounds/en/please-enter-the.gsm
+var/lib/asterisk/sounds/en/please-enter-your.gsm
+var/lib/asterisk/sounds/en/please-hang-up-and-dial-operator.gsm
+var/lib/asterisk/sounds/en/please-hang-up-and-try-again.gsm
+var/lib/asterisk/sounds/en/please-try-again-later.gsm
+var/lib/asterisk/sounds/en/please-try-again.gsm
+var/lib/asterisk/sounds/en/please-try.gsm
+var/lib/asterisk/sounds/en/please-wait-connect-oncall-eng.gsm
+var/lib/asterisk/sounds/en/pls-ent-num-transfer.gsm
+var/lib/asterisk/sounds/en/pls-enter-conf-password.gsm
+var/lib/asterisk/sounds/en/pls-enter-num-message-after-tone.gsm
+var/lib/asterisk/sounds/en/pls-enter-vm-password.gsm
+var/lib/asterisk/sounds/en/pls-entr-num-uwish2-call.gsm
+var/lib/asterisk/sounds/en/pls-hold-process-tx.gsm
+var/lib/asterisk/sounds/en/pls-hold-silent30.gsm
+var/lib/asterisk/sounds/en/pls-hold-while-try.gsm
+var/lib/asterisk/sounds/en/pls-lv-msg-will-contact.gsm
+var/lib/asterisk/sounds/en/pls-rcrd-name-at-tone.gsm
+var/lib/asterisk/sounds/en/pls-stay-on-line.gsm
+var/lib/asterisk/sounds/en/pls-try-again.gsm
+var/lib/asterisk/sounds/en/pls-try-area-code.gsm
+var/lib/asterisk/sounds/en/pls-try-call-later.gsm
+var/lib/asterisk/sounds/en/pls-try-manually.gsm
+var/lib/asterisk/sounds/en/pls-wait-connect-call.gsm
+var/lib/asterisk/sounds/en/plugh.gsm
+var/lib/asterisk/sounds/en/pm-announcement-number.gsm
+var/lib/asterisk/sounds/en/pm-invalid-option.gsm
+var/lib/asterisk/sounds/en/pm-phrase-management.gsm
+var/lib/asterisk/sounds/en/pm-prompt-number.gsm
+var/lib/asterisk/sounds/en/pm-to-record-phrase.gsm
+var/lib/asterisk/sounds/en/pm-to-review-phrase.gsm
+var/lib/asterisk/sounds/en/point.gsm
+var/lib/asterisk/sounds/en/pop.gsm
+var/lib/asterisk/sounds/en/port.gsm
+var/lib/asterisk/sounds/en/portland.gsm
+var/lib/asterisk/sounds/en/portnumber.gsm
+var/lib/asterisk/sounds/en/position.gsm
+var/lib/asterisk/sounds/en/post-entry-pound.gsm
+var/lib/asterisk/sounds/en/pounds.gsm
+var/lib/asterisk/sounds/en/presales-support.gsm
+var/lib/asterisk/sounds/en/presidents-office.gsm
+var/lib/asterisk/sounds/en/press-0.gsm
+var/lib/asterisk/sounds/en/press-1.gsm
+var/lib/asterisk/sounds/en/press-2.gsm
+var/lib/asterisk/sounds/en/press-3.gsm
+var/lib/asterisk/sounds/en/press-4.gsm
+var/lib/asterisk/sounds/en/press-5.gsm
+var/lib/asterisk/sounds/en/press-6-to-eject.gsm
+var/lib/asterisk/sounds/en/press-6.gsm
+var/lib/asterisk/sounds/en/press-7.gsm
+var/lib/asterisk/sounds/en/press-8.gsm
+var/lib/asterisk/sounds/en/press-9.gsm
+var/lib/asterisk/sounds/en/press-button-again.gsm
+var/lib/asterisk/sounds/en/press-enter.gsm
+var/lib/asterisk/sounds/en/press-escape.gsm
+var/lib/asterisk/sounds/en/press-hash.gsm
+var/lib/asterisk/sounds/en/press-pound-save-changes.gsm
+var/lib/asterisk/sounds/en/press-pound-to-login-star-to-hangup.gsm
+var/lib/asterisk/sounds/en/press-pound.gsm
+var/lib/asterisk/sounds/en/press-return.gsm
+var/lib/asterisk/sounds/en/press-star-cancel.gsm
+var/lib/asterisk/sounds/en/press-star.gsm
+var/lib/asterisk/sounds/en/press-the-space-bar.gsm
+var/lib/asterisk/sounds/en/press-tilde.gsm
+var/lib/asterisk/sounds/en/press.gsm
+var/lib/asterisk/sounds/en/pressure.gsm
+var/lib/asterisk/sounds/en/printing.gsm
+var/lib/asterisk/sounds/en/priv-callee-options.gsm
+var/lib/asterisk/sounds/en/priv-callpending.gsm
+var/lib/asterisk/sounds/en/priv-introsaved.gsm
+var/lib/asterisk/sounds/en/priv-recordintro.gsm
+var/lib/asterisk/sounds/en/privacy-blacklisted.gsm
+var/lib/asterisk/sounds/en/privacy-blocked.gsm
+var/lib/asterisk/sounds/en/privacy-if-error-leave-message-or-hangup.gsm
+var/lib/asterisk/sounds/en/privacy-if-error.gsm
+var/lib/asterisk/sounds/en/privacy-if-sales-call-contact-in-writing.gsm
+var/lib/asterisk/sounds/en/privacy-incorrect.gsm
+var/lib/asterisk/sounds/en/privacy-last-caller-was.gsm
+var/lib/asterisk/sounds/en/privacy-not.gsm
+var/lib/asterisk/sounds/en/privacy-please-dial.gsm
+var/lib/asterisk/sounds/en/privacy-please-stay-on-line-to-be-connected.gsm
+var/lib/asterisk/sounds/en/privacy-prompt.gsm
+var/lib/asterisk/sounds/en/privacy-restricted-by-req.gsm
+var/lib/asterisk/sounds/en/privacy-screening-unidentified-calls.gsm
+var/lib/asterisk/sounds/en/privacy-stop-calling-not-welcome.gsm
+var/lib/asterisk/sounds/en/privacy-stop-calling-not-welcome2.gsm
+var/lib/asterisk/sounds/en/privacy-thankyou.gsm
+var/lib/asterisk/sounds/en/privacy-this-number-is.gsm
+var/lib/asterisk/sounds/en/privacy-to-blacklist-last-caller.gsm
+var/lib/asterisk/sounds/en/privacy-to-blacklist-this-number.gsm
+var/lib/asterisk/sounds/en/privacy-to-hear-our-contact-details.gsm
+var/lib/asterisk/sounds/en/privacy-to-whitelist-last-caller.gsm
+var/lib/asterisk/sounds/en/privacy-to-whitelist-this-number.gsm
+var/lib/asterisk/sounds/en/privacy-unident.gsm
+var/lib/asterisk/sounds/en/privacy-whitelisted.gsm
+var/lib/asterisk/sounds/en/privacy-you-are-blacklisted.gsm
+var/lib/asterisk/sounds/en/privacy-you-are-calling-from.gsm
+var/lib/asterisk/sounds/en/privacy-your-callerid-is.gsm
+var/lib/asterisk/sounds/en/product.gsm
+var/lib/asterisk/sounds/en/production.gsm
+var/lib/asterisk/sounds/en/projects.gsm
+var/lib/asterisk/sounds/en/protocol.gsm
+var/lib/asterisk/sounds/en/public-relations.gsm
+var/lib/asterisk/sounds/en/purchasing.gsm
+var/lib/asterisk/sounds/en/purposes.gsm
+var/lib/asterisk/sounds/en/q-dot-931.gsm
+var/lib/asterisk/sounds/en/q-dot-9thirty1.gsm
+var/lib/asterisk/sounds/en/quality-assurance.gsm
+var/lib/asterisk/sounds/en/quality-control.gsm
+var/lib/asterisk/sounds/en/quarter.gsm
+var/lib/asterisk/sounds/en/queue-callswaiting.gsm
+var/lib/asterisk/sounds/en/queue-holdtime.gsm
+var/lib/asterisk/sounds/en/queue-less-than.gsm
+var/lib/asterisk/sounds/en/queue-minute.gsm
+var/lib/asterisk/sounds/en/queue-minutes.gsm
+var/lib/asterisk/sounds/en/queue-periodic-announce.gsm
+var/lib/asterisk/sounds/en/queue-quantity1.gsm
+var/lib/asterisk/sounds/en/queue-quantity2.gsm
+var/lib/asterisk/sounds/en/queue-reporthold.gsm
+var/lib/asterisk/sounds/en/queue-seconds.gsm
+var/lib/asterisk/sounds/en/queue-thankyou.gsm
+var/lib/asterisk/sounds/en/queue-thereare.gsm
+var/lib/asterisk/sounds/en/queue-youarenext.gsm
+var/lib/asterisk/sounds/en/quickly.gsm
+var/lib/asterisk/sounds/en/quote.gsm
+var/lib/asterisk/sounds/en/race.gsm
+var/lib/asterisk/sounds/en/rain.gsm
+var/lib/asterisk/sounds/en/rainfall.gsm
+var/lib/asterisk/sounds/en/rainy.gsm
+var/lib/asterisk/sounds/en/range.gsm
+var/lib/asterisk/sounds/en/reassigned-new-areacode.gsm
+var/lib/asterisk/sounds/en/rebates.gsm
+var/lib/asterisk/sounds/en/received.gsm
+var/lib/asterisk/sounds/en/receiving.gsm
+var/lib/asterisk/sounds/en/reception.gsm
+var/lib/asterisk/sounds/en/recorded.gsm
+var/lib/asterisk/sounds/en/registrar.gsm
+var/lib/asterisk/sounds/en/remote-already-in-this-mode-2.gsm
+var/lib/asterisk/sounds/en/remote-already-in-this-mode.gsm
+var/lib/asterisk/sounds/en/remote-base.gsm
+var/lib/asterisk/sounds/en/removed.gsm
+var/lib/asterisk/sounds/en/repair.gsm
+var/lib/asterisk/sounds/en/repeat-only.gsm
+var/lib/asterisk/sounds/en/repeater.gsm
+var/lib/asterisk/sounds/en/research-and-development.gsm
+var/lib/asterisk/sounds/en/research.gsm
+var/lib/asterisk/sounds/en/reservations.gsm
+var/lib/asterisk/sounds/en/restarting.gsm
+var/lib/asterisk/sounds/en/rhode-island.gsm
+var/lib/asterisk/sounds/en/right-bracket.gsm
+var/lib/asterisk/sounds/en/rising.gsm
+var/lib/asterisk/sounds/en/risk-management.gsm
+var/lib/asterisk/sounds/en/roaming.gsm
+var/lib/asterisk/sounds/en/room-service.gsm
+var/lib/asterisk/sounds/en/route-sip.gsm
+var/lib/asterisk/sounds/en/rqsted-wakeup-for.gsm
+var/lib/asterisk/sounds/en/sacramento.gsm
+var/lib/asterisk/sounds/en/saint-louis.gsm
+var/lib/asterisk/sounds/en/sales-floor.gsm
+var/lib/asterisk/sounds/en/sales.gsm
+var/lib/asterisk/sounds/en/san-antonio.gsm
+var/lib/asterisk/sounds/en/san-diego.gsm
+var/lib/asterisk/sounds/en/san-francisco.gsm
+var/lib/asterisk/sounds/en/san-jose.gsm
+var/lib/asterisk/sounds/en/save-announce-press.gsm
+var/lib/asterisk/sounds/en/say-temp-msg-prs-pound.gsm
+var/lib/asterisk/sounds/en/says-thats-stupid.gsm
+var/lib/asterisk/sounds/en/scattered.gsm
+var/lib/asterisk/sounds/en/sciences.gsm
+var/lib/asterisk/sounds/en/screen-callee-options.gsm
+var/lib/asterisk/sounds/en/seattle.gsm
+var/lib/asterisk/sounds/en/second.gsm
+var/lib/asterisk/sounds/en/seconds.gsm
+var/lib/asterisk/sounds/en/secretary.gsm
+var/lib/asterisk/sounds/en/security.gsm
+var/lib/asterisk/sounds/en/self-destruct-in.gsm
+var/lib/asterisk/sounds/en/self-destruct.gsm
+var/lib/asterisk/sounds/en/server.gsm
+var/lib/asterisk/sounds/en/service-not-implemented.gsm
+var/lib/asterisk/sounds/en/service.gsm
+var/lib/asterisk/sounds/en/seventeenth.gsm
+var/lib/asterisk/sounds/en/seventh.gsm
+var/lib/asterisk/sounds/en/seventieth.gsm
+var/lib/asterisk/sounds/en/severe.gsm
+var/lib/asterisk/sounds/en/shall-i-try-again.gsm
+var/lib/asterisk/sounds/en/shiny-brass-lamp.gsm
+var/lib/asterisk/sounds/en/shipping.gsm
+var/lib/asterisk/sounds/en/shop.gsm
+var/lib/asterisk/sounds/en/show-office.gsm
+var/lib/asterisk/sounds/en/sighted.gsm
+var/lib/asterisk/sounds/en/silence
+var/lib/asterisk/sounds/en/silence/1.gsm
+var/lib/asterisk/sounds/en/silence/10.gsm
+var/lib/asterisk/sounds/en/silence/2.gsm
+var/lib/asterisk/sounds/en/silence/3.gsm
+var/lib/asterisk/sounds/en/silence/4.gsm
+var/lib/asterisk/sounds/en/silence/5.gsm
+var/lib/asterisk/sounds/en/silence/6.gsm
+var/lib/asterisk/sounds/en/silence/7.gsm
+var/lib/asterisk/sounds/en/silence/8.gsm
+var/lib/asterisk/sounds/en/silence/9.gsm
+var/lib/asterisk/sounds/en/simplex.gsm
+var/lib/asterisk/sounds/en/simul-call-limit-reached.gsm
+var/lib/asterisk/sounds/en/sixteenth.gsm
+var/lib/asterisk/sounds/en/sixth.gsm
+var/lib/asterisk/sounds/en/sixtieth.gsm
+var/lib/asterisk/sounds/en/sleet.gsm
+var/lib/asterisk/sounds/en/sleeting.gsm
+var/lib/asterisk/sounds/en/slow.gsm
+var/lib/asterisk/sounds/en/slowly.gsm
+var/lib/asterisk/sounds/en/snow.gsm
+var/lib/asterisk/sounds/en/snowing.gsm
+var/lib/asterisk/sounds/en/snowy.gsm
+var/lib/asterisk/sounds/en/software.gsm
+var/lib/asterisk/sounds/en/someone-you-trust1.gsm
+var/lib/asterisk/sounds/en/someone-you-trust2.gsm
+var/lib/asterisk/sounds/en/someone-you-trust3.gsm
+var/lib/asterisk/sounds/en/something-terribly-wrong.gsm
+var/lib/asterisk/sounds/en/sorry-cant-let-you-do-that.gsm
+var/lib/asterisk/sounds/en/sorry-cant-let-you-do-that2.gsm
+var/lib/asterisk/sounds/en/sorry-cant-let-you-do-that3.gsm
+var/lib/asterisk/sounds/en/sorry-mailbox-full.gsm
+var/lib/asterisk/sounds/en/sorry-youre-having-problems.gsm
+var/lib/asterisk/sounds/en/sorry.gsm
+var/lib/asterisk/sounds/en/sorry2.gsm
+var/lib/asterisk/sounds/en/south-carolina.gsm
+var/lib/asterisk/sounds/en/south-dakota.gsm
+var/lib/asterisk/sounds/en/south.gsm
+var/lib/asterisk/sounds/en/southerly.gsm
+var/lib/asterisk/sounds/en/spam.gsm
+var/lib/asterisk/sounds/en/spam2.gsm
+var/lib/asterisk/sounds/en/speak-louder-into-phone.gsm
+var/lib/asterisk/sounds/en/speak-louder.gsm
+var/lib/asterisk/sounds/en/speak-to-the-operator.gsm
+var/lib/asterisk/sounds/en/speed-dial-empty.gsm
+var/lib/asterisk/sounds/en/speed-dial.gsm
+var/lib/asterisk/sounds/en/speed.gsm
+var/lib/asterisk/sounds/en/splat.gsm
+var/lib/asterisk/sounds/en/spy-agent.gsm
+var/lib/asterisk/sounds/en/spy-console.gsm
+var/lib/asterisk/sounds/en/spy-dahdi.gsm
+var/lib/asterisk/sounds/en/spy-h323.gsm
+var/lib/asterisk/sounds/en/spy-iax.gsm
+var/lib/asterisk/sounds/en/spy-iax2.gsm
+var/lib/asterisk/sounds/en/spy-jingle.gsm
+var/lib/asterisk/sounds/en/spy-local.gsm
+var/lib/asterisk/sounds/en/spy-mgcp.gsm
+var/lib/asterisk/sounds/en/spy-misdn.gsm
+var/lib/asterisk/sounds/en/spy-mobile.gsm
+var/lib/asterisk/sounds/en/spy-nbs.gsm
+var/lib/asterisk/sounds/en/spy-sip.gsm
+var/lib/asterisk/sounds/en/spy-skinny.gsm
+var/lib/asterisk/sounds/en/spy-unistim.gsm
+var/lib/asterisk/sounds/en/spy-usbradio.gsm
+var/lib/asterisk/sounds/en/spy-zap.gsm
+var/lib/asterisk/sounds/en/ss-noservice.gsm
+var/lib/asterisk/sounds/en/ssh.gsm
+var/lib/asterisk/sounds/en/staff.gsm
+var/lib/asterisk/sounds/en/staffing.gsm
+var/lib/asterisk/sounds/en/standard.gsm
+var/lib/asterisk/sounds/en/star-for-menu-again.gsm
+var/lib/asterisk/sounds/en/starting-with-either.gsm
+var/lib/asterisk/sounds/en/station.gsm
+var/lib/asterisk/sounds/en/status.gsm
+var/lib/asterisk/sounds/en/step-in-stream.gsm
+var/lib/asterisk/sounds/en/sterling.gsm
+var/lib/asterisk/sounds/en/store-accounting.gsm
+var/lib/asterisk/sounds/en/storm.gsm
+var/lib/asterisk/sounds/en/sun.gsm
+var/lib/asterisk/sounds/en/sunny.gsm
+var/lib/asterisk/sounds/en/support.gsm
+var/lib/asterisk/sounds/en/swap.gsm
+var/lib/asterisk/sounds/en/system-crashed.gsm
+var/lib/asterisk/sounds/en/system-status-msg.gsm
+var/lib/asterisk/sounds/en/system.gsm
+var/lib/asterisk/sounds/en/systems.gsm
+var/lib/asterisk/sounds/en/talking-to-myself.gsm
+var/lib/asterisk/sounds/en/target-attendant.gsm
+var/lib/asterisk/sounds/en/tcp.gsm
+var/lib/asterisk/sounds/en/technical-support.gsm
+var/lib/asterisk/sounds/en/telephone-in-your-pocket.gsm
+var/lib/asterisk/sounds/en/telephone-in-your-pocket2.gsm
+var/lib/asterisk/sounds/en/telephone-number.gsm
+var/lib/asterisk/sounds/en/telesales.gsm
+var/lib/asterisk/sounds/en/teletubbie-murder.gsm
+var/lib/asterisk/sounds/en/telnet.gsm
+var/lib/asterisk/sounds/en/temp-disconnected.gsm
+var/lib/asterisk/sounds/en/temperature.gsm
+var/lib/asterisk/sounds/en/tennessee.gsm
+var/lib/asterisk/sounds/en/tenth.gsm
+var/lib/asterisk/sounds/en/terabits.gsm
+var/lib/asterisk/sounds/en/terabytes.gsm
+var/lib/asterisk/sounds/en/terminated.gsm
+var/lib/asterisk/sounds/en/terminating.gsm
+var/lib/asterisk/sounds/en/test-tones-follow.gsm
+var/lib/asterisk/sounds/en/texas.gsm
+var/lib/asterisk/sounds/en/thank-you-cooperation.gsm
+var/lib/asterisk/sounds/en/thank-you-for-calling.gsm
+var/lib/asterisk/sounds/en/thanks-for-calling-today.gsm
+var/lib/asterisk/sounds/en/thanks-for-using.gsm
+var/lib/asterisk/sounds/en/that-is-not-rec-phn-num.gsm
+var/lib/asterisk/sounds/en/that-number.gsm
+var/lib/asterisk/sounds/en/that-tickles.gsm
+var/lib/asterisk/sounds/en/that-you-require.gsm
+var/lib/asterisk/sounds/en/the-mailbox.gsm
+var/lib/asterisk/sounds/en/the-monkeys-twice.gsm
+var/lib/asterisk/sounds/en/the-new-number-is.gsm
+var/lib/asterisk/sounds/en/the-next.gsm
+var/lib/asterisk/sounds/en/the-num-i-have-is.gsm
+var/lib/asterisk/sounds/en/the-number-u-dialed.gsm
+var/lib/asterisk/sounds/en/the-party-you-are-calling.gsm
+var/lib/asterisk/sounds/en/the-weather-at.gsm
+var/lib/asterisk/sounds/en/then-press-pound.gsm
+var/lib/asterisk/sounds/en/there-are.gsm
+var/lib/asterisk/sounds/en/there-is-no-customer-support.gsm
+var/lib/asterisk/sounds/en/these-are-currently.gsm
+var/lib/asterisk/sounds/en/third.gsm
+var/lib/asterisk/sounds/en/thirteenth.gsm
+var/lib/asterisk/sounds/en/thirtieth.gsm
+var/lib/asterisk/sounds/en/this-call-may-be-monitored-or-recorded.gsm
+var/lib/asterisk/sounds/en/this-call-may-be.gsm
+var/lib/asterisk/sounds/en/this-call-will-cost.gsm
+var/lib/asterisk/sounds/en/this-call-will-end-in.gsm
+var/lib/asterisk/sounds/en/this-is-the-voice-mail-system.gsm
+var/lib/asterisk/sounds/en/this-is-yr-wakeup-call.gsm
+var/lib/asterisk/sounds/en/this.gsm
+var/lib/asterisk/sounds/en/thnk-u-for-patience.gsm
+var/lib/asterisk/sounds/en/thousandth.gsm
+var/lib/asterisk/sounds/en/through.gsm
+var/lib/asterisk/sounds/en/thunderstorm.gsm
+var/lib/asterisk/sounds/en/tide.gsm
+var/lib/asterisk/sounds/en/time.gsm
+var/lib/asterisk/sounds/en/times.gsm
+var/lib/asterisk/sounds/en/to-accept-recording.gsm
+var/lib/asterisk/sounds/en/to-be-called-back.gsm
+var/lib/asterisk/sounds/en/to-blklist-last-caller.gsm
+var/lib/asterisk/sounds/en/to-blklist-last-num.gsm
+var/lib/asterisk/sounds/en/to-call-num-press.gsm
+var/lib/asterisk/sounds/en/to-call-prson-w-sent-msg.gsm
+var/lib/asterisk/sounds/en/to-call-this-number.gsm
+var/lib/asterisk/sounds/en/to-cancel-this-msg.gsm
+var/lib/asterisk/sounds/en/to-cancel-wakeup.gsm
+var/lib/asterisk/sounds/en/to-change-exp-date.gsm
+var/lib/asterisk/sounds/en/to-change-your-pin-number.gsm
+var/lib/asterisk/sounds/en/to-collect-voicemail.gsm
+var/lib/asterisk/sounds/en/to-compose-a-message.gsm
+var/lib/asterisk/sounds/en/to-confirm-wakeup.gsm
+var/lib/asterisk/sounds/en/to-dial-by-name-press.gsm
+var/lib/asterisk/sounds/en/to-dial-by-name.gsm
+var/lib/asterisk/sounds/en/to-enter-a-diff-number.gsm
+var/lib/asterisk/sounds/en/to-enter-a-number.gsm
+var/lib/asterisk/sounds/en/to-erase-yr-temp-grtg.gsm
+var/lib/asterisk/sounds/en/to-extension.gsm
+var/lib/asterisk/sounds/en/to-hang-up-2.gsm
+var/lib/asterisk/sounds/en/to-hang-up.gsm
+var/lib/asterisk/sounds/en/to-hear-callerid.gsm
+var/lib/asterisk/sounds/en/to-hear-menu-again.gsm
+var/lib/asterisk/sounds/en/to-hear-msg-again.gsm
+var/lib/asterisk/sounds/en/to-hear-msg-envelope.gsm
+var/lib/asterisk/sounds/en/to-hear-net-status.gsm
+var/lib/asterisk/sounds/en/to-hear-weather-status.gsm
+var/lib/asterisk/sounds/en/to-hear-your-account-balance.gsm
+var/lib/asterisk/sounds/en/to-join-a-meeting.gsm
+var/lib/asterisk/sounds/en/to-leave-message-for.gsm
+var/lib/asterisk/sounds/en/to-listen-to-it.gsm
+var/lib/asterisk/sounds/en/to-log-in-to-voice-mail.gsm
+var/lib/asterisk/sounds/en/to-place-outgoing-call.gsm
+var/lib/asterisk/sounds/en/to-reach-first-rep.gsm
+var/lib/asterisk/sounds/en/to-reach-operator.gsm
+var/lib/asterisk/sounds/en/to-rec-yr-temp-grtg.gsm
+var/lib/asterisk/sounds/en/to-record-call.gsm
+var/lib/asterisk/sounds/en/to-redial-the-last-number-you-called.gsm
+var/lib/asterisk/sounds/en/to-report-emergency.gsm
+var/lib/asterisk/sounds/en/to-report-system-network-down.gsm
+var/lib/asterisk/sounds/en/to-rerecord-announce.gsm
+var/lib/asterisk/sounds/en/to-rerecord-it.gsm
+var/lib/asterisk/sounds/en/to-rerecord-yr-message.gsm
+var/lib/asterisk/sounds/en/to-rmv-num-blklist.gsm
+var/lib/asterisk/sounds/en/to-rqst-wakeup-call.gsm
+var/lib/asterisk/sounds/en/to-send-a-reply.gsm
+var/lib/asterisk/sounds/en/to-snooze-for.gsm
+var/lib/asterisk/sounds/en/to-use-def-attendant.gsm
+var/lib/asterisk/sounds/en/tomorrow-night.gsm
+var/lib/asterisk/sounds/en/tones-that-follow-are-for-the-deaf.gsm
+var/lib/asterisk/sounds/en/tonight.gsm
+var/lib/asterisk/sounds/en/too-low.gsm
+var/lib/asterisk/sounds/en/tornado.gsm
+var/lib/asterisk/sounds/en/touchtone1.gsm
+var/lib/asterisk/sounds/en/touchtone2.gsm
+var/lib/asterisk/sounds/en/touchtone3.gsm
+var/lib/asterisk/sounds/en/towards.gsm
+var/lib/asterisk/sounds/en/trading-desk.gsm
+var/lib/asterisk/sounds/en/traffic.gsm
+var/lib/asterisk/sounds/en/training.gsm
+var/lib/asterisk/sounds/en/transfer.gsm
+var/lib/asterisk/sounds/en/transportation.gsm
+var/lib/asterisk/sounds/en/travel.gsm
+var/lib/asterisk/sounds/en/treasury.gsm
+var/lib/asterisk/sounds/en/tt-allbusy.gsm
+var/lib/asterisk/sounds/en/tt-codezone.gsm
+var/lib/asterisk/sounds/en/tt-codezone_MIXDOWN.gsm
+var/lib/asterisk/sounds/en/tt-hangup.gsm
+var/lib/asterisk/sounds/en/tt-monkeys.gsm
+var/lib/asterisk/sounds/en/tt-monkeysintro.gsm
+var/lib/asterisk/sounds/en/tt-monty-knights.gsm
+var/lib/asterisk/sounds/en/tt-somethingwrong.gsm
+var/lib/asterisk/sounds/en/tt-weasels.gsm
+var/lib/asterisk/sounds/en/tucson.gsm
+var/lib/asterisk/sounds/en/tulsa.gsm
+var/lib/asterisk/sounds/en/turn-off-recording.gsm
+var/lib/asterisk/sounds/en/turning-to.gsm
+var/lib/asterisk/sounds/en/twelveth.gsm
+var/lib/asterisk/sounds/en/twentieth.gsm
+var/lib/asterisk/sounds/en/twisty-maze.gsm
+var/lib/asterisk/sounds/en/tx-has-been-approved.gsm
+var/lib/asterisk/sounds/en/typhoon.gsm
+var/lib/asterisk/sounds/en/udp.gsm
+var/lib/asterisk/sounds/en/uh-oh1.gsm
+var/lib/asterisk/sounds/en/uh-oh2.gsm
+var/lib/asterisk/sounds/en/uk.gsm
+var/lib/asterisk/sounds/en/unavailable.gsm
+var/lib/asterisk/sounds/en/unconditional.gsm
+var/lib/asterisk/sounds/en/unidentified-no-callback.gsm
+var/lib/asterisk/sounds/en/units.gsm
+var/lib/asterisk/sounds/en/unix.gsm
+var/lib/asterisk/sounds/en/up.gsm
+var/lib/asterisk/sounds/en/uptime.gsm
+var/lib/asterisk/sounds/en/user.gsm
+var/lib/asterisk/sounds/en/users.gsm
+var/lib/asterisk/sounds/en/utah.gsm
+var/lib/asterisk/sounds/en/variable.gsm
+var/lib/asterisk/sounds/en/vermont.gsm
+var/lib/asterisk/sounds/en/virginia-beach.gsm
+var/lib/asterisk/sounds/en/virginia.gsm
+var/lib/asterisk/sounds/en/visibility.gsm
+var/lib/asterisk/sounds/en/visit-asterisk-website.gsm
+var/lib/asterisk/sounds/en/vm-Cust1.gsm
+var/lib/asterisk/sounds/en/vm-Cust2.gsm
+var/lib/asterisk/sounds/en/vm-Cust3.gsm
+var/lib/asterisk/sounds/en/vm-Cust4.gsm
+var/lib/asterisk/sounds/en/vm-Cust5.gsm
+var/lib/asterisk/sounds/en/vm-Family.gsm
+var/lib/asterisk/sounds/en/vm-Friends.gsm
+var/lib/asterisk/sounds/en/vm-INBOX.gsm
+var/lib/asterisk/sounds/en/vm-Old.gsm
+var/lib/asterisk/sounds/en/vm-Urgent.gsm
+var/lib/asterisk/sounds/en/vm-Work.gsm
+var/lib/asterisk/sounds/en/vm-advopts.gsm
+var/lib/asterisk/sounds/en/vm-and.gsm
+var/lib/asterisk/sounds/en/vm-calldiffnum.gsm
+var/lib/asterisk/sounds/en/vm-changeto.gsm
+var/lib/asterisk/sounds/en/vm-delete.gsm
+var/lib/asterisk/sounds/en/vm-deleted.gsm
+var/lib/asterisk/sounds/en/vm-dialout.gsm
+var/lib/asterisk/sounds/en/vm-duration.gsm
+var/lib/asterisk/sounds/en/vm-enter-num-to-call.gsm
+var/lib/asterisk/sounds/en/vm-extension.gsm
+var/lib/asterisk/sounds/en/vm-first.gsm
+var/lib/asterisk/sounds/en/vm-for.gsm
+var/lib/asterisk/sounds/en/vm-forward-multiple.gsm
+var/lib/asterisk/sounds/en/vm-forward.gsm
+var/lib/asterisk/sounds/en/vm-forwardoptions.gsm
+var/lib/asterisk/sounds/en/vm-from-extension.gsm
+var/lib/asterisk/sounds/en/vm-from-phonenumber.gsm
+var/lib/asterisk/sounds/en/vm-from.gsm
+var/lib/asterisk/sounds/en/vm-goodbye.gsm
+var/lib/asterisk/sounds/en/vm-helpexit.gsm
+var/lib/asterisk/sounds/en/vm-incorrect-mailbox.gsm
+var/lib/asterisk/sounds/en/vm-incorrect.gsm
+var/lib/asterisk/sounds/en/vm-instructions.gsm
+var/lib/asterisk/sounds/en/vm-intro.gsm
+var/lib/asterisk/sounds/en/vm-invalid-password.gsm
+var/lib/asterisk/sounds/en/vm-invalidpassword.gsm
+var/lib/asterisk/sounds/en/vm-isonphone.gsm
+var/lib/asterisk/sounds/en/vm-isunavail.gsm
+var/lib/asterisk/sounds/en/vm-last.gsm
+var/lib/asterisk/sounds/en/vm-leavemsg.gsm
+var/lib/asterisk/sounds/en/vm-login.gsm
+var/lib/asterisk/sounds/en/vm-mailboxfull.gsm
+var/lib/asterisk/sounds/en/vm-marked-nonurgent.gsm
+var/lib/asterisk/sounds/en/vm-marked-urgent.gsm
+var/lib/asterisk/sounds/en/vm-message.gsm
+var/lib/asterisk/sounds/en/vm-messages.gsm
+var/lib/asterisk/sounds/en/vm-minutes.gsm
+var/lib/asterisk/sounds/en/vm-mismatch.gsm
+var/lib/asterisk/sounds/en/vm-msginstruct.gsm
+var/lib/asterisk/sounds/en/vm-msgsaved.gsm
+var/lib/asterisk/sounds/en/vm-newpassword.gsm
+var/lib/asterisk/sounds/en/vm-newuser.gsm
+var/lib/asterisk/sounds/en/vm-next.gsm
+var/lib/asterisk/sounds/en/vm-no.gsm
+var/lib/asterisk/sounds/en/vm-nobodyavail.gsm
+var/lib/asterisk/sounds/en/vm-nobox.gsm
+var/lib/asterisk/sounds/en/vm-nomore.gsm
+var/lib/asterisk/sounds/en/vm-nonumber.gsm
+var/lib/asterisk/sounds/en/vm-num-i-have.gsm
+var/lib/asterisk/sounds/en/vm-onefor-full.gsm
+var/lib/asterisk/sounds/en/vm-onefor.gsm
+var/lib/asterisk/sounds/en/vm-options.gsm
+var/lib/asterisk/sounds/en/vm-opts-full.gsm
+var/lib/asterisk/sounds/en/vm-opts.gsm
+var/lib/asterisk/sounds/en/vm-passchanged.gsm
+var/lib/asterisk/sounds/en/vm-password.gsm
+var/lib/asterisk/sounds/en/vm-pls-try-again.gsm
+var/lib/asterisk/sounds/en/vm-press.gsm
+var/lib/asterisk/sounds/en/vm-prev.gsm
+var/lib/asterisk/sounds/en/vm-reachoper.gsm
+var/lib/asterisk/sounds/en/vm-rec-busy.gsm
+var/lib/asterisk/sounds/en/vm-rec-name.gsm
+var/lib/asterisk/sounds/en/vm-rec-temp.gsm
+var/lib/asterisk/sounds/en/vm-rec-unv.gsm
+var/lib/asterisk/sounds/en/vm-received.gsm
+var/lib/asterisk/sounds/en/vm-record-prepend.gsm
+var/lib/asterisk/sounds/en/vm-reenterpassword.gsm
+var/lib/asterisk/sounds/en/vm-repeat.gsm
+var/lib/asterisk/sounds/en/vm-review-nonurgent.gsm
+var/lib/asterisk/sounds/en/vm-review-urgent.gsm
+var/lib/asterisk/sounds/en/vm-review.gsm
+var/lib/asterisk/sounds/en/vm-saved.gsm
+var/lib/asterisk/sounds/en/vm-savedto.gsm
+var/lib/asterisk/sounds/en/vm-savefolder.gsm
+var/lib/asterisk/sounds/en/vm-savemessage.gsm
+var/lib/asterisk/sounds/en/vm-saveoper.gsm
+var/lib/asterisk/sounds/en/vm-sorry.gsm
+var/lib/asterisk/sounds/en/vm-star-cancel.gsm
+var/lib/asterisk/sounds/en/vm-starmain.gsm
+var/lib/asterisk/sounds/en/vm-tempgreetactive.gsm
+var/lib/asterisk/sounds/en/vm-tempgreeting.gsm
+var/lib/asterisk/sounds/en/vm-tempgreeting2.gsm
+var/lib/asterisk/sounds/en/vm-tempremoved.gsm
+var/lib/asterisk/sounds/en/vm-then-pound.gsm
+var/lib/asterisk/sounds/en/vm-theperson.gsm
+var/lib/asterisk/sounds/en/vm-tmpexists.gsm
+var/lib/asterisk/sounds/en/vm-tocallback.gsm
+var/lib/asterisk/sounds/en/vm-tocallnum.gsm
+var/lib/asterisk/sounds/en/vm-tocancel.gsm
+var/lib/asterisk/sounds/en/vm-tocancelmsg.gsm
+var/lib/asterisk/sounds/en/vm-toenternumber.gsm
+var/lib/asterisk/sounds/en/vm-toforward.gsm
+var/lib/asterisk/sounds/en/vm-tohearenv.gsm
+var/lib/asterisk/sounds/en/vm-tomakecall.gsm
+var/lib/asterisk/sounds/en/vm-tooshort.gsm
+var/lib/asterisk/sounds/en/vm-toreply.gsm
+var/lib/asterisk/sounds/en/vm-torerecord.gsm
+var/lib/asterisk/sounds/en/vm-undelete.gsm
+var/lib/asterisk/sounds/en/vm-undeleted.gsm
+var/lib/asterisk/sounds/en/vm-unknown-caller.gsm
+var/lib/asterisk/sounds/en/vm-whichbox.gsm
+var/lib/asterisk/sounds/en/vm-youhave.gsm
+var/lib/asterisk/sounds/en/voice-mail-system.gsm
+var/lib/asterisk/sounds/en/wait-moment.gsm
+var/lib/asterisk/sounds/en/wait-offensive-sounds.gsm
+var/lib/asterisk/sounds/en/wakeup-call-cancelled.gsm
+var/lib/asterisk/sounds/en/wakeup-call.gsm
+var/lib/asterisk/sounds/en/wakeup-daily.gsm
+var/lib/asterisk/sounds/en/wakeup-for-daily.gsm
+var/lib/asterisk/sounds/en/wakeup-for-one-time.gsm
+var/lib/asterisk/sounds/en/wakeup-onetime.gsm
+var/lib/asterisk/sounds/en/walks-into-bar-mail.gsm
+var/lib/asterisk/sounds/en/warning.gsm
+var/lib/asterisk/sounds/en/was-last-seen.gsm
+var/lib/asterisk/sounds/en/was.gsm
+var/lib/asterisk/sounds/en/washington-dc.gsm
+var/lib/asterisk/sounds/en/washington.gsm
+var/lib/asterisk/sounds/en/watch.gsm
+var/lib/asterisk/sounds/en/we-apologize.gsm
+var/lib/asterisk/sounds/en/we-dont-have-tech-support.gsm
+var/lib/asterisk/sounds/en/weasels-eaten-phonesys.gsm
+var/lib/asterisk/sounds/en/weather-station.gsm
+var/lib/asterisk/sounds/en/weather.gsm
+var/lib/asterisk/sounds/en/web.gsm
+var/lib/asterisk/sounds/en/weeks.gsm
+var/lib/asterisk/sounds/en/welcome.gsm
+var/lib/asterisk/sounds/en/were-sorry.gsm
+var/lib/asterisk/sounds/en/west-virginia.gsm
+var/lib/asterisk/sounds/en/west.gsm
+var/lib/asterisk/sounds/en/westerly.gsm
+var/lib/asterisk/sounds/en/what-are-you-wearing.gsm
+var/lib/asterisk/sounds/en/what-time-it-is.gsm
+var/lib/asterisk/sounds/en/what-time-it-is2.gsm
+var/lib/asterisk/sounds/en/when-dialing-this-number.gsm
+var/lib/asterisk/sounds/en/who-would-you-like-to-call.gsm
+var/lib/asterisk/sounds/en/why-no-answer-mystery.gsm
+var/lib/asterisk/sounds/en/wichita.gsm
+var/lib/asterisk/sounds/en/will-apply.gsm
+var/lib/asterisk/sounds/en/will-expire.gsm
+var/lib/asterisk/sounds/en/will-not-expire.gsm
+var/lib/asterisk/sounds/en/will-reflect-charge-of.gsm
+var/lib/asterisk/sounds/en/wind.gsm
+var/lib/asterisk/sounds/en/windows.gsm
+var/lib/asterisk/sounds/en/windy.gsm
+var/lib/asterisk/sounds/en/wisconsin.gsm
+var/lib/asterisk/sounds/en/wish-to-continue.gsm
+var/lib/asterisk/sounds/en/with.gsm
+var/lib/asterisk/sounds/en/within.gsm
+var/lib/asterisk/sounds/en/work.gsm
+var/lib/asterisk/sounds/en/wrong-try-again-smarty.gsm
+var/lib/asterisk/sounds/en/wtng-to-spk-w-rep.gsm
+var/lib/asterisk/sounds/en/www-switchboard-com.gsm
+var/lib/asterisk/sounds/en/wx
+var/lib/asterisk/sounds/en/wx/around.gsm
+var/lib/asterisk/sounds/en/wx/barometer.gsm
+var/lib/asterisk/sounds/en/wx/ceiling.gsm
+var/lib/asterisk/sounds/en/wx/dew-point.gsm
+var/lib/asterisk/sounds/en/wx/falling.gsm
+var/lib/asterisk/sounds/en/wx/feet.gsm
+var/lib/asterisk/sounds/en/wx/foot.gsm
+var/lib/asterisk/sounds/en/wx/gust.gsm
+var/lib/asterisk/sounds/en/wx/gusting-to.gsm
+var/lib/asterisk/sounds/en/wx/gusts.gsm
+var/lib/asterisk/sounds/en/wx/gusty.gsm
+var/lib/asterisk/sounds/en/wx/heat-index.gsm
+var/lib/asterisk/sounds/en/wx/humidity.gsm
+var/lib/asterisk/sounds/en/wx/inch.gsm
+var/lib/asterisk/sounds/en/wx/inches.gsm
+var/lib/asterisk/sounds/en/wx/kilometer.gsm
+var/lib/asterisk/sounds/en/wx/large.gsm
+var/lib/asterisk/sounds/en/wx/meter.gsm
+var/lib/asterisk/sounds/en/wx/mist.gsm
+var/lib/asterisk/sounds/en/wx/northeast.gsm
+var/lib/asterisk/sounds/en/wx/northwest.gsm
+var/lib/asterisk/sounds/en/wx/percent.gsm
+var/lib/asterisk/sounds/en/wx/point.gsm
+var/lib/asterisk/sounds/en/wx/rising.gsm
+var/lib/asterisk/sounds/en/wx/southeast.gsm
+var/lib/asterisk/sounds/en/wx/southwest.gsm
+var/lib/asterisk/sounds/en/wx/steady.gsm
+var/lib/asterisk/sounds/en/wx/temperature.gsm
+var/lib/asterisk/sounds/en/wx/wind-chill.gsm
+var/lib/asterisk/sounds/en/wx/winds.gsm
+var/lib/asterisk/sounds/en/wyoming.gsm
+var/lib/asterisk/sounds/en/yeah.gsm
+var/lib/asterisk/sounds/en/year.gsm
+var/lib/asterisk/sounds/en/years.gsm
+var/lib/asterisk/sounds/en/yes-dear.gsm
+var/lib/asterisk/sounds/en/yes-dear2.gsm
+var/lib/asterisk/sounds/en/you-are-caller-num.gsm
+var/lib/asterisk/sounds/en/you-are-curr-call-num.gsm
+var/lib/asterisk/sounds/en/you-can-press.gsm
+var/lib/asterisk/sounds/en/you-dialed-wrong-number.gsm
+var/lib/asterisk/sounds/en/you-entered.gsm
+var/lib/asterisk/sounds/en/you-have-dialed.gsm
+var/lib/asterisk/sounds/en/you-have-reached-a-test-number.gsm
+var/lib/asterisk/sounds/en/you-have-these-options.gsm
+var/lib/asterisk/sounds/en/you-must-first-dial.gsm
+var/lib/asterisk/sounds/en/you-seem-impatient.gsm
+var/lib/asterisk/sounds/en/you-sound-cute.gsm
+var/lib/asterisk/sounds/en/you-wish-to-join.gsm
+var/lib/asterisk/sounds/en/your-account.gsm
+var/lib/asterisk/sounds/en/your-msg-has-been-saved.gsm
+var/lib/asterisk/sounds/en/your-msg-is-too-short.gsm
+var/lib/asterisk/sounds/en/your-notifications.gsm
+var/lib/asterisk/sounds/en/your-req-notification.gsm
+var/lib/asterisk/sounds/en/your-temp-greeting.gsm
+var/lib/asterisk/sounds/en/your.gsm
+var/lib/asterisk/sounds/en/zip-code.gsm
  #var/lib/asterisk/sounds/letters
-var/lib/asterisk/sounds/letters/a.gsm
-var/lib/asterisk/sounds/letters/ascii123.gsm
-var/lib/asterisk/sounds/letters/ascii124.gsm
-var/lib/asterisk/sounds/letters/ascii125.gsm
-var/lib/asterisk/sounds/letters/ascii126.gsm
-var/lib/asterisk/sounds/letters/ascii34.gsm
-var/lib/asterisk/sounds/letters/ascii36.gsm
-var/lib/asterisk/sounds/letters/ascii37.gsm
-var/lib/asterisk/sounds/letters/ascii38.gsm
-var/lib/asterisk/sounds/letters/ascii39.gsm
-var/lib/asterisk/sounds/letters/ascii40.gsm
-var/lib/asterisk/sounds/letters/ascii41.gsm
-var/lib/asterisk/sounds/letters/ascii42.gsm
-var/lib/asterisk/sounds/letters/ascii44.gsm
-var/lib/asterisk/sounds/letters/ascii58.gsm
-var/lib/asterisk/sounds/letters/ascii59.gsm
-var/lib/asterisk/sounds/letters/ascii60.gsm
-var/lib/asterisk/sounds/letters/ascii62.gsm
-var/lib/asterisk/sounds/letters/ascii63.gsm
-var/lib/asterisk/sounds/letters/ascii91.gsm
-var/lib/asterisk/sounds/letters/ascii92.gsm
-var/lib/asterisk/sounds/letters/ascii93.gsm
-var/lib/asterisk/sounds/letters/ascii94.gsm
-var/lib/asterisk/sounds/letters/ascii95.gsm
-var/lib/asterisk/sounds/letters/ascii96.gsm
-var/lib/asterisk/sounds/letters/asterisk.gsm
-var/lib/asterisk/sounds/letters/at.gsm
-var/lib/asterisk/sounds/letters/b.gsm
-var/lib/asterisk/sounds/letters/c.gsm
-var/lib/asterisk/sounds/letters/d.gsm
-var/lib/asterisk/sounds/letters/dash.gsm
  #var/lib/asterisk/sounds/letters/de
  var/lib/asterisk/sounds/letters/de/a.gsm
  var/lib/asterisk/sounds/letters/de/at.gsm
@@ -1572,230 +2657,7 @@ var/lib/asterisk/sounds/letters/de/x.gsm
  var/lib/asterisk/sounds/letters/de/y.gsm
  var/lib/asterisk/sounds/letters/de/z.gsm
  var/lib/asterisk/sounds/letters/de/zed.gsm
-var/lib/asterisk/sounds/letters/dollar.gsm
-var/lib/asterisk/sounds/letters/dot.gsm
-var/lib/asterisk/sounds/letters/e.gsm
-var/lib/asterisk/sounds/letters/equals.gsm
-var/lib/asterisk/sounds/letters/exclaimation-point.gsm
-var/lib/asterisk/sounds/letters/f.gsm
-var/lib/asterisk/sounds/letters/g.gsm
-var/lib/asterisk/sounds/letters/h.gsm
-var/lib/asterisk/sounds/letters/i.gsm
-var/lib/asterisk/sounds/letters/j.gsm
-var/lib/asterisk/sounds/letters/k.gsm
-var/lib/asterisk/sounds/letters/l.gsm
-var/lib/asterisk/sounds/letters/m.gsm
-var/lib/asterisk/sounds/letters/n.gsm
-var/lib/asterisk/sounds/letters/o.gsm
-var/lib/asterisk/sounds/letters/p.gsm
-var/lib/asterisk/sounds/letters/plus.gsm
-var/lib/asterisk/sounds/letters/q.gsm
-var/lib/asterisk/sounds/letters/r.gsm
-var/lib/asterisk/sounds/letters/s.gsm
-var/lib/asterisk/sounds/letters/slash.gsm
-var/lib/asterisk/sounds/letters/space.gsm
-var/lib/asterisk/sounds/letters/t.gsm
-var/lib/asterisk/sounds/letters/u.gsm
-var/lib/asterisk/sounds/letters/v.gsm
-var/lib/asterisk/sounds/letters/w.gsm
-var/lib/asterisk/sounds/letters/x.gsm
-var/lib/asterisk/sounds/letters/y.gsm
-var/lib/asterisk/sounds/letters/z.gsm
-var/lib/asterisk/sounds/letters/zed.gsm
-var/lib/asterisk/sounds/library.gsm
-var/lib/asterisk/sounds/lightning.gsm
-var/lib/asterisk/sounds/limit-simul-calls.gsm
-var/lib/asterisk/sounds/lines-complaining-customers.gsm
-var/lib/asterisk/sounds/linux.gsm
-var/lib/asterisk/sounds/list.gsm
-var/lib/asterisk/sounds/load-average.gsm
-var/lib/asterisk/sounds/local-authorities.gsm
-var/lib/asterisk/sounds/location.gsm
-var/lib/asterisk/sounds/login-fail.gsm
-var/lib/asterisk/sounds/long-beach.gsm
-var/lib/asterisk/sounds/los-angeles.gsm
-var/lib/asterisk/sounds/loss-prevention.gsm
-var/lib/asterisk/sounds/loss.gsm
-var/lib/asterisk/sounds/lots-o-monkeys.gsm
-var/lib/asterisk/sounds/louisiana.gsm
-var/lib/asterisk/sounds/low.gsm
-var/lib/asterisk/sounds/lunch.gsm
-var/lib/asterisk/sounds/lyrics-louie-louie.gsm
-var/lib/asterisk/sounds/machine.gsm
-var/lib/asterisk/sounds/made-it-up.gsm
-var/lib/asterisk/sounds/mail.gsm
-var/lib/asterisk/sounds/mailroom.gsm
-var/lib/asterisk/sounds/main-menu.gsm
-var/lib/asterisk/sounds/maine.gsm
-var/lib/asterisk/sounds/maintenance.gsm
-var/lib/asterisk/sounds/male.gsm
-var/lib/asterisk/sounds/management.gsm
-var/lib/asterisk/sounds/manufacturing.gsm
-var/lib/asterisk/sounds/marketing.gsm
-var/lib/asterisk/sounds/marryme.gsm
-var/lib/asterisk/sounds/maryland.gsm
-var/lib/asterisk/sounds/massachusetts.gsm
-var/lib/asterisk/sounds/mathematics.gsm
-var/lib/asterisk/sounds/maximum.gsm
-var/lib/asterisk/sounds/megabits.gsm
-var/lib/asterisk/sounds/megabytes.gsm
-var/lib/asterisk/sounds/megahertz.gsm
-var/lib/asterisk/sounds/memory.gsm
-var/lib/asterisk/sounds/memphis.gsm
-var/lib/asterisk/sounds/menu.gsm
-var/lib/asterisk/sounds/mesa.gsm
-var/lib/asterisk/sounds/message-from.gsm
-var/lib/asterisk/sounds/message-number.gsm
-var/lib/asterisk/sounds/meter.gsm
-var/lib/asterisk/sounds/meters.gsm
-var/lib/asterisk/sounds/miami.gsm
-var/lib/asterisk/sounds/michigan.gsm
-var/lib/asterisk/sounds/midnight-tomorrow-night.gsm
-var/lib/asterisk/sounds/midnight-tonight.gsm
-var/lib/asterisk/sounds/midnight.gsm
-var/lib/asterisk/sounds/mike.gsm
-var/lib/asterisk/sounds/miles-per-hour.gsm
-var/lib/asterisk/sounds/miles.gsm
-var/lib/asterisk/sounds/millionth.gsm
-var/lib/asterisk/sounds/milwaukee.gsm
-var/lib/asterisk/sounds/minimum.gsm
-var/lib/asterisk/sounds/minneapolis.gsm
-var/lib/asterisk/sounds/minnesota.gsm
-var/lib/asterisk/sounds/minute.gsm
-var/lib/asterisk/sounds/minutes.gsm
-var/lib/asterisk/sounds/missed.gsm
-var/lib/asterisk/sounds/mississippi.gsm
-var/lib/asterisk/sounds/missouri.gsm
-var/lib/asterisk/sounds/misty.gsm
-var/lib/asterisk/sounds/monitored.gsm
-var/lib/asterisk/sounds/montana.gsm
-var/lib/asterisk/sounds/month.gsm
-var/lib/asterisk/sounds/months.gsm
-var/lib/asterisk/sounds/moo1.gsm
-var/lib/asterisk/sounds/moo2.gsm
-var/lib/asterisk/sounds/morning.gsm
-var/lib/asterisk/sounds/moron.gsm
-var/lib/asterisk/sounds/mostly.gsm
-var/lib/asterisk/sounds/motor-pool.gsm
-var/lib/asterisk/sounds/mountain.gsm
-var/lib/asterisk/sounds/moving.gsm
-var/lib/asterisk/sounds/ms.gsm
-var/lib/asterisk/sounds/nashville.gsm
-var/lib/asterisk/sounds/national-weather-service.gsm
-var/lib/asterisk/sounds/nautical-miles.gsm
-var/lib/asterisk/sounds/nbdy-avail-to-take-call.gsm
-var/lib/asterisk/sounds/near.gsm
-var/lib/asterisk/sounds/nebraska.gsm
-var/lib/asterisk/sounds/negative.gsm
-var/lib/asterisk/sounds/network-operations-center.gsm
-var/lib/asterisk/sounds/network-operations.gsm
-var/lib/asterisk/sounds/nevada.gsm
-var/lib/asterisk/sounds/new-accounts.gsm
-var/lib/asterisk/sounds/new-hampshire.gsm
-var/lib/asterisk/sounds/new-jersey.gsm
-var/lib/asterisk/sounds/new-mexico.gsm
-var/lib/asterisk/sounds/new-orleans.gsm
-var/lib/asterisk/sounds/new-york.gsm
-var/lib/asterisk/sounds/nineteenth.gsm
-var/lib/asterisk/sounds/ninetieth.gsm
-var/lib/asterisk/sounds/ninth.gsm
-var/lib/asterisk/sounds/no-112-1.gsm
-var/lib/asterisk/sounds/no-112-2.gsm
-var/lib/asterisk/sounds/no-911-1.gsm
-var/lib/asterisk/sounds/no-911-2.gsm
-var/lib/asterisk/sounds/no-empty-conferences.gsm
-var/lib/asterisk/sounds/no-info-about-number.gsm
-var/lib/asterisk/sounds/no-longer-in-service.gsm
-var/lib/asterisk/sounds/no-reply-no-mailbox.gsm
-var/lib/asterisk/sounds/no-route-exists-to-dest.gsm
-var/lib/asterisk/sounds/nobody-but-chickens.gsm
-var/lib/asterisk/sounds/node.gsm
-var/lib/asterisk/sounds/north-carolina.gsm
-var/lib/asterisk/sounds/north-dakota.gsm
-var/lib/asterisk/sounds/north.gsm
-var/lib/asterisk/sounds/northerly.gsm
-var/lib/asterisk/sounds/not-auth-pstn.gsm
-var/lib/asterisk/sounds/not-enough-credit.gsm
-var/lib/asterisk/sounds/not-necessary-1.gsm
-var/lib/asterisk/sounds/not-necessary-ac.gsm
-var/lib/asterisk/sounds/not-necessary-dial-1-or-ac.gsm
-var/lib/asterisk/sounds/not-rqsted-wakeup.gsm
-var/lib/asterisk/sounds/not-taking-your-call.gsm
-var/lib/asterisk/sounds/not-yet-assigned.gsm
-var/lib/asterisk/sounds/not-yet-connected.gsm
-var/lib/asterisk/sounds/nothing-recorded.gsm
-var/lib/asterisk/sounds/now.gsm
-var/lib/asterisk/sounds/num-not-in-db.gsm
-var/lib/asterisk/sounds/num-outside-area.gsm
-var/lib/asterisk/sounds/num-was-successfully.gsm
-var/lib/asterisk/sounds/number-not-answering.gsm
-var/lib/asterisk/sounds/number.gsm
-var/lib/asterisk/sounds/oakland.gsm
-var/lib/asterisk/sounds/octothorpe.gsm
-var/lib/asterisk/sounds/off-duty.gsm
-var/lib/asterisk/sounds/office-code.gsm
-var/lib/asterisk/sounds/office-iguanas.gsm
-var/lib/asterisk/sounds/office.gsm
-var/lib/asterisk/sounds/ohio.gsm
-var/lib/asterisk/sounds/oklahoma-city.gsm
-var/lib/asterisk/sounds/oklahoma.gsm
-var/lib/asterisk/sounds/omaha.gsm
-var/lib/asterisk/sounds/on-busy.gsm
-var/lib/asterisk/sounds/on-monthly-tel-stment.gsm
-var/lib/asterisk/sounds/on-no-answer.gsm
-var/lib/asterisk/sounds/on.gsm
-var/lib/asterisk/sounds/one-moment-please.gsm
-var/lib/asterisk/sounds/one-small-step.gsm
-var/lib/asterisk/sounds/one-small-step2.gsm
-var/lib/asterisk/sounds/oops1.gsm
-var/lib/asterisk/sounds/oops2.gsm
-var/lib/asterisk/sounds/oops3.gsm
-var/lib/asterisk/sounds/open-parenthesis.gsm
-var/lib/asterisk/sounds/operations.gsm
-var/lib/asterisk/sounds/option-is-invalid.gsm
-var/lib/asterisk/sounds/option-not-implemented.gsm
-var/lib/asterisk/sounds/or-press.gsm
-var/lib/asterisk/sounds/or.gsm
-var/lib/asterisk/sounds/order-desk.gsm
-var/lib/asterisk/sounds/orders.gsm
-var/lib/asterisk/sounds/oregon.gsm
-var/lib/asterisk/sounds/other-options-exercise.gsm
-var/lib/asterisk/sounds/otherwise-press.gsm
-var/lib/asterisk/sounds/otherwise.gsm
-var/lib/asterisk/sounds/our-business-hours-are.gsm
-var/lib/asterisk/sounds/outbound.gsm
-var/lib/asterisk/sounds/outside-sales.gsm
-var/lib/asterisk/sounds/outside-transfer.gsm
-var/lib/asterisk/sounds/pacific.gsm
-var/lib/asterisk/sounds/packet.gsm
-var/lib/asterisk/sounds/panic.gsm
-var/lib/asterisk/sounds/partially.gsm
-var/lib/asterisk/sounds/partly.gsm
-var/lib/asterisk/sounds/pascal.gsm
-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
-var/lib/asterisk/sounds/pennsylvania.gsm
-var/lib/asterisk/sounds/penny.gsm
-var/lib/asterisk/sounds/percent.gsm
-var/lib/asterisk/sounds/perhaps-we-are.gsm
-var/lib/asterisk/sounds/perhaps-we-are2.gsm
-var/lib/asterisk/sounds/period.gsm
-var/lib/asterisk/sounds/personnel.gsm
-var/lib/asterisk/sounds/persons-in-path-of.gsm
-var/lib/asterisk/sounds/philadelphia.gsm
-var/lib/asterisk/sounds/phoenix.gsm
  #var/lib/asterisk/sounds/phonetic
-var/lib/asterisk/sounds/phonetic/9_p.gsm
-var/lib/asterisk/sounds/phonetic/a_p.gsm
-var/lib/asterisk/sounds/phonetic/b_p.gsm
-var/lib/asterisk/sounds/phonetic/c_p.gsm
-var/lib/asterisk/sounds/phonetic/d_p.gsm
  #var/lib/asterisk/sounds/phonetic/de
  var/lib/asterisk/sounds/phonetic/de/9_p.gsm
  var/lib/asterisk/sounds/phonetic/de/a_p.gsm
@@ -1825,701 +2687,18 @@ var/lib/asterisk/sounds/phonetic/de/w_p.gsm
  var/lib/asterisk/sounds/phonetic/de/x_p.gsm
  var/lib/asterisk/sounds/phonetic/de/y_p.gsm
  var/lib/asterisk/sounds/phonetic/de/z_p.gsm
-var/lib/asterisk/sounds/phonetic/e_p.gsm
-var/lib/asterisk/sounds/phonetic/f_p.gsm
-var/lib/asterisk/sounds/phonetic/g_p.gsm
-var/lib/asterisk/sounds/phonetic/h_p.gsm
-var/lib/asterisk/sounds/phonetic/i_p.gsm
-var/lib/asterisk/sounds/phonetic/j_p.gsm
-var/lib/asterisk/sounds/phonetic/k_p.gsm
-var/lib/asterisk/sounds/phonetic/l_p.gsm
-var/lib/asterisk/sounds/phonetic/m_p.gsm
-var/lib/asterisk/sounds/phonetic/n_p.gsm
-var/lib/asterisk/sounds/phonetic/o_p.gsm
-var/lib/asterisk/sounds/phonetic/p_p.gsm
-var/lib/asterisk/sounds/phonetic/q_p.gsm
-var/lib/asterisk/sounds/phonetic/r_p.gsm
-var/lib/asterisk/sounds/phonetic/s_p.gsm
-var/lib/asterisk/sounds/phonetic/t_p.gsm
-var/lib/asterisk/sounds/phonetic/u_p.gsm
-var/lib/asterisk/sounds/phonetic/v_p.gsm
-var/lib/asterisk/sounds/phonetic/w_p.gsm
-var/lib/asterisk/sounds/phonetic/x_p.gsm
-var/lib/asterisk/sounds/phonetic/y_p.gsm
-var/lib/asterisk/sounds/phonetic/z_p.gsm
-var/lib/asterisk/sounds/physics.gsm
-var/lib/asterisk/sounds/pin-invalid.gsm
-var/lib/asterisk/sounds/pin-number-accepted.gsm
-var/lib/asterisk/sounds/ping.gsm
-var/lib/asterisk/sounds/pipe.gsm
-var/lib/asterisk/sounds/planning.gsm
-var/lib/asterisk/sounds/please-answer-the-following.gsm
-var/lib/asterisk/sounds/please-contact-tech-supt.gsm
-var/lib/asterisk/sounds/please-enter-first-three-letters.gsm
-var/lib/asterisk/sounds/please-enter-the.gsm
-var/lib/asterisk/sounds/please-enter-your.gsm
-var/lib/asterisk/sounds/please-hang-up-and-dial-operator.gsm
-var/lib/asterisk/sounds/please-hang-up-and-try-again.gsm
-var/lib/asterisk/sounds/please-try-again-later.gsm
-var/lib/asterisk/sounds/please-try-again.gsm
-var/lib/asterisk/sounds/please-try.gsm
-var/lib/asterisk/sounds/please-wait-connect-oncall-eng.gsm
-var/lib/asterisk/sounds/pls-ent-num-transfer.gsm
-var/lib/asterisk/sounds/pls-enter-conf-password.gsm
-var/lib/asterisk/sounds/pls-enter-num-message-after-tone.gsm
-var/lib/asterisk/sounds/pls-enter-vm-password.gsm
-var/lib/asterisk/sounds/pls-entr-num-uwish2-call.gsm
-var/lib/asterisk/sounds/pls-hold-process-tx.gsm
-var/lib/asterisk/sounds/pls-hold-silent30.gsm
-var/lib/asterisk/sounds/pls-hold-while-try.gsm
-var/lib/asterisk/sounds/pls-lv-msg-will-contact.gsm
-var/lib/asterisk/sounds/pls-rcrd-name-at-tone.gsm
-var/lib/asterisk/sounds/pls-stay-on-line.gsm
-var/lib/asterisk/sounds/pls-try-again.gsm
-var/lib/asterisk/sounds/pls-try-area-code.gsm
-var/lib/asterisk/sounds/pls-try-call-later.gsm
-var/lib/asterisk/sounds/pls-try-manually.gsm
-var/lib/asterisk/sounds/pls-wait-connect-call.gsm
-var/lib/asterisk/sounds/plugh.gsm
-var/lib/asterisk/sounds/pm-announcement-number.gsm
-var/lib/asterisk/sounds/pm-invalid-option.gsm
-var/lib/asterisk/sounds/pm-phrase-management.gsm
-var/lib/asterisk/sounds/pm-prompt-number.gsm
-var/lib/asterisk/sounds/pm-to-record-phrase.gsm
-var/lib/asterisk/sounds/pm-to-review-phrase.gsm
-var/lib/asterisk/sounds/point.gsm
-var/lib/asterisk/sounds/pop.gsm
-var/lib/asterisk/sounds/port.gsm
-var/lib/asterisk/sounds/portland.gsm
-var/lib/asterisk/sounds/portnumber.gsm
-var/lib/asterisk/sounds/position.gsm
-var/lib/asterisk/sounds/post-entry-pound.gsm
-var/lib/asterisk/sounds/pounds.gsm
-var/lib/asterisk/sounds/presales-support.gsm
-var/lib/asterisk/sounds/presidents-office.gsm
-var/lib/asterisk/sounds/press-0.gsm
-var/lib/asterisk/sounds/press-1.gsm
-var/lib/asterisk/sounds/press-2.gsm
-var/lib/asterisk/sounds/press-3.gsm
-var/lib/asterisk/sounds/press-4.gsm
-var/lib/asterisk/sounds/press-5.gsm
-var/lib/asterisk/sounds/press-6-to-eject.gsm
-var/lib/asterisk/sounds/press-6.gsm
-var/lib/asterisk/sounds/press-7.gsm
-var/lib/asterisk/sounds/press-8.gsm
-var/lib/asterisk/sounds/press-9.gsm
-var/lib/asterisk/sounds/press-button-again.gsm
-var/lib/asterisk/sounds/press-enter.gsm
-var/lib/asterisk/sounds/press-escape.gsm
-var/lib/asterisk/sounds/press-hash.gsm
-var/lib/asterisk/sounds/press-pound-save-changes.gsm
-var/lib/asterisk/sounds/press-pound-to-login-star-to-hangup.gsm
-var/lib/asterisk/sounds/press-pound.gsm
-var/lib/asterisk/sounds/press-return.gsm
-var/lib/asterisk/sounds/press-star-cancel.gsm
-var/lib/asterisk/sounds/press-star.gsm
-var/lib/asterisk/sounds/press-the-space-bar.gsm
-var/lib/asterisk/sounds/press-tilde.gsm
-var/lib/asterisk/sounds/press.gsm
-var/lib/asterisk/sounds/pressure.gsm
-var/lib/asterisk/sounds/printing.gsm
-var/lib/asterisk/sounds/priv-callee-options.gsm
-var/lib/asterisk/sounds/priv-callpending.gsm
-var/lib/asterisk/sounds/priv-introsaved.gsm
-var/lib/asterisk/sounds/priv-recordintro.gsm
-var/lib/asterisk/sounds/privacy-blacklisted.gsm
-var/lib/asterisk/sounds/privacy-blocked.gsm
-var/lib/asterisk/sounds/privacy-if-error-leave-message-or-hangup.gsm
-var/lib/asterisk/sounds/privacy-if-error.gsm
-var/lib/asterisk/sounds/privacy-if-sales-call-contact-in-writing.gsm
-var/lib/asterisk/sounds/privacy-incorrect.gsm
-var/lib/asterisk/sounds/privacy-last-caller-was.gsm
-var/lib/asterisk/sounds/privacy-not.gsm
-var/lib/asterisk/sounds/privacy-please-dial.gsm
-var/lib/asterisk/sounds/privacy-please-stay-on-line-to-be-connected.gsm
-var/lib/asterisk/sounds/privacy-prompt.gsm
-var/lib/asterisk/sounds/privacy-restricted-by-req.gsm
-var/lib/asterisk/sounds/privacy-screening-unidentified-calls.gsm
-var/lib/asterisk/sounds/privacy-stop-calling-not-welcome.gsm
-var/lib/asterisk/sounds/privacy-stop-calling-not-welcome2.gsm
-var/lib/asterisk/sounds/privacy-thankyou.gsm
-var/lib/asterisk/sounds/privacy-this-number-is.gsm
-var/lib/asterisk/sounds/privacy-to-blacklist-last-caller.gsm
-var/lib/asterisk/sounds/privacy-to-blacklist-this-number.gsm
-var/lib/asterisk/sounds/privacy-to-hear-our-contact-details.gsm
-var/lib/asterisk/sounds/privacy-to-whitelist-last-caller.gsm
-var/lib/asterisk/sounds/privacy-to-whitelist-this-number.gsm
-var/lib/asterisk/sounds/privacy-unident.gsm
-var/lib/asterisk/sounds/privacy-whitelisted.gsm
-var/lib/asterisk/sounds/privacy-you-are-blacklisted.gsm
-var/lib/asterisk/sounds/privacy-you-are-calling-from.gsm
-var/lib/asterisk/sounds/privacy-your-callerid-is.gsm
-var/lib/asterisk/sounds/product.gsm
-var/lib/asterisk/sounds/production.gsm
-var/lib/asterisk/sounds/projects.gsm
-var/lib/asterisk/sounds/protocol.gsm
-var/lib/asterisk/sounds/public-relations.gsm
-var/lib/asterisk/sounds/purchasing.gsm
-var/lib/asterisk/sounds/purposes.gsm
-var/lib/asterisk/sounds/q-dot-931.gsm
-var/lib/asterisk/sounds/q-dot-9thirty1.gsm
-var/lib/asterisk/sounds/quality-assurance.gsm
-var/lib/asterisk/sounds/quality-control.gsm
-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
-var/lib/asterisk/sounds/queue-quantity2.gsm
-var/lib/asterisk/sounds/queue-reporthold.gsm
-var/lib/asterisk/sounds/queue-seconds.gsm
-var/lib/asterisk/sounds/queue-thankyou.gsm
-var/lib/asterisk/sounds/queue-thereare.gsm
-var/lib/asterisk/sounds/queue-youarenext.gsm
-var/lib/asterisk/sounds/quickly.gsm
-var/lib/asterisk/sounds/quote.gsm
-var/lib/asterisk/sounds/race.gsm
-var/lib/asterisk/sounds/rain.gsm
-var/lib/asterisk/sounds/rainfall.gsm
-var/lib/asterisk/sounds/rainy.gsm
-var/lib/asterisk/sounds/range.gsm
-var/lib/asterisk/sounds/reassigned-new-areacode.gsm
-var/lib/asterisk/sounds/rebates.gsm
-var/lib/asterisk/sounds/received.gsm
-var/lib/asterisk/sounds/receiving.gsm
-var/lib/asterisk/sounds/reception.gsm
-var/lib/asterisk/sounds/recorded.gsm
-var/lib/asterisk/sounds/registrar.gsm
-var/lib/asterisk/sounds/remote-already-in-this-mode-2.gsm
-var/lib/asterisk/sounds/remote-already-in-this-mode.gsm
-var/lib/asterisk/sounds/remote-base.gsm
-var/lib/asterisk/sounds/removed.gsm
-var/lib/asterisk/sounds/repair.gsm
-var/lib/asterisk/sounds/repeat-only.gsm
-var/lib/asterisk/sounds/repeater.gsm
-var/lib/asterisk/sounds/research-and-development.gsm
-var/lib/asterisk/sounds/research.gsm
-var/lib/asterisk/sounds/reservations.gsm
-var/lib/asterisk/sounds/restarting.gsm
-var/lib/asterisk/sounds/rhode-island.gsm
-var/lib/asterisk/sounds/right-bracket.gsm
-var/lib/asterisk/sounds/rising.gsm
-var/lib/asterisk/sounds/risk-management.gsm
-var/lib/asterisk/sounds/roaming.gsm
-var/lib/asterisk/sounds/room-service.gsm
-var/lib/asterisk/sounds/route-sip.gsm
-var/lib/asterisk/sounds/rqsted-wakeup-for.gsm
-var/lib/asterisk/sounds/sacramento.gsm
-var/lib/asterisk/sounds/saint-louis.gsm
-var/lib/asterisk/sounds/sales-floor.gsm
-var/lib/asterisk/sounds/sales.gsm
-var/lib/asterisk/sounds/san-antonio.gsm
-var/lib/asterisk/sounds/san-diego.gsm
-var/lib/asterisk/sounds/san-francisco.gsm
-var/lib/asterisk/sounds/san-jose.gsm
-var/lib/asterisk/sounds/save-announce-press.gsm
-var/lib/asterisk/sounds/say-temp-msg-prs-pound.gsm
-var/lib/asterisk/sounds/says-thats-stupid.gsm
-var/lib/asterisk/sounds/scattered.gsm
-var/lib/asterisk/sounds/sciences.gsm
-var/lib/asterisk/sounds/screen-callee-options.gsm
-var/lib/asterisk/sounds/seattle.gsm
-var/lib/asterisk/sounds/second.gsm
-var/lib/asterisk/sounds/seconds.gsm
-var/lib/asterisk/sounds/secretary.gsm
-var/lib/asterisk/sounds/security.gsm
-var/lib/asterisk/sounds/self-destruct-in.gsm
-var/lib/asterisk/sounds/self-destruct.gsm
-var/lib/asterisk/sounds/server.gsm
-var/lib/asterisk/sounds/service-not-implemented.gsm
-var/lib/asterisk/sounds/service.gsm
-var/lib/asterisk/sounds/seventeenth.gsm
-var/lib/asterisk/sounds/seventh.gsm
-var/lib/asterisk/sounds/seventieth.gsm
-var/lib/asterisk/sounds/severe.gsm
-var/lib/asterisk/sounds/shall-i-try-again.gsm
-var/lib/asterisk/sounds/shiny-brass-lamp.gsm
-var/lib/asterisk/sounds/shipping.gsm
-var/lib/asterisk/sounds/shop.gsm
-var/lib/asterisk/sounds/show-office.gsm
-var/lib/asterisk/sounds/sighted.gsm
-var/lib/asterisk/sounds/silence
-var/lib/asterisk/sounds/silence/1.gsm
-var/lib/asterisk/sounds/silence/10.gsm
-var/lib/asterisk/sounds/silence/2.gsm
-var/lib/asterisk/sounds/silence/3.gsm
-var/lib/asterisk/sounds/silence/4.gsm
-var/lib/asterisk/sounds/silence/5.gsm
-var/lib/asterisk/sounds/silence/6.gsm
-var/lib/asterisk/sounds/silence/7.gsm
-var/lib/asterisk/sounds/silence/8.gsm
-var/lib/asterisk/sounds/silence/9.gsm
-var/lib/asterisk/sounds/simplex.gsm
-var/lib/asterisk/sounds/simul-call-limit-reached.gsm
-var/lib/asterisk/sounds/sixteenth.gsm
-var/lib/asterisk/sounds/sixth.gsm
-var/lib/asterisk/sounds/sixtieth.gsm
-var/lib/asterisk/sounds/sleet.gsm
-var/lib/asterisk/sounds/sleeting.gsm
-var/lib/asterisk/sounds/slow.gsm
-var/lib/asterisk/sounds/slowly.gsm
-var/lib/asterisk/sounds/snow.gsm
-var/lib/asterisk/sounds/snowing.gsm
-var/lib/asterisk/sounds/snowy.gsm
-var/lib/asterisk/sounds/software.gsm
-var/lib/asterisk/sounds/someone-you-trust1.gsm
-var/lib/asterisk/sounds/someone-you-trust2.gsm
-var/lib/asterisk/sounds/someone-you-trust3.gsm
-var/lib/asterisk/sounds/something-terribly-wrong.gsm
-var/lib/asterisk/sounds/sorry-cant-let-you-do-that.gsm
-var/lib/asterisk/sounds/sorry-cant-let-you-do-that2.gsm
-var/lib/asterisk/sounds/sorry-cant-let-you-do-that3.gsm
-var/lib/asterisk/sounds/sorry-mailbox-full.gsm
-var/lib/asterisk/sounds/sorry-youre-having-problems.gsm
-var/lib/asterisk/sounds/sorry.gsm
-var/lib/asterisk/sounds/sorry2.gsm
-var/lib/asterisk/sounds/south-carolina.gsm
-var/lib/asterisk/sounds/south-dakota.gsm
-var/lib/asterisk/sounds/south.gsm
-var/lib/asterisk/sounds/southerly.gsm
-var/lib/asterisk/sounds/spam.gsm
-var/lib/asterisk/sounds/spam2.gsm
-var/lib/asterisk/sounds/speak-louder-into-phone.gsm
-var/lib/asterisk/sounds/speak-louder.gsm
-var/lib/asterisk/sounds/speak-to-the-operator.gsm
-var/lib/asterisk/sounds/speed-dial-empty.gsm
-var/lib/asterisk/sounds/speed-dial.gsm
-var/lib/asterisk/sounds/speed.gsm
-var/lib/asterisk/sounds/splat.gsm
-var/lib/asterisk/sounds/spy-agent.gsm
-var/lib/asterisk/sounds/spy-console.gsm
-var/lib/asterisk/sounds/spy-dahdi.gsm
-var/lib/asterisk/sounds/spy-h323.gsm
-var/lib/asterisk/sounds/spy-iax.gsm
-var/lib/asterisk/sounds/spy-iax2.gsm
-var/lib/asterisk/sounds/spy-jingle.gsm
-var/lib/asterisk/sounds/spy-local.gsm
-var/lib/asterisk/sounds/spy-mgcp.gsm
-var/lib/asterisk/sounds/spy-misdn.gsm
-var/lib/asterisk/sounds/spy-mobile.gsm
-var/lib/asterisk/sounds/spy-nbs.gsm
-var/lib/asterisk/sounds/spy-sip.gsm
-var/lib/asterisk/sounds/spy-skinny.gsm
-var/lib/asterisk/sounds/spy-unistim.gsm
-var/lib/asterisk/sounds/spy-usbradio.gsm
-var/lib/asterisk/sounds/spy-zap.gsm
-var/lib/asterisk/sounds/ss-noservice.gsm
-var/lib/asterisk/sounds/ssh.gsm
-var/lib/asterisk/sounds/staff.gsm
-var/lib/asterisk/sounds/staffing.gsm
-var/lib/asterisk/sounds/standard.gsm
-var/lib/asterisk/sounds/star-for-menu-again.gsm
-var/lib/asterisk/sounds/starting-with-either.gsm
-var/lib/asterisk/sounds/station.gsm
-var/lib/asterisk/sounds/status.gsm
-var/lib/asterisk/sounds/step-in-stream.gsm
-var/lib/asterisk/sounds/sterling.gsm
-var/lib/asterisk/sounds/store-accounting.gsm
-var/lib/asterisk/sounds/storm.gsm
-var/lib/asterisk/sounds/sun.gsm
-var/lib/asterisk/sounds/sunny.gsm
-var/lib/asterisk/sounds/support.gsm
-var/lib/asterisk/sounds/swap.gsm
-var/lib/asterisk/sounds/system-crashed.gsm
-var/lib/asterisk/sounds/system-status-msg.gsm
-var/lib/asterisk/sounds/system.gsm
-var/lib/asterisk/sounds/systems.gsm
-var/lib/asterisk/sounds/talking-to-myself.gsm
-var/lib/asterisk/sounds/target-attendant.gsm
-var/lib/asterisk/sounds/tcp.gsm
-var/lib/asterisk/sounds/technical-support.gsm
-var/lib/asterisk/sounds/telephone-in-your-pocket.gsm
-var/lib/asterisk/sounds/telephone-in-your-pocket2.gsm
-var/lib/asterisk/sounds/telephone-number.gsm
-var/lib/asterisk/sounds/telesales.gsm
-var/lib/asterisk/sounds/teletubbie-murder.gsm
-var/lib/asterisk/sounds/telnet.gsm
-var/lib/asterisk/sounds/temp-disconnected.gsm
-var/lib/asterisk/sounds/temperature.gsm
-var/lib/asterisk/sounds/tennessee.gsm
-var/lib/asterisk/sounds/tenth.gsm
-var/lib/asterisk/sounds/terabits.gsm
-var/lib/asterisk/sounds/terabytes.gsm
-var/lib/asterisk/sounds/terminated.gsm
-var/lib/asterisk/sounds/terminating.gsm
-var/lib/asterisk/sounds/test-tones-follow.gsm
-var/lib/asterisk/sounds/texas.gsm
-var/lib/asterisk/sounds/thank-you-cooperation.gsm
-var/lib/asterisk/sounds/thank-you-for-calling.gsm
-var/lib/asterisk/sounds/thanks-for-calling-today.gsm
-var/lib/asterisk/sounds/thanks-for-using.gsm
-var/lib/asterisk/sounds/that-is-not-rec-phn-num.gsm
-var/lib/asterisk/sounds/that-number.gsm
-var/lib/asterisk/sounds/that-tickles.gsm
-var/lib/asterisk/sounds/that-you-require.gsm
-var/lib/asterisk/sounds/the-mailbox.gsm
-var/lib/asterisk/sounds/the-monkeys-twice.gsm
-var/lib/asterisk/sounds/the-new-number-is.gsm
-var/lib/asterisk/sounds/the-next.gsm
-var/lib/asterisk/sounds/the-num-i-have-is.gsm
-var/lib/asterisk/sounds/the-number-u-dialed.gsm
-var/lib/asterisk/sounds/the-party-you-are-calling.gsm
-var/lib/asterisk/sounds/the-weather-at.gsm
-var/lib/asterisk/sounds/then-press-pound.gsm
-var/lib/asterisk/sounds/there-are.gsm
-var/lib/asterisk/sounds/there-is-no-customer-support.gsm
-var/lib/asterisk/sounds/these-are-currently.gsm
-var/lib/asterisk/sounds/third.gsm
-var/lib/asterisk/sounds/thirteenth.gsm
-var/lib/asterisk/sounds/thirtieth.gsm
-var/lib/asterisk/sounds/this-call-may-be-monitored-or-recorded.gsm
-var/lib/asterisk/sounds/this-call-may-be.gsm
-var/lib/asterisk/sounds/this-call-will-cost.gsm
-var/lib/asterisk/sounds/this-call-will-end-in.gsm
-var/lib/asterisk/sounds/this-is-the-voice-mail-system.gsm
-var/lib/asterisk/sounds/this-is-yr-wakeup-call.gsm
-var/lib/asterisk/sounds/this.gsm
-var/lib/asterisk/sounds/thnk-u-for-patience.gsm
-var/lib/asterisk/sounds/thousandth.gsm
-var/lib/asterisk/sounds/through.gsm
-var/lib/asterisk/sounds/thunderstorm.gsm
-var/lib/asterisk/sounds/tide.gsm
-var/lib/asterisk/sounds/time.gsm
-var/lib/asterisk/sounds/times.gsm
-var/lib/asterisk/sounds/to-accept-recording.gsm
-var/lib/asterisk/sounds/to-be-called-back.gsm
-var/lib/asterisk/sounds/to-blklist-last-caller.gsm
-var/lib/asterisk/sounds/to-blklist-last-num.gsm
-var/lib/asterisk/sounds/to-call-num-press.gsm
-var/lib/asterisk/sounds/to-call-prson-w-sent-msg.gsm
-var/lib/asterisk/sounds/to-call-this-number.gsm
-var/lib/asterisk/sounds/to-cancel-this-msg.gsm
-var/lib/asterisk/sounds/to-cancel-wakeup.gsm
-var/lib/asterisk/sounds/to-change-exp-date.gsm
-var/lib/asterisk/sounds/to-change-your-pin-number.gsm
-var/lib/asterisk/sounds/to-collect-voicemail.gsm
-var/lib/asterisk/sounds/to-compose-a-message.gsm
-var/lib/asterisk/sounds/to-confirm-wakeup.gsm
-var/lib/asterisk/sounds/to-dial-by-name-press.gsm
-var/lib/asterisk/sounds/to-dial-by-name.gsm
-var/lib/asterisk/sounds/to-enter-a-diff-number.gsm
-var/lib/asterisk/sounds/to-enter-a-number.gsm
-var/lib/asterisk/sounds/to-erase-yr-temp-grtg.gsm
-var/lib/asterisk/sounds/to-extension.gsm
-var/lib/asterisk/sounds/to-hang-up-2.gsm
-var/lib/asterisk/sounds/to-hang-up.gsm
-var/lib/asterisk/sounds/to-hear-callerid.gsm
-var/lib/asterisk/sounds/to-hear-menu-again.gsm
-var/lib/asterisk/sounds/to-hear-msg-again.gsm
-var/lib/asterisk/sounds/to-hear-msg-envelope.gsm
-var/lib/asterisk/sounds/to-hear-net-status.gsm
-var/lib/asterisk/sounds/to-hear-weather-status.gsm
-var/lib/asterisk/sounds/to-hear-your-account-balance.gsm
-var/lib/asterisk/sounds/to-join-a-meeting.gsm
-var/lib/asterisk/sounds/to-leave-message-for.gsm
-var/lib/asterisk/sounds/to-listen-to-it.gsm
-var/lib/asterisk/sounds/to-log-in-to-voice-mail.gsm
-var/lib/asterisk/sounds/to-place-outgoing-call.gsm
-var/lib/asterisk/sounds/to-reach-first-rep.gsm
-var/lib/asterisk/sounds/to-reach-operator.gsm
-var/lib/asterisk/sounds/to-rec-yr-temp-grtg.gsm
-var/lib/asterisk/sounds/to-record-call.gsm
-var/lib/asterisk/sounds/to-redial-the-last-number-you-called.gsm
-var/lib/asterisk/sounds/to-report-emergency.gsm
-var/lib/asterisk/sounds/to-report-system-network-down.gsm
-var/lib/asterisk/sounds/to-rerecord-announce.gsm
-var/lib/asterisk/sounds/to-rerecord-it.gsm
-var/lib/asterisk/sounds/to-rerecord-yr-message.gsm
-var/lib/asterisk/sounds/to-rmv-num-blklist.gsm
-var/lib/asterisk/sounds/to-rqst-wakeup-call.gsm
-var/lib/asterisk/sounds/to-send-a-reply.gsm
-var/lib/asterisk/sounds/to-snooze-for.gsm
-var/lib/asterisk/sounds/to-use-def-attendant.gsm
-var/lib/asterisk/sounds/tomorrow-night.gsm
-var/lib/asterisk/sounds/tones-that-follow-are-for-the-deaf.gsm
-var/lib/asterisk/sounds/tonight.gsm
-var/lib/asterisk/sounds/too-low.gsm
-var/lib/asterisk/sounds/tornado.gsm
-var/lib/asterisk/sounds/touchtone1.gsm
-var/lib/asterisk/sounds/touchtone2.gsm
-var/lib/asterisk/sounds/touchtone3.gsm
-var/lib/asterisk/sounds/towards.gsm
-var/lib/asterisk/sounds/trading-desk.gsm
-var/lib/asterisk/sounds/traffic.gsm
-var/lib/asterisk/sounds/training.gsm
-var/lib/asterisk/sounds/transfer.gsm
-var/lib/asterisk/sounds/transportation.gsm
-var/lib/asterisk/sounds/travel.gsm
-var/lib/asterisk/sounds/treasury.gsm
-var/lib/asterisk/sounds/tt-allbusy.gsm
-var/lib/asterisk/sounds/tt-codezone.gsm
-var/lib/asterisk/sounds/tt-codezone_MIXDOWN.gsm
-var/lib/asterisk/sounds/tt-hangup.gsm
-var/lib/asterisk/sounds/tt-monkeys.gsm
-var/lib/asterisk/sounds/tt-monkeysintro.gsm
-var/lib/asterisk/sounds/tt-monty-knights.gsm
-var/lib/asterisk/sounds/tt-somethingwrong.gsm
-var/lib/asterisk/sounds/tt-weasels.gsm
-var/lib/asterisk/sounds/tucson.gsm
-var/lib/asterisk/sounds/tulsa.gsm
-var/lib/asterisk/sounds/turn-off-recording.gsm
-var/lib/asterisk/sounds/turning-to.gsm
-var/lib/asterisk/sounds/twelveth.gsm
-var/lib/asterisk/sounds/twentieth.gsm
-var/lib/asterisk/sounds/twisty-maze.gsm
-var/lib/asterisk/sounds/tx-has-been-approved.gsm
-var/lib/asterisk/sounds/typhoon.gsm
-var/lib/asterisk/sounds/udp.gsm
-var/lib/asterisk/sounds/uh-oh1.gsm
-var/lib/asterisk/sounds/uh-oh2.gsm
-var/lib/asterisk/sounds/uk.gsm
-var/lib/asterisk/sounds/unavailable.gsm
-var/lib/asterisk/sounds/unconditional.gsm
-var/lib/asterisk/sounds/unidentified-no-callback.gsm
-var/lib/asterisk/sounds/units.gsm
-var/lib/asterisk/sounds/unix.gsm
-var/lib/asterisk/sounds/up.gsm
-var/lib/asterisk/sounds/uptime.gsm
-var/lib/asterisk/sounds/user.gsm
-var/lib/asterisk/sounds/users.gsm
-var/lib/asterisk/sounds/utah.gsm
-var/lib/asterisk/sounds/variable.gsm
-var/lib/asterisk/sounds/vermont.gsm
-var/lib/asterisk/sounds/virginia-beach.gsm
-var/lib/asterisk/sounds/virginia.gsm
-var/lib/asterisk/sounds/visibility.gsm
-var/lib/asterisk/sounds/visit-asterisk-website.gsm
-var/lib/asterisk/sounds/vm-Cust1.gsm
-var/lib/asterisk/sounds/vm-Cust2.gsm
-var/lib/asterisk/sounds/vm-Cust3.gsm
-var/lib/asterisk/sounds/vm-Cust4.gsm
-var/lib/asterisk/sounds/vm-Cust5.gsm
-var/lib/asterisk/sounds/vm-Family.gsm
-var/lib/asterisk/sounds/vm-Friends.gsm
-var/lib/asterisk/sounds/vm-INBOX.gsm
-var/lib/asterisk/sounds/vm-Old.gsm
-var/lib/asterisk/sounds/vm-Urgent.gsm
-var/lib/asterisk/sounds/vm-Work.gsm
-var/lib/asterisk/sounds/vm-advopts.gsm
-var/lib/asterisk/sounds/vm-and.gsm
-var/lib/asterisk/sounds/vm-calldiffnum.gsm
-var/lib/asterisk/sounds/vm-changeto.gsm
-var/lib/asterisk/sounds/vm-delete.gsm
-var/lib/asterisk/sounds/vm-deleted.gsm
-var/lib/asterisk/sounds/vm-dialout.gsm
-var/lib/asterisk/sounds/vm-duration.gsm
-var/lib/asterisk/sounds/vm-enter-num-to-call.gsm
-var/lib/asterisk/sounds/vm-extension.gsm
-var/lib/asterisk/sounds/vm-first.gsm
-var/lib/asterisk/sounds/vm-for.gsm
-var/lib/asterisk/sounds/vm-forward-multiple.gsm
-var/lib/asterisk/sounds/vm-forward.gsm
-var/lib/asterisk/sounds/vm-forwardoptions.gsm
-var/lib/asterisk/sounds/vm-from-extension.gsm
-var/lib/asterisk/sounds/vm-from-phonenumber.gsm
-var/lib/asterisk/sounds/vm-from.gsm
-var/lib/asterisk/sounds/vm-goodbye.gsm
-var/lib/asterisk/sounds/vm-helpexit.gsm
-var/lib/asterisk/sounds/vm-incorrect-mailbox.gsm
-var/lib/asterisk/sounds/vm-incorrect.gsm
-var/lib/asterisk/sounds/vm-instructions.gsm
-var/lib/asterisk/sounds/vm-intro.gsm
-var/lib/asterisk/sounds/vm-invalid-password.gsm
-var/lib/asterisk/sounds/vm-invalidpassword.gsm
-var/lib/asterisk/sounds/vm-isonphone.gsm
-var/lib/asterisk/sounds/vm-isunavail.gsm
-var/lib/asterisk/sounds/vm-last.gsm
-var/lib/asterisk/sounds/vm-leavemsg.gsm
-var/lib/asterisk/sounds/vm-login.gsm
-var/lib/asterisk/sounds/vm-mailboxfull.gsm
-var/lib/asterisk/sounds/vm-marked-nonurgent.gsm
-var/lib/asterisk/sounds/vm-marked-urgent.gsm
-var/lib/asterisk/sounds/vm-message.gsm
-var/lib/asterisk/sounds/vm-messages.gsm
-var/lib/asterisk/sounds/vm-minutes.gsm
-var/lib/asterisk/sounds/vm-mismatch.gsm
-var/lib/asterisk/sounds/vm-msginstruct.gsm
-var/lib/asterisk/sounds/vm-msgsaved.gsm
-var/lib/asterisk/sounds/vm-newpassword.gsm
-var/lib/asterisk/sounds/vm-newuser.gsm
-var/lib/asterisk/sounds/vm-next.gsm
-var/lib/asterisk/sounds/vm-no.gsm
-var/lib/asterisk/sounds/vm-nobodyavail.gsm
-var/lib/asterisk/sounds/vm-nobox.gsm
-var/lib/asterisk/sounds/vm-nomore.gsm
-var/lib/asterisk/sounds/vm-nonumber.gsm
-var/lib/asterisk/sounds/vm-num-i-have.gsm
-var/lib/asterisk/sounds/vm-onefor-full.gsm
-var/lib/asterisk/sounds/vm-onefor.gsm
-var/lib/asterisk/sounds/vm-options.gsm
-var/lib/asterisk/sounds/vm-opts-full.gsm
-var/lib/asterisk/sounds/vm-opts.gsm
-var/lib/asterisk/sounds/vm-passchanged.gsm
-var/lib/asterisk/sounds/vm-password.gsm
-var/lib/asterisk/sounds/vm-pls-try-again.gsm
-var/lib/asterisk/sounds/vm-press.gsm
-var/lib/asterisk/sounds/vm-prev.gsm
-var/lib/asterisk/sounds/vm-reachoper.gsm
-var/lib/asterisk/sounds/vm-rec-busy.gsm
-var/lib/asterisk/sounds/vm-rec-name.gsm
-var/lib/asterisk/sounds/vm-rec-temp.gsm
-var/lib/asterisk/sounds/vm-rec-unv.gsm
-var/lib/asterisk/sounds/vm-received.gsm
-var/lib/asterisk/sounds/vm-record-prepend.gsm
-var/lib/asterisk/sounds/vm-reenterpassword.gsm
-var/lib/asterisk/sounds/vm-repeat.gsm
-var/lib/asterisk/sounds/vm-review-nonurgent.gsm
-var/lib/asterisk/sounds/vm-review-urgent.gsm
-var/lib/asterisk/sounds/vm-review.gsm
-var/lib/asterisk/sounds/vm-saved.gsm
-var/lib/asterisk/sounds/vm-savedto.gsm
-var/lib/asterisk/sounds/vm-savefolder.gsm
-var/lib/asterisk/sounds/vm-savemessage.gsm
-var/lib/asterisk/sounds/vm-saveoper.gsm
-var/lib/asterisk/sounds/vm-sorry.gsm
-var/lib/asterisk/sounds/vm-star-cancel.gsm
-var/lib/asterisk/sounds/vm-starmain.gsm
-var/lib/asterisk/sounds/vm-tempgreetactive.gsm
-var/lib/asterisk/sounds/vm-tempgreeting.gsm
-var/lib/asterisk/sounds/vm-tempgreeting2.gsm
-var/lib/asterisk/sounds/vm-tempremoved.gsm
-var/lib/asterisk/sounds/vm-then-pound.gsm
-var/lib/asterisk/sounds/vm-theperson.gsm
-var/lib/asterisk/sounds/vm-tmpexists.gsm
-var/lib/asterisk/sounds/vm-tocallback.gsm
-var/lib/asterisk/sounds/vm-tocallnum.gsm
-var/lib/asterisk/sounds/vm-tocancel.gsm
-var/lib/asterisk/sounds/vm-tocancelmsg.gsm
-var/lib/asterisk/sounds/vm-toenternumber.gsm
-var/lib/asterisk/sounds/vm-toforward.gsm
-var/lib/asterisk/sounds/vm-tohearenv.gsm
-var/lib/asterisk/sounds/vm-tomakecall.gsm
-var/lib/asterisk/sounds/vm-tooshort.gsm
-var/lib/asterisk/sounds/vm-toreply.gsm
-var/lib/asterisk/sounds/vm-torerecord.gsm
-var/lib/asterisk/sounds/vm-undelete.gsm
-var/lib/asterisk/sounds/vm-undeleted.gsm
-var/lib/asterisk/sounds/vm-unknown-caller.gsm
-var/lib/asterisk/sounds/vm-whichbox.gsm
-var/lib/asterisk/sounds/vm-youhave.gsm
-var/lib/asterisk/sounds/voice-mail-system.gsm
-var/lib/asterisk/sounds/wait-moment.gsm
-var/lib/asterisk/sounds/wait-offensive-sounds.gsm
-var/lib/asterisk/sounds/wakeup-call-cancelled.gsm
-var/lib/asterisk/sounds/wakeup-call.gsm
-var/lib/asterisk/sounds/wakeup-daily.gsm
-var/lib/asterisk/sounds/wakeup-for-daily.gsm
-var/lib/asterisk/sounds/wakeup-for-one-time.gsm
-var/lib/asterisk/sounds/wakeup-onetime.gsm
-var/lib/asterisk/sounds/walks-into-bar-mail.gsm
-var/lib/asterisk/sounds/warning.gsm
-var/lib/asterisk/sounds/was-last-seen.gsm
-var/lib/asterisk/sounds/was.gsm
-var/lib/asterisk/sounds/washington-dc.gsm
-var/lib/asterisk/sounds/washington.gsm
-var/lib/asterisk/sounds/watch.gsm
-var/lib/asterisk/sounds/we-apologize.gsm
-var/lib/asterisk/sounds/we-dont-have-tech-support.gsm
-var/lib/asterisk/sounds/weasels-eaten-phonesys.gsm
-var/lib/asterisk/sounds/weather-station.gsm
-var/lib/asterisk/sounds/weather.gsm
-var/lib/asterisk/sounds/web.gsm
-var/lib/asterisk/sounds/weeks.gsm
-var/lib/asterisk/sounds/welcome.gsm
-var/lib/asterisk/sounds/were-sorry.gsm
-var/lib/asterisk/sounds/west-virginia.gsm
-var/lib/asterisk/sounds/west.gsm
-var/lib/asterisk/sounds/westerly.gsm
-var/lib/asterisk/sounds/what-are-you-wearing.gsm
-var/lib/asterisk/sounds/what-time-it-is.gsm
-var/lib/asterisk/sounds/what-time-it-is2.gsm
-var/lib/asterisk/sounds/when-dialing-this-number.gsm
-var/lib/asterisk/sounds/who-would-you-like-to-call.gsm
-var/lib/asterisk/sounds/why-no-answer-mystery.gsm
-var/lib/asterisk/sounds/wichita.gsm
-var/lib/asterisk/sounds/will-apply.gsm
-var/lib/asterisk/sounds/will-expire.gsm
-var/lib/asterisk/sounds/will-not-expire.gsm
-var/lib/asterisk/sounds/will-reflect-charge-of.gsm
-var/lib/asterisk/sounds/wind.gsm
-var/lib/asterisk/sounds/windows.gsm
-var/lib/asterisk/sounds/windy.gsm
-var/lib/asterisk/sounds/wisconsin.gsm
-var/lib/asterisk/sounds/wish-to-continue.gsm
-var/lib/asterisk/sounds/with.gsm
-var/lib/asterisk/sounds/within.gsm
-var/lib/asterisk/sounds/work.gsm
-var/lib/asterisk/sounds/wrong-try-again-smarty.gsm
-var/lib/asterisk/sounds/wtng-to-spk-w-rep.gsm
-var/lib/asterisk/sounds/www-switchboard-com.gsm
-#var/lib/asterisk/sounds/wx
-var/lib/asterisk/sounds/wx/around.gsm
-var/lib/asterisk/sounds/wx/barometer.gsm
-var/lib/asterisk/sounds/wx/ceiling.gsm
-var/lib/asterisk/sounds/wx/dew-point.gsm
-var/lib/asterisk/sounds/wx/falling.gsm
-var/lib/asterisk/sounds/wx/feet.gsm
-var/lib/asterisk/sounds/wx/foot.gsm
-var/lib/asterisk/sounds/wx/gust.gsm
-var/lib/asterisk/sounds/wx/gusting-to.gsm
-var/lib/asterisk/sounds/wx/gusts.gsm
-var/lib/asterisk/sounds/wx/gusty.gsm
-var/lib/asterisk/sounds/wx/heat-index.gsm
-var/lib/asterisk/sounds/wx/humidity.gsm
-var/lib/asterisk/sounds/wx/inch.gsm
-var/lib/asterisk/sounds/wx/inches.gsm
-var/lib/asterisk/sounds/wx/kilometer.gsm
-var/lib/asterisk/sounds/wx/large.gsm
-var/lib/asterisk/sounds/wx/meter.gsm
-var/lib/asterisk/sounds/wx/mist.gsm
-var/lib/asterisk/sounds/wx/northeast.gsm
-var/lib/asterisk/sounds/wx/northwest.gsm
-var/lib/asterisk/sounds/wx/percent.gsm
-var/lib/asterisk/sounds/wx/point.gsm
-var/lib/asterisk/sounds/wx/rising.gsm
-var/lib/asterisk/sounds/wx/southeast.gsm
-var/lib/asterisk/sounds/wx/southwest.gsm
-var/lib/asterisk/sounds/wx/steady.gsm
-var/lib/asterisk/sounds/wx/temperature.gsm
-var/lib/asterisk/sounds/wx/wind-chill.gsm
-var/lib/asterisk/sounds/wx/winds.gsm
-var/lib/asterisk/sounds/wyoming.gsm
-var/lib/asterisk/sounds/yeah.gsm
-var/lib/asterisk/sounds/year.gsm
-var/lib/asterisk/sounds/years.gsm
-var/lib/asterisk/sounds/yes-dear.gsm
-var/lib/asterisk/sounds/yes-dear2.gsm
-var/lib/asterisk/sounds/you-are-caller-num.gsm
-var/lib/asterisk/sounds/you-are-curr-call-num.gsm
-var/lib/asterisk/sounds/you-can-press.gsm
-var/lib/asterisk/sounds/you-dialed-wrong-number.gsm
-var/lib/asterisk/sounds/you-entered.gsm
-var/lib/asterisk/sounds/you-have-dialed.gsm
-var/lib/asterisk/sounds/you-have-reached-a-test-number.gsm
-var/lib/asterisk/sounds/you-have-these-options.gsm
-var/lib/asterisk/sounds/you-must-first-dial.gsm
-var/lib/asterisk/sounds/you-seem-impatient.gsm
-var/lib/asterisk/sounds/you-sound-cute.gsm
-var/lib/asterisk/sounds/you-wish-to-join.gsm
-var/lib/asterisk/sounds/your-account.gsm
-var/lib/asterisk/sounds/your-msg-has-been-saved.gsm
-var/lib/asterisk/sounds/your-msg-is-too-short.gsm
-var/lib/asterisk/sounds/your-notifications.gsm
-var/lib/asterisk/sounds/your-req-notification.gsm
-var/lib/asterisk/sounds/your-temp-greeting.gsm
-var/lib/asterisk/sounds/your.gsm
-var/lib/asterisk/sounds/zip-code.gsm
  #var/lib/asterisk/static-http
  var/lib/asterisk/static-http/ajamdemo.html
  var/lib/asterisk/static-http/astman.css
  var/lib/asterisk/static-http/astman.js
+var/lib/asterisk/static-http/core-en_US.xml
+var/lib/asterisk/static-http/mantest.html
  var/lib/asterisk/static-http/prototype.js
  #var/log/asterisk
  var/log/asterisk/cdr-csv
  var/log/asterisk/cdr-custom
+var/log/asterisk/cel-custom
+var/run/asterisk
  #var/spool/asterisk
  var/spool/asterisk/dictate
  var/spool/asterisk/meetme
@@ -2530,8 +2709,6 @@ var/spool/asterisk/tmp
  #var/spool/asterisk/voicemail/default
  #var/spool/asterisk/voicemail/default/1234
  var/spool/asterisk/voicemail/default/1234/INBOX
-var/spool/asterisk/voicemail/default/1234/busy.gsm
-var/spool/asterisk/voicemail/default/1234/unavail.gsm
-etc/rc.d/init.d/asterisk
-srv/web/ipfire/cgi-bin/asterisk
-var/ipfire/menu.d/EX-asterisk.menu
+var/spool/asterisk/voicemail/default/1234/en
+var/spool/asterisk/voicemail/default/1234/en/busy.gsm
+var/spool/asterisk/voicemail/default/1234/en/unavail.gsm
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav

index 4029074b6b76d720c8019f63cd9adc6e32d36607..6987adeda7088b48ed7fe0251bf65462c01d36ea 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
  #usr/lib/libclamav.la
  usr/lib/libclamav.so
  usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.13
+usr/lib/libclamav.so.6.1.14
  #usr/lib/libclamunrar.la
  usr/lib/libclamunrar.so
  usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.13
+usr/lib/libclamunrar.so.6.1.14
  #usr/lib/libclamunrar_iface.la
  usr/lib/libclamunrar_iface.so
  usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.13
+usr/lib/libclamunrar_iface.so.6.1.14
  #usr/lib/pkgconfig/libclamav.pc
  usr/sbin/clamd
  usr/share/clamav
diff --git a/config/rootfiles/packages/mtr b/config/rootfiles/packages/mtr

new file mode 100644 (file)

index 0000000..25356a7
--- /dev/null
+++ b/config/rootfiles/packages/mtr
@@ -0,0 +1,2 @@
+usr/sbin/mtr
+#usr/share/man/man8/mtr.8
diff --git a/config/rootfiles/packages/tcpick b/config/rootfiles/packages/tcpick

new file mode 100644 (file)

index 0000000..f447d21
--- /dev/null
+++ b/config/rootfiles/packages/tcpick
@@ -0,0 +1,3 @@
+usr/bin/tcpick
+#usr/man/man8/tcpick.8
+#usr/man/man8/tcpick_italian.8
diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper

index c3bbf7c9f45ff7549abed98768b729a9dfc24601..ceae12b2bc97da3af78a52c6e5bb129f59cc0e30 100644 (file)
--- a/config/urlfilter/redirect_wrapper
+++ b/config/urlfilter/redirect_wrapper
@@ -2,7 +2,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@ -115,7 +115,7 @@ while($line = <>) {
  exit 0;
  
  sub writetolog {
-       open(DATEI, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/redirector_debug";
+       open(DATEI, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/squid/redirector_debug";
         my $log = shift;
         print DATEI $log."\n";
         close(DATEI);
diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi

index 14ee20910509b0e9633e6b5d586039d7cda7d12e..21f66d7b2c7a06315309f1bbefb0c35a133b2377 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -2,7 +2,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@ -19,13 +19,10 @@
  #                                                                             #
  ###############################################################################
  
-my @network=();
-my @masklen=();
-my @colour=();
+use strict;
  
  use Net::IPv4Addr qw( :all );
-
-use strict;
+use Switch;
  
  # enable only the following on debugging purpose
  #use warnings;
@@ -35,42 +32,62 @@ require '/var/ipfire/general-functions.pl';
  require "${General::swroot}/lang.pl";
  require "${General::swroot}/header.pl";
  
+&Header::showhttpheaders();
+
+my @network=();
+my @masklen=();
+my @colour=();
+
+my %netsettings=();
+&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
+
  #workaround to suppress a warning when a variable is used only once
  my @dummy = ( ${Header::table1colour} );
  undef (@dummy);
  
-# Read various files
+# Read the connection tracking table.
+open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table";
+my @conntrack = <CONNTRACK>;
+close(CONNTRACK);
  
-my %netsettings=();
-&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
+# Collect data for the @network array.
  
-open (ACTIVE, '/usr/local/bin/getiptstate |') or die 'Unable to open ip_conntrack';
-my @active = <ACTIVE>;
-close (ACTIVE);
+# Add Firewall Localhost 127.0.0.1
+push(@network, '127.0.0.1');
+push(@masklen, '255.255.255.255');
+push(@colour, ${Header::colourfw});
  
  if (open(IP, "${General::swroot}/red/local-ipaddress")) {
-        my $redip = <IP>;
-        close(IP);
-        chomp $redip;
-        push(@network, $redip);
-        push(@masklen, '255.255.255.255' );
-        push(@colour, ${Header::colourfw} );
+       my $redip = <IP>;
+       close(IP);
+
+       chomp $redip;
+       push(@network, $redip);
+       push(@masklen, '255.255.255.255');
+       push(@colour, ${Header::colourfw});
  }
  
-my @vpn = `/usr/local/bin/ipsecctrl I 2>/dev/null|grep erouted|cut -d"]" -f3|cut -d"=" -f4|cut -d";" -f1| sed "s|/| |g"`;
-  foreach my $route (@vpn) {
-                chomp($route);
-                my @temp = split(/[\t ]+/, $route);
-                if ( $temp[0] eq '$redip' ){next;}
-                push(@network, $temp[0]);
-                push(@masklen, $temp[1]);
-                push(@colour, ${Header::colourvpn} );
-        }
-
-my $aliasfile = "${General::swroot}/ethernet/aliases";
-open(ALIASES, $aliasfile) or die 'Unable to open aliases file.';
-my @aliases = <ALIASES>;
-close(ALIASES);
+# Add STATIC RED aliases
+if ($netsettings{'RED_DEV'}) {
+       my $aliasfile = "${General::swroot}/ethernet/aliases";
+       open(ALIASES, $aliasfile) or die 'Unable to open aliases file.';
+       my @aliases = <ALIASES>;
+       close(ALIASES);
+
+       # We have a RED eth iface
+       if ($netsettings{'RED_TYPE'} eq 'STATIC') {
+               # We have a STATIC RED eth iface
+               foreach my $line (@aliases) {
+                       chomp($line);
+                       my @temp = split(/\,/,$line);
+                       if ($temp[0]) {
+                               push(@network, $temp[0]);
+                               push(@masklen, $netsettings{'RED_NETMASK'} );
+                               push(@colour, ${Header::colourfw} );
+                       }
+               }
+       }
+}
  
  # Add Green Firewall Interface
  push(@network, $netsettings{'GREEN_ADDRESS'});
@@ -85,32 +102,11 @@ push(@colour, ${Header::colourgreen} );
  # Add Green Routes to Array
  my @routes = `/sbin/route -n | /bin/grep $netsettings{'GREEN_DEV'}`;
  foreach my $route (@routes) {
-        chomp($route);
-        my @temp = split(/[\t ]+/, $route);
-        push(@network, $temp[0]);
-        push(@masklen, $temp[2]);
-        push(@colour, ${Header::colourgreen} );
-}
-
-# Add Firewall Localhost 127.0.0.1
-push(@network, '127.0.0.1');
-push(@masklen, '255.255.255.255' );
-push(@colour, ${Header::colourfw} );
-
-# Add Orange Network
-if ($netsettings{'ORANGE_DEV'}) {
-        push(@network, $netsettings{'ORANGE_NETADDRESS'});
-        push(@masklen, $netsettings{'ORANGE_NETMASK'} );
-        push(@colour, ${Header::colourorange} );
-        # Add Orange Routes to Array
-        @routes = `/sbin/route -n | /bin/grep $netsettings{'ORANGE_DEV'}`;
-        foreach my $route (@routes) {
-                  chomp($route);
-                my @temp = split(/[\t ]+/, $route);
-                push(@network, $temp[0]);
-                push(@masklen, $temp[2]);
-                push(@colour, ${Header::colourorange} );
-        }
+       chomp($route);
+       my @temp = split(/[\t ]+/, $route);
+       push(@network, $temp[0]);
+       push(@masklen, $temp[2]);
+       push(@colour, ${Header::colourgreen} );
  }
  
  # Add Blue Firewall Interface
@@ -120,304 +116,357 @@ push(@colour, ${Header::colourfw} );
  
  # Add Blue Network
  if ($netsettings{'BLUE_DEV'}) {
-        push(@network, $netsettings{'BLUE_NETADDRESS'});
-        push(@masklen, $netsettings{'BLUE_NETMASK'} );
-        push(@colour, ${Header::colourblue} );
-        # Add Blue Routes to Array
-        @routes = `/sbin/route -n | /bin/grep $netsettings{'BLUE_DEV'}`;
-        foreach my $route (@routes) {
-                  chomp($route);
-                my @temp = split(/[\t ]+/, $route);
-                push(@network, $temp[0]);
-                push(@masklen, $temp[2]);
-                push(@colour, ${Header::colourblue} );
-        }
+       push(@network, $netsettings{'BLUE_NETADDRESS'});
+       push(@masklen, $netsettings{'BLUE_NETMASK'} );
+       push(@colour, ${Header::colourblue} );
+
+       # Add Blue Routes to Array
+       @routes = `/sbin/route -n | /bin/grep $netsettings{'BLUE_DEV'}`;
+       foreach my $route (@routes) {
+               chomp($route);
+               my @temp = split(/[\t ]+/, $route);
+               push(@network, $temp[0]);
+               push(@masklen, $temp[2]);
+               push(@colour, ${Header::colourblue} );
+       }
+}
+
+# Add Orange Network
+if ($netsettings{'ORANGE_DEV'}) {
+       push(@network, $netsettings{'ORANGE_NETADDRESS'});
+       push(@masklen, $netsettings{'ORANGE_NETMASK'} );
+       push(@colour, ${Header::colourorange} );
+       # Add Orange Routes to Array
+       @routes = `/sbin/route -n | /bin/grep $netsettings{'ORANGE_DEV'}`;
+       foreach my $route (@routes) {
+               chomp($route);
+               my @temp = split(/[\t ]+/, $route);
+               push(@network, $temp[0]);
+               push(@masklen, $temp[2]);
+               push(@colour, ${Header::colourorange} );
+       }
  }
  
  # Add OpenVPN net and RED/BLUE/ORANGE entry (when appropriate)
  if (-e "${General::swroot}/ovpn/settings") {
-    my %ovpnsettings = ();    
-    &General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
-    my @tempovpnsubnet = split("\/",$ovpnsettings{'DOVPN_SUBNET'});
-
-    # add OpenVPN net
-                push(@network, $tempovpnsubnet[0]);
-                push(@masklen, $tempovpnsubnet[1]);
-                push(@colour, ${Header::colourovpn} );
-
-
-    if ( ($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'} ) {
-      # add BLUE:port / proto
-            push(@network, $netsettings{'BLUE_ADDRESS'} );
-            push(@masklen, '255.255.255.255' );
-                  push(@colour, ${Header::colourovpn} );
-    }
-    if ( ($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'} ) {
-      # add ORANGE:port / proto
-            push(@network, $netsettings{'ORANGE_ADDRESS'} );
-            push(@masklen, '255.255.255.255' );
-                  push(@colour, ${Header::colourovpn} );
-    }
-}
+       my %ovpnsettings = ();
+       &General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
+       my @tempovpnsubnet = split("\/",$ovpnsettings{'DOVPN_SUBNET'});
+
+       # add OpenVPN net
+       push(@network, $tempovpnsubnet[0]);
+       push(@masklen, $tempovpnsubnet[1]);
+       push(@colour, ${Header::colourovpn} );
+
+       # add BLUE:port / proto
+       if (($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'}) {
+               push(@network, $netsettings{'BLUE_ADDRESS'} );
+               push(@masklen, '255.255.255.255' );
+               push(@colour, ${Header::colourovpn});
+       }
  
-# Add STATIC RED aliases
-if ($netsettings{'RED_DEV'}) {
-        # We have a RED eth iface
-        if ($netsettings{'RED_TYPE'} eq 'STATIC') {
-                # We have a STATIC RED eth iface
-                foreach my $line (@aliases)
-                {
-                        chomp($line);
-                        my @temp = split(/\,/,$line);
-                        if ( $temp[0] ) {
-                                push(@network, $temp[0]);
-                                push(@masklen, $netsettings{'RED_NETMASK'} );
-                                push(@colour, ${Header::colourfw} );
-                        }
-                }
-        }
+       # add ORANGE:port / proto
+       if (($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'}) {
+               push(@network, $netsettings{'ORANGE_ADDRESS'} );
+               push(@masklen, '255.255.255.255' );
+               push(@colour, ${Header::colourovpn} );
+       }
  }
  
-# Add VPNs
-if ( $vpn[0] ne 'none' ) {
-        foreach my $line (@vpn) {
-                my @temp = split(/[\t ]+/,$line);
-                my @temp1 = split(/[\/:]+/,$temp[3]);
-                push(@network, $temp1[0]);
-                push(@masklen, ipv4_cidr2msk($temp1[1]));
-                push(@colour, ${Header::colourvpn} );
-        }
-}
+open(IPSEC, "${General::swroot}/var/ipfire/vpn/config");
+my @ipsec = <IPSEC>;
+close(IPSEC);
  
-#Establish simple filtering&sorting boxes on top of table
+foreach my $line (@ipsec) {
+       my @vpn = split(',', $line);
+       my ($network, $mask) = split("/", $vpn[12]);
  
-our %cgiparams;
-&Header::getcgihash(\%cgiparams);
+       if (!&General::validip($mask)) {
+               $mask = ipv4_cidr2msk($mask);
+       }
  
-my @list_proto = ($Lang::tr{'all'}, 'icmp', 'udp', 'tcp');
-my @list_state = ($Lang::tr{'all'}, 'SYN_SENT', 'SYN_RECV', 'ESTABLISHED', 'FIN_WAIT',
-                    'CLOSE_WAIT', 'LAST_ACK', 'TIME_WAIT', 'CLOSE', 'LISTEN');
-my @list_mark = ($Lang::tr{'all'}, '[ASSURED]', '[UNREPLIED]');
-my @list_sort = ('orgsip','protocol', 'expires', 'status', 'orgdip', 'orgsp',
-                    'orgdp', 'exsip', 'exdip', 'exsp', 'exdp', 'marked');
+       push(@network, $network);
+       push(@masklen, $mask);
+       push(@colour, ${Header::colourvpn});
+}
  
-# init or silently correct unknown value...
-if ( ! grep ( /^$cgiparams{'SEE_PROTO'}$/ , @list_proto )) { $cgiparams{'SEE_PROTO'} = $list_proto[0] };
-if ( ! grep ( /^$cgiparams{'SEE_STATE'}$/ , @list_state )) { $cgiparams{'SEE_STATE'} = $list_state[0] };
-if ( ($cgiparams{'SEE_MARK'} ne $Lang::tr{'all'}) &&   # ok the grep should work but it doesn't because of
-     ($cgiparams{'SEE_MARK'} ne '[ASSURED]') &&                # the '[' & ']' interpreted as list separator.
-     ($cgiparams{'SEE_MARK'} ne '[UNREPLIED]')         # So, explicitly enumerate items.
-   )  { $cgiparams{'SEE_MARK'}  = $list_mark[0] };
-if ( ! grep ( /^$cgiparams{'SEE_SORT'}$/  , @list_sort ))  { $cgiparams{'SEE_SORT'}  = $list_sort[0] };
-# *.*.*.* or a valid IP
-if ( $cgiparams{'SEE_SRC'}  !~ /^(\*\.\*\.\*\.\*\.|\d+\.\d+\.\d+\.\d+)$/) {  $cgiparams{'SEE_SRC'} = '*.*.*.*' };
-if ( $cgiparams{'SEE_DEST'} !~ /^(\*\.\*\.\*\.\*\.|\d+\.\d+\.\d+\.\d+)$/) {  $cgiparams{'SEE_DEST'} = '*.*.*.*' };
+if (-e "${General::swroot}/ovpn/n2nconf") {
+       open(OVPNN2N, "${General::swroot}/ovpn/ovpnconfig");
+       my @ovpnn2n = <OVPNN2N>;
+       close(OVPNN2N);
  
+       foreach my $line (@ovpnn2n) {
+               my @ovpn = split(',', $line);
+               next if ($ovpn[4] ne 'net');
  
-our %entries = ();     # will hold the lines analyzed correctly
-my $unknownlines = ''; # should be empty all the time...
-my $index = 0;         # just a counter to make unique entryies in entries
+               my ($network, $mask) = split("/", $ovpn[12]);
+               if (!&General::validip($mask)) {
+                       $mask = ipv4_cidr2msk($mask);
+               }
  
-&Header::showhttpheaders();
+               push(@network, $network);
+               push(@masklen, $mask);
+               push(@colour, ${Header::colourovpn});
+       }
+}
+
+# Show the page.
  &Header::openpage($Lang::tr{'connections'}, 1, '');
  &Header::openbigbox('100%', 'left');
  &Header::openbox('100%', 'left', $Lang::tr{'connection tracking'});
  
-# Build listbox objects
-my $menu_proto = &make_select ('SEE_PROTO', $cgiparams{'SEE_PROTO'}, @list_proto);
-my $menu_state = &make_select ('SEE_STATE', $cgiparams{'SEE_STATE'}, @list_state);
-
-print <<END
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='100%'>
-<tr><td align='center'><b>$Lang::tr{'legend'} : </b></td>
-    <td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourred}'><b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourorange}'><b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourblue}'><b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourfw}'><b><font color='#FFFFFF'>IPFire</font></b></td>
-    <td align='center' bgcolor='${Header::colourvpn}'><b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourovpn}'><b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b></td>
-</tr>
-</table>
-<br />
-<table width='100%'>
-<tr><td align='center'><font size=2>$Lang::tr{'source ip and port'}</font></td>
-               <td>&nbsp;</td>
-               <td align='center'><font size=2>$Lang::tr{'dest ip and port'}</font></td>
-               <td>&nbsp;</td>
-               <td align='center'><font size=2>$Lang::tr{'protocol'}</font></td>
-               <td align='center'><font size=2>$Lang::tr{'connection'}<br></br>$Lang::tr{'status'}</font></td>
-    <td align='center'><font size=2>$Lang::tr{'expires'}<br></br>($Lang::tr{'seconds'})</font></td>
-    
-</tr>
-<tr><td colspan='4'>&nbsp;</td>
-               <td align='center'>$menu_proto</td>
-    <td align='center'>$menu_state</td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td align='center' colspan='7'></td>
-</tr>
-<tr>
-    <td align='center' colspan='7'><input type='submit' value="$Lang::tr{'update'}" /></td>
-</tr>
+# Print legend.
+print <<END;
+       <table width='100%'>
+               <tr>
+                       <td align='center'>
+                               <b>$Lang::tr{'legend'} : </b>
+                       </td>
+                       <td align='center' bgcolor='${Header::colourgreen}'>
+                               <b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b>
+                       </td>
+                       <td align='center' bgcolor='${Header::colourred}'>
+                               <b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b>
+                       </td>
+                       <td align='center' bgcolor='${Header::colourorange}'>
+                               <b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b>
+                       </td>
+                       <td align='center' bgcolor='${Header::colourblue}'>
+                               <b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b>
+                       </td>
+                       <td align='center' bgcolor='${Header::colourfw}'>
+                               <b><font color='#FFFFFF'>IPFire</font></b>
+                       </td>
+                       <td align='center' bgcolor='${Header::colourvpn}'>
+                               <b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b>
+                       </td>
+                       <td align='center' bgcolor='${Header::colourovpn}'>
+                               <b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b>
+                       </td>
+               </tr>
+       </table>
+       <br>
+END
  
+# Print table header.
+print <<END;
+       <table width='100%'>
+               <tr>
+                       <th align='center'>
+                               $Lang::tr{'protocol'}
+                       </th>
+                       <th align='center'>
+                               $Lang::tr{'source ip and port'}
+                       </th>
+                       <th>&nbsp;</th>
+                       <th align='center'>
+                               $Lang::tr{'dest ip and port'}
+                       </th>
+                       <th>&nbsp;</th>
+                       <th align='center'>
+                               $Lang::tr{'download'} /
+                               <br>$Lang::tr{'upload'}
+                       </th>
+                       <th align='center'>
+                               $Lang::tr{'connection'}<br>$Lang::tr{'status'}
+                       </th>
+                       <th align='center'>
+                               $Lang::tr{'expires'}<br>($Lang::tr{'seconds'})
+                       </th>
+               </tr>
  END
-;
-
-my $i=0;
-foreach my $line (@active) {
-    $i++;
-    if ($i < 3) {
-                       next;
-    }
-    chomp($line);
-    my @temp = split(' ',$line);
-
-    my ($sip, $sport) = split(':', $temp[0]);
-    my ($dip, $dport) = split(':', $temp[1]);
-    my $proto = $temp[2];
-    my $state; my $ttl;
-    if ( $proto eq "esp" ){$state = "";$ttl = $temp[3];}
-    elsif ( $proto eq "icmp" ){$state = "";$ttl = $temp[4];}
-    else{$state = $temp[3];$ttl = $temp[4];}
-    
-    next if( !(
-                       (($cgiparams{'SEE_PROTO'}  eq $Lang::tr{'all'}) || ($proto  eq $cgiparams{'SEE_PROTO'} ))
-                && (($cgiparams{'SEE_STATE'}  eq $Lang::tr{'all'}) || ($state  eq $cgiparams{'SEE_STATE'} ))
-               && (($cgiparams{'SEE_SRC'}    eq "*.*.*.*")        || ($sip    eq $cgiparams{'SEE_SRC'}   ))
-               && (($cgiparams{'SEE_DEST'}   eq "*.*.*.*")       || ($dip    eq $cgiparams{'SEE_DEST'}  ))
-              ));
-
-    if (($proto eq 'udp') && ($ttl eq '')) {
-                       $ttl = $state;
-                       $state = '&nbsp;';      
-    }
-
-    my $sipcol = ipcolour($sip);
-    my $dipcol = ipcolour($dip);
-
-    my $sserv = '';
-    if ($sport < 1024) {
-       $sserv = uc(getservbyport($sport, lc($proto)));
-       if ($sserv ne '') {
-           $sserv = "&nbsp;($sserv)";
+
+foreach my $line (@conntrack) {
+       my @conn = split(' ', $line);
+
+       # The first bit is the l3 protocol.
+       my $l3proto = $conn[0];
+
+       # Skip everything that is not IPv4.
+       if ($l3proto ne 'ipv4') {
+               next;
+       }
+
+       # L4 protocol (tcp, udp, ...).
+       my $l4proto = $conn[2];
+
+       # Translate unknown protocols.
+       if ($l4proto eq 'unknown') {
+               my $l4protonum = $conn[3];
+               if ($l4protonum eq '2') {
+                       $l4proto = 'IGMP';
+               } elsif ($l4protonum eq '4') {
+                       $l4proto = 'IPv4 Encap';
+               } elsif ($l4protonum eq '33') {
+                       $l4proto = 'DCCP';
+               } elsif ($l4protonum eq '41') {
+                       $l4proto = 'IPv6 Encap';
+               } elsif ($l4protonum eq '50') {
+                       $l4proto = 'ESP';
+               } elsif ($l4protonum eq '51') {
+                       $l4proto = 'AH';
+               } elsif ($l4protonum eq '132') {
+                       $l4proto = 'SCTP';
+               } else {
+                       $l4proto = $l4protonum;
+               }
+       } else {
+               $l4proto = uc($l4proto);
         }
-    }
  
-    my $dserv = '';
-    if ($dport < 1024) {
-       $dserv = uc(getservbyport($dport, lc($proto)));
-       if ($dserv ne '') {
-           $dserv = "&nbsp;($dserv)";
+       # Source and destination.
+       my $sip;
+       my $dip;
+       my $sport;
+       my $dport;
+       my @packets;
+       my @bytes;
+
+       my $ttl = $conn[4];
+       my $state;
+       if ($l4proto eq 'TCP') {
+               $state = $conn[5];
         }
-    }
-
-    print <<END
-    <tr >
-      <td align='center' bgcolor='$sipcol'>
-        <a href='/cgi-bin/ipinfo.cgi?ip=$sip'>
-          <font color='#FFFFFF'>$sip</font>
-        </a>
-      </td>
-      <td align='center' bgcolor='$sipcol'>
-        <a href='http://isc.sans.org/port_details.php?port=$sport' target='top'>
-          <font color='#FFFFFF'>$sport$sserv</font>
-        </a>
-      </td>
-      <td align='center' bgcolor='$dipcol'>
-        <a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
-          <font color='#FFFFFF'>$dip</font>
-        </a>
-      </td>
-      <td align='center' bgcolor='$dipcol'>
-        <a href='http://isc.sans.org/port_details.php?port=$dport' target='top'>
-          <font color='#FFFFFF'>$dport$dserv</font>
-        </a>
-      </td>
-      <td align='center'>$proto</td>
-      <td align='center'>$state</td>
-      <td align='center'>$ttl</td>
-    </tr>
+
+       # Kick out everything that is not IPv4.
+       foreach my $item (@conn) {
+               my ($key, $val) = split('=', $item);
+
+               switch ($key) {
+                       case "src" {
+                               $sip = $val;
+                       }
+                       case "dst" {
+                               $dip = $val;
+                       }
+                       case "sport" {
+                               $sport = $val;
+                       }
+                       case "dport" {
+                               $dport = $val;
+                       }
+                       case "packets" {
+                               push(@packets, $val);
+                       }
+                       case "bytes" {
+                               push(@bytes, $val);
+                       }
+               }
+       }
+
+       my $sip_colour = ipcolour($sip);
+       my $dip_colour = ipcolour($dip);
+
+       my $sserv = '';
+       if ($sport < 1024) {
+               $sserv = uc(getservbyport($sport, lc($l4proto)));
+               if ($sserv ne '') {
+                       $sserv = "&nbsp;($sserv)";
+               }
+       }
+
+       my $dserv = '';
+       if ($dport < 1024) {
+               $dserv = uc(getservbyport($dport, lc($l4proto)));
+               if ($dserv ne '') {
+                       $dserv = "&nbsp;($dserv)";
+               }
+       }
+
+       my $bytes_in = format_bytes($bytes[0]);
+       my $bytes_out = format_bytes($bytes[1]);
+
+       # Format TTL
+       $ttl = format_time($ttl);
+
+       print <<END;
+       <tr>
+               <td align='center'>$l4proto</td>
+               <td align='center' bgcolor='$sip_colour'>
+                       <a href='/cgi-bin/ipinfo.cgi?ip=$sip'>
+                               <font color='#FFFFFF'>$sip</font>
+                       </a>
+               </td>
+               <td align='center' bgcolor='$sip_colour'>
+                       <a href='http://isc.sans.org/port_details.php?port=$sport' target='top'>
+                               <font color='#FFFFFF'>$sport$sserv</font>
+                       </a>
+               </td>
+               <td align='center' bgcolor='$dip_colour'>
+                       <a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
+                               <font color='#FFFFFF'>$dip</font>
+                       </a>
+               </td>
+               <td align='center' bgcolor='$dip_colour'>
+                       <a href='http://isc.sans.org/port_details.php?port=$dport' target='top'>
+                               <font color='#FFFFFF'>$dport$dserv</font>
+                       </a>
+               </td>
+               <td align='center'>
+                       $bytes_in / $bytes_out
+               </td>
+               <td align='center'>$state</td>
+               <td align='center'>$ttl</td>
+       </tr>
  END
-;
  }
  
-print "</table></form>";
+# Close the main table.
+print "</table>";
  
  &Header::closebox();
  &Header::closebigbox();
  &Header::closepage();
  
-sub ipcolour($) {
-        my $id = 0;
-        my $line;
-        my $colour = ${Header::colourred};
-        my ($ip) = $_[0];
-        my $found = 0;
-        foreach $line (@network) {
-                                       if ($network[$id] eq '') {
-                                               $id++;
-                                       } else {
-                                               if (!$found && ipv4_in_network( $network[$id] , $masklen[$id], $ip) ) {
-                                                       $found = 1;
-                                                       $colour = $colour[$id];
-                                               }
-                                               $id++;
-                                       }
-        }
-        return $colour
-}
+sub format_bytes($) {
+       my $bytes = shift;
+       my @units = ("B", "k", "M", "G", "T");
+
+       foreach my $unit (@units) {
+               if ($bytes < 1024) {
+                       return sprintf("%d%s", $bytes, $unit);
+               }
  
-# Create a string containing a complete SELECT html object 
-# param1: name
-# param2: current value selected
-# param3: field list
-sub make_select ($,$,$) {
-        my $select_name = shift;
-        my $selected    = shift;
-        my $select = "<select name='$select_name'>";
-
-        foreach my $value (@_) {
-                    my $check = $selected eq $value ? "selected='selected'" : '';
-                    $select .= "<option $check value='$value'>$value</option>";
-        }
-        $select .= "</select>";
-        return $select;
+               $bytes /= 1024;
+       }
+
+       return sprintf("%d%s", $bytes, $units[$#units]);
  }
  
-# Build a list of IP obtained from the %entries hash
-# param1: IP field name
-sub get_known_ips ($) {
-        my $field = shift;
-        my $qs = $cgiparams{'SEE_SORT'};       # switch the sort order
-        $cgiparams{'SEE_SORT'} = $field;
+sub format_time($) {
+       my $time = shift;
  
-        my @liste=('*.*.*.*');
-        foreach my $entry ( sort sort_entries keys %entries) {
-                    push (@liste, $entries{$entry}->{$field}) if (! grep (/^$entries{$entry}->{$field}$/,@liste) );
-        }
+       my $seconds = $time % 60;
+       my $minutes = $time / 60;
  
-        $cgiparams{'SEE_SORT'} = $qs;  #restore sort order
-        return @liste;
+       my $hours = 0;
+       if ($minutes >= 60) {
+               $hours = $minutes / 60;
+               $minutes %= 60;
+       }
+
+       return sprintf("%3d:%02d:%02d", $hours, $minutes, $seconds);
  }
  
-# Used to sort the table containing the lines displayed.
-sub sort_entries { #Reverse is not implemented
-        my $qs=$cgiparams{'SEE_SORT'};
-        if ($qs =~ /orgsip|orgdip|exsip|exdip/) {
-                my @a = split(/\./,$entries{$a}->{$qs});
-                my @b = split(/\./,$entries{$b}->{$qs});
-                ($a[0]<=>$b[0]) ||
-                ($a[1]<=>$b[1]) ||
-                ($a[2]<=>$b[2]) ||
-                ($a[3]<=>$b[3]);
-        } elsif ($qs =~ /expire|orgsp|orgdp|exsp|exdp/) {
-                    $entries{$a}->{$qs} <=> $entries{$b}->{$qs};
-        } else {
-                    $entries{$a}->{$qs} cmp $entries{$b}->{$qs};
-        }
+sub ipcolour($) {
+       my $id = 0;
+       my $colour = ${Header::colourred};
+       my ($ip) = $_[0];
+       my $found = 0;
+
+       foreach my $line (@network) {
+               if ($network[$id] eq '') {
+                       $id++;
+               } else {
+                       if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
+                               $found = 1;
+                               $colour = $colour[$id];
+                       }
+                       $id++;
+               }
+       }
+
+       return $colour;
  }
  
  1;
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi

index 7375afdb8471576b0677c86453c1b23e52511b6b..75e59b18d66be403ae59721690a22257c2ad9b2b 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -35,6 +35,24 @@ require "${General::swroot}/header.pl";
  
  &Header::openbigbox('100%', 'center');
  
+&Header::openbox('100%', 'left', $Lang::tr{'donation'});
+
+print <<END
+<p>$Lang::tr{'donation-text'}</p>
+       <div align="center">
+               <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+                       <input type="hidden" name="cmd" value="_s-xclick">
+                       <input type="hidden" name="hosted_button_id" value="10781833">
+                       <input type="image" src=$Lang::tr{'donation-link'} border="0" name="submit" alt="PayPal - The safer, easier way to pay online.">
+                       <img alt="" border="0" src="https://www.paypal.com/de_DE/i/scr/pixel.gif" width="1" height="1">
+               </form>
+       </div>
+<br />
+
+END
+;
+&Header::closebox();
+
  &Header::openbox('100%', 'left', $Lang::tr{'credits'});
  
  print <<END
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi

index b325250a58e9b0d37fe316692028e71856e4050f..04a87cf63087e4f65236099bc9c93fd5b2a82c2e 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -2,7 +2,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@ -20,6 +20,7 @@
  ###############################################################################
  
  use strict;
+use Net::Telnet;
  
  # enable only the following on debugging purpose
  #use warnings;
@@ -355,7 +356,7 @@ END
  END
                 my $id = 0;
                 my $gif;
-               foreach my $key (keys %confighash) {
+               foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
                         if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
  
                         if ($id % 2) {
@@ -387,8 +388,57 @@ END
                 <tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br>
                 <td width='30%' align='center'>$ovpnip
                 <td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
+       
  END
+
+       }
+
+###
+# Print the OpenVPN N2N connection status.
+###
+if ( -d "${General::swroot}/ovpn/n2nconf") {
+       my %confighash=();
+
+       &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
+       foreach my $dkey (keys %confighash) {
+               if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) {
+                       my $tport = $confighash{$dkey}[22];
+                       next if ($tport eq '');
+
+                       my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); 
+                       $tnet->open('127.0.0.1');
+                       my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
+                       my @tustate = split(/\,/, $output[1]);
+
+                       my $display;
+                       my $display_colour = $Header::colourred;
+                       if ( $tustate[1] eq 'CONNECTED') {
+                               $display_colour = $Header::colourgreen;
+                               $display = $Lang::tr{'capsopen'};
+                       } else {
+                               $display = $tustate[1];
+                       }
+ 
+                       print <<END;
+                       <tr>
+                               <td align='left' nowrap='nowrap' bgcolor='$color{'color22'}'>
+                                       $confighash{$dkey}[1]
+                               </td>
+                               <td align='center'>
+                                       $confighash{$dkey}[11]
+                               </td>
+                               <td align='center' bgcolor='$display_colour'>
+                                       <b>
+                                               <font color='#FFFFFF'>
+                                                       $display
+                                               </font>
+                                       </b>
+                               </td>
+                       </tr>
+END
+               }
         }
+}
  
  # Fireinfo
  if ( ! -e "/var/ipfire/main/send_profile") {
@@ -443,6 +493,14 @@ foreach my $file (@files) {
         }
  }
  
+# Reiser4 warning
+my @files = `mount | grep " reiser4 (" 2>/dev/null`;
+foreach my $disk (@files) {
+       chomp ($disk);
+       $warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n";
+}
+
+
  if ($warnmessage) {
         print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
  }
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi

index b6c5fc0ade3c326f8e45c110a02edcb8004d7595..f91adf1f4a48a9702844d93befb0201944e1e96b 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -18,11 +18,14 @@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
  #                                                                             #
  ###############################################################################
-
+###
+# Based on IPFireCore 55
+###
  use CGI;
  use CGI qw/:standard/;
  use Net::DNS;
  use Net::Ping;
+use Net::Telnet;
  use File::Copy;
  use File::Temp qw/ tempfile tempdir /;
  use strict;
@@ -33,8 +36,8 @@ require "${General::swroot}/header.pl";
  require "${General::swroot}/countries.pl";
  
  # enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
+use warnings;
+use CGI::Carp 'fatalsToBrowser';
  #workaround to suppress a warning when a variable is used only once
  my @dummy = ( ${Header::colourgreen} );
  undef (@dummy);
@@ -57,6 +60,7 @@ my %selected=();
  my $warnmessage = '';
  my $errormessage = '';
  my %settings=();
+my $routes_push_file = '';
  &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
  $cgiparams{'ENABLED'} = 'off';
  $cgiparams{'ENABLED_BLUE'} = 'off';
@@ -70,9 +74,11 @@ $cgiparams{'CA_NAME'} = '';
  $cgiparams{'DHCP_DOMAIN'} = '';
  $cgiparams{'DHCP_DNS'} = '';
  $cgiparams{'DHCP_WINS'} = '';
+$cgiparams{'ROUTES_PUSH'} = '';
  $cgiparams{'DCOMPLZO'} = 'off';
  $cgiparams{'MSSFIX'} = '';
-
+$routes_push_file = "${General::swroot}/ovpn/routes_push";
+unless (-e $routes_push_file)    { system("touch $routes_push_file"); }
  
  &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
  
@@ -307,10 +313,13 @@ sub disallowreserved
         return;
  }
  
+
  sub writeserverconf {
-    my %sovpnsettings = ();    
+    my %sovpnsettings = ();  
+    my @temp = ();  
      &General::readhash("${General::swroot}/ovpn/settings", \%sovpnsettings);
-
+    &read_routepushfile;
+    
      open(CONF,    ">${General::swroot}/ovpn/server.conf") or die "Unable to open ${General::swroot}/ovpn/server.conf: $!";
      flock CONF, 2;
      print CONF "#OpenVPN Server conf\n";
@@ -325,6 +334,7 @@ sub writeserverconf {
      print CONF "port $sovpnsettings{'DDEST_PORT'}\n";
      print CONF "script-security 3 system\n";
      print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n";
+    print CONF "client-config-dir /var/ipfire/ovpn/ccd\n";
      print CONF "tls-server\n";
      print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n";
      print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n";
@@ -333,14 +343,27 @@ sub writeserverconf {
      my @tempovpnsubnet = split("\/",$sovpnsettings{'DOVPN_SUBNET'});
      print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n";
      print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n";
+    
+    if ($vpnsettings{'ROUTES_PUSH'} ne '') {
+       @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'});
+       foreach (@temp)
+       {
+               @tempovpnsubnet = split("\/",&General::ipcidr2msk($_));
+               print CONF "push \"route " . $tempovpnsubnet[0]. " " .  $tempovpnsubnet[1] . "\"\n";
+       }
+    }
+
      if ($sovpnsettings{CLIENT2CLIENT} eq 'on') {
         print CONF "client-to-client\n";
      }
-    if ($sovpnsettings{MSSFIX} eq 'on') {
-       print CONF "mssfix\n";
-    }
-    if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
-       print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
+    if ($sovpnsettings{'DPROTOCOL'} eq 'udp') {
+        if ($sovpnsettings{MSSFIX} eq 'on') {
+           print CONF "mssfix\n";
+        }
+        if ($sovpnsettings{'FRAGMENT'} eq '' || $sovpnsettings{'FRAGMENT'} eq 0) {
+               $sovpnsettings{'FRAGMENT'} = '1300';
+        }
+        print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
      }
      if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {  
         print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n";
@@ -410,7 +433,29 @@ sub validdotmask
         if (($mask =~ /\./ )) { return 0; }     
    return 1;
  }
- 
+
+# -------------------------------------------------------------------
+
+sub write_routepushfile
+{
+       open(FILE, ">$routes_push_file");
+       flock(FILE, 2);
+       if ($vpnsettings{'ROUTES_PUSH'} ne '') {
+               print FILE $vpnsettings{'ROUTES_PUSH'};
+       }
+       close(FILE); 
+}
+
+sub read_routepushfile
+{
+       if (-e "$routes_push_file") {
+               open(FILE,"$routes_push_file");
+               delete $vpnsettings{'ROUTES_PUSH'};
+               while (<FILE>) { $vpnsettings{'ROUTES_PUSH'} .= $_ };
+               close(FILE);
+               $cgiparams{'ROUTES_PUSH'} = $vpnsettings{'ROUTES_PUSH'};
+       }
+}
  
  
  #hier die refresh page
@@ -473,6 +518,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
      $vpnsettings{'DHCP_DOMAIN'} = $cgiparams{'DHCP_DOMAIN'};
      $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'};
      $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'};
+    $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'};
+    my @temp=();
      
      if ($cgiparams{'FRAGMENT'} eq '') {
         delete $vpnsettings{'FRAGMENT'};
@@ -485,7 +532,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
         }
      }
      if ($cgiparams{'MSSFIX'} ne 'on') {
-       delete $vpnsettings{'MSSFIX'};
+       $vpnsettings{'MSSFIX'} = 'off';
      } else {
         $vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'};
      }
@@ -504,8 +551,35 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
      if ($cgiparams{'DHCP_WINS'} ne ''){
         unless (&General::validfqdn($cgiparams{'DHCP_WINS'}) || &General::validip($cgiparams{'DHCP_WINS'})) {
                 $errormessage = $Lang::tr{'invalid input for dhcp wins'};
-       goto ADV_ERROR;
+               goto ADV_ERROR;
+       }
+    }
+    if ($cgiparams{'ROUTES_PUSH'} ne ''){
+       @temp = split(/\n/,$cgiparams{'ROUTES_PUSH'});
+       undef $vpnsettings{'ROUTES_PUSH'};
+       foreach (@temp)
+       {
+               s/^\s+//g; s/\s+$//g;
+               if ($_)
+               {
+                       unless (&General::validipandmask($_)) {
+                               $errormessage = $Lang::tr{'ovpn errmsg invalid ip or mask'};
+                       goto ADV_ERROR;
+                       }
+                       my ($ip, $cidr) = split("\/",&General::ipcidr2msk($_));
+                       if ($ip eq $netsettings{'GREEN_NETADDRESS'} && $cidr eq $netsettings{'GREEN_NETMASK'}) {
+                               $errormessage = $Lang::tr{'ovpn errmsg green already pushed'};
+  goto ADV_ERROR;
+                       }
+                       $vpnsettings{'ROUTES_PUSH'} .= $_."\n";
+               }
         }
+       &write_routepushfile;
+       undef $vpnsettings{'ROUTES_PUSH'};
+    }
+       else {
+       undef $vpnsettings{'ROUTES_PUSH'};
+       &write_routepushfile;
      }
      if ((length($cgiparams{'MAX_CLIENTS'}) == 0) || (($cgiparams{'MAX_CLIENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 255 )) {
          $errormessage = $Lang::tr{'invalid input for max clients'};
@@ -541,7 +615,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' &&
  
  my @remsubnet = split(/\//,$cgiparams{'REMOTE_SUBNET'});
  my @ovsubnettemp =  split(/\./,$cgiparams{'OVPN_SUBNET'});
-my $ovsubnet =  "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]";
+my $ovsubnet =  "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]";
  my $tunmtu =  '';
  
  unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";}
@@ -564,7 +638,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
    print SERVERCONF "# IP adresses of the VPN Subnet\n"; 
    print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; 
    print SERVERCONF "# Client Gateway Network\n"; 
-  print SERVERCONF "route @remsubnet[0] @remsubnet[1]\n";
+  print SERVERCONF "route $remsubnet[0] $remsubnet[1]\n";
    print SERVERCONF "# tun Device\n"; 
    print SERVERCONF "dev tun\n"; 
    print SERVERCONF "# Port and Protokol\n"; 
@@ -582,10 +656,9 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
    print SERVERCONF "# Paketsize\n";
    if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}};
    print SERVERCONF "tun-mtu $tunmtu\n";
-  if ($cgiparams{'FRAGMENT'} ne '')  {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";}
-  if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n";}
+  if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} 
+  if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; }; 
    }
-   
    print SERVERCONF "# Auth. Server\n"; 
    print SERVERCONF "tls-server\n"; 
    print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; 
@@ -606,7 +679,8 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
    print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; 
    print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; 
    print SERVERCONF "# Activate Management Interface and Port\n"; 
-  print SERVERCONF "#management localhost 4711\n";
+  if ($cgiparams{'OVPN_MGMT'} eq '') {print SERVERCONF "management localhost $cgiparams{'DEST_PORT'}\n"}
+  else {print SERVERCONF "management localhost $cgiparams{'OVPN_MGMT'}\n"};
    close(SERVERCONF);
  
  }
@@ -618,10 +692,10 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
  if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'client')
  {
          my @ovsubnettemp =  split(/\./,$cgiparams{'OVPN_SUBNET'});
-        my $ovsubnet =  "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]";
+        my $ovsubnet =  "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]";
          my @remsubnet =  split(/\//,$cgiparams{'REMOTE_SUBNET'});
          my $tunmtu =  '';
-           
+                   
  unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";}
  unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770 or die "Unable to create dir $!";}
    
@@ -642,7 +716,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
    print CLIENTCONF "# IP adresses of the VPN Subnet\n"; 
    print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; 
    print CLIENTCONF "# Server Gateway Network\n"; 
-  print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; 
+  print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; 
    print CLIENTCONF "# tun Device\n"; 
    print CLIENTCONF "dev tun\n"; 
    print CLIENTCONF "# Port and Protokol\n"; 
@@ -653,7 +727,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
    print CLIENTCONF "# Packet size\n";
    if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}};
    print CLIENTCONF "tun-mtu $tunmtu\n";
-  print CLIENTCONF "ns-cert-type server\n";
    }
    
    if ($cgiparams{'PROTOCOL'} eq 'udp') {
@@ -661,10 +734,11 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
    print CLIENTCONF "# Paketsize\n";
    if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}};
    print CLIENTCONF "tun-mtu $tunmtu\n";
-  if ($cgiparams{'FRAGMENT'} ne '')  {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";}
-  if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n";}
+  if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";}
+  if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; }; 
    }
-     
+ 
+  print CLIENTCONF "ns-cert-type server\n";   
    print CLIENTCONF "# Auth. Client\n"; 
    print CLIENTCONF "tls-client\n"; 
    print CLIENTCONF "# Cipher\n"; 
@@ -682,7 +756,8 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
    print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n";
    print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; 
    print CLIENTCONF "# Activate Management Interface and Port\n"; 
-  print CLIENTCONF "# management localhost 4711\n";
+  if ($cgiparams{'OVPN_MGMT'} eq '') {print CLIENTCONF "management localhost $cgiparams{'DEST_PORT'}\n"}
+  else {print CLIENTCONF "management localhost $cgiparams{'OVPN_MGMT'}\n"};
    close(CLIENTCONF);
  
  }
@@ -1549,9 +1624,10 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){
          my $zippathname = "$zippath$zipname";
          $clientovpn = "$confighash{$cgiparams{'KEY'}}[1].conf";  
          my @ovsubnettemp =  split(/\./,$confighash{$cgiparams{'KEY'}}[27]);
-        my $ovsubnet =  "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]";
+        my $ovsubnet =  "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]";
          my $tunmtu = ''; 
          my @remsubnet = split(/\//,$confighash{$cgiparams{'KEY'}}[8]);
+        my $n2nfragment = '';
          
      open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!";
      flock CLIENTCONF, 2;
@@ -1582,7 +1658,6 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){
     print CLIENTCONF "# Packet size\n";
     if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]};
     print CLIENTCONF "tun-mtu $tunmtu\n";
-   print CLIENTCONF "ns-cert-type server\n";
     }
    
     if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') {
@@ -1590,10 +1665,10 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){
     print CLIENTCONF "# Paketsize\n";
     if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1500'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]};
     print CLIENTCONF "tun-mtu $tunmtu\n";
-   if ($cgiparams{'FRAGMENT'} ne '')  {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";}
+   if ($confighash{$cgiparams{'KEY'}}[24] ne '') {print CLIENTCONF "fragment $confighash{$cgiparams{'KEY'}}[24]\n";}
     if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF "mssfix\n";}
     }
-      
+   print CLIENTCONF "ns-cert-type server\n";   
     print CLIENTCONF "# Auth. Client\n"; 
     print CLIENTCONF "tls-client\n"; 
     print CLIENTCONF "# Cipher\n"; 
@@ -1614,7 +1689,8 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){
     print CLIENTCONF "daemon $confighash{$cgiparams{'KEY'}}[1]n2n\n"; 
     print CLIENTCONF "writepid /var/run/$confighash{$cgiparams{'KEY'}}[1]n2n.pid\n"; 
     print CLIENTCONF "# Activate Management Interface and Port\n"; 
-   print CLIENTCONF "# management localhost 4711\n";
+   if ($confighash{$cgiparams{'KEY'}}[22] eq '') {print CLIENTCONF "management localhost $confighash{$cgiparams{'KEY'}}[29]\n"}
+    else {print CLIENTCONF "management localhost $confighash{$cgiparams{'KEY'}}[22]\n"};
     print CLIENTCONF "# remsub $confighash{$cgiparams{'KEY'}}[11]\n";
    
  
@@ -1812,6 +1888,7 @@ else
      %cahash = ();
      %confighash = ();
      &General::readhash("${General::swroot}/ovpn/settings", \%cgiparams);
+    read_routepushfile;
  
  #    if ($cgiparams{'CLIENT2CLIENT'} eq '') {
  #      $cgiparams{'CLIENT2CLIENT'} =  'on';     
@@ -1820,7 +1897,6 @@ ADV_ERROR:
      if ($cgiparams{'MAX_CLIENTS'} eq '') {
         $cgiparams{'MAX_CLIENTS'} =  '100';     
      }
-    
      if ($cgiparams{'KEEPALIVE_1'} eq '') {
         $cgiparams{'KEEPALIVE_1'} =  '10';     
      }
@@ -1828,7 +1904,13 @@ ADV_ERROR:
         $cgiparams{'KEEPALIVE_2'} =  '60';     
      }
      if ($cgiparams{'LOG_VERB'} eq '') {
-       $cgiparams{'LOG_VERB'} =  '3';     
+       $cgiparams{'LOG_VERB'} =  '3';
+    }
+    if ($cgiparams{'MSSFIX'} eq '') {
+        $cgiparams{'MSSFIX'} = 'on';
+    }
+    if ($cgiparams{'FRAGMENT'} eq '') {
+        $cgiparams{'FRAGMENT'} = '1300';
      }
      $checked{'CLIENT2CLIENT'}{'off'} = '';
      $checked{'CLIENT2CLIENT'}{'on'} = '';
@@ -1886,6 +1968,25 @@ ADV_ERROR:
      <tr>       
         <td class='base'>WINS</td>
         <td><input type='TEXT' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}' size='30' /></td>
+       </tr>
+    <tr>
+       <td colspan='4'><b>$Lang::tr{'ovpn routes push options'}</b></td>
+    </tr>
+    <tr>       
+       <td class='base'>$Lang::tr{'ovpn routes push'}</td>
+  <td colspan='2'>
+       <textarea name='ROUTES_PUSH' cols='26' rows='6' wrap='off'>
+END
+;
+
+if ($cgiparams{'ROUTES_PUSH'} ne '')
+{
+       print $cgiparams{'ROUTES_PUSH'};
+}
+
+print <<END
+</textarea></td>
+</tr>
      </tr>
  </table>
  <hr size='1'>
@@ -2200,7 +2301,12 @@ if ( -s "${General::swroot}/ovpn/settings") {
                 <tr><td><input type='radio' name='TYPE' value='net2net' /></td>         
                 <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr>
           <tr><td>&nbsp;</td><td class='base'><input type='file' name='FH' size='30'></td></tr>
-         <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr>
+         <tr><td>&nbsp;</td><td>Import Connection Name <img src='/blob.gif' /></td></tr>
+    <tr><td>&nbsp;</td><td class='base'><input type='text' name='n2nname' size='30'><td class='base'>Default : Client Packagename</td></td></tr>
+         <tr><td colspan='3'><hr /></td></tr>
+    <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr>
+         <tr><td>&nbsp;</td></tr>
+         <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td></tr>
             </form></table>
  END
         ;
@@ -2231,11 +2337,14 @@ END
         my @firen2nconf;
         my @confdetails;
         my $uplconffilename ='';
+       my $uplconffilename2 ='';
         my $uplp12name = '';
+       my $uplp12name2 = '';
         my @rem_subnet;
         my @rem_subnet2;
         my @tmposupnet3;        
         my $key;
+       my @n2nname;
  
         &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);    
  
@@ -2299,14 +2408,38 @@ END
  ###
  # m.a.d net2net
  ###
+  
+ if ($cgiparams{'n2nname'} ne ''){
+
+  $uplconffilename2 = "$cgiparams{'n2nname'}.conf"; 
+  $uplp12name2 = "$cgiparams{'n2nname'}.p12"; 
+  $n2nname[0] = $cgiparams{'n2nname'};
+  my @n2nname2 = split(/\./,$uplconffilename);
+  $n2nname2[0] =~ s/\n|\r//g;
+  my $input1 = "${General::swroot}/ovpn/certs/$uplp12name";
+       my $output1 = "${General::swroot}/ovpn/certs/$uplp12name2";
+       my $input2 = "$n2nname2[0]n2n";
+  my $output2 = "$n2nname[0]n2n";
+  my $filename = "$tempdir/$uplconffilename";
+  open(FILE, "< $filename") or die 'Unable to open config file.';
+       my @current = <FILE>;
+       close(FILE);
+       foreach (@current) {s/$input1/$output1/g;}
+       foreach (@current) {s/$input2/$output2/g;}
+  open (OUT, "> $filename") || die 'Unable to open config file.';
+  print OUT @current;
+  close OUT;
  
- my @n2nname = split(/\./,$uplconffilename);
+    }else{
+    $uplconffilename2 =  $uplconffilename;
+    $uplp12name2 = $uplp12name;
+    @n2nname = split(/\./,$uplconffilename);
      $n2nname[0] =~ s/\n|\r//g;
-
+   } 
      unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";}
      unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";}   
  
-       move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename");
+       move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename2");
  
         if ($? ne 0) {
             $errormessage = "*.conf move failed: $!";
@@ -2314,7 +2447,7 @@ END
             goto N2N_ERROR;
         }
         
-       move("$tempdir/$uplp12name", "${General::swroot}/ovpn/certs/$uplp12name");
+       move("$tempdir/$uplp12name", "${General::swroot}/ovpn/certs/$uplp12name2");
         chmod 0600, "${General::swroot}/ovpn/certs/$uplp12name";
         
         if ($? ne 0) {
@@ -2327,18 +2460,20 @@ my $complzoactive;
  my $mssfixactive;
  my $n2nfragment;
  my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]);
-my @n2nproto = split(/-/, @n2nproto2[1]);
+my @n2nproto = split(/-/, $n2nproto2[1]);
  my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]);
  my @n2ntunmtu = split(/ /, (grep { /^tun-mtu/ } @firen2nconf)[0]);
  my @n2ncomplzo = grep { /^comp-lzo/ } @firen2nconf;
  if ($n2ncomplzo[0] =~ /comp-lzo/){$complzoactive = "on";} else {$complzoactive = "off";}       
  my @n2nmssfix  = grep { /^mssfix/ } @firen2nconf;
  if ($n2nmssfix[0] =~ /mssfix/){$mssfixactive = "on";} else {$mssfixactive = "off";}
+#my @n2nmssfix = split(/ /, (grep { /^mssfix/ } @firen2nconf)[0]);
  my @n2nfragment = split(/ /, (grep { /^fragment/ } @firen2nconf)[0]);
  my @n2nremote = split(/ /, (grep { /^remote/ } @firen2nconf)[0]);
  my @n2novpnsuball = split(/ /, (grep { /^ifconfig/ } @firen2nconf)[0]);
  my @n2novpnsub =  split(/\./,$n2novpnsuball[1]);
  my @n2nremsub = split(/ /, (grep { /^route/ } @firen2nconf)[0]);
+my @n2nmgmt =  split(/ /, (grep { /^management/ } @firen2nconf)[0]);
  my @n2nlocalsub  = split(/ /, (grep { /^# remsub/ } @firen2nconf)[0]);
  
  
@@ -2357,6 +2492,7 @@ $n2nremsub[1] =~ s/\n|\r//g;
  $n2nremsub[2] =~ s/\n|\r//g;
  $n2nlocalsub[2] =~ s/\n|\r//g;
  $n2nfragment[1] =~ s/\n|\r//g;
+$n2nmgmt[2] =~ s/\n|\r//g;
  chomp ($complzoactive);
  chomp ($mssfixactive);
  
@@ -2420,7 +2556,8 @@ foreach my $dkey (keys %confighash) {
         $confighash{$key}[8] =  $n2nlocalsub[2];
    $confighash{$key}[10] = $n2nremote[1];
    $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]";               
-       $confighash{$key}[23] = $mssfixactive;
+       $confighash{$key}[22] = $n2nmgmt[2];
+  $confighash{$key}[23] = $mssfixactive;
         $confighash{$key}[24] = $n2nfragment[1];
    $confighash{$key}[25] = 'IPFire n2n Client';
         $confighash{$key}[26] = 'red';
@@ -2466,6 +2603,7 @@ foreach my $dkey (keys %confighash) {
                 <tr><td class='boldbase' nowrap='nowrap'>MSSFIX </td><td><b>$confighash{$key}[23]</b></td></tr>
                 <tr><td class='boldbase' nowrap='nowrap'>Fragment </td><td><b>$confighash{$key}[24]</b></td></tr>
                 <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}</td><td><b>$confighash{$key}[31]</b></td></tr>
+               <tr><td class='boldbase' nowrap='nowrap'>Management Port </td><td><b>$confighash{$key}[22]</b></td></tr>
                 <tr><td>&nbsp;</td><td>&nbsp;</td></tr> 
      </table>
  END
@@ -2546,6 +2684,7 @@ if ($confighash{$cgiparams{'KEY'}}) {
    $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10];
    $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11];
  # n2n m.a.d new fields
+  $cgiparams{'OVPN_MGMT'} = $confighash{$cgiparams{'KEY'}}[22];
    $cgiparams{'MSSFIX'} = $confighash{$cgiparams{'KEY'}}[23];
    $cgiparams{'FRAGMENT'} = $confighash{$cgiparams{'KEY'}}[24];
         $cgiparams{'REMARK'}    = $confighash{$cgiparams{'KEY'}}[25];
@@ -2612,6 +2751,13 @@ if ($cgiparams{'TYPE'} eq 'net') {
             rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
        goto VPNCONF_ERROR;                      
                 }
+    
+    if ($cgiparams{'DEST_PORT'} eq  '') {
+                       $errormessage = $Lang::tr{'openvpn destination port used'};
+                       unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
+           rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
+      goto VPNCONF_ERROR;                      
+               }
  
      if ($cgiparams{'OVPN_SUBNET'} eq  $vpnsettings{'DOVPN_SUBNET'}) {
                         $errormessage = $Lang::tr{'openvpn subnet is used'};
@@ -2654,6 +2800,11 @@ if ($cgiparams{'TYPE'} eq 'net') {
             rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
                   goto VPNCONF_ERROR;
                 } 
+
+    if ($cgiparams{'OVPN_MGMT'} eq  '') {
+                       $cgiparams{'OVPN_MGMT'} = $cgiparams{'DEST_PORT'};              
+               }
+   
  }
  
  #      if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) {
@@ -2768,7 +2919,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
  
             # Sign the certificate request and move it
             # Sign the host certificate request
-           system('/usr/bin/openssl', 'ca', '-days', '999999',
+           system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}",
                 '-batch', '-notext',
                 '-in', $filename,
                 '-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem",
@@ -2947,7 +3098,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
             }
         
             # Sign the host certificate request
-           system('/usr/bin/openssl', 'ca', '-days', '999999',
+           system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}",
                 '-batch', '-notext',
                 '-in',  "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}req.pem",
                 '-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem",
@@ -3023,6 +3174,11 @@ if ($cgiparams{'TYPE'} eq 'net') {
         }
         $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'};
         $confighash{$key}[10] = $cgiparams{'REMOTE'};
+  if ($cgiparams{'OVPN_MGMT'} eq '') {
+  $confighash{$key}[22] = $confighash{$key}[29];
+  } else {
+  $confighash{$key}[22] = $cgiparams{'OVPN_MGMT'};
+  }
    $confighash{$key}[23] = $cgiparams{'MSSFIX'};
    $confighash{$key}[24] = $cgiparams{'FRAGMENT'};
         $confighash{$key}[25] = $cgiparams{'REMARK'};
@@ -3069,6 +3225,14 @@ if ($cgiparams{'TYPE'} eq 'net') {
         goto VPNCONF_END;
      } else {
          $cgiparams{'ENABLED'} = 'on';
+###
+# m.a.d n2n begin
+###    
+        $cgiparams{'MSSFIX'} = 'on';
+        $cgiparams{'FRAGMENT'} = '1300';
+###
+# m.a.d n2n end
+###    
         $cgiparams{'SIDE'} = 'left';
         if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) {
             $cgiparams{'AUTH'} = 'psk';
@@ -3204,13 +3368,19 @@ if ($cgiparams{'TYPE'} eq 'net') {
                     
                       <tr><td class='boldbase' nowrap='nowrap'>mssfix &nbsp;<img src='/blob.gif' /></td>
                     <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td>
-                   
-                     <tr><td class='boldbase' nowrap='nowrap'>fragment &nbsp;<img src='/blob.gif' /></td>
+        <td>$Lang::tr{'openvpn default'}: <span class="base">on</span></td>
+        
+          <tr><td class='boldbase' nowrap='nowrap'>fragment &nbsp;<img src='/blob.gif' /></td>
                     <td><input type='TEXT' name='FRAGMENT' VALUE='$cgiparams{'FRAGMENT'}'size='5' /></td>
                     <td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td>
                     
                 <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;<img src='/blob.gif' /></td>
-                   <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></TD>
+                   <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></td>
+        <td colspan='2'>$Lang::tr{'openvpn default'}: udp/tcp <span class="base">1500/1400</span></td>
+        
+        <tr><td class='boldbase' nowrap='nowrap'>Management Port&nbsp;<img src='/blob.gif' /></td>
+                   <td> <input type='TEXT' name='OVPN_MGMT' VALUE='$cgiparams{'OVPN_MGMT'}'size='5' /></td>
+        <td colspan='2'>$Lang::tr{'openvpn default'}: <span class="base">$Lang::tr{'destination port'}</span></td>
  
  END
             ;
@@ -3260,10 +3430,12 @@ END
  
  print <<END
             <table width='100%' cellpadding='0' cellspacing='5' border='0'>
-           <tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' border='0' /></td></tr>
+           
             <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td><td class='base'>$Lang::tr{'upload a certificate request'}</td><td class='base' rowspan='2'><input type='file' name='FH' size='30' $cacrtdisabled></td></tr>
             <tr><td><input type='radio' name='AUTH' value='certfile' $checked{'AUTH'}{'certfile'} $cacrtdisabled /></td><td class='base'>$Lang::tr{'upload a certificate'}</td></tr>
-           <tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' BORDER='0' /></td></tr>
+           <tr><td colspan='3'>&nbsp;</td></tr>
+      <tr><td colspan='3'><hr /></td></tr>
+      <tr><td colspan='3'>&nbsp;</td></tr>
             <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td><td class='base'>$Lang::tr{'generate a certificate'}</td><td>&nbsp;</td></tr>
             <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'users fullname or system hostname'}:</td><td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled /></td></tr>
             <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'users email'}:&nbsp;<img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled /></td></tr>
@@ -3292,7 +3464,8 @@ print <<END
             <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'city'}:&nbsp;<img src='/blob.gif'></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_CITY' value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled /></td></tr>
             <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'state or province'}:&nbsp;<img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled /></td></tr>
             <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'country'}:</td><td class='base'><select name='CERT_COUNTRY' $cakeydisabled>
-
+          
+      
  END
  ;
  
@@ -3317,13 +3490,16 @@ if ($cgiparams{'TYPE'} eq 'host') {
             print <<END
             </select></td></tr>
  
-       <td class='base'>$Lang::tr{'valid till'} (days):</td>
+       <td>&nbsp;</td><td class='base'>$Lang::tr{'valid till'} (days):</td>
         <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr>
     <tr><td>&nbsp;</td>
                 <td class='base'>$Lang::tr{'pkcs12 file password'}:</td>
                 <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr>
             <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td>
                 <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr>
+     <tr><td colspan='3'>&nbsp;</td></tr>
+     <tr><td colspan='3'><hr /></td></tr>
+     <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td></tr>
       </table>
  END
  }else{
@@ -3331,6 +3507,8 @@ END
             </select></td></tr>
     <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
          <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+        <tr><td colspan='3'><hr /></td></tr>
+        <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td></tr>
         </table>
   
  END
@@ -3683,6 +3861,7 @@ END
  
  ###
  # m.a.d net2net
+#<td width='25%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b><br /><img src='/images/null.gif' width='125' height='1' border='0' alt='L2089' /></td>
  ###
  
      &Header::openbox('100%', 'LEFT', $Lang::tr{'Client status and controlc' });
@@ -3694,8 +3873,8 @@ END
      <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></td>
      <td width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></td>
      <td width='18%' class='boldbase' align='center'><b>$Lang::tr{'common name'}</b></td>
-    <td width='17%' class='boldbase' align='center'><b>$Lang::tr{'valid till'}</b></td>
-    <td width='25%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b><br /><img src='/images/null.gif' width='125' height='1' border='0' alt='L2089' /></td>
+    <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'valid till'}</b></td>
+    <td width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td>
      <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></td>
      <td width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></td>
  </tr>
@@ -3703,7 +3882,7 @@ END
         ;
          my $id = 0;
          my $gif;
-        foreach my $key (keys %confighash) {
+        foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
         if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
  
         if ($id % 2) {
@@ -3727,7 +3906,7 @@ END
         my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
  
         if ($confighash{$key}[0] eq 'off') {
-           $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn disabled'}</font></b></td></tr></table>";
+        $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
         } else {
  
  ###
@@ -3735,24 +3914,36 @@ END
  ###       
         
         if ($confighash{$key}[3] eq 'net') {
-#        my @tempovpnsubnet = split("\/",$confighash{$key}[27]);
-#                       my @ovpnip = split /\./,$tempovpnsubnet[0];
-#                         my $pingip = "";
-#               if ($confighash{$key}[6] eq 'server') {
-#                               $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].2";
-#                               } else {
-#                               $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].1";
-#                               }
-#        my $p = Net::Ping->new("udp",1);
-#        if ($p->ping($pingip)) {
-#                         $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
-#                         }    
-#                         $p->close(); 
-
-       if (-e "/var/run/$confighash{$key}[1]n2n.pid") {
-       $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn enabled'}</font></b></td></tr></table>";
-       } 
-    }  
+
+        if (-e "/var/run/$confighash{$key}[1]n2n.pid") {
+          my @output = "";
+          my @tustate = "";
+          my $tport = $confighash{$key}[22];
+          my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); 
+          if ($tport ne '') {
+          $tnet->open('127.0.0.1');
+          @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
+          @tustate = split(/\,/, $output[1]);
+###
+#CONNECTING    -- OpenVPN's initial state.
+#WAIT          -- (Client only) Waiting for initial response from server.
+#AUTH          -- (Client only) Authenticating with server.
+#GET_CONFIG    -- (Client only) Downloading configuration options from server.
+#ASSIGN_IP     -- Assigning IP address to virtual network interface.
+#ADD_ROUTES    -- Adding routes to system.
+#CONNECTED     -- Initialization Sequence Completed.
+#RECONNECTING  -- A restart has occurred.
+#EXITING       -- A graceful exit is in progress.
+####
+
+        if ( $tustate[1] eq 'CONNECTED') {
+          $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></tr></td></table>";
+                          } else {
+          $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$tustate[1]</font></b></td></tr></table>";                          
+           }
+           } 
+           }
+        }      else {
  
                 my $cn;
             my @match = ();     
@@ -3767,7 +3958,7 @@ END
                     if ($cn eq "$confighash{$key}[2]") {
                         $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
                     }
-
+   }
        
         }
  }
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi

index 6d0fe545e3b4798f67c1bc86dea613253160354e..015502a4e5fda106006447a12eb60591479487da 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -2,7 +2,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@ -55,10 +55,10 @@ my %mainsettings=();
  my %checked=();
  my %selected=();
  
-my @throttle_limits=(64,128,256,384,512,1024,2048,3072,5120);
-my $throttle_binary="bin|cab|exe|gz|rar|sea|tar|tgz|zip";
-my $throttle_dskimg="b5t|bin|bwt|ccd|cdi|cue|gho|img|iso|mds|nrg|pqi";
-my $throttle_mmedia="aiff?|asf|avi|divx|mov|mp3|mpe?g|qt|ra?m";
+my @throttle_limits=(64,128,256,384,512,768,1024,1280,1536,1792,2048,2560,3072,3584,4096,5120,6144,7168,8192,10240,12288,16384,20480);
+my $throttle_binary="7z|arj|bin|bz2|cab|exe|gz|lzh|rar|sea|tar|tgz|xz|zip";
+my $throttle_dskimg="b5t|bin|bwt|ccd|cdi|cue|gho|img|iso|mds|nrg|pqi|vmdk";
+my $throttle_mmedia="aiff?|asf|avi|divx|mov|mp3|mpe?g|ogg|qt|ra?m|ts|vob";
  
  my $def_ports_safe="80 # http\n21 # ftp\n443 # https\n563 # snews\n70 # gopher\n210 # wais\n1025-65535 # unregistered ports\n280 # http-mgmt\n488 # gss-http\n591 # filemaker\n777 # multiling http\n800 # Squids port (for icons)\n";
  my $def_ports_ssl="443 # https\n563 # snews\n";
@@ -353,6 +353,13 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                 $errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
                 goto ERROR;
         }
+       if (!($proxysettings{'UPSTREAM_PROXY'} eq '')) {
+         my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
+         if (!(&General::validip($temp[0]))) {
+           $errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
+           goto ERROR;
+          }
+        }
         if (!($proxysettings{'CACHE_SIZE'} =~ /^\d+/) ||
                 ($proxysettings{'CACHE_SIZE'} < 10))
         {
@@ -984,7 +991,7 @@ print <<END
  <tr><td class='base' >$Lang::tr{'processes'}<input type='text' name='CHILDREN' value='$proxysettings{'CHILDREN'}' size='5' /></td>
  END
  ;
-my $count = `arp -a | wc -l`;
+my $count = `ip n| wc -l`;
  if ( $count < 1 ){$count = 1;}
  if ( -e "/usr/bin/squidclamav" ) {
         print "<td class='base'><b>".$Lang::tr{'advproxy squidclamav'}."</b><br />";
@@ -3013,7 +3020,7 @@ sub writeconfig
         }
  
         $_ = $proxysettings{'UPSTREAM_PROXY'};
-       my ($remotehost, $remoteport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+        my ($remotehost, $remoteport) = split(/:/,$_);
  
         if ($remoteport eq '') { $remoteport = 80; }
  
@@ -3923,6 +3930,11 @@ END
                 print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
                 print FILE "url_rewrite_children $proxysettings{'CHILDREN'}\n\n";
         }
+
+       # Include file with user defined settings.
+       if (-e "/etc/squid/squid.conf.local") {
+               print FILE "include /etc/squid/squid.conf.local\n";
+       }
         close FILE;
  }
  
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi

index 55740cf26dbd56b3bb20234329e6206465cdd473..123c3258792ddab8da3350c2c9600dca3132d483 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -240,7 +240,7 @@ sub isrunning{
         my $pid = '';
         my $testcmd = '';
         my $exename;
-       my @memory;
+       my $memory;
  
         $cmd =~ /(^[a-z]+)/;
         $exename = $1;
@@ -256,13 +256,18 @@ sub isrunning{
                         }
                         close FILE;
                 }
-               if (open(FILE, "/proc/${pid}/statm")){
-                               my $temp = <FILE>;
-                               @memory = split(/ /,$temp);
+               if (open(FILE, "/proc/${pid}/status")) {
+                       while (<FILE>) {
+                               my ($key, $val) = split(":", $_, 2);
+                               if ($key eq 'VmRSS') {
+                                       $memory = $val;
+                                       last;
+                               }
+                       }
+                       close(FILE);
                 }
-               close FILE;
                 if ($testcmd =~ /$exename/){
-                       $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory[0] KB</td>";
+                       $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory</td>";
                 }
         }
         return $status;
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl

index 727470fba98873a12e302effd9f98cfe1f48b3f5..3ec57ebb99b841b4f5ece52de198550ea96e3e87 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -223,6 +223,7 @@
  'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller',
  'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port',
  'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy',
+'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy',
  'advproxy errmsg invalid user' => 'Benutzername existiert nicht',
  'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich',
  'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich',
@@ -581,6 +582,7 @@
  'delete share' => 'Freigabe löschen',
  'delete user' => 'Benutzer löschen',
  'demon login script' => 'Demon-Anmeldeskript',
+'deprecated fs warn' => 'Veraltetes Dateisystem! Keine Unterstützung in neueren Kernelversionen. Sichern und Umformatieren!',
  'description' => 'Beschreibung',
  'dest ip and port' => 'Ziel-IP:Port',
  'destination' => 'Ziel',
@@ -1367,6 +1369,10 @@
  'ovpn_processprioVH' => 'Sehr Hoch',
  'ovpnstatus log' => 'OVPN-Status-Log',
  'ovpnsys log' => 'OVPN-System-Log',
+'ovpn routes push options' => 'Route push Optionen',
+'ovpn routes push' => 'Routen (eine pro Zeile)',
+'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske',
+'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt',
  'package failed to install' => 'Programmpaket konnte nicht installiert werden.',
  'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.',
  'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?',
@@ -1379,10 +1385,10 @@
  'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus Symbol.',
  'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
  'pakfire installed addons' => 'Installierte Addons:',
-'pakfire last core list update' => 'Letztes Corelisten Update vor',
-'pakfire last package update' => 'Letztes Paketlisten Update vor',
-'pakfire last serverlist update' => 'Letztes Serverlisten Update vor',
-'pakfire last update' => 'Letzes Update vor',
+'pakfire last core list update' => 'Letztes Corelisten Update ist',
+'pakfire last package update' => 'Letztes Paketlisten Update ist',
+'pakfire last serverlist update' => 'Letztes Serverlisten Update ist',
+'pakfire last update' => 'Letzes Update ist',
  'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen sie unten eine Liste.',
  'pakfire register' => 'Registrierung am Pakfire-Server:',
  'pakfire system state' => 'System Status',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl

index 16df2b96fd868246f372468e5f9661cc4ba8da5c..003056f9ee5a04aa624d214974dfcf9f36f478ca 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -223,6 +223,7 @@
  'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller',
  'advproxy errmsg invalid proxy port' => 'Invalid proxy port',
  'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
+'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP',
  'advproxy errmsg invalid user' => 'Username does not exist',
  'advproxy errmsg ldap base dn' => 'LDAP base DN required',
  'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
@@ -602,6 +603,7 @@
  'delete share' => 'Delete share',
  'delete user' => 'Delete user',
  'demon login script' => 'Demon login script',
+'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
  'description' => 'Description',
  'dest ip and port' => 'Dest. IP: Port',
  'destination' => 'Destination',
@@ -1395,6 +1397,10 @@
  'ovpn_processprioVH' => 'Very high',
  'ovpnstatus log' => 'OVPN-Status-Log',
  'ovpnsys log' => 'OVPN-System-Log',
+'ovpn routes push options' => 'Route push options',
+'ovpn routes push' => 'Routes (one per line):',
+'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
+'ovpn errmsg green already pushed' => 'Route for green network is always set',
  'package failed to install' => 'Package failed to install.',
  'pagerefresh' => 'Page is beeing refreshed, please wait.',
  'pakfire accept all' => 'Do you want to install all packages?',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl

index 365630a6e4d47e111446a44d441b7000190d987d..387ab4aded169dca772e8ea07f8aed77d3078521 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1352,6 +1352,10 @@
  'ovpn_processprioVH' => 'Muy alto',
  'ovpnstatus log' => 'OVPN-Status-Log',
  'ovpnsys log' => 'OVPN-System-Log',
+'ovpn routes push options' => 'Route push options',
+'ovpn routes push' => 'Routes (one per line):',
+'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
+'ovpn errmsg green already pushed' => 'Route for green network is always set',
  'package failed to install' => 'Falló la instalación del paquete',
  'pagerefresh' => 'La página se está actualiszando, por favor espere.',
  'pakfire accept all' => '¿Desea instalar todos los paquetes?',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl

index e7e5aed403a8df1152158e661421247ee35eacf3..a537459b26a6f36cc21b8272690ccea2e5a97a6b 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1364,6 +1364,10 @@
  'ovpn_processprioVH' => 'Très haute',
  'ovpnstatus log' => 'Journal statut OVPN',
  'ovpnsys log' => 'Journal système OVPN',
+'ovpn routes push options' => 'Options de Route push',
+'ovpn routes push' => 'Routes (une par ligne):',
+'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide',
+'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e',
  'package failed to install' => 'L\'installation du paquet a échoué.',
  'pagerefresh' => 'La page est entrain d\'être rafraichie, veuillez attendre.',
  'pakfire accept all' => 'Voulez-vous installer tout les paquets?',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl

index 12439e4453581406710825c77940ab676bda9ba1..d8f18909a40cbc4898646d3356ba6ba5ec0e441d 100644 (file)
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1375,6 +1375,10 @@
  'ovpn_processprioVH' => 'Bardzo wysoki',
  'ovpnstatus log' => 'OVPN-Status-Log',
  'ovpnsys log' => 'OVPN-System-Log',
+'ovpn routes push options' => 'Route push options',
+'ovpn routes push' => 'Routes (one per line):',
+'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
+'ovpn errmsg green already pushed' => 'Route for green network is always set',
  'package failed to install' => 'Błąd instalacji pakietu.',
  'pagerefresh' => 'Strona jest odświeżana, proszę czekać.',
  'pakfire accept all' => 'Czy chcesz zainstalować wszystkie pakiety?',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl

index 18c1349150dcf1a4a16c66b5ab9cc55b9274cdb0..c1afd015add1a661a16ce5685ae9513b13d89bef 100644 (file)
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -1366,6 +1366,10 @@
  'ovpn_processprioVH' => 'Very high',
  'ovpnstatus log' => 'OVPN-Status-Log',
  'ovpnsys log' => 'OVPN-System-Log',
+'ovpn routes push options' => 'Настройки маршрутизации',
+'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)',
+'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти',
+'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён',
  'package failed to install' => 'Package failed to install.',
  'pagerefresh' => 'Page is beeing refreshed, please wait.',
  'pakfire accept all' => 'Do you want to install all packages?',
diff --git a/lfs/GeoIP b/lfs/GeoIP

index f1b200b818eb81c70e0a2024040601fc738dd8c2..aeb358d28e4d0a57eb98f3f7bcf4e20f071acc39 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -1,7 +1,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@ -25,7 +25,7 @@
  include Config
  
  VER        = 1.17
-DATVER     = 01052012
+DATVER     = 04072012
  
  THISAPP    = Geo-IP-PurePerl-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
  
  $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = bb073125a92b1ee3dba202b1cec922c4
+GeoIP.dat-$(DATVER).gz_MD5 = 1395bec12f8a5f0b1e889581271ed5ce
  
  install : $(TARGET)
  
diff --git a/lfs/Net-Telnet b/lfs/Net-Telnet

new file mode 100644 (file)

index 0000000..8d911f8
--- /dev/null
+++ b/lfs/Net-Telnet
@@ -0,0 +1,77 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# 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/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.03
+
+THISAPP    = Net-Telnet-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 2f7d34b09d6117baefe89d44cff9d5fc
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/asterisk b/lfs/asterisk

index 8b4a02f33450ea8cd859af57a6e6ec3c00246171..afc95f5beb40c36e138887b940c7e653234721d8 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 1.4.42
+VER        = 1.8.13.0
  
  THISAPP    = asterisk-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = asterisk
-PAK_VER    = 6
+PAK_VER    = 7
  
-CHAN_CAPI  = chan_capi-1.1.4
+CHAN_CAPI  = chan_capi-20120614
  
  DEPS       = "libpri libtiff libvorbis libogg spandsp netsnmpd"
  
@@ -47,24 +47,21 @@ objects = $(DL_FILE) \
         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
+       $(CHAN_CAPI).tgz
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  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.13.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.13.tar.gz
-$(CHAN_CAPI).tar.gz = $(URL_IPFIRE)/$(CHAN_CAPI).tar.gz
+$(CHAN_CAPI).tgz = $(URL_IPFIRE)/$(CHAN_CAPI).tgz
  
-$(DL_FILE)_MD5 = 332f2f67e0eefe84b1e55320eab45166
+$(DL_FILE)_MD5 = e7f2cb19068c1211c907062f9e96c47a
  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.13.tar.gz_MD5 = e59471b6f25901a82e45b9e5e0c73703
-$(CHAN_CAPI).tar.gz_MD5 = 18fa835e724b7814deafbfa5b8cb01eb
+$(CHAN_CAPI).tgz_MD5 = c190f44eb362bf258b27f92c3458e4bf
  
  install : $(TARGET)
  
@@ -122,16 +119,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         cd $(DIR_APP) && make install
         cd $(DIR_APP) && make samples
  
-       # extract and configure asterisk-addons
-       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
-       # make and install asterisk-addons
-       cd $(DIR_SRC)/asterisk-addons-* && make $(MAKETUNING) all
-       cd $(DIR_SRC)/asterisk-addons-* && make install
-       cd $(DIR_SRC)/asterisk-addons-* && make samples
-
         # add german sounds and remove README.txt
         tar xfz $(DIR_DL)/asterisk-1.4-de-prompts.tar.gz -C /var/lib/asterisk/sounds/
         -rm -f /var/lib/asterisk/sounds/README.txt
@@ -147,10 +134,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         ln -f -s /var/ipfire/asterisk/wakeup/wakeup.sh /etc/fcron.minutely/wakeup.sh
  
         # build and install chan capi (needed for isdn)
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tar.gz
-       cd $(DIR_SRC)/$(CHAN_CAPI) && make $(MAKETUNING)
-       cd $(DIR_SRC)/$(CHAN_CAPI) && make install
-       @rm -rf $(DIR_SRC)/$(CHAN_CAPI)
+       cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tgz
+       cd $(DIR_SRC)/chan-capi-HEAD && sed -i -e 's/^CFLAGS+=-Wno-unused-but-set-variable$$//' Makefile
+       cd $(DIR_SRC)/chan-capi-HEAD && make $(MAKETUNING)
+       cd $(DIR_SRC)/chan-capi-HEAD && make install
+       @rm -rf $(DIR_SRC)/chan-capi-HEAD
  
         # be sure all source is removed
         @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*
diff --git a/lfs/bison b/lfs/bison

index e1111d5120342d6b65df4e0faa30e8aea9d11cf8..6b84f419eaec3ff215ba95539a3211ea4aec74c6 100644 (file)
--- a/lfs/bison
+++ b/lfs/bison
@@ -24,10 +24,10 @@
  
  include Config
  
-VER        = 2.2
+VER        = 2.5.1
  
  THISAPP    = bison-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects =$(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = e345a5d021db850f06ce49eba78af027
+$(DL_FILE)_MD5 = 8fedf916f1aa2c4a31441d8f8bbc603c
  
  install : $(TARGET)
  
@@ -69,7 +69,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 zxf $(DIR_DL)/$(DL_FILE)
         cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
         # Disable NLS
         #cd $(DIR_APP) && echo '#define YYENABLE_NLS 1' >> config.h
diff --git a/lfs/clamav b/lfs/clamav

index fe26aa2b61b99c0224988e7d47d619be83d9c616..a717023024db36707fe71f78408ab2b114148bee 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 0.97.4
+VER        = 0.97.5
  
  THISAPP    = clamav-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = clamav
-PAK_VER    = 19
+PAK_VER    = 20
  
  DEPS       = ""
  
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = dc1e5abc093b11f120e4eac94a7f78aa
+$(DL_FILE)_MD5 = 4d4b93243a5add0216acc4f24f43a895
  
  install : $(TARGET)
  
@@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/clamav
         cd $(DIR_APP) && make $(MAKETUNING)
         cd $(DIR_APP) && make install
+       mkdir -p /usr/share/clamav/
         chown clamav.clamav -R /usr/share/clamav/
         cp -rf $(DIR_SRC)/config/clamav/* /var/ipfire/clamav/
         rm -rfv /usr/share/clamav/*.cvd
diff --git a/lfs/fireinfo b/lfs/fireinfo

index e0d83bf098885eb953b3ba9507cf355724e95587..f7fbbc44ab34c372798bced9dcf84ed01396544b 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.1.4
+VER        = 2.1.5
  
  THISAPP    = fireinfo-v$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 4a5a027fadb7f81bda1224608a76c944
+$(DL_FILE)_MD5 = 7f5350212b6aff44cb361fcabdf991e0
  
  install : $(TARGET)
  
diff --git a/lfs/flex b/lfs/flex

index 9ac33bdd0b46ecc6e233d2b1ed61b3d714d5b001..0c43e4acdfa9f35583cc45f6dc0c4ab3d38fed65 100644 (file)
--- a/lfs/flex
+++ b/lfs/flex
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.5.33
+VER        = 2.5.35
  
  THISAPP    = flex-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 343374a00b38d9e39d1158b71af37150
+$(DL_FILE)_MD5 = 10714e50cea54dc7a227e3eddcd44d57
  
  install : $(TARGET)
  
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
         cd $(DIR_APP) && make $(EXTRA_INSTALL) install
  ifeq "$(ROOT)" ""
-       ln -sv libfl.a /usr/lib/libl.a
+       ln -sfv libfl.a /usr/lib/libl.a
         echo "#!/bin/sh"                        >  /usr/bin/lex
         echo "exec /usr/bin/flex -l \"\$$@\""   >> /usr/bin/lex
         chmod 755 /usr/bin/lex
diff --git a/lfs/foomatic b/lfs/foomatic

index e22f4b840dbabe5dec4fcffc1d63eafe898781e8..712247ff038c44beda47397f78c9235f2942cb8e 100644 (file)
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -86,7 +86,7 @@ $(subst %,%_MD5,$(objects)) :
  
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
-       @rm -rf $(DIR_SRC)/foomatic-* && cd $(DIR_SRC) && \
+       @rm -rf $(DIR_SRC)/foomatic-* /usr/share/foomatic && cd $(DIR_SRC) && \
                 tar zxf $(DIR_DL)/$(DL_FILE) && \
                 tar zxf $(DIR_DL)/foomatic-db-$(DATE).tar.gz && \
                 tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz && \
diff --git a/lfs/lcr b/lfs/lcr

index 453afa43dc2eb33bc77896c10c0df6502e5b2a44..d6734ed9d56113f91976b94084810281fd941e5f 100644 (file)
--- a/lfs/lcr
+++ b/lfs/lcr
@@ -24,15 +24,15 @@
  
  include Config
  
-VER        = 20100601
+VER        = 1.10
  
  THISAPP    = lcr-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = lcr
-PAK_VER    = 3
+PAK_VER    = 4
  
  DEPS       = ""
  
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 68ccdcbe741df38c0f79d14c1b5473f5
+$(DL_FILE)_MD5 = ccde843ee92f4d75f697d8a9e9fa3ba9
  
  install : $(TARGET)
  
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
  
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
-       @rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
         cd $(DIR_SRC)/lcr && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.in
         cd $(DIR_SRC)/lcr && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.am
         cd $(DIR_SRC)/lcr && ./configure --prefix=/usr
diff --git a/lfs/logwatch b/lfs/logwatch

index ac2585b788499e5221093f6be0299028fd78f100..755557a0b93e73275e5897e2cd6227a6b1674374 100644 (file)
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
         @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
         cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh
+       cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch-7.3.6-date_manip6.patch
         @cd $(DIR_APP) && chmod 755 install_logwatch.sh
         cd $(DIR_APP) && yes "" | ./install_logwatch.sh
         
diff --git a/lfs/m4 b/lfs/m4

index 690f54a0cfeb3ab10615db7b2b303d2b25f3f55e..df4b6a9470aff719fe08da28cb46a00cdc429b6d 100644 (file)
--- a/lfs/m4
+++ b/lfs/m4
@@ -24,10 +24,10 @@
  
  include Config
  
-VER        = 1.4.4
+VER        = 1.4.16
  
  THISAPP    = m4-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  
@@ -55,7 +55,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 8d1d64dbecf1494690a0f3ba8db4482a
+$(DL_FILE)_MD5 = 8a7cef47fecab6272eb86a6be6363b2f
  
  install : $(TARGET)
  
@@ -84,7 +84,7 @@ $(subst %,%_MD5,$(objects)) :
  
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
         cd $(DIR_APP) && LDFLAGS="$(EXTRA_LDFLAGS)" ./configure $(EXTRA_CONFIG)
         cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
         cd $(DIR_APP) && make $(EXTRA_INSTALL) install
diff --git a/lfs/mtr b/lfs/mtr

new file mode 100644 (file)

index 0000000..ca08396
--- /dev/null
+++ b/lfs/mtr
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# 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/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.82
+
+THISAPP    = mtr-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = mtr
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 10601ea543fda3e51545c4bce195b64c
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
+
diff --git a/lfs/openvpn b/lfs/openvpn

index 4f10e7afbe8874b384b4aa867efc087d7435cb96..e57aa30bacf2d190c339c5f012af213c0ef78373 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         cd $(DIR_APP)/plugin/down-root && make
         cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn
         -mkdir -vp /var/ipfire/ovpn/ca
+       -mkdir -vp /var/ipfire/ovpn/ccd
         -mkdir -vp /var/ipfire/ovpn/crls
         -mkdir -vp /var/ipfire/ovpn/n2nconf
         -mkdir -vp /var/ipfire/ovpn/scripts
diff --git a/lfs/pam b/lfs/pam

index 6daca32f92fd4010209abd979b41045a3cbe736a..75557a499628ba50a5f0904cf24030b53a0c0c84 100644 (file)
--- a/lfs/pam
+++ b/lfs/pam
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 0.99.4.0
+VER        = 0.99.10.0
  
  THISAPP    = Linux-PAM-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 267ea71253615342261f9fc486d06647
+$(DL_FILE)_MD5 = be4dd1d34ac5933408e13e48f3eb710a
  
  install : $(TARGET)
  
@@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) :
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
         @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pam-0.99.3.0-hostname.patch
         cd $(DIR_APP) && ./configure --libdir=/usr/lib \
                             --sbindir=/lib/security \
                             --enable-securedir=/lib/security \
@@ -81,9 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         chmod -v 4755 /lib/security/unix_chkpwd
         mv -v /lib/security/pam_tally /sbin
         mv -v /usr/lib/libpam*.so.0* /lib
-       ln -v -sf ../../lib/libpam.so.0.81.3 /usr/lib/libpam.so
+       ln -v -sf ../../lib/libpam.so.0.81.10 /usr/lib/libpam.so
         ln -v -sf ../../lib/libpamc.so.0.81.0 /usr/lib/libpamc.so
-       ln -v -sf ../../lib/libpam_misc.so.0.81.2 /usr/lib/libpam_misc.so
+       ln -v -sf ../../lib/libpam_misc.so.0.81.3 /usr/lib/libpam_misc.so
         -mkdir -p /etc/pam.d
         cp $(DIR_SRC)/config/pam/* /etc/pam.d
         chown root.root -R /etc/pam.d
diff --git a/lfs/php b/lfs/php

index 075d4fbae4dcd18158253c5f327efcfa74be2bb1..3fcac171724655b22e7534b9889bed3bd1db7a91 100644 (file)
--- a/lfs/php
+++ b/lfs/php
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 5.3.13
+VER        = 5.3.14
  
  THISAPP    = php-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
  Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
  
-$(DL_FILE)_MD5 = 370be99c5cdc2e756c82c44d774933c8
+$(DL_FILE)_MD5 = 7caac4f71e2f21426c11ac153e538392
  idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
  Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
  
diff --git a/lfs/samba b/lfs/samba

index e27ee08da7410bc2790dfdf09265e3a3e0964362..9c6a3b65d44c77c4d55d3bc1adea154fe90f4d21 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 3.5.15
+VER        = 3.5.16
  
  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    = 40
+PAK_VER    = 41
  
  DEPS       = "cups"
  
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 2d72c044bdfd854ee2ab736326da3afd
+$(DL_FILE)_MD5 = 260cf49b683e86f4cc316c1e6fddbdc5
  
  install : $(TARGET)
  
diff --git a/lfs/squid b/lfs/squid

index 814985cea0777cb95b24e004b627bd274c60cbf4..74683284f286bf0e06234ce5879b370cff420f9b 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 3.1.19
+VER        = 3.1.20
  
  THISAPP    = squid-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 9b6ffaf96bee8f05f0085bc6361d7c94
+$(DL_FILE)_MD5 = c4d733a383c0508fd0746d64a2d7278a
  
  install : $(TARGET)
  
@@ -105,7 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            --enable-ipf-transparent \
            --enable-kill-parent-hack \
            --disable-wccpv2 \
-          --disable-icap-client \
+          --enable-icap-client \
            --disable-esi
  
         cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/strongswan b/lfs/strongswan

index 44497d480e34386b0283f6cef6bc37f0546fb0f5..d0d533d11da7e1642c5ac1eb502d7ea13cce5f3f 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 4.6.3
+VER        = 4.6.4
  
  THISAPP    = strongswan-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 34146e514ced1738b4f2d9e7169bbb52
+$(DL_FILE)_MD5 = 4c0999c42faa0860ae0afc4f8efd9d04
  
  install : $(TARGET)
  
diff --git a/lfs/tcpick b/lfs/tcpick

new file mode 100644 (file)

index 0000000..52ba75b
--- /dev/null
+++ b/lfs/tcpick
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# 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/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.2.1
+
+THISAPP    = tcpick-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = tcpick
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = bb94f2f9ea81aeb645619fbe9b3b9a29
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data

index 2b99bd079c150908f2cd54ea582af627fa37fd91..46c7c0d98e095645bf99046a0a2d838ccf35b682 100644 (file)
--- a/lfs/usb_modeswitch_data
+++ b/lfs/usb_modeswitch_data
@@ -1,7 +1,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 20120120
+VER        = 20120531
  
  THISAPP    = usb-modeswitch-data-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = c899cc9c71bb35f3ec600b7cd1455c65
+$(DL_FILE)_MD5 = 4a948331d5b9fccba4a89d3e62040cc3
  
  install : $(TARGET)
  
diff --git a/make.sh b/make.sh

index 3b447c893240b4cb3eb928f2ffa2b056baf2448d..265677b57728d1c2fa8bf3a6688cb64fe7100326 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
  NAME="IPFire"                                                  # Software name
  SNAME="ipfire"                                                 # Short name
  VERSION="2.11"                                                 # Version number
-CORE="59"                                                      # Core Level (Filename)
-PAKFIRE_CORE="59"                                              # Core Level (PAKFIRE)
+CORE="61"                                                      # Core Level (Filename)
+PAKFIRE_CORE="61"                                              # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
  SLOGAN="www.ipfire.org"                                                # Software slogan
  CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -572,6 +572,7 @@ buildipfire() {
    ipfiremake Locale-Country
    ipfiremake XML-Parser
    ipfiremake Crypt-PasswdMD5
+  ipfiremake Net-Telnet
    ipfiremake python-setuptools
    ipfiremake python-clientform
    ipfiremake python-mechanize
@@ -764,6 +765,8 @@ buildipfire() {
    ipfiremake transmission
    ipfiremake dpfhack
    ipfiremake lcd4linux
+  ipfiremake mtr
+  ipfiremake tcpick
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd

index bdb5ca2f0bcebf0dd095717dca65b24a47566627..544b3e1f1472af9c4660a91f16b5db041ac6ae27 100644 (file)
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -86,9 +86,14 @@ case "$1" in
                         sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf
                 fi
  
-               boot_mesg "Starting Collection daemon..."
-               /usr/sbin/collectd -C /etc/collectd.conf
-               evaluate_retval
+               if [ $(date +%Y) -gt 2011 ]; then
+                       boot_mesg "Starting Collection daemon..."
+                       /usr/sbin/collectd -C /etc/collectd.conf
+                       evaluate_retval
+               else
+                       boot_mesg "collectd: cannot start with incorrect time ($(date))."
+                       echo_warning;
+               fi
                 ;;
         stop)
                 boot_mesg "Stopping Collection daemon..."
diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile

index 9f1e3f0006d16b3dac3ac93e8bc95af8fbd2c191..300e9ecbb244caabd7fb447a82259b92d764d6e8 100644 (file)
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -32,7 +32,8 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \
         wirelessctrl getipstat getiptstate qosctrl launch-ether-wake \
         redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
         smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
-       setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes
+       setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \
+       getconntracktable
  SUID_UPDX = updxsetperms
  
  install : all
@@ -160,3 +161,6 @@ fireinfoctrl: fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o
  
  rebuildroutes: rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o
         $(COMPILE) -I../install+setup/libsmooth/ rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o -o $@
+
+getconntracktable: getconntracktable.c setuid.o ../install+setup/libsmooth/varval.o
+       $(COMPILE) -I../install+setup/libsmooth/ getconntracktable.c setuid.o ../install+setup/libsmooth/varval.o -o $@
diff --git a/src/misc-progs/getconntracktable.c b/src/misc-progs/getconntracktable.c

new file mode 100644 (file)

index 0000000..674b211
--- /dev/null
+++ b/src/misc-progs/getconntracktable.c
@@ -0,0 +1,31 @@
+/* IPFire helper program - getconntracktable\r
+ *\r
+ * This program is distributed under the terms of the GNU General Public\r
+ * Licence.  See the file COPYING for details.\r
+ *\r
+ * The kernel's connection tracking table is not readable by\r
+ * non-root users. So this helper will just read and output it.\r
+ */\r
+\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include "setuid.h"\r
+\r
+int main(void) {\r
+       if (!(initsetuid()))\r
+               exit(1);\r
+\r
+       FILE *fp = fopen("/proc/net/nf_conntrack", "r");\r
+       if (fp == NULL) {\r
+               exit(1);\r
+       }\r
+\r
+       /* Read content line by line and write it to stdout. */\r
+       char linebuf[STRING_SIZE];\r
+       while (fgets(linebuf, STRING_SIZE, fp)) {\r
+               printf("%s", linebuf);\r
+       }\r
+\r
+       fclose(fp);\r
+       return 0;\r
+}\r
diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh

index 2f6491f28e3b4a7862a775787ae30cca8061bb78..bc05bd01e0112d137715241c36e5cfc8faed9a69 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -2,7 +2,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@ -28,6 +28,13 @@ extract_files() {
         echo "...Finished."
  }
  
+extract_backup_includes() {
+       echo "Extracting backup includes..."
+       tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
+               var/ipfire/backup/addons/includes
+       echo "...Finished."
+}
+
  remove_files() {
         echo "Removing files..."
         for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do
diff --git a/src/patches/logwatch-7.3.6-date_manip6.patch b/src/patches/logwatch-7.3.6-date_manip6.patch

new file mode 100644 (file)

index 0000000..015e7d6
--- /dev/null
+++ b/src/patches/logwatch-7.3.6-date_manip6.patch
@@ -0,0 +1,13 @@
+--- Logwatch.pm.orig    2012-06-20 09:58:12.786294471 +0200
++++ Logwatch.pm 2012-06-20 09:41:59.443055298 +0200
+@@ -4,6 +4,10 @@
+
+ package Logwatch;
+
++# Define interace version 5 for Date::Manip
++BEGIN {
++       $Date::Manip::Backend = 'DM5';
++}
+ use strict;
+ use Exporter;
+ use POSIX qw(strftime);
diff --git a/src/patches/pam-0.99.3.0-hostname.patch b/src/patches/pam-0.99.3.0-hostname.patch

deleted file mode 100644 (file)

index 119de2c..0000000
--- a/src/patches/pam-0.99.3.0-hostname.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- Linux-PAM-0.99.3.0/configure.in.host-name-max      2005-12-12 19:56:27.000000000 +0300
-+++ Linux-PAM-0.99.3.0/configure.in    2006-01-28 01:31:58.000000000 +0300
-@@ -395,6 +395,46 @@
- AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
- AC_CHECK_FUNCS(getgrouplist getline getdelim)
- 
-+AH_BOTTOM([#ifndef HAVE_HOST_NAME_MAX
-+ #ifdef HAVE_MAXHOSTNAME
-+  #include <sys/param.h>
-+  #define HOST_NAME_MAX MAXHOSTNAME
-+ #else 
-+  #define HOST_NAME_MAX 64
-+ #endif
-+#endif])
-+ac_cv_maxhostname_defined=no
-+AC_CACHE_CHECK([[whether HOST_NAME_MAX is defined in limits.h]],
-+[ac_cv_host_name_max_defined],
-+[AC_COMPILE_IFELSE([[#include <limits.h>
-+
-+char name[HOST_NAME_MAX];
-+
-+int main()
-+{
-+  return 0;
-+}]], [ac_cv_host_name_max_defined=yes
-+ AC_MSG_RESULT([ac_cv_host_name_max_defined])],
-+[ac_cv_host_name_max_defined=no
-+AC_MSG_RESULT([ac_cv_host_name_max_defined])
-+AC_CACHE_CHECK([[whether MAXHOSTNAME is defined in sys/param.h]],
-+[ac_cv_maxhostname_defined],
-+[AC_COMPILE_IFELSE([[#include <sys/param.h>
-+
-+char name[MAXHOSTNAME];
-+
-+int main()
-+{
-+return 0;
-+}]], [ac_cv_maxhostname_defined=yes], [ac_cv_maxhostname_defined=no])])
-+AC_MSG_RESULT([ac_cv_maxhostname_defined])])])
-+if test $ac_cv_host_name_max_defined = yes; then
-+AC_DEFINE([HAVE_HOST_NAME_MAX], 1, [Define if system header limits.h defines HOST_NAME_MAX])
-+fi
-+if test $ac_cv_maxhostname_defined = yes; then
-+AC_DEFINE([HAVE_MAXHOSTNAME], 1, [Define if system header sys/param.h defines MAXHOSTNAME])
-+fi
-+
- dnl Checks for programs/utilities
- AC_CHECK_PROG(SGML2PS, sgml2ps, yes, no)
- AC_CHECK_PROG(SGML2TXT, sgml2txt, yes, no)
-
author	Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
	Sun, 22 Jul 2012 08:30:29 +0000 (10:30 +0200)
committer	Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
	Sun, 22 Jul 2012 08:30:29 +0000 (10:30 +0200)
config/asterisk/asterisk.makeopts		patch \| blob \| blame \| history
config/calamaris/mkreport		patch \| blob \| blame \| history
config/cfgroot/general-functions.pl		patch \| blob \| blame \| history
config/rootfiles/common/Net-Telnet	[new file with mode: 0644]	patch \| blob
config/rootfiles/common/bison		patch \| blob \| blame \| history
config/rootfiles/common/flex		patch \| blob \| blame \| history
config/rootfiles/common/m4		patch \| blob \| blame \| history
config/rootfiles/common/misc-progs		patch \| blob \| blame \| history
config/rootfiles/common/openvpn		patch \| blob \| blame \| history
config/rootfiles/common/pam		patch \| blob \| blame \| history
config/rootfiles/common/squid		patch \| blob \| blame \| history
config/rootfiles/common/usb_modeswitch_data		patch \| blob \| blame \| history
config/rootfiles/core/58/filelists/Net-Telnet	[new symlink]	patch \| blob
config/rootfiles/core/59/update.sh		patch \| blob \| blame \| history
config/rootfiles/core/60/exclude	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/60/filelists/files	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/60/filelists/strongswan	[new symlink]	patch \| blob
config/rootfiles/core/60/meta	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/60/update.sh	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/61/exclude	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/61/filelists/GeoIP	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/61/filelists/Net-Telnet	[new symlink]	patch \| blob
config/rootfiles/core/61/filelists/files	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/61/filelists/fireinfo	[new symlink]	patch \| blob
config/rootfiles/core/61/filelists/logwatch	[new symlink]	patch \| blob
config/rootfiles/core/61/filelists/openvpn	[new symlink]	patch \| blob
config/rootfiles/core/61/filelists/pam	[new symlink]	patch \| blob
config/rootfiles/core/61/filelists/php	[new symlink]	patch \| blob
config/rootfiles/core/61/filelists/squid	[new symlink]	patch \| blob
config/rootfiles/core/61/filelists/usb_modeswitch_data	[new symlink]	patch \| blob
config/rootfiles/core/61/meta	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/61/update.sh	[new file with mode: 0644]	patch \| blob
config/rootfiles/packages/asterisk		patch \| blob \| blame \| history
config/rootfiles/packages/clamav		patch \| blob \| blame \| history
config/rootfiles/packages/mtr	[new file with mode: 0644]	patch \| blob
config/rootfiles/packages/tcpick	[new file with mode: 0644]	patch \| blob
config/urlfilter/redirect_wrapper		patch \| blob \| blame \| history
html/cgi-bin/connections.cgi		patch \| blob \| blame \| history
html/cgi-bin/credits.cgi		patch \| blob \| blame \| history
html/cgi-bin/index.cgi		patch \| blob \| blame \| history
html/cgi-bin/ovpnmain.cgi		patch \| blob \| blame \| history
html/cgi-bin/proxy.cgi		patch \| blob \| blame \| history
html/cgi-bin/services.cgi		patch \| blob \| blame \| history
langs/de/cgi-bin/de.pl		patch \| blob \| blame \| history
langs/en/cgi-bin/en.pl		patch \| blob \| blame \| history
langs/es/cgi-bin/es.pl		patch \| blob \| blame \| history
langs/fr/cgi-bin/fr.pl		patch \| blob \| blame \| history
langs/pl/cgi-bin/pl.pl		patch \| blob \| blame \| history
langs/ru/cgi-bin/ru.pl		patch \| blob \| blame \| history
lfs/GeoIP		patch \| blob \| blame \| history
lfs/Net-Telnet	[new file with mode: 0644]	patch \| blob
lfs/asterisk		patch \| blob \| blame \| history
lfs/bison		patch \| blob \| blame \| history
lfs/clamav		patch \| blob \| blame \| history
lfs/fireinfo		patch \| blob \| blame \| history
lfs/flex		patch \| blob \| blame \| history
lfs/foomatic		patch \| blob \| blame \| history
lfs/lcr		patch \| blob \| blame \| history
lfs/logwatch		patch \| blob \| blame \| history
lfs/m4		patch \| blob \| blame \| history
lfs/mtr	[new file with mode: 0644]	patch \| blob
lfs/openvpn		patch \| blob \| blame \| history
lfs/pam		patch \| blob \| blame \| history
lfs/php		patch \| blob \| blame \| history
lfs/samba		patch \| blob \| blame \| history
lfs/squid		patch \| blob \| blame \| history
lfs/strongswan		patch \| blob \| blame \| history
lfs/tcpick	[new file with mode: 0644]	patch \| blob
lfs/usb_modeswitch_data		patch \| blob \| blame \| history
make.sh		patch \| blob \| blame \| history
src/initscripts/init.d/collectd		patch \| blob \| blame \| history
src/misc-progs/Makefile		patch \| blob \| blame \| history
src/misc-progs/getconntracktable.c	[new file with mode: 0644]	patch \| blob
src/pakfire/lib/functions.sh		patch \| blob \| blame \| history
src/patches/logwatch-7.3.6-date_manip6.patch	[new file with mode: 0644]	patch \| blob
src/patches/pam-0.99.3.0-hostname.patch	[deleted file]	patch \| blob \| blame \| history