[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0cc5df4e29dc872bdcb475875077f4339dc0d435
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 0cc5df4e29dc872bdcb475875077f4339dc0d435 (commit) via f06c8adbc747554d7b7581e40b40139285848c54 (commit) via 85de995f2b073c0451c3fb27c472c8183412b25b (commit) via 1d9640c45b2b16760db5883953f0a376e73bf891 (commit) via df7cddff92a0bbb72ea1f19c9920d4841511f3c8 (commit) via 9e7b9a87ffb9f96814901cd270f2e5f1a1003796 (commit) via 084f5d6ccdf82f528e9be7039dceae74bfe1e944 (commit) via 08e08f16c18a54f98a7e861830f76b41ed6d3819 (commit) via 79bcb246d108d3c380eafb0dbd43e2781939605b (commit) via 202c7af49ebbfe77a188ea7071cb46f2e972a1ef (commit) via 4a0ce88c9bb2a4dd1eda1557888111f303fdd00c (commit) from 26eed11e1758a7d1cc667b70c6cf38a734df66df (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 0cc5df4e29dc872bdcb475875077f4339dc0d435 Merge: f06c8adbc747554d7b7581e40b40139285848c54 26eed11e1758a7d1cc667b70c6cf38a734df66df Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 14 11:40:33 2010 +0100
Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next
commit f06c8adbc747554d7b7581e40b40139285848c54 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Mar 12 20:58:46 2010 +0100
Remove non working SSH1 checkbox.
commit 85de995f2b073c0451c3fb27c472c8183412b25b Author: Christian Schmidt maniacikarus@ipfire.org Date: Thu Mar 11 20:39:08 2010 +0100
Updated sslh to current stable.
commit 1d9640c45b2b16760db5883953f0a376e73bf891 Author: Jan Paul Tuecking earl@ipfire.org Date: Thu Mar 11 13:45:56 2010 +0100
Insert the full revised and redesigned wlanap page.
commit df7cddff92a0bbb72ea1f19c9920d4841511f3c8 Author: Jan Paul Tuecking earl@ipfire.org Date: Thu Mar 11 13:40:48 2010 +0100
Insert sentence for multilanguage support of wlan ap page
commit 9e7b9a87ffb9f96814901cd270f2e5f1a1003796 Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Mar 10 23:03:29 2010 +0100
Updated samba to current stable.
The passsb packend has been change by the samba team, so we need to fix our config.
commit 084f5d6ccdf82f528e9be7039dceae74bfe1e944 Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Mar 10 22:44:35 2010 +0100
Enabled identd lookup for squid.
commit 08e08f16c18a54f98a7e861830f76b41ed6d3819 Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Mar 10 22:43:29 2010 +0100
Updated hostapd to current dev version which seems to be stable.
commit 79bcb246d108d3c380eafb0dbd43e2781939605b Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Mar 10 22:42:47 2010 +0100
Updated squidclamav to current stable.
commit 202c7af49ebbfe77a188ea7071cb46f2e972a1ef Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Mar 10 22:30:21 2010 +0100
Upgdated lynis to current stable.
commit 4a0ce88c9bb2a4dd1eda1557888111f303fdd00c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 3 10:45:47 2010 +0100
pakfire: Change pingtest to use icmp again.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/lynis | 123 +++++++++++---------- config/rootfiles/packages/samba | 35 +++++- config/rootfiles/packages/squidclamav | 1 + config/samba/default.global | 1 + html/cgi-bin/remote.cgi | 18 --- html/cgi-bin/samba.cgi | 1 + html/cgi-bin/wlanap.cgi | 196 +++++++++++++++++++++++---------- langs/de/cgi-bin/de.pl | 20 ++++ langs/en/cgi-bin/en.pl | 20 ++++ langs/fr/cgi-bin/fr.pl | 20 ++++ lfs/hostapd | 8 +- lfs/lynis | 6 +- lfs/samba | 31 ++--- lfs/squid | 2 +- lfs/squidclamav | 6 +- lfs/sslh | 6 +- src/misc-progs/sshctrl.c | 5 +- src/pakfire/lib/functions.pl | 2 +- src/paks/samba/update.sh | 7 +- 19 files changed, 327 insertions(+), 181 deletions(-) mode change 100644 => 100755 html/cgi-bin/wlanap.cgi
Difference in files: diff --git a/config/rootfiles/packages/lynis b/config/rootfiles/packages/lynis index 064815d..d4e3237 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 2404362..95ed2aa 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 0ebab0a..7538749 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 03b237d..48f572a 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 4d6eb19..9737b07 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'"; @@ -148,11 +135,6 @@ print <<END </tr> <tr> <td> </td> - <td><input type='checkbox' name='ENABLE_SSH_PORTOCOL1' $checked{'ENABLE_SSH_PORTOCOL1'}{'on'} /></td> - <td width='100%' class='base'>$Lang::tr{'ssh1 support'}</td> -</tr> -<tr> - <td> </td> <td><input type='checkbox' name='ENABLE_SSH_PORTFW' $checked{'ENABLE_SSH_PORTFW'}{'on'} /></td> <td width='100%' class='base'>$Lang::tr{'ssh portfw'}</td> </tr> diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4b8de89..4d90914 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -272,6 +272,7 @@ print FILE <<END netbios name = $sambasettings{'NETBIOSNAME'} server string = $sambasettings{'SRVSTRING'} workgroup = $sambasettings{'WORKGRP'} +passdb backend = smbpasswd
wide links = $sambasettings{'WIDELINKS'} unix extensions = $sambasettings{'UNIXEXTENSION'} diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi old mode 100644 new mode 100755 index f084fc6..a0b7de4 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -35,8 +35,8 @@ require '/var/ipfire/header.pl'; my $debug = 0; my $status = ''; my $errormessage = ''; -my $status_started = "<td align='center' width='75%' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td></tr>"; -my $status_stopped = "<td align='center' width='75%' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td></tr>"; +my $status_started = "<td align='center' width='75%' bgcolor='${Header::colourgreen}'><font color='white'><strong>$Lang::tr{'running'}</strong></font></td></tr>"; +my $status_stopped = "<td align='center' width='75%' bgcolor='${Header::colourred}'><font color='white'><strong>$Lang::tr{'stopped'}</strong></font></td></tr>";
# get rid of used only once warnings my @onlyonce = ( $Header::colourgreen, $Header::colourred ); @@ -84,10 +84,48 @@ delete $wlanapsettings{'DENY_MACS'};
&Header::showhttpheaders();
+my $string=(); +my $status=(); +my $errormessage = ''; +my $memory = 0; +my @memory=(); +my @pid=(); +my @hostapd=(); +sub pid +{ +# for pid and memory + open(FILE, '/usr/local/bin/addonctrl hostapd status | '); + @hostapd = <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 = <FILE>; + @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.<br />"; + # 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'}<br />"; + } }
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 $message<br /> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name='INTERFACE'> - <option value='green0' $selected{'INTERFACE'}{'green0'}>green0</option> END ; if ( $netsettings{'BLUE_DEV'} ne ''){ print "<option value='blue0' $selected{'INTERFACE'}{'blue0'}>blue0</option>"; } print <<END + <option value='green0' $selected{'INTERFACE'}{'green0'}>green0</option> </select> -<br /> - <input type='hidden' name='ACTION' value='$Lang::tr{'interface'}' /> - <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form> +<br /><br /> +<hr size='1'> + <input type='submit' name='ACTION' value='$Lang::tr{'wlanap interface'}' /></form> 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 <<END <table width='95%' cellspacing='0'> -<tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><b>WLAN Services</b></td></tr> END ; + if ( $wlan_card_status ne '' ){ - print "<tr><td class='base'>WLAN card ($wlanapsettings{'DRIVER'})</td>"; + print "<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><strong>$Lang::tr{'wlanap wlan services'}</strong></td></tr>"; + print "<tr><td colspan='1' class='base'>$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})</td>"; print $wlan_card_status eq 'up' ? $status_started : $status_stopped; - print "<tr><td class='base'>Access Point</td>"; + print "<tr><td colspan='1' class='base'>$Lang::tr{'wlanap access point'}</td>"; print $wlan_ap_status eq 'up' ? $status_started : $status_stopped; + }else{ - print "<tr><td colspan='2' class='base'><b>$message</b></td></tr>"; + print "<tr><td colspan='2' class='base'>$message"; +} + print "</table>"; + +if ( ($memory != 0) && (@pid[0] ne "///") && ($wlan_card_status ne '') ){ + print "<table width='95%' cellspacing='0' border='0'>"; + print "<tr>"; + print "<td align='center'></td>"; + print "<td bgcolor='$color{'color20'}' align='center'><strong>PID</strong></td>"; + print "<td bgcolor='$color{'color20'}' align='center'><strong>$Lang::tr{'memory'}</strong></td>"; + print "</tr>"; + print "<tr>"; + print "<td width='35%' align='right'><strong>hostapd</strong> </td>"; + print "<td bgcolor='$color{'color22'}' align='center'>@pid[0]</td>"; + print "<td bgcolor='$color{'color22'}' align='center'>$memory KB</td>"; + print "</tr>"; + print "</table>"; } -print "</table>";
-print <<END -<br /> -<table width='95%' cellspacing='0'> -<tr><td align='left' width='40%' /> -<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Start' /><input type='image' alt='Start' title='Start' src='/images/go-up.png' /></form></td> -<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Stop' /><input type='image' alt='Stop' title='Stop' src='/images/go-down.png' /></form></td> -<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Restart' /><input type='image' alt='Restart' title='Restart' src='/images/view-refresh.png' /></form></td></tr> -</table> -END -; +if ( $wlan_card_status ne '' ){ +print "<br />"; +print "<table width='95%' cellspacing='0' border='0'>"; +print "<tr align='center'>"; +print "<td colspan='4'><hr size='1'></td>"; +print "</tr>"; +print "<tr align='center'>"; +print "<td width='40%'> </td>"; +print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='submit' name='ACTION' value='$Lang::tr{'start'}' /></form></td>"; +print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='submit' name='ACTION' value='$Lang::tr{'stop'}' /></form></td>"; +print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='submit' name='ACTION' value='$Lang::tr{'restart'}' /></form></td>"; +print "</tr>"; +print "</table>"; +}else{ +print "<br />"; +print "<table width='95%' cellspacing='0' border='0'>"; +print "<tr align='center'>"; +print "<td colspan='4'><hr size='1'></td>"; +print "</tr>"; +print "<tr align='center'>"; +print "<td width='40%'> </td>"; +print "<td width='20%'><form method='post' action='/cgi-bin/wlanap.cgi'><input type='submit' name='ACTION' value='$Lang::tr{'wlanap del interface'}' /></form></td>"; +print "<td width='20%'></td>"; +print "<td width='20%'></td>"; +print "</tr>"; +print "</table>"; +}
if ( $wlan_card_status eq '' ){ &Header::closebox(); @@ -265,27 +341,27 @@ print <<END <br /> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <table width='95%' cellspacing='0'> -<tr><td bgcolor='$color{'color20'}' colspan='4' align='left'><b>WLAN Settings</b> +<tr><td bgcolor='$color{'color20'}' colspan='4' align='left'><strong>$Lang::tr{'wlanap wlan settings'}</strong> <tr><td width='25%' class='base'>SSID: </td><td class='base' colspan='3'><input type='text' name='SSID' size='40' value='$wlanapsettings{'SSID'}' /></td></tr> -<tr><td width='25%' class='base'>Disable SSID broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} />/ +<tr><td width='25%' class='base'>SSID Broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> | <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> off</td></tr> <tr><td width='25%' class='base'>HW Mode: </td><td class='base' colspan='3'> <select name='HW_MODE'> - <option value='a' $selected{'HW_MODE'}{'a'}>a</option> - <option value='b' $selected{'HW_MODE'}{'b'}>b</option> - <option value='g' $selected{'HW_MODE'}{'g'}>g</option> - <option value='n' $selected{'HW_MODE'}{'n'}>n</option> + <option value='a' $selected{'HW_MODE'}{'a'}>802.11a</option> + <option value='b' $selected{'HW_MODE'}{'b'}>802.11b</option> + <option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option> + <option value='n' $selected{'HW_MODE'}{'n'}>802.11n</option> </select> </td></tr>
-<tr><td width='25%' class='base'>Encryption: </td><td class='base' colspan='3'> +<tr><td width='25%' class='base'>$Lang::tr{'wlanap encryption'}: </td><td class='base' colspan='3'> <select name='ENC'> - <option value='none' $selected{'ENC'}{'none'}>none</option> - <option value='wpa1' $selected{'ENC'}{'wpa1'}>wpa1</option> - <option value='wpa2' $selected{'ENC'}{'wpa2'}>wpa2</option> + <option value='none' $selected{'ENC'}{'none'}>$Lang::tr{'wlanap none'}</option> + <option value='wpa1' $selected{'ENC'}{'wpa1'}>WPA1</option> + <option value='wpa2' $selected{'ENC'}{'wpa2'}>WPA2</option> </select> </td></tr> -<tr><td width='25%' class='base'>Channel: </td><td class='base' colspan='3'> +<tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}: </td><td class='base' colspan='3'> <select name='CHANNEL'> END ; @@ -306,20 +382,20 @@ print <<END <tr><td width='25%' class='base'>Passphrase: </td><td class='base' colspan='3'><input type='text' name='PWD' size='63' value='$wlanapsettings{'PWD'}' /></td></tr> <tr><td width='25%' class='base'>Loglevel (hostapd): </td><td class='base' width='25%'> <select name='SYSLOGLEVEL'> - <option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 (verbose)</option> - <option value='1' $selected{'SYSLOGLEVEL'}{'1'}>1 (debugging)</option> - <option value='2' $selected{'SYSLOGLEVEL'}{'2'}>2 (informations)</option> - <option value='3' $selected{'SYSLOGLEVEL'}{'3'}>3 (notifications)</option> - <option value='4' $selected{'SYSLOGLEVEL'}{'4'}>4 (warnings)</option> + <option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option> + <option value='1' $selected{'SYSLOGLEVEL'}{'1'}>1 ($Lang::tr{'wlanap debugging'})</option> + <option value='2' $selected{'SYSLOGLEVEL'}{'2'}>2 ($Lang::tr{'wlanap informations'})</option> + <option value='3' $selected{'SYSLOGLEVEL'}{'3'}>3 ($Lang::tr{'wlanap notifications'})</option> + <option value='4' $selected{'SYSLOGLEVEL'}{'4'}>4 ($Lang::tr{'wlanap warnings'})</option> </select> </td> <td width='25%' class='base'>Debuglevel (hostapd): </td><td class='base' width='25%'> <select name='DEBUG'> - <option value='0' $selected{'DEBUG'}{'0'}>0 (verbose)</option> - <option value='1' $selected{'DEBUG'}{'1'}>1 (debugging)</option> - <option value='2' $selected{'DEBUG'}{'2'}>2 (informations)</option> - <option value='3' $selected{'DEBUG'}{'3'}>3 (notifications)</option> - <option value='4' $selected{'DEBUG'}{'4'}>4 (warnings)</option> + <option value='0' $selected{'DEBUG'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option> + <option value='1' $selected{'DEBUG'}{'1'}>1 ($Lang::tr{'wlanap debugging'})</option> + <option value='2' $selected{'DEBUG'}{'2'}>2 ($Lang::tr{'wlanap informations'})</option> + <option value='3' $selected{'DEBUG'}{'3'}>3 ($Lang::tr{'wlanap notifications'})</option> + <option value='4' $selected{'DEBUG'}{'4'}>4 ($Lang::tr{'wlanap warnings'})</option> </select> </td></tr> </table> @@ -347,10 +423,10 @@ END } print <<END <br /> -<table width='10%' cellspacing='0'> -<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value=$Lang::tr{'save'} /> - <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td> +<table width='95%' cellspacing='0'> +<tr><td align='center'><hr size='1'> +<form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></form></td> </tr> </table> END @@ -365,10 +441,16 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ print <<END <br /> <table width='95%' cellspacing='0'> -<tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><b>WLAN Status</b></td></tr> +<tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><strong>$Lang::tr{'wlanap wlan status'}</strong></td></tr> <tr><td><pre>@channellist_cmd</pre></td><td><pre>@txpower_cmd</pre></td></tr> <tr><td colspan='2'><pre>$status</pre></td></tr> </table> +<br /> +<table width='95%' cellspacing='0'> +<tr><td bgcolor='$color{'color20'}' align='left'><strong>WLan Clients</strong></td></tr> +<tr><td> <a href="/cgi-bin/wireless.cgi">$Lang::tr{'wlanap link wireless'}</a></td></tr> +<tr><td> <a href="/cgi-bin/dhcp.cgi">$Lang::tr{'wlanap link dhcp'}</a></td></tr> +</table> END ; &Header::closebox(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 147b79a..e18fdfb 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 22f3561..0bc5033 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 22f3561..0bc5033 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 c881f80..4f3ffb4 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 f098ff2..5cfd184 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 4dbb90f..a5fd0ad 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 f1120ff..f895307 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 110a43b..68d5f6a 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 09eba59..e6f2ceb 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 0bdc583..3007497 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 8d4a7da..5aaa5f4 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 89c40d0..6f4cb60 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 info@ipfire.org. # +# Copyright (C) 2010 IPFire-Team info@ipfire.org. # # # ############################################################################ # . /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
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org