From: Arne Fitzenreiter Date: Sun, 14 Mar 2010 10:40:33 +0000 (+0100) Subject: Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.9-beta1~412^2~20 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0cc5df4e29dc872bdcb475875077f4339dc0d435;hp=26eed11e1758a7d1cc667b70c6cf38a734df66df Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next --- diff --git a/config/rootfiles/packages/lynis b/config/rootfiles/packages/lynis index 064815da7a..d4e3237696 100644 --- a/config/rootfiles/packages/lynis +++ b/config/rootfiles/packages/lynis @@ -1,60 +1,63 @@ -var/ipfire/lynis-1.2.6 -var/ipfire/lynis-1.2.6/db -var/ipfire/lynis-1.2.6/db/fileperms.db -var/ipfire/lynis-1.2.6/db/integrity.db -var/ipfire/lynis-1.2.6/db/malware.db -var/ipfire/lynis-1.2.6/db/sbl.db -var/ipfire/lynis-1.2.6/default.prf -var/ipfire/lynis-1.2.6/include -var/ipfire/lynis-1.2.6/include/binaries -var/ipfire/lynis-1.2.6/include/consts -var/ipfire/lynis-1.2.6/include/functions -var/ipfire/lynis-1.2.6/include/osdetection -var/ipfire/lynis-1.2.6/include/parameters -var/ipfire/lynis-1.2.6/include/profiles -var/ipfire/lynis-1.2.6/include/report -var/ipfire/lynis-1.2.6/include/tests_accounting -var/ipfire/lynis-1.2.6/include/tests_authentication -var/ipfire/lynis-1.2.6/include/tests_banners -var/ipfire/lynis-1.2.6/include/tests_boot_services -var/ipfire/lynis-1.2.6/include/tests_crypto -var/ipfire/lynis-1.2.6/include/tests_databases -var/ipfire/lynis-1.2.6/include/tests_file_integrity -var/ipfire/lynis-1.2.6/include/tests_file_permissions -var/ipfire/lynis-1.2.6/include/tests_filesystems -var/ipfire/lynis-1.2.6/include/tests_firewalls -var/ipfire/lynis-1.2.6/include/tests_hardening -var/ipfire/lynis-1.2.6/include/tests_hardening_tools -var/ipfire/lynis-1.2.6/include/tests_homedirs -var/ipfire/lynis-1.2.6/include/tests_insecure_services -var/ipfire/lynis-1.2.6/include/tests_kernel -var/ipfire/lynis-1.2.6/include/tests_ldap -var/ipfire/lynis-1.2.6/include/tests_logging -var/ipfire/lynis-1.2.6/include/tests_mac_frameworks -var/ipfire/lynis-1.2.6/include/tests_mail_messaging -var/ipfire/lynis-1.2.6/include/tests_malware -var/ipfire/lynis-1.2.6/include/tests_memory_processes -var/ipfire/lynis-1.2.6/include/tests_nameservices -var/ipfire/lynis-1.2.6/include/tests_networking -var/ipfire/lynis-1.2.6/include/tests_php -var/ipfire/lynis-1.2.6/include/tests_ports_packages -var/ipfire/lynis-1.2.6/include/tests_printers_spools -var/ipfire/lynis-1.2.6/include/tests_scheduling -var/ipfire/lynis-1.2.6/include/tests_shells -var/ipfire/lynis-1.2.6/include/tests_snmp -var/ipfire/lynis-1.2.6/include/tests_solaris -var/ipfire/lynis-1.2.6/include/tests_ssh -var/ipfire/lynis-1.2.6/include/tests_storage -var/ipfire/lynis-1.2.6/include/tests_storage_nfs -var/ipfire/lynis-1.2.6/include/tests_time -var/ipfire/lynis-1.2.6/include/tests_virtualization -var/ipfire/lynis-1.2.6/include/tests_webservers -var/ipfire/lynis-1.2.6/lynis -var/ipfire/lynis-1.2.6/lynis.8 -var/ipfire/lynis-1.2.6/plugins -var/ipfire/lynis-1.2.6/plugins/README -var/ipfire/lynis-1.2.6/plugins/compliance_pci -var/ipfire/lynis-1.2.6/plugins/files_permissions -var/ipfire/lynis-1.2.6/plugins/malware_rootkit -var/ipfire/lynis-1.2.6/plugins/malware_webvuln -var/ipfire/lynis-1.2.6/plugins/webserver_data +var/ipfire/lynis-1.2.9 +var/ipfire/lynis-1.2.9/db +var/ipfire/lynis-1.2.9/db/fileperms.db +var/ipfire/lynis-1.2.9/db/hints.db +var/ipfire/lynis-1.2.9/db/integrity.db +var/ipfire/lynis-1.2.9/db/malware-susp.db +var/ipfire/lynis-1.2.9/db/malware.db +var/ipfire/lynis-1.2.9/db/sbl.db +var/ipfire/lynis-1.2.9/default.prf +var/ipfire/lynis-1.2.9/include +var/ipfire/lynis-1.2.9/include/binaries +var/ipfire/lynis-1.2.9/include/consts +var/ipfire/lynis-1.2.9/include/functions +var/ipfire/lynis-1.2.9/include/osdetection +var/ipfire/lynis-1.2.9/include/parameters +var/ipfire/lynis-1.2.9/include/profiles +var/ipfire/lynis-1.2.9/include/report +var/ipfire/lynis-1.2.9/include/tests_accounting +var/ipfire/lynis-1.2.9/include/tests_authentication +var/ipfire/lynis-1.2.9/include/tests_banners +var/ipfire/lynis-1.2.9/include/tests_boot_services +var/ipfire/lynis-1.2.9/include/tests_crypto +var/ipfire/lynis-1.2.9/include/tests_databases +var/ipfire/lynis-1.2.9/include/tests_file_integrity +var/ipfire/lynis-1.2.9/include/tests_file_permissions +var/ipfire/lynis-1.2.9/include/tests_filesystems +var/ipfire/lynis-1.2.9/include/tests_firewalls +var/ipfire/lynis-1.2.9/include/tests_hardening +var/ipfire/lynis-1.2.9/include/tests_hardening_tools +var/ipfire/lynis-1.2.9/include/tests_homedirs +var/ipfire/lynis-1.2.9/include/tests_insecure_services +var/ipfire/lynis-1.2.9/include/tests_kernel +var/ipfire/lynis-1.2.9/include/tests_kernel_hardening +var/ipfire/lynis-1.2.9/include/tests_ldap +var/ipfire/lynis-1.2.9/include/tests_logging +var/ipfire/lynis-1.2.9/include/tests_mac_frameworks +var/ipfire/lynis-1.2.9/include/tests_mail_messaging +var/ipfire/lynis-1.2.9/include/tests_malware +var/ipfire/lynis-1.2.9/include/tests_memory_processes +var/ipfire/lynis-1.2.9/include/tests_nameservices +var/ipfire/lynis-1.2.9/include/tests_networking +var/ipfire/lynis-1.2.9/include/tests_php +var/ipfire/lynis-1.2.9/include/tests_ports_packages +var/ipfire/lynis-1.2.9/include/tests_printers_spools +var/ipfire/lynis-1.2.9/include/tests_scheduling +var/ipfire/lynis-1.2.9/include/tests_shells +var/ipfire/lynis-1.2.9/include/tests_snmp +var/ipfire/lynis-1.2.9/include/tests_solaris +var/ipfire/lynis-1.2.9/include/tests_squid +var/ipfire/lynis-1.2.9/include/tests_ssh +var/ipfire/lynis-1.2.9/include/tests_storage +var/ipfire/lynis-1.2.9/include/tests_storage_nfs +var/ipfire/lynis-1.2.9/include/tests_time +var/ipfire/lynis-1.2.9/include/tests_virtualization +var/ipfire/lynis-1.2.9/include/tests_webservers +var/ipfire/lynis-1.2.9/lynis +var/ipfire/lynis-1.2.9/lynis.8 +var/ipfire/lynis-1.2.9/plugins +var/ipfire/lynis-1.2.9/plugins/README +var/ipfire/lynis-1.2.9/plugins/plugin_access_files +var/ipfire/lynis-1.2.9/plugins/plugin_compliance_pci +var/ipfire/lynis-1.2.9/plugins/plugin_homedirs +var/ipfire/lynis-1.2.9/plugins/plugin_webserver_data \ No newline at end of file diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba index 24043628bd..95ed2aaa0f 100644 --- a/config/rootfiles/packages/samba +++ b/config/rootfiles/packages/samba @@ -1,7 +1,3 @@ -lib/libnss_winbind.so -lib/libnss_winbind.so.2 -lib/libnss_wins.so -lib/libnss_wins.so.2 usr/bin/eventlogadm usr/bin/findsmb usr/bin/ldbadd @@ -37,6 +33,7 @@ usr/bin/wbinfo #usr/include/smb_share_modes.h #usr/include/talloc.h #usr/include/tdb.h +#usr/include/wbc_async.h #usr/include/wbclient.h usr/lib/libnetapi.so usr/lib/libnetapi.so.0 @@ -45,7 +42,7 @@ usr/lib/libsmbclient.so.0 usr/lib/libsmbsharemodes.so usr/lib/libsmbsharemodes.so.0 usr/lib/libtalloc.so -usr/lib/libtalloc.so.1 +usr/lib/libtalloc.so.2 usr/lib/libtdb.so usr/lib/libtdb.so.1 usr/lib/libwbclient.so @@ -61,6 +58,7 @@ usr/lib/samba/idmap usr/lib/samba/lowcase.dat usr/lib/samba/nss_info usr/lib/samba/pdb +usr/lib/samba/perfcount usr/lib/samba/rpc usr/lib/samba/upcase.dat usr/lib/samba/valid.dat @@ -69,6 +67,7 @@ usr/lib/samba/vfs/acl_tdb.so usr/lib/samba/vfs/acl_xattr.so usr/lib/samba/vfs/audit.so usr/lib/samba/vfs/cap.so +usr/lib/samba/vfs/catia.so usr/lib/samba/vfs/default_quota.so usr/lib/samba/vfs/dirsort.so usr/lib/samba/vfs/expand_msdfs.so @@ -81,6 +80,7 @@ usr/lib/samba/vfs/preopen.so usr/lib/samba/vfs/readahead.so usr/lib/samba/vfs/readonly.so usr/lib/samba/vfs/recycle.so +usr/lib/samba/vfs/scannedonly.so usr/lib/samba/vfs/shadow_copy.so usr/lib/samba/vfs/shadow_copy2.so usr/lib/samba/vfs/smb_traffic_analyzer.so @@ -88,12 +88,33 @@ usr/lib/samba/vfs/streams_depot.so usr/lib/samba/vfs/streams_xattr.so usr/lib/samba/vfs/syncops.so usr/lib/samba/vfs/xattr_tdb.so +usr/lib/security +usr/lib/security/pam_smbpass.so +usr/lib/security/pam_winbind.so usr/sbin/mount.cifs usr/sbin/nmbd usr/sbin/smbd -usr/sbin/umount.cifs usr/sbin/winbindd +#usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/da/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/de/LC_MESSAGES/net.mo #usr/share/locale/de/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/es/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/fi/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/fr/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/hu/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/it/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/ja/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/ko/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/nb/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/nl/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/pl/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/ru/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo +#usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo #usr/share/man/man1/findsmb.1 #usr/share/man/man1/ldbadd.1 #usr/share/man/man1/ldbdel.1 @@ -118,6 +139,7 @@ usr/sbin/winbindd #usr/share/man/man1/testparm.1 #usr/share/man/man1/vfstest.1 #usr/share/man/man1/wbinfo.1 +#usr/share/man/man5/pam_winbind.conf.5 #usr/share/man/man5/lmhosts.5 #usr/share/man/man5/smb.conf.5 #usr/share/man/man5/smbgetrc.5 @@ -169,6 +191,7 @@ usr/sbin/winbindd #usr/share/man/man8/vfs_readahead.8 #usr/share/man/man8/vfs_readonly.8 #usr/share/man/man8/vfs_recycle.8 +#usr/share/man/man8/vfs_scannedonly.8 #usr/share/man/man8/vfs_shadow_copy.8 #usr/share/man/man8/vfs_shadow_copy2.8 #usr/share/man/man8/vfs_smb_traffic_analyzer.8 diff --git a/config/rootfiles/packages/squidclamav b/config/rootfiles/packages/squidclamav index 0ebab0a384..7538749fae 100644 --- a/config/rootfiles/packages/squidclamav +++ b/config/rootfiles/packages/squidclamav @@ -6,6 +6,7 @@ usr/bin/squidclamav #usr/libexec/squidclamav/clwarn.cgi.en_EN #usr/libexec/squidclamav/clwarn.cgi.fr_FR #usr/libexec/squidclamav/clwarn.cgi.pt_BR +#usr/libexec/squidclamav/clwarn.cgi.ru_RU #usr/share/man/man1/squidclamav.1 #usr/share/squidclamav #usr/share/squidclamav/README diff --git a/config/samba/default.global b/config/samba/default.global index 03b237d17e..48f572afdc 100644 --- a/config/samba/default.global +++ b/config/samba/default.global @@ -4,6 +4,7 @@ netbios name = ipfire server string = Samba workgroup = homeip.net +passdb backend = smbpasswd keep alive = 30 os level = 33 diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 4d6eb19cca..9737b078dd 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -37,7 +37,6 @@ my $counter = 0; &Header::showhttpheaders(); $remotesettings{'ENABLE_SSH'} = 'off'; -$remotesettings{'ENABLE_SSH_PORTOCOL1'} = 'off'; $remotesettings{'ENABLE_SSH_PORTFW'} = 'off'; $remotesettings{'ACTION'} = ''; &Header::getcgihash(\%remotesettings); @@ -65,15 +64,6 @@ if ( (($remotesettings{'ACTION'} eq $Lang::tr{'save'}) || ($remotesettings{'ACTI &General::log($Lang::tr{'ssh is disabled'}); unlink "${General::swroot}/remote/enablessh"; } - - if ($remotesettings{'ENABLE_SSH_PORTOCOL1'} eq 'on') - { - &General::log($Lang::tr{'ssh1 enabled'}); - } - else - { - &General::log($Lang::tr{'ssh1 disabled'}); - } if ($remotesettings{'SSH_PORT'} eq 'on') { @@ -111,9 +101,6 @@ else { $checked{'ENABLE_SSH'}{'off'} = ''; $checked{'ENABLE_SSH'}{'on'} = ''; $checked{'ENABLE_SSH'}{$remotesettings{'ENABLE_SSH'}} = "checked='checked'"; -$checked{'ENABLE_SSH_PORTOCOL1'}{'off'} = ''; -$checked{'ENABLE_SSH_PORTOCOL1'}{'on'} = ''; -$checked{'ENABLE_SSH_PORTOCOL1'}{$remotesettings{'ENABLE_SSH_PORTOCOL1'}} = "checked='checked'"; $checked{'ENABLE_SSH_PORTFW'}{'off'} = ''; $checked{'ENABLE_SSH_PORTFW'}{'on'} = ''; $checked{'ENABLE_SSH_PORTFW'}{$remotesettings{'ENABLE_SSH_PORTFW'}} = "checked='checked'"; @@ -146,11 +133,6 @@ print < $Lang::tr{'ssh access'} - -   - - $Lang::tr{'ssh1 support'} -   diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4b8de89e57..4d90914484 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -272,6 +272,7 @@ print FILE <; + close(FILE); + $string = join("", @hostapd); + $string =~ s/[a-z_]//gi; + $string =~ s/\[[0-1]\;[0-9]+//gi; + $string =~ s/[\(\)\.]//gi; + $string =~ s/ //gi; + $string =~ s///gi; + @pid = split(/\s/,$string); + if (open(FILE, "/proc/$pid[0]/statm")){ + my $temp = ; + @memory = split(/ /,$temp); + close(FILE); + } + $memory+=$memory[0]; +} +pid(); + + + +if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){ + delete $wlanapsettings{'INTERFACE'}; + &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); +} + if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ - # verify WPA Passphrase, must be 8 .. 63 characters - if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63) ){ - $errormessage .= "Invalid length in WPA Passphrase. Must be between 8 and 63 characters.
"; + # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc + if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2")){ + if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){ + $errormessage .= "$Lang::tr{'wlanap invalid wpa'}
"; + } } if ( $errormessage eq '' ){ @@ -95,18 +133,22 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ &WriteConfig_hostapd(); system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); + pid(); } -}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'interface'}" ){ +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap interface'}" ){ &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); -}elsif ( $wlanapsettings{'ACTION'} eq 'Start' ){ +}elsif ( ($wlanapsettings{'ACTION'} eq "$Lang::tr{'start'}") && ($memory == 0) ){ system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1"); -}elsif ( $wlanapsettings{'ACTION'} eq 'Stop' ){ + pid(); +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){ system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1"); -}elsif ( $wlanapsettings{'ACTION'} eq 'Restart' ){ + $memory=0; +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'restart'}" ){ system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); + pid(); } -&Header::openpage('WLAN', 1, '', ''); +&Header::openpage('Wireless LAN', 1, '', ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ( $errormessage ){ @@ -146,23 +188,23 @@ $selected{'INTERFACE'}{'blue0'} = ''; $selected{'ENC'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'"; if ( ($wlanapsettings{'INTERFACE'} eq '') ){ - $message = "No WLan Interface selected."; + $message = $Lang::tr{'wlanap select interface'}; &Header::openbox('100%', 'center', "WLAN AP"); print <
-
- -
+

+
+ END ; &Header::closebox(); @@ -173,7 +215,7 @@ END my $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} 2>/dev/null`; if ( $cmd_out eq '' ){ - $message = "Interface is not a WLAN card."; + $message = "$Lang::tr{'wlanap no interface'}"; $wlan_card_status = ''; }else{ $cmd_out = `/sbin/ifconfig | /bin/grep $wlanapsettings{'INTERFACE'}`; @@ -231,29 +273,63 @@ $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'"; &Header::openbox('100%', 'center', "WLAN AP"); print < -WLAN Services END ; + if ( $wlan_card_status ne '' ){ - print "WLAN card ($wlanapsettings{'DRIVER'})"; + print "$Lang::tr{'wlanap wlan services'}"; + print "$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})"; print $wlan_card_status eq 'up' ? $status_started : $status_stopped; - print "Access Point"; + print "$Lang::tr{'wlanap access point'}"; print $wlan_ap_status eq 'up' ? $status_started : $status_stopped; + }else{ - print "$message"; + print "$message"; +} + print ""; + +if ( ($memory != 0) && (@pid[0] ne "///") && ($wlan_card_status ne '') ){ + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print "
PID$Lang::tr{'memory'}
hostapd    @pid[0]$memory KB
"; } -print ""; -print < - - - - -
-
-END -; +if ( $wlan_card_status ne '' ){ +print "
"; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print "
 
"; +}else{ +print "
"; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print "
 
"; +} if ( $wlan_card_status eq '' ){ &Header::closebox(); @@ -265,27 +341,27 @@ print <
- - - -
WLAN Settings +
$Lang::tr{'wlanap wlan settings'}
SSID: 
Disable SSID broadcast: on / +
SSID Broadcast: on | off
HW Mode: 
Encryption:  +
$Lang::tr{'wlanap encryption'}: 
Channel:  +
$Lang::tr{'wlanap channel'}:  Passphrase: 
Loglevel (hostapd):  Debuglevel (hostapd): 
@@ -347,10 +423,10 @@ END } print < - - +
- -
+
+
+
END @@ -365,10 +441,16 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ print < - +
WLAN Status
$Lang::tr{'wlanap wlan status'}
@channellist_cmd
@txpower_cmd
$status
+
+ + + + +
WLan Clients
 $Lang::tr{'wlanap link wireless'}
 $Lang::tr{'wlanap link dhcp'}
END ; &Header::closebox(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 147b79a64e..e18fdfbbcd 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2044,6 +2044,26 @@ 'week' => 'Woche', 'weekly firewallhits' => 'wöchentliche Firewalltreffer', 'weeks' => 'Wochen', +'wlanap select interface' => 'Bitte das WLan Interface auswählen.', +'wlanap no interface' => 'Ausgewählte Interface ist keine WLan Karte!', +'wlanap del interface' => 'Ausgewähltes Interface zurücksetzen?', +'wlanap wlan services' => 'WLan Dienste', +'wlanap wlan card' => 'WLan Karte', +'wlanap access point' => 'Access Point', +'wlanap wlan settings' => 'WLan Einstellungen', +'wlanap encryption' => 'Verschlüsselung', +'wlanap channel' => 'Kanal', +'wlanap none' => 'keine', +'wlanap verbose' => 'Alle Informationen', +'wlanap debugging' => 'Debugging', +'wlanap informations' => 'Informationen', +'wlanap notifications' => 'Hinweise', +'wlanap warnings' => 'Warnungen', +'wlanap wlan status' => 'WLan Status', +'wlanap link wireless' => 'Wireless Lan Clients freischaten', +'wlanap link dhcp' => 'Wireless Lan DHCP Einstellungen', +'wlanap invalid wpa' => 'Ungültige Länge in WPA-Passphrase. Muss zwischen 8 und 63 Zeichen lang sein.', +'wlanap interface' => 'Interface übernehmen', 'wildcards' => 'Wildcards', 'wins server' => 'Wins Server', 'wins support' => 'Wins Support', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 22f3561eac..0bc5033bbc 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2077,6 +2077,26 @@ 'week' => 'Week', 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'weeks', +'wlanap select interface' => 'Please select the wireless lan interface.', +'wlanap no interface' => 'Selected interface is not a wirless lan card!', +'wlanap del interface' => 'Remove selected interface?', +'wlanap wlan services' => 'WLan Services', +'wlanap wlan card' => 'WLan Card', +'wlanap access point' => 'Access Point', +'wlanap wlan settings' => 'WLan Settings', +'wlanap encryption' => 'Encryption', +'wlanap channel' => 'Channel', +'wlanap none' => 'none', +'wlanap verbose' => 'Verbose', +'wlanap debugging' => 'Debugging', +'wlanap informations' => 'Informations', +'wlanap notifications' => 'Notifications', +'wlanap warnings' => 'Warnings', +'wlanap wlan status' => 'WLan Status', +'wlanap link wireless' => 'Activate wireless lan clients', +'wlanap link dhcp' => 'Wireless lan DHCP configuration', +'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.', +'wlanap interface' => 'Select interface', 'wildcards' => 'Wildcards', 'wins server' => 'Wins Server', 'wins support' => 'Wins Support', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 22f3561eac..0bc5033bbc 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2077,6 +2077,26 @@ 'week' => 'Week', 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'weeks', +'wlanap select interface' => 'Please select the wireless lan interface.', +'wlanap no interface' => 'Selected interface is not a wirless lan card!', +'wlanap del interface' => 'Remove selected interface?', +'wlanap wlan services' => 'WLan Services', +'wlanap wlan card' => 'WLan Card', +'wlanap access point' => 'Access Point', +'wlanap wlan settings' => 'WLan Settings', +'wlanap encryption' => 'Encryption', +'wlanap channel' => 'Channel', +'wlanap none' => 'none', +'wlanap verbose' => 'Verbose', +'wlanap debugging' => 'Debugging', +'wlanap informations' => 'Informations', +'wlanap notifications' => 'Notifications', +'wlanap warnings' => 'Warnings', +'wlanap wlan status' => 'WLan Status', +'wlanap link wireless' => 'Activate wireless lan clients', +'wlanap link dhcp' => 'Wireless lan DHCP configuration', +'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.', +'wlanap interface' => 'Select interface', 'wildcards' => 'Wildcards', 'wins server' => 'Wins Server', 'wins support' => 'Wins Support', diff --git a/lfs/hostapd b/lfs/hostapd index c881f803c8..4f3ffb4da5 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,7 +24,7 @@ include Config -VER = 0.6.9 +VER = 0.7.1 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 = 16 +PAK_VER = 17 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 83630d11fa66ade9091f1b304fccd74c +$(DL_FILE)_MD5 = 3c4f71a889803935c7eb40fac6539d7c install : $(TARGET) @@ -77,7 +77,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd-usb_hw_did_not_ack.patch + #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd-usb_hw_did_not_ack.patch -cp /usr/src/linux/include/linux/genetlink.h /usr/include/linux/ -cp /usr/src/linux/include/linux/netfilter/nfnetlink.h /usr/include/linux/netfilter/ -cp /usr/src/linux/include/linux/netfilter/nfnetlink_compat.h /usr/include/linux/netfilter/ diff --git a/lfs/lynis b/lfs/lynis index f098ff23ef..5cfd184a44 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -24,7 +24,7 @@ include Config -VER = 1.2.6 +VER = 1.2.9 THISAPP = lynis-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis -PAK_VER = 3 +PAK_VER = 4 DEPS = "" ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 46921fc56873a53074f4cf6775ce9007 +$(DL_FILE)_MD5 = 69b369173ffc0f10f021035f73857e1f install : $(TARGET) diff --git a/lfs/samba b/lfs/samba index 4dbb90fd00..a5fd0ad886 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.3.10 +VER = 3.5.1 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 24 +PAK_VER = 25 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 84645ff5f0fb213e2371e629507dc8bb +$(DL_FILE)_MD5 = 60811195b0507fa151b602684cece743 install : $(TARGET) @@ -77,7 +77,7 @@ $(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)/source && ./configure \ + cd $(DIR_APP)/source3 && ./configure \ --prefix=/usr \ --libdir=/usr/lib/ \ --sysconfdir=/var/ipfire \ @@ -89,21 +89,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-cups \ --with-cifsmount \ --with-syslog - cd $(DIR_APP)/source && make proto && make all $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP)/source && make install -# cp -vfp /usr/lib/samba/{libsmbclient.so.0,libtalloc.so.1,libtdb.so.1,libwbclient.so.0} /usr/lib -# cd /usr/lib/ && ln -v -sf libsmbclient.so.0 libsmbclient.so -# cd /usr/lib/ && ln -v -sf libtalloc.so.1 libtalloc.so -# cd /usr/lib/ && ln -v -sf libtdb.so.1 libtdb.so -# cd /usr/lib/ && ln -v -sf libwbclient.so.0 libwbclient.so - cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h - cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h - cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_wins.so /lib - cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_winbind.so /lib - cd $(DIR_APP)/source && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2 - cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2 -# cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security - cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba + 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 + #cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_wins.so /lib + #cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_winbind.so /lib + #cd $(DIR_APP)/source3 && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2 + #cd $(DIR_APP)/source3 && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2 + cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba -mkdir -p /var/ipfire/samba cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/ chown nobody:nobody -R /var/ipfire/samba/ diff --git a/lfs/squid b/lfs/squid index f1120ff18e..f895307d6a 100644 --- a/lfs/squid +++ b/lfs/squid @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --mandir=/usr/share/man --libexecdir=/usr/lib/squid \ --localstatedir=/var --sysconfdir=/etc/squid \ --disable-poll --disable-icmp --disable-wccp \ - --disable-ident-lookups \ + --enable-ident-lookups \ --enable-storeio="aufs,coss,diskd,ufs,null" --enable-ssl \ --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \ --enable-http-violations --enable-auth=basic,ntlm \ diff --git a/lfs/squidclamav b/lfs/squidclamav index 110a43b28c..68d5f6acdd 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -24,7 +24,7 @@ include Config -VER = 5.0 +VER = 5.2 THISAPP = squidclamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 9 +PAK_VER = 10 DEPS = "clamav" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fe6456c25294653cb5f19ff7afdb5f90 +$(DL_FILE)_MD5 = 7f8d48962f139f747fa9b2050ede19a3 install : $(TARGET) diff --git a/lfs/sslh b/lfs/sslh index 09eba59da4..e6f2cebce2 100644 --- a/lfs/sslh +++ b/lfs/sslh @@ -24,7 +24,7 @@ include Config -VER = 1.6i +VER = 1.7a THISAPP = sslh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sslh -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b2e0a207df885d7be57713449edae815 +$(DL_FILE)_MD5 = ee124654412198a5e11fe28acf10634d install : $(TARGET) diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index 0bdc583480..30074973da 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -54,10 +54,7 @@ int main(int argc, char *argv[]) exit(1); } - if(findkey(kv, "ENABLE_SSH_PROTOCOL1", buffer) && !strcmp(buffer,"on")) - strlcat(command, "s/^Protocol .*$/Protocol 2,1/;", STRING_SIZE - 1 ); - else - strlcat(command, "s/^Protocol .*$/Protocol 2/;", STRING_SIZE - 1 ); + strlcat(command, "s/^Protocol .*$/Protocol 2/;", STRING_SIZE - 1 ); if(findkey(kv, "ENABLE_SSH_KEYS", buffer) && !strcmp(buffer,"off")) strlcat(command, "s/^RSAAuthentication .*$/RSAAuthentication no/;" "s/^PubkeyAuthentication .*$/PubkeyAuthentication no/;", STRING_SIZE - 1 ); diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 8d4a7da7db..5aaa5f41fa 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -116,7 +116,7 @@ sub usage { sub pinghost { my $host = shift; - $p = Net::Ping->new(); + $p = Net::Ping->new("icmp"); if ($p->ping($host)) { logger("PING INFO: $host is alive"); return 1; diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh index 89c40d0d7c..6f4cb60645 100644 --- a/src/paks/samba/update.sh +++ b/src/paks/samba/update.sh @@ -17,10 +17,13 @@ # 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 . # +# Copyright (C) 2010 IPFire-Team . # # # ############################################################################ # . /opt/pakfire/lib/functions.sh ./uninstall.sh -./install.sh +extract_files +restore_backup ${NAME} +echo "passdb backend = smbpasswd" >> /var/ipfire/samba/smb.conf +/usr/local/bin/sambactrl smbstart