Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

Conflicts:
	config/etc/logrotate.conf
	config/rootfiles/packages/asterisk
This commit is contained in:
Dirk Wagner
2014-07-27 22:35:56 +02:00
107 changed files with 24487 additions and 1721 deletions

View File

@@ -12,6 +12,7 @@
/etc/hosts*
/etc/httpd/*
/etc/ssh/ssh_host*
/etc/logrotate.d
/var/ipfire/auth/users
/var/ipfire/dhcp/*
/var/ipfire/dnsforward/*

View File

@@ -0,0 +1 @@
/etc/bacula/

View File

@@ -0,0 +1 @@
/etc/check_mk/

View File

@@ -0,0 +1,2 @@
/srv/web/owncloud/config
/var/owncloud/data

View File

@@ -0,0 +1 @@
. 3600 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0=

View File

@@ -598,6 +598,19 @@ sub checksubnets
if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
}
sub check_net_internal{
my $network=shift;
my ($ip,$cidr)=split(/\//,$network);
my %ownnet=();
my $errormessage;
$cidr=&iporsubtocidr($cidr);
#check if we use one of ipfire's networks (green,orange,blue)
&readhash("${General::swroot}/ethernet/settings", \%ownnet);
if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
}
sub validport
{
@@ -1174,4 +1187,16 @@ sub firewall_reload() {
system("/usr/local/bin/firewallctrl");
}
# Function which will return the used interface for the red network zone (red0, ppp0, etc).
sub get_red_interface() {
open(IFACE, "${General::swroot}/red/iface") or die "Could not open /var/ipfire/red/iface";
my $interface = <IFACE>;
close(IFACE);
chomp $interface;
return $interface;
}
1;

View File

@@ -142,6 +142,8 @@ sub genmenu {
my %sublogshash = ();
my $sublogs = \%sublogshash;
if ( -e "/var/ipfire/main/gpl_accepted") {
eval `/bin/cat /var/ipfire/menu.d/*.menu`;
eval `/bin/cat /var/ipfire/menu.d/*.main`;
@@ -159,6 +161,7 @@ sub genmenu {
if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "" ) {
$menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
}
}
}
sub showhttpheaders

View File

@@ -24,12 +24,10 @@ HOME=/
*/5 * * * * /usr/local/bin/makegraphs >/dev/null
17 5 * * * /etc/init.d/tmpfs backup >/dev/null
# Force update the dynamic dns registration once a week
# Force update even if IP has not changed once a month if 'minimize update' selected in GUI
# to avoid account declared as dead
*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl
9 2 * * 0 [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl -f
3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl -f -m
# Update dynamic DNS records every five minutes.
# Force an update once a month
*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all
3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force
# Logwatch
01 0 * * * /usr/local/bin/logwatch > /var/log/logwatch/`date -I -d yesterday`; \

View File

@@ -25,6 +25,7 @@ stunnel:x:51:
lock:x:54:
sshd:x:74:
pcap:x:77:
wbpriv:x:88:squid
nobody:x:99:
users:x:100:
snort:x:101:

View File

@@ -10,7 +10,7 @@ create
# uncomment this if you want your log files compressed
compress
# packages drop log rotation information into this directory
# packages drop log rotation information into this directory
include /etc/logrotate.d
# wtmp

View File

@@ -0,0 +1,21 @@
Listen 1011
<VirtualHost *:1011>
DocumentRoot /srv/web/owncloud
SSLEngine on
SSLProtocol all -SSLv2
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128:AES256:HIGH:!RC4:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK
SSLHonorCipherOrder on
SSLCertificateFile /etc/httpd/owncloud.crt
SSLCertificateKeyFile /etc/httpd/owncloud.key
Include /etc/httpd/conf/conf.d/php*.conf
<Directory /srv/web/owncloud>
Options Indexes FollowSymlinks MultiViews
AllowOverride ALL
Order allow,deny
Allow from all
</Directory>
</VirtualHost>

View File

@@ -1,21 +1,15 @@
#usr/include/gmp.h
#usr/include/gmpxx.h
#usr/include/mp.h
#usr/lib/libgmp.a
#usr/lib/libgmp.la
#usr/lib/libgmp.so
usr/lib/libgmp.so.10
usr/lib/libgmp.so.10.0.5
usr/lib/libgmp.so.10.2.0
#usr/lib/libgmpxx.a
#usr/lib/libgmpxx.la
#usr/lib/libgmpxx.so
usr/lib/libgmpxx.so.4
usr/lib/libgmpxx.so.4.2.5
#usr/lib/libmp.a
#usr/lib/libmp.la
#usr/lib/libmp.so
usr/lib/libmp.so.3
usr/lib/libmp.so.3.1.25
usr/lib/libgmpxx.so.4.4.0
#usr/share/info/gmp.info
#usr/share/info/gmp.info-1
#usr/share/info/gmp.info-2

View File

@@ -24,6 +24,7 @@ etc/rc.d/init.d/console
#etc/rc.d/init.d/cyrus-imapd
#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/fcron
#etc/rc.d/init.d/fetchmail
@@ -130,7 +131,6 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d

View File

@@ -1,8 +1,9 @@
etc/trusted-key.key
usr/bin/dig
usr/bin/host
usr/bin/nslookup
usr/bin/nsupdate
#usr/man/man1/dig.1
#usr/man/man1/host.1
#usr/man/man1/nslookup.1
#usr/man/man8/nsupdate.8
#usr/share/man/man1/dig.1
#usr/share/man/man1/host.1
#usr/share/man/man1/nslookup.1
#usr/share/man/man1/nsupdate.1

10938
config/rootfiles/common/boost Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,63 @@
usr/bin/ddns
usr/lib/python2.7/site-packages/ddns
usr/lib/python2.7/site-packages/ddns/__init__.py
usr/lib/python2.7/site-packages/ddns/__init__.pyc
usr/lib/python2.7/site-packages/ddns/__init__.pyo
usr/lib/python2.7/site-packages/ddns/__version__.py
usr/lib/python2.7/site-packages/ddns/__version__.pyc
usr/lib/python2.7/site-packages/ddns/__version__.pyo
usr/lib/python2.7/site-packages/ddns/errors.py
usr/lib/python2.7/site-packages/ddns/errors.pyc
usr/lib/python2.7/site-packages/ddns/errors.pyo
usr/lib/python2.7/site-packages/ddns/i18n.py
usr/lib/python2.7/site-packages/ddns/i18n.pyc
usr/lib/python2.7/site-packages/ddns/i18n.pyo
usr/lib/python2.7/site-packages/ddns/providers.py
usr/lib/python2.7/site-packages/ddns/providers.pyc
usr/lib/python2.7/site-packages/ddns/providers.pyo
usr/lib/python2.7/site-packages/ddns/system.py
usr/lib/python2.7/site-packages/ddns/system.pyc
usr/lib/python2.7/site-packages/ddns/system.pyo
#usr/share/doc/ddns
#usr/share/doc/ddns/COPYING
#usr/share/locale/ar/LC_MESSAGES/ddns.mo
#usr/share/locale/ca/LC_MESSAGES/ddns.mo
#usr/share/locale/cs_CZ
#usr/share/locale/cs_CZ/LC_MESSAGES
#usr/share/locale/cs_CZ/LC_MESSAGES/ddns.mo
#usr/share/locale/da/LC_MESSAGES/ddns.mo
#usr/share/locale/de/LC_MESSAGES/ddns.mo
#usr/share/locale/el_GR
#usr/share/locale/el_GR/LC_MESSAGES
#usr/share/locale/el_GR/LC_MESSAGES/ddns.mo
#usr/share/locale/es/LC_MESSAGES/ddns.mo
#usr/share/locale/fa/LC_MESSAGES/ddns.mo
#usr/share/locale/fr/LC_MESSAGES/ddns.mo
#usr/share/locale/hu/LC_MESSAGES/ddns.mo
#usr/share/locale/id/LC_MESSAGES/ddns.mo
#usr/share/locale/it/LC_MESSAGES/ddns.mo
#usr/share/locale/ja/LC_MESSAGES/ddns.mo
#usr/share/locale/km_KH
#usr/share/locale/km_KH/LC_MESSAGES
#usr/share/locale/km_KH/LC_MESSAGES/ddns.mo
#usr/share/locale/nl/LC_MESSAGES/ddns.mo
#usr/share/locale/pl/LC_MESSAGES/ddns.mo
#usr/share/locale/pt_BR/LC_MESSAGES/ddns.mo
#usr/share/locale/pt_PT/LC_MESSAGES/ddns.mo
#usr/share/locale/ro_RO
#usr/share/locale/ro_RO/LC_MESSAGES
#usr/share/locale/ro_RO/LC_MESSAGES/ddns.mo
#usr/share/locale/ru/LC_MESSAGES/ddns.mo
#usr/share/locale/sq/LC_MESSAGES/ddns.mo
#usr/share/locale/sv/LC_MESSAGES/ddns.mo
#usr/share/locale/th/LC_MESSAGES/ddns.mo
#usr/share/locale/tk
#usr/share/locale/tk/LC_MESSAGES
#usr/share/locale/tk/LC_MESSAGES/ddns.mo
#usr/share/locale/tr/LC_MESSAGES/ddns.mo
#usr/share/locale/uk/LC_MESSAGES/ddns.mo
#usr/share/locale/uz@Latn
#usr/share/locale/uz@Latn/LC_MESSAGES
#usr/share/locale/uz@Latn/LC_MESSAGES/ddns.mo
#usr/share/locale/vi/LC_MESSAGES/ddns.mo
#var/ipfire/ddns/ddns.conf.sample

View File

@@ -21,7 +21,7 @@ etc/dhcp/dhcpd.conf
#usr/lib/libomapi.a
#usr/sbin/dhclient
usr/sbin/dhcpd
#usr/sbin/dhcrelay
usr/sbin/dhcrelay
#usr/share/man/man1/omshell.1
#usr/share/man/man3/dhcpctl.3
#usr/share/man/man3/omapi.3

View File

@@ -0,0 +1,17 @@
#usr/include/gmp.h
#usr/include/gmpxx.h
#usr/lib/libgmp.a
#usr/lib/libgmp.la
#usr/lib/libgmp.so
usr/lib/libgmp.so.10
usr/lib/libgmp.so.10.2.0
#usr/lib/libgmpxx.a
#usr/lib/libgmpxx.la
#usr/lib/libgmpxx.so
usr/lib/libgmpxx.so.4
usr/lib/libgmpxx.so.4.4.0
usr/lib/sse2/libgmp.so.10
usr/lib/sse2/libgmp.so.10.2.0
#usr/share/info/gmp.info
#usr/share/info/gmp.info-1
#usr/share/info/gmp.info-2

View File

@@ -26,6 +26,7 @@ etc/rc.d/init.d/console
#etc/rc.d/init.d/cyrus-imapd
#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/fcron
#etc/rc.d/init.d/fetchmail
@@ -133,7 +134,6 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d

View File

@@ -3,13 +3,13 @@
#usr/lib/libmpfr.a
#usr/lib/libmpfr.la
#usr/lib/libmpfr.so
usr/lib/libmpfr.so.1
usr/lib/libmpfr.so.1.2.2
usr/lib/libmpfr.so.4
usr/lib/libmpfr.so.4.1.2
#usr/share/doc/mpfr
#usr/share/doc/mpfr/AUTHORS
#usr/share/doc/mpfr/BUGS
#usr/share/doc/mpfr/COPYING
#usr/share/doc/mpfr/COPYING.LIB
#usr/share/doc/mpfr/COPYING.LESSER
#usr/share/doc/mpfr/FAQ.html
#usr/share/doc/mpfr/NEWS
#usr/share/doc/mpfr/TODO
@@ -18,4 +18,5 @@ usr/lib/libmpfr.so.1.2.2
#usr/share/doc/mpfr/examples/divworst.c
#usr/share/doc/mpfr/examples/rndo-add.c
#usr/share/doc/mpfr/examples/sample.c
#usr/share/doc/mpfr/examples/version.c
#usr/share/info/mpfr.info

View File

@@ -0,0 +1,71 @@
#usr/bin/nettle-hash
#usr/bin/nettle-lfib-stream
#usr/bin/nettle-pbkdf2
#usr/bin/pkcs1-conv
#usr/bin/sexp-conv
#usr/include/nettle
#usr/include/nettle/aes.h
#usr/include/nettle/arcfour.h
#usr/include/nettle/arctwo.h
#usr/include/nettle/asn1.h
#usr/include/nettle/base16.h
#usr/include/nettle/base64.h
#usr/include/nettle/bignum.h
#usr/include/nettle/blowfish.h
#usr/include/nettle/buffer.h
#usr/include/nettle/camellia.h
#usr/include/nettle/cast128.h
#usr/include/nettle/cbc.h
#usr/include/nettle/ccm.h
#usr/include/nettle/chacha-poly1305.h
#usr/include/nettle/chacha.h
#usr/include/nettle/ctr.h
#usr/include/nettle/des-compat.h
#usr/include/nettle/des.h
#usr/include/nettle/dsa-compat.h
#usr/include/nettle/dsa.h
#usr/include/nettle/eax.h
#usr/include/nettle/ecc-curve.h
#usr/include/nettle/ecc.h
#usr/include/nettle/ecdsa.h
#usr/include/nettle/gcm.h
#usr/include/nettle/gosthash94.h
#usr/include/nettle/hmac.h
#usr/include/nettle/knuth-lfib.h
#usr/include/nettle/macros.h
#usr/include/nettle/md2.h
#usr/include/nettle/md4.h
#usr/include/nettle/md5-compat.h
#usr/include/nettle/md5.h
#usr/include/nettle/memxor.h
#usr/include/nettle/nettle-meta.h
#usr/include/nettle/nettle-stdint.h
#usr/include/nettle/nettle-types.h
#usr/include/nettle/pbkdf2.h
#usr/include/nettle/pgp.h
#usr/include/nettle/pkcs1.h
#usr/include/nettle/poly1305.h
#usr/include/nettle/realloc.h
#usr/include/nettle/ripemd160.h
#usr/include/nettle/rsa.h
#usr/include/nettle/salsa20.h
#usr/include/nettle/serpent.h
#usr/include/nettle/sexp.h
#usr/include/nettle/sha.h
#usr/include/nettle/sha1.h
#usr/include/nettle/sha2.h
#usr/include/nettle/sha3.h
#usr/include/nettle/twofish.h
#usr/include/nettle/umac.h
#usr/include/nettle/yarrow.h
#usr/lib/libhogweed.a
#usr/lib/libhogweed.so
usr/lib/libhogweed.so.3
usr/lib/libhogweed.so.3.0
#usr/lib/libnettle.a
#usr/lib/libnettle.so
usr/lib/libnettle.so.5
usr/lib/libnettle.so.5.0
#usr/lib/pkgconfig/hogweed.pc
#usr/lib/pkgconfig/nettle.pc
#usr/share/info/nettle.info

View File

@@ -74,6 +74,7 @@ usr/lib/libgcc_s.so.1
#usr/lib/libstdc++.la
#usr/lib/libstdc++.so
usr/lib/libstdc++.so.6
#usr/lib/sse2
#usr/local
#usr/local/bin
#usr/local/bin/archive.files
@@ -90,7 +91,6 @@ usr/local/bin/rebuild-initrd
usr/local/bin/run-parts
#usr/local/bin/sanedloop
usr/local/bin/scanhd
usr/local/bin/setddns.pl
usr/local/bin/settime
usr/local/bin/timecheck
usr/local/bin/timezone-transition

View File

@@ -54,7 +54,6 @@ etc/strongswan.d/charon/sha2.conf
etc/strongswan.d/charon/socket-default.conf
etc/strongswan.d/charon/sshkey.conf
etc/strongswan.d/charon/stroke.conf
etc/strongswan.d/charon/unity.conf
etc/strongswan.d/charon/updown.conf
etc/strongswan.d/charon/x509.conf
etc/strongswan.d/charon/xauth-eap.conf
@@ -62,8 +61,8 @@ etc/strongswan.d/charon/xauth-generic.conf
etc/strongswan.d/charon/xauth-noauth.conf
etc/strongswan.d/charon/xcbc.conf
etc/strongswan.d/pki.conf
etc/strongswan.d/scepclient.conf
etc/strongswan.d/starter.conf
etc/strongswan.d/tools.conf
usr/bin/pki
#usr/lib/ipsec
#usr/lib/ipsec/libcharon.a
@@ -133,7 +132,6 @@ usr/lib/ipsec/plugins/libstrongswan-sha2.so
usr/lib/ipsec/plugins/libstrongswan-socket-default.so
usr/lib/ipsec/plugins/libstrongswan-sshkey.so
usr/lib/ipsec/plugins/libstrongswan-stroke.so
usr/lib/ipsec/plugins/libstrongswan-unity.so
usr/lib/ipsec/plugins/libstrongswan-updown.so
usr/lib/ipsec/plugins/libstrongswan-x509.so
usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
@@ -213,7 +211,6 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/plugins/socket-default.conf
#usr/share/strongswan/templates/config/plugins/sshkey.conf
#usr/share/strongswan/templates/config/plugins/stroke.conf
#usr/share/strongswan/templates/config/plugins/unity.conf
#usr/share/strongswan/templates/config/plugins/updown.conf
#usr/share/strongswan/templates/config/plugins/x509.conf
#usr/share/strongswan/templates/config/plugins/xauth-eap.conf
@@ -225,5 +222,5 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/strongswan.d/charon-logging.conf
#usr/share/strongswan/templates/config/strongswan.d/charon.conf
#usr/share/strongswan/templates/config/strongswan.d/pki.conf
#usr/share/strongswan/templates/config/strongswan.d/scepclient.conf
#usr/share/strongswan/templates/config/strongswan.d/starter.conf
#usr/share/strongswan/templates/config/strongswan.d/tools.conf

View File

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

View File

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

View File

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

View File

@@ -1,5 +1,17 @@
etc/system-release
etc/issue
usr/local/bin/setddns.pl
etc/logrotate.conf
etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/dhcrelay
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/networking/red.up/30-ddns
srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/routing.cgi
usr/sbin/dhcrelay
var/ipfire/general-functions.pl
var/ipfire/header.pl
var/ipfire/langs

View File

@@ -0,0 +1 @@
../../../../common/i586/gmp

View File

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

View File

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

View File

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

View File

@@ -32,11 +32,25 @@ do
done
# Stop services
/etc/init.d/ipsec stop
# Remove old strongswan files
rm -f \
/etc/strongswan.d/charon/unity.conf \
/usr/lib/ipsec/plugins/libstrongswan-unity.so \
/usr/share/strongswan/templates/config/plugins/unity.conf
rm -f /usr/local/bin/setddns.pl
# Extract files
extract_files
# Start services
/etc/init.d/dnsmasq restart
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi
# Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
@@ -46,6 +60,34 @@ rm -f \
/opt/pakfire/db/installed/meta-libgpg-error \
/opt/pakfire/db/rootfiles/libgpg-error
# Regenerate squid configuration file
sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
# Fix broken proxy configuration permissions
chown -R nobody.nobody \
/var/ipfire/proxy/advanced \
/var/ipfire/proxy/acl-1.4 \
/var/ipfire/proxy/enable \
/var/ipfire/proxy/settings \
/var/ipfire/proxy/squid.conf \
/var/ipfire/proxy/transparent
# Generate ddns configuration file
sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
# Update crontab
sed -i /var/spool/cron/root.orig -e "/setddns.pl/d"
grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
# Update dynamic DNS records every five minutes.
# Force an update once a month
*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all
3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force
EOF
fcrontab -z &>/dev/null
sync
# This update need a reboot...

View File

@@ -0,0 +1,62 @@
#etc/bacula
#etc/bacula/bacula
#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/bconsole
#etc/bacula/bconsole.conf
#etc/bacula/btraceback.dbx
#etc/bacula/btraceback.gdb
#etc/bacula/btraceback.mdb
#etc/bacula/disk-changer
#etc/bacula/dvd-handler
#etc/bacula/mtx-changer
#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/btraceback
#usr/share/doc/bacula
#usr/share/doc/bacula/ChangeLog
#usr/share/doc/bacula/INSTALL
#usr/share/doc/bacula/LICENSE
#usr/share/doc/bacula/README
#usr/share/doc/bacula/ReleaseNotes
#usr/share/doc/bacula/VERIFYING
#usr/share/doc/bacula/technotes
#usr/share/man/man1/bacula-bwxconsole.1.gz
#usr/share/man/man1/bacula-tray-monitor.1.gz
#usr/share/man/man1/bat.1.gz
#usr/share/man/man1/bsmtp.1.gz
#usr/share/man/man8/bacula-dir.8.gz
#usr/share/man/man8/bacula-fd.8.gz
#usr/share/man/man8/bacula-sd.8.gz
#usr/share/man/man8/bacula.8.gz
#usr/share/man/man8/bconsole.8.gz
#usr/share/man/man8/bcopy.8.gz
#usr/share/man/man8/bextract.8.gz
#usr/share/man/man8/bls.8.gz
#usr/share/man/man8/bregex.8.gz
#usr/share/man/man8/bscan.8.gz
#usr/share/man/man8/btape.8.gz
#usr/share/man/man8/btraceback.8.gz
#usr/share/man/man8/bwild.8.gz
#usr/share/man/man8/dbcheck.8.gz
#var/bacula
var/bacula/working

View File

@@ -41,6 +41,6 @@ var/ipfire/clamav/clamd.conf
var/ipfire/clamav/clamd.conf.sample
var/ipfire/clamav/freshclam.conf
var/ipfire/clamav/freshclam.conf.sample
var/run/clamav
#var/run/clamav
etc/rc.d/init.d/clamav
usr/local/bin/clamavctrl

View File

@@ -936,7 +936,7 @@ var/ipfire/cups/ppd
var/ipfire/cups/snmp.conf
var/ipfire/cups/ssl
var/log/cups
var/run/cups
var/run/cups/certs
#var/run/cups
#var/run/cups/certs
var/spool/cups
var/spool/cups/tmp

View File

@@ -50,4 +50,4 @@ usr/share/dbus-1/services
#usr/share/man/man1/dbus-send.1
#usr/share/man/man1/dbus-uuidgen.1
var/lib/dbus
var/run/dbus
#var/run/dbus

View File

@@ -0,0 +1,165 @@
#usr/bin/gss-client
#usr/bin/k5srvutil
usr/bin/kadmin
usr/bin/kdestroy
usr/bin/kinit
usr/bin/klist
usr/bin/kpasswd
#usr/bin/krb5-config
#usr/bin/ksu
#usr/bin/kswitch
#usr/bin/ktutil
#usr/bin/kvno
#usr/bin/sclient
#usr/bin/sim_client
#usr/bin/uuclient
#usr/include/gssapi
#usr/include/gssapi.h
#usr/include/gssapi/gssapi.h
#usr/include/gssapi/gssapi_ext.h
#usr/include/gssapi/gssapi_generic.h
#usr/include/gssapi/gssapi_krb5.h
#usr/include/gssapi/mechglue.h
#usr/include/gssrpc
#usr/include/gssrpc/auth.h
#usr/include/gssrpc/auth_gss.h
#usr/include/gssrpc/auth_gssapi.h
#usr/include/gssrpc/auth_unix.h
#usr/include/gssrpc/clnt.h
#usr/include/gssrpc/netdb.h
#usr/include/gssrpc/pmap_clnt.h
#usr/include/gssrpc/pmap_prot.h
#usr/include/gssrpc/pmap_rmt.h
#usr/include/gssrpc/rename.h
#usr/include/gssrpc/rpc.h
#usr/include/gssrpc/rpc_msg.h
#usr/include/gssrpc/svc.h
#usr/include/gssrpc/svc_auth.h
#usr/include/gssrpc/types.h
#usr/include/gssrpc/xdr.h
#usr/include/kadm5
#usr/include/kadm5/admin.h
#usr/include/kadm5/chpass_util_strings.h
#usr/include/kadm5/kadm_err.h
#usr/include/kdb.h
#usr/include/krad.h
#usr/include/krb5
#usr/include/krb5.h
#usr/include/krb5/ccselect_plugin.h
#usr/include/krb5/clpreauth_plugin.h
#usr/include/krb5/hostrealm_plugin.h
#usr/include/krb5/kadm5_hook_plugin.h
#usr/include/krb5/kdcpreauth_plugin.h
#usr/include/krb5/krb5.h
#usr/include/krb5/localauth_plugin.h
#usr/include/krb5/locate_plugin.h
#usr/include/krb5/plugin.h
#usr/include/krb5/preauth_plugin.h
#usr/include/krb5/pwqual_plugin.h
#usr/include/profile.h
#usr/include/verto-module.h
#usr/include/verto.h
usr/lib/krb5
usr/lib/krb5/plugins
usr/lib/krb5/plugins/authdata
usr/lib/krb5/plugins/kdb
usr/lib/krb5/plugins/kdb/db2.so
usr/lib/krb5/plugins/libkrb5
usr/lib/krb5/plugins/preauth
usr/lib/krb5/plugins/preauth/otp.so
usr/lib/krb5/plugins/preauth/pkinit.so
#usr/lib/libgssapi_krb5.so
usr/lib/libgssapi_krb5.so.2
usr/lib/libgssapi_krb5.so.2.2
#usr/lib/libgssrpc.so
usr/lib/libgssrpc.so.4
usr/lib/libgssrpc.so.4.2
#usr/lib/libk5crypto.so
usr/lib/libk5crypto.so.3
usr/lib/libk5crypto.so.3.1
#usr/lib/libkadm5clnt.so
#usr/lib/libkadm5clnt_mit.so
usr/lib/libkadm5clnt_mit.so.9
usr/lib/libkadm5clnt_mit.so.9.0
#usr/lib/libkadm5srv.so
#usr/lib/libkadm5srv_mit.so
usr/lib/libkadm5srv_mit.so.9
usr/lib/libkadm5srv_mit.so.9.0
#usr/lib/libkdb5.so
usr/lib/libkdb5.so.7
usr/lib/libkdb5.so.7.0
#usr/lib/libkrad.so
usr/lib/libkrad.so.0
usr/lib/libkrad.so.0.0
#usr/lib/libkrb5.so
usr/lib/libkrb5.so.3
usr/lib/libkrb5.so.3.3
#usr/lib/libkrb5support.so
usr/lib/libkrb5support.so.0
usr/lib/libkrb5support.so.0.1
#usr/lib/libverto.so
usr/lib/libverto.so.0
usr/lib/libverto.so.0.0
#usr/lib/pkgconfig/gssrpc.pc
#usr/lib/pkgconfig/kadm-client.pc
#usr/lib/pkgconfig/kadm-server.pc
#usr/lib/pkgconfig/kdb.pc
#usr/lib/pkgconfig/krb5-gssapi.pc
#usr/lib/pkgconfig/krb5.pc
#usr/lib/pkgconfig/mit-krb5-gssapi.pc
#usr/lib/pkgconfig/mit-krb5.pc
#usr/sbin/gss-server
#usr/sbin/kadmin.local
#usr/sbin/kadmind
#usr/sbin/kdb5_util
#usr/sbin/kprop
#usr/sbin/kpropd
#usr/sbin/kproplog
#usr/sbin/krb5-send-pr
#usr/sbin/krb5kdc
#usr/sbin/sim_server
#usr/sbin/sserver
#usr/sbin/uuserver
#usr/share/examples
#usr/share/examples/krb5
#usr/share/examples/krb5/kdc.conf
#usr/share/examples/krb5/krb5.conf
#usr/share/examples/krb5/services.append
#usr/share/gnats
#usr/share/gnats/mit
#usr/share/locale/en_US
#usr/share/locale/en_US/LC_MESSAGES
#usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo
#usr/share/man/cat1
#usr/share/man/cat5
#usr/share/man/cat8
#usr/share/man/man1/k5srvutil.1
#usr/share/man/man1/kadmin.1
#usr/share/man/man1/kdestroy.1
#usr/share/man/man1/kinit.1
#usr/share/man/man1/klist.1
#usr/share/man/man1/kpasswd.1
#usr/share/man/man1/krb5-config.1
#usr/share/man/man1/krb5-send-pr.1
#usr/share/man/man1/ksu.1
#usr/share/man/man1/kswitch.1
#usr/share/man/man1/ktutil.1
#usr/share/man/man1/kvno.1
#usr/share/man/man1/sclient.1
#usr/share/man/man5/.k5identity.5
#usr/share/man/man5/.k5login.5
#usr/share/man/man5/k5identity.5
#usr/share/man/man5/k5login.5
#usr/share/man/man5/kadm5.acl.5
#usr/share/man/man5/kdc.conf.5
#usr/share/man/man5/krb5.conf.5
#usr/share/man/man8/kadmin.local.8
#usr/share/man/man8/kadmind.8
#usr/share/man/man8/kdb5_ldap_util.8
#usr/share/man/man8/kdb5_util.8
#usr/share/man/man8/kprop.8
#usr/share/man/man8/kpropd.8
#usr/share/man/man8/kproplog.8
#usr/share/man/man8/krb5kdc.8
#usr/share/man/man8/sserver.8
var/lib/krb5kdc

View File

@@ -300,4 +300,4 @@ usr/share/mysql
#usr/share/mysql/ukrainian
#usr/share/mysql/ukrainian/errmsg.sys
var/ipfire/backup/addons/includes/mysql
var/run/mysql
#var/run/mysql

File diff suppressed because it is too large Load Diff

View File

@@ -219,10 +219,10 @@ var/ipfire/samba/shares
var/ipfire/samba/smb.conf
var/ipfire/samba/smb.conf.default
var/lib/samba
var/lib/samba/winbindd_privileged
var/log/samba
var/nmbd
etc/rc.d/init.d/samba
etc/rc.d/init.d/winbind
srv/web/ipfire/cgi-bin/samba.cgi
srv/web/ipfire/cgi-bin/sambahlp.cgi
var/ipfire/menu.d/EX-samba.menu

View File

@@ -182,4 +182,4 @@ etc/rc.d/rc3.d/S99vdradmin
#usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
var/cache/vdradmin
var/log/vdradmin
var/run/vdradmin
#var/run/vdradmin

View File

@@ -21,6 +21,7 @@ WARNING: translation string unused: add-route
WARNING: translation string unused: addon
WARNING: translation string unused: admin user password has been changed
WARNING: translation string unused: administrator user password
WARNING: translation string unused: adsl settings
WARNING: translation string unused: advproxy LDAP auth
WARNING: translation string unused: advproxy NTLM auth
WARNING: translation string unused: advproxy advanced proxy
@@ -41,6 +42,7 @@ WARNING: translation string unused: advproxy errmsg password incorrect
WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
WARNING: translation string unused: age second
WARNING: translation string unused: age seconds
WARNING: translation string unused: age shour
@@ -59,6 +61,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup config floppy
WARNING: translation string unused: backup configuration
WARNING: translation string unused: backup export key
@@ -70,6 +73,7 @@ WARNING: translation string unused: backup password
WARNING: translation string unused: backup sets
WARNING: translation string unused: backup to floppy
WARNING: translation string unused: bad characters in
WARNING: translation string unused: behind a proxy
WARNING: translation string unused: bitrate
WARNING: translation string unused: bleeding rules
WARNING: translation string unused: blue access use hint
@@ -116,6 +120,8 @@ WARNING: translation string unused: dbfile
WARNING: translation string unused: ddns help dnsmadeeasy
WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -144,6 +150,7 @@ WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: download dh parameter
WARNING: translation string unused: driver
@@ -159,6 +166,7 @@ WARNING: translation string unused: editor
WARNING: translation string unused: eg
WARNING: translation string unused: email server can not be empty
WARNING: translation string unused: enable javascript
WARNING: translation string unused: enable wildcards
WARNING: translation string unused: enabled on
WARNING: translation string unused: enabledtitle
WARNING: translation string unused: encrypted
@@ -230,7 +238,6 @@ WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
WARNING: translation string unused: fwhost IpSec Host
WARNING: translation string unused: fwhost IpSec Network
WARNING: translation string unused: fwhost OpenVPN N-2-N
WARNING: translation string unused: fwhost OpenVPN static host
WARNING: translation string unused: fwhost OpenVPN static network
WARNING: translation string unused: fwhost Standard Network
@@ -446,6 +453,7 @@ WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
WARNING: translation string unused: present
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
WARNING: translation string unused: proxy no proxy extend
WARNING: translation string unused: proxy no proxy local
@@ -460,12 +468,16 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -492,6 +504,7 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -606,6 +619,7 @@ WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -616,15 +630,11 @@ WARNING: untranslated string: addons
WARNING: untranslated string: bytes
WARNING: untranslated string: community rules
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: downlink
WARNING: untranslated string: emerging rules
WARNING: untranslated string: first
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: last
WARNING: untranslated string: qos add subclass
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: uplink

View File

@@ -20,6 +20,7 @@ WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: admin user password has been changed
WARNING: translation string unused: administrator user password
WARNING: translation string unused: adsl settings
WARNING: translation string unused: advproxy LDAP auth
WARNING: translation string unused: advproxy NTLM auth
WARNING: translation string unused: advproxy advanced proxy
@@ -41,6 +42,7 @@ WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
WARNING: translation string unused: age second
WARNING: translation string unused: age seconds
WARNING: translation string unused: age shour
@@ -60,6 +62,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
WARNING: translation string unused: backup config floppy
@@ -86,6 +89,7 @@ WARNING: translation string unused: backup protect key password
WARNING: translation string unused: backup sets
WARNING: translation string unused: backup to floppy
WARNING: translation string unused: bad characters in
WARNING: translation string unused: behind a proxy
WARNING: translation string unused: bewan adsl pci st
WARNING: translation string unused: bewan adsl usb
WARNING: translation string unused: bitrate
@@ -135,6 +139,8 @@ WARNING: translation string unused: dbfile
WARNING: translation string unused: ddns help dnsmadeeasy
WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -166,6 +172,7 @@ WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: download dh parameter
@@ -182,6 +189,7 @@ WARNING: translation string unused: editor
WARNING: translation string unused: eg
WARNING: translation string unused: email server can not be empty
WARNING: translation string unused: enable javascript
WARNING: translation string unused: enable wildcards
WARNING: translation string unused: enabled on
WARNING: translation string unused: enabledtitle
WARNING: translation string unused: encrypted
@@ -253,7 +261,6 @@ WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
WARNING: translation string unused: fwhost IpSec Host
WARNING: translation string unused: fwhost IpSec Network
WARNING: translation string unused: fwhost OpenVPN N-2-N
WARNING: translation string unused: fwhost OpenVPN static host
WARNING: translation string unused: fwhost OpenVPN static network
WARNING: translation string unused: fwhost Standard Network
@@ -472,6 +479,7 @@ WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
WARNING: translation string unused: present
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
WARNING: translation string unused: proxy no proxy extend
WARNING: translation string unused: proxy no proxy local
@@ -487,12 +495,16 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -522,6 +534,7 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -631,6 +644,7 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
@@ -641,6 +655,7 @@ WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -648,12 +663,8 @@ WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: downlink
WARNING: untranslated string: first
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: last
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: uplink

View File

@@ -42,6 +42,7 @@ WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
@@ -56,6 +57,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
WARNING: translation string unused: backup config floppy
@@ -82,6 +84,7 @@ WARNING: translation string unused: backup protect key password
WARNING: translation string unused: backup sets
WARNING: translation string unused: backup to floppy
WARNING: translation string unused: bad characters in
WARNING: translation string unused: behind a proxy
WARNING: translation string unused: bewan adsl pci st
WARNING: translation string unused: bewan adsl usb
WARNING: translation string unused: bitrate
@@ -129,6 +132,8 @@ WARNING: translation string unused: dbfile
WARNING: translation string unused: ddns help dnsmadeeasy
WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
@@ -158,6 +163,7 @@ WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
@@ -174,6 +180,7 @@ WARNING: translation string unused: editor
WARNING: translation string unused: eg
WARNING: translation string unused: email server can not be empty
WARNING: translation string unused: enable javascript
WARNING: translation string unused: enable wildcards
WARNING: translation string unused: enabled on
WARNING: translation string unused: enabledtitle
WARNING: translation string unused: encrypted
@@ -405,6 +412,7 @@ WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
WARNING: translation string unused: present
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
WARNING: translation string unused: proxy no proxy extend
WARNING: translation string unused: proxy no proxy local
@@ -420,12 +428,16 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -455,6 +467,7 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -563,6 +576,7 @@ WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -580,10 +594,16 @@ WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
WARNING: untranslated string: addons
WARNING: untranslated string: administrator password
WARNING: untranslated string: administrator username
WARNING: untranslated string: advproxy AUTH method ntlm
WARNING: untranslated string: advproxy AUTH method ntlm auth
WARNING: untranslated string: advproxy cache-digest
WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
@@ -649,6 +669,10 @@ WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: dnssec aware
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
WARNING: untranslated string: downlink
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
@@ -760,6 +784,7 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
WARNING: untranslated string: fwhost OpenVPN N-2-N
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -843,6 +868,7 @@ WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: messages
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
WARNING: untranslated string: model
@@ -860,6 +886,7 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: nameserver
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
@@ -913,6 +940,8 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key

View File

@@ -42,6 +42,7 @@ WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
@@ -56,6 +57,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
WARNING: translation string unused: backup config floppy
@@ -82,6 +84,7 @@ WARNING: translation string unused: backup protect key password
WARNING: translation string unused: backup sets
WARNING: translation string unused: backup to floppy
WARNING: translation string unused: bad characters in
WARNING: translation string unused: behind a proxy
WARNING: translation string unused: bewan adsl pci st
WARNING: translation string unused: bewan adsl usb
WARNING: translation string unused: bitrate
@@ -129,6 +132,8 @@ WARNING: translation string unused: dbfile
WARNING: translation string unused: ddns help dnsmadeeasy
WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
@@ -158,6 +163,7 @@ WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
@@ -174,6 +180,7 @@ WARNING: translation string unused: editor
WARNING: translation string unused: eg
WARNING: translation string unused: email server can not be empty
WARNING: translation string unused: enable javascript
WARNING: translation string unused: enable wildcards
WARNING: translation string unused: enabled on
WARNING: translation string unused: enabledtitle
WARNING: translation string unused: encrypted
@@ -416,6 +423,7 @@ WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
WARNING: translation string unused: present
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
WARNING: translation string unused: proxy no proxy extend
WARNING: translation string unused: proxy no proxy local
@@ -431,12 +439,16 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -466,6 +478,7 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -576,6 +589,7 @@ WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
@@ -590,10 +604,16 @@ WARNING: untranslated string: MTU settings
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: administrator password
WARNING: untranslated string: administrator username
WARNING: untranslated string: advproxy AUTH method ntlm
WARNING: untranslated string: advproxy AUTH method ntlm auth
WARNING: untranslated string: advproxy cache-digest
WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
@@ -660,6 +680,10 @@ WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: dnssec aware
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
WARNING: untranslated string: downlink
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
@@ -771,6 +795,7 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
WARNING: untranslated string: fwhost OpenVPN N-2-N
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -854,6 +879,7 @@ WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: messages
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
WARNING: untranslated string: model
@@ -871,6 +897,7 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: nameserver
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
@@ -920,6 +947,8 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key

View File

@@ -42,6 +42,7 @@ WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
WARNING: translation string unused: age second
WARNING: translation string unused: age seconds
WARNING: translation string unused: age shour
@@ -61,6 +62,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
WARNING: translation string unused: backup config floppy
@@ -87,6 +89,7 @@ WARNING: translation string unused: backup protect key password
WARNING: translation string unused: backup sets
WARNING: translation string unused: backup to floppy
WARNING: translation string unused: bad characters in
WARNING: translation string unused: behind a proxy
WARNING: translation string unused: bewan adsl pci st
WARNING: translation string unused: bewan adsl usb
WARNING: translation string unused: bitrate
@@ -136,6 +139,8 @@ WARNING: translation string unused: dbfile
WARNING: translation string unused: ddns help dnsmadeeasy
WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -166,6 +171,7 @@ WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
@@ -182,6 +188,7 @@ WARNING: translation string unused: editor
WARNING: translation string unused: eg
WARNING: translation string unused: email server can not be empty
WARNING: translation string unused: enable javascript
WARNING: translation string unused: enable wildcards
WARNING: translation string unused: enabled on
WARNING: translation string unused: enabledtitle
WARNING: translation string unused: encrypted
@@ -253,7 +260,6 @@ WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
WARNING: translation string unused: fwhost IpSec Host
WARNING: translation string unused: fwhost IpSec Network
WARNING: translation string unused: fwhost OpenVPN N-2-N
WARNING: translation string unused: fwhost OpenVPN static host
WARNING: translation string unused: fwhost OpenVPN static network
WARNING: translation string unused: fwhost Standard Network
@@ -470,6 +476,7 @@ WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
WARNING: translation string unused: present
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
WARNING: translation string unused: proxy no proxy extend
WARNING: translation string unused: proxy no proxy local
@@ -485,12 +492,16 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -520,6 +531,7 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -639,6 +651,7 @@ WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -647,6 +660,12 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: MTU settings
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: administrator password
WARNING: untranslated string: administrator username
WARNING: untranslated string: advproxy AUTH method ntlm
WARNING: untranslated string: advproxy AUTH method ntlm auth
WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: atm device
WARNING: untranslated string: bytes
WARNING: untranslated string: capabilities
@@ -657,6 +676,10 @@ WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dns servers
WARNING: untranslated string: dnssec aware
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: drop outgoing
WARNING: untranslated string: firewall logs country
@@ -665,6 +688,7 @@ WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: imei
WARNING: untranslated string: imsi
WARNING: untranslated string: messages
WARNING: untranslated string: model
WARNING: untranslated string: modem hardware details
WARNING: untranslated string: modem information
@@ -679,6 +703,7 @@ WARNING: untranslated string: modem no connection message
WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: nameserver
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
@@ -693,6 +718,8 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain
WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: software version

View File

@@ -42,6 +42,7 @@ WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
@@ -56,6 +57,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
WARNING: translation string unused: backup config floppy
@@ -82,6 +84,7 @@ WARNING: translation string unused: backup protect key password
WARNING: translation string unused: backup sets
WARNING: translation string unused: backup to floppy
WARNING: translation string unused: bad characters in
WARNING: translation string unused: behind a proxy
WARNING: translation string unused: bewan adsl pci st
WARNING: translation string unused: bewan adsl usb
WARNING: translation string unused: bitrate
@@ -129,6 +132,8 @@ WARNING: translation string unused: dbfile
WARNING: translation string unused: ddns help dnsmadeeasy
WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
@@ -158,6 +163,7 @@ WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
@@ -174,6 +180,7 @@ WARNING: translation string unused: editor
WARNING: translation string unused: eg
WARNING: translation string unused: email server can not be empty
WARNING: translation string unused: enable javascript
WARNING: translation string unused: enable wildcards
WARNING: translation string unused: enabled on
WARNING: translation string unused: enabledtitle
WARNING: translation string unused: encrypted
@@ -405,6 +412,7 @@ WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
WARNING: translation string unused: present
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
WARNING: translation string unused: proxy no proxy extend
WARNING: translation string unused: proxy no proxy local
@@ -420,12 +428,16 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -455,6 +467,7 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -563,6 +576,7 @@ WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -580,10 +594,16 @@ WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
WARNING: untranslated string: addons
WARNING: untranslated string: administrator password
WARNING: untranslated string: administrator username
WARNING: untranslated string: advproxy AUTH method ntlm
WARNING: untranslated string: advproxy AUTH method ntlm auth
WARNING: untranslated string: advproxy cache-digest
WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
@@ -649,6 +669,10 @@ WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: dnssec aware
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
WARNING: untranslated string: downlink
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
@@ -760,6 +784,7 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
WARNING: untranslated string: fwhost OpenVPN N-2-N
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -843,6 +868,7 @@ WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: messages
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
WARNING: untranslated string: model
@@ -860,6 +886,7 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: nameserver
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
@@ -913,6 +940,8 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key

View File

@@ -42,6 +42,7 @@ WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
@@ -56,6 +57,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
WARNING: translation string unused: backup config floppy
@@ -82,6 +84,7 @@ WARNING: translation string unused: backup protect key password
WARNING: translation string unused: backup sets
WARNING: translation string unused: backup to floppy
WARNING: translation string unused: bad characters in
WARNING: translation string unused: behind a proxy
WARNING: translation string unused: bewan adsl pci st
WARNING: translation string unused: bewan adsl usb
WARNING: translation string unused: bitrate
@@ -128,6 +131,8 @@ WARNING: translation string unused: dbfile
WARNING: translation string unused: ddns help dnsmadeeasy
WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
@@ -157,6 +162,7 @@ WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
@@ -173,6 +179,7 @@ WARNING: translation string unused: editor
WARNING: translation string unused: eg
WARNING: translation string unused: email server can not be empty
WARNING: translation string unused: enable javascript
WARNING: translation string unused: enable wildcards
WARNING: translation string unused: enabled on
WARNING: translation string unused: enabledtitle
WARNING: translation string unused: encrypted
@@ -410,6 +417,7 @@ WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
WARNING: translation string unused: present
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
WARNING: translation string unused: proxy no proxy extend
WARNING: translation string unused: proxy no proxy local
@@ -425,12 +433,16 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -460,6 +472,7 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -567,6 +580,7 @@ WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -583,10 +597,16 @@ WARNING: untranslated string: MTU settings
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: administrator password
WARNING: untranslated string: administrator username
WARNING: untranslated string: advproxy AUTH method ntlm
WARNING: untranslated string: advproxy AUTH method ntlm auth
WARNING: untranslated string: advproxy cache-digest
WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
@@ -654,6 +674,10 @@ WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: dnssec aware
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
WARNING: untranslated string: downlink
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
@@ -755,6 +779,7 @@ WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
WARNING: untranslated string: fwhost OpenVPN N-2-N
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
@@ -839,6 +864,7 @@ WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: messages
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
WARNING: untranslated string: model
@@ -856,6 +882,7 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: nameserver
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
@@ -903,6 +930,8 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key

View File

@@ -42,6 +42,7 @@ WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
WARNING: translation string unused: age second
WARNING: translation string unused: age seconds
WARNING: translation string unused: age shour
@@ -61,6 +62,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
WARNING: translation string unused: backup config floppy
@@ -87,6 +89,7 @@ WARNING: translation string unused: backup protect key password
WARNING: translation string unused: backup sets
WARNING: translation string unused: backup to floppy
WARNING: translation string unused: bad characters in
WARNING: translation string unused: behind a proxy
WARNING: translation string unused: bewan adsl pci st
WARNING: translation string unused: bewan adsl usb
WARNING: translation string unused: bitrate
@@ -136,6 +139,8 @@ WARNING: translation string unused: dbfile
WARNING: translation string unused: ddns help dnsmadeeasy
WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -166,6 +171,7 @@ WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: driver
@@ -181,6 +187,7 @@ WARNING: translation string unused: editor
WARNING: translation string unused: eg
WARNING: translation string unused: email server can not be empty
WARNING: translation string unused: enable javascript
WARNING: translation string unused: enable wildcards
WARNING: translation string unused: enabled on
WARNING: translation string unused: enabledtitle
WARNING: translation string unused: encrypted
@@ -252,7 +259,6 @@ WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
WARNING: translation string unused: fwhost IpSec Host
WARNING: translation string unused: fwhost IpSec Network
WARNING: translation string unused: fwhost OpenVPN N-2-N
WARNING: translation string unused: fwhost OpenVPN static host
WARNING: translation string unused: fwhost OpenVPN static network
WARNING: translation string unused: fwhost Standard Network
@@ -469,6 +475,7 @@ WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
WARNING: translation string unused: present
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
WARNING: translation string unused: proxy no proxy extend
WARNING: translation string unused: proxy no proxy local
@@ -484,12 +491,16 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -519,6 +530,7 @@ WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
@@ -642,6 +654,7 @@ WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -650,6 +663,12 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: MTU settings
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: administrator password
WARNING: untranslated string: administrator username
WARNING: untranslated string: advproxy AUTH method ntlm
WARNING: untranslated string: advproxy AUTH method ntlm auth
WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: bytes
WARNING: untranslated string: capabilities
WARNING: untranslated string: default
@@ -658,6 +677,10 @@ WARNING: untranslated string: dh key move failed
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dnssec aware
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: firewall logs country
WARNING: untranslated string: fwhost err hostip
@@ -665,6 +688,7 @@ WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: imei
WARNING: untranslated string: imsi
WARNING: untranslated string: messages
WARNING: untranslated string: model
WARNING: untranslated string: modem hardware details
WARNING: untranslated string: modem information
@@ -679,6 +703,7 @@ WARNING: untranslated string: modem no connection message
WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: nameserver
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
@@ -692,6 +717,8 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain
WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: software version

View File

@@ -14,10 +14,17 @@
# Checking cgi-bin translations for language: fr #
############################################################################
< addon
< administrator password
< administrator username
< adsl settings
< advproxy AUTH method ntlm
< advproxy AUTH method ntlm auth
< advproxy cache-digest
< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< advproxy errmsg proxy ports equal
< advproxy group access control
< advproxy group required
< advproxy proxy port transparent
< age second
< age seconds
@@ -94,7 +101,12 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
< dnssec aware
< dnssec information
< dnssec not supported
< dnssec validating
< dns servers
< downlink
< download dh parameter
< download tls-auth key
< dpd delay
@@ -126,6 +138,7 @@
< fireinfo your profile id
< firewall logs country
< firewall rules
< first
< flag
< forward firewall
< fw default drop
@@ -324,12 +337,14 @@
< ipsec
< ipsec network
< ipsec no connections
< last
< least preferred
< lifetime
< mac filter
< maximum
< MB read
< MB written
< messages
< minimum
< minute
< model
@@ -348,6 +363,7 @@
< monitor interface
< most preferred
< MTU settings
< nameserver
< never
< no hardware random number generator
< not a valid dh key
@@ -399,6 +415,8 @@
< qos enter bandwidths
< random number generator daemon
< red1
< samba join a domain
< samba join domain
< server restart
< show dh
< snat new source ip address
@@ -467,6 +485,7 @@
< tor use exit nodes
< updxlrtr sources
< updxlrtr standard view
< uplink
< upload dh key
< upload new ruleset
< uptime
@@ -536,10 +555,17 @@
# Checking cgi-bin translations for language: es #
############################################################################
< addon
< administrator password
< administrator username
< adsl settings
< advproxy AUTH method ntlm
< advproxy AUTH method ntlm auth
< advproxy cache-digest
< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< advproxy errmsg proxy ports equal
< advproxy group access control
< advproxy group required
< advproxy proxy port transparent
< age second
< age seconds
@@ -616,7 +642,12 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
< dnssec aware
< dnssec information
< dnssec not supported
< dnssec validating
< dns servers
< downlink
< download dh parameter
< download tls-auth key
< dpd delay
@@ -648,6 +679,7 @@
< fireinfo your profile id
< firewall logs country
< firewall rules
< first
< flag
< forward firewall
< fw default drop
@@ -846,12 +878,14 @@
< ipsec
< ipsec network
< ipsec no connections
< last
< least preferred
< lifetime
< mac filter
< maximum
< MB read
< MB written
< messages
< minimum
< minute
< model
@@ -870,6 +904,7 @@
< monitor interface
< most preferred
< MTU settings
< nameserver
< never
< no hardware random number generator
< not a valid dh key
@@ -937,6 +972,8 @@
< qos enter bandwidths
< random number generator daemon
< red1
< samba join a domain
< samba join domain
< server restart
< Set time on boot
< show dh
@@ -1005,6 +1042,7 @@
< tor use exit nodes
< updxlrtr sources
< updxlrtr standard view
< uplink
< upload dh key
< uptime
< uptime load average
@@ -1051,10 +1089,17 @@
# Checking cgi-bin translations for language: pl #
############################################################################
< addon
< administrator password
< administrator username
< adsl settings
< advproxy AUTH method ntlm
< advproxy AUTH method ntlm auth
< advproxy cache-digest
< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< advproxy errmsg proxy ports equal
< advproxy group access control
< advproxy group required
< advproxy proxy port transparent
< age second
< age seconds
@@ -1130,7 +1175,12 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
< dnssec aware
< dnssec information
< dnssec not supported
< dnssec validating
< dns servers
< downlink
< download dh parameter
< download tls-auth key
< dpd delay
@@ -1154,6 +1204,7 @@
< extrahd you cant mount
< firewall logs country
< firewall rules
< first
< flag
< forward firewall
< fw default drop
@@ -1352,12 +1403,14 @@
< ipsec
< ipsec network
< ipsec no connections
< last
< least preferred
< lifetime
< mac filter
< maximum
< MB read
< MB written
< messages
< minimum
< minute
< model
@@ -1376,6 +1429,7 @@
< monitor interface
< most preferred
< MTU settings
< nameserver
< never
< no hardware random number generator
< not a valid dh key
@@ -1429,6 +1483,8 @@
< qos enter bandwidths
< random number generator daemon
< red1
< samba join a domain
< samba join domain
< server restart
< show dh
< snat new source ip address
@@ -1495,6 +1551,7 @@
< tor use exit nodes
< updxlrtr sources
< updxlrtr standard view
< uplink
< upload dh key
< uptime
< uptime load average
@@ -1542,10 +1599,17 @@
############################################################################
< Add a route
< addon
< administrator password
< administrator username
< adsl settings
< advproxy AUTH method ntlm
< advproxy AUTH method ntlm auth
< advproxy cache-digest
< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< advproxy errmsg proxy ports equal
< advproxy group access control
< advproxy group required
< advproxy proxy port transparent
< age second
< age seconds
@@ -1623,7 +1687,12 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
< dnssec aware
< dnssec information
< dnssec not supported
< dnssec validating
< dns servers
< downlink
< download dh parameter
< download tls-auth key
< dpd delay
@@ -1648,6 +1717,7 @@
< extrahd you cant mount
< firewall logs country
< firewall rules
< first
< flag
< forward firewall
< frequency
@@ -1849,12 +1919,14 @@
< ipsec
< ipsec network
< ipsec no connections
< last
< least preferred
< lifetime
< mac filter
< maximum
< MB read
< MB written
< messages
< minimum
< minute
< model
@@ -1874,6 +1946,7 @@
< month-graph
< most preferred
< MTU settings
< nameserver
< never
< no hardware random number generator
< not a valid dh key
@@ -1924,6 +1997,8 @@
< qos enter bandwidths
< random number generator daemon
< red1
< samba join a domain
< samba join domain
< server restart
< show dh
< snat new source ip address
@@ -1990,6 +2065,7 @@
< tor use exit nodes
< updxlrtr sources
< updxlrtr standard view
< uplink
< upload dh key
< uptime
< uptime load average

View File

@@ -238,6 +238,23 @@ if (-e "${General::swroot}/ovpn/settings") {
}
}
# Add OpenVPN net for custom OVPNs
if (-e "${General::swroot}/ovpn/ccd.conf") {
open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");
my @ovpnsub = <OVPNSUB>;
close(OVPNSUB);
foreach (@ovpnsub) {
my ($network, $mask) = split '/', (split ',', $_)[2];
$mask = ipv4_cidr2msk($mask) unless &General::validip($mask);
push(@network, $network);
push(@masklen, $mask);
push(@colour, ${Header::colourovpn});
}
}
open(IPSEC, "${General::swroot}/vpn/config");
my @ipsec = <IPSEC>;
close(IPSEC);

File diff suppressed because it is too large Load Diff

View File

@@ -292,25 +292,25 @@ if ($fwhostsettings{'ACTION'} eq 'savenet' )
}
if($fwhostsettings{'error'} ne 'on'){
#check if we use one of ipfire's networks (green,orange,blue)
if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($fwhostsettings{'IP'},$ownnet{'GREEN_NETADDRESS'},$ownnet{'GREEN_NETMASK'}))
if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && ($fwhostsettings{'IP'} eq $ownnet{'GREEN_NETADDRESS'} && $fwhostsettings{'SUBNET'} eq $ownnet{'GREEN_NETMASK'}))
{
$errormessage=$errormessage.$Lang::tr{'ccd err green'}."<br>";
$fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'};
if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}='editnet';}
}
if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($fwhostsettings{'IP'},$ownnet{'ORANGE_NETADDRESS'},$ownnet{'ORANGE_NETMASK'}))
if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && ($fwhostsettings{'IP'} eq $ownnet{'ORANGE_NETADDRESS'} && $fwhostsettings{'SUBNET'} eq $ownnet{'ORANGE_NETMASK'}))
{
$errormessage=$errormessage.$Lang::tr{'ccd err orange'}."<br>";
$fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'};
if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}='editnet';}
}
if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($fwhostsettings{'IP'},$ownnet{'BLUE_NETADDRESS'},$ownnet{'BLUE_NETMASK'}))
if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && ($fwhostsettings{'IP'} eq $ownnet{'BLUE_NETADDRESS'} && $fwhostsettings{'SUBNET'} eq $ownnet{'BLUE_NETMASK'}))
{
$errormessage=$errormessage.$Lang::tr{'ccd err blue'}."<br>";
$fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'};
if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}='editnet';}
}
if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($fwhostsettings{'IP'},$ownnet{'RED_NETADDRESS'},$ownnet{'RED_NETMASK'}))
if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && ($fwhostsettings{'IP'} eq $ownnet{'RED_NETADDRESS'} && $fwhostsettings{'SUBNET'} eq $ownnet{'RED_NETMASK'}))
{
$errormessage=$errormessage.$Lang::tr{'ccd err red'}."<br>";
$fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'};

View File

@@ -283,12 +283,14 @@ END
&Header::openbox('100%', 'left', 'Firewall Logs');
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
my $red_interface = &General::get_red_interface();
my $linesjc = 0;
my %tabjc;
my $gi = Geo::IP::PurePerl->new();
if ($pienumber == -1 || $pienumber > $lines || $sortcolumn == 2) { $pienumber = $lines; };
$lines = 0;
foreach $_ (@log)
{
/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
@@ -296,7 +298,7 @@ foreach $_ (@log)
$packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 =~ /2./ ){ $iface="";}
$packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1;
if($iface eq 'red0') {
if($iface eq $red_interface) {
if($srcaddr ne '') {
my $ccode = $gi->country_code_by_name($srcaddr);
if( $ccode eq '') {

View File

@@ -76,6 +76,86 @@ if ( $querry[0] ne~ ""){
&Header::closebox();
}
## DNSSEC
my @nameservers = ();
foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") {
open(DNS, "<$f");
my $nameserver = <DNS>;
close(DNS);
chomp($nameserver);
if ($nameserver) {
push(@nameservers, $nameserver);
}
}
&Header::openbox('100%', 'center', $Lang::tr{'dnssec information'});
print <<END;
<table class="tbl" width='66%'>
<thead>
<tr>
<th align="center">
<strong>$Lang::tr{'nameserver'}</strong>
</th>
<th align="center">
<strong>$Lang::tr{'status'}</strong>
</th>
</tr>
</thead>
<tbody>
END
my $id = 0;
for my $nameserver (@nameservers) {
my $status = &check_dnssec($nameserver, "ping.ipfire.org");
my $colour = "";
my $bgcolour = "";
my $message = "";
# DNSSEC Not supported
if ($status == 0) {
$message = $Lang::tr{'dnssec not supported'};
$colour = "white";
$bgcolour = ${Header::colourred};
# DNSSEC Aware
} elsif ($status == 1) {
$message = $Lang::tr{'dnssec aware'};
$colour = "black";
$bgcolour = ${Header::colouryellow};
# DNSSEC Validating
} elsif ($status == 2) {
$message = $Lang::tr{'dnssec validating'};
$colour = "white";
$bgcolour = ${Header::colourgreen};
# Error
} else {
$colour = ${Header::colourred};
}
my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
print <<END;
<tr bgcolor="$table_colour">
<td>$nameserver</td>
<td bgcolor="$bgcolour" align="center">
<font color="$colour"><strong>$message</strong></font>
</td>
</tr>
END
}
print <<END;
</tbody>
</table>
END
&Header::closebox();
if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} eq "DHCP"){
&Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}");
@@ -161,4 +241,33 @@ END
&Header::closebigbox();
&Header::closepage();
}
}
sub check_dnssec($$) {
my $nameserver = shift;
my $record = shift;
my @command = ("dig", "+dnssec", $record, "\@$nameserver");
my @output = qx(@command);
my $output = join("", @output);
my $status = 0;
if ($output =~ m/status: (\w+)/) {
$status = ($1 eq "NOERROR");
if (!$status) {
return -1;
}
}
my @flags = ();
if ($output =~ m/flags: (.*);/) {
@flags = split(/ /, $1);
}
my $aware = ($output =~ m/RRSIG/);
my $validating = ("ad" ~~ @flags);
return $aware + $validating;
}

View File

@@ -908,7 +908,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
}
if ($cgiparams{'COMPLZO'} eq 'on') {
print SERVERCONF "# Enable Compression\n";
print SERVERCONF "comp-lzo\r\n";
print SERVERCONF "comp-lzo\n";
}
print SERVERCONF "# Debug Level\n";
print SERVERCONF "verb 3\n";
@@ -1003,7 +1003,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
}
if ($cgiparams{'COMPLZO'} eq 'on') {
print CLIENTCONF "# Enable Compression\n";
print CLIENTCONF "comp-lzo\r\n";
print CLIENTCONF "comp-lzo\n";
}
print CLIENTCONF "# Debug Level\n";
print CLIENTCONF "verb 3\n";
@@ -2103,7 +2103,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){
}
if ($confighash{$cgiparams{'KEY'}}[30] eq 'on') {
print CLIENTCONF "# Enable Compression\n";
print CLIENTCONF "comp-lzo\r\n";
print CLIENTCONF "comp-lzo\n";
}
print CLIENTCONF "# Debug Level\n";
print CLIENTCONF "verb 3\n";
@@ -5024,24 +5024,41 @@ END
###
&Header::openbox('100%', 'LEFT', $Lang::tr{'connection status and controlc' });
print <<END;
<table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
<tr>
<th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th>
<th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th>
<th width='22%' class='boldbase' align='center'><b>$Lang::tr{'network'}</b></th>
<th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
<th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th>
<th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th>
</tr>
END
;
my $id = 0;
my $gif;
my $col1="";
foreach my $key (sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) {
my $lastnet;
foreach my $key (sort { ncmp ($confighash{$a}[32],$confighash{$b}[32]) } sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) {
if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]=$Lang::tr{'fwhost OpenVPN N-2-N'};}
if ($confighash{$key}[32] eq "dynamic"){$confighash{$key}[32]=$Lang::tr{'ccd dynrange'};}
if($id == 0){
print"<b>$confighash{$key}[32]</b>";
print <<END;
<table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
<tr>
<th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th>
<th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th>
<th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
<th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th>
<th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th>
</tr>
END
}
if ($id > 0 && $lastnet ne $confighash{$key}[32]){
print "</table><br>";
print"<b>$confighash{$key}[32]</b>";
print <<END;
<table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
<tr>
<th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th>
<th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th>
<th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
<th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th>
<th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th>
</tr>
END
}
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {
print "<tr>";
@@ -5060,9 +5077,6 @@ END
my $cavalid = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem`;
$cavalid =~ /Not After : (.*)[\n]/;
$cavalid = $1;
if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]="net-2-net";}
if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";}
print "<td align='center' $col>$confighash{$key}[32]</td>";
print "<td align='center' $col>$confighash{$key}[25]</td>";
$col1="bgcolor='${Header::colourred}'";
my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
@@ -5191,7 +5205,9 @@ END
END
;
$id++;
$lastnet = $confighash{$key}[32];
}
print"</table>";
;
# If the config file contains entries, print Key to action icons

View File

@@ -172,6 +172,8 @@ unless (-e $acl_include) { system("touch $acl_include"); }
unless (-e $browserdb) { system("touch $browserdb"); }
unless (-e $mimetypes) { system("touch $mimetypes"); }
my $HAVE_NTLM_AUTH = (-e "/usr/bin/ntlm_auth");
open FILE, $browserdb;
@useragentlist = sort { reverse(substr(reverse(substr($a,index($a,',')+1)),index(reverse(substr($a,index($a,','))),',')+1)) cmp reverse(substr(reverse(substr($b,index($b,',')+1)),index(reverse(substr($b,index($b,','))),',')+1))} grep !/(^$)|(^\s*#)/,<FILE>;
close(FILE);
@@ -264,6 +266,7 @@ $proxysettings{'LDAP_PORT'} = '389';
$proxysettings{'LDAP_BINDDN_USER'} = '';
$proxysettings{'LDAP_BINDDN_PASS'} = '';
$proxysettings{'LDAP_GROUP'} = '';
$proxysettings{'NTLM_AUTH_GROUP'} = '';
$proxysettings{'NTLM_DOMAIN'} = '';
$proxysettings{'NTLM_PDC'} = '';
$proxysettings{'NTLM_BDC'} = '';
@@ -860,6 +863,7 @@ $checked{'AUTH_METHOD'}{'ncsa'} = '';
$checked{'AUTH_METHOD'}{'ident'} = '';
$checked{'AUTH_METHOD'}{'ldap'} = '';
$checked{'AUTH_METHOD'}{'ntlm'} = '';
$checked{'AUTH_METHOD'}{'ntlm-auth'} = '';
$checked{'AUTH_METHOD'}{'radius'} = '';
$checked{'AUTH_METHOD'}{$proxysettings{'AUTH_METHOD'}} = "checked='checked'";
@@ -1686,18 +1690,33 @@ print <<END
END
;
print <<END
my $auth_columns = 5;
if ($HAVE_NTLM_AUTH) {
$auth_columns++;
}
my $auth_column_width = 100 / $auth_columns;
print <<END;
<table width='100%'>
<tr>
<td colspan='5'><b>$Lang::tr{'advproxy AUTH method'}</b></td>
<td colspan='$auth_columns'><b>$Lang::tr{'advproxy AUTH method'}</b></td>
</tr>
<tr>
<td width='16%' class='base'><input type='radio' name='AUTH_METHOD' value='none' $checked{'AUTH_METHOD'}{'none'} />$Lang::tr{'advproxy AUTH method none'}</td>
<td width='16%' class='base'><input type='radio' name='AUTH_METHOD' value='ncsa' $checked{'AUTH_METHOD'}{'ncsa'} />$Lang::tr{'advproxy AUTH method ncsa'}</td>
<td width='16%' class='base'><input type='radio' name='AUTH_METHOD' value='ident' $checked{'AUTH_METHOD'}{'ident'} />$Lang::tr{'advproxy AUTH method ident'}</td>
<td width='16%' class='base'><input type='radio' name='AUTH_METHOD' value='ldap' $checked{'AUTH_METHOD'}{'ldap'} />$Lang::tr{'advproxy AUTH method ldap'}</td>
<td width='16%' class='base'><input type='radio' name='AUTH_METHOD' value='ntlm' $checked{'AUTH_METHOD'}{'ntlm'} />$Lang::tr{'advproxy AUTH method ntlm'}</td>
<td width='16%' class='base'><input type='radio' name='AUTH_METHOD' value='radius' $checked{'AUTH_METHOD'}{'radius'} />$Lang::tr{'advproxy AUTH method radius'}</td>
<td width='$auth_column_width%' class='base'><input type='radio' name='AUTH_METHOD' value='none' $checked{'AUTH_METHOD'}{'none'} />$Lang::tr{'advproxy AUTH method none'}</td>
<td width='$auth_column_width%' class='base'><input type='radio' name='AUTH_METHOD' value='ncsa' $checked{'AUTH_METHOD'}{'ncsa'} />$Lang::tr{'advproxy AUTH method ncsa'}</td>
<td width='$auth_column_width%' class='base'><input type='radio' name='AUTH_METHOD' value='ident' $checked{'AUTH_METHOD'}{'ident'} />$Lang::tr{'advproxy AUTH method ident'}</td>
<td width='$auth_column_width%' class='base'><input type='radio' name='AUTH_METHOD' value='ldap' $checked{'AUTH_METHOD'}{'ldap'} />$Lang::tr{'advproxy AUTH method ldap'}</td>
<td width='$auth_column_width%' class='base'><input type='radio' name='AUTH_METHOD' value='ntlm' $checked{'AUTH_METHOD'}{'ntlm'} />$Lang::tr{'advproxy AUTH method ntlm'}</td>
END
if ($HAVE_NTLM_AUTH) {
print <<END;
<td width='$auth_column_width%' class='base'><input type='radio' name='AUTH_METHOD' value='ntlm-auth' $checked{'AUTH_METHOD'}{'ntlm-auth'} />$Lang::tr{'advproxy AUTH method ntlm auth'}</td>
END
}
print <<END
<td width='$auth_column_width%' class='base'><input type='radio' name='AUTH_METHOD' value='radius' $checked{'AUTH_METHOD'}{'radius'} />$Lang::tr{'advproxy AUTH method radius'}</td>
</tr>
</table>
END
@@ -1976,6 +1995,27 @@ if ($proxysettings{'AUTH_METHOD'} eq 'ntlm') { print <<END
END
; }
# ===================================================================
# NTLM-AUTH settings
# ===================================================================
if ($proxysettings{'AUTH_METHOD'} eq 'ntlm-auth') {
print <<END;
<hr size ='1'>
<table width='100%'>
<tr>
<td colspan='4'><b>$Lang::tr{'advproxy group access control'}</b></td>
</tr>
<tr>
<td width='20%' class='base'>$Lang::tr{'advproxy group required'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
<td width='40%'><input type='text' name='NTLM_AUTH_GROUP' value='$proxysettings{'NTLM_AUTH_GROUP'}' size='37' /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
END
}
# ===================================================================
# LDAP auth settings
# ===================================================================
@@ -3143,7 +3183,6 @@ END
print FILE <<END
cache_effective_user squid
cache_effective_group squid
umask 022
pid_filename /var/run/squid.pid
@@ -3169,9 +3208,35 @@ END
print FILE "\n";
}
if ($proxysettings{'CACHE_SIZE'} ne '0')
if ($proxysettings{'CACHE_SIZE'} > 0) {
print FILE <<END
maximum_object_size $proxysettings{'MAX_SIZE'} KB
minimum_object_size $proxysettings{'MIN_SIZE'} KB
cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256
END
;
} else {
print FILE "cache deny all\n\n";
}
print FILE <<END
request_body_max_size $proxysettings{'MAX_OUTGOING_SIZE'} KB
END
;
if ($proxysettings{'MAX_INCOMING_SIZE'} > 0) {
if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size none IPFire_unrestricted_ips\n"; }
if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size none IPFire_unrestricted_mac\n"; }
if ($proxysettings{'AUTH_METHOD'} eq 'ncsa')
{
if (!-z $extgrp) { print FILE "reply_body_max_size none for_extended_users\n"; }
}
}
if ( $proxysettings{'MAX_INCOMING_SIZE'} != '0' )
{
print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
print FILE "reply_body_max_size $proxysettings{'MAX_INCOMING_SIZE'} KB all\n\n";
}
if ($proxysettings{'LOGGING'} eq 'on')
@@ -3300,6 +3365,20 @@ END
}
}
if ($proxysettings{'AUTH_METHOD'} eq 'ntlm-auth')
{
print FILE "auth_param ntlm program /usr/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp";
if ($proxysettings{'NTLM_AUTH_GROUP'}) {
my $ntlm_auth_group = $proxysettings{'NTLM_AUTH_GROUP'};
$ntlm_auth_group =~ s/\\/\+/;
print FILE " --require-membership-of=\"$ntlm_auth_group\"";
}
print FILE "\n";
print FILE "auth_param ntlm children $proxysettings{'AUTH_CHILDREN'}\n";
}
if ($proxysettings{'AUTH_METHOD'} eq 'radius')
{
print FILE "auth_param basic program $authdir/basic_radius_auth -h $proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} ";
@@ -3396,19 +3475,25 @@ END
}
open (PORTS,"$acl_ports_ssl");
@temp = <PORTS>;
my @ssl_ports = <PORTS>;
close PORTS;
if (@temp)
{
foreach (@temp) { print FILE "acl SSL_ports port $_"; }
if (@ssl_ports) {
foreach (@ssl_ports) {
print FILE "acl SSL_ports port $_";
}
}
open (PORTS,"$acl_ports_safe");
@temp = <PORTS>;
my @safe_ports = <PORTS>;
close PORTS;
if (@temp)
{
foreach (@temp) { print FILE "acl Safe_ports port $_"; }
if (@safe_ports) {
foreach (@safe_ports) {
print FILE "acl Safe_ports port $_";
}
}
print FILE <<END
acl IPFire_http port $http_port
@@ -3498,7 +3583,7 @@ END
print FILE "http_access deny purge\n";
print FILE "url_rewrite_access deny localhost\n";
}
print FILE <<END
print FILE <<END;
#Access to squid:
#local machine, no restriction
@@ -3509,11 +3594,15 @@ http_access allow IPFire_ips IPFire_networks IPFire_http
http_access allow CONNECT IPFire_ips IPFire_networks IPFire_https
#Deny not web services
http_access deny !Safe_ports
http_access deny CONNECT !SSL_ports
END
;
if (@safe_ports) {
print FILE "http_access deny !Safe_ports\n";
}
if (@ssl_ports) {
print FILE "http_access deny CONNECT !SSL_ports\n";
}
if ($proxysettings{'AUTH_METHOD'} eq 'ident')
{
@@ -3941,34 +4030,6 @@ END
print FILE "http_reply_access allow all\n\n";
}
if ($proxysettings{'CACHE_SIZE'} > 0)
{
print FILE <<END
maximum_object_size $proxysettings{'MAX_SIZE'} KB
minimum_object_size $proxysettings{'MIN_SIZE'} KB
END
;
} else { print FILE "cache deny all\n\n"; }
print FILE <<END
request_body_max_size $proxysettings{'MAX_OUTGOING_SIZE'} KB
END
;
if ($proxysettings{'MAX_INCOMING_SIZE'} > 0) {
if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size none IPFire_unrestricted_ips\n"; }
if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size none IPFire_unrestricted_mac\n"; }
if ($proxysettings{'AUTH_METHOD'} eq 'ncsa')
{
if (!-z $extgrp) { print FILE "reply_body_max_size none for_extended_users\n"; }
}
}
if ( $proxysettings{'MAX_INCOMING_SIZE'} != '0' )
{
print FILE "reply_body_max_size $proxysettings{'MAX_INCOMING_SIZE'} KB all\n\n";
}
print FILE "visible_hostname";
if ($proxysettings{'VISIBLE_HOSTNAME'} eq '')
{

View File

@@ -134,6 +134,27 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
$errormessage = $Lang::tr{'invalid ip'}. " - ".$Lang::tr{'gateway ip'};
}
#set networkip if not already correctly defined
my($ip,$cidr) = split(/\//,$settings{'IP'});
my $netip=&General::getnetworkip($ip,$cidr);
$settings{'IP'} = "$netip/$cidr";
#Check for already existing routing entry
foreach my $line (@current) {
chomp($line); # remove newline
my @temp=split(/\,/,$line);
$temp[2] ='' unless defined $temp[2]; # not always populated
$temp[3] ='' unless defined $temp[2]; # not always populated
#Same ip already used?
if($temp[1] eq $settings{'IP'}){
$errormessage = $Lang::tr{'ccd err irouteexist'};
last;
}
#Is the network part of an internal network?
$errormessage .= &General::check_net_internal($settings{'IP'});
last;
}
unless ($errormessage) {
if ($settings{'KEY1'} eq '') { #add or edit ?
unshift (@current, "$settings{'EN'},$settings{'IP'},$settings{'GATEWAY'},$settings{'REMARK'}\n");

View File

@@ -67,8 +67,7 @@ $ovpnip[3]=$ovpnip[3]+1;
############################################################################################################################
############################################# Samba Dienste fr Statusberprfung ##########################################
my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
#my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd','Winbind Daemon' => 'winbindd');
my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Winbind Daemon' => 'winbindd');
&Header::showhttpheaders();
@@ -192,6 +191,10 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
refreshpage();
}
if ($sambasettings{'ACTION'} eq 'join') {
$message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'});
}
############################################################################################################################
################################################ Sicherheitsabfrage für den Reset ##########################################
@@ -276,6 +279,7 @@ print FILE <<END
netbios name = $sambasettings{'NETBIOSNAME'}
server string = $sambasettings{'SRVSTRING'}
workgroup = $sambasettings{'WORKGRP'}
realm = $mainsettings{'DOMAINNAME'}
passdb backend = smbpasswd
wide links = $sambasettings{'WIDELINKS'}
@@ -315,8 +319,12 @@ username level = 1
wins support = $sambasettings{'WINSSUPPORT'}
wins server = $sambasettings{'WINSSRV'}
winbind separator = +
winbind uid = 10000-20000
winbind gid = 10000-20000
winbind use default domain = yes
log file = /var/log/samba/samba-log.%m
lock directory = /var/lock/samba
pid directory = /var/run/
log level = $sambasettings{'LOGLEVEL'}
syslog = $sambasettings{'SYSLOGLEVEL'}
@@ -384,6 +392,15 @@ if ($errormessage)
&Header::closebox();
}
if ($message) {
$message = &Header::cleanhtml($message);
$message =~ s/\n/<br>/g;
&Header::openbox('100%', 'left', $Lang::tr{'messages'});
print "$message\n";
&Header::closebox();
}
############################################################################################################################
########################################## Aktivieren von Checkboxen und Dropdowns #########################################
@@ -440,14 +457,6 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
print <<END
<br />
<table width='95%' cellspacing='0'>
END
;
if ( $message ne "" )
{
print "<tr><td colspan='3' align='left'><font color='red'>$message</font>";
}
print <<END
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
</table><table width='95%' cellspacing='0'>
END
@@ -875,6 +884,55 @@ END
&Header::closebox();
}
if ($sambasettings{'SECURITY'} eq "ADS") {
&Header::openbox('100%', 'center', $Lang::tr{'samba join a domain'});
my $AD_DOMAINNAME = uc($mainsettings{'DOMAINNAME'});
print <<END;
<form method="POST" action="$ENV{'SCRIPT_NAME'}">
<input type="hidden" name="ACTION" value="join">
<table width="95%">
<tbody>
<tr>
<td width="40%">
$Lang::tr{'domain'}
</td>
<td>
$AD_DOMAINNAME
</td>
</tr>
<tr>
<td width="40%">
$Lang::tr{'administrator username'}
</td>
<td>
<input type="text" name="USERNAME" size="30">
</td>
</tr>
<tr>
<td width="40%">
$Lang::tr{'administrator password'}
</td>
<td>
<input type="password" name="PASSWORD" size="30">
</td>
</tr>
<tr>
<td></td>
<td>
<input type="submit" value="$Lang::tr{'samba join domain'}">
</td>
</tr>
</tbody>
</table>
</form>
END
&Header::closebox();
}
############################################################################################################################
############################################### Verwalten von Freigaben ####################################################
@@ -1304,3 +1362,13 @@ sub isrunning
}
return $status;
}
sub joindomain {
my $username = shift;
my $password = shift;
my @options = ("/usr/local/bin/sambactrl", "join", $username, $password);
my $output = qx(@options);
return $output;
}

View File

@@ -99,7 +99,10 @@
'addon' => 'Addons',
'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
'admin users' => 'Liste der Benutzer mit Super User Rechten',
'administrator password' => 'Administrator-Passwort',
'administrator user password' => 'Passwort für Benutzer &quot;admin&quot;:',
'administrator username' => 'Administrator-Benutzername',
'adsl settings' => 'ADSL-Einstellungen',
'advanced' => 'Erweitert',
'advanced server' => 'Erweiterte Server-Optionen',
'advproxy AUTH always required' => 'Authentifizierung für uneingeschränkte Quelladressen erforderlich',
@@ -111,7 +114,8 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Lokal',
'advproxy AUTH method none' => 'Keine',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method ntlm' => 'Windows NT4-Domäne',
'advproxy AUTH method ntlm auth' => 'Windows Active Directory',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Domains ohne Authentifizierung (eine pro Zeile)',
'advproxy AUTH number of auth processes' => 'Anzahl der Authentifizierungsprozesse',
@@ -262,6 +266,8 @@
'advproxy fake useragent' => 'Gefälschter Useragent für externe Web-Sites',
'advproxy friday' => 'Fre',
'advproxy from' => 'Von',
'advproxy group access control' => 'Gruppenbasierte Zugriffskontrolle',
'advproxy group required' => 'Erforderliche Gruppe',
'advproxy hdd cache size' => 'Cachegröße auf der Festplatte (MB)',
'advproxy invalid num of children' => 'Ungültige Anzahl der Filter-Prozesse',
'advproxy log enabled' => 'Protokoll aktiviert',
@@ -750,6 +756,10 @@
'dnsforward entries' => 'Aktuelle Einträge',
'dnsforward forward_server' => 'DNS-Server',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC-aware',
'dnssec information' => 'DNSSEC-Informationen',
'dnssec not supported' => 'DNSSEC wird nicht unterstützt',
'dnssec validating' => 'DNSSEC-validierend',
'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)',
'dod' => 'Dial-on-Demand-Modus',
'dod for dns' => 'Dial-on-Demand für DNS:',
@@ -765,6 +775,7 @@
'donation-text' => '<strong>IPFire</strong> wird von Freiwilligen in ihrer Freizeit betrieben und auch betreut. Um dieses Projekt am Laufen zu halten, entstehen uns natürlich auch Kosten. Wenn Sie uns unterstützen wollen, würden wir uns über eine kleine Spende sehr freuen.',
'dos charset' => 'DOS Charset',
'down and up speed' => 'Geben Sie bitte hier ihre Download- bzw. Upload-Geschwindigkeit ein <br /> und klicken Sie danach auf <i>Speichern</i>.',
'downlink' => 'Downlink',
'downlink speed' => 'Downlink-Geschwindigkeit (kBit/sek)',
'downlink std class' => 'Downloadstandardklasse',
'download' => 'herunterladen',
@@ -919,6 +930,7 @@
'firewallhits' => 'Firewalltreffer',
'firmware' => 'Firmware',
'firmware upload' => 'Hochladen der Firmware/Treiber',
'first' => 'Erste',
'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt',
'fixed ip lease modified' => 'Feste IP-Zuordnung geändert',
'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht',
@@ -1344,6 +1356,7 @@
'lan' => 'LAN',
'lang' => 'de',
'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:',
'last' => 'Letzte',
'last activity' => 'Letzte Aktivität',
'lateprompting' => 'Late prompting',
'lease expires' => 'Zuordnung verfällt',
@@ -1455,6 +1468,7 @@
'memory' => 'Speicher',
'memory information' => 'Speicherinformationen',
'memory usage per' => 'Speichernutzung pro',
'messages' => 'Meldungen',
'messages logging' => 'Logeinstellungen für /var/log/messages',
'method' => 'Methode:',
'min costs' => 'Minimale Kosten',
@@ -1520,6 +1534,7 @@
'name is invalid' => 'Name ist ungültig',
'name must only contain characters' => 'Name darf nur Buchstaben enthalten.',
'name too long' => 'Der volle Benutzername oder der System Hostname ist zu lang',
'nameserver' => 'Nameserver',
'nat-traversal' => 'Nat Traversal:',
'needreboot' => 'Ein Update benötigt einen Neustart',
'net' => 'Netz',
@@ -1889,6 +1904,8 @@
'running' => 'LÄUFT',
'safe removal of umounted device' => 'Sie können gefahrlos das abgemeldete Gerät entfernen',
'samba' => 'Samba',
'samba join a domain' => 'Einer Domäne beitreten',
'samba join domain' => 'Domäne beitreten',
'samba status' => 'Samba Status',
'saturday' => 'Samstag',
'save' => 'Speichern',
@@ -2269,6 +2286,7 @@
'updxlrtr weekly' => 'wöchentlich',
'updxlrtr year' => 'einem Jahr',
'upgrade' => 'upgrade',
'uplink' => 'Uplink',
'uplink speed' => 'Uplink-Geschwindigkeit (kBit/sek)',
'uplink std class' => 'Uploadstandardklasse',
'upload' => 'Hochladen',

View File

@@ -99,7 +99,10 @@
'addons' => 'Addons',
'admin user password has been changed' => 'Admin user password has been changed.',
'admin users' => 'User with superuser rights',
'administrator password' => 'Administrator password',
'administrator user password' => 'Admin user password:',
'administrator username' => 'Administrator username',
'adsl settings' => 'ADSL settings',
'advanced' => 'Advanced',
'advanced server' => 'Advanced server options',
'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses',
@@ -111,7 +114,8 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Local',
'advproxy AUTH method none' => 'None',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method ntlm' => 'Windows NT4 Domain',
'advproxy AUTH method ntlm auth' => 'Windows Active Directory',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Domains without authentication (one per line)',
'advproxy AUTH number of auth processes' => 'Number of authentication processes',
@@ -262,6 +266,8 @@
'advproxy fake useragent' => 'Fake useragent submitted to external sites',
'advproxy friday' => 'Fri',
'advproxy from' => 'From',
'advproxy group access control' => 'Group based access control',
'advproxy group required' => 'Required group',
'advproxy hdd cache size' => 'Harddisk cache size (MB)',
'advproxy invalid num of children' => 'Invalid number of filter processes',
'advproxy log enabled' => 'Log enabled',
@@ -775,6 +781,10 @@
'dnsforward entries' => 'Current entries',
'dnsforward forward_server' => 'Nameserver',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC Aware',
'dnssec information' => 'DNSSEC Information',
'dnssec not supported' => 'DNSSEC Not supported',
'dnssec validating' => 'DNSSEC Validating',
'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
'dod' => 'Dial on Demand',
'dod for dns' => 'Dial on Demand for DNS:',
@@ -791,6 +801,7 @@
'done' => 'Do it',
'dos charset' => 'DOS Charset',
'down and up speed' => 'Enter your Down- and Uplink-Speed <br /> and then press <i>Save</i>.',
'downlink' => 'Downlink',
'downlink speed' => 'Downlink speed (kbit/sec)',
'downlink std class' => 'downlink standard class',
'download' => 'download',
@@ -946,6 +957,7 @@
'firewallhits' => 'firewallhits',
'firmware' => 'Firmware',
'firmware upload' => 'Upload Firmware/Drivers',
'first' => 'First',
'fixed ip lease added' => 'Fixed IP lease added',
'fixed ip lease modified' => 'Fixed IP lease modified',
'fixed ip lease removed' => 'Fixed IP lease removed',
@@ -1374,6 +1386,7 @@
'lan' => 'LAN',
'lang' => 'en',
'languagepurpose' => 'Select the language you wish IPFire to display in:',
'last' => 'Last',
'last activity' => 'Last Activity',
'lateprompting' => 'Lateprompting',
'lease expires' => 'Lease expires',
@@ -1485,6 +1498,7 @@
'memory' => 'Memory',
'memory information' => 'Memory information',
'memory usage per' => 'Memory Usage per',
'messages' => 'Messages',
'messages logging' => 'Logsettings for /var/log/messages',
'method' => 'Method:',
'min costs' => 'Minimum costs',
@@ -1550,6 +1564,7 @@
'name is invalid' => 'Name is invalid',
'name must only contain characters' => 'Name must only contain characters.',
'name too long' => 'User\'s full name or system hostname is too long',
'nameserver' => 'Nameserver',
'nat-traversal' => 'Nat Traversal:',
'needreboot' => 'An update requires a restart',
'net' => 'Net',
@@ -1921,6 +1936,8 @@
'running' => 'RUNNING',
'safe removal of umounted device' => 'You can safely remove the unmounted device',
'samba' => 'Samba',
'samba join a domain' => 'Join a domain',
'samba join domain' => 'Join domain',
'samba status' => 'Samba Status',
'saturday' => 'Saturday',
'save' => 'Save',
@@ -2309,6 +2326,7 @@
'updxlrtr weekly' => 'weekly',
'updxlrtr year' => 'one year',
'upgrade' => 'upgrade',
'uplink' => 'Uplink',
'uplink speed' => 'Uplink speed (kbit/sec)',
'uplink std class' => 'uplink standard class',
'upload' => 'Upload',
@@ -2563,6 +2581,7 @@
'vpn aggrmode' => 'IKE aggressive mode allowed. Avoid if possible (preshared key is transmitted in clear text)!',
'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something',
'vpn auth-dn' => 'Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field',
'vpn configuration main' => 'VPN Configuration',
'vpn delayed start' => 'Delay before launching VPN (seconds)',
'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',

View File

@@ -101,7 +101,6 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Local',
'advproxy AUTH method none' => 'Ninguno',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Dominios sin autenticación (uno por línea)',
'advproxy AUTH number of auth processes' => 'Número de proceso de autenticación',

View File

@@ -103,7 +103,6 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Local',
'advproxy AUTH method none' => 'Rien',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Domaines sans authentification (un par ligne)',
'advproxy AUTH number of auth processes' => 'Nombre de processus d\'authentification',

View File

@@ -110,7 +110,6 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Lokaal',
'advproxy AUTH method none' => 'Geen',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Domeinen zonder authenticatie (een per regel)',
'advproxy AUTH number of auth processes' => 'Aantal authenticatieprocessen',

View File

@@ -103,7 +103,6 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Local',
'advproxy AUTH method none' => 'None',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Domeny bez autoryzacji (jedna w linii)',
'advproxy AUTH number of auth processes' => 'Liczba procesów autoryzujących',

View File

@@ -101,7 +101,6 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Локальный',
'advproxy AUTH method none' => 'Нет',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Домен без аутентификации (один на строчку)',
'advproxy AUTH number of auth processes' => 'Кол-во процессов аутентификации',

View File

@@ -110,7 +110,6 @@
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Yerel',
'advproxy AUTH method none' => 'Yok',
'advproxy AUTH method ntlm' => 'Windows',
'advproxy AUTH method radius' => 'RADIUS',
'advproxy AUTH no auth' => 'Kimlik doğrulaması olmayan hedefler (her satırda bir tane)',
'advproxy AUTH number of auth processes' => 'Kimlik doğrulama işlemlerinin sayısı',

91
lfs/bacula Normal file
View File

@@ -0,0 +1,91 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 5.2.13
THISAPP = bacula-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = bacula
PAK_VER = 2
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 43417bae0c221afb1f30a581c9e0f2fe
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 \
--sysconfdir=/etc/bacula \
--with-working-dir=/var/bacula/working \
--enable-client-only
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
rm -f /root/.rnd
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -25,7 +25,7 @@
include Config
VER = 9.3.2
VER = 9.9.5
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -33,6 +33,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
export CPPFLAGS = -DDIG_SIGCHASE
###############################################################################
# Top-level Rules
###############################################################################
@@ -41,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 55e709501a7780233c36e25ccd15ece2
$(DL_FILE)_MD5 = e676c65cad5234617ee22f48e328c24e
install : $(TARGET)
@@ -71,7 +73,11 @@ $(subst %,%_MD5,$(objects)) :
$(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 --disable-nls --disable-ipv6
cd $(DIR_APP) && STD_CDEFINES="$(CPPFLAGS)" \
./configure \
--prefix=/usr \
--disable-static \
--disable-openssl-version-check
cd $(DIR_APP) && make -C lib/dns
cd $(DIR_APP) && make -C lib/isc
cd $(DIR_APP) && make -C lib/bind9
@@ -81,5 +87,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make -C bin/dig install
cd $(DIR_APP) && make -C bin/nsupdate
cd $(DIR_APP) && make -C bin/nsupdate install
install -v -m 644 $(DIR_SRC)/config/bind/trusted-key.key \
/etc/trusted-key.key
@rm -rf $(DIR_APP)
@$(POSTBUILD)

99
lfs/boost Normal file
View File

@@ -0,0 +1,99 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 1_55_0
THISAPP = boost_$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
CONFIGURE_OPTIONS = \
--prefix=/usr \
--layout=tagged \
--without-mpi \
--without-graph_parallel \
--build-dir=serial \
cflags="$(CFLAGS)" \
cxxflags="$(CXXFLAGS)" \
variant=release \
threading=single,multi \
debug-symbols=off \
pch=off
ifeq "$(MACHINE)" "armv5tel"
MAKETUNING = -j2
endif
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 93780777cfbf999a600f62883bd54b17
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./bootstrap.sh --with-toolset=gcc
cd $(DIR_APP) && ./b2 -d+2 -q $(MAKETUNING) $(CONFIGURE_OPTIONS) stage
cd $(DIR_APP) && ./b2 $(MAKETUNING) $(CONFIGURE_OPTIONS) install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -24,15 +24,15 @@
include Config
VER = 1.2.2p2
VER = 1.2.4p5
THISAPP = check_mk_agent-$(VER)
DL_FILE = check_mk-${VER}.tar.gz
DL_FROM = http://mathias-kettner.de/download
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/check_mk-${VER}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = check_mk_agent
PAK_VER = 2
PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89
$(DL_FILE)_MD5 = ef3055d191bd38295d1716b3f7824115
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))

80
lfs/ddns Normal file
View File

@@ -0,0 +1,80 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 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 = 003
THISAPP = ddns-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = http://source.ipfire.org/releases/ddns/
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9ff8ab5fa716859b51f63b0a241f1337
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -24,14 +24,16 @@
include Config
VER = 2.45
VER = 2.71
THISAPP = dnsmasq-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
COPTS = -DHAVE_ISC_READER
###############################################################################
# Top-level Rules
###############################################################################
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b7956e15c9766e05b3eca3ce88fdb616
$(DL_FILE)_MD5 = 9e2e4d59c75e71ee3ca817ff0f9be69e
install : $(TARGET)
@@ -69,13 +71,18 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i -e 's|/usr/local|/usr|g' Makefile
cd $(DIR_APP)/src && sed -i \
-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
-e 's|^#define HAVE_TFTP *$$|//#define HAVE_TFTP|' \
-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-2.71-use-nettle-with-minigmp.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-2.71-support-nettle-3.0.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-2.70-Add-support-to-read-ISC-DHCP-lease-file.patch
cd $(DIR_APP) && sed -i src/config.h \
-e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \
-e 's|/\* #define HAVE_DNSSEC \*/|#define HAVE_DNSSEC|g' \
-e 's|#define HAVE_DHCP|//#define HAVE_DHCP|g' \
-e 's|#define HAVE_DHCP6|//#define HAVE_DHCP6|g' \
-e 's|#define HAVE_TFTP|//#define HAVE_TFTP|g'
cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" COPTS="$(COPTS)" $(MAKETUNING)
cd $(DIR_APP) && make PREFIX=/usr install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

41
lfs/gmp
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2014 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,18 +24,25 @@
include Config
VER = 5.0.5
VER = 6.0.0
THISAPP = gmp-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP)a.tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(MACHINE)" "i586"
CONFIGURE_ARGS = ABI=32
BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET))
endif
CONFIGURE_OPTIONS = \
--prefix=/usr \
--enable-cxx \
--enable-mpbsd \
--disable-nls
###############################################################################
# Top-level Rules
###############################################################################
@@ -44,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 041487d25e9c230b0c42b106361055fe
$(DL_FILE)_MD5 = 1e6da4e434553d2811437aa42c7f7c76
install : $(TARGET)
@@ -73,10 +80,30 @@ $(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) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
--enable-cxx --enable-mpbsd --disable-nls
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && \
$(CONFIGURE_ARGS) \
./configure \
--build=$(BUILDTARGET) \
$(CONFIGURE_OPTIONS)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
ifeq "$(MACHINE)" "i586"
# Build SSE/SSE2 optimised version for x86
cd $(DIR_APP) && make clean
cd $(DIR_APP) && \
$(CONFIGURE_ARGS) \
./configure \
--build=$(BUILDTARGET_PENTIUM4) \
$(CONFIGURE_OPTIONS) \
CFLAGS="$(CFLAGS) -march=pentium4" \
CXXFLAGS="$(CXXFLAGS) -march=pentium4"
cd $(DIR_APP) && make $(MAKETUNING)
-mkdir -pv /usr/lib/sse2
cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.2.0 /usr/lib/sse2
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2014 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 #
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
--build=$(BUILDTARGET) \
--enable-cxx --enable-mpbsd --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && install -m 644 .libs/libgmp.so.3.5.2 /usr/lib

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.1
VER = 2.2
THISAPP = hostapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
PAK_VER = 29
PAK_VER = 30
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = bb9c50e87c5af6f89f387e63911effac
$(DL_FILE)_MD5 = 23c1f78a693c3288802d516adb7fd289
install : $(TARGET)

105
lfs/krb5 Normal file
View File

@@ -0,0 +1,105 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 1.12.1
THISAPP = krb5-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)/src
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = krb5
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4a631b3474d3e44773f1ecda96f04400
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 axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/mitkrb-1.12.1-db2_fix-1.patch
cd $(DIR_APP) && sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \
-e "s@-lpython2.5]@&,\n AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \
-i configure.in
cd $(DIR_APP) && autoconf
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--with-system-et \
--with-system-ss \
--enable-dns-for-realm \
CPPFLAGS="-I/usr/include/et"
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
for LIB in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \
kdb5 kdb_ldap krad krb5 krb5support verto; do \
chmod -f -v 755 "/usr/lib/lib$$LIB.so"; \
done
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2014 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 = 2.06
VER = 2.08
THISAPP = lzo-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 95380bd4081f85ef08c5209f4107e9f8
$(DL_FILE)_MD5 = fcec64c26a0f4f4901468f360029678f
install : $(TARGET)

View File

@@ -24,10 +24,10 @@
include Config
VER = 2.4.2
VER = 3.1.2
THISAPP = mpfr-$(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,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 89e59fe665e2b3ad44a6789f40b059a0
$(DL_FILE)_MD5 = e3d203d188b8fe60bb6578dd3152e05c
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 axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
--enable-thread-safe --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)

79
lfs/nettle Normal file
View File

@@ -0,0 +1,79 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 3.0
THISAPP = nettle-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = f64b1bf1e774b7ae6e507318e340250e
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--enable-shared
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

100
lfs/owncloud Normal file
View File

@@ -0,0 +1,100 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 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 = 6.0.4
THISAPP = owncloud-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = owncloud
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0a92cf5971e9c9c58e40219b385bd8f4
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_SRC)/$(PROG) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC) && cp -vrf owncloud /srv/web/
# Rename files with spaces in the name.
while read -r file; do \
mv -v "$${file}" "$${file//\ /_}"; \
done <<< "$$(find /srv/web/owncloud | grep ' ')"
# Create data directory
mkdir -pv /var/owncloud/data
ln -s /var/owncloud/data /srv/web/owncloud/data
# Make sure everything is owned by root, except...
chown -R root.root /srv/web/owncloud
chown -R nobody.nobody /srv/web/owncloud/{apps,data,config}
install -v -m644 $(DIR_SRC)/config/owncloud/owncloud.conf \
/etc/httpd/conf/vhosts.d/
install -v -m 644 $(DIR_SRC)/config/backup/includes/owncloud \
/var/ipfire/backup/addons/includes/owncloud
@$(POSTBUILD)

View File

@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 58
DEPS = "cups"
DEPS = "cups krb5"
###############################################################################
# Top-level Rules
@@ -78,16 +78,27 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP)/source3 && ./configure \
--prefix=/usr \
--libdir=/usr/lib/ \
--sysconfdir=/var/ipfire \
--localstatedir=/var \
--with-piddir=/var/run \
--with-fhs \
--with-winbind \
--disable-swat \
--enable-cups \
--with-syslog
--prefix=/usr \
--libdir=/usr/lib/ \
--sysconfdir=/var/ipfire \
--localstatedir=/var \
--with-cachedir=/var/lib/samba \
--with-lockdir=/var/lib/samba \
--with-piddir=/var/run \
--with-ads \
--with-acl-support \
--with-libsmbclient \
--with-libsmbsharemodes \
--with-sendfile-support \
--without-smbwrapper \
--with-mmap \
--with-fhs \
--with-vfs \
--with-winbind \
--disable-swat \
--enable-cups \
--disable-avahi \
--with-syslog
cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/source3 && make install
cd $(DIR_APP)/source3 && chmod -v 644 /usr/include/libsmbclient.h
@@ -107,5 +118,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
-mkdir -p /var/log/samba
install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba
-mkdir -p 750 /var/lib/samba/winbindd_privileged
chgrp wbpriv /var/lib/samba/winbindd_privileged
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -53,7 +53,7 @@ $(TARGET) :
-mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
-install -dv -m 0750 /root
-install -dv -m 1777 /tmp /var/tmp
-mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}

View File

@@ -24,7 +24,7 @@
include Config
VER = 5.2.0dr6
VER = 5.2.0
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 6b9ac43a3934dcdf66ccbdfebc54081b
$(DL_FILE)_MD5 = 5cee4ee1a6ccb74400758b3ace54d46e
install : $(TARGET)
@@ -97,7 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-eap-peap \
--enable-eap-mschapv2 \
--enable-eap-identity \
--enable-unity \
$(CONFIGURE_OPTIONS)
cd $(DIR_APP) && make $(MAKETUNING)

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.2.4.20
VER = 0.2.4.22
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
PAK_VER = 6
PAK_VER = 7
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a8cd8e3b3a3f6a7770f2c22d280f19b8
$(DL_FILE)_MD5 = 5a7eee0d9df87233255d78b25c6f8270
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.83
VER = 2.84
THISAPP = transmission-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
PAK_VER = 10
PAK_VER = 11
DEPS = "libevent2"
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4620cfbfefee2ce55a6fa12c3ec330a7
$(DL_FILE)_MD5 = 411aec1c418c14f6765710d89743ae42
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.1
VER = 2.2
THISAPP = wpa_supplicant-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e96b8db5a8171cd17a5b2012d6ad7cc7
$(DL_FILE)_MD5 = 238e8e888bbd558e1a57e3eb28d1dd07
install : $(TARGET)

24
make.sh
View File

@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.15" # Version number
CORE="80" # Core Level (Filename)
PAKFIRE_CORE="79" # Core Level (PAKFIRE)
PAKFIRE_CORE="80" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -385,9 +385,6 @@ buildipfire() {
export LOGFILE
ipfiremake configroot
ipfiremake backup
ipfiremake bind
ipfiremake dhcp
ipfiremake dhcpcd
ipfiremake libusb
ipfiremake libusbx
ipfiremake libpcap
@@ -459,17 +456,21 @@ buildipfire() {
;;
esac
ipfiremake pkg-config
ipfiremake openssl
ipfiremake openssl-compat
ipfiremake libgpg-error
ipfiremake libgcrypt
ipfiremake libassuan
ipfiremake bind
ipfiremake dhcp
ipfiremake dhcpcd
ipfiremake boost
ipfiremake linux-atm
ipfiremake cpio
ipfiremake dracut
ipfiremake expat
ipfiremake gdbm
ipfiremake pam
ipfiremake openssl
ipfiremake openssl-compat
ipfiremake libgpg-error
ipfiremake libgcrypt
ipfiremake libassuan
ipfiremake curl
ipfiremake tcl
ipfiremake sqlite
@@ -508,6 +509,7 @@ buildipfire() {
ipfiremake arping
ipfiremake beep
ipfiremake dvdrtools
ipfiremake nettle
ipfiremake dnsmasq
ipfiremake dosfstools
ipfiremake reiserfsprogs
@@ -614,6 +616,7 @@ buildipfire() {
ipfiremake foomatic
ipfiremake hplip
ipfiremake cifs-utils
ipfiremake krb5
ipfiremake samba
ipfiremake sudo
ipfiremake mc
@@ -763,6 +766,7 @@ buildipfire() {
ipfiremake python-progressbar
ipfiremake python-xattr
ipfiremake intltool
ipfiremake ddns
ipfiremake transmission
ipfiremake dpfhack
ipfiremake lcd4linux
@@ -805,6 +809,8 @@ buildipfire() {
ipfiremake iotop
ipfiremake stunnel
ipfiremake sslscan
ipfiremake owncloud
ipfiremake bacula
}
buildinstaller() {

View File

@@ -71,6 +71,13 @@ create_files() {
case "${1}" in
start)
if [[ ! -L "/var/run" ]]; then
boot_mesg "Repair /var/run symlink to /run..."
mv -u /var/run/* /run/ 2>&1 > /dev/null
rm -rf /var/run
ln -s ../run /var/run
fi
boot_mesg -n "Cleaning file systems:" ${INFO}
boot_mesg -n " /tmp" ${NORMAL}

53
src/initscripts/init.d/dhcrelay Executable file
View File

@@ -0,0 +1,53 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/dhcrelay
#
# Description : The DHCP Relay Daemon
#
########################################################################
. /etc/sysconfig/rc
. ${rc_functions}
CONFIG_FILE="/var/ipfire/dhcp/relay"
if [ -r "${CONFIG_FILE}" ]; then
eval $(/usr/local/bin/readhash ${CONFIG_FILE})
fi
ARGS="-q"
for interface in ${INTERFACES}; do
ARGS="${ARGS} -i ${interface}"
done
ARGS="${ARGS} ${SERVERS}"
case "${1}" in
start)
boot_mesg "Starting DHCP Relay..."
loadproc /usr/sbin/dhcrelay ${ARGS}
;;
stop)
boot_mesg "Stopping DHCP Relay..."
killproc -p /var/run/dhcrelay.pid /usr/sbin/dhcrelay
;;
restart)
${0} stop
sleep 1
${0} start
;;
status)
statusproc /usr/sbin/dhcrelay
;;
*)
echo "Usage: ${0} {start|stop|restart|status}"
exit 1
;;
esac
# End $rc_base/init.d/dhcrelay

View File

@@ -20,7 +20,20 @@ if [ -e "/etc/sysconfig/dnsmasq" ]; then
. /etc/sysconfig/dnsmasq
fi
CACHE_SIZE=2500
ENABLE_DNSSEC=1
SHOW_SRV=1
TRUST_ANCHOR=".,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5"
function dnssec_args() {
local cmdline="--dnssec"
if [ -n "${TRUST_ANCHOR}" ]; then
cmdline="${cmdline} --trust-anchor=${TRUST_ANCHOR}"
fi
echo "${cmdline}"
}
function dns_forward_args() {
local file="${1}"
@@ -41,7 +54,6 @@ function dns_forward_args() {
echo "${cmdline}"
}
case "${1}" in
start)
# kill already running copy of dnsmasq...
@@ -73,6 +85,15 @@ case "${1}" in
# Add custom forward dns zones.
ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
# Enabled DNSSEC validation
if [ "${ENABLE_DNSSEC}" -eq 1 ]; then
ARGS="${ARGS} $(dnssec_args)"
fi
if [ -n "${CACHE_SIZE}" ]; then
ARGS="${ARGS} --cache-size=${CACHE_SIZE}"
fi
loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then

View File

@@ -1,5 +1,3 @@
#!/bin/bash
/usr/local/bin/setddns.pl -f
exit 0
exec /usr/bin/ddns update-all

View File

@@ -4,19 +4,28 @@
# Based on sysklogd script from LFS-3.1 and earlier.
# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org
#$LastChangedBy: bdubbs $
#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
. /etc/sysconfig/rc
. $rc_functions
function fix_permissions() {
local lockdir="/var/lib/samba/winbindd_privileged"
chmod 750 "${lockdir}"
chgrp wbpriv "${lockdir}"
}
case "$1" in
start)
fix_permissions
boot_mesg "Starting nmbd..."
loadproc /usr/sbin/nmbd -D
boot_mesg "Starting smbd..."
loadproc /usr/sbin/smbd -D
boot_mesg "Starting winbind..."
loadproc /usr/sbin/winbindd
;;
stop)
@@ -25,6 +34,9 @@ case "$1" in
boot_mesg "Stopping nmbd..."
killproc -p /var/run/nmbd.pid /usr/sbin/nmbd
boot_mesg "Stopping winbind..."
killproc -p /var/run/winbindd.pid /usr/sbin/winbindd
;;
reload)
@@ -33,6 +45,9 @@ case "$1" in
boot_mesg "Reloading nmbd..."
reloadproc /usr/sbin/nmbd
boot_mesg "Reloading winbind..."
reloadproc /usr/sbin/winbindd
;;
restart)
@@ -44,6 +59,7 @@ case "$1" in
status)
statusproc /usr/sbin/nmbd
statusproc /usr/sbin/smbd
statusproc /usr/sbin/winbindd
;;
*)

View File

@@ -1,50 +0,0 @@
#!/bin/bash
# Begin $rc_base/init.d/winbind
# Based on sysklogd script from LFS-3.1 and earlier.
# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org
#$LastChangedBy: bdubbs $
#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
. /etc/sysconfig/rc
. $rc_functions
PIDFILE="/var/run/winbindd.pid"
KILLDELAY="10"
case "$1" in
start)
boot_mesg "Starting winbind..."
loadproc /usr/sbin/winbindd
;;
stop)
boot_mesg "Stopping winbind..."
killproc -p ${PIDFILE} /usr/sbin/winbind
;;
reload)
boot_mesg "Reloading winbind..."
reloadproc /usr/sbin/winbindd
;;
restart)
$0 stop
sleep 1
$0 start
;;
status)
statusproc /usr/sbin/winbindd
;;
*)
echo "Usage: $0 {start|stop|reload|restart|status}"
exit 1
;;
esac
# End $rc_base/init.d/winbind

View File

@@ -10,165 +10,136 @@
char command[BUFFER_SIZE];
int main(int argc, char *argv[])
{
int main(int argc, char *argv[]) {
if (!(initsetuid()))
exit(1);
if (!(initsetuid()))
exit(1);
// Check what command is asked
if (argc == 1) {
fprintf (stderr, "Missing smbctrl command!\n");
return 1;
// Check what command is asked
if (argc==1)
{
fprintf (stderr, "Missing smbctrl command!\n");
return 1;
}
else if (strcmp(argv[1], "smbuserdisable")==0)
{
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -d %s >/dev/null", argv[2]);
safe_system(command);
return 0;
}
else if (strcmp(argv[1], "smbuserenable")==0)
{
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -e %s >/dev/null", argv[2]);
safe_system(command);
return 0;
}
else if (strcmp(argv[1], "smbuserdelete")==0)
{
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -x %s >/dev/null", argv[2]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/userdel %s >/dev/null", argv[2]);
safe_system(command);
return 0;
}
else if (strcmp(argv[1], "smbsafeconf")==0)
{
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
return 0;
}
else if (strcmp(argv[1], "smbsafeconfcups")==0)
{
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
return 0;
}
else if (strcmp(argv[1], "smbsafeconfpdc")==0)
{
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
return 0;
}
else if (strcmp(argv[1], "smbsafeconfpdccups")==0)
{
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
return 0;
}
else if (strcmp(argv[1], "smbglobalreset")==0)
{
safe_system("/bin/cat /var/ipfire/samba/default.global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
safe_system("/bin/cat /var/ipfire/samba/default.settings > /var/ipfire/samba/settings");
safe_system("/bin/cat /var/ipfire/samba/default.global > /var/ipfire/samba/global");
safe_system("/bin/cat /var/ipfire/samba/default.pdc > /var/ipfire/samba/pdc");
return 0;
}
else if (strcmp(argv[1], "smbsharesreset")==0)
{
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/default.shares > /var/ipfire/samba/smb.conf");
safe_system("/bin/cat /var/ipfire/samba/default.shares > /var/ipfire/samba/shares");
return 0;
}
else if (strcmp(argv[1], "smbprinterreset")==0)
{
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/default.printer > /var/ipfire/samba/smb.conf");
safe_system("/bin/cat /var/ipfire/samba/default.printer > /var/ipfire/samba/printer");
return 0;
}
else if (strcmp(argv[1], "smbstop")==0)
{
safe_system("/etc/rc.d/init.d/samba stop >/dev/null");
safe_system("/usr/local/bin/sambactrl disable");
return 0;
}
else if (strcmp(argv[1], "smbstart")==0)
{
safe_system("/etc/rc.d/init.d/samba start >/dev/null");
safe_system("/usr/local/bin/sambactrl enable");
return 0;
}
else if (strcmp(argv[1], "smbrestart")==0)
{
safe_system("/etc/rc.d/init.d/samba restart >/dev/null");
return 0;
}
else if (strcmp(argv[1], "smbreload")==0)
{
safe_system("/etc/rc.d/init.d/samba reload >/dev/null");
return 0;
}
else if (strcmp(argv[1], "smbstatus")==0)
{
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbstatus 2>/dev/null");
safe_system(command);
return 0;
}
else if (strcmp(argv[1], "smbuseradd")==0)
{
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambauser >/dev/null");
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g %s -s %s %s >/dev/null", argv[4], argv[5], argv[2]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]);
safe_system(command);
return 0;
}
else if (strcmp(argv[1], "smbpcadd")==0)
{
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambawks >/dev/null");
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba Workstation' -g %s -s %s %s >/dev/null", argv[3], argv[4], argv[2]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s >/dev/null", argv[2]);
safe_system(command);
return 0;
}
else if (strcmp(argv[1], "smbchangepw")==0)
{
snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]);
safe_system(command);
return 0;
}
else if (strcmp(argv[1], "readsmbpasswd")==0)
{
safe_system("/bin/chown root:nobody /var/ipfire/samba/private >/dev/null");
safe_system("/bin/chown root:nobody /var/ipfire/samba/private/smbpasswd >/dev/null");
safe_system("/bin/chmod 640 /var/ipfire/samba/private/smbpasswd >/dev/null");
safe_system("/bin/chmod 650 /var/ipfire/samba/private >/dev/null");
return 0;
}
else if (strcmp(argv[1], "locksmbpasswd")==0)
{
safe_system("/bin/chown root:root /var/ipfire/samba/private >/dev/null");
safe_system("/bin/chown root:root /var/ipfire/samba/private/smbpasswd >/dev/null");
safe_system("/bin/chmod 600 /var/ipfire/samba/private/smbpasswd >/dev/null");
safe_system("/bin/chmod 600 /var/ipfire/samba/private >/dev/null");
return 0;
}
else if (strcmp(argv[1], "enable")==0)
{
safe_system("touch /var/ipfire/samba/enable");
safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S45samba");
safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc0.d/K48samba");
safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc6.d/K48samba");
return 0;
}
else if (strcmp(argv[1], "disable")==0)
{
safe_system("unlink /var/ipfire/samba/enable");
safe_system("rm -rf /etc/rc.d/rc*.d/*samba");
return 0;
}
return 0;
} else if (strcmp(argv[1], "smbuserdisable") == 0) {
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -d %s >/dev/null", argv[2]);
safe_system(command);
} else if (strcmp(argv[1], "smbuserenable") == 0) {
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -e %s >/dev/null", argv[2]);
safe_system(command);
} else if (strcmp(argv[1], "smbuserdelete") == 0) {
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -x %s >/dev/null", argv[2]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/userdel %s >/dev/null", argv[2]);
safe_system(command);
} else if (strcmp(argv[1], "smbsafeconf") == 0) {
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
} else if (strcmp(argv[1], "smbsafeconfcups") == 0) {
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
} else if (strcmp(argv[1], "smbsafeconfpdc") == 0) {
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
} else if (strcmp(argv[1], "smbsafeconfpdccups") == 0) {
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
} else if (strcmp(argv[1], "smbglobalreset") == 0) {
safe_system("/bin/cat /var/ipfire/samba/default.global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
safe_system("/bin/cat /var/ipfire/samba/default.settings > /var/ipfire/samba/settings");
safe_system("/bin/cat /var/ipfire/samba/default.global > /var/ipfire/samba/global");
safe_system("/bin/cat /var/ipfire/samba/default.pdc > /var/ipfire/samba/pdc");
} else if (strcmp(argv[1], "smbsharesreset") == 0) {
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/default.shares > /var/ipfire/samba/smb.conf");
safe_system("/bin/cat /var/ipfire/samba/default.shares > /var/ipfire/samba/shares");
} else if (strcmp(argv[1], "smbprinterreset") == 0) {
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/default.printer > /var/ipfire/samba/smb.conf");
safe_system("/bin/cat /var/ipfire/samba/default.printer > /var/ipfire/samba/printer");
} else if (strcmp(argv[1], "smbstop") == 0) {
safe_system("/etc/rc.d/init.d/samba stop >/dev/null");
safe_system("/usr/local/bin/sambactrl disable");
} else if (strcmp(argv[1], "smbstart") == 0) {
safe_system("/etc/rc.d/init.d/samba start >/dev/null");
safe_system("/usr/local/bin/sambactrl enable");
} else if (strcmp(argv[1], "smbrestart") == 0) {
safe_system("/etc/rc.d/init.d/samba restart >/dev/null");
} else if (strcmp(argv[1], "smbreload") == 0) {
safe_system("/etc/rc.d/init.d/samba reload >/dev/null");
} else if (strcmp(argv[1], "smbstatus") == 0) {
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbstatus 2>/dev/null");
safe_system(command);
} else if (strcmp(argv[1], "smbuseradd") == 0) {
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambauser >/dev/null");
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g %s -s %s %s >/dev/null", argv[4], argv[5], argv[2]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]);
safe_system(command);
} else if (strcmp(argv[1], "smbpcadd") == 0) {
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambawks >/dev/null");
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba Workstation' -g %s -s %s %s >/dev/null", argv[3], argv[4], argv[2]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s >/dev/null", argv[2]);
safe_system(command);
} else if (strcmp(argv[1], "smbchangepw") == 0) {
snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]);
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]);
safe_system(command);
} else if (strcmp(argv[1], "readsmbpasswd") == 0) {
safe_system("/bin/chown root:nobody /var/ipfire/samba/private >/dev/null");
safe_system("/bin/chown root:nobody /var/ipfire/samba/private/smbpasswd >/dev/null");
safe_system("/bin/chmod 640 /var/ipfire/samba/private/smbpasswd >/dev/null");
safe_system("/bin/chmod 650 /var/ipfire/samba/private >/dev/null");
} else if (strcmp(argv[1], "locksmbpasswd") == 0) {
safe_system("/bin/chown root:root /var/ipfire/samba/private >/dev/null");
safe_system("/bin/chown root:root /var/ipfire/samba/private/smbpasswd >/dev/null");
safe_system("/bin/chmod 600 /var/ipfire/samba/private/smbpasswd >/dev/null");
safe_system("/bin/chmod 600 /var/ipfire/samba/private >/dev/null");
} else if (strcmp(argv[1], "enable") == 0) {
safe_system("touch /var/ipfire/samba/enable");
safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S45samba");
safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc0.d/K48samba");
safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc6.d/K48samba");
} else if (strcmp(argv[1], "disable") == 0) {
safe_system("unlink /var/ipfire/samba/enable");
safe_system("rm -rf /etc/rc.d/rc*.d/*samba");
} else if (strcmp(argv[1], "join") == 0) {
if (argc == 4) {
snprintf(command, BUFFER_SIZE - 1, "/usr/bin/net join -U \"%s%%%s\"",
argv[2], argv[3]);
return safe_system(command);
} else {
fprintf(stderr, "Wrong number of arguments. Need username and password.\n");
return 1;
}
}
return 0;
}

View File

@@ -0,0 +1,44 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
# Fix permissions.
chmod 777 /srv/web/owncloud/apps
chmod 777 /srv/web/owncloud/config
# Create data directory.
mkdir -p /var/owncloud/data
chown -R nobody:nobody /var/owncloud
# Import web interface certificates if none exist.
if [ ! -e "/etc/httpd/owncloud.crt" ] && [ ! -e "/etc/httpd/owncloud.key" ]; then
cat /etc/httpd/server.crt > /etc/httpd/owncloud.crt
cat /etc/httpd/server.key > /etc/httpd/owncloud.key
fi
/etc/init.d/apache reload
exit 0

View File

@@ -0,0 +1,30 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
make_backup ${NAME}
remove_files
/etc/init.d/apache reload
exit 0

View File

@@ -0,0 +1,26 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh

View File

@@ -22,6 +22,14 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
# If the wbpriv group does not exist yet, then create it and put squid
# into it.
if ! getent group wbpriv >/dev/null; then
groupadd -g 88 wbpriv
usermod -a -G wbpriv squid
fi
extract_files
restore_backup ${NAME}
/usr/local/bin/sambactrl smbstart

View File

@@ -23,6 +23,14 @@
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
# If the wbpriv group does not exist yet, then create it and put squid
# into it.
if ! getent group wbpriv >/dev/null; then
groupadd -g 88 wbpriv
usermod -a -G wbpriv squid
fi
extract_files
restore_backup ${NAME}
echo "passdb backend = smbpasswd" >> /var/ipfire/samba/smb.conf

Some files were not shown because too many files have changed in this diff Show More