From 4fc61b9a098ceda37677bb4752eb7ff83a6d40ed Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 11 Feb 2015 19:36:55 +0100 Subject: [PATCH] Rootfile update --- config/rootfiles/common/collectd | 20 +++++++------ config/rootfiles/common/openvpn | 2 +- config/rootfiles/packages/asterisk | 46 ++++++------------------------ 3 files changed, 20 insertions(+), 48 deletions(-) diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 5c2064dbdc..72b2dee033 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -213,15 +213,18 @@ usr/lib/collectd/write_http.so usr/lib/libcollectdclient.so usr/lib/libcollectdclient.so.0 usr/lib/libcollectdclient.so.0.0.0 -#usr/lib/perl5/site_perl/5.12.3/Collectd -#usr/lib/perl5/site_perl/5.12.3/Collectd.pm -#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins -#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/Monitorus.pm -#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/OpenVZ.pm -#usr/lib/perl5/site_perl/5.12.3/Collectd/Unixsock.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd/.packlist +#usr/lib/perl5/Collectd +#usr/lib/perl5/Collectd.pm +#usr/lib/perl5/Collectd/Plugins +#usr/lib/perl5/Collectd/Plugins/OpenVZ.pm +#usr/lib/perl5/Collectd/Unixsock.pm +#usr/lib/perl5/i586-linux-thread-multi +#usr/lib/perl5/i586-linux-thread-multi/auto +#usr/lib/perl5/i586-linux-thread-multi/auto/Collectd +#usr/lib/perl5/i586-linux-thread-multi/auto/Collectd/.packlist +#usr/lib/perl5/i586-linux-thread-multi/perllocal.pod #usr/lib/pkgconfig/libcollectdclient.pc +#usr/man/man3/Collectd::Unixsock.3 usr/sbin/collectd usr/sbin/collectdmon #usr/share/collectd @@ -230,7 +233,6 @@ usr/share/collectd/types.db #usr/share/man/man1/collectd-nagios.1 #usr/share/man/man1/collectd.1 #usr/share/man/man1/collectdmon.1 -#usr/share/man/man3/Collectd::Unixsock.3 #usr/share/man/man5/collectd-email.5 #usr/share/man/man5/collectd-exec.5 #usr/share/man/man5/collectd-java.5 diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index d1b836a1b4..b58e30c535 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -17,7 +17,6 @@ usr/sbin/openvpn #usr/share/doc/openvpn/README.polarssl #usr/share/doc/openvpn/management-notes.txt #usr/share/man/man8/openvpn.8 -var/ipfire/ovpn var/ipfire/ovpn/ca var/ipfire/ovpn/caconfig var/ipfire/ovpn/ccd @@ -32,3 +31,4 @@ var/ipfire/ovpn/ovpn-leases.db var/ipfire/ovpn/ovpnconfig var/ipfire/ovpn/scripts var/ipfire/ovpn/settings +var/log/openvpn diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 332c22b96c..6654621a20 100755 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -1,6 +1,6 @@ -usr/lib/libsrtp.so 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 @@ -156,38 +156,6 @@ etc/rc.d/rc6.d/K30asterisk #usr/include/asterisk/xml.h #usr/include/asterisk/xmldoc.h #usr/include/asterisk/xmpp.h -#usr/include/srtp -#usr/include/srtp/aes.h -#usr/include/srtp/aes_cbc.h -#usr/include/srtp/aes_icm.h -#usr/include/srtp/alloc.h -#usr/include/srtp/auth.h -#usr/include/srtp/cipher.h -#usr/include/srtp/config.h -#usr/include/srtp/crypto.h -#usr/include/srtp/crypto_kernel.h -#usr/include/srtp/crypto_math.h -#usr/include/srtp/crypto_types.h -#usr/include/srtp/cryptoalg.h -#usr/include/srtp/datatypes.h -#usr/include/srtp/err.h -#usr/include/srtp/gf2_8.h -#usr/include/srtp/hmac.h -#usr/include/srtp/integers.h -#usr/include/srtp/kernel_compat.h -#usr/include/srtp/key.h -#usr/include/srtp/null_auth.h -#usr/include/srtp/null_cipher.h -#usr/include/srtp/prng.h -#usr/include/srtp/rand_source.h -#usr/include/srtp/rdb.h -#usr/include/srtp/rdbx.h -#usr/include/srtp/rtp.h -#usr/include/srtp/sha1.h -#usr/include/srtp/srtp.h -#usr/include/srtp/stat.h -#usr/include/srtp/ut_sim.h -#usr/include/srtp/xfm.h #usr/lib/asterisk #usr/lib/asterisk/modules usr/lib/asterisk/modules/app_adsiprog.so @@ -298,7 +266,6 @@ usr/lib/asterisk/modules/format_h263.so usr/lib/asterisk/modules/format_h264.so usr/lib/asterisk/modules/format_ilbc.so usr/lib/asterisk/modules/format_jpeg.so -#usr/lib/asterisk/modules/format_ogg_vorbis.so usr/lib/asterisk/modules/format_pcm.so usr/lib/asterisk/modules/format_siren14.so usr/lib/asterisk/modules/format_siren7.so @@ -370,7 +337,6 @@ usr/lib/asterisk/modules/res_convert.so 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_fax_spandsp.so usr/lib/asterisk/modules/res_format_attr_celt.so usr/lib/asterisk/modules/res_format_attr_h263.so usr/lib/asterisk/modules/res_format_attr_h264.so @@ -393,7 +359,6 @@ usr/lib/asterisk/modules/res_timing_pthread.so usr/lib/asterisk/modules/res_timing_timerfd.so usr/lib/libasteriskssl.so usr/lib/libasteriskssl.so.1 -#usr/lib/libsrtp.a #usr/lib/pkgconfig/asterisk.pc usr/sbin/astcanary usr/sbin/astdb2bdb @@ -420,7 +385,7 @@ var/ipfire/asterisk/app_mysql.conf var/ipfire/asterisk/app_skel.conf var/ipfire/asterisk/asterisk.adsi var/ipfire/asterisk/asterisk.conf -#var/ipfire/asterisk/asterisk.makeopts +var/ipfire/asterisk/asterisk.logrotate var/ipfire/asterisk/calendar.conf var/ipfire/asterisk/ccss.conf var/ipfire/asterisk/cdr.conf @@ -874,6 +839,12 @@ var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26 var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.15 var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm var/lib/asterisk/sounds/en/1-yes-2-no.gsm +#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15 +#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15 +#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15 var/lib/asterisk/sounds/en/OfficeSpace.gsm var/lib/asterisk/sounds/en/Randulo-allison.gsm var/lib/asterisk/sounds/en/SIP_Test_Failure.gsm @@ -2884,4 +2855,3 @@ var/spool/asterisk/voicemail/default/1234/INBOX 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 -- 2.39.5