]> git.ipfire.org Git - people/ummeegge/ipfire-2.x.git/commitdiff
openssl-11: Updates of several packages and changed root and lfs files. openssl-11
authorErik Kapfer <erik.kapfer@ipfire.org>
Thu, 7 Dec 2017 08:47:55 +0000 (09:47 +0100)
committerErik Kapfer <erik.kapfer@ipfire.org>
Thu, 7 Dec 2017 08:47:55 +0000 (09:47 +0100)
Updates:
PHP: Update to version 7.2.0 .
  Added apxs configure option to produce libphp7.so .
  Updated Log to 1.13.1 .
Apache: Added php7.conf.
  Changed loadmodule.conf appropriately.
Asterisk: Update to version 13.18.3 .
  Added needed new dependency libjansson.
  Updated asterisk-prompt-de to version 2.0 (debian version).
  Updated asterisk-extra-sounds to version 1.5.1 .
  Updated asterisk-moh-opsound to version 2.03 .
Changes:
wget: Changed lfs file and Linked agains gnutls instead of OpenSSL.
icinga: Updated rootfile.
bacula: Updated rootfile.

16 files changed:
config/httpd/conf.d/php7.conf [new file with mode: 0644]
config/httpd/loadmodule.conf
config/rootfiles/common/apache2
config/rootfiles/common/icu [new file with mode: 0644]
config/rootfiles/common/openssl
config/rootfiles/common/php
config/rootfiles/packages/asterisk
config/rootfiles/packages/bacula
config/rootfiles/packages/icinga
config/rootfiles/packages/jansson [new file with mode: 0644]
lfs/apache2
lfs/asterisk
lfs/icu [new file with mode: 0644]
lfs/jansson [new file with mode: 0644]
lfs/php
lfs/wget

diff --git a/config/httpd/conf.d/php7.conf b/config/httpd/conf.d/php7.conf
new file mode 100644 (file)
index 0000000..e2d1ce8
--- /dev/null
@@ -0,0 +1,11 @@
+<IfModule dir_module>
+       <IfModule php7_module>
+               DirectoryIndex index.php index.html
+               <FilesMatch "\.php$">
+                       SetHandler application/x-httpd-php
+               </FilesMatch>
+               <FilesMatch "\.phps$">
+                       SetHandler application/x-httpd-php-source
+               </FilesMatch>
+       </IfModule>
+</IfModule>
index 249221e8cba318c05492383f99f82caa127e7bd0..6431feb0035c25cad8ad648c1932679ba41cdd84 100644 (file)
@@ -52,4 +52,4 @@ LoadModule alias_module /usr/lib/apache/mod_alias.so
 LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so
 LoadModule socache_shmcb_module /usr/lib/apache/mod_socache_shmcb.so
 LoadModule ssl_module /usr/lib/apache/mod_ssl.so
-LoadModule php5_module /usr/lib/apache/libphp5.so
+LoadModule php7_module /usr/lib/apache/libphp7.so
index 64faa7926c5ddd1ff7ebe543457e84f387391de1..3af4b5e7e78c5f685d535c4d6547747f98c6613e 100644 (file)
@@ -1,7 +1,7 @@
 #etc/httpd
 #etc/httpd/conf
 #etc/httpd/conf/conf.d
-etc/httpd/conf/conf.d/php5.conf
+etc/httpd/conf/conf.d/php7.conf
 etc/httpd/conf/default-server.conf
 #etc/httpd/conf/extra
 #etc/httpd/conf/extra/httpd-autoindex.conf
@@ -1597,6 +1597,7 @@ usr/lib/apache/mod_log_config.so
 usr/lib/apache/mod_log_debug.so
 usr/lib/apache/mod_log_forensic.so
 usr/lib/apache/mod_logio.so
+usr/lib/apache/mod_lua.so
 usr/lib/apache/mod_macro.so
 usr/lib/apache/mod_mime.so
 usr/lib/apache/mod_mime_magic.so
diff --git a/config/rootfiles/common/icu b/config/rootfiles/common/icu
new file mode 100644 (file)
index 0000000..816862e
--- /dev/null
@@ -0,0 +1,245 @@
+#usr/bin/derb
+#usr/bin/genbrk
+#usr/bin/gencfu
+#usr/bin/gencnval
+#usr/bin/gendict
+#usr/bin/genrb
+#usr/bin/icu-config
+#usr/bin/icuinfo
+#usr/bin/makeconv
+#usr/bin/pkgdata
+#usr/bin/uconv
+#usr/include/unicode
+#usr/include/unicode/alphaindex.h
+#usr/include/unicode/appendable.h
+#usr/include/unicode/basictz.h
+#usr/include/unicode/brkiter.h
+#usr/include/unicode/bytestream.h
+#usr/include/unicode/bytestrie.h
+#usr/include/unicode/bytestriebuilder.h
+#usr/include/unicode/calendar.h
+#usr/include/unicode/caniter.h
+#usr/include/unicode/casemap.h
+#usr/include/unicode/char16ptr.h
+#usr/include/unicode/chariter.h
+#usr/include/unicode/choicfmt.h
+#usr/include/unicode/coleitr.h
+#usr/include/unicode/coll.h
+#usr/include/unicode/compactdecimalformat.h
+#usr/include/unicode/curramt.h
+#usr/include/unicode/currpinf.h
+#usr/include/unicode/currunit.h
+#usr/include/unicode/datefmt.h
+#usr/include/unicode/dbbi.h
+#usr/include/unicode/dcfmtsym.h
+#usr/include/unicode/decimfmt.h
+#usr/include/unicode/docmain.h
+#usr/include/unicode/dtfmtsym.h
+#usr/include/unicode/dtintrv.h
+#usr/include/unicode/dtitvfmt.h
+#usr/include/unicode/dtitvinf.h
+#usr/include/unicode/dtptngen.h
+#usr/include/unicode/dtrule.h
+#usr/include/unicode/edits.h
+#usr/include/unicode/enumset.h
+#usr/include/unicode/errorcode.h
+#usr/include/unicode/fieldpos.h
+#usr/include/unicode/filteredbrk.h
+#usr/include/unicode/fmtable.h
+#usr/include/unicode/format.h
+#usr/include/unicode/fpositer.h
+#usr/include/unicode/gender.h
+#usr/include/unicode/gregocal.h
+#usr/include/unicode/icudataver.h
+#usr/include/unicode/icuplug.h
+#usr/include/unicode/idna.h
+#usr/include/unicode/listformatter.h
+#usr/include/unicode/localpointer.h
+#usr/include/unicode/locdspnm.h
+#usr/include/unicode/locid.h
+#usr/include/unicode/measfmt.h
+#usr/include/unicode/measunit.h
+#usr/include/unicode/measure.h
+#usr/include/unicode/messagepattern.h
+#usr/include/unicode/msgfmt.h
+#usr/include/unicode/normalizer2.h
+#usr/include/unicode/normlzr.h
+#usr/include/unicode/nounit.h
+#usr/include/unicode/numberformatter.h
+#usr/include/unicode/numfmt.h
+#usr/include/unicode/numsys.h
+#usr/include/unicode/parseerr.h
+#usr/include/unicode/parsepos.h
+#usr/include/unicode/platform.h
+#usr/include/unicode/plurfmt.h
+#usr/include/unicode/plurrule.h
+#usr/include/unicode/ptypes.h
+#usr/include/unicode/putil.h
+#usr/include/unicode/rbbi.h
+#usr/include/unicode/rbnf.h
+#usr/include/unicode/rbtz.h
+#usr/include/unicode/regex.h
+#usr/include/unicode/region.h
+#usr/include/unicode/reldatefmt.h
+#usr/include/unicode/rep.h
+#usr/include/unicode/resbund.h
+#usr/include/unicode/schriter.h
+#usr/include/unicode/scientificnumberformatter.h
+#usr/include/unicode/search.h
+#usr/include/unicode/selfmt.h
+#usr/include/unicode/simpleformatter.h
+#usr/include/unicode/simpletz.h
+#usr/include/unicode/smpdtfmt.h
+#usr/include/unicode/sortkey.h
+#usr/include/unicode/std_string.h
+#usr/include/unicode/strenum.h
+#usr/include/unicode/stringoptions.h
+#usr/include/unicode/stringpiece.h
+#usr/include/unicode/stringtriebuilder.h
+#usr/include/unicode/stsearch.h
+#usr/include/unicode/symtable.h
+#usr/include/unicode/tblcoll.h
+#usr/include/unicode/timezone.h
+#usr/include/unicode/tmunit.h
+#usr/include/unicode/tmutamt.h
+#usr/include/unicode/tmutfmt.h
+#usr/include/unicode/translit.h
+#usr/include/unicode/tzfmt.h
+#usr/include/unicode/tznames.h
+#usr/include/unicode/tzrule.h
+#usr/include/unicode/tztrans.h
+#usr/include/unicode/ubidi.h
+#usr/include/unicode/ubiditransform.h
+#usr/include/unicode/ubrk.h
+#usr/include/unicode/ucal.h
+#usr/include/unicode/ucasemap.h
+#usr/include/unicode/ucat.h
+#usr/include/unicode/uchar.h
+#usr/include/unicode/ucharstrie.h
+#usr/include/unicode/ucharstriebuilder.h
+#usr/include/unicode/uchriter.h
+#usr/include/unicode/uclean.h
+#usr/include/unicode/ucnv.h
+#usr/include/unicode/ucnv_cb.h
+#usr/include/unicode/ucnv_err.h
+#usr/include/unicode/ucnvsel.h
+#usr/include/unicode/ucol.h
+#usr/include/unicode/ucoleitr.h
+#usr/include/unicode/uconfig.h
+#usr/include/unicode/ucsdet.h
+#usr/include/unicode/ucurr.h
+#usr/include/unicode/udat.h
+#usr/include/unicode/udata.h
+#usr/include/unicode/udateintervalformat.h
+#usr/include/unicode/udatpg.h
+#usr/include/unicode/udisplaycontext.h
+#usr/include/unicode/uenum.h
+#usr/include/unicode/ufieldpositer.h
+#usr/include/unicode/uformattable.h
+#usr/include/unicode/ugender.h
+#usr/include/unicode/uidna.h
+#usr/include/unicode/uiter.h
+#usr/include/unicode/uldnames.h
+#usr/include/unicode/ulistformatter.h
+#usr/include/unicode/uloc.h
+#usr/include/unicode/ulocdata.h
+#usr/include/unicode/umachine.h
+#usr/include/unicode/umisc.h
+#usr/include/unicode/umsg.h
+#usr/include/unicode/unifilt.h
+#usr/include/unicode/unifunct.h
+#usr/include/unicode/unimatch.h
+#usr/include/unicode/unirepl.h
+#usr/include/unicode/uniset.h
+#usr/include/unicode/unistr.h
+#usr/include/unicode/unorm.h
+#usr/include/unicode/unorm2.h
+#usr/include/unicode/unum.h
+#usr/include/unicode/unumsys.h
+#usr/include/unicode/uobject.h
+#usr/include/unicode/upluralrules.h
+#usr/include/unicode/uregex.h
+#usr/include/unicode/uregion.h
+#usr/include/unicode/ureldatefmt.h
+#usr/include/unicode/urename.h
+#usr/include/unicode/urep.h
+#usr/include/unicode/ures.h
+#usr/include/unicode/uscript.h
+#usr/include/unicode/usearch.h
+#usr/include/unicode/uset.h
+#usr/include/unicode/usetiter.h
+#usr/include/unicode/ushape.h
+#usr/include/unicode/uspoof.h
+#usr/include/unicode/usprep.h
+#usr/include/unicode/ustdio.h
+#usr/include/unicode/ustream.h
+#usr/include/unicode/ustring.h
+#usr/include/unicode/ustringtrie.h
+#usr/include/unicode/utext.h
+#usr/include/unicode/utf.h
+#usr/include/unicode/utf16.h
+#usr/include/unicode/utf32.h
+#usr/include/unicode/utf8.h
+#usr/include/unicode/utf_old.h
+#usr/include/unicode/utmscale.h
+#usr/include/unicode/utrace.h
+#usr/include/unicode/utrans.h
+#usr/include/unicode/utypes.h
+#usr/include/unicode/uvernum.h
+#usr/include/unicode/uversion.h
+#usr/include/unicode/vtzone.h
+#usr/lib/icu
+#usr/lib/icu/60.1
+#usr/lib/icu/60.1/Makefile.inc
+#usr/lib/icu/60.1/pkgdata.inc
+#usr/lib/icu/Makefile.inc
+#usr/lib/icu/current
+#usr/lib/icu/pkgdata.inc
+usr/lib/libicudata.so
+usr/lib/libicudata.so.60
+usr/lib/libicudata.so.60.1
+usr/lib/libicui18n.so
+usr/lib/libicui18n.so.60
+usr/lib/libicui18n.so.60.1
+usr/lib/libicuio.so
+usr/lib/libicuio.so.60
+usr/lib/libicuio.so.60.1
+usr/lib/libicutest.so
+usr/lib/libicutest.so.60
+usr/lib/libicutest.so.60.1
+usr/lib/libicutu.so
+usr/lib/libicutu.so.60
+usr/lib/libicutu.so.60.1
+usr/lib/libicuuc.so
+usr/lib/libicuuc.so.60
+usr/lib/libicuuc.so.60.1
+#usr/lib/pkgconfig/icu-i18n.pc
+#usr/lib/pkgconfig/icu-io.pc
+#usr/lib/pkgconfig/icu-uc.pc
+#usr/sbin/escapesrc
+#usr/sbin/genccode
+#usr/sbin/gencmn
+#usr/sbin/gennorm2
+#usr/sbin/gensprep
+#usr/sbin/icupkg
+#usr/share/icu
+#usr/share/icu/60.1
+#usr/share/icu/60.1/LICENSE
+#usr/share/icu/60.1/config
+#usr/share/icu/60.1/config/mh-linux
+#usr/share/icu/60.1/install-sh
+#usr/share/icu/60.1/mkinstalldirs
+#usr/share/man/man1/derb.1
+#usr/share/man/man1/genbrk.1
+#usr/share/man/man1/gencfu.1
+#usr/share/man/man1/gencnval.1
+#usr/share/man/man1/gendict.1
+#usr/share/man/man1/genrb.1
+#usr/share/man/man1/icu-config.1
+#usr/share/man/man1/makeconv.1
+#usr/share/man/man1/pkgdata.1
+#usr/share/man/man1/uconv.1
+#usr/share/man/man8/genccode.8
+#usr/share/man/man8/gencmn.8
+#usr/share/man/man8/gensprep.8
+#usr/share/man/man8/icupkg.8
index 6f65e710bf8dbf18b6c43666d1a05498e9566555..2a7c71eee2b209052833ad3ad9915080aa88d27c 100644 (file)
@@ -82,6 +82,7 @@ usr/bin/openssl
 #usr/include/openssl/x509.h
 #usr/include/openssl/x509_vfy.h
 #usr/include/openssl/x509v3.h
+#usr/lib/engines-1.1
 #usr/lib/libcrypto.a
 usr/lib/libcrypto.so
 usr/lib/libcrypto.so.1.1
index fa073de9da11573dc9ecbe05cd28e5501a5ac8f9..9c41976453e08fcd9194e83172eb567fc1380b05 100644 (file)
@@ -1,4 +1,7 @@
 etc/pear.conf
+#etc/php-fpm.conf.default
+#etc/php-fpm.d
+#etc/php-fpm.d/www.conf.default
 etc/php.ini
 #usr/bin/pear
 #usr/bin/peardev
@@ -6,25 +9,27 @@ etc/php.ini
 usr/bin/phar
 usr/bin/phar.phar
 usr/bin/php
+usr/bin/php-cgi
 #usr/bin/php-config
+#usr/bin/phpdbg
 #usr/bin/phpize
 #usr/include/php
 #usr/include/php/TSRM
 #usr/include/php/TSRM/TSRM.h
-#usr/include/php/TSRM/acconfig.h
 #usr/include/php/TSRM/readdir.h
 #usr/include/php/TSRM/tsrm_config.h
 #usr/include/php/TSRM/tsrm_config.w32.h
 #usr/include/php/TSRM/tsrm_config_common.h
-#usr/include/php/TSRM/tsrm_nw.h
 #usr/include/php/TSRM/tsrm_strtok_r.h
-#usr/include/php/TSRM/tsrm_virtual_cwd.h
 #usr/include/php/TSRM/tsrm_win32.h
 #usr/include/php/Zend
-#usr/include/php/Zend/acconfig.h
 #usr/include/php/Zend/zend.h
 #usr/include/php/Zend/zend_API.h
 #usr/include/php/Zend/zend_alloc.h
+#usr/include/php/Zend/zend_alloc_sizes.h
+#usr/include/php/Zend/zend_arena.h
+#usr/include/php/Zend/zend_ast.h
+#usr/include/php/Zend/zend_bitset.h
 #usr/include/php/Zend/zend_build.h
 #usr/include/php/Zend/zend_builtin_functions.h
 #usr/include/php/Zend/zend_closures.h
@@ -33,19 +38,19 @@ usr/bin/php
 #usr/include/php/Zend/zend_config.nw.h
 #usr/include/php/Zend/zend_config.w32.h
 #usr/include/php/Zend/zend_constants.h
-#usr/include/php/Zend/zend_dynamic_array.h
+#usr/include/php/Zend/zend_dtrace.h
 #usr/include/php/Zend/zend_errors.h
 #usr/include/php/Zend/zend_exceptions.h
 #usr/include/php/Zend/zend_execute.h
 #usr/include/php/Zend/zend_extensions.h
-#usr/include/php/Zend/zend_fast_cache.h
 #usr/include/php/Zend/zend_float.h
 #usr/include/php/Zend/zend_gc.h
+#usr/include/php/Zend/zend_generators.h
 #usr/include/php/Zend/zend_globals.h
 #usr/include/php/Zend/zend_globals_macros.h
 #usr/include/php/Zend/zend_hash.h
 #usr/include/php/Zend/zend_highlight.h
-#usr/include/php/Zend/zend_indent.h
+#usr/include/php/Zend/zend_inheritance.h
 #usr/include/php/Zend/zend_ini.h
 #usr/include/php/Zend/zend_ini_parser.h
 #usr/include/php/Zend/zend_ini_scanner.h
@@ -58,6 +63,7 @@ usr/bin/php
 #usr/include/php/Zend/zend_language_scanner_defs.h
 #usr/include/php/Zend/zend_list.h
 #usr/include/php/Zend/zend_llist.h
+#usr/include/php/Zend/zend_long.h
 #usr/include/php/Zend/zend_modules.h
 #usr/include/php/Zend/zend_multibyte.h
 #usr/include/php/Zend/zend_multiply.h
@@ -65,15 +71,25 @@ usr/bin/php
 #usr/include/php/Zend/zend_objects.h
 #usr/include/php/Zend/zend_objects_API.h
 #usr/include/php/Zend/zend_operators.h
+#usr/include/php/Zend/zend_portability.h
 #usr/include/php/Zend/zend_ptr_stack.h
-#usr/include/php/Zend/zend_qsort.h
+#usr/include/php/Zend/zend_range_check.h
+#usr/include/php/Zend/zend_signal.h
+#usr/include/php/Zend/zend_smart_str.h
+#usr/include/php/Zend/zend_smart_str_public.h
+#usr/include/php/Zend/zend_smart_string.h
+#usr/include/php/Zend/zend_smart_string_public.h
+#usr/include/php/Zend/zend_sort.h
 #usr/include/php/Zend/zend_stack.h
-#usr/include/php/Zend/zend_static_allocator.h
 #usr/include/php/Zend/zend_stream.h
+#usr/include/php/Zend/zend_string.h
 #usr/include/php/Zend/zend_strtod.h
+#usr/include/php/Zend/zend_strtod_int.h
 #usr/include/php/Zend/zend_ts_hash.h
+#usr/include/php/Zend/zend_type_info.h
 #usr/include/php/Zend/zend_types.h
 #usr/include/php/Zend/zend_variables.h
+#usr/include/php/Zend/zend_virtual_cwd.h
 #usr/include/php/Zend/zend_vm.h
 #usr/include/php/Zend/zend_vm_def.h
 #usr/include/php/Zend/zend_vm_execute.h
@@ -83,37 +99,44 @@ usr/bin/php
 #usr/include/php/ext/date/lib
 #usr/include/php/ext/date/lib/timelib.h
 #usr/include/php/ext/date/lib/timelib_config.h
-#usr/include/php/ext/date/lib/timelib_structs.h
 #usr/include/php/ext/date/php_date.h
 #usr/include/php/ext/dom
 #usr/include/php/ext/dom/xml_common.h
-#usr/include/php/ext/ereg
-#usr/include/php/ext/ereg/php_ereg.h
-#usr/include/php/ext/ereg/php_regex.h
-#usr/include/php/ext/ereg/regex
-#usr/include/php/ext/ereg/regex/cclass.h
-#usr/include/php/ext/ereg/regex/cname.h
-#usr/include/php/ext/ereg/regex/regex.h
-#usr/include/php/ext/ereg/regex/regex2.h
-#usr/include/php/ext/ereg/regex/utils.h
 #usr/include/php/ext/filter
 #usr/include/php/ext/filter/php_filter.h
 #usr/include/php/ext/gd
+#usr/include/php/ext/gd/gd_compat.h
 #usr/include/php/ext/gd/gdcache.h
+#usr/include/php/ext/gd/libgd
+#usr/include/php/ext/gd/libgd/bmp.h
+#usr/include/php/ext/gd/libgd/gd.h
+#usr/include/php/ext/gd/libgd/gd_errors.h
+#usr/include/php/ext/gd/libgd/gd_intern.h
+#usr/include/php/ext/gd/libgd/gd_io.h
+#usr/include/php/ext/gd/libgd/gdcache.h
+#usr/include/php/ext/gd/libgd/gdfontg.h
+#usr/include/php/ext/gd/libgd/gdfontl.h
+#usr/include/php/ext/gd/libgd/gdfontmb.h
+#usr/include/php/ext/gd/libgd/gdfonts.h
+#usr/include/php/ext/gd/libgd/gdfontt.h
+#usr/include/php/ext/gd/libgd/gdhelpers.h
+#usr/include/php/ext/gd/libgd/jisx0208.h
+#usr/include/php/ext/gd/libgd/wbmp.h
 #usr/include/php/ext/gd/php_gd.h
 #usr/include/php/ext/hash
 #usr/include/php/ext/hash/php_hash.h
 #usr/include/php/ext/hash/php_hash_adler32.h
 #usr/include/php/ext/hash/php_hash_crc32.h
+#usr/include/php/ext/hash/php_hash_fnv.h
 #usr/include/php/ext/hash/php_hash_gost.h
 #usr/include/php/ext/hash/php_hash_haval.h
+#usr/include/php/ext/hash/php_hash_joaat.h
 #usr/include/php/ext/hash/php_hash_md.h
 #usr/include/php/ext/hash/php_hash_ripemd.h
-#usr/include/php/ext/hash/php_hash_salsa.h
 #usr/include/php/ext/hash/php_hash_sha.h
+#usr/include/php/ext/hash/php_hash_sha3.h
 #usr/include/php/ext/hash/php_hash_snefru.h
 #usr/include/php/ext/hash/php_hash_tiger.h
-#usr/include/php/ext/hash/php_hash_types.h
 #usr/include/php/ext/hash/php_hash_whirlpool.h
 #usr/include/php/ext/iconv
 #usr/include/php/ext/iconv/php_have_bsd_iconv.h
@@ -123,11 +146,14 @@ usr/bin/php
 #usr/include/php/ext/iconv/php_have_libiconv.h
 #usr/include/php/ext/iconv/php_iconv.h
 #usr/include/php/ext/iconv/php_iconv_aliased_libiconv.h
+#usr/include/php/ext/iconv/php_iconv_broken_ignore.h
 #usr/include/php/ext/iconv/php_iconv_supports_errno.h
 #usr/include/php/ext/iconv/php_php_iconv_h_path.h
 #usr/include/php/ext/iconv/php_php_iconv_impl.h
 #usr/include/php/ext/json
 #usr/include/php/ext/json/php_json.h
+#usr/include/php/ext/json/php_json_parser.h
+#usr/include/php/ext/json/php_json_scanner.h
 #usr/include/php/ext/libxml
 #usr/include/php/ext/libxml/php_libxml.h
 #usr/include/php/ext/mbstring
@@ -154,21 +180,52 @@ usr/bin/php
 #usr/include/php/ext/mbstring/oniguruma/oniguruma.h
 #usr/include/php/ext/mbstring/php_mbregex.h
 #usr/include/php/ext/mbstring/php_onig_compat.h
+#usr/include/php/ext/mysqli
+#usr/include/php/ext/mysqli/mysqli_mysqlnd.h
+#usr/include/php/ext/mysqli/php_mysqli_structs.h
+#usr/include/php/ext/mysqlnd
+#usr/include/php/ext/mysqlnd/config-win.h
+#usr/include/php/ext/mysqlnd/mysql_float_to_double.h
+#usr/include/php/ext/mysqlnd/mysqlnd.h
+#usr/include/php/ext/mysqlnd/mysqlnd_alloc.h
+#usr/include/php/ext/mysqlnd/mysqlnd_auth.h
+#usr/include/php/ext/mysqlnd/mysqlnd_block_alloc.h
+#usr/include/php/ext/mysqlnd/mysqlnd_charset.h
+#usr/include/php/ext/mysqlnd/mysqlnd_commands.h
+#usr/include/php/ext/mysqlnd/mysqlnd_connection.h
+#usr/include/php/ext/mysqlnd/mysqlnd_debug.h
+#usr/include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
+#usr/include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
+#usr/include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
+#usr/include/php/ext/mysqlnd/mysqlnd_plugin.h
+#usr/include/php/ext/mysqlnd/mysqlnd_portability.h
+#usr/include/php/ext/mysqlnd/mysqlnd_priv.h
+#usr/include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
+#usr/include/php/ext/mysqlnd/mysqlnd_ps.h
+#usr/include/php/ext/mysqlnd/mysqlnd_read_buffer.h
+#usr/include/php/ext/mysqlnd/mysqlnd_result.h
+#usr/include/php/ext/mysqlnd/mysqlnd_result_meta.h
+#usr/include/php/ext/mysqlnd/mysqlnd_reverse_api.h
+#usr/include/php/ext/mysqlnd/mysqlnd_statistics.h
+#usr/include/php/ext/mysqlnd/mysqlnd_structs.h
+#usr/include/php/ext/mysqlnd/mysqlnd_vio.h
+#usr/include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
+#usr/include/php/ext/mysqlnd/php_mysqlnd.h
 #usr/include/php/ext/pcre
-#usr/include/php/ext/pcre/pcrelib
-#usr/include/php/ext/pcre/pcrelib/config.h
-#usr/include/php/ext/pcre/pcrelib/pcre.h
-#usr/include/php/ext/pcre/pcrelib/pcre_internal.h
-#usr/include/php/ext/pcre/pcrelib/pcreposix.h
-#usr/include/php/ext/pcre/pcrelib/ucp.h
 #usr/include/php/ext/pcre/php_pcre.h
 #usr/include/php/ext/pdo
 #usr/include/php/ext/pdo/php_pdo.h
 #usr/include/php/ext/pdo/php_pdo_driver.h
+#usr/include/php/ext/pdo/php_pdo_error.h
+#usr/include/php/ext/phar
+#usr/include/php/ext/phar/php_phar.h
 #usr/include/php/ext/session
 #usr/include/php/ext/session/mod_files.h
 #usr/include/php/ext/session/mod_user.h
 #usr/include/php/ext/session/php_session.h
+#usr/include/php/ext/simplexml
+#usr/include/php/ext/simplexml/php_simplexml.h
+#usr/include/php/ext/simplexml/php_simplexml_exports.h
 #usr/include/php/ext/sockets
 #usr/include/php/ext/sockets/php_sockets.h
 #usr/include/php/ext/spl
@@ -183,10 +240,6 @@ usr/bin/php
 #usr/include/php/ext/spl/spl_heap.h
 #usr/include/php/ext/spl/spl_iterators.h
 #usr/include/php/ext/spl/spl_observer.h
-#usr/include/php/ext/sqlite
-#usr/include/php/ext/sqlite/libsqlite
-#usr/include/php/ext/sqlite/libsqlite/src
-#usr/include/php/ext/sqlite/libsqlite/src/sqlite.h
 #usr/include/php/ext/sqlite3
 #usr/include/php/ext/sqlite3/libsqlite
 #usr/include/php/ext/sqlite3/libsqlite/sqlite3.h
@@ -209,6 +262,7 @@ usr/bin/php
 #usr/include/php/ext/standard/fsock.h
 #usr/include/php/ext/standard/head.h
 #usr/include/php/ext/standard/html.h
+#usr/include/php/ext/standard/html_tables.h
 #usr/include/php/ext/standard/info.h
 #usr/include/php/ext/standard/md5.h
 #usr/include/php/ext/standard/microtime.h
@@ -234,9 +288,12 @@ usr/bin/php
 #usr/include/php/ext/standard/php_mail.h
 #usr/include/php/ext/standard/php_math.h
 #usr/include/php/ext/standard/php_metaphone.h
+#usr/include/php/ext/standard/php_mt_rand.h
+#usr/include/php/ext/standard/php_password.h
 #usr/include/php/ext/standard/php_rand.h
-#usr/include/php/ext/standard/php_smart_str.h
-#usr/include/php/ext/standard/php_smart_str_public.h
+#usr/include/php/ext/standard/php_random.h
+#usr/include/php/ext/standard/php_smart_string.h
+#usr/include/php/ext/standard/php_smart_string_public.h
 #usr/include/php/ext/standard/php_standard.h
 #usr/include/php/ext/standard/php_string.h
 #usr/include/php/ext/standard/php_type.h
@@ -259,17 +316,16 @@ usr/bin/php
 #usr/include/php/main
 #usr/include/php/main/SAPI.h
 #usr/include/php/main/build-defs.h
+#usr/include/php/main/fastcgi.h
 #usr/include/php/main/fopen_wrappers.h
-#usr/include/php/main/logos.h
+#usr/include/php/main/http_status_codes.h
 #usr/include/php/main/php.h
-#usr/include/php/main/php3_compat.h
 #usr/include/php/main/php_compat.h
 #usr/include/php/main/php_config.h
 #usr/include/php/main/php_content_types.h
 #usr/include/php/main/php_getopt.h
 #usr/include/php/main/php_globals.h
 #usr/include/php/main/php_ini.h
-#usr/include/php/main/php_logos.h
 #usr/include/php/main/php_main.h
 #usr/include/php/main/php_memory_streams.h
 #usr/include/php/main/php_network.h
@@ -277,13 +333,13 @@ usr/bin/php
 #usr/include/php/main/php_output.h
 #usr/include/php/main/php_reentrancy.h
 #usr/include/php/main/php_scandir.h
+#usr/include/php/main/php_stdint.h
 #usr/include/php/main/php_streams.h
 #usr/include/php/main/php_syslog.h
 #usr/include/php/main/php_ticks.h
 #usr/include/php/main/php_variables.h
 #usr/include/php/main/php_version.h
 #usr/include/php/main/rfc1867.h
-#usr/include/php/main/safe_mode.h
 #usr/include/php/main/snprintf.h
 #usr/include/php/main/spprintf.h
 #usr/include/php/main/streams
@@ -295,9 +351,10 @@ usr/bin/php
 #usr/include/php/main/streams/php_stream_transport.h
 #usr/include/php/main/streams/php_stream_userspace.h
 #usr/include/php/main/streams/php_streams_int.h
-#usr/include/php/main/win32_internal_function_disabled.h
-#usr/include/php/main/win95nt.h
-usr/lib/apache/libphp5.so
+#usr/include/php/sapi
+#usr/include/php/sapi/cli
+#usr/include/php/sapi/cli/cli.h
+usr/lib/apache/libphp7.so
 #usr/lib/php
 #usr/lib/php/.channels
 #usr/lib/php/.channels/.alias
@@ -344,10 +401,9 @@ usr/lib/php/Log/sqlite.php
 usr/lib/php/Log/syslog.php
 usr/lib/php/Log/win.php
 #usr/lib/php/OS
-#usr/lib/php/OS/Guess.php
-usr/lib/php/PEAR
+usr/lib/php/OS/Guess.php
+#usr/lib/php/PEAR
 usr/lib/php/PEAR.php
-usr/lib/php/PEAR/Autoloader.php
 usr/lib/php/PEAR/Builder.php
 #usr/lib/php/PEAR/ChannelFile
 usr/lib/php/PEAR/ChannelFile.php
@@ -386,7 +442,6 @@ usr/lib/php/PEAR/Downloader.php
 usr/lib/php/PEAR/Downloader/Package.php
 usr/lib/php/PEAR/ErrorStack.php
 usr/lib/php/PEAR/Exception.php
-usr/lib/php/PEAR/FixPHP5PEARWarnings.php
 #usr/lib/php/PEAR/Frontend
 usr/lib/php/PEAR/Frontend.php
 usr/lib/php/PEAR/Frontend/CLI.php
@@ -403,6 +458,8 @@ usr/lib/php/PEAR/Installer/Role/Doc.php
 usr/lib/php/PEAR/Installer/Role/Doc.xml
 usr/lib/php/PEAR/Installer/Role/Ext.php
 usr/lib/php/PEAR/Installer/Role/Ext.xml
+usr/lib/php/PEAR/Installer/Role/Man.php
+usr/lib/php/PEAR/Installer/Role/Man.xml
 usr/lib/php/PEAR/Installer/Role/Php.php
 usr/lib/php/PEAR/Installer/Role/Php.xml
 usr/lib/php/PEAR/Installer/Role/Script.php
@@ -427,6 +484,7 @@ usr/lib/php/PEAR/PackageFile/v2.php
 usr/lib/php/PEAR/PackageFile/v2/Validator.php
 usr/lib/php/PEAR/PackageFile/v2/rw.php
 usr/lib/php/PEAR/Packager.php
+usr/lib/php/PEAR/Proxy.php
 #usr/lib/php/PEAR/REST
 usr/lib/php/PEAR/REST.php
 usr/lib/php/PEAR/REST/10.php
@@ -452,7 +510,6 @@ usr/lib/php/PEAR/Validate.php
 #usr/lib/php/PEAR/Validator
 usr/lib/php/PEAR/Validator/PECL.php
 usr/lib/php/PEAR/XMLParser.php
-usr/lib/php/PEAR5.php
 #usr/lib/php/Structures
 #usr/lib/php/Structures/Graph
 usr/lib/php/Structures/Graph.php
@@ -466,21 +523,20 @@ usr/lib/php/XML/Util.php
 #usr/lib/php/build
 #usr/lib/php/build/Makefile.global
 #usr/lib/php/build/acinclude.m4
+#usr/lib/php/build/ax_check_compile_flag.m4
 #usr/lib/php/build/config.guess
 #usr/lib/php/build/config.sub
 #usr/lib/php/build/libtool.m4
 #usr/lib/php/build/ltmain.sh
 #usr/lib/php/build/mkdep.awk
 #usr/lib/php/build/phpize.m4
-#usr/lib/php/build/run-tests.php
+usr/lib/php/build/run-tests.php
 #usr/lib/php/build/scan_makefile_in.awk
 #usr/lib/php/build/shtool
 #usr/lib/php/data
 #usr/lib/php/data/PEAR
 #usr/lib/php/data/PEAR/package.dtd
 #usr/lib/php/data/PEAR/template.spec
-#usr/lib/php/data/Structures_Graph
-#usr/lib/php/data/Structures_Graph/LICENSE
 #usr/lib/php/doc
 #usr/lib/php/doc/Archive_Tar
 #usr/lib/php/doc/Archive_Tar/docs
@@ -488,32 +544,10 @@ usr/lib/php/XML/Util.php
 #usr/lib/php/doc/PEAR
 #usr/lib/php/doc/PEAR/INSTALL
 #usr/lib/php/doc/PEAR/LICENSE
-#usr/lib/php/doc/PEAR/README
+#usr/lib/php/doc/PEAR/README.rst
 #usr/lib/php/doc/Structures_Graph
+#usr/lib/php/doc/Structures_Graph/LICENSE
 #usr/lib/php/doc/Structures_Graph/docs
-#usr/lib/php/doc/Structures_Graph/docs/generate.sh
-#usr/lib/php/doc/Structures_Graph/docs/html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Node.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Node_php.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_php.html
-#usr/lib/php/doc/Structures_Graph/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html
-#usr/lib/php/doc/Structures_Graph/docs/html/classtrees_Structures_Graph.html
-#usr/lib/php/doc/Structures_Graph/docs/html/elementindex.html
-#usr/lib/php/doc/Structures_Graph/docs/html/elementindex_Structures_Graph.html
-#usr/lib/php/doc/Structures_Graph/docs/html/errors.html
-#usr/lib/php/doc/Structures_Graph/docs/html/index.html
-#usr/lib/php/doc/Structures_Graph/docs/html/li_Structures_Graph.html
-#usr/lib/php/doc/Structures_Graph/docs/html/media
-#usr/lib/php/doc/Structures_Graph/docs/html/media/banner.css
-#usr/lib/php/doc/Structures_Graph/docs/html/media/stylesheet.css
-#usr/lib/php/doc/Structures_Graph/docs/html/packages.html
-#usr/lib/php/doc/Structures_Graph/docs/html/todolist.html
 #usr/lib/php/doc/Structures_Graph/docs/tutorials
 #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph
 #usr/lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
@@ -522,38 +556,58 @@ usr/lib/php/XML/Util.php
 usr/lib/php/doc/XML_Util/examples/example.php
 usr/lib/php/doc/XML_Util/examples/example2.php
 #usr/lib/php/extensions
-#usr/lib/php/extensions/no-debug-zts-20090626
-usr/lib/php/extensions/no-debug-zts-20090626/dba.so
-usr/lib/php/extensions/no-debug-zts-20090626/idn.so
-#usr/lib/php/pearcmd.php
-#usr/lib/php/peclcmd.php
+usr/lib/php/extensions/no-debug-zts-20170718
+usr/lib/php/extensions/no-debug-zts-20170718/dba.so
+usr/lib/php/extensions/no-debug-zts-20170718/opcache.so
+usr/lib/php/pearcmd.php
+usr/lib/php/peclcmd.php
 #usr/lib/php/test
+#usr/lib/php/test/Console_Getopt
+#usr/lib/php/test/Console_Getopt/tests
+#usr/lib/php/test/Console_Getopt/tests/001-getopt.phpt
+#usr/lib/php/test/Console_Getopt/tests/bug10557.phpt
+#usr/lib/php/test/Console_Getopt/tests/bug11068.phpt
+#usr/lib/php/test/Console_Getopt/tests/bug13140.phpt
 #usr/lib/php/test/Structures_Graph
 #usr/lib/php/test/Structures_Graph/tests
-#usr/lib/php/test/Structures_Graph/tests/AllTests.php
-#usr/lib/php/test/Structures_Graph/tests/testCase
-#usr/lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php
+usr/lib/php/test/Structures_Graph/tests/AcyclicTestTest.php
+usr/lib/php/test/Structures_Graph/tests/AllTests.php
+usr/lib/php/test/Structures_Graph/tests/BasicGraphTest.php
+usr/lib/php/test/Structures_Graph/tests/TopologicalSorterTest.php
+#usr/lib/php/test/Structures_Graph/tests/helper.inc
 #usr/lib/php/test/XML_Util
 #usr/lib/php/test/XML_Util/tests
-#usr/lib/php/test/XML_Util/tests/AllTests.php
-#usr/lib/php/test/XML_Util/tests/testBasic_apiVersion.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_attributesToString.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_collapseEmptyTags.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_createCDataSection.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_createComment.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_createEndElement.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_createStartElement.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_createTag.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_createTagFromArray.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_getDocTypeDeclaration.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_getXmlDeclaration.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_isValidName.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_raiseError.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_replaceEntities.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_reverseEntities.phpt
-#usr/lib/php/test/XML_Util/tests/testBasic_splitQualifiedName.phpt
-#usr/lib/php/test/XML_Util/tests/testBug_4950.phpt
-#usr/lib/php/test/XML_Util/tests/testBug_5392.phpt
-#usr/man/man1/php-config.1
-#usr/man/man1/php.1
-#usr/man/man1/phpize.1
+usr/lib/php/test/XML_Util/tests/AbstractUnitTests.php
+usr/lib/php/test/XML_Util/tests/ApiVersionTests.php
+usr/lib/php/test/XML_Util/tests/AttributesToStringTests.php
+usr/lib/php/test/XML_Util/tests/Bug18343Tests.php
+usr/lib/php/test/XML_Util/tests/Bug21177Tests.php
+usr/lib/php/test/XML_Util/tests/Bug21184Tests.php
+usr/lib/php/test/XML_Util/tests/Bug4950Tests.php
+usr/lib/php/test/XML_Util/tests/Bug5392Tests.php
+usr/lib/php/test/XML_Util/tests/CollapseEmptyTagsTests.php
+usr/lib/php/test/XML_Util/tests/CreateCDataSectionTests.php
+usr/lib/php/test/XML_Util/tests/CreateCommentTests.php
+usr/lib/php/test/XML_Util/tests/CreateEndElementTests.php
+usr/lib/php/test/XML_Util/tests/CreateStartElementTests.php
+usr/lib/php/test/XML_Util/tests/CreateTagFromArrayTests.php
+usr/lib/php/test/XML_Util/tests/CreateTagTests.php
+usr/lib/php/test/XML_Util/tests/GetDocTypeDeclarationTests.php
+usr/lib/php/test/XML_Util/tests/GetXmlDeclarationTests.php
+usr/lib/php/test/XML_Util/tests/IsValidNameTests.php
+usr/lib/php/test/XML_Util/tests/RaiseErrorTests.php
+usr/lib/php/test/XML_Util/tests/ReplaceEntitiesTests.php
+usr/lib/php/test/XML_Util/tests/ReverseEntitiesTests.php
+usr/lib/php/test/XML_Util/tests/SplitQualifiedNameTests.php
+#usr/sbin/php-fpm
+#usr/share/man/man1/phar.1
+#usr/share/man/man1/phar.phar.1
+#usr/share/man/man1/php-cgi.1
+#usr/share/man/man1/php-config.1
+#usr/share/man/man1/php.1
+#usr/share/man/man1/phpdbg.1
+#usr/share/man/man1/phpize.1
+#usr/share/man/man8/php-fpm.8
+#usr/share/php
+#usr/share/php/fpm
+#usr/share/php/fpm/status.html
index d1a3097c67b7afafa6be08d7a7886b91e43dd448..fb4590aef1579309f20f20f9d6dc32ad52d79673 100644 (file)
@@ -1,5 +1,6 @@
 etc/asterisk
 etc/logrotate.d/asterisk
+etc/rc.d/init.d/asterisk
 etc/rc.d/rc0.d/K30asterisk
 etc/rc.d/rc3.d/S30asterisk
 etc/rc.d/rc6.d/K30asterisk
@@ -12,8 +13,10 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/ael_structs.h
 #usr/include/asterisk/agi.h
 #usr/include/asterisk/alaw.h
+#usr/include/asterisk/alertpipe.h
 #usr/include/asterisk/aoc.h
 #usr/include/asterisk/app.h
+#usr/include/asterisk/ari.h
 #usr/include/asterisk/ast_expr.h
 #usr/include/asterisk/ast_version.h
 #usr/include/asterisk/astdb.h
@@ -24,9 +27,18 @@ etc/rc.d/rc6.d/K30asterisk
 #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/backtrace.h
+#usr/include/asterisk/beep.h
+#usr/include/asterisk/bridge.h
+#usr/include/asterisk/bridge_after.h
+#usr/include/asterisk/bridge_basic.h
+#usr/include/asterisk/bridge_channel.h
+#usr/include/asterisk/bridge_channel_internal.h
+#usr/include/asterisk/bridge_features.h
+#usr/include/asterisk/bridge_internal.h
+#usr/include/asterisk/bridge_roles.h
+#usr/include/asterisk/bridge_technology.h
+#usr/include/asterisk/bucket.h
 #usr/include/asterisk/build.h
 #usr/include/asterisk/buildinfo.h
 #usr/include/asterisk/buildopts.h
@@ -42,10 +54,13 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/channelstate.h
 #usr/include/asterisk/chanvars.h
 #usr/include/asterisk/cli.h
+#usr/include/asterisk/codec.h
 #usr/include/asterisk/compat.h
 #usr/include/asterisk/compiler.h
 #usr/include/asterisk/config.h
 #usr/include/asterisk/config_options.h
+#usr/include/asterisk/core_local.h
+#usr/include/asterisk/core_unreal.h
 #usr/include/asterisk/crypto.h
 #usr/include/asterisk/data.h
 #usr/include/asterisk/datastore.h
@@ -59,24 +74,25 @@ etc/rc.d/rc6.d/K30asterisk
 #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/endpoints.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/features_config.h
 #usr/include/asterisk/file.h
 #usr/include/asterisk/format.h
+#usr/include/asterisk/format_cache.h
 #usr/include/asterisk/format_cap.h
-#usr/include/asterisk/format_pref.h
+#usr/include/asterisk/format_compatibility.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
@@ -90,26 +106,34 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/indications.h
 #usr/include/asterisk/inline_api.h
 #usr/include/asterisk/io.h
-#usr/include/asterisk/jabber.h
-#usr/include/asterisk/jingle.h
+#usr/include/asterisk/json.h
 #usr/include/asterisk/linkedlists.h
 #usr/include/asterisk/localtime.h
 #usr/include/asterisk/lock.h
 #usr/include/asterisk/logger.h
 #usr/include/asterisk/manager.h
+#usr/include/asterisk/max_forwards.h
 #usr/include/asterisk/md5.h
+#usr/include/asterisk/media_index.h
 #usr/include/asterisk/message.h
+#usr/include/asterisk/mixmonitor.h
 #usr/include/asterisk/mod_format.h
 #usr/include/asterisk/module.h
 #usr/include/asterisk/monitor.h
+#usr/include/asterisk/multicast_rtp.h
 #usr/include/asterisk/musiconhold.h
+#usr/include/asterisk/named_locks.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/opus.h
+#usr/include/asterisk/parking.h
 #usr/include/asterisk/paths.h
 #usr/include/asterisk/pbx.h
+#usr/include/asterisk/phoneprov.h
+#usr/include/asterisk/pickup.h
 #usr/include/asterisk/pktccops.h
 #usr/include/asterisk/plc.h
 #usr/include/asterisk/poll-compat.h
@@ -117,22 +141,56 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/privacy.h
 #usr/include/asterisk/pval.h
 #usr/include/asterisk/res_fax.h
+#usr/include/asterisk/res_hep.h
+#usr/include/asterisk/res_mwi_external.h
 #usr/include/asterisk/res_odbc.h
+#usr/include/asterisk/res_odbc_transaction.h
+#usr/include/asterisk/res_pjproject.h
+#usr/include/asterisk/res_pjsip.h
+#usr/include/asterisk/res_pjsip_body_generator_types.h
+#usr/include/asterisk/res_pjsip_cli.h
+#usr/include/asterisk/res_pjsip_outbound_publish.h
+#usr/include/asterisk/res_pjsip_presence_xml.h
+#usr/include/asterisk/res_pjsip_pubsub.h
+#usr/include/asterisk/res_pjsip_session.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/sdp_srtp.h
 #usr/include/asterisk/security_events.h
 #usr/include/asterisk/security_events_defs.h
 #usr/include/asterisk/select.h
+#usr/include/asterisk/sem.h
 #usr/include/asterisk/sha1.h
 #usr/include/asterisk/silk.h
 #usr/include/asterisk/sip_api.h
 #usr/include/asterisk/slin.h
 #usr/include/asterisk/slinfactory.h
 #usr/include/asterisk/smdi.h
+#usr/include/asterisk/smoother.h
+#usr/include/asterisk/sorcery.h
+#usr/include/asterisk/sounds_index.h
 #usr/include/asterisk/speech.h
+#usr/include/asterisk/spinlock.h
 #usr/include/asterisk/srv.h
+#usr/include/asterisk/stasis.h
+#usr/include/asterisk/stasis_app.h
+#usr/include/asterisk/stasis_app_device_state.h
+#usr/include/asterisk/stasis_app_impl.h
+#usr/include/asterisk/stasis_app_mailbox.h
+#usr/include/asterisk/stasis_app_playback.h
+#usr/include/asterisk/stasis_app_recording.h
+#usr/include/asterisk/stasis_app_snoop.h
+#usr/include/asterisk/stasis_bridges.h
+#usr/include/asterisk/stasis_cache_pattern.h
+#usr/include/asterisk/stasis_channels.h
+#usr/include/asterisk/stasis_endpoints.h
+#usr/include/asterisk/stasis_internal.h
+#usr/include/asterisk/stasis_message_router.h
+#usr/include/asterisk/stasis_system.h
+#usr/include/asterisk/stasis_test.h
+#usr/include/asterisk/statsd.h
 #usr/include/asterisk/stringfields.h
 #usr/include/asterisk/strings.h
 #usr/include/asterisk/stun.h
@@ -142,6 +200,7 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/tdd.h
 #usr/include/asterisk/term.h
 #usr/include/asterisk/test.h
+#usr/include/asterisk/threadpool.h
 #usr/include/asterisk/threadstorage.h
 #usr/include/asterisk/time.h
 #usr/include/asterisk/timing.h
@@ -150,7 +209,9 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/udptl.h
 #usr/include/asterisk/ulaw.h
 #usr/include/asterisk/unaligned.h
+#usr/include/asterisk/uri.h
 #usr/include/asterisk/utils.h
+#usr/include/asterisk/uuid.h
 #usr/include/asterisk/vector.h
 #usr/include/asterisk/version.h
 #usr/include/asterisk/xml.h
@@ -159,9 +220,11 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/lib/asterisk
 #usr/lib/asterisk/modules
 usr/lib/asterisk/modules/app_adsiprog.so
+usr/lib/asterisk/modules/app_agent_pool.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_bridgewait.so
 usr/lib/asterisk/modules/app_cdr.so
 usr/lib/asterisk/modules/app_celgenuserevent.so
 usr/lib/asterisk/modules/app_chanisavail.so
@@ -195,7 +258,6 @@ 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
@@ -210,6 +272,7 @@ usr/lib/asterisk/modules/app_sms.so
 usr/lib/asterisk/modules/app_softhangup.so
 usr/lib/asterisk/modules/app_speech_utils.so
 usr/lib/asterisk/modules/app_stack.so
+usr/lib/asterisk/modules/app_stasis.so
 usr/lib/asterisk/modules/app_system.so
 usr/lib/asterisk/modules/app_talkdetect.so
 usr/lib/asterisk/modules/app_test.so
@@ -224,7 +287,9 @@ 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/bridge_builtin_features.so
-usr/lib/asterisk/modules/bridge_multiplexed.so
+usr/lib/asterisk/modules/bridge_builtin_interval_features.so
+usr/lib/asterisk/modules/bridge_holding.so
+usr/lib/asterisk/modules/bridge_native_rtp.so
 usr/lib/asterisk/modules/bridge_simple.so
 usr/lib/asterisk/modules/bridge_softmix.so
 usr/lib/asterisk/modules/cdr_csv.so
@@ -236,14 +301,12 @@ 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_bridge_media.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_multicast_rtp.so
 usr/lib/asterisk/modules/chan_phone.so
+usr/lib/asterisk/modules/chan_rtp.so
 usr/lib/asterisk/modules/chan_sip.so
 usr/lib/asterisk/modules/chan_skinny.so
 usr/lib/asterisk/modules/chan_unistim.so
@@ -295,6 +358,7 @@ 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_hangupcause.so
+usr/lib/asterisk/modules/func_holdintercept.so
 usr/lib/asterisk/modules/func_iconv.so
 usr/lib/asterisk/modules/func_jitterbuffer.so
 usr/lib/asterisk/modules/func_lock.so
@@ -302,16 +366,19 @@ 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_module.so
+usr/lib/asterisk/modules/func_periodic_hook.so
 usr/lib/asterisk/modules/func_pitchshift.so
 usr/lib/asterisk/modules/func_presencestate.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_sorcery.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_talkdetect.so
 usr/lib/asterisk/modules/func_timeout.so
 usr/lib/asterisk/modules/func_uri.so
 usr/lib/asterisk/modules/func_version.so
@@ -326,6 +393,18 @@ 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_ari.so
+usr/lib/asterisk/modules/res_ari_applications.so
+usr/lib/asterisk/modules/res_ari_asterisk.so
+usr/lib/asterisk/modules/res_ari_bridges.so
+usr/lib/asterisk/modules/res_ari_channels.so
+usr/lib/asterisk/modules/res_ari_device_states.so
+usr/lib/asterisk/modules/res_ari_endpoints.so
+usr/lib/asterisk/modules/res_ari_events.so
+usr/lib/asterisk/modules/res_ari_model.so
+usr/lib/asterisk/modules/res_ari_playbacks.so
+usr/lib/asterisk/modules/res_ari_recordings.so
+usr/lib/asterisk/modules/res_ari_sounds.so
 usr/lib/asterisk/modules/res_calendar.so
 usr/lib/asterisk/modules/res_clialiases.so
 usr/lib/asterisk/modules/res_clioriginate.so
@@ -338,22 +417,44 @@ usr/lib/asterisk/modules/res_crypto.so
 usr/lib/asterisk/modules/res_curl.so
 usr/lib/asterisk/modules/res_fax.so
 usr/lib/asterisk/modules/res_format_attr_celt.so
+usr/lib/asterisk/modules/res_format_attr_g729.so
 usr/lib/asterisk/modules/res_format_attr_h263.so
 usr/lib/asterisk/modules/res_format_attr_h264.so
+usr/lib/asterisk/modules/res_format_attr_opus.so
 usr/lib/asterisk/modules/res_format_attr_silk.so
+usr/lib/asterisk/modules/res_format_attr_siren14.so
+usr/lib/asterisk/modules/res_format_attr_siren7.so
+usr/lib/asterisk/modules/res_format_attr_vp8.so
+usr/lib/asterisk/modules/res_hep.so
+usr/lib/asterisk/modules/res_hep_rtcp.so
 usr/lib/asterisk/modules/res_http_websocket.so
 usr/lib/asterisk/modules/res_limit.so
+usr/lib/asterisk/modules/res_manager_devicestate.so
+usr/lib/asterisk/modules/res_manager_presencestate.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_parking.so
 usr/lib/asterisk/modules/res_phoneprov.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_sorcery_astdb.so
+usr/lib/asterisk/modules/res_sorcery_config.so
+usr/lib/asterisk/modules/res_sorcery_memory.so
+usr/lib/asterisk/modules/res_sorcery_memory_cache.so
+usr/lib/asterisk/modules/res_sorcery_realtime.so
 usr/lib/asterisk/modules/res_speech.so
 usr/lib/asterisk/modules/res_srtp.so
+usr/lib/asterisk/modules/res_stasis.so
+usr/lib/asterisk/modules/res_stasis_answer.so
+usr/lib/asterisk/modules/res_stasis_device_state.so
+usr/lib/asterisk/modules/res_stasis_playback.so
+usr/lib/asterisk/modules/res_stasis_recording.so
+usr/lib/asterisk/modules/res_stasis_snoop.so
+usr/lib/asterisk/modules/res_statsd.so
 usr/lib/asterisk/modules/res_stun_monitor.so
 usr/lib/asterisk/modules/res_timing_pthread.so
 usr/lib/asterisk/modules/res_timing_timerfd.so
@@ -365,6 +466,7 @@ usr/sbin/astdb2bdb
 usr/sbin/astdb2sqlite3
 usr/sbin/asterisk
 usr/sbin/astgenkey
+usr/sbin/astversion
 usr/sbin/autosupport
 usr/sbin/rasterisk
 usr/sbin/safe_asterisk
@@ -383,6 +485,8 @@ var/ipfire/asterisk/alsa.conf
 var/ipfire/asterisk/amd.conf
 var/ipfire/asterisk/app_mysql.conf
 var/ipfire/asterisk/app_skel.conf
+var/ipfire/asterisk/ari.conf
+var/ipfire/asterisk/ast_debug_tools.conf
 var/ipfire/asterisk/asterisk.adsi
 var/ipfire/asterisk/asterisk.conf
 var/ipfire/asterisk/asterisk.logrotate
@@ -427,14 +531,11 @@ var/ipfire/asterisk/features.conf
 var/ipfire/asterisk/festival.conf
 var/ipfire/asterisk/followme.conf
 var/ipfire/asterisk/func_odbc.conf
-var/ipfire/asterisk/gtalk.conf
-var/ipfire/asterisk/h323.conf
+var/ipfire/asterisk/hep.conf
 var/ipfire/asterisk/http.conf
 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
@@ -450,6 +551,10 @@ var/ipfire/asterisk/osp.conf
 var/ipfire/asterisk/oss.conf
 var/ipfire/asterisk/phone.conf
 var/ipfire/asterisk/phoneprov.conf
+var/ipfire/asterisk/pjproject.conf
+var/ipfire/asterisk/pjsip.conf
+var/ipfire/asterisk/pjsip_notify.conf
+var/ipfire/asterisk/pjsip_wizard.conf
 var/ipfire/asterisk/queuerules.conf
 var/ipfire/asterisk/queues.conf
 var/ipfire/asterisk/res_config_mysql.conf
@@ -460,6 +565,7 @@ 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_parking.conf
 var/ipfire/asterisk/res_pgsql.conf
 var/ipfire/asterisk/res_pktccops.conf
 var/ipfire/asterisk/res_snmp.conf
@@ -471,7 +577,12 @@ var/ipfire/asterisk/sip_notify.conf
 var/ipfire/asterisk/skinny.conf
 var/ipfire/asterisk/sla.conf
 var/ipfire/asterisk/smdi.conf
+var/ipfire/asterisk/sorcery.conf
+var/ipfire/asterisk/ss7.timers
+var/ipfire/asterisk/stasis.conf
+var/ipfire/asterisk/statsd.conf
 var/ipfire/asterisk/telcordia-1.adsi
+var/ipfire/asterisk/test_sorcery.conf
 var/ipfire/asterisk/udptl.conf
 var/ipfire/asterisk/unistim.conf
 var/ipfire/asterisk/users.conf
@@ -480,9 +591,10 @@ var/ipfire/asterisk/vpb.conf
 var/ipfire/asterisk/xmpp.conf
 var/ipfire/backup/addons/includes/asterisk
 #var/lib/asterisk
-var/lib/asterisk/agi-bin
+#var/lib/asterisk/agi-bin
 #var/lib/asterisk/documentation
 #var/lib/asterisk/documentation/appdocsxml.dtd
+#var/lib/asterisk/documentation/appdocsxml.xslt
 #var/lib/asterisk/documentation/core-en_US.xml
 #var/lib/asterisk/documentation/thirdparty
 #var/lib/asterisk/firmware
@@ -510,16 +622,34 @@ var/lib/asterisk/moh/manolo_camp-morning_coffee.gsm
 var/lib/asterisk/moh/manolo_camp-morning_coffee.wav
 var/lib/asterisk/moh/reno_project-system.gsm
 var/lib/asterisk/moh/reno_project-system.wav
-var/lib/asterisk/phoneprov
+#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/rest-api
+var/lib/asterisk/rest-api/applications.json
+var/lib/asterisk/rest-api/asterisk.json
+var/lib/asterisk/rest-api/bridges.json
+var/lib/asterisk/rest-api/channels.json
+var/lib/asterisk/rest-api/deviceStates.json
+var/lib/asterisk/rest-api/endpoints.json
+var/lib/asterisk/rest-api/events.json
+var/lib/asterisk/rest-api/mailboxes.json
+var/lib/asterisk/rest-api/playbacks.json
+var/lib/asterisk/rest-api/recordings.json
+var/lib/asterisk/rest-api/resources.json
+var/lib/asterisk/rest-api/sounds.json
+var/lib/asterisk/scripts
+var/lib/asterisk/scripts/ast_coredumper
+var/lib/asterisk/scripts/ast_logescalator
+var/lib/asterisk/scripts/ast_loggrabber
+var/lib/asterisk/scripts/refcounter.py
 #var/lib/asterisk/sounds
 #var/lib/asterisk/sounds/de
-var/lib/asterisk/sounds/de/.DS_Store
+var/lib/asterisk/sounds/de/Star.gsm
 var/lib/asterisk/sounds/de/agent-alreadyon.gsm
 var/lib/asterisk/sounds/de/agent-incorrect.gsm
 var/lib/asterisk/sounds/de/agent-loggedoff.gsm
@@ -527,10 +657,10 @@ var/lib/asterisk/sounds/de/agent-loginok.gsm
 var/lib/asterisk/sounds/de/agent-newlocation.gsm
 var/lib/asterisk/sounds/de/agent-pass.gsm
 var/lib/asterisk/sounds/de/agent-user.gsm
+var/lib/asterisk/sounds/de/agent.gsm
 var/lib/asterisk/sounds/de/auth-incorrect.gsm
 var/lib/asterisk/sounds/de/auth-thankyou.gsm
-var/lib/asterisk/sounds/de/beep.gsm
-var/lib/asterisk/sounds/de/beeperr.gsm
+var/lib/asterisk/sounds/de/both_help.gsm
 var/lib/asterisk/sounds/de/conf-adminmenu.gsm
 var/lib/asterisk/sounds/de/conf-enteringno.gsm
 var/lib/asterisk/sounds/de/conf-errormenu.gsm
@@ -569,50 +699,50 @@ var/lib/asterisk/sounds/de/demo-nogo.gsm
 var/lib/asterisk/sounds/de/demo-nomatch.gsm
 var/lib/asterisk/sounds/de/demo-thanks.gsm
 var/lib/asterisk/sounds/de/dir-instr.gsm
-var/lib/asterisk/sounds/de/dir-intro-fn.gsm
 var/lib/asterisk/sounds/de/dir-intro.gsm
 var/lib/asterisk/sounds/de/dir-nomatch.gsm
 var/lib/asterisk/sounds/de/dir-nomore.gsm
-var/lib/asterisk/sounds/de/dollars.gsm
-var/lib/asterisk/sounds/de/hello-world.gsm
+var/lib/asterisk/sounds/de/enter_filename.gsm
+var/lib/asterisk/sounds/de/forhelp.gsm
+var/lib/asterisk/sounds/de/h323.gsm
 var/lib/asterisk/sounds/de/hours.gsm
+var/lib/asterisk/sounds/de/iax.gsm
+var/lib/asterisk/sounds/de/iax2.gsm
 var/lib/asterisk/sounds/de/invalid.gsm
+var/lib/asterisk/sounds/de/mgcp.gsm
 var/lib/asterisk/sounds/de/minutes.gsm
+var/lib/asterisk/sounds/de/pause.gsm
+var/lib/asterisk/sounds/de/paused.gsm
 var/lib/asterisk/sounds/de/pbx-invalid.gsm
 var/lib/asterisk/sounds/de/pbx-invalidpark.gsm
 var/lib/asterisk/sounds/de/pbx-transfer.gsm
-var/lib/asterisk/sounds/de/priv-callee-options.gsm
-var/lib/asterisk/sounds/de/priv-callpending.gsm
-var/lib/asterisk/sounds/de/priv-introsaved.gsm
-var/lib/asterisk/sounds/de/priv-recordintro.gsm
+var/lib/asterisk/sounds/de/play_help.gsm
+var/lib/asterisk/sounds/de/playback.gsm
+var/lib/asterisk/sounds/de/playback_mode.gsm
 var/lib/asterisk/sounds/de/privacy-incorrect.gsm
 var/lib/asterisk/sounds/de/privacy-prompt.gsm
 var/lib/asterisk/sounds/de/privacy-thankyou.gsm
 var/lib/asterisk/sounds/de/privacy-unident.gsm
+var/lib/asterisk/sounds/de/privacy_unident_altern.gsm
 var/lib/asterisk/sounds/de/queue-callswaiting.gsm
+var/lib/asterisk/sounds/de/queue-callwaiting.gsm
 var/lib/asterisk/sounds/de/queue-holdtime.gsm
 var/lib/asterisk/sounds/de/queue-less-than.gsm
-var/lib/asterisk/sounds/de/queue-minutes.gsm
-var/lib/asterisk/sounds/de/queue-periodic-announce.gsm
 var/lib/asterisk/sounds/de/queue-reporthold.gsm
 var/lib/asterisk/sounds/de/queue-seconds.gsm
 var/lib/asterisk/sounds/de/queue-thankyou.gsm
 var/lib/asterisk/sounds/de/queue-thereare.gsm
 var/lib/asterisk/sounds/de/queue-youarenext.gsm
-var/lib/asterisk/sounds/de/screen-callee-options.gsm
+var/lib/asterisk/sounds/de/record.gsm
+var/lib/asterisk/sounds/de/record_help.gsm
+var/lib/asterisk/sounds/de/record_mode.gsm
 var/lib/asterisk/sounds/de/seconds.gsm
-var/lib/asterisk/sounds/de/spy-agent.gsm
-var/lib/asterisk/sounds/de/spy-h323.gsm
-var/lib/asterisk/sounds/de/spy-iax.gsm
-var/lib/asterisk/sounds/de/spy-iax2.gsm
-var/lib/asterisk/sounds/de/spy-mgcp.gsm
-var/lib/asterisk/sounds/de/spy-sip.gsm
-var/lib/asterisk/sounds/de/spy-skinny.gsm
-var/lib/asterisk/sounds/de/spy-zap.gsm
+var/lib/asterisk/sounds/de/sip.gsm
+var/lib/asterisk/sounds/de/skinny.gsm
 var/lib/asterisk/sounds/de/ss-noservice.gsm
 var/lib/asterisk/sounds/de/transfer.gsm
+var/lib/asterisk/sounds/de/truncating_audio.gsm
 var/lib/asterisk/sounds/de/tt-allbusy.gsm
-var/lib/asterisk/sounds/de/tt-monkeys.gsm
 var/lib/asterisk/sounds/de/tt-monkeysintro.gsm
 var/lib/asterisk/sounds/de/tt-somethingwrong.gsm
 var/lib/asterisk/sounds/de/tt-weasels.gsm
@@ -653,6 +783,7 @@ var/lib/asterisk/sounds/de/vm-isunavail.gsm
 var/lib/asterisk/sounds/de/vm-last.gsm
 var/lib/asterisk/sounds/de/vm-leavemsg.gsm
 var/lib/asterisk/sounds/de/vm-login.gsm
+var/lib/asterisk/sounds/de/vm-mailbox.gsm
 var/lib/asterisk/sounds/de/vm-mailboxfull.gsm
 var/lib/asterisk/sounds/de/vm-message.gsm
 var/lib/asterisk/sounds/de/vm-messages.gsm
@@ -679,6 +810,7 @@ var/lib/asterisk/sounds/de/vm-prev.gsm
 var/lib/asterisk/sounds/de/vm-reachoper.gsm
 var/lib/asterisk/sounds/de/vm-rec-busy.gsm
 var/lib/asterisk/sounds/de/vm-rec-name.gsm
+var/lib/asterisk/sounds/de/vm-rec-temp-altern.gsm
 var/lib/asterisk/sounds/de/vm-rec-temp.gsm
 var/lib/asterisk/sounds/de/vm-rec-unv.gsm
 var/lib/asterisk/sounds/de/vm-received.gsm
@@ -693,9 +825,11 @@ var/lib/asterisk/sounds/de/vm-saveoper.gsm
 var/lib/asterisk/sounds/de/vm-sorry.gsm
 var/lib/asterisk/sounds/de/vm-star-cancel.gsm
 var/lib/asterisk/sounds/de/vm-starmain.gsm
-var/lib/asterisk/sounds/de/vm-tempgreetactive.gsm
+var/lib/asterisk/sounds/de/vm-tempgreeting-altern.gsm
+var/lib/asterisk/sounds/de/vm-tempgreeting-altern2.gsm
 var/lib/asterisk/sounds/de/vm-tempgreeting.gsm
 var/lib/asterisk/sounds/de/vm-tempgreeting2.gsm
+var/lib/asterisk/sounds/de/vm-tempremoved-altern.gsm
 var/lib/asterisk/sounds/de/vm-tempremoved.gsm
 var/lib/asterisk/sounds/de/vm-then-pound.gsm
 var/lib/asterisk/sounds/de/vm-theperson.gsm
@@ -705,6 +839,7 @@ var/lib/asterisk/sounds/de/vm-tocancel.gsm
 var/lib/asterisk/sounds/de/vm-tocancelmsg.gsm
 var/lib/asterisk/sounds/de/vm-toenternumber.gsm
 var/lib/asterisk/sounds/de/vm-toforward.gsm
+var/lib/asterisk/sounds/de/vm-tohearenv-altern.gsm
 var/lib/asterisk/sounds/de/vm-tohearenv.gsm
 var/lib/asterisk/sounds/de/vm-tomakecall.gsm
 var/lib/asterisk/sounds/de/vm-tooshort.gsm
@@ -715,23 +850,11 @@ 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/dictate
-#var/lib/asterisk/sounds/dictate/de
-var/lib/asterisk/sounds/dictate/de/both_help.gsm
-var/lib/asterisk/sounds/dictate/de/enter_filename.gsm
-var/lib/asterisk/sounds/dictate/de/forhelp.gsm
-var/lib/asterisk/sounds/dictate/de/pause.gsm
-var/lib/asterisk/sounds/dictate/de/paused.gsm
-var/lib/asterisk/sounds/dictate/de/play_help.gsm
-var/lib/asterisk/sounds/dictate/de/playback.gsm
-var/lib/asterisk/sounds/dictate/de/playback_mode.gsm
-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/de/zap.gsm
 #var/lib/asterisk/sounds/digits
 #var/lib/asterisk/sounds/digits/de
 var/lib/asterisk/sounds/digits/de/0.gsm
+var/lib/asterisk/sounds/digits/de/1-and.gsm
 var/lib/asterisk/sounds/digits/de/1.gsm
 var/lib/asterisk/sounds/digits/de/10.gsm
 var/lib/asterisk/sounds/digits/de/11.gsm
@@ -744,23 +867,35 @@ var/lib/asterisk/sounds/digits/de/17.gsm
 var/lib/asterisk/sounds/digits/de/18.gsm
 var/lib/asterisk/sounds/digits/de/19.gsm
 var/lib/asterisk/sounds/digits/de/1F.gsm
+var/lib/asterisk/sounds/digits/de/2-and.gsm
 var/lib/asterisk/sounds/digits/de/2.gsm
 var/lib/asterisk/sounds/digits/de/20.gsm
+var/lib/asterisk/sounds/digits/de/3-and.gsm
 var/lib/asterisk/sounds/digits/de/3.gsm
 var/lib/asterisk/sounds/digits/de/30.gsm
+var/lib/asterisk/sounds/digits/de/4-and.gsm
 var/lib/asterisk/sounds/digits/de/4.gsm
 var/lib/asterisk/sounds/digits/de/40.gsm
+var/lib/asterisk/sounds/digits/de/5-and.gsm
 var/lib/asterisk/sounds/digits/de/5.gsm
 var/lib/asterisk/sounds/digits/de/50.gsm
+var/lib/asterisk/sounds/digits/de/6-and.gsm
 var/lib/asterisk/sounds/digits/de/6.gsm
 var/lib/asterisk/sounds/digits/de/60.gsm
+var/lib/asterisk/sounds/digits/de/7-and.gsm
 var/lib/asterisk/sounds/digits/de/7.gsm
 var/lib/asterisk/sounds/digits/de/70.gsm
+var/lib/asterisk/sounds/digits/de/8-and.gsm
 var/lib/asterisk/sounds/digits/de/8.gsm
 var/lib/asterisk/sounds/digits/de/80.gsm
+var/lib/asterisk/sounds/digits/de/9-and.gsm
 var/lib/asterisk/sounds/digits/de/9.gsm
 var/lib/asterisk/sounds/digits/de/90.gsm
+var/lib/asterisk/sounds/digits/de/Star.gsm
 var/lib/asterisk/sounds/digits/de/a-m.gsm
+var/lib/asterisk/sounds/digits/de/at.gsm
+var/lib/asterisk/sounds/digits/de/cent.gsm
+var/lib/asterisk/sounds/digits/de/comma.gsm
 var/lib/asterisk/sounds/digits/de/day-0.gsm
 var/lib/asterisk/sounds/digits/de/day-1.gsm
 var/lib/asterisk/sounds/digits/de/day-2.gsm
@@ -768,6 +903,10 @@ var/lib/asterisk/sounds/digits/de/day-3.gsm
 var/lib/asterisk/sounds/digits/de/day-4.gsm
 var/lib/asterisk/sounds/digits/de/day-5.gsm
 var/lib/asterisk/sounds/digits/de/day-6.gsm
+var/lib/asterisk/sounds/digits/de/dollar.gsm
+var/lib/asterisk/sounds/digits/de/ein.gsm
+var/lib/asterisk/sounds/digits/de/eine.gsm
+var/lib/asterisk/sounds/digits/de/euro.gsm
 var/lib/asterisk/sounds/digits/de/h-1.gsm
 var/lib/asterisk/sounds/digits/de/h-10.gsm
 var/lib/asterisk/sounds/digits/de/h-11.gsm
@@ -791,6 +930,7 @@ var/lib/asterisk/sounds/digits/de/h-8.gsm
 var/lib/asterisk/sounds/digits/de/h-9.gsm
 var/lib/asterisk/sounds/digits/de/hundred.gsm
 var/lib/asterisk/sounds/digits/de/million.gsm
+var/lib/asterisk/sounds/digits/de/millions.gsm
 var/lib/asterisk/sounds/digits/de/minus.gsm
 var/lib/asterisk/sounds/digits/de/mon-0.gsm
 var/lib/asterisk/sounds/digits/de/mon-1.gsm
@@ -805,46 +945,24 @@ var/lib/asterisk/sounds/digits/de/mon-7.gsm
 var/lib/asterisk/sounds/digits/de/mon-8.gsm
 var/lib/asterisk/sounds/digits/de/mon-9.gsm
 var/lib/asterisk/sounds/digits/de/oclock.gsm
-var/lib/asterisk/sounds/digits/de/oh.gsm
 var/lib/asterisk/sounds/digits/de/p-m.gsm
+var/lib/asterisk/sounds/digits/de/point.gsm
 var/lib/asterisk/sounds/digits/de/pound.gsm
-var/lib/asterisk/sounds/digits/de/star.gsm
 var/lib/asterisk/sounds/digits/de/thousand.gsm
 var/lib/asterisk/sounds/digits/de/today.gsm
 var/lib/asterisk/sounds/digits/de/tomorrow.gsm
-var/lib/asterisk/sounds/digits/de/xh-10x.gsm
-var/lib/asterisk/sounds/digits/de/xh-11x.gsm
-var/lib/asterisk/sounds/digits/de/xh-12x.gsm
-var/lib/asterisk/sounds/digits/de/xh-13x.gsm
-var/lib/asterisk/sounds/digits/de/xh-14x.gsm
-var/lib/asterisk/sounds/digits/de/xh-15x.gsm
-var/lib/asterisk/sounds/digits/de/xh-16x.gsm
-var/lib/asterisk/sounds/digits/de/xh-17x.gsm
-var/lib/asterisk/sounds/digits/de/xh-18x.gsm
-var/lib/asterisk/sounds/digits/de/xh-19x.gsm
-var/lib/asterisk/sounds/digits/de/xh-1x.gsm
-var/lib/asterisk/sounds/digits/de/xh-20x.gsm
-var/lib/asterisk/sounds/digits/de/xh-2x.gsm
-var/lib/asterisk/sounds/digits/de/xh-30x.gsm
-var/lib/asterisk/sounds/digits/de/xh-3x.gsm
-var/lib/asterisk/sounds/digits/de/xh-4x.gsm
-var/lib/asterisk/sounds/digits/de/xh-5x.gsm
-var/lib/asterisk/sounds/digits/de/xh-6x.gsm
-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/en
-var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.5
-var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.5
+#var/lib/asterisk/sounds/en
+var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.6
+var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.5.1
 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.5
-#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.5
-#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.5
-#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.5
-#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.5
-#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.5
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.6
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.5.1
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.6
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.5.1
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.6
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.5.1
 var/lib/asterisk/sounds/en/OfficeSpace.gsm
 var/lib/asterisk/sounds/en/Randulo-allison.gsm
 var/lib/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -1110,6 +1228,8 @@ 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-binaural-off.gsm
+var/lib/asterisk/sounds/en/confbridge-binaural-on.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
@@ -1210,7 +1330,7 @@ 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
 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
@@ -1224,7 +1344,7 @@ 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
 var/lib/asterisk/sounds/en/digits.gsm
 var/lib/asterisk/sounds/en/digits/0.gsm
 var/lib/asterisk/sounds/en/digits/1.gsm
@@ -1483,7 +1603,7 @@ var/lib/asterisk/sounds/en/got_kidding.gsm
 var/lib/asterisk/sounds/en/grammar.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
 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
@@ -1745,7 +1865,7 @@ 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
 var/lib/asterisk/sounds/en/letters/a.gsm
 var/lib/asterisk/sounds/en/letters/ascii123.gsm
 var/lib/asterisk/sounds/en/letters/ascii124.gsm
@@ -2017,7 +2137,7 @@ 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
 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
@@ -2268,7 +2388,7 @@ 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
 var/lib/asterisk/sounds/en/silence/1.gsm
 var/lib/asterisk/sounds/en/silence/10.gsm
 var/lib/asterisk/sounds/en/silence/2.gsm
@@ -2702,7 +2822,7 @@ 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
 var/lib/asterisk/sounds/en/wx/around.gsm
 var/lib/asterisk/sounds/en/wx/barometer.gsm
 var/lib/asterisk/sounds/en/wx/ceiling.gsm
@@ -2771,7 +2891,6 @@ var/lib/asterisk/sounds/letters/de/b.gsm
 var/lib/asterisk/sounds/letters/de/c.gsm
 var/lib/asterisk/sounds/letters/de/d.gsm
 var/lib/asterisk/sounds/letters/de/dash.gsm
-var/lib/asterisk/sounds/letters/de/dollar.gsm
 var/lib/asterisk/sounds/letters/de/dot.gsm
 var/lib/asterisk/sounds/letters/de/e.gsm
 var/lib/asterisk/sounds/letters/de/equals.gsm
@@ -2787,7 +2906,6 @@ var/lib/asterisk/sounds/letters/de/m.gsm
 var/lib/asterisk/sounds/letters/de/n.gsm
 var/lib/asterisk/sounds/letters/de/o.gsm
 var/lib/asterisk/sounds/letters/de/p.gsm
-var/lib/asterisk/sounds/letters/de/plus.gsm
 var/lib/asterisk/sounds/letters/de/q.gsm
 var/lib/asterisk/sounds/letters/de/r.gsm
 var/lib/asterisk/sounds/letters/de/s.gsm
@@ -2800,7 +2918,6 @@ var/lib/asterisk/sounds/letters/de/w.gsm
 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/phonetic
 #var/lib/asterisk/sounds/phonetic/de
 var/lib/asterisk/sounds/phonetic/de/9_p.gsm
@@ -2818,7 +2935,6 @@ var/lib/asterisk/sounds/phonetic/de/k_p.gsm
 var/lib/asterisk/sounds/phonetic/de/l_p.gsm
 var/lib/asterisk/sounds/phonetic/de/m_p.gsm
 var/lib/asterisk/sounds/phonetic/de/n_p.gsm
-var/lib/asterisk/sounds/phonetic/de/niner.gsm
 var/lib/asterisk/sounds/phonetic/de/o_p.gsm
 var/lib/asterisk/sounds/phonetic/de/p_p.gsm
 var/lib/asterisk/sounds/phonetic/de/q_p.gsm
@@ -2832,12 +2948,14 @@ 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/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/lib/asterisk/static-http/ajamdemo.html
+var/lib/asterisk/static-http/appdocsxml.xslt
+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/lib/asterisk/third-party
 #var/log/asterisk
 var/log/asterisk/cdr-csv
 var/log/asterisk/cdr-custom
@@ -2846,13 +2964,13 @@ var/log/asterisk/cel-custom
 var/spool/asterisk/dictate
 var/spool/asterisk/meetme
 var/spool/asterisk/monitor
+var/spool/asterisk/recording
 var/spool/asterisk/system
 var/spool/asterisk/tmp
 #var/spool/asterisk/voicemail
 #var/spool/asterisk/voicemail/default
 #var/spool/asterisk/voicemail/default/1234
 var/spool/asterisk/voicemail/default/1234/INBOX
-var/spool/asterisk/voicemail/default/1234/en
+#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
-etc/rc.d/init.d/asterisk
index 908434795bead4e6f66d204b8938fbdcadab77fd..dd548a93927f5123b698fb2616e4c52d73eb14e6 100644 (file)
@@ -3,10 +3,8 @@
 #etc/bacula/bacula-ctl-dir
 etc/bacula/bacula-ctl-fd
 #etc/bacula/bacula-ctl-sd
-etc/bacula/bacula-fd.conf
-#etc/bacula/bacula_config
+etc/bacula/bacula_config
 #etc/bacula/bconsole
-#etc/bacula/bconsole.conf
 #etc/bacula/btraceback.dbx
 #etc/bacula/btraceback.gdb
 #etc/bacula/btraceback.mdb
@@ -16,21 +14,7 @@ etc/bacula/bacula-fd.conf
 #etc/bacula/mtx-changer.conf
 etc/rc.d/init.d/bacula
 usr/lib/bpipe-fd.so
-usr/lib/libbac-5.2.13.so
-#usr/lib/libbac.la
-#usr/lib/libbac.so
-usr/lib/libbaccfg-5.2.13.so
-#usr/lib/libbaccfg.la
-#usr/lib/libbaccfg.so
-usr/lib/libbacfind-5.2.13.so
-#usr/lib/libbacfind.la
-#usr/lib/libbacfind.so
-usr/lib/libbacpy-5.2.13.so
-#usr/lib/libbacpy.la
-#usr/lib/libbacpy.so
-#usr/sbin/bacula
-usr/sbin/bacula-fd
-#usr/sbin/bconsole
+usr/sbin/bacula
 #usr/sbin/btraceback
 #usr/share/doc/bacula
 #usr/share/doc/bacula/ChangeLog
index 7a8ae9224c9dd6197e43fa16b0f1e71b31491870..370a871ae302d8a8fe7629eca8758210bd98393d 100644 (file)
@@ -5,7 +5,7 @@ etc/icinga/cgiauth.cfg
 etc/icinga/conf.d
 etc/icinga/icinga.cfg
 etc/icinga/modules
-etc/icinga/objects
+#etc/icinga/objects
 etc/icinga/objects/commands.cfg
 etc/icinga/objects/contacts.cfg
 etc/icinga/objects/localhost.cfg
@@ -47,7 +47,6 @@ usr/lib/icinga/plugins/check_ifoperstatus
 usr/lib/icinga/plugins/check_ifstatus
 usr/lib/icinga/plugins/check_imap
 usr/lib/icinga/plugins/check_ircd
-usr/lib/icinga/plugins/check_jabber
 usr/lib/icinga/plugins/check_ldap
 usr/lib/icinga/plugins/check_ldaps
 usr/lib/icinga/plugins/check_load
@@ -59,7 +58,6 @@ usr/lib/icinga/plugins/check_mysql
 usr/lib/icinga/plugins/check_mysql_query
 usr/lib/icinga/plugins/check_nagios
 usr/lib/icinga/plugins/check_nntp
-usr/lib/icinga/plugins/check_nntps
 usr/lib/icinga/plugins/check_nt
 usr/lib/icinga/plugins/check_ntp
 usr/lib/icinga/plugins/check_ntp_peer
@@ -73,12 +71,9 @@ usr/lib/icinga/plugins/check_procs
 usr/lib/icinga/plugins/check_real
 usr/lib/icinga/plugins/check_rpc
 usr/lib/icinga/plugins/check_sensors
-usr/lib/icinga/plugins/check_simap
 usr/lib/icinga/plugins/check_smtp
 usr/lib/icinga/plugins/check_snmp
-usr/lib/icinga/plugins/check_spop
 usr/lib/icinga/plugins/check_ssh
-usr/lib/icinga/plugins/check_ssmtp
 usr/lib/icinga/plugins/check_swap
 usr/lib/icinga/plugins/check_tcp
 usr/lib/icinga/plugins/check_time
@@ -87,15 +82,15 @@ usr/lib/icinga/plugins/check_ups
 usr/lib/icinga/plugins/check_uptime
 usr/lib/icinga/plugins/check_users
 usr/lib/icinga/plugins/check_wave
-usr/lib/icinga/plugins/eventhandlers
+#usr/lib/icinga/plugins/eventhandlers
 usr/lib/icinga/plugins/eventhandlers/disable_active_service_checks
 usr/lib/icinga/plugins/eventhandlers/disable_notifications
-usr/lib/icinga/plugins/eventhandlers/distributed-monitoring
+#usr/lib/icinga/plugins/eventhandlers/distributed-monitoring
 usr/lib/icinga/plugins/eventhandlers/distributed-monitoring/obsessive_svc_handler
 usr/lib/icinga/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
 usr/lib/icinga/plugins/eventhandlers/enable_active_service_checks
 usr/lib/icinga/plugins/eventhandlers/enable_notifications
-usr/lib/icinga/plugins/eventhandlers/redundancy-scenario1
+#usr/lib/icinga/plugins/eventhandlers/redundancy-scenario1
 usr/lib/icinga/plugins/eventhandlers/redundancy-scenario1/handle-master-host-event
 usr/lib/icinga/plugins/eventhandlers/redundancy-scenario1/handle-master-proc-event
 usr/lib/icinga/plugins/eventhandlers/submit_check_result
@@ -103,8 +98,8 @@ usr/lib/icinga/plugins/negate
 usr/lib/icinga/plugins/urlize
 usr/lib/icinga/plugins/utils.pm
 usr/lib/icinga/plugins/utils.sh
-usr/share/icinga
-usr/share/icinga/cgi-bin
+#usr/share/icinga
+#usr/share/icinga/cgi-bin
 usr/share/icinga/cgi-bin/avail.cgi
 usr/share/icinga/cgi-bin/cmd.cgi
 usr/share/icinga/cgi-bin/config.cgi
@@ -119,8 +114,8 @@ usr/share/icinga/cgi-bin/statusmap.cgi
 usr/share/icinga/cgi-bin/summary.cgi
 usr/share/icinga/cgi-bin/tac.cgi
 usr/share/icinga/cgi-bin/trends.cgi
-usr/share/icinga/docs
-usr/share/icinga/docs/de
+#usr/share/icinga/docs
+#usr/share/icinga/docs/de
 usr/share/icinga/docs/de/about.html
 usr/share/icinga/docs/de/activechecks.html
 usr/share/icinga/docs/de/adaptive.html
@@ -254,7 +249,7 @@ usr/share/icinga/docs/de/upgrading_idoutils.html
 usr/share/icinga/docs/de/verifyconfig.html
 usr/share/icinga/docs/de/volatileservices.html
 usr/share/icinga/docs/de/whatsnew.html
-usr/share/icinga/docs/en
+#usr/share/icinga/docs/en
 usr/share/icinga/docs/en/about.html
 usr/share/icinga/docs/en/activechecks.html
 usr/share/icinga/docs/en/adaptive.html
@@ -389,7 +384,7 @@ usr/share/icinga/docs/en/upgrading_idoutils.html
 usr/share/icinga/docs/en/verifyconfig.html
 usr/share/icinga/docs/en/volatileservices.html
 usr/share/icinga/docs/en/whatsnew.html
-usr/share/icinga/docs/images
+#usr/share/icinga/docs/images
 usr/share/icinga/docs/images/Architecture_1.5_800px.png
 usr/share/icinga/docs/images/IcingaWeb_BusinessProcess-150x150.png
 usr/share/icinga/docs/images/IcingaWeb_BusinessProcess.png
@@ -504,7 +499,7 @@ usr/share/icinga/docs/images/fig6.png
 usr/share/icinga/docs/images/fig7.png
 usr/share/icinga/docs/images/fig8.png
 usr/share/icinga/docs/images/fig9.png
-usr/share/icinga/docs/images/flags
+#usr/share/icinga/docs/images/flags
 usr/share/icinga/docs/images/flags/de.png
 usr/share/icinga/docs/images/flags/um_gb.png
 usr/share/icinga/docs/images/freshness.png
@@ -633,13 +628,13 @@ usr/share/icinga/docs/images/tip.png
 usr/share/icinga/docs/images/tuning.png
 usr/share/icinga/docs/images/upto.gif
 usr/share/icinga/docs/index.html
-usr/share/icinga/docs/js
+#usr/share/icinga/docs/js
 usr/share/icinga/docs/js/icinga-docs.js
 usr/share/icinga/docs/js/jquery-min.js
 usr/share/icinga/docs/robots.txt
-usr/share/icinga/docs/stylesheets
+#usr/share/icinga/docs/stylesheets
 usr/share/icinga/docs/stylesheets/icinga-docs.css
-usr/share/icinga/images
+#usr/share/icinga/images
 usr/share/icinga/images/Icinga_Header_Webinterface.jpg
 usr/share/icinga/images/Icinga_Header_Webinterface_Pixel.jpg
 usr/share/icinga/images/Icinga_TAC_Header_Webinterface.jpg
@@ -687,7 +682,7 @@ usr/share/icinga/images/icon_reload.png
 usr/share/icinga/images/info.png
 usr/share/icinga/images/left.gif
 usr/share/icinga/images/logofullsize.png
-usr/share/icinga/images/logos
+#usr/share/icinga/images/logos
 usr/share/icinga/images/logos/Stats1.gif
 usr/share/icinga/images/logos/Stats2.png
 usr/share/icinga/images/logos/equipment
@@ -1229,7 +1224,7 @@ usr/share/icinga/images/logos/equipment/workstation_locked.png
 usr/share/icinga/images/logos/equipment/www_server.gd2
 usr/share/icinga/images/logos/equipment/www_server.gif
 usr/share/icinga/images/logos/equipment/www_server.png
-usr/share/icinga/images/logos/hardware
+#usr/share/icinga/images/logos/hardware
 usr/share/icinga/images/logos/hardware/3ComSS2h500.gif
 usr/share/icinga/images/logos/hardware/3ComSS2h500.jpg
 usr/share/icinga/images/logos/hardware/3ComSS2h500.png
@@ -1445,7 +1440,7 @@ usr/share/icinga/images/logos/hardware/switch40.png
 usr/share/icinga/images/logos/icinga.gd2
 usr/share/icinga/images/logos/icinga.gif
 usr/share/icinga/images/logos/icingavrml.png
-usr/share/icinga/images/logos/other
+#usr/share/icinga/images/logos/other
 usr/share/icinga/images/logos/other/1.gd2
 usr/share/icinga/images/logos/other/1.gif
 usr/share/icinga/images/logos/other/1.png
@@ -1618,7 +1613,7 @@ usr/share/icinga/images/logos/s.gif
 usr/share/icinga/images/logos/switch.png
 usr/share/icinga/images/logos/unknown.gd2
 usr/share/icinga/images/logos/unknown.gif
-usr/share/icinga/images/logos/vendors
+#usr/share/icinga/images/logos/vendors
 usr/share/icinga/images/logos/vendors/3com.gd2
 usr/share/icinga/images/logos/vendors/3com.gif
 usr/share/icinga/images/logos/vendors/3com.png
@@ -2282,14 +2277,14 @@ usr/share/icinga/images/warning_triangle.gif
 usr/share/icinga/images/zoom1.gif
 usr/share/icinga/images/zoom2.gif
 usr/share/icinga/index.html
-usr/share/icinga/jquery-ui
-usr/share/icinga/jquery-ui-addon
+#usr/share/icinga/jquery-ui
+#usr/share/icinga/jquery-ui-addon
 usr/share/icinga/jquery-ui-addon/jquery.ui.timepicker-addon.css
 usr/share/icinga/jquery-ui-addon/jquery.ui.timepicker-addon.js
 usr/share/icinga/jquery-ui-addon/jquery.ui.timepicker-addon.min.js
-usr/share/icinga/jquery-ui/themes
-usr/share/icinga/jquery-ui/themes/base
-usr/share/icinga/jquery-ui/themes/base/images
+#usr/share/icinga/jquery-ui/themes
+#usr/share/icinga/jquery-ui/themes/base
+#usr/share/icinga/jquery-ui/themes/base/images
 usr/share/icinga/jquery-ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
 usr/share/icinga/jquery-ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
 usr/share/icinga/jquery-ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
@@ -2310,7 +2305,7 @@ usr/share/icinga/jquery-ui/themes/base/jquery.ui.core.css
 usr/share/icinga/jquery-ui/themes/base/jquery.ui.datepicker.css
 usr/share/icinga/jquery-ui/themes/base/jquery.ui.slider.css
 usr/share/icinga/jquery-ui/themes/base/jquery.ui.theme.css
-usr/share/icinga/jquery-ui/ui
+#usr/share/icinga/jquery-ui/ui
 usr/share/icinga/jquery-ui/ui/jquery.ui.autocomplete.js
 usr/share/icinga/jquery-ui/ui/jquery.ui.button.js
 usr/share/icinga/jquery-ui/ui/jquery.ui.core.js
@@ -2322,7 +2317,7 @@ usr/share/icinga/jquery-ui/ui/jquery.ui.mouse.js
 usr/share/icinga/jquery-ui/ui/jquery.ui.position.js
 usr/share/icinga/jquery-ui/ui/jquery.ui.slider.js
 usr/share/icinga/jquery-ui/ui/jquery.ui.widget.js
-usr/share/icinga/js
+#usr/share/icinga/js
 usr/share/icinga/js/autocomplete.js
 usr/share/icinga/js/checkbox_functions.js
 usr/share/icinga/js/common_functions.js
@@ -2334,15 +2329,15 @@ usr/share/icinga/js/menu.js
 usr/share/icinga/js/page_refresh.js
 usr/share/icinga/js/skinnytip.js
 usr/share/icinga/js/status_filter_functions.js
-usr/share/icinga/log
+#usr/share/icinga/log
 usr/share/icinga/log/.htaccess
 usr/share/icinga/log/index.htm
 usr/share/icinga/main.html
-usr/share/icinga/media
+#usr/share/icinga/media
 usr/share/icinga/menu.html
 usr/share/icinga/robots.txt
-usr/share/icinga/ssi
-usr/share/icinga/stylesheets
+#usr/share/icinga/ssi
+#usr/share/icinga/stylesheets
 usr/share/icinga/stylesheets/avail.css
 usr/share/icinga/stylesheets/checksanity.css
 usr/share/icinga/stylesheets/cmd.css
@@ -2362,9 +2357,9 @@ usr/share/icinga/stylesheets/summary.css
 usr/share/icinga/stylesheets/tac.css
 usr/share/icinga/stylesheets/tacheader.css
 usr/share/icinga/stylesheets/trends.css
-var/icinga
+#var/icinga
 var/icinga/archives
 var/icinga/rw
-var/icinga/spool
+#var/icinga/spool
 var/icinga/spool/checkresults
 var/ipfire/backup/addons/includes/icinga
diff --git a/config/rootfiles/packages/jansson b/config/rootfiles/packages/jansson
new file mode 100644 (file)
index 0000000..30184bd
--- /dev/null
@@ -0,0 +1,8 @@
+#usr/include/jansson.h
+#usr/include/jansson_config.h
+#usr/lib/libjansson.a
+#usr/lib/libjansson.la
+usr/lib/libjansson.so
+usr/lib/libjansson.so.4
+usr/lib/libjansson.so.4.10.0
+#usr/lib/pkgconfig/jansson.pc
index 28855fdc5c26578caad5132e03a290f45d1eb7fd..77b020818498f4471778339086cfc7fa6cce49c7 100644 (file)
@@ -100,10 +100,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        echo "    proxycachedir:      /var/cache/apache/proxy" >> $(DIR_APP)/config.layout
        echo "</Layout>" >> $(DIR_APP)/config.layout
 
-       cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event
+       cd $(DIR_APP) && ./configure                    \
+                       --enable-layout=IPFire          \
+                       --enable-ssl                    \
+                       --enable-mods-shared=all        \
+                       --enable-proxy                  \
+                       --with-mpm=event
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+
        chown -v root:root /usr/lib/apache/httpd.exp \
            /usr/bin/{apxs,dbmmanage} \
            /usr/sbin/apachectl \
index 31f6ec0fe83e32abd373939ec12720f705421fb3..2ed992f7b40b7cbfd055d5065136bb695b9bb4f5 100755 (executable)
@@ -20,7 +20,7 @@
 
 include Config
 
-VER        = 11.23.1
+VER        = 13.18.3
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -28,28 +28,28 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 20
+PAK_VER    = 21
 
-DEPS       = "libsrtp"
+DEPS       = "libsrtp jansson"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE) \
-       asterisk-1.4-de-prompts.tar.gz \
-       asterisk-extra-sounds-en-gsm-1.5.tar.gz \
+       asterisk-prompt-de_2.0.orig.tar.gz \
+       asterisk-extra-sounds-en-gsm-1.5.1.tar.gz \
        asterisk-moh-opsound-gsm-2.03.tar.gz 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-extra-sounds-en-gsm-1.5.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.5.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-extra-sounds-en-gsm-1.5.1.tar.gz      = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.5.1.tar.gz
+asterisk-moh-opsound-gsm-2.03.tar.gz           = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
+asterisk-prompt-de_2.0.orig.tar.gz             = $(URL_IPFIRE)/asterisk-prompt-de_2.0.orig.tar.gz
 
-$(DL_FILE)_MD5 = 8dadfcda24eac2f6df431c71f5f01947
-asterisk-extra-sounds-en-gsm-1.5.tar.gz_MD5 = 49f2baefc7aad424f30ff18d883501d2
-asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
-asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
+$(DL_FILE)_MD5 = cca924baa305f2e1a1ed098ac7e58ab7
+asterisk-extra-sounds-en-gsm-1.5.1.tar.gz_MD5  = aa1003ed984239f18e123decc39c2178
+asterisk-moh-opsound-gsm-2.03.tar.gz_MD5       = 09066f55f1358f298bc1a6e4678a3ddf
+asterisk-prompt-de_2.0.orig.tar.gz_MD5                 = fcdce354de8bc13db8a3a53ddab39bd9
 
 install : $(TARGET)
 
@@ -86,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
        # patch asterisk
-       cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/asterisk-no-ffmpeg.patch
+       #cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/asterisk-no-ffmpeg.patch
 
        # configure asterisk
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire \
@@ -111,7 +111,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                menuselect.makeopts
 
        # add additional sounds
-       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.5.tar.gz $(DIR_APP)/sounds/
+       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.5.1.tar.gz $(DIR_APP)/sounds/
        cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/
 
        # Fix wrong cpu optimization (march=armv5tel)
@@ -125,9 +125,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && 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
+       # add german sounds
+       tar xfz $(DIR_DL)/asterisk-prompt-de_2.0.orig.tar.gz && \
+       cp -vfr ast_prompts_de_v2_0/var/lib/asterisk/sounds/* /var/lib/asterisk/sounds
 
        # remove build directories
        @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*
@@ -139,7 +139,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown nobody:nobody -R /var/ipfire/asterisk
        chown nobody:nobody -R /var/lib/asterisk
 
-# be sure all source is removed
+       # be sure all source is removed
        @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/libsrtp*
 
        # remember backup-location
diff --git a/lfs/icu b/lfs/icu
new file mode 100644 (file)
index 0000000..f03f29c
--- /dev/null
+++ b/lfs/icu
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2015  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        = 60_1-src
+
+THISAPP    = icu4c-$(VER)
+DL_FILE    = $(THISAPP).tgz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/icu
+TARGET     = $(DIR_INFO)/icu
+PROG       = icu
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 3d164a2d1bcebd1464c6160ebb8315ef
+
+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)/source && ./configure \
+               --prefix=/usr
+
+       cd $(DIR_APP)/source && make $(MAKETUNING)
+       cd $(DIR_APP)/source && make install
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
+
diff --git a/lfs/jansson b/lfs/jansson
new file mode 100644 (file)
index 0000000..1540a43
--- /dev/null
@@ -0,0 +1,87 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2017  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        = 2.10
+
+THISAPP    = jansson-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = jansson
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 16a2c4e84c0a80ca61bd6e619a0f9358
+
+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/php b/lfs/php
index 8717ccac14c5c1dcbe1946bf600f92432e0187e1..665495998e9f3c8e7a8c9260a5acf8e785ff3e57 100644 (file)
--- a/lfs/php
+++ b/lfs/php
 
 include Config
 
-VER        = 5.3.27
+VER        = 7.2.0
 
 THISAPP    = php-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,15 +40,13 @@ endif
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) idn-0.1.tgz Log-1.9.11.tgz
+objects = $(DL_FILE) Log-1.13.1.tar.gz
 
-$(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)             = $(DL_FROM)/$(DL_FILE)
+Log-1.13.1.tar.gz      = $(DL_FROM)/Log-1.13.1.tar.gz
 
-$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
-idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
-Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
+$(DL_FILE)_MD5                 = ef8d4764f16d5f066e9893fe91887a31
+Log-1.13.1.tar.gz_MD5  = 058bb44515bbeb16ba590b5fb6357d68
 
 install : $(TARGET)
 
@@ -77,64 +75,78 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \
-               cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \
+       cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && ./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-apxs2 \
-            --enable-force-cgi-redirect \
-            --enable-discard-path \
-            --enable-fastcgi \
-            --with-config-file-path=/etc \
-            --with-openssl \
-            --with-kerberos \
-            --with-zlib \
-            --enable-bcmath \
-            --with-bz2 \
-            --enable-calendar \
-            --with-curl \
-            --with-curlwrappers \
-            --enable-dba=shared \
-            --with-gdbm \
-            --with-db4 \
-            --with-inifile \
-            --with-flatfile \
-            --enable-exif \
-            --enable-ftp \
-            --with-openssl-dir=/usr \
-            --with-gd=/usr \
-            --with-jpeg-dir=/usr \
-            --with-png-dir=/usr \
-            --with-zlib-dir=/usr \
-            --with-freetype-dir=/usr \
-            --with-gettext \
-            --with-gmp \
-            --enable-mbstring \
-            --with-mysql \
-            --with-mysql-sock=/var/run/mysql \
-            --with-ncurses \
-            --with-pdo-mysql \
-            --with-pdo-sqlite \
-            --with-readline \
-            --enable-sockets \
-            --with-xsl \
-            --with-iconv \
-            --enable-zip
+                       --prefix=/usr \
+                       --with-apxs2=/usr/bin/apxs \
+                       --with-config-file-path=/etc \
+                       --sysconfdir=/etc \
+                       --localstatedir=/var \
+                       --datadir=/usr/share/php \
+                       --mandir=/usr/share/man \
+                       --enable-maintainer-zts \
+                       --enable-zend-signals \
+                       --enable-intl \
+                       --with-icu-dir=/usr \
+                       --enable-calendar \
+                       --enable-cli \
+                       --enable-dba=shared \
+                       --enable-ftp \
+                       --enable-bcmath \
+                       --enable-mbstring \
+                       --enable-simplexml \
+                       --enable-json \
+                       --enable-exif \
+                       --enable-fpm \
+                       --with-fpm-group=nobody \
+                       --with-fpm-user=nobody \
+                       --enable-opcache \
+                       --enable-session \
+                       --enable-soap \
+                       --enable-sockets \
+                       --enable-pcntl \
+                       --enable-sysvsem \
+                       --enable-sysvmsg \
+                       --enable-sysvshm \
+                       --enable-zip \
+                       --with-pcre-regex=/usr \
+                       --with-bz2 \
+                       --with-curl \
+                       --with-db4 \
+                       --with-gd \
+                       --with-gdbm \
+                       --with-gmp \
+                       --with-gettext \
+                       --with-xsl=/usr \
+                       --with-iconv \
+                       --with-readline \
+                       --with-openssl \
+                       --with-openssl-dir=/usr \
+                       --with-tsrm-pthreads \
+                       --with-mysql-sock=/var/run/mysql/mysql.sock \
+                       --with-mysqli=mysqlnd \
+                       --with-pdo-sqlite \
+                       --with-pdo-mysql=mysqlnd \
+                       --with-jpeg-dir=/usr \
+                       --with-png-dir=/usr \
+                       --with-zlib \
+                       --with-zlib-dir=/usr \
+                       --with-freetype-dir=/usr \
+                       --disable-ipv6
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+
        cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
        -grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
        mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.1.tgz
-       -rm -f $(DIR_SRC)/package.xml
-       cd $(DIR_SRC)/idn-* && phpize
-       cd $(DIR_SRC)/idn-* && ./configure --prefix=/usr --with-idn
-       cd $(DIR_SRC)/idn-* && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_SRC)/idn-* && make install
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.9.11.tgz
+
+       # Install Log
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.13.1.tar.gz
        -rm -f $(DIR_SRC)/package.xml
        cd $(DIR_SRC)/Log-* && cp -av Log Log.php /usr/lib/php 
-       @rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml
+
+       @rm -rf $(DIR_APP) $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml
        @$(POSTBUILD)
index 774928bdcb58f108a5df471187a81f30d2d43d7c..a17de7a06a9a98e8e1d6460573668c637527b9fa 100644 (file)
--- a/lfs/wget
+++ b/lfs/wget
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \
-               --with-ssl=openssl \
+               --with-ssl=gnutls \
                --disable-nls \
                --disable-ipv6