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

This commit is contained in:
Arne Fitzenreiter
2012-06-23 13:12:37 +02:00
29 changed files with 2200 additions and 1949 deletions

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

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

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

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

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

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

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

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

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);

View File

@@ -356,7 +356,7 @@ END
END
my $id = 0;
my $gif;
foreach my $key (keys %confighash) {
foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {

View File

@@ -334,6 +334,7 @@ sub writeserverconf {
print CONF "port $sovpnsettings{'DDEST_PORT'}\n";
print CONF "script-security 3 system\n";
print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n";
print CONF "client-config-dir /var/ipfire/ovpn/ccd\n";
print CONF "tls-server\n";
print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n";
print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n";
@@ -358,7 +359,7 @@ sub writeserverconf {
if ($sovpnsettings{MSSFIX} eq 'on') {
print CONF "mssfix\n";
}
if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
if (($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{FRAGMENT} ne 0) && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
}
if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {
@@ -2910,7 +2911,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
# Sign the certificate request and move it
# Sign the host certificate request
system('/usr/bin/openssl', 'ca', '-days', '999999',
system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}",
'-batch', '-notext',
'-in', $filename,
'-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem",
@@ -3089,7 +3090,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
}
# Sign the host certificate request
system('/usr/bin/openssl', 'ca', '-days', '999999',
system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}",
'-batch', '-notext',
'-in', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}req.pem",
'-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem",
@@ -3873,7 +3874,7 @@ END
;
my $id = 0;
my $gif;
foreach my $key (keys %confighash) {
foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {

View File

@@ -1383,10 +1383,10 @@
'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus Symbol.',
'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
'pakfire installed addons' => 'Installierte Addons:',
'pakfire last core list update' => 'Letztes Corelisten Update vor',
'pakfire last package update' => 'Letztes Paketlisten Update vor',
'pakfire last serverlist update' => 'Letztes Serverlisten Update vor',
'pakfire last update' => 'Letzes Update vor',
'pakfire last core list update' => 'Letztes Corelisten Update ist',
'pakfire last package update' => 'Letztes Paketlisten Update ist',
'pakfire last serverlist update' => 'Letztes Serverlisten Update ist',
'pakfire last update' => 'Letzes Update ist',
'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen sie unten eine Liste.',
'pakfire register' => 'Registrierung am Pakfire-Server:',
'pakfire system state' => 'System Status',

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.4.42
VER = 1.8.13.0
THISAPP = asterisk-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = asterisk
PAK_VER = 6
PAK_VER = 7
CHAN_CAPI = chan_capi-1.1.4
CHAN_CAPI = chan_capi-20120614
DEPS = "libpri libtiff libvorbis libogg spandsp netsnmpd"
@@ -47,24 +47,21 @@ objects = $(DL_FILE) \
asterisk-core-sounds-en-gsm-1.4.22.tar.gz \
asterisk-extra-sounds-en-gsm-1.4.11.tar.gz \
asterisk-moh-opsound-gsm-2.03.tar.gz \
asterisk-addons-1.4.13.tar.gz \
$(CHAN_CAPI).tar.gz
$(CHAN_CAPI).tgz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
asterisk-core-sounds-en-gsm-1.4.22.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz
asterisk-extra-sounds-en-gsm-1.4.11.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
asterisk-addons-1.4.13.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.13.tar.gz
$(CHAN_CAPI).tar.gz = $(URL_IPFIRE)/$(CHAN_CAPI).tar.gz
$(CHAN_CAPI).tgz = $(URL_IPFIRE)/$(CHAN_CAPI).tgz
$(DL_FILE)_MD5 = 332f2f67e0eefe84b1e55320eab45166
$(DL_FILE)_MD5 = e7f2cb19068c1211c907062f9e96c47a
asterisk-core-sounds-en-gsm-1.4.22.tar.gz_MD5 = 2a99a45c0675135255bc65796b12f7c6
asterisk-extra-sounds-en-gsm-1.4.11.tar.gz_MD5 = 5479cb4cb81d678304d96f35e4933a11
asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
asterisk-addons-1.4.13.tar.gz_MD5 = e59471b6f25901a82e45b9e5e0c73703
$(CHAN_CAPI).tar.gz_MD5 = 18fa835e724b7814deafbfa5b8cb01eb
$(CHAN_CAPI).tgz_MD5 = c190f44eb362bf258b27f92c3458e4bf
install : $(TARGET)
@@ -122,16 +119,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
cd $(DIR_APP) && make samples
# extract and configure asterisk-addons
cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.13.tar.gz
cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr --sysconfdir=/var/ipfire
# enable additional features (--> NOT NEEDED, DEFAULT CONFIG INCLUDES ALL)
#cd $(DIR_SRC)/asterisk-addons-* && cp -f $(DIR_SRC)/config/asterisk/addons.makeopts menuselect.makeopts
# make and install asterisk-addons
cd $(DIR_SRC)/asterisk-addons-* && make $(MAKETUNING) all
cd $(DIR_SRC)/asterisk-addons-* && make install
cd $(DIR_SRC)/asterisk-addons-* && make samples
# add german sounds and remove README.txt
tar xfz $(DIR_DL)/asterisk-1.4-de-prompts.tar.gz -C /var/lib/asterisk/sounds/
-rm -f /var/lib/asterisk/sounds/README.txt
@@ -147,10 +134,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -f -s /var/ipfire/asterisk/wakeup/wakeup.sh /etc/fcron.minutely/wakeup.sh
# build and install chan capi (needed for isdn)
cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tar.gz
cd $(DIR_SRC)/$(CHAN_CAPI) && make $(MAKETUNING)
cd $(DIR_SRC)/$(CHAN_CAPI) && make install
@rm -rf $(DIR_SRC)/$(CHAN_CAPI)
cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tgz
cd $(DIR_SRC)/chan-capi-HEAD && sed -i -e 's/^CFLAGS+=-Wno-unused-but-set-variable$$//' Makefile
cd $(DIR_SRC)/chan-capi-HEAD && make $(MAKETUNING)
cd $(DIR_SRC)/chan-capi-HEAD && make install
@rm -rf $(DIR_SRC)/chan-capi-HEAD
# be sure all source is removed
@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*

View File

@@ -24,10 +24,10 @@
include Config
VER = 2.2
VER = 2.5.1
THISAPP = bison-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects =$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e345a5d021db850f06ce49eba78af027
$(DL_FILE)_MD5 = 8fedf916f1aa2c4a31441d8f8bbc603c
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
# Disable NLS
#cd $(DIR_APP) && echo '#define YYENABLE_NLS 1' >> config.h

View File

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

View File

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

View File

@@ -86,7 +86,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_SRC)/foomatic-* && cd $(DIR_SRC) && \
@rm -rf $(DIR_SRC)/foomatic-* /usr/share/foomatic && cd $(DIR_SRC) && \
tar zxf $(DIR_DL)/$(DL_FILE) && \
tar zxf $(DIR_DL)/foomatic-db-$(DATE).tar.gz && \
tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz && \

10
lfs/lcr
View File

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

View File

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

8
lfs/m4
View File

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

View File

@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/plugin/down-root && make
cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn
-mkdir -vp /var/ipfire/ovpn/ca
-mkdir -vp /var/ipfire/ovpn/ccd
-mkdir -vp /var/ipfire/ovpn/crls
-mkdir -vp /var/ipfire/ovpn/n2nconf
-mkdir -vp /var/ipfire/ovpn/scripts

View File

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

View File

@@ -105,7 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-ipf-transparent \
--enable-kill-parent-hack \
--disable-wccpv2 \
--disable-icap-client \
--enable-icap-client \
--disable-esi
cd $(DIR_APP) && make $(MAKETUNING)

View File

@@ -0,0 +1,13 @@
--- Logwatch.pm.orig 2012-06-20 09:58:12.786294471 +0200
+++ Logwatch.pm 2012-06-20 09:41:59.443055298 +0200
@@ -4,6 +4,10 @@
package Logwatch;
+# Define interace version 5 for Date::Manip
+BEGIN {
+ $Date::Manip::Backend = 'DM5';
+}
use strict;
use Exporter;
use POSIX qw(strftime);

View File

@@ -1,50 +0,0 @@
--- Linux-PAM-0.99.3.0/configure.in.host-name-max 2005-12-12 19:56:27.000000000 +0300
+++ Linux-PAM-0.99.3.0/configure.in 2006-01-28 01:31:58.000000000 +0300
@@ -395,6 +395,46 @@
AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
AC_CHECK_FUNCS(getgrouplist getline getdelim)
+AH_BOTTOM([#ifndef HAVE_HOST_NAME_MAX
+ #ifdef HAVE_MAXHOSTNAME
+ #include <sys/param.h>
+ #define HOST_NAME_MAX MAXHOSTNAME
+ #else
+ #define HOST_NAME_MAX 64
+ #endif
+#endif])
+ac_cv_maxhostname_defined=no
+AC_CACHE_CHECK([[whether HOST_NAME_MAX is defined in limits.h]],
+[ac_cv_host_name_max_defined],
+[AC_COMPILE_IFELSE([[#include <limits.h>
+
+char name[HOST_NAME_MAX];
+
+int main()
+{
+ return 0;
+}]], [ac_cv_host_name_max_defined=yes
+ AC_MSG_RESULT([ac_cv_host_name_max_defined])],
+[ac_cv_host_name_max_defined=no
+AC_MSG_RESULT([ac_cv_host_name_max_defined])
+AC_CACHE_CHECK([[whether MAXHOSTNAME is defined in sys/param.h]],
+[ac_cv_maxhostname_defined],
+[AC_COMPILE_IFELSE([[#include <sys/param.h>
+
+char name[MAXHOSTNAME];
+
+int main()
+{
+return 0;
+}]], [ac_cv_maxhostname_defined=yes], [ac_cv_maxhostname_defined=no])])
+AC_MSG_RESULT([ac_cv_maxhostname_defined])])])
+if test $ac_cv_host_name_max_defined = yes; then
+AC_DEFINE([HAVE_HOST_NAME_MAX], 1, [Define if system header limits.h defines HOST_NAME_MAX])
+fi
+if test $ac_cv_maxhostname_defined = yes; then
+AC_DEFINE([HAVE_MAXHOSTNAME], 1, [Define if system header sys/param.h defines MAXHOSTNAME])
+fi
+
dnl Checks for programs/utilities
AC_CHECK_PROG(SGML2PS, sgml2ps, yes, no)
AC_CHECK_PROG(SGML2TXT, sgml2txt, yes, no)