webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into kernel-update

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-06-23 13:12:37 +02:00
parent c29b052461 6f7fcbf2ad
commit e384ca20f6
29 changed files with 2200 additions and 1949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
config/asterisk/asterisk.makeopts
View File

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

18
config/rootfiles/common/bison
View File

@@ -1,18 +1,32 @@
#usr/bin/bison
#usr/bin/yacc
#usr/info/bison.info
#usr/lib/liby.a
#usr/man/man1/bison.1
#usr/share/aclocal
#usr/share/aclocal/bison-i18n.m4
#usr/share/bison
#usr/share/bison/README
#usr/share/bison/bison.m4
#usr/share/bison/c++-skel.m4
#usr/share/bison/c++.m4
#usr/share/bison/c-skel.m4
#usr/share/bison/c.m4
#usr/share/bison/glr.c
#usr/share/bison/glr.cc
#usr/share/bison/java-skel.m4
#usr/share/bison/java.m4
#usr/share/bison/lalr1.cc
#usr/share/bison/lalr1.java
#usr/share/bison/location.cc
#usr/share/bison/m4sugar
#usr/share/bison/m4sugar/foreach.m4
#usr/share/bison/m4sugar/m4sugar.m4
#usr/share/bison/stack.hh
#usr/share/bison/xslt
#usr/share/bison/xslt/bison.xsl
#usr/share/bison/xslt/xml2dot.xsl
#usr/share/bison/xslt/xml2text.xsl
#usr/share/bison/xslt/xml2xhtml.xsl
#usr/share/bison/yacc.c
#usr/share/info/bison.info
#usr/share/man/man1/bison.1
#usr/share/man/man1/yacc.1

6
config/rootfiles/common/flex
View File

@@ -4,11 +4,7 @@
#usr/info/flex.info
#usr/info/flex.info-1
#usr/info/flex.info-2
#usr/info/flex.info-3
#usr/info/flex.info-4
#usr/info/flex.info-5
#usr/info/flex.info-6
#usr/info/flex.info-7
#usr/lib/libfl.a
#usr/lib/libfl_pic.a
#usr/lib/libl.a
#usr/man/man1/flex.1

5
config/rootfiles/common/m4
View File

@@ -1,2 +1,5 @@
#usr/bin/m4
#usr/info/m4.info
#usr/share/info/m4.info
#usr/share/info/m4.info-1
#usr/share/info/m4.info-2
#usr/share/man/man1/m4.1

1
config/rootfiles/common/openvpn
View File

@@ -8,6 +8,7 @@ usr/sbin/openvpn
var/ipfire/ovpn
var/ipfire/ovpn/ca
var/ipfire/ovpn/caconfig
var/ipfire/ovpn/ccd
#var/ipfire/ovpn/certs
var/ipfire/ovpn/certs/index.txt
var/ipfire/ovpn/certs/serial

68
config/rootfiles/common/pam
View File

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

1
config/rootfiles/core/61/filelists/files
View File

@@ -5,3 +5,4 @@ srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
usr/sbin/redirect_wrapper

1
config/rootfiles/core/61/filelists/logwatch Symbolic link
View File

@@ -0,0 +1 @@
../../../common/logwatch

1
config/rootfiles/core/61/filelists/squid Symbolic link
View File

@@ -0,0 +1 @@
../../../common/squid

1
config/rootfiles/core/61/update.sh
View File

@@ -41,6 +41,7 @@ extract_files
#
#Start services
/etc/init.d/squid restart &>/dev/null
#
#Update Language cache

3783
config/rootfiles/packages/asterisk
View File

File diff suppressed because it is too large Load Diff

6
config/rootfiles/packages/clamav
View File

@@ -10,15 +10,15 @@ usr/bin/sigtool
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
usr/lib/libclamav.so.6.1.13
usr/lib/libclamav.so.6.1.14
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
usr/lib/libclamunrar.so.6.1.13
usr/lib/libclamunrar.so.6.1.14
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
usr/lib/libclamunrar_iface.so.6.1.13
usr/lib/libclamunrar_iface.so.6.1.14
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav

4
config/urlfilter/redirect_wrapper
View File

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