IPFire-SCM July 2013

ipfire-scm@lists.ipfire.org

1 participants
61 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15be554282c3c424d5d9eab9de62f6fde4203585
by git＠ipfire.org 16 Jul '13

16 Jul '13

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 15be554282c3c424d5d9eab9de62f6fde4203585 (commit) from cfab012b143b6aaf7f181243c96616e060c08d05 (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 15be554282c3c424d5d9eab9de62f6fde4203585 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 16 20:54:28 2013 +0200 strongswan: Enable EAP authentication algorithms. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 10 ++++++++++ lfs/strongswan | 6 ++++++ 2 files changed, 16 insertions(+) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 2d5d42b..c94ce6f 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -31,6 +31,11 @@ usr/lib/ipsec/libradius.so.0.0.0 usr/lib/ipsec/libstrongswan.so usr/lib/ipsec/libstrongswan.so.0 usr/lib/ipsec/libstrongswan.so.0.0.0 +#usr/lib/ipsec/libtls.a +#usr/lib/ipsec/libtls.la +usr/lib/ipsec/libtls.so +usr/lib/ipsec/libtls.so.0 +usr/lib/ipsec/libtls.so.0.0.0 #usr/lib/ipsec/plugins usr/lib/ipsec/plugins/libstrongswan-aes.so usr/lib/ipsec/plugins/libstrongswan-attr.so @@ -39,7 +44,12 @@ usr/lib/ipsec/plugins/libstrongswan-constraints.so usr/lib/ipsec/plugins/libstrongswan-curl.so usr/lib/ipsec/plugins/libstrongswan-des.so usr/lib/ipsec/plugins/libstrongswan-dnskey.so +usr/lib/ipsec/plugins/libstrongswan-eap-identity.so +usr/lib/ipsec/plugins/libstrongswan-eap-mschapv2.so +usr/lib/ipsec/plugins/libstrongswan-eap-peap.so usr/lib/ipsec/plugins/libstrongswan-eap-radius.so +usr/lib/ipsec/plugins/libstrongswan-eap-tls.so +usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so usr/lib/ipsec/plugins/libstrongswan-fips-prf.so usr/lib/ipsec/plugins/libstrongswan-gmp.so usr/lib/ipsec/plugins/libstrongswan-hmac.so diff --git a/lfs/strongswan b/lfs/strongswan index b3ce846..a6075a2 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -84,7 +84,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir="/etc" \ --enable-curl \ --enable-openssl \ + --enable-xauth-eap \ --enable-eap-radius \ + --enable-eap-tls \ + --enable-eap-ttls \ + --enable-eap-peap \ + --enable-eap-mschapv2 \ + --enable-eap-identity \ $(PADLOCK) cd $(DIR_APP) && make $(MAKETUNING) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cfab012b143b6aaf7f181243c96616e060c08d05
by git＠ipfire.org 16 Jul '13

16 Jul '13

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 cfab012b143b6aaf7f181243c96616e060c08d05 (commit) via 25848b36da1363f46ad85570501e6aff7a3eec1e (commit) from 8b417dd143a02900f8ba06510d7ffa3039f15be8 (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 cfab012b143b6aaf7f181243c96616e060c08d05 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 16 19:46:29 2013 +0200 squidclamav: Fix indentation of update script. commit 25848b36da1363f46ad85570501e6aff7a3eec1e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 16 19:42:53 2013 +0200 squidclamav: Fix permissions of /etc/squidclamav.conf. The file must not be executable, but writeable by anybody in the group nobody. ----------------------------------------------------------------------- Summary of changes: lfs/squidclamav | 3 ++- src/paks/squidclamav/update.sh | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) Difference in files: diff --git a/lfs/squidclamav b/lfs/squidclamav index 79bf5d0..7d9e6af 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -80,7 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-dont_use_ipv6.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make install - install -v -m 755 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf + install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf + chown -v root:nobody /etc/squidclamav.conf install -v -m 644 $(DIR_SRC)/config/backup/includes/squidclamav /var/ipfire/backup/addons/includes/squidclamav chmod 755 /srv/web/ipfire/html/clwarn.cgi @rm -rf $(DIR_APP) diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh index 4b54216..4376085 100644 --- a/src/paks/squidclamav/update.sh +++ b/src/paks/squidclamav/update.sh @@ -28,21 +28,26 @@ extract_files VERSION=$(cat /opt/pakfire/db/installed/meta-squidclamav | grep Release | cut -d" " -f2) if [ "$VERSION" -gt "10" ]; then - restore_backup ${NAME} + restore_backup ${NAME} fi if [ "$VERSION" -lt "11" ]; then - sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf + sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf fi if [ "$VERSION" -lt "16" ]; then - sed -e "s/proxy none//g" -i /etc/squidclamav.conf - sed -e "s/^#squid_ip 127\.0\.0\.1/squid_ip 127\.0\.0\.1/g" \ - -e "s/^#squid_port 3128/squid_port 800/g" \ - -e "s/^#trust_cache 1/trust_cache 1/g" -i /etc/squidclamav.conf + sed -i /etc/squidclamav.conf \ + -e "s/proxy none//g" \ + -e "s/^#squid_ip 127\.0\.0\.1/squid_ip 127\.0\.0\.1/g" \ + -e "s/^#squid_port 3128/squid_port 800/g" \ + -e "s/^#trust_cache 1/trust_cache 1/g" - # Regenerate configuration files. - perl /srv/web/ipfire/cgi-bin/proxy.cgi + # Fix permissions. + chmod 664 /etc/squidclamav.conf + chown root.nobody /etc/squidclamav.conf + + # Regenerate configuration files. + perl /srv/web/ipfire/cgi-bin/proxy.cgi fi /etc/init.d/squid restart hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8b417dd143a02900f8ba06510d7ffa3039f15be8
by git＠ipfire.org 16 Jul '13

16 Jul '13

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 8b417dd143a02900f8ba06510d7ffa3039f15be8 (commit) from 15f78770b1d4ee730dca39166590393e3b24a666 (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 8b417dd143a02900f8ba06510d7ffa3039f15be8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 16 19:38:54 2013 +0200 proxy.cgi: Re-apply accidentially removed changes. Removed in dfee7582f9b386126fcaa6c8cdcb98677e34f5b4, originally introduced in 49c7cb232870cce6986f93bb6fc3b6dbf643ec07. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/proxy.cgi | 6 ++++++ 1 file changed, 6 insertions(+) Difference in files: diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 76d52b4..870042a 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3071,6 +3071,12 @@ icp_port 0 END ; + + # Include file with user defined settings. + if (-e "/etc/squid/squid.conf.pre.local") { + print FILE "include /etc/squid/squid.conf.pre.local\n\n"; + } + print FILE "http_port $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}"; if ($proxysettings{'TRANSPARENT'} eq 'on') { print FILE " transparent" } if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " no-connection-auth" } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core71, updated. c7929cf54604d989986ddb8b6bbf491955c48258
by git＠ipfire.org 16 Jul '13

16 Jul '13

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, core71 has been updated via c7929cf54604d989986ddb8b6bbf491955c48258 (commit) from 15f78770b1d4ee730dca39166590393e3b24a666 (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 c7929cf54604d989986ddb8b6bbf491955c48258 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 18:29:48 2013 +0200 core71: stop/start squid at update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/71/update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh index 8990b97..e45ccd8 100644 --- a/config/rootfiles/core/71/update.sh +++ b/config/rootfiles/core/71/update.sh @@ -39,7 +39,7 @@ cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup # #Stop services /etc/init.d/snort stop - +/etc/init.d/squid stop # #Remove old usb-modeswitch file rm /usr/share/usb_modeswitch/0e8d:0002 @@ -59,6 +59,7 @@ grep "^include $RULE_PATH" /etc/snort/snort.conf.backup >> /etc/snort/snort.conf # #Start services +/etc/init.d/squid start /etc/init.d/snort start # hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core71, created. 15f78770b1d4ee730dca39166590393e3b24a666
by git＠ipfire.org 16 Jul '13

16 Jul '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 15f78770b1d4ee730dca39166590393e3b24a666
by git＠ipfire.org 16 Jul '13

16 Jul '13

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, master has been updated via 15f78770b1d4ee730dca39166590393e3b24a666 (commit) via 2dd319f5b52848a2feee817d62c590106817435b (commit) via 648e0d03685bcbd6c6a31a6d0b13d936126f3183 (commit) via 3770a2abd160035e9a1d0f59729fe8adbc8c3561 (commit) via 920cc7233335608630a117183b24ee0d5ff2a908 (commit) via a610e13655dcf9fcb50a2b1e16bd39ffe37f30ad (commit) via c50ba483d2e9e6c5b403847152e76afe1470453b (commit) via 8245f77ee35511458ba528d9083394af72574757 (commit) via be3aaa7961be31becab7aa7e8138e5934b258670 (commit) via 3e862ce4f99059002b60994addc87a013d298b38 (commit) via f9dec458f39323bead4686f9e1a3bb827a9bd134 (commit) via c47f57d4e73f04da8a57f5f90fd3bb0ab8e9170a (commit) via 774df2479dfc7f1dba314da193d62bf828bb9edf (commit) via a0fa489f2f29aafc6a4fe9f8ad7bbdd469919241 (commit) via 1043cb0ae90a7f190cd0645acf995d509b57bafc (commit) via 8b9b6c016495d15f74ba4cebe6dd502ff11937f2 (commit) via e4ba53ed590428632025982d0dbd7af9b4e71084 (commit) via 900e2e99c4464a0b4200e6d9873a3c2570bcc30e (commit) via d2266224f7d1a6e2033b143b09ac5e59df06d040 (commit) via 067c77090555626819f9f751d31c8e558029f75c (commit) via a0da39f67c87e5084904c3f6d2e6d4202ca5bcfb (commit) via 65b1608fd2b189cef218a0ebd53f7cde7bc7fe5b (commit) via 02d67e754571b2fda38c398a59fa1845f7c9740a (commit) via 89baf6d537a92d2a4f640dba97ef387ee5511daf (commit) via d43bb759b1bb6d02a93b63d0dfd82e623685fb21 (commit) via 29fa14154fc211a4eb91d0c75c041b74fc0bf1fa (commit) via 5ced384b719877abfe0c78d9345a645f4531e38a (commit) via fcfd54ba9b883d0776f320e93ef422a5b2c3c73d (commit) via 204cab0218cfbc1abbbdba2ac60f862ae6bca42b (commit) via 3033567376ee335545ac2b177c826ca2f287b446 (commit) via a1b4e3c22de4806bd30c485c4628db307fac21e5 (commit) via e2a9e21f68c848af352330b2fc9af63daaf6c5aa (commit) via 57097305a610383d013c87ef32ae117c18846e46 (commit) via b63dc827f21fa617246ec0aa1d8a690f46b4f58e (commit) via 50a43338822aa1e74fe1433adbddeaa633ddc478 (commit) via 75b9d3658da7f8e37499523494aeb10fe1e27199 (commit) via 2e1cf5d9604b5c9b3c7995f460245583eff809ea (commit) via c5e5324cb6a121f13657df56f22da67e0d465ffa (commit) via b25387547d45ee4bb8b81e7aab5db4fb2281ae12 (commit) via f8c079150ec8df07a0f90bf25ef3a68f1201756f (commit) via 2650b1d285a3cb60808a4fbf386f7c65b2dfa29f (commit) via 2e11506109fe3e04e25c2013856fbd6557c3d641 (commit) via f7a617a02573dccce4713ce3448116d2bc173757 (commit) via ee7caa4bed3cbc5d6e296732bcba09bedd53d2f9 (commit) via dfee7582f9b386126fcaa6c8cdcb98677e34f5b4 (commit) via 71ea0d688d77705e53dae8931b1c3e2b477ed8fa (commit) via 61027579bbb5822d06ac41c7cdf259c49377b837 (commit) from c59eaea9ea398cb190fff2bebe24b37dfc4349cb (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 15f78770b1d4ee730dca39166590393e3b24a666 Merge: 2dd319f 920cc72 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 08:36:54 2013 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 2dd319f5b52848a2feee817d62c590106817435b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 08:35:28 2013 +0200 close core71. commit 648e0d03685bcbd6c6a31a6d0b13d936126f3183 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 00:57:33 2013 +0200 usb-modeswitch-data: update to 20130610. commit 3770a2abd160035e9a1d0f59729fe8adbc8c3561 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 00:56:17 2013 +0200 usb-modeswitch: update to 1.2.6. commit 920cc7233335608630a117183b24ee0d5ff2a908 Merge: a610e13 c50ba48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 15 22:05:12 2013 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit a610e13655dcf9fcb50a2b1e16bd39ffe37f30ad Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 15 22:04:59 2013 +0200 squid: Allow to set more FDs in CGI. commit c50ba483d2e9e6c5b403847152e76afe1470453b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 21:56:56 2013 +0200 misc-progs: rootfile updates. commit 8245f77ee35511458ba528d9083394af72574757 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 21:53:47 2013 +0200 misc-progs: fix typo in Makefile. commit be3aaa7961be31becab7aa7e8138e5934b258670 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:51:42 2013 +0200 core71: add proxy-squidclam changes to updater. commit 3e862ce4f99059002b60994addc87a013d298b38 Merge: f9dec45 5ced384 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:49:23 2013 +0200 Merge remote-tracking branch 'stevee/proxy-squidclamav' into next Conflicts: config/cfgroot/general-functions.pl commit f9dec458f39323bead4686f9e1a3bb827a9bd134 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:42:59 2013 +0200 core71: add dnsforward to updater. commit c47f57d4e73f04da8a57f5f90fd3bb0ab8e9170a Merge: 774df24 e4ba53e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:38:27 2013 +0200 Merge remote-tracking branch 'stevee/dnsforward' into next commit 774df2479dfc7f1dba314da193d62bf828bb9edf Merge: a0fa489 8b9b6c0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:36:53 2013 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit a0fa489f2f29aafc6a4fe9f8ad7bbdd469919241 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 17:05:44 2013 +0200 snort: update to 2.9.5. add VRT/GPLv2 community rules. fix wrong oinkcode warning if no oinkcode is needed. commit 1043cb0ae90a7f190cd0645acf995d509b57bafc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 17:03:53 2013 +0200 oinkmaster: add vrt community-rules support. commit 8b9b6c016495d15f74ba4cebe6dd502ff11937f2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 15 14:35:07 2013 +0200 squid: Increase FDs to 65536 (#10387). commit e4ba53ed590428632025982d0dbd7af9b4e71084 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 14 11:55:29 2013 +0200 dnsmasq: Add feature to forward domains to certain DNS servers. Fixes #10369. commit 900e2e99c4464a0b4200e6d9873a3c2570bcc30e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 14 13:01:13 2013 +0200 Cleanup in 30-network.menu. * Removed entry for non existing upload.cgi. * Fix indentation for several menu points. commit d2266224f7d1a6e2033b143b09ac5e59df06d040 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jul 14 11:33:54 2013 +0200 GeoIP: update database to 2013-07-02. commit 067c77090555626819f9f751d31c8e558029f75c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jul 14 11:22:54 2013 +0200 hwdata: update ids: pci 2013-07-14, usb 2013-05-24. commit a0da39f67c87e5084904c3f6d2e6d4202ca5bcfb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 12 16:24:30 2013 +0200 mc: update to 4.8.9. commit 65b1608fd2b189cef218a0ebd53f7cde7bc7fe5b Merge: 02d67e7 89baf6d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 9 20:08:40 2013 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 02d67e754571b2fda38c398a59fa1845f7c9740a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 9 19:09:39 2013 +0200 functions.network: change "Not running" message. Now it looks like other initskripts. commit 89baf6d537a92d2a4f640dba97ef387ee5511daf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 9 12:15:07 2013 +0200 ppp: Don't require setting the MTU configuration. commit d43bb759b1bb6d02a93b63d0dfd82e623685fb21 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 8 22:32:42 2013 +0200 functions.network: cleanup dhcp stop script. commit 29fa14154fc211a4eb91d0c75c041b74fc0bf1fa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 8 19:58:11 2013 +0200 functions.network: fix cursor position at status write. commit 5ced384b719877abfe0c78d9345a645f4531e38a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 7 10:26:30 2013 +0200 squidclamav: Never use IPv6. Squidclamav uses curl to resolve all kind of addresses which the system allow. If the remote address is an IPv6 address, squidclamav hangs forever. Nico Prenzel has found a solution to force the usage of IPv4 to prevent from this issue. Fixes #10376. commit fcfd54ba9b883d0776f320e93ef422a5b2c3c73d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jul 7 00:09:06 2013 +0200 dnsmasq: kill already old instances before start. commit 204cab0218cfbc1abbbdba2ac60f862ae6bca42b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 22:26:08 2013 +0200 wireless-client: add cgi to iso. commit 3033567376ee335545ac2b177c826ca2f287b446 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 19:49:59 2013 +0200 wireless-client: add wireless cfg to iso, backup and core71. commit a1b4e3c22de4806bd30c485c4628db307fac21e5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 17:07:49 2013 +0200 wlanclient: fix initskript rootfile for arm. commit e2a9e21f68c848af352330b2fc9af63daaf6c5aa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 17:00:40 2013 +0200 core71: add wlanclient to updater. commit 57097305a610383d013c87ef32ae117c18846e46 Merge: b63dc82 71ea0d6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 11:50:01 2013 +0200 Merge remote-tracking branch 'stevee/wlan-client' into next Conflicts: config/cfgroot/general-functions.pl commit b63dc827f21fa617246ec0aa1d8a690f46b4f58e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 09:39:03 2013 +0200 core71: add curl to updater. commit 50a43338822aa1e74fe1433adbddeaa633ddc478 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 09:36:34 2013 +0200 jwhois: update rootfile. commit 75b9d3658da7f8e37499523494aeb10fe1e27199 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 5 15:21:31 2013 +0200 start core71. commit 2e1cf5d9604b5c9b3c7995f460245583eff809ea Merge: c5e5324 c59eaea Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 5 15:18:37 2013 +0200 Merge branch 'master' into next commit c5e5324cb6a121f13657df56f22da67e0d465ffa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 4 17:31:30 2013 +0200 Replace whois by jwhois. commit b25387547d45ee4bb8b81e7aab5db4fb2281ae12 Merge: f8c0791 2650b1d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 3 20:34:15 2013 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit f8c079150ec8df07a0f90bf25ef3a68f1201756f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 3 20:32:07 2013 +0200 curl: Update to 7.31.0. Disable IPv6 in order to avoid that AAAA record resolution which may kill squidclamav. commit 2650b1d285a3cb60808a4fbf386f7c65b2dfa29f Merge: 2e11506 ee7caa4 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Jul 3 18:38:16 2013 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 2e11506109fe3e04e25c2013856fbd6557c3d641 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Jul 3 10:31:53 2013 +0200 igmpproxy: add igmpproxy.conf backup include. fixes #10375. commit f7a617a02573dccce4713ce3448116d2bc173757 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 22:45:57 2013 +0200 squidclamav: Update squidclamav.conf to use and trust the proxy cache. If squidclamav is already installed, the configuration will be saved and updated during the upgrade process. Reference #10367. commit ee7caa4bed3cbc5d6e296732bcba09bedd53d2f9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 30 18:26:40 2013 +0200 kernel: bump pae kernel package version. commit dfee7582f9b386126fcaa6c8cdcb98677e34f5b4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 22:29:30 2013 +0200 Increase performance of the squidclamav redirector. To boost up the performance, now we trust the proxy cache. I add some changes to the proxy.cgi to configure the proxy and the squidclamav in the right way. I also add a hook that allows us to generate a new configuration if the cgi script will be launched from the shell. Fixes #10367. commit 71ea0d688d77705e53dae8931b1c3e2b477ed8fa Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 2 15:00:25 2013 +0200 Add wireless client for RED to startup process. http://wishlist.ipfire.org/wish/wireless-client-on-red commit 61027579bbb5822d06ac41c7cdf259c49377b837 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 10 16:07:52 2013 +0100 Implement wireless client on RED. http://wishlist.ipfire.org/wish/wireless-client-on-red Conflicts: doc/language_issues.de doc/language_issues.en doc/language_issues.es doc/language_issues.fr doc/language_issues.pl doc/language_issues.ru src/misc-progs/Makefile ----------------------------------------------------------------------- Summary of changes: config/backup/include | 1 + config/backup/includes/igmpproxy | 1 + config/cfgroot/general-functions.pl | 45 + config/cfgroot/header.pl | 4 + config/menu/10-system.menu | 6 + config/menu/30-network.menu | 30 +- config/rootfiles/common/apache2 | 1 + config/rootfiles/common/armv5tel/initscripts | 6 + config/rootfiles/common/configroot | 1 + config/rootfiles/common/i586/initscripts | 6 + config/rootfiles/common/inetutils | 1 - config/rootfiles/common/jwhois | 25 + config/rootfiles/common/misc-progs | 2 + config/rootfiles/common/snort | 2 +- config/rootfiles/common/usb_modeswitch_data | 46 +- config/rootfiles/core/{70 => 71}/exclude | 0 .../{oldcore/54 => core/71}/filelists/GeoIP | 0 .../{oldcore/28 => core/71}/filelists/curl | 0 config/rootfiles/core/71/filelists/files | 24 + .../{oldcore/58 => core/71}/filelists/hwdata | 0 config/rootfiles/core/71/filelists/jwhois | 1 + config/rootfiles/core/71/filelists/oinkmaster | 1 + .../{oldcore/28 => core/71}/filelists/snort | 0 .../{oldcore/32 => core/71}/filelists/squid | 0 .../34 => core/71}/filelists/usb_modeswitch | 0 .../44 => core/71}/filelists/usb_modeswitch_data | 0 config/rootfiles/core/{70 => 71}/meta | 0 config/rootfiles/{oldcore/68 => core/71}/update.sh | 30 +- config/rootfiles/packages/igmpproxy | 1 + config/rootfiles/packages/mc | 8 + config/snort/snort.conf | 42 +- config/squidclamav/squidclamav.conf | 9 +- doc/language_issues.de | 4 +- doc/language_issues.en | 1 - doc/language_issues.es | 32 +- doc/language_issues.fr | 32 +- doc/language_issues.nl | 31 +- doc/language_issues.pl | 32 +- doc/language_issues.ru | 33 +- doc/language_issues.tr | 31 +- doc/language_missings | 124 ++ html/cgi-bin/dnsforward.cgi | 359 +++++ html/cgi-bin/ids.cgi | 13 +- html/cgi-bin/pppsetup.cgi | 8 +- html/cgi-bin/proxy.cgi | 43 +- html/cgi-bin/wirelessclient.cgi | 703 +++++++++ langs/de/cgi-bin/de.pl | 39 +- langs/en/cgi-bin/en.pl | 40 +- langs/nl/cgi-bin/nl.pl | 3 +- langs/pl/cgi-bin/pl.pl | 1 - langs/ru/cgi-bin/ru.pl | 1 - langs/tr/cgi-bin/tr.pl | 3 +- lfs/GeoIP | 4 +- lfs/configroot | 4 +- lfs/curl | 6 +- lfs/igmpproxy | 6 +- lfs/inetutils | 4 + lfs/initscripts | 3 + lfs/{pango => jwhois} | 21 +- lfs/linux | 2 +- lfs/mc | 6 +- lfs/oinkmaster | 1 + lfs/snort | 7 +- lfs/squid | 4 +- lfs/squidclamav | 3 +- lfs/usb_modeswitch | 6 +- lfs/usb_modeswitch_data | 6 +- make.sh | 7 +- src/hwdata/pci.ids | 1613 +++++++++++++++++--- src/hwdata/usb.ids | 6 +- src/initscripts/init.d/dnsmasq | 29 +- .../init.d/networking/functions.network | 147 ++ src/initscripts/init.d/networking/red | 137 +- .../init.d/networking/wpa_supplicant.exe | 50 + src/initscripts/init.d/wlanclient | 283 ++++ src/misc-progs/Makefile | 9 +- src/misc-progs/{updxsetperms.c => dnsmasqctrl.c} | 12 +- .../{updxsetperms.c => wirelessclient.c} | 22 +- src/pakfire/pakfire.conf | 2 +- src/paks/{default => igmpproxy}/install.sh | 0 src/paks/{mediatomb => igmpproxy}/uninstall.sh | 1 + src/paks/{apcupsd => igmpproxy}/update.sh | 0 src/paks/squidclamav/update.sh | 10 + src/patches/jwhois-4.0-conf_update.patch | 714 +++++++++ src/patches/jwhois-4.0-conf_update2.patch | 163 ++ src/patches/jwhois-4.0-connect.patch | 58 + src/patches/jwhois-4.0-fclose.patch | 12 + src/patches/jwhois-4.0-idna.patch | 43 + src/patches/jwhois-4.0-ipv6match.patch | 15 + src/patches/jwhois-4.0-multi-homed.patch | 15 + src/patches/jwhois-4.0-select.patch | 27 + .../oinkmaster-2.0-add_community_rules.patch | 14 + src/patches/squidclamav-5.11-dont_use_ipv6.patch | 13 + 93 files changed, 4872 insertions(+), 439 deletions(-) create mode 100644 config/backup/includes/igmpproxy create mode 100644 config/rootfiles/common/jwhois copy config/rootfiles/core/{70 => 71}/exclude (100%) copy config/rootfiles/{oldcore/54 => core/71}/filelists/GeoIP (100%) copy config/rootfiles/{oldcore/28 => core/71}/filelists/curl (100%) create mode 100644 config/rootfiles/core/71/filelists/files copy config/rootfiles/{oldcore/58 => core/71}/filelists/hwdata (100%) create mode 120000 config/rootfiles/core/71/filelists/jwhois create mode 120000 config/rootfiles/core/71/filelists/oinkmaster copy config/rootfiles/{oldcore/28 => core/71}/filelists/snort (100%) copy config/rootfiles/{oldcore/32 => core/71}/filelists/squid (100%) copy config/rootfiles/{oldcore/34 => core/71}/filelists/usb_modeswitch (100%) copy config/rootfiles/{oldcore/44 => core/71}/filelists/usb_modeswitch_data (100%) copy config/rootfiles/core/{70 => 71}/meta (100%) copy config/rootfiles/{oldcore/68 => core/71}/update.sh (83%) create mode 100644 html/cgi-bin/dnsforward.cgi create mode 100755 html/cgi-bin/wirelessclient.cgi copy lfs/{pango => jwhois} (78%) create mode 100644 src/initscripts/init.d/networking/functions.network create mode 100644 src/initscripts/init.d/networking/wpa_supplicant.exe create mode 100644 src/initscripts/init.d/wlanclient copy src/misc-progs/{updxsetperms.c => dnsmasqctrl.c} (59%) copy src/misc-progs/{updxsetperms.c => wirelessclient.c} (50%) copy src/paks/{default => igmpproxy}/install.sh (100%) copy src/paks/{mediatomb => igmpproxy}/uninstall.sh (98%) copy src/paks/{apcupsd => igmpproxy}/update.sh (100%) create mode 100644 src/patches/jwhois-4.0-conf_update.patch create mode 100644 src/patches/jwhois-4.0-conf_update2.patch create mode 100644 src/patches/jwhois-4.0-connect.patch create mode 100644 src/patches/jwhois-4.0-fclose.patch create mode 100644 src/patches/jwhois-4.0-idna.patch create mode 100644 src/patches/jwhois-4.0-ipv6match.patch create mode 100644 src/patches/jwhois-4.0-multi-homed.patch create mode 100644 src/patches/jwhois-4.0-select.patch create mode 100644 src/patches/oinkmaster-2.0-add_community_rules.patch create mode 100644 src/patches/squidclamav-5.11-dont_use_ipv6.patch Difference in files: diff --git a/config/backup/include b/config/backup/include index 9b08683..8463a89 100644 --- a/config/backup/include +++ b/config/backup/include @@ -39,3 +39,4 @@ /root/.gitconfig /root/.bash_history /var/ipfire/ethernet/aliases +/var/ipfire/ethernet/wireless diff --git a/config/backup/includes/igmpproxy b/config/backup/includes/igmpproxy new file mode 100644 index 0000000..dc47ad3 --- /dev/null +++ b/config/backup/includes/igmpproxy @@ -0,0 +1 @@ +/etc/igmpproxy.conf diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 90eacbd..41643d8 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -1008,4 +1008,49 @@ sub MakeUserAgent() { return $user_agent; } +sub RedIsWireless() { + # This function checks if a network device is a wireless device. + + my %settings = (); + &readhash("${General::swroot}/ethernet/settings", \%settings); + + # Find the name of the network device. + my $device = $settings{'RED_DEV'}; + + # Exit, if no device is configured. + return 0 if ($device eq ""); + + # Return 1 if the device is a wireless one. + my $path = "/sys/class/net/$device/wireless"; + if (-d $path) { + return 1; + } + + # Otherwise return zero. + return 0; +} + +# Function to read a file with UTF-8 charset. +sub read_file_utf8 ($) { + my ($file) = @_; + + open my $in, '<:encoding(UTF-8)', $file or die "Could not open '$file' for reading $!"; + local $/ = undef; + my $all = <$in>; + close $in; + + return $all; +} + +# Function to write a file with UTF-8 charset. +sub write_file_utf8 ($) { + my ($file, $content) = @_; + + open my $out, '>:encoding(UTF-8)', $file or die "Could not open '$file' for writing $!";; + print $out $content; + close $out; + + return; +} + 1; diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 0f10bf9..a7f209d 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -157,6 +157,10 @@ sub genmenu { if ( $ethsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $ethsettings{'RED_TYPE'} eq 'STATIC' ) { $menu->{'03.network'}{'subMenu'}->{'70.aliases'}{'enabled'} = 1; } + + if (&General::RedIsWireless()) { + $menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} = 1; + } } sub showhttpheaders diff --git a/config/menu/10-system.menu b/config/menu/10-system.menu index 9248663..b56a1ec 100644 --- a/config/menu/10-system.menu +++ b/config/menu/10-system.menu @@ -10,6 +10,12 @@ 'title' => "$Lang::tr{'alt dialup'}", 'enabled' => 1, }; + $subsystem->{'21.wlan'} = { + 'caption' => $Lang::tr{'wlan client'}, + 'uri' => '/cgi-bin/wirelessclient.cgi', + 'title' => "$Lang::tr{'wlan client'}", + 'enabled' => 0, + }; $subsystem->{'30.ssh'} = { 'caption' => $Lang::tr{'ssh access'}, 'uri' => '/cgi-bin/remote.cgi', diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu index f4645b8..c50508f 100644 --- a/config/menu/30-network.menu +++ b/config/menu/30-network.menu @@ -35,37 +35,37 @@ 'title' => "$Lang::tr{'edit hosts'}", 'enabled' => 1, }; - $subnetwork->{'51.routes'} = { + $subnetwork->{'51.dnsmenu'} = { + 'caption' => $Lang::tr{'dns menu'}, + 'uri' => '/cgi-bin/dns.cgi', + 'title' => "$Lang::tr{'dns menu'}", + 'enabled' => `grep "RED_TYPE=DHCP" /var/ipfire/ethernet/settings`, + }; + $subnetwork->{'52.dnsforward'} = { + 'caption' => $Lang::tr{'dnsforward'}, + 'uri' => '/cgi-bin/dnsforward.cgi', + 'title' => "$Lang::tr{'dnsforward'}", + 'enabled' => 1 + }; + $subnetwork->{'60.routes'} = { 'caption' => $Lang::tr{'static routes'}, 'uri' => '/cgi-bin/routing.cgi', 'title' => "$Lang::tr{'static routes'}", 'enabled' => 1, }; - $subnetwork->{'60.upload'} = { - 'caption' => $Lang::tr{'upload'}, - 'uri' => '/cgi-bin/upload.cgi', - 'title' => "$Lang::tr{'upload'}", - 'enabled' => 0, - }; $subnetwork->{'70.aliases'} = { 'caption' => $Lang::tr{'aliases'}, 'uri' => '/cgi-bin/aliases.cgi', 'title' => "$Lang::tr{'aliases'}", 'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`, }; - $subnetwork->{'80.dnsmenu'} = { - 'caption' => $Lang::tr{'dns menu'}, - 'uri' => '/cgi-bin/dns.cgi', - 'title' => "$Lang::tr{'dns menu'}", - 'enabled' => `grep "RED_TYPE=DHCP" /var/ipfire/ethernet/settings`, - }; - $subnetwork->{'90.macadressmenu'} = { + $subnetwork->{'80.macadressmenu'} = { 'caption' => $Lang::tr{'mac address menu'}, 'uri' => '/cgi-bin/mac.cgi', 'title' => "$Lang::tr{'mac address menu'}", 'enabled' => 1, }; - $subnetwork->{'99.wakeonlan'} = { + $subnetwork->{'90.wakeonlan'} = { 'caption' => $Lang::tr{'WakeOnLan'}, 'uri' => '/cgi-bin/wakeonlan.cgi', 'title' => "$Lang::tr{'WakeOnLan'}", diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 802ddcb..9be3581 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1431,6 +1431,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/webaccess.cgi srv/web/ipfire/cgi-bin/wireless.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/cgi-bin/xtaccess.cgi srv/web/ipfire/html var/updatecache diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index a4fa8a7..ff6d731 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -64,6 +64,7 @@ etc/rc.d/init.d/network-vlans etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue etc/rc.d/init.d/networking/dhcpcd.exe +etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red @@ -94,6 +95,7 @@ etc/rc.d/init.d/networking/red.up/98-leds etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl etc/rc.d/init.d/networking/red.up/99-fireinfo etc/rc.d/init.d/networking/red.up/99-pakfire-update +etc/rc.d/init.d/networking/wpa_supplicant.exe #etc/rc.d/init.d/nfs-server etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut @@ -132,6 +134,7 @@ etc/rc.d/init.d/upnpd #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 #etc/rc.d/rc0.d/K01imspetor @@ -149,6 +152,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds etc/rc.d/rc0.d/K80network +etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth #etc/rc.d/rc0.d/K85messagebus etc/rc.d/rc0.d/K85tmpfs @@ -165,6 +169,7 @@ etc/rc.d/rc3.d/S10sysklogd #etc/rc.d/rc3.d/S16bluetooth #etc/rc.d/rc3.d/S18cpufreq etc/rc.d/rc3.d/S19smartenabler +etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl @@ -195,6 +200,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl etc/rc.d/rc6.d/K78snort etc/rc.d/rc6.d/K79leds etc/rc.d/rc6.d/K80network +etc/rc.d/rc6.d/K82wlanclient #etc/rc.d/rc6.d/K84bluetooth #etc/rc.d/rc6.d/K85messagebus etc/rc.d/rc6.d/K85tmpfs diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index e97134f..3910b36 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -36,6 +36,7 @@ var/ipfire/ethernet #var/ipfire/ethernet/scanned_nics #var/ipfire/ethernet/settings #var/ipfire/ethernet/vlans +#var/ipfire/ethernet/wireless #var/ipfire/extrahd #var/ipfire/extrahd/bin var/ipfire/extrahd/bin/extrahd.pl diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 606f8ea..55cee86 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -66,6 +66,7 @@ etc/rc.d/init.d/network-vlans etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue etc/rc.d/init.d/networking/dhcpcd.exe +etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red @@ -96,6 +97,7 @@ etc/rc.d/init.d/networking/red.up/98-leds etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl etc/rc.d/init.d/networking/red.up/99-fireinfo etc/rc.d/init.d/networking/red.up/99-pakfire-update +etc/rc.d/init.d/networking/wpa_supplicant.exe #etc/rc.d/init.d/nfs-server etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut @@ -135,6 +137,7 @@ etc/rc.d/init.d/upnpd #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 #etc/rc.d/rc0.d/K01imspetor @@ -152,6 +155,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds etc/rc.d/rc0.d/K80network +etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth #etc/rc.d/rc0.d/K85messagebus etc/rc.d/rc0.d/K85tmpfs @@ -170,6 +174,7 @@ etc/rc.d/rc3.d/S12acpid #etc/rc.d/rc3.d/S16bluetooth #etc/rc.d/rc3.d/S18cpufreq etc/rc.d/rc3.d/S19smartenabler +etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl @@ -200,6 +205,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl etc/rc.d/rc6.d/K78snort etc/rc.d/rc6.d/K79leds etc/rc.d/rc6.d/K80network +etc/rc.d/rc6.d/K82wlanclient #etc/rc.d/rc6.d/K84bluetooth #etc/rc.d/rc6.d/K85messagebus etc/rc.d/rc6.d/K85tmpfs diff --git a/config/rootfiles/common/inetutils b/config/rootfiles/common/inetutils index 3cea63c..fb33fb0 100644 --- a/config/rootfiles/common/inetutils +++ b/config/rootfiles/common/inetutils @@ -5,7 +5,6 @@ bin/ping #usr/bin/rsh #usr/bin/talk #usr/bin/tftp -usr/bin/whois #usr/sbin/ftpd #usr/sbin/inetd #usr/sbin/rexecd diff --git a/config/rootfiles/common/jwhois b/config/rootfiles/common/jwhois new file mode 100644 index 0000000..135b453 --- /dev/null +++ b/config/rootfiles/common/jwhois @@ -0,0 +1,25 @@ +etc/jwhois.conf +usr/bin/jwhois +usr/bin/whois +#usr/share/info/jwhois.info +#usr/share/locale/es/LC_MESSAGES/jwhois.mo +#usr/share/locale/fr/LC_MESSAGES/jwhois.mo +#usr/share/locale/hu/LC_MESSAGES/jwhois.mo +#usr/share/locale/id/LC_MESSAGES/jwhois.mo +#usr/share/locale/it/LC_MESSAGES/jwhois.mo +#usr/share/locale/nl/LC_MESSAGES/jwhois.mo +#usr/share/locale/pl/LC_MESSAGES/jwhois.mo +#usr/share/locale/pt_BR/LC_MESSAGES/jwhois.mo +#usr/share/locale/ro +#usr/share/locale/ro/LC_MESSAGES +#usr/share/locale/ro/LC_MESSAGES/jwhois.mo +#usr/share/locale/ru/LC_MESSAGES/jwhois.mo +#usr/share/locale/rw/LC_MESSAGES/jwhois.mo +#usr/share/locale/sv/LC_MESSAGES/jwhois.mo +#usr/share/locale/tr/LC_MESSAGES/jwhois.mo +#usr/share/locale/vi/LC_MESSAGES/jwhois.mo +#usr/share/locale/zh_TW/LC_MESSAGES/jwhois.mo +#usr/share/man/man1/jwhois.1 +#usr/share/man/sv +#usr/share/man/sv/man1 +#usr/share/man/sv/man1/jwhois.1 diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index d2cf710..a8dac59 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -3,6 +3,7 @@ usr/local/bin/addonctrl usr/local/bin/backupctrl #usr/local/bin/clamavctrl usr/local/bin/dhcpctrl +usr/local/bin/dnsmasqctrl usr/local/bin/extrahdctrl usr/local/bin/fireinfoctrl usr/local/bin/getconntracktable @@ -35,5 +36,6 @@ usr/local/bin/timectrl usr/local/bin/updxlratorctrl usr/local/bin/upnpctrl usr/local/bin/urlfilterctrl +usr/local/bin/wirelessclient usr/local/bin/wirelessctrl #usr/local/bin/wlanapctrl diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 8404486..e35838d 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -3,6 +3,7 @@ etc/snort/rules #etc/snort/rules/classification.config #etc/snort/rules/reference.config etc/snort/snort.conf +etc/snort/snort.conf.template etc/snort/unicode.map usr/bin/u2boat usr/bin/u2spewfoo @@ -179,7 +180,6 @@ usr/sbin/snort #usr/share/doc/snort/README.dnp3 #usr/share/doc/snort/README.dns #usr/share/doc/snort/README.event_queue -#usr/share/doc/snort/README.file #usr/share/doc/snort/README.filters #usr/share/doc/snort/README.flowbits #usr/share/doc/snort/README.frag3 diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index 448a19e..a454c61 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -5,20 +5,24 @@ usr/share/usb_modeswitch/03f0:002a usr/share/usb_modeswitch/0408:f000 usr/share/usb_modeswitch/0421:060c usr/share/usb_modeswitch/0421:0610 +usr/share/usb_modeswitch/0421:0618 usr/share/usb_modeswitch/0421:061d usr/share/usb_modeswitch/0421:0622 usr/share/usb_modeswitch/0421:0627 usr/share/usb_modeswitch/0421:062c +usr/share/usb_modeswitch/0421:0632 usr/share/usb_modeswitch/0421:0637 usr/share/usb_modeswitch/0471:1210:uMa=Philips usr/share/usb_modeswitch/0471:1210:uMa=Wisue usr/share/usb_modeswitch/0471:1237 usr/share/usb_modeswitch/0482:024d usr/share/usb_modeswitch/04bb:bccd +usr/share/usb_modeswitch/04cc:225c usr/share/usb_modeswitch/04e8:680c usr/share/usb_modeswitch/04e8:689a usr/share/usb_modeswitch/04e8:f000:sMo=U209 usr/share/usb_modeswitch/057c:84ff +usr/share/usb_modeswitch/05c6:0010 usr/share/usb_modeswitch/05c6:1000:sVe=GT usr/share/usb_modeswitch/05c6:1000:sVe=Option usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA @@ -27,6 +31,7 @@ usr/share/usb_modeswitch/05c6:1000:uMa=DGT usr/share/usb_modeswitch/05c6:1000:uMa=Option usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG usr/share/usb_modeswitch/05c6:1000:uMa=SSE +usr/share/usb_modeswitch/05c6:1000:uMa=StrongRising usr/share/usb_modeswitch/05c6:1000:uMa=Vertex usr/share/usb_modeswitch/05c6:2000 usr/share/usb_modeswitch/05c6:2001 @@ -83,6 +88,7 @@ usr/share/usb_modeswitch/0af0:8700 usr/share/usb_modeswitch/0af0:8800 usr/share/usb_modeswitch/0af0:8900 usr/share/usb_modeswitch/0af0:9000 +usr/share/usb_modeswitch/0af0:9200 usr/share/usb_modeswitch/0af0:c031 usr/share/usb_modeswitch/0af0:c100 usr/share/usb_modeswitch/0af0:d001 @@ -104,7 +110,7 @@ usr/share/usb_modeswitch/0cf3:20ff usr/share/usb_modeswitch/0d46:45a1 usr/share/usb_modeswitch/0d46:45a5 usr/share/usb_modeswitch/0df7:0800 -usr/share/usb_modeswitch/0e8d:0002 +usr/share/usb_modeswitch/0e8d:0002:uPr=MT usr/share/usb_modeswitch/0e8d:7109 usr/share/usb_modeswitch/0fce:d0cf usr/share/usb_modeswitch/0fce:d0e1 @@ -115,14 +121,19 @@ usr/share/usb_modeswitch/1004:607f usr/share/usb_modeswitch/1004:613a usr/share/usb_modeswitch/1004:613f usr/share/usb_modeswitch/1004:614e +usr/share/usb_modeswitch/1004:6156 usr/share/usb_modeswitch/1004:6190 +usr/share/usb_modeswitch/1004:61aa usr/share/usb_modeswitch/1004:61dd usr/share/usb_modeswitch/1004:61e7 usr/share/usb_modeswitch/1004:61eb +usr/share/usb_modeswitch/1004:6327 usr/share/usb_modeswitch/1033:0035 usr/share/usb_modeswitch/106c:3b03 usr/share/usb_modeswitch/106c:3b05 usr/share/usb_modeswitch/106c:3b06 +usr/share/usb_modeswitch/106c:3b11 +usr/share/usb_modeswitch/106c:3b14 usr/share/usb_modeswitch/1076:7f40 usr/share/usb_modeswitch/109b:f009 usr/share/usb_modeswitch/1199:0fff @@ -139,6 +150,7 @@ usr/share/usb_modeswitch/12d1:1449 usr/share/usb_modeswitch/12d1:14ad usr/share/usb_modeswitch/12d1:14b5 usr/share/usb_modeswitch/12d1:14b7 +usr/share/usb_modeswitch/12d1:14ba usr/share/usb_modeswitch/12d1:14c1 usr/share/usb_modeswitch/12d1:14c3 usr/share/usb_modeswitch/12d1:14c4 @@ -146,24 +158,33 @@ usr/share/usb_modeswitch/12d1:14c5 usr/share/usb_modeswitch/12d1:14d1 usr/share/usb_modeswitch/12d1:14fe usr/share/usb_modeswitch/12d1:1505 +usr/share/usb_modeswitch/12d1:151a usr/share/usb_modeswitch/12d1:1520 usr/share/usb_modeswitch/12d1:1521 usr/share/usb_modeswitch/12d1:1523 +usr/share/usb_modeswitch/12d1:1526 usr/share/usb_modeswitch/12d1:1553 usr/share/usb_modeswitch/12d1:1557 +usr/share/usb_modeswitch/12d1:155b +usr/share/usb_modeswitch/12d1:1805 usr/share/usb_modeswitch/12d1:1c0b +usr/share/usb_modeswitch/12d1:1c1b usr/share/usb_modeswitch/12d1:1c24 usr/share/usb_modeswitch/12d1:1d50 usr/share/usb_modeswitch/12d1:1da1 usr/share/usb_modeswitch/12d1:1f01 +usr/share/usb_modeswitch/12d1:1f03 +usr/share/usb_modeswitch/12d1:1f11 usr/share/usb_modeswitch/12d1:380b usr/share/usb_modeswitch/1307:1169 usr/share/usb_modeswitch/1410:5010 usr/share/usb_modeswitch/1410:5020 +usr/share/usb_modeswitch/1410:5023 usr/share/usb_modeswitch/1410:5030 usr/share/usb_modeswitch/1410:5031 usr/share/usb_modeswitch/1410:5041 usr/share/usb_modeswitch/1410:5059 +usr/share/usb_modeswitch/1410:7001 usr/share/usb_modeswitch/148e:a000 usr/share/usb_modeswitch/148f:2578 usr/share/usb_modeswitch/15eb:7153 @@ -173,6 +194,7 @@ usr/share/usb_modeswitch/16d8:6804 usr/share/usb_modeswitch/16d8:700a usr/share/usb_modeswitch/16d8:700b usr/share/usb_modeswitch/16d8:f000 +usr/share/usb_modeswitch/1726:f00e usr/share/usb_modeswitch/198a:0003 usr/share/usb_modeswitch/198f:bccd usr/share/usb_modeswitch/19d2:0003 @@ -181,16 +203,20 @@ usr/share/usb_modeswitch/19d2:0026 usr/share/usb_modeswitch/19d2:0031 usr/share/usb_modeswitch/19d2:0040 usr/share/usb_modeswitch/19d2:0053 +usr/share/usb_modeswitch/19d2:0083 usr/share/usb_modeswitch/19d2:0083:uPr=WCDMA usr/share/usb_modeswitch/19d2:0101 usr/share/usb_modeswitch/19d2:0103 usr/share/usb_modeswitch/19d2:0110 usr/share/usb_modeswitch/19d2:0115 +usr/share/usb_modeswitch/19d2:0120 usr/share/usb_modeswitch/19d2:0146 usr/share/usb_modeswitch/19d2:0149 +usr/share/usb_modeswitch/19d2:0150 usr/share/usb_modeswitch/19d2:0154 usr/share/usb_modeswitch/19d2:0166 usr/share/usb_modeswitch/19d2:0169 +usr/share/usb_modeswitch/19d2:0266 usr/share/usb_modeswitch/19d2:0325 usr/share/usb_modeswitch/19d2:1001 usr/share/usb_modeswitch/19d2:1007 @@ -203,9 +229,13 @@ usr/share/usb_modeswitch/19d2:1179 usr/share/usb_modeswitch/19d2:1201 usr/share/usb_modeswitch/19d2:1216 usr/share/usb_modeswitch/19d2:1224 +usr/share/usb_modeswitch/19d2:1227 usr/share/usb_modeswitch/19d2:1514 usr/share/usb_modeswitch/19d2:1517 usr/share/usb_modeswitch/19d2:1520 +usr/share/usb_modeswitch/19d2:1523 +usr/share/usb_modeswitch/19d2:1528 +usr/share/usb_modeswitch/19d2:1542 usr/share/usb_modeswitch/19d2:2000 usr/share/usb_modeswitch/19d2:bccd usr/share/usb_modeswitch/19d2:ffde @@ -216,6 +246,7 @@ usr/share/usb_modeswitch/1a8d:1000 usr/share/usb_modeswitch/1a8d:2000 usr/share/usb_modeswitch/1ab7:5700 usr/share/usb_modeswitch/1b7d:0700 +usr/share/usb_modeswitch/1bbb:000f usr/share/usb_modeswitch/1bbb:00ca usr/share/usb_modeswitch/1bbb:f000 usr/share/usb_modeswitch/1bbb:f017 @@ -226,6 +257,7 @@ usr/share/usb_modeswitch/1c9e:9200 usr/share/usb_modeswitch/1c9e:9800 usr/share/usb_modeswitch/1c9e:98ff usr/share/usb_modeswitch/1c9e:9e00 +usr/share/usb_modeswitch/1c9e:9e08 usr/share/usb_modeswitch/1c9e:f000 usr/share/usb_modeswitch/1da5:f000 usr/share/usb_modeswitch/1dd6:1000 @@ -237,16 +269,28 @@ usr/share/usb_modeswitch/1ee8:0009 usr/share/usb_modeswitch/1ee8:0013 usr/share/usb_modeswitch/1ee8:0040 usr/share/usb_modeswitch/1ee8:004a +usr/share/usb_modeswitch/1ee8:0054 usr/share/usb_modeswitch/1ee8:0060 +usr/share/usb_modeswitch/1ee8:0063 +usr/share/usb_modeswitch/1ee8:0068 usr/share/usb_modeswitch/1f28:0021 usr/share/usb_modeswitch/1fac:0032 usr/share/usb_modeswitch/1fac:0130 +usr/share/usb_modeswitch/1fac:0150 +usr/share/usb_modeswitch/1fac:0151 +usr/share/usb_modeswitch/2001:a706 +usr/share/usb_modeswitch/2001:a707 +usr/share/usb_modeswitch/2001:a708 +usr/share/usb_modeswitch/2001:a805 usr/share/usb_modeswitch/2001:a80b usr/share/usb_modeswitch/201e:1023 usr/share/usb_modeswitch/201e:2009 +usr/share/usb_modeswitch/2020:0002 usr/share/usb_modeswitch/2020:f00e +usr/share/usb_modeswitch/2077:1000 usr/share/usb_modeswitch/2077:f000 usr/share/usb_modeswitch/21f5:1000 +usr/share/usb_modeswitch/22de:6801 usr/share/usb_modeswitch/22de:6803 usr/share/usb_modeswitch/22f4:0021 usr/share/usb_modeswitch/230d:0001 diff --git a/config/rootfiles/core/71/exclude b/config/rootfiles/core/71/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/71/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/71/filelists/GeoIP b/config/rootfiles/core/71/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/71/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/71/filelists/curl b/config/rootfiles/core/71/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/core/71/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files new file mode 100644 index 0000000..9dd0e30 --- /dev/null +++ b/config/rootfiles/core/71/filelists/files @@ -0,0 +1,24 @@ +etc/system-release +etc/issue +var/ipfire/general-functions.pl +var/ipfire/header.pl +var/ipfire/menu.d/10-system.menu +var/ipfire/menu.d/30-network.menu +etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/wlanclient +etc/rc.d/init.d/networking/functions.network +etc/rc.d/init.d/networking/wpa_supplicant.exe +etc/rc.d/init.d/networking/red +etc/rc.d/rc0.d/K82wlanclient +etc/rc.d/rc3.d/S19wlanclient +etc/rc.d/rc6.d/K82wlanclient +usr/local/bin/dnsmasqctrl +usr/local/bin/wirelessclient +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +var/ipfire/general-functions.pl +var/ipfire/langs +var/ipfire/backup/include diff --git a/config/rootfiles/core/71/filelists/hwdata b/config/rootfiles/core/71/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/core/71/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/71/filelists/jwhois b/config/rootfiles/core/71/filelists/jwhois new file mode 120000 index 0000000..b984a7f --- /dev/null +++ b/config/rootfiles/core/71/filelists/jwhois @@ -0,0 +1 @@ +../../../common/jwhois \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/oinkmaster b/config/rootfiles/core/71/filelists/oinkmaster new file mode 120000 index 0000000..75029e6 --- /dev/null +++ b/config/rootfiles/core/71/filelists/oinkmaster @@ -0,0 +1 @@ +../../../common/oinkmaster \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/snort b/config/rootfiles/core/71/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/71/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/squid b/config/rootfiles/core/71/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/71/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/usb_modeswitch b/config/rootfiles/core/71/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/71/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/usb_modeswitch_data b/config/rootfiles/core/71/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/71/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/71/meta b/config/rootfiles/core/71/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/71/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh new file mode 100644 index 0000000..8990b97 --- /dev/null +++ b/config/rootfiles/core/71/update.sh @@ -0,0 +1,79 @@ +#!/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 3 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) 2013 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=71 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Backup snort.conf +cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup + +# +#Stop services +/etc/init.d/snort stop + +# +#Remove old usb-modeswitch file +rm /usr/share/usb_modeswitch/0e8d:0002 + +# +#Extract files +extract_files + +# +#Create wireless config file... +touch /var/ipfire/ethernet/wireless +chown nobody:nobody /var/ipfire/ethernet/wireless + +# +# Import active rules to new snort.conf +grep "^include $RULE_PATH" /etc/snort/snort.conf.backup >> /etc/snort/snort.conf + +# +#Start services +/etc/init.d/snort start + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/packages/igmpproxy b/config/rootfiles/packages/igmpproxy index 439c21f..1b34521 100644 --- a/config/rootfiles/packages/igmpproxy +++ b/config/rootfiles/packages/igmpproxy @@ -2,3 +2,4 @@ etc/igmpproxy.conf usr/local/sbin/igmpproxy #usr/local/share/man/man5/igmpproxy.conf.5 #usr/local/share/man/man8/igmpproxy.8 +var/ipfire/backup/addons/includes/igmpproxy diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 626107b..10b5f33 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -110,6 +110,14 @@ usr/share/mc/skins/double-lines.ini usr/share/mc/skins/featured.ini usr/share/mc/skins/gotar.ini usr/share/mc/skins/mc46.ini +usr/share/mc/skins/modarcon16-defbg.ini +usr/share/mc/skins/modarcon16.ini +usr/share/mc/skins/modarcon16root-defbg.ini +usr/share/mc/skins/modarcon16root.ini +usr/share/mc/skins/modarin256-defbg.ini +usr/share/mc/skins/modarin256.ini +usr/share/mc/skins/modarin256root-defbg.ini +usr/share/mc/skins/modarin256root.ini usr/share/mc/skins/nicedark.ini usr/share/mc/skins/sand256.ini usr/share/mc/skins/xoria256.ini diff --git a/config/snort/snort.conf b/config/snort/snort.conf index ea9f81f..950ae3e 100644 --- a/config/snort/snort.conf +++ b/config/snort/snort.conf @@ -3,7 +3,7 @@ # # some parts of this file are changed/updated by the webif ################################################### -# VERSIONS : 2.9.1.1 +# VERSIONS : 2.9.5.0 include /etc/snort/vars @@ -42,7 +42,7 @@ ipvar FTP_SERVERS $HOME_NET ipvar SIP_SERVERS $HOME_NET # List of ports you run web servers on -portvar HTTP_PORTS [80,81,311,444,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,5250,7001,7777,7779,8000,8008,8028,8080,8088,8118,8123,8180,8181,8243,8280,8888,9090,9091,9443,9999,11371,50002,55555] +portvar HTTP_PORTS [80,81,82,83,84,85,86,87,88,89,311,383,444,591,593,631,901,1220,1414,1741,1830,2301,2381,2809,3037,3057,3128,3702,4343,4848,5250,6080,6988,7000,7001,7144,7145,7510,7777,7779,8000,8008,8014,8028,8080,8085,8088,8090,8118,8123,8180,8181,8222,8243,8280,8300,8500,8800,8888,8899,9000,9060,9080,9090,9091,9443,9999,11371,34443,34444,41080,50002,55555] # List of ports you want to look for SHELLCODE on. portvar SHELLCODE_PORTS !80 @@ -75,6 +75,14 @@ var RULE_PATH /etc/snort/rules var SO_RULE_PATH /etc/snort/so_rules var PREPROC_RULE_PATH /etc/snort/preproc_rules +# If you are using reputation preprocessor set these +# Currently there is a bug with relative paths, they are relative to where snort is +# not relative to snort.conf like the above variables +# This is completely inconsistent with how other vars work, BUG 89986 +# Set the absolute path appropriately +var WHITE_LIST_PATH /etc/snort/rules +var BLACK_LIST_PATH /etc/snort/rules + ################################################### # Step #2: Configure the decoder. For more information, see README.decode @@ -161,7 +169,7 @@ config pcre_match_limit_recursion: 1500 config detection: search-method ac-split search-optimize max-pattern-len 20 # Configure the event queue. For more information, see README.event_queue -config event_queue: max_queue 8 log 3 order_events content_length +config event_queue: max_queue 8 log 5 order_events content_length ################################################### ## Configure GTP if it is to be used. @@ -215,6 +223,7 @@ dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so # path to dynamic rules libraries # dynamicdetection directory /usr/local/lib/snort_dynamicrules + ################################################### # Step #5: Configure preprocessors # For more information, see the Snort Manual, Configuring Snort - Preprocessors @@ -245,12 +254,12 @@ preprocessor stream5_global: track_tcp yes, \ min_response_seconds 5 preprocessor stream5_tcp: policy windows, detect_anomalies, require_3whs 180, \ overlap_limit 10, small_segments 3 bytes 150, timeout 180, \ - ports client 21 22 23 25 42 53 79 109 110 111 113 119 135 136 137 139 143 \ - 161 445 513 514 587 593 691 1433 1521 2100 3306 6070 6665 6666 6667 6668 6669 \ + ports client 21 22 23 25 42 53 70 79 109 110 111 113 119 135 136 137 139 143 \ + 161 222 445 513 514 587 593 691 1433 1521 1741 2100 3306 6070 6665 6666 6667 6668 6669 \ 7000 8181 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, \ - ports both 80 81 311 443 465 563 591 593 636 901 989 992 993 994 995 1220 1414 1830 2301 2381 2809 3128 3702 5250 7907 7001 7802 7777 7779 \ + ports both 80 81 82 83 84 85 86 87 88 89 110 311 383 443 444 465 563 591 593 631 636 901 989 992 993 994 995 1220 1414 1830 2301 2381 2809 3037 3057 3128 3702 4343 4848 5250 6080 6988 7907 7000 7001 7144 7145 7510 7802 7777 7779 \ 7801 7900 7901 7902 7903 7904 7905 7906 7908 7909 7910 7911 7912 7913 7914 7915 7916 \ - 7917 7918 7919 7920 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371 50002 55555 + 7917 7918 7919 7920 8000 8008 8014 8028 8080 8085 8088 8090 8118 8123 8180 8222 8243 8280 8300 8500 8800 8888 8899 9000 9060 9080 9090 9091 9443 9999 11371 34443 34444 41080 50002 55555 preprocessor stream5_udp: timeout 180 # performance statistics. For more information, see the Snort Manual, Configuring Snort - Preprocessors - Performance Monitor @@ -269,7 +278,7 @@ preprocessor http_inspect_server: server default \ max_headers 100 \ max_spaces 200 \ small_chunk_length { 10 5 } \ - ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 5250 7001 7777 7779 8000 8008 8028 8080 8088 8118 8123 8180 8181 8243 8280 8888 9090 9091 9443 9999 11371 50002 55555 } \ + ports { 80 81 82 83 84 85 86 87 88 89 311 383 444 591 593 631 901 1220 1414 1741 1830 2301 2381 2809 3037 3057 3128 3702 4343 4848 5250 6080 6988 7000 7001 7144 7145 7510 7777 7779 8000 8008 8014 8028 8080 8085 8088 8090 8118 8123 8180 8181 8222 8243 8280 8300 8500 8800 8888 8899 9000 9060 9080 9090 9091 9443 9999 11371 34443 34444 41080 50002 55555 } \ non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \ enable_cookie \ extended_response_inspection \ @@ -286,7 +295,7 @@ preprocessor http_inspect_server: server default \ iis_delimiter no \ iis_unicode no \ multi_slash no \ - utf_8 no \ + utf_8 no \ u_encode yes \ webroot no @@ -384,7 +393,7 @@ preprocessor sfportscan: proto { all } memcap { 10000000 } sense_level { medium # preprocessor arpspoof_detect_host: 192.168.40.1 f0:0f:00:f0:0f:00 # SSH anomaly detection. For more information, see README.ssh -preprocessor ssh: server_ports { 22,222 } \ +preprocessor ssh: server_ports { 22 222 } \ autodetect \ max_client_bytes 19600 \ max_encrypted_packets 20 \ @@ -409,7 +418,7 @@ preprocessor ssl: ports { 443 444 465 563 636 989 992 993 994 995 7801 7802 7900 preprocessor sensitive_data: alert_threshold 25 # SIP Session Initiation Protocol preprocessor. For more information see README.sip -preprocessor sip: max_sessions 10000, \ +preprocessor sip: max_sessions 40000, \ ports { 5060 5061 5600 }, \ methods { invite \ cancel \ @@ -439,7 +448,7 @@ preprocessor sip: max_sessions 10000, \ max_to_len 256, \ max_via_len 1024, \ max_contact_len 512, \ - max_content_len 1024 + max_content_len 2048 # IMAP preprocessor. For more information see README.imap preprocessor imap: \ @@ -465,6 +474,15 @@ preprocessor dnp3: ports { 20000 } \ memcap 262144 \ check_crc +# Reputation preprocessor. For more information see README.reputation +#preprocessor reputation: \ +# memcap 500, \ +# priority whitelist, \ +# nested_ip inner, \ +# whitelist $WHITE_LIST_PATH/white_list.rules, \ +# blacklist $BLACK_LIST_PATH/black_list.rules + + ################################################### # Step #6: Configure output plugins # For more information, see Snort Manual, Configuring Snort - Output Modules diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf index 19bffa0..2b8f5dc 100644 --- a/config/squidclamav/squidclamav.conf +++ b/config/squidclamav/squidclamav.conf @@ -1,6 +1,5 @@ -#squid_ip 127.0.0.1 -#squid_port 3128 -proxy none +squid_ip 127.0.0.1 +squid_port 800 # logfile /var/log/squid/squidclamav.log redirect http://127.0.0.1:81/clwarn.cgi @@ -15,7 +14,7 @@ clamd_local /var/run/clamav/clamd maxsize 5000000 maxredir 30 timeout 60 -#trust_cache 1 +trust_cache 1 # # Do not scan standard HTTP images abort ^.*\.(ico|gif|png|jpg)$ @@ -37,4 +36,4 @@ abortcontent ^video\/x-flv$ abortcontent ^.*application\/x-mms-framed.*$ # # White list some sites -whitelist .*\.clamav.net \ No newline at end of file +whitelist .*\.clamav.net diff --git a/doc/language_issues.de b/doc/language_issues.de index de0c4d3..3b6e117 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -429,7 +429,6 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted -WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -478,6 +477,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: community rules +WARNING: untranslated string: emerging rules WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: qos add subclass @@ -485,4 +486,3 @@ 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: wlanap country diff --git a/doc/language_issues.en b/doc/language_issues.en index d7a7d72..8f530a3 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -460,7 +460,6 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted -WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 diff --git a/doc/language_issues.es b/doc/language_issues.es index 0dea29c..2258d1b 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -456,7 +456,6 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted -WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -550,6 +549,7 @@ WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn +WARNING: untranslated string: emerging rules WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -621,4 +621,34 @@ WARNING: untranslated string: system information WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: wlan client +WARNING: untranslated string: wlan client advanced settings +WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client bssid +WARNING: untranslated string: wlan client ccmp +WARNING: untranslated string: wlan client configuration +WARNING: untranslated string: wlan client disconnected +WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client edit entry +WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption none +WARNING: untranslated string: wlan client encryption wep +WARNING: untranslated string: wlan client encryption wpa +WARNING: untranslated string: wlan client encryption wpa2 +WARNING: untranslated string: wlan client group cipher +WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client new entry +WARNING: untranslated string: wlan client new network +WARNING: untranslated string: wlan client pairwise cipher +WARNING: untranslated string: wlan client pairwise key algorithm +WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client psk +WARNING: untranslated string: wlan client ssid +WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client wpa mode +WARNING: untranslated string: wlan client wpa mode all +WARNING: untranslated string: wlan client wpa mode ccmp ccmp +WARNING: untranslated string: wlan client wpa mode ccmp tkip +WARNING: untranslated string: wlan client wpa mode tkip tkip WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.fr b/doc/language_issues.fr index bec7223..58f4454 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -455,7 +455,6 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted -WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -550,6 +549,7 @@ WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dns address deleted txt +WARNING: untranslated string: emerging rules WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -609,6 +609,36 @@ WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: wlan client +WARNING: untranslated string: wlan client advanced settings +WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client bssid +WARNING: untranslated string: wlan client ccmp +WARNING: untranslated string: wlan client configuration +WARNING: untranslated string: wlan client disconnected +WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client edit entry +WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption none +WARNING: untranslated string: wlan client encryption wep +WARNING: untranslated string: wlan client encryption wpa +WARNING: untranslated string: wlan client encryption wpa2 +WARNING: untranslated string: wlan client group cipher +WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client new entry +WARNING: untranslated string: wlan client new network +WARNING: untranslated string: wlan client pairwise cipher +WARNING: untranslated string: wlan client pairwise key algorithm +WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client psk +WARNING: untranslated string: wlan client ssid +WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client wpa mode +WARNING: untranslated string: wlan client wpa mode all +WARNING: untranslated string: wlan client wpa mode ccmp ccmp +WARNING: untranslated string: wlan client wpa mode ccmp tkip +WARNING: untranslated string: wlan client wpa mode tkip tkip WARNING: untranslated string: wlanap access point WARNING: untranslated string: wlanap channel WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c6fa36f..d7a7ff7 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -460,7 +460,6 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted -WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -522,3 +521,33 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: uptime load average +WARNING: untranslated string: wlan client +WARNING: untranslated string: wlan client advanced settings +WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client bssid +WARNING: untranslated string: wlan client ccmp +WARNING: untranslated string: wlan client configuration +WARNING: untranslated string: wlan client disconnected +WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client edit entry +WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption none +WARNING: untranslated string: wlan client encryption wep +WARNING: untranslated string: wlan client encryption wpa +WARNING: untranslated string: wlan client encryption wpa2 +WARNING: untranslated string: wlan client group cipher +WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client new entry +WARNING: untranslated string: wlan client new network +WARNING: untranslated string: wlan client pairwise cipher +WARNING: untranslated string: wlan client pairwise key algorithm +WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client psk +WARNING: untranslated string: wlan client ssid +WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client wpa mode +WARNING: untranslated string: wlan client wpa mode all +WARNING: untranslated string: wlan client wpa mode ccmp ccmp +WARNING: untranslated string: wlan client wpa mode ccmp tkip +WARNING: untranslated string: wlan client wpa mode tkip tkip diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 0dea29c..2258d1b 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -456,7 +456,6 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted -WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -550,6 +549,7 @@ WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn +WARNING: untranslated string: emerging rules WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -621,4 +621,34 @@ WARNING: untranslated string: system information WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: wlan client +WARNING: untranslated string: wlan client advanced settings +WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client bssid +WARNING: untranslated string: wlan client ccmp +WARNING: untranslated string: wlan client configuration +WARNING: untranslated string: wlan client disconnected +WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client edit entry +WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption none +WARNING: untranslated string: wlan client encryption wep +WARNING: untranslated string: wlan client encryption wpa +WARNING: untranslated string: wlan client encryption wpa2 +WARNING: untranslated string: wlan client group cipher +WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client new entry +WARNING: untranslated string: wlan client new network +WARNING: untranslated string: wlan client pairwise cipher +WARNING: untranslated string: wlan client pairwise key algorithm +WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client psk +WARNING: untranslated string: wlan client ssid +WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client wpa mode +WARNING: untranslated string: wlan client wpa mode all +WARNING: untranslated string: wlan client wpa mode ccmp ccmp +WARNING: untranslated string: wlan client wpa mode ccmp tkip +WARNING: untranslated string: wlan client wpa mode tkip tkip WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.ru b/doc/language_issues.ru index b513b59..7b83295 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -449,7 +449,6 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted -WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -540,8 +539,10 @@ WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used +WARNING: untranslated string: community rules WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per +WARNING: untranslated string: emerging rules WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount WARNING: untranslated string: extrahd install or load driver @@ -585,4 +586,34 @@ WARNING: untranslated string: static routes WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: wlan client +WARNING: untranslated string: wlan client advanced settings +WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client bssid +WARNING: untranslated string: wlan client ccmp +WARNING: untranslated string: wlan client configuration +WARNING: untranslated string: wlan client disconnected +WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client edit entry +WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption none +WARNING: untranslated string: wlan client encryption wep +WARNING: untranslated string: wlan client encryption wpa +WARNING: untranslated string: wlan client encryption wpa2 +WARNING: untranslated string: wlan client group cipher +WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client new entry +WARNING: untranslated string: wlan client new network +WARNING: untranslated string: wlan client pairwise cipher +WARNING: untranslated string: wlan client pairwise key algorithm +WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client psk +WARNING: untranslated string: wlan client ssid +WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client wpa mode +WARNING: untranslated string: wlan client wpa mode all +WARNING: untranslated string: wlan client wpa mode ccmp ccmp +WARNING: untranslated string: wlan client wpa mode ccmp tkip +WARNING: untranslated string: wlan client wpa mode tkip tkip WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.tr b/doc/language_issues.tr index d7a7d72..1756840 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -460,7 +460,6 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted -WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -517,3 +516,33 @@ 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: wlan client +WARNING: untranslated string: wlan client advanced settings +WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client bssid +WARNING: untranslated string: wlan client ccmp +WARNING: untranslated string: wlan client configuration +WARNING: untranslated string: wlan client disconnected +WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client edit entry +WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption none +WARNING: untranslated string: wlan client encryption wep +WARNING: untranslated string: wlan client encryption wpa +WARNING: untranslated string: wlan client encryption wpa2 +WARNING: untranslated string: wlan client group cipher +WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client new entry +WARNING: untranslated string: wlan client new network +WARNING: untranslated string: wlan client pairwise cipher +WARNING: untranslated string: wlan client pairwise key algorithm +WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client psk +WARNING: untranslated string: wlan client ssid +WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client wpa mode +WARNING: untranslated string: wlan client wpa mode all +WARNING: untranslated string: wlan client wpa mode ccmp ccmp +WARNING: untranslated string: wlan client wpa mode ccmp tkip +WARNING: untranslated string: wlan client wpa mode tkip tkip diff --git a/doc/language_missings b/doc/language_missings index 85e59ab..b78b367 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -120,6 +120,7 @@ < vpn keyexchange < wlanap access point < wlanap channel +< wlanap country < wlanap debugging < wlanap del interface < wlanap encryption @@ -138,6 +139,36 @@ < wlanap wlan services < wlanap wlan settings < wlanap wlan status +< wlan client +< wlan client advanced settings +< wlan client and +< wlan client bssid +< wlan client ccmp +< wlan client configuration +< wlan client disconnected +< wlan client duplicate ssid +< wlan client edit entry +< wlan client encryption +< wlan client encryption none +< wlan client encryption wep +< wlan client encryption wpa +< wlan client encryption wpa2 +< wlan client group cipher +< wlan client group key algorithm +< wlan client invalid key length +< wlan client new entry +< wlan client new network +< wlan client pairwise cipher +< wlan client pairwise key algorithm +< wlan client pairwise key group key +< wlan client psk +< wlan client ssid +< wlan client tkip +< wlan client wpa mode +< wlan client wpa mode all +< wlan client wpa mode ccmp ccmp +< wlan client wpa mode ccmp tkip +< wlan client wpa mode tkip tkip ############################################################################ # Checking install/setup translations for language: es # ############################################################################ @@ -264,6 +295,37 @@ < uptime load average < visit us at < vpn keyexchange +< wlanap country +< wlan client +< wlan client advanced settings +< wlan client and +< wlan client bssid +< wlan client ccmp +< wlan client configuration +< wlan client disconnected +< wlan client duplicate ssid +< wlan client edit entry +< wlan client encryption +< wlan client encryption none +< wlan client encryption wep +< wlan client encryption wpa +< wlan client encryption wpa2 +< wlan client group cipher +< wlan client group key algorithm +< wlan client invalid key length +< wlan client new entry +< wlan client new network +< wlan client pairwise cipher +< wlan client pairwise key algorithm +< wlan client pairwise key group key +< wlan client psk +< wlan client ssid +< wlan client tkip +< wlan client wpa mode +< wlan client wpa mode all +< wlan client wpa mode ccmp ccmp +< wlan client wpa mode ccmp tkip +< wlan client wpa mode tkip tkip ############################################################################ # Checking install/setup translations for language: pl # ############################################################################ @@ -365,6 +427,37 @@ < uptime load average < visit us at < vpn keyexchange +< wlanap country +< wlan client +< wlan client advanced settings +< wlan client and +< wlan client bssid +< wlan client ccmp +< wlan client configuration +< wlan client disconnected +< wlan client duplicate ssid +< wlan client edit entry +< wlan client encryption +< wlan client encryption none +< wlan client encryption wep +< wlan client encryption wpa +< wlan client encryption wpa2 +< wlan client group cipher +< wlan client group key algorithm +< wlan client invalid key length +< wlan client new entry +< wlan client new network +< wlan client pairwise cipher +< wlan client pairwise key algorithm +< wlan client pairwise key group key +< wlan client psk +< wlan client ssid +< wlan client tkip +< wlan client wpa mode +< wlan client wpa mode all +< wlan client wpa mode ccmp ccmp +< wlan client wpa mode ccmp tkip +< wlan client wpa mode tkip tkip ############################################################################ # Checking install/setup translations for language: ru # ############################################################################ @@ -472,4 +565,35 @@ < visit us at < vpn keyexchange < week-graph +< wlanap country +< wlan client +< wlan client advanced settings +< wlan client and +< wlan client bssid +< wlan client ccmp +< wlan client configuration +< wlan client disconnected +< wlan client duplicate ssid +< wlan client edit entry +< wlan client encryption +< wlan client encryption none +< wlan client encryption wep +< wlan client encryption wpa +< wlan client encryption wpa2 +< wlan client group cipher +< wlan client group key algorithm +< wlan client invalid key length +< wlan client new entry +< wlan client new network +< wlan client pairwise cipher +< wlan client pairwise key algorithm +< wlan client pairwise key group key +< wlan client psk +< wlan client ssid +< wlan client tkip +< wlan client wpa mode +< wlan client wpa mode all +< wlan client wpa mode ccmp ccmp +< wlan client wpa mode ccmp tkip +< wlan client wpa mode tkip tkip < year-graph diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi new file mode 100644 index 0000000..15d430c --- /dev/null +++ b/html/cgi-bin/dnsforward.cgi @@ -0,0 +1,359 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 IPFire Development Team # +# # +# 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/>. # +# # +############################################################################### + +use strict; + +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; + +#workaround to suppress a warning when a variable is used only once +my @dummy = ( ${Header::colouryellow} ); +undef (@dummy); + +my %cgiparams=(); +my %checked=(); +my %selected=(); +my $errormessage = ''; +my $filename = "${General::swroot}/dnsforward/config"; +my $changed = 'no'; + +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + +&Header::showhttpheaders(); + +$cgiparams{'ENABLED'} = 'off'; +$cgiparams{'ACTION'} = ''; +$cgiparams{'ZONE'} = ''; +$cgiparams{'FORWARD_SERVER'} = ''; +$cgiparams{'REMARK'} =''; +&Header::getcgihash(\%cgiparams); +open(FILE, $filename) or die 'Unable to open config file.'; +my @current = <FILE>; +close(FILE); + +### +# Add / Edit entries. +# +if ($cgiparams{'ACTION'} eq $Lang::tr{'add'}) +{ + # Check if the entered domainname is valid. + unless (&General::validdomainname($cgiparams{'ZONE'})) { + $errormessage = $Lang::tr{'invalid domain name'}; + } + + # Check if the settings for the forward server are valid. + unless(&General::validip($cgiparams{'FORWARD_SERVER'})) { + $errormessage = $Lang::tr{'invalid ip'}; + } + + # Go further if there was no error. + if ( ! $errormessage) + { + # Check if a remark has been entered. + $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); + + # Check if we want to edit an existing or add a new entry. + if($cgiparams{'EDITING'} eq 'no') { + open(FILE,">>$filename") or die 'Unable to open config file.'; + flock FILE, 2; + print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n"; + } else { + open(FILE, ">$filename") or die 'Unable to open config file.'; + flock FILE, 2; + my $id = 0; + foreach my $line (@current) + { + $id++; + if ($cgiparams{'EDITING'} eq $id) { + print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n"; + } else { print FILE "$line"; } + } + } + close(FILE); + undef %cgiparams; + $changed = 'yes'; + } else { + # stay on edit mode if an error occur + if ($cgiparams{'EDITING'} ne 'no') + { + $cgiparams{'ACTION'} = $Lang::tr{'edit'}; + $cgiparams{'ID'} = $cgiparams{'EDITING'}; + } + } + # Restart dnsmasq. + system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); +} + +### +# Remove existing entries. +# +if ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) +{ + my $id = 0; + open(FILE, ">$filename") or die 'Unable to open config file.'; + flock FILE, 2; + foreach my $line (@current) + { + $id++; + unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; } + } + close(FILE); + # Restart dnsmasq. + system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); +} + +### +# Toggle Enable/Disable for entries. +# +if ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) +{ + open(FILE, ">$filename") or die 'Unable to open config file.'; + flock FILE, 2; + my $id = 0; + foreach my $line (@current) + { + $id++; + unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; } + else + { + chomp($line); + my @temp = split(/\,/,$line); + print FILE "$cgiparams{'ENABLE'},$temp[1],$temp[2],$temp[3]\n"; + } + } + close(FILE); + # Restart dnsmasq. + system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); +} + +### +# Read items for edit mode. +# +if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) +{ + my $id = 0; + foreach my $line (@current) + { + $id++; + if ($cgiparams{'ID'} eq $id) + { + chomp($line); + my @temp = split(/\,/,$line); + $cgiparams{'ENABLED'} = $temp[0]; + $cgiparams{'ZONE'} = $temp[1]; + $cgiparams{'FORWARD_SERVER'} = $temp[2]; + $cgiparams{'REMARK'} = $temp[3]; + } + } +} + +$checked{'ENABLED'}{'off'} = ''; +$checked{'ENABLED'}{'on'} = ''; +$checked{'ENABLED'}{$cgiparams{'ENABLED'}} = "checked='checked'"; + +&Header::openpage($Lang::tr{'dnsforward configuration'}, 1, ''); + +&Header::openbigbox('100%', 'left', '', $errormessage); + +### +# Error messages layout. +# +if ($errormessage) { + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print "<class name='base'>$errormessage\n"; + print " </class>\n"; + &Header::closebox(); +} + +print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n"; + +my $buttontext = $Lang::tr{'add'}; +if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { + &Header::openbox('100%', 'left', $Lang::tr{'dnsforward edit an entry'}); + $buttontext = $Lang::tr{'update'}; +} else { + &Header::openbox('100%', 'left', $Lang::tr{'dnsforward add a new entry'}); +} + +### +# Content of the main page. +# +print <<END +<table width='100%'> + <tr> + <td width='20%' class='base'><font>$Lang::tr{'dnsforward zone'}:</font></td> + <td><input type='text' name='ZONE' value='$cgiparams{'ZONE'}' size='24' /></td> + <td width='30%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> + </tr> + + <tr> + <td width='20%' class='base'><font>$Lang::tr{'dnsforward forward_server'}:</font></td> + <td><input type='text' name='FORWARD_SERVER' value='$cgiparams{'FORWARD_SERVER'}' size='24' /></td> + </tr> +</table> + +<table width='100%'> + <tr> + <td width ='20%' class='base'><font class='boldbase'>$Lang::tr{'remark'}:</font> <img src='/blob.gif' alt='*' /></td> + <td><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' maxlength='50' /></td> + </tr> +</table> + +<hr> + +<table width='100%'> + <tr> + <td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' /> <font class='base'>$Lang::tr{'this field may be blank'}</font></td> + <td width='40%' align='center'> + <input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /> + <input type='submit' name='SUBMIT' value='$buttontext' /> + </td> + </tr> +</table> +END +; +if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { + print "<input type='hidden' name='EDITING' value='$cgiparams{'ID'}' />\n"; +} else { + print "<input type='hidden' name='EDITING' value='no' />\n"; +} + +&Header::closebox(); +print "</form>\n"; + +### +# Existing rules. +# +&Header::openbox('100%', 'left', $Lang::tr{'dnsforward entries'}); +print <<END +<table width='100%'> + <tr> + <td width='35%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward zone'}</b></td> + <td width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_server'}</b></td> + <td width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td> + <td width='5%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></td> + </tr> +END +; + +# If something has happened re-read config +if($cgiparams{'ACTION'} ne '' or $changed ne 'no') +{ + open(FILE, $filename) or die 'Unable to open config file.'; + @current = <FILE>; + close(FILE); +} + +### +# Re-read entries and highlight selected item for editing. +# +my $id = 0; +foreach my $line (@current) +{ + $id++; + chomp($line); + my @temp = split(/\,/,$line); + my $toggle = ''; + my $gif = ''; + my $gdesc = ''; + my $toggle = ''; + + if($cgiparams{'ACTION'} eq $Lang::tr{'edit'} && $cgiparams{'ID'} eq $id) { + print "<tr bgcolor='${Header::colouryellow}'>\n"; } + elsif ($id % 2) { + print "<tr bgcolor='$color{'color22'}'>\n"; } + else { + print "<tr bgcolor='$color{'color20'}'>\n"; } + + if ($temp[0] eq 'on') { $gif='on.gif'; $toggle='off'; $gdesc=$Lang::tr{'click to disable'};} + else { $gif='off.gif'; $toggle='on'; $gdesc=$Lang::tr{'click to enable'}; } + +### +# Display edit page. +# +print <<END + <td align='center'>$temp[1]</td> + <td align='center'>$temp[2]</td> + <td align='center'>$temp[3]</td> + <td align='center'> + <form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' title='$gdesc' alt='$gdesc' /> + <input type='hidden' name='ID' value='$id' /> + <input type='hidden' name='ENABLE' value='$toggle' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' /> + </form> + </td> + <td align='center'> + <form method='post' name='frmb$id' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' title='$Lang::tr{'edit'}' alt='$Lang::tr{'edit'}' /> + <input type='hidden' name='ID' value='$id' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' /> + </form> + </td> + <td align='center'> + <form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' /> + <input type='hidden' name='ID' value='$id' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' /> + </form> + </td> +</tr> +END + ; +} +print "</table>\n"; + +### +# Print the legend at the bottom if there are any configured entries. +# +# Check if the file size is zero - no existing entries. +if ( ! -z "$filename") { +print <<END +<table> + <tr> + <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> + <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> + <td class='base'>$Lang::tr{'click to disable'}</td> + <td>    <img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td> + <td class='base'>$Lang::tr{'click to enable'}</td> + <td>    <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td> + <td class='base'>$Lang::tr{'edit'}</td> + <td>    <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> + <td class='base'>$Lang::tr{'remove'}</td> + </tr> +</table> +END +; +} + +&Header::closebox(); + +&Header::closebigbox(); + +&Header::closepage(); diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 5c0bcff..62bb03a 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,9 +263,11 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control ################################# if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2940.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2950.tar.gz/$snortsettin…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2940.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2950.tar.gz/$snortsettin…'OINKCODE'}"; +} elsif ($snortsettings{'RULES'} eq 'community') { + $url=" http://s3.amazonaws.com/snort-org/www/rules/community/community-rules.tar.gz"; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } @@ -274,8 +276,9 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} e { $errormessage = $Lang::tr{'invalid input for oink code'} unless ( ($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/) || - ($snortsettings{'RULESTYPE'} eq 'nothing' ) || - ($snortsettings{'RULESTYPE'} eq 'community' )); + ($snortsettings{'RULES'} eq 'nothing' ) || + ($snortsettings{'RULES'} eq 'emerging' ) || + ($snortsettings{'RULES'} eq 'community' )); &General::writehash("${General::swroot}/snort/settings", \%snortsettings); if ($snortsettings{'ENABLE_SNORT'} eq 'on') @@ -402,6 +405,7 @@ $checked{'ENABLE_GUARDIAN'}{'on'} = ''; $checked{'ENABLE_GUARDIAN'}{$snortsettings{'ENABLE_GUARDIAN'}} = "checked='checked'"; $selected{'RULES'}{'nothing'} = ''; $selected{'RULES'}{'community'} = ''; +$selected{'RULES'}{'emerging'} = ''; $selected{'RULES'}{'registered'} = ''; $selected{'RULES'}{'subscripted'} = ''; $selected{'RULES'}{$snortsettings{'RULES'}} = "selected='selected'"; @@ -515,6 +519,7 @@ print <<END <tr> <td><select name='RULES'> <option value='nothing' $selected{'RULES'}{'nothing'} >$Lang::tr{'no'}</option> + <option value='emerging' $selected{'RULES'}{'emerging'} >$Lang::tr{'emerging rules'}</option> <option value='community' $selected{'RULES'}{'community'} >$Lang::tr{'community rules'}</option> <option value='registered' $selected{'RULES'}{'registered'} >$Lang::tr{'registered user rules'}</option> <option value='subscripted' $selected{'RULES'}{'subscripted'} >$Lang::tr{'subscripted user rules'}</option> diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index f6b29e1..ca6892b 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -818,11 +818,11 @@ print <<END </tr> <tr> <tr> - <td width='25%'>MTU</td> + <td width='25%'>MTU <img src='/blob.gif' alt='*' /></td> <td width='25%'><input type='text' name='MTU' value='$pppsettings{'MTU'}' /></td> </tr> <tr> - <td width='25%'>MRU</td> + <td width='25%'>MRU <img src='/blob.gif' alt='*' /></td> <td width='25%'><input type='text' name='MRU' value='$pppsettings{'MRU'}' /></td> </tr> END @@ -943,8 +943,8 @@ sub initprofile $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255'; $pppsettings{'PPTP_ROUTE'} = ''; $pppsettings{'PROTOCOL'} = 'RFC2364'; - $pppsettings{'MTU'} = '1492'; - $pppsettings{'MRU'} = '1492'; + $pppsettings{'MTU'} = ''; + $pppsettings{'MRU'} = ''; $pppsettings{'DIALMODE'} = 'T'; $pppsettings{'MAXRETRIES'} = 5; $pppsettings{'HOLDOFF'} = 30; diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index fb313ac..76d52b4 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -381,7 +381,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'} } } if (!($proxysettings{'FILEDESCRIPTORS'} =~ /^\d+/) || - ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 16384)) + ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 65536)) { $errormessage = $Lang::tr{'proxy errmsg filedescriptors'}; goto ERROR; @@ -699,6 +699,16 @@ if (!$errormessage) &read_acls; } +# ------------------------------------------------------------------ + +# Hook to regenerate the configuration files, if cgi got called from command line. +if ($ENV{"REMOTE_ADDR"} eq "") { + writeconfig(); + exit(0); +} + +# ------------------------------------------------------------------- + $checked{'ENABLE'}{'off'} = ''; $checked{'ENABLE'}{'on'} = ''; $checked{'ENABLE'}{$proxysettings{'ENABLE'}} = "checked='checked'"; @@ -3061,12 +3071,6 @@ icp_port 0 END ; - - # Include file with user defined settings. - if (-e "/etc/squid/squid.conf.pre.local") { - print FILE "include /etc/squid/squid.conf.pre.local\n\n"; - } - print FILE "http_port $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}"; if ($proxysettings{'TRANSPARENT'} eq 'on') { print FILE " transparent" } if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " no-connection-auth" } @@ -3448,6 +3452,19 @@ END close (ACL); } if ((!-z $extgrp) && ($proxysettings{'AUTH_METHOD'} eq 'ncsa') && ($proxysettings{'NCSA_BYPASS_REDIR'} eq 'on')) { print FILE "\nredirector_access deny for_extended_users\n"; } + + # Check if squidclamav is enabled. + if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') { + print FILE "\n#Settings for squidclamav:\n"; + print FILE "http_port 127.0.0.1:$proxysettings{'PROXY_PORT'} transparent\n"; + print FILE "acl to_localhost dst 127.0.0.0/8\n"; + print FILE "acl purge method PURGE\n"; + print FILE "http_access deny to_localhost\n"; + print FILE "http_access allow localhost\n"; + print FILE "http_access allow purge localhost\n"; + print FILE "http_access deny purge\n"; + print FILE "url_rewrite_access deny localhost\n"; + } print FILE <<END #Access to squid: @@ -3963,6 +3980,18 @@ END print FILE "include /etc/squid/squid.conf.local\n"; } close FILE; + + # Proxy settings for squidclamav - if installed. + # + # Check if squidclamav is enabled. + if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') { + + my $configfile='/etc/squidclamav.conf'; + + my $data = &General::read_file_utf8($configfile); + $data =~ s/squid_port [0-9]+/squid_port $proxysettings{'PROXY_PORT'}/g; + &General::write_file_utf8($configfile, $data); + } } # ------------------------------------------------------------------- diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi new file mode 100755 index 0000000..5ff0e2c --- /dev/null +++ b/html/cgi-bin/wirelessclient.cgi @@ -0,0 +1,703 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2012 IPFire Team <info(a)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/>. # +# # +############################################################################### + +# DEVICE,ENABLED,MODE,WPA_MODE,SSID,PSK,PRIO +# wlan0,on,WPA2,,Use This One Mum,ThisIsTheKey,2 + +use strict; + +# enable only the following on debugging purpose +use warnings; +use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; + +#workaround to suppress a warning when a variable is used only once +my @dummy = ( ${Header::colouryellow} ); +undef (@dummy); + +# Files used +my $setting = "${General::swroot}/main/settings"; +our $datafile = "${General::swroot}/ethernet/wireless"; + +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + +our %settings = (); +our %netsettings = (); + +$settings{'ID'} = ''; +$settings{'INTERFACE'} = ''; +$settings{'ENABLED'} = ''; +$settings{'ENCRYPTION'} = ''; +$settings{'WPA_MODE'} = ''; +$settings{'SSID'} = ''; +$settings{'PSK'} = ''; +$settings{'PRIO'} = ''; + +$settings{'ACTION'} = ''; # add/edit/remove +$settings{'ID'} = ''; # point record for ACTION + +my $errormessage = ''; +my $warnmessage = ''; + +&Header::showhttpheaders(); + +#Get GUI values +&Header::getcgihash(\%settings); + +# Load multiline data +our @configs = (); +if (open(FILE, "$datafile")) { + @configs = <FILE>; + close (FILE); +} + +&General::readhash("${General::swroot}/main/settings", \%settings); +&General::readhash("${General::swroot}/ethernet/settings", \%netsettings); + +# Toggle enable/disable field. +if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { + my @update; + + foreach my $line (@configs) { + chomp($line); + my @config = split(/\,/, $line); + + # Update the entry with the matching ID. + if ($config[0] eq $settings{'ID'}) { + # Toggle enabled/disabled status. + + if ($config[2] eq 'on') { + $config[2] = 'off'; + } else { + $config[2] = 'on'; + } + + $line = join(',', @config); + } + + push(@update, $line."\n"); + } + + # Save updated configuration settings. + open(FILE, ">$datafile") or die 'wlan client datafile error'; + print FILE @update; + close(FILE); + + @configs = @update; + + # Update configuration files. + &BuildConfiguration(); + + # Reset ACTION. + $settings{'ACTION'} = ''; +} + +if ($settings{'ACTION'} eq $Lang::tr{'add'}) { + # Validate input data. + $errormessage = ValidateInput("add"); + + unless ($errormessage) { + # Search for the next free id. + my $next_id = NextID(); + + my @config = ($next_id); + push(@config, $settings{'INTERFACE'}); + push(@config, $settings{'ENABLED'}); + push(@config, $settings{'ENCRYPTION'}); + push(@config, $settings{'WPA_MODE'}); + push(@config, $settings{'SSID'}); + push(@config, $settings{'PSK'}); + push(@config, $settings{'PRIO'}); + + # Add the new configuration and write all the stuff to the configuration file. + my $line = join(',', @config) . "\n"; + push(@configs, $line); + + # Save updated configuration settings. + open(FILE, ">$datafile") or die 'wlan client datafile error'; + print FILE @configs; + close(FILE); + + # Update configuration files. + &BuildConfiguration(); + + # Reset ACTION. + $settings{'ACTION'} = ''; + } +} + +if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { + foreach my $line (@configs) { + chomp($line); + my @config = split(/\,/, $line); + + if ($config[0] eq $settings{'ID'}) { + $settings{'ID'} = $config[0]; + $settings{'INTERFACE'} = $config[1]; + $settings{'ENABLED'} = $config[2]; + $settings{'ENCRYPTION'} = $config[3]; + $settings{'WPA_MODE'} = $config[4]; + $settings{'SSID'} = $config[5]; + $settings{'PSK'} = $config[6]; + $settings{'PRIO'} = $config[7]; + } + } +} + +if ($settings{'ACTION'} eq $Lang::tr{'update'}) { + $errormessage = ValidateInput("update"); + + unless ($errormessage) { + my @update; + foreach my $line (@configs) { + chomp($line); + my @config = split(/\,/, $line); + + # Update the entry with the matching ID. + if ($config[0] eq $settings{'ID'}) { + # Update all configuration settings. + # ID and INTERFACE cannot be changed. + $config[2] = $settings{'ENABLED'}; + $config[3] = $settings{'ENCRYPTION'}; + $config[4] = $settings{'WPA_MODE'}; + $config[5] = $settings{'SSID'}; + $config[6] = $settings{'PSK'}; + $config[7] = $settings{'PRIO'}; + + $line = join(',', @config); + } + + push(@update, $line."\n"); + } + + # Save updated configuration settings. + open(FILE, ">$datafile") or die 'wlan client datafile error'; + print FILE @update; + close(FILE); + + @configs = @update; + + # Update configuration files. + &BuildConfiguration(); + + # Reset ACTION. + $settings{'ACTION'} = ''; + } +} + +if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { + my @update; + + foreach my $line (@configs) { + chomp($line); + my @config = split(/\,/, $line); + + # Skip the to be removed entry. + if ($config[0] eq $settings{'ID'}) { + next; + } + + push(@update, $line."\n"); + } + + # Save updated configuration settings. + open(FILE, ">$datafile") or die 'wlan client datafile error'; + print FILE @update; + close(FILE); + + @configs = @update; + + # Update configuration files. + &BuildConfiguration(); + + # Reset ACTION. + $settings{'ACTION'} = ''; +} + +if ($settings{'ACTION'} eq '') { # First launch from GUI + &showMainBox(); +} else { + # Action has been set, so show the edit box. + &showEditBox(); +} + +sub showMainBox() { + &Header::openpage($Lang::tr{'wlan client configuration'}, 1, ''); + &Header::openbigbox('100%', 'left', '', $errormessage); + + &Header::openbox('100%', 'left', $Lang::tr{'wlan client configuration'}); + + print <<END; + <form method='POST' action='$ENV{'SCRIPT_NAME'}' style='text-align: center;'> + <input type='submit' name='ACTION' value='$Lang::tr{'wlan client new network'}' /> + </form> + + <br><hr><br> + + <table width="100%"> + <tr> + <th align='center'>$Lang::tr{'wlan client ssid'}</th> + <th align='center'>$Lang::tr{'wlan client encryption'}</th> + <th align='center'>$Lang::tr{'priority'}</th> + </tr> +END + + # + # Print each line of @configs list + # + + my $key = 0; + foreach my $line (@configs) { + # Skip commented lines. + my $firstchar = substr($line, 0, 1); + next if ($firstchar eq "#"); + + chomp($line); + my @config = split(/\,/,$line); + + #Choose icon for checkbox + my $gif = ''; + my $gdesc = ''; + if ($config[2] eq 'on' ) { + $gif = 'on.gif'; + $gdesc = $Lang::tr{'click to disable'}; + } else { + $gif = 'off.gif'; + $gdesc = $Lang::tr{'click to enable'}; + } + + # Colorize each line + if ($key % 2) { + print "<tr bgcolor='$color{'color22'}'>"; + } else { + print "<tr bgcolor='$color{'color20'}'>"; + } + + my $encryption_mode = $Lang::tr{'unknown'}; + if ($config[3] eq "NONE") { + $encryption_mode = $Lang::tr{'wlan client encryption none'}; + } elsif ($config[3] eq "WEP") { + $encryption_mode = $Lang::tr{'wlan client encryption wep'}; + } elsif ($config[3] eq "WPA") { + $encryption_mode = $Lang::tr{'wlan client encryption wpa'}; + } elsif ($config[3] eq "WPA2") { + $encryption_mode = $Lang::tr{'wlan client encryption wpa2'}; + } + + if (($config[3] eq "WPA") || ($config[3] eq "WPA2")) { + my $wpa_pairwise = "$Lang::tr{'wlan client ccmp'} $Lang::tr{'wlan client and'} $Lang::tr{'wlan client tkip'}"; + my $wpa_group = "$Lang::tr{'wlan client ccmp'} $Lang::tr{'wlan client and'} $Lang::tr{'wlan client tkip'}"; + + if ($config[4] eq "CCMP-CCMP") { + $wpa_pairwise = $Lang::tr{'wlan client ccmp'}; + $wpa_group = $Lang::tr{'wlan client ccmp'}; + } elsif ($config[4] eq "CCMP-TKIP") { + $wpa_pairwise = $Lang::tr{'wlan client ccmp'}; + $wpa_group = $Lang::tr{'wlan client tkip'}; + } elsif ($config[4] eq "TKIP-TKIP") { + $wpa_pairwise = $Lang::tr{'wlan client tkip'}; + $wpa_group = $Lang::tr{'wlan client tkip'}; + } + + $encryption_mode .= "<hr>"; + $encryption_mode .= "<strong>$Lang::tr{'wlan client pairwise key algorithm'}</strong>: "; + $encryption_mode .= $wpa_pairwise; + $encryption_mode .= "<br>"; + $encryption_mode .= "<strong>$Lang::tr{'wlan client group key algorithm'}</strong>: "; + $encryption_mode .= $wpa_group; + } + + print <<END; + <td align='center'>$config[5]</td> + <td align='center'>$encryption_mode</td> + <td align='center'>$config[7]</td> + <td align='center' width='5%'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' /> + <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$gdesc' title='$gdesc' /> + <input type='hidden' name='ID' value='$config[0]' /> + </form> + </td> + <td align='center' width='5%'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' /> + <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /> + <input type='hidden' name='ID' value='$config[0]' /> + </form> + </td> + <td align='center' width='5%'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' /> + <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' /> + <input type='hidden' name='ID' value='$config[0]' /> + </form> + </td> + </tr> +END + $key++; + } + print "</table>"; + + # If table contains entries, print 'Key to action icons' + if ($key) { + print <<END; + <table> + <tr> + <td class='boldbase'> <b>$Lang::tr{'legend'}: </b></td> + <td><img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> + <td class='base'>$Lang::tr{'click to disable'}</td> + <td>  </td> + <td><img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td> + <td class='base'>$Lang::tr{'click to enable'}</td> + <td>  </td> + <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td> + <td class='base'>$Lang::tr{'edit'}</td> + <td>  </td> + <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> + <td class='base'>$Lang::tr{'remove'}</td> + </tr> + </table> +END + } + + &Header::closebox(); + + # Show status box. + &ShowStatus(); + + &Header::closebigbox(); + &Header::closepage(); +} + +sub showEditBox() { + &Header::openpage($Lang::tr{'wlan client configuration'}, 1, ''); + &Header::openbigbox('100%', 'left', '', $errormessage); + + if ($errormessage) { + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print "<font class='base'>$errormessage </font>"; + &Header::closebox(); + } + + my $buttontext = $Lang::tr{'add'}; + if ($settings{'ID'} ne '') { + $buttontext = $Lang::tr{'update'}; + &Header::openbox('100%', 'left', $Lang::tr{'wlan client edit entry'}); + } else { + &Header::openbox('100%', 'left', $Lang::tr{'wlan client new entry'}); + $settings{'ENABLED'} = 'on'; + } + my $action = $buttontext; + + my %checked = (); + $checked{'ENABLED'} = ($settings{'ENABLED'} ne 'on' ) ? '' : "checked='checked'"; + + my %selected = (); + $selected{'ENCRYPTION'} = (); + $selected{'ENCRYPTION'}{'NONE'} = ''; + $selected{'ENCRYPTION'}{'WPA2'} = ''; + $selected{'ENCRYPTION'}{'WPA'} = ''; + $selected{'ENCRYPTION'}{'WEP'} = ''; + $selected{'ENCRYPTION'}{$settings{'ENCRYPTION'}} = "selected='selected'"; + + $selected{'WPA_MODE'} = (); + $selected{'WPA_MODE'}{''} = ''; + $selected{'WPA_MODE'}{'CCMP-CCMP'} = ''; + $selected{'WPA_MODE'}{'CCMP-TKIP'} = ''; + $selected{'WPA_MODE'}{'TKIP-TKIP'} = ''; + $selected{'WPA_MODE'}{$settings{'WPA_MODE'}} = "selected='selected'"; + + $selected{'PRIO'} = (); + $selected{'PRIO'}{'0'} = ''; + $selected{'PRIO'}{'1'} = ''; + $selected{'PRIO'}{'2'} = ''; + $selected{'PRIO'}{'3'} = ''; + $selected{'PRIO'}{'4'} = ''; + $selected{'PRIO'}{$settings{'PRIO'}} = "selected='selected'"; + + print <<END; + <form method='POST' action='$ENV{'SCRIPT_NAME'}'> + <input type='hidden' name='ID' value='$settings{'ID'}'> + + <table width='100%'> + <tr> + <td class='base' width='20%'>$Lang::tr{'wlan client ssid'}:</td> + <td width='40%'><input type='text' name='SSID' value='$settings{'SSID'}' size='25'/></td> + <td class='base' width='10%'>$Lang::tr{'enabled'}</td> + <td width='30%'><input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td> + </tr> + <tr> + <td class='base' width='20%'>$Lang::tr{'wlan client encryption'}:</td> + <td width='40%'> + <select name='ENCRYPTION'> + <option value="NONE" $selected{'ENCRYPTION'}{'NONE'}>$Lang::tr{'wlan client encryption none'}</option> + <option value="WPA2" $selected{'ENCRYPTION'}{'WPA2'}>$Lang::tr{'wlan client encryption wpa2'}</option> + <option value="WPA" $selected{'ENCRYPTION'}{'WPA'}>$Lang::tr{'wlan client encryption wpa'}</option> + <option value="WEP" $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option> + </select> + </td> + <td colspan="2" width='40%'></td> + </tr> + <tr> + <td class='base' width='20%'>$Lang::tr{'wlan client psk'}: </td> + <td width='40%'><input type='password' name='PSK' value='$settings{'PSK'}' size='25'/></td> + <td colspan="2" width='40%'></td> + </tr> + </table> + + <br> + <hr> + + <strong> + $Lang::tr{'wlan client advanced settings'}: + </strong> + + <table width='100%'> + <tr> + <td class='base' width='20%'> + $Lang::tr{'wlan client wpa mode'}: + </td> + <td width='40%'> + <select name='WPA_MODE'> + <option value="" $selected{'WPA_MODE'}{''}>$Lang::tr{'wlan client wpa mode all'}</option> + <option value="CCMP-CCMP" $selected{'WPA_MODE'}{'CCMP-CCMP'}>$Lang::tr{'wlan client wpa mode ccmp ccmp'}</option> + <option value="CCMP-TKIP" $selected{'WPA_MODE'}{'CCMP-TKIP'}>$Lang::tr{'wlan client wpa mode ccmp tkip'}</option> + <option value="TKIP-TKIP" $selected{'WPA_MODE'}{'TKIP-TKIP'}>$Lang::tr{'wlan client wpa mode tkip tkip'}</option> + </select> + </td> + <td colspan="2" width='40%'> + <em>($Lang::tr{'wlan client pairwise key group key'})</em> + </td> + </tr> + <tr> + <td class='base' width='20%'> + $Lang::tr{'priority'}: + </td> + <td width='40%'> + <select name='PRIO'> + <option value="0" $selected{'PRIO'}{'0'}>0</option> + <option value="1" $selected{'PRIO'}{'1'}>1</option> + <option value="2" $selected{'PRIO'}{'2'}>2</option> + <option value="3" $selected{'PRIO'}{'3'}>3</option> + <option value="4" $selected{'PRIO'}{'4'}>4</option> + </select> + </td> + <td colspan="2" width='40%'></td> + </tr> + </table> + + <br> + <hr> + + <table width='100%'> + <tr> + <td width='50%' align='center'> + <input type='hidden' name='ACTION' value='$action' /> + <input type='submit' name='SUBMIT' value='$buttontext' /> + </td> + </tr> + </table> + </form> +END + &Header::closebox(); + + &Header::closebigbox(); + &Header::closepage(); +} + +sub ShowStatus() { + my $device = $netsettings{'RED_DEV'}; + + # Exit if no device is configured. + return if ($device eq ""); + + # Exit if wpa_supplicant is not running on this interface. + #return if (! -e "/var/run/wpa_supplicant/$device"); + + open(FILE, "/usr/local/bin/wirelessclient status |"); + + my %status = (); + while (<FILE>) { + chomp($_); + + my ($key, $value) = split("=", $_); + $status{$key} = $value; + } + + close(FILE); + + # End here, if no there is no input. + return if (!keys %status); + + &Header::openbox('100%', 'left', $Lang::tr{'status'}); + + if ($status{'ssid'} eq "") { + print "<p>$Lang::tr{'wlan client disconnected'}</p>"; + + } else { + print <<END; + <table width='100%'> + <tr> + <td width='20%'> + $Lang::tr{'wlan client ssid'} + </td> + <td width='80%'> + $status{'ssid'} + </td> + </tr> + <tr> + <td width='20%'> + $Lang::tr{'wlan client bssid'} + </td> + <td width='80%'> + $status{'bssid'} + </td> + </tr> +END + + if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) { + print <<END; + <tr> + <td colspan='2'> + <strong>$Lang::tr{'wlan client encryption wpa'}</strong> + </td> + </tr> + <tr> + <td width='20%'> + $Lang::tr{'wlan client pairwise cipher'} + </td> + <td width='80%'> + $status{'pairwise_cipher'} + </td> + </tr> + <tr> + <td width='20%'> + $Lang::tr{'wlan client group cipher'} + </td> + <td width='80%'> + $status{'group_cipher'} + </td> + </tr> +END + } + + print "</table>"; + } + + &Header::closebox(); +} + +sub BuildConfiguration() { + system("/usr/local/bin/wirelessclient restart"); +} + +sub NextID() { + my $highest_id = 0; + foreach my $line (@configs) { + # Skip commented lines. + my $firstchar = substr($line, 0, 1); + next if ($firstchar eq "#"); + + my @config = split(/\,/, $line); + if ($config[0] > $highest_id) { + $highest_id = $config[0]; + } + } + + return $highest_id + 1; +} + +sub DuplicateSSID($) { + my $ssid = shift; + + foreach my $line (@configs) { + # Skip commented lines. + my $firstchar = substr($line, 0, 1); + next if ($firstchar eq "#"); + + my @config = split(/\,/, $line); + if ($config[5] eq $ssid) { + return 1; + } + } + + return 0; +} + +sub ValidKeyLength($$) { + my $algo = shift; + my $key = shift; + + my $key_length = length($key); + + if ($algo eq "WEP") { + # Key must be 13 or 26 characters. + if (($key_length == 13) || ($key_length == 26)) { + return 0; + } + + return 1; + + } elsif (($algo eq "WPA2") || ($algo eq "WPA")) { + # Key must be between 8 and 63 chars. + if (($key_length >= 8) && ($key_length <= 63)) { + return 0; + } + + return 1; + } + + # Say okay for all other algorithms. + return 0; +} + +sub ValidateInput($) { + my $mode = shift; + + # Check for duplicate SSIDs. + if (($mode eq "add") && (DuplicateSSID($settings{'SSID'}))) { + return "$Lang::tr{'wlan client duplicate ssid'}: $settings{'SSID'}"; + + # Check for invalid key length. + } elsif (ValidKeyLength($settings{'ENCRYPTION'}, $settings{'PSK'})) { + return "$Lang::tr{'wlan client invalid key length'}"; + + } + + # Reset WPA mode, if WPA(2) is not selected. + if (($settings{'ENCRYPTION'} ne "WPA") && ($settings{'ENCRYPTION'} ne "WPA2")) { + $settings{'WPA_MODE'} = ''; + } + + if ($settings{'ENABLED'} ne "") { + $settings{'ENABLED'} = 'on'; + } else { + $settings{'ENABLED'} = 'off'; + } + + return; +} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6275d8a..d1ad7b0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -526,7 +526,6 @@ 'clock last synchronized at' => 'Die Uhr wurde zuletzt synchronisiert um', 'comment' => 'Kommentar', 'common name' => 'Gemeinsamer Name', -'community rules' => 'Emergingthreats.net Community Rules', 'comp-lzo' => 'LZO-Kompression', 'compression' => 'Kompression:', 'computer to modem rate' => 'Übertragungsrate zwischen Computer und Modem:', @@ -715,6 +714,13 @@ 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', 'dns server' => 'DNS Server', 'dns title' => 'Domain Name System', +'dnsforward' => 'DNS-Weiterleitung', +'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen:', +'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung', +'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten:', +'dnsforward entries' => 'Aktuelle Einträge:', +'dnsforward forward_server' => 'DNS-Server', +'dnsforward zone' => 'Zone', '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:', @@ -2212,8 +2218,39 @@ 'wireless config added' => 'Wireless-Konfiguration hinzugefügt', 'wireless config changed' => 'Wireless-Konfiguration geändert', 'wireless configuration' => 'Wireless-Konfiguration', +'wlan client' => 'WLAN-Client', +'wlan client advanced settings' => 'Erweiterte Einstellungen', +'wlan client and' => 'und', +'wlan client bssid' => 'BSSID', +'wlan client ccmp' => 'CCMP', +'wlan client configuration' => 'WLAN-Client-Konfiguration', +'wlan client disconnected' => 'Nicht verbunden', +'wlan client duplicate ssid' => 'Doppelte SSID', +'wlan client edit entry' => 'Verbindung bearbeiten', +'wlan client encryption' => 'Verschlüsselung', +'wlan client encryption none' => 'Keine', +'wlan client encryption wep' => 'WEP', +'wlan client encryption wpa' => 'WPA', +'wlan client encryption wpa2' => 'WPA2', +'wlan client group cipher' => 'Gruppenchiffre', +'wlan client group key algorithm' => 'GKA', +'wlan client invalid key length' => 'Ungültige Schlüssellänge.', +'wlan client new entry' => 'Neue WLAN-Client-Konfiguration erstellen', +'wlan client new network' => 'Neues Netzwerk', +'wlan client pairwise cipher' => 'Paarweise Chiffre', +'wlan client pairwise key algorithm' => 'PKA', +'wlan client pairwise key group key' => 'Paarweise-/Gruppenschlüssel', +'wlan client psk' => 'Schlüssel', +'wlan client ssid' => 'SSID', +'wlan client tkip' => 'TKIP', +'wlan client wpa mode' => 'WPA-Modus', +'wlan client wpa mode all' => 'Automatisch', +'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', +'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP', +'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlanap access point' => 'Access Point', 'wlanap channel' => 'Kanal', +'wlanap country' => 'Ländercode', 'wlanap debugging' => 'Debugging', 'wlanap del interface' => 'Ausgewähltes Interface zurücksetzen?', 'wlanap encryption' => 'Verschlüsselung', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 75138f5..30d0734 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -545,7 +545,7 @@ 'clock last synchronized at' => 'Clock was last synchronized at', 'comment' => 'Description:', 'common name' => 'Common name', -'community rules' => 'Emergingthreats.net Community Rules', +'community rules' => 'Snort/VRT GPLv2 Community Rules', 'comp-lzo' => 'LZO-Compression:', 'compression' => 'Compression:', 'computer to modem rate' => 'Computer to modem rate:', @@ -737,6 +737,13 @@ 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', 'dns server' => 'DNS Server', 'dns title' => 'Domain Name System', +'dnsforward' => 'DNS forwarding', +'dnsforward add a new entry' => 'Add a new entry:', +'dnsforward configuration' => 'DNS forward configuration', +'dnsforward edit an entry' => 'Edit an existing entry:', +'dnsforward entries' => 'Current entries:', +'dnsforward forward_server' => 'Nameserver', +'dnsforward zone' => 'Zone', '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:', @@ -801,6 +808,7 @@ 'eg' => 'e.g.:', 'email server can not be empty' => 'E-mail server can not be empty', 'emailreportlevel' => 'E-mailreportlevel', +'emerging rules' => 'Emergingthreats.net Community Rules', 'empty' => 'This field may be left blank', 'empty profile' => 'empty', 'enable ignore filter' => 'Enable ignore filter', @@ -2246,6 +2254,36 @@ 'wireless config added' => 'Wireless config added', 'wireless config changed' => 'Wireless config changed', 'wireless configuration' => 'Wireless Configuration', +'wlan client' => 'Wireless client', +'wlan client advanced settings' => 'Advanced settings', +'wlan client and' => 'and', +'wlan client bssid' => 'BSSID', +'wlan client ccmp' => 'CCMP', +'wlan client configuration' => 'Wireless Client Configuration', +'wlan client disconnected' => 'Disconnected', +'wlan client duplicate ssid' => 'Duplicate SSID', +'wlan client edit entry' => 'Edit wireless client configuration', +'wlan client encryption' => 'Encryption', +'wlan client encryption none' => 'None', +'wlan client encryption wep' => 'WEP', +'wlan client encryption wpa' => 'WPA', +'wlan client encryption wpa2' => 'WPA2', +'wlan client group cipher' => 'Group cipher', +'wlan client group key algorithm' => 'GKA', +'wlan client invalid key length' => 'Invalid key length.', +'wlan client new entry' => 'Create new wireless client configuration', +'wlan client new network' => 'New network', +'wlan client pairwise cipher' => 'Pairwise cipher', +'wlan client pairwise key algorithm' => 'PKA', +'wlan client pairwise key group key' => 'Pairwise key/group key', +'wlan client psk' => 'Pre-shared key', +'wlan client ssid' => 'SSID', +'wlan client tkip' => 'TKIP', +'wlan client wpa mode' => 'WPA mode', +'wlan client wpa mode all' => 'Auto', +'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', +'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP', +'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlanap access point' => 'Access Point', 'wlanap channel' => 'Channel', 'wlanap country' => 'Country Code', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 0c45a0b..427dba6 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -538,7 +538,7 @@ 'clock last synchronized at' => 'Klok was voor het laatst gesynchroniseerd om', 'comment' => 'Omschrijving:', 'common name' => 'Algemene naam', -'community rules' => 'Emergingthreats.net community regels', +'community rules' => 'Snort/VRT GPLv2 community regels', 'comp-lzo' => 'LZO-Compressie:', 'compression' => 'Compressie:', 'computer to modem rate' => 'Computer naar modem rato:', @@ -794,6 +794,7 @@ 'eg' => 'bijv.:', 'email server can not be empty' => 'E-mailserver mag niet leeg zijn', 'emailreportlevel' => 'E-mailrapport detailniveau', +'emerging rules' => 'Emergingthreats.net community regels', 'empty' => 'Dit veld mag niet leeg worden gelaten', 'empty profile' => 'leeg', 'enable ignore filter' => 'Inschakelen negeer-filter', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index d85a90a..19f68e4 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -499,7 +499,6 @@ 'clock last synchronized at' => 'Ostatnia synchronizacja zegara: ', 'comment' => 'Opis:', 'common name' => 'Common name', -'community rules' => 'Emergingthreats.net Community Rules', 'comp-lzo' => 'Kompresja LZO:', 'compression' => 'Kompresja:', 'computer to modem rate' => 'Szybkość połączenia z komputerem:', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 0b22f69..69c4599 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -497,7 +497,6 @@ 'clock last synchronized at' => 'В последний раз время синхронизировалось в', 'comment' => 'Description:', 'common name' => 'Короткое имя', -'community rules' => 'Emergingthreats.net Community Rules', 'comp-lzo' => 'LZO-Сжатие:', 'compression' => 'Compression:', 'computer to modem rate' => 'Computer to modem rate:', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index b8ea1fb..9888121 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -545,7 +545,7 @@ 'clock last synchronized at' => 'Saatin son olarak eşitlendiği zaman:', 'comment' => 'Açıklama:', 'common name' => 'Ortak ad', -'community rules' => 'Emergingthreats.net Topluluk Kuralları', +'community rules' => 'Snort/VRT GPLv2 Topluluk Kuralları', 'comp-lzo' => 'LZO-Sıkıştırması:', 'compression' => 'Sıkıştırma:', 'computer to modem rate' => 'Bilgisayarın modem hızı:', @@ -801,6 +801,7 @@ 'eg' => 'e.g.:', 'email server can not be empty' => 'E-posta sunucusu boş olamaz', 'emailreportlevel' => 'E-posta rapor seviyesi', +'emerging rules' => 'Emergingthreats.net Topluluk Kuralları', 'empty' => 'Bu alan boş bırakılabilir', 'empty profile' => 'boş', 'enable ignore filter' => 'Aktif filtreyi yoksay', diff --git a/lfs/GeoIP b/lfs/GeoIP index 040316d..295598c 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -25,7 +25,7 @@ include Config VER = 1.17 -DATVER = 07052013 +DATVER = 02072013 THISAPP = Geo-IP-PurePerl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de -GeoIP.dat-$(DATVER).gz_MD5 = 634d72f4ffbb2de57efa468add572d38 +GeoIP.dat-$(DATVER).gz_MD5 = 25d59395b43d676fcbab05e7610a7b58 install : $(TARGET) diff --git a/lfs/configroot b/lfs/configroot index f8fe426..1f84a16 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team <info(a)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 # @@ -64,7 +64,7 @@ $(TARGET) : for i in auth/users backup/include.user backup/exclude.user \ certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ - extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ + ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ diff --git a/lfs/curl b/lfs/curl index 1228f39..715d79d 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,7 +24,7 @@ include Config -VER = 7.29.0 +VER = 7.31.0 THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4f57d3b4a3963038bd5e04dbff385390 +$(DL_FILE)_MD5 = 6f26843f7e3a2fb06e02f68a55efe8c7 install : $(TARGET) @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6 cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install # Create symlink to new curl lib for old binaries diff --git a/lfs/igmpproxy b/lfs/igmpproxy index 3e5fca9..fb1426f 100644 --- a/lfs/igmpproxy +++ b/lfs/igmpproxy @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team <info(a)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 # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = igmpproxy -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -86,5 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + install -v -m 644 $(DIR_SRC)/config/backup/includes/igmpproxy \ + /var/ipfire/backup/addons/includes/igmpproxy @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/inetutils b/lfs/inetutils index 468c2af..ba87c9c 100644 --- a/lfs/inetutils +++ b/lfs/inetutils @@ -80,5 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install mv -v /usr/bin/ping /bin + + # Don't use whois command from here. + rm -vf /usr/bin/whois + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/initscripts b/lfs/initscripts index 213b46e..6549147 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -173,6 +173,9 @@ $(TARGET) : ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S90sysctl ln -sf ../init.d/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans + ln -sf ../init.d/wlanclient /etc/rc.d/rc0.d/K82wlanclient + ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S19wlanclient + ln -sf ../init.d/wlanclient /etc/rc.d/rc6.d/K82wlanclient ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall diff --git a/lfs/jwhois b/lfs/jwhois new file mode 100644 index 0000000..46abec4 --- /dev/null +++ b/lfs/jwhois @@ -0,0 +1,90 @@ +############################################################################### +# # +# 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 = 4.0 + +THISAPP = jwhois-$(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 = 977d0ba90ee058a7998c94d933fc9546 + +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) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-conf_update.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-conf_update2.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-connect.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-fclose.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-idna.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-ipv6match.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-multi-homed.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/jwhois-4.0-select.patch + + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + # Add alias for whois command. + ln -svf jwhois /usr/bin/whois + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index f820dfb..094f09e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 29 +PAK_VER = 30 DEPS = "" VERSUFIX=ipfire$(KCFG) diff --git a/lfs/mc b/lfs/mc index eb59a44..1861349 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,7 +24,7 @@ include Config -VER = 4.8.8 +VER = 4.8.9 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 7 +PAK_VER = 8 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 14231665535fc80cc654b6ccfd070995 +$(DL_FILE)_MD5 = 0f8a05f9a9708241541ae177c8e2f209 install : $(TARGET) diff --git a/lfs/oinkmaster b/lfs/oinkmaster index a13c924..6cc075f 100644 --- a/lfs/oinkmaster +++ b/lfs/oinkmaster @@ -69,6 +69,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/oinkmaster-2.0-add_community_rules.patch cd $(DIR_APP) && chown nobody:nobody oinkmaster.pl cd $(DIR_APP) && cp -f oinkmaster.conf /var/ipfire/snort/ cd /var/ipfire/snort && patch -Np1 < $(DIR_SRC)/src/patches/oinkmaster-tmp.patch diff --git a/lfs/snort b/lfs/snort index 950b319..daec621 100644 --- a/lfs/snort +++ b/lfs/snort @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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.9.4 +VER = 2.9.5 THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e79ee6b4fbb32edc5dfed2d7dfcc6813 +$(DL_FILE)_MD5 = f5fc0e176afca5989d47509478758fc7 install : $(TARGET) @@ -86,6 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) etc/reference.config etc/classification.config /etc/snort/rules cd $(DIR_APP) && install -m 0644 etc/unicode.map /etc/snort install -m 0644 $(DIR_SRC)/config/snort/snort.conf /etc/snort + cp /etc/snort/snort.conf /etc/snort/snort.conf.template chown -R nobody:nobody /etc/snort -mkdir -p /var/log/snort chown -R snort:snort /var/log/snort diff --git a/lfs/squid b/lfs/squid index 3ede976..fde8606 100644 --- a/lfs/squid +++ b/lfs/squid @@ -87,8 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-referer-log \ --enable-snmp \ --with-pthreads --with-dl \ - --with-maxfd="16384" \ - --with-filedescriptors=16384 \ + --with-maxfd="65536" \ + --with-filedescriptors=65536 \ --with-large-files \ --with-aio \ --enable-async-io=8 \ diff --git a/lfs/squidclamav b/lfs/squidclamav index 86255f8..79bf5d0 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 15 +PAK_VER = 17 DEPS = "clamav" @@ -77,6 +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/squidclamav-5.11-dont_use_ipv6.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make install install -v -m 755 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index f8aea5f..0f28078 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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 = 1.2.4 +VER = 1.2.6 THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dbd4ce7966d7b4a5a0604a8280f7164d +$(DL_FILE)_MD5 = 3cd804ad2dd4cb61fbd77a5cc033496c install : $(TARGET) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 5beecda..709434c 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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 = 20120815 +VER = 20130610 THISAPP = usb-modeswitch-data-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 12d7de3210e45ad6f48791d12bbdbf61 +$(DL_FILE)_MD5 = 52dff3f54e0c01dad02639d642e089e0 install : $(TARGET) diff --git a/make.sh b/make.sh index 71df2c9..88af898 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # 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-2012 IPFire Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="70" # Core Level (Filename) -PAKFIRE_CORE="70" # Core Level (PAKFIRE) +CORE="71" # Core Level (Filename) +PAKFIRE_CORE="71" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -336,6 +336,7 @@ buildbase() { lfsmake2 gzip lfsmake2 inetutils lfsmake2 iproute2 + lfsmake2 jwhois lfsmake2 kbd lfsmake2 less lfsmake2 make diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids index b2144f9..277a2ba 100644 --- a/src/hwdata/pci.ids +++ b/src/hwdata/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2013.05.04 -# Date: 2013-05-04 03:15:02 +# Version: 2013.07.14 +# Date: 2013-07-14 03:15:01 # # Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -337,8 +337,19 @@ 8086 3513 RMS25CB080 RAID Controller 005c SAS1064A PCI-X Fusion-MPT SAS 005d MegaRAID SAS-3 3108 [Invader] + 1028 1f41 PERC H830 Adapter + 1028 1f42 PERC H730P Adapter + 1028 1f43 PERC H730 Adapter + 1028 1f47 PERC H730P Mini + 1028 1f48 PERC H730P Mini (for blades) + 1028 1f49 PERC H730 Mini + 1028 1f4a PERC H730 Mini (for blades) 005e SAS1066 PCI-X Fusion-MPT SAS 005f MegaRAID SAS-3 3008 [Fury] + 1028 1f44 PERC H330 Adapter + 1028 1f4b PERC H330 Mini + 1028 1f4c PERC H330 Mini (for blades) + 1028 1f4d PERC H330 Embedded (for monolithic) 0060 MegaRAID SAS 1078 1000 1006 MegaRAID SAS 8888ELP 1000 100a MegaRAID SAS 8708ELP @@ -564,8 +575,22 @@ 1305 Kaveri 1306 Kaveri 1307 Kaveri - 1314 Wrestler HDMI Audio [Radeon HD 6250/6310] - 174b 1001 Sapphire PURE Fusion Mini + 1309 Kaveri + 130a Kaveri + 130b Kaveri + 130c Kaveri + 130d Kaveri + 130e Kaveri + 130f Kaveri + 1310 Kaveri + 1311 Kaveri + 1313 Kaveri + 1314 Wrestler HDMI Audio + 174b 1001 PURE Fusion Mini + 1315 Kaveri + 1316 Kaveri + 131b Kaveri + 131c Kaveri 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s 3150 RV380/M24 [Mobility Radeon X600] @@ -588,11 +613,11 @@ 1002 0002 R9600 Pro primary (Asus OEM for HP) 1002 0003 R9600 Pro secondary (Asus OEM for HP) 1002 4722 All-in-Wonder 2006 AGP Edition - 1458 4024 Giga-Byte GV-R96128D (Primary) - 148c 2064 PowerColor R96A-C3N - 148c 2066 PowerColor R96A-C3N - 174b 7c19 Sapphire Atlantis Radeon 9600 Pro - 174b 7c29 GC-R9600PRO [Sapphire] (Primary) + 1458 4024 GV-R96128D + 148c 2064 R96A-C3N + 148c 2066 R96A-C3N + 174b 7c19 Atlantis Radeon 9600 Pro + 174b 7c29 GC-R9600PRO 17ee 2002 Radeon 9600 256Mb Primary 18bc 0101 GC-R9600PRO (Primary) 4151 RV350 [Radeon 9600 Series] @@ -603,7 +628,7 @@ 1043 c002 Radeon 9600 XT TVD 1043 c01a A9600XT/TD 1462 9510 RX9600XT (MS-8951) - 174b 7c29 Sapphire Radeon 9600XT + 174b 7c29 Radeon 9600XT 1787 4002 Radeon 9600 XT 4153 RV350 [Radeon 9550] 1043 010c A9550GE/TD @@ -619,9 +644,9 @@ 4170 RV350 [Radeon 9550/9600/X1050 Series] (Secondary) 1002 0003 R9600 Pro secondary (Asus OEM for HP) 1002 4723 All-in-Wonder 2006 AGP Edition (Secondary) - 1458 4025 Giga-Byte GV-R96128D (Secondary) - 148c 2067 PowerColor R96A-C3N (Secondary) - 174b 7c28 GC-R9600PRO [Sapphire] (Secondary) + 1458 4025 GV-R96128D (Secondary) + 148c 2067 R96A-C3N (Secondary) + 174b 7c28 GC-R9600PRO (Secondary) 17ee 2003 Radeon 9600 256Mb (Secondary) 18bc 0100 GC-R9600PRO (Secondary) 4171 RV350 [Radeon 9600] (Secondary) @@ -631,12 +656,13 @@ 1002 4773 All-in-Wonder 9600 XT (Secondary) 1043 c003 A9600XT (Secondary) 1043 c01b A9600XT/TD (Secondary) - 174b 7c28 Sapphire Radeon 9600XT (Secondary) + 174b 7c28 Radeon 9600XT (Secondary) 1787 4003 Radeon 9600 XT (Secondary) 4173 RV350 [Radeon 9550] (Secondary) 1043 010d A9550GE/TD (Secondary) 4242 R200 [All-In-Wonder Radeon 8500 DV] 1002 02aa Radeon 8500 AIW DV Edition + 4243 R200 PCI Bridge [All-in-Wonder Radeon 8500DV] 4336 RS100 [Radeon IGP 320M] 1002 4336 Pavilion ze4300 ATI Radeon Mobility U1 (IGP 320 M) 103c 0024 Pavilion ze4400 builtin Video @@ -745,7 +771,7 @@ 1458 4385 GA-MA770-DS3rev2.0 Motherboard 1462 7368 K9AG Neo2 15d9 a811 H8DGU - 174b 1001 Sapphire PURE Fusion Mini + 174b 1001 PURE Fusion Mini 17f2 5000 KI690-AM2 Motherboard 4386 SB600 USB Controller (EHCI) 103c 280a DC5750 Microtower @@ -798,7 +824,7 @@ 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO - 174b 1001 Sapphire PURE Fusion Mini + 174b 1001 PURE Fusion Mini 4392 SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode] 4393 SB7x0/SB8x0/SB9x0 SATA Controller [RAID5 mode] 4394 SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode] @@ -809,14 +835,14 @@ 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO 15d9 a811 H8DGU - 174b 1001 Sapphire PURE Fusion Mini + 174b 1001 PURE Fusion Mini 4397 SB7x0/SB8x0/SB9x0 USB OHCI0 Controller 1019 2120 A785GM-M 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO 15d9 a811 H8DGU - 174b 1001 Sapphire PURE Fusion Mini + 174b 1001 PURE Fusion Mini 4398 SB7x0 USB OHCI1 Controller 1019 2120 A785GM-M 1043 82ef M3A78-EH Motherboard @@ -825,7 +851,7 @@ 1019 2120 A785GM-M 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO - 174b 1001 Sapphire PURE Fusion Mini + 174b 1001 PURE Fusion Mini 439c SB7x0/SB8x0/SB9x0 IDE Controller 1019 2120 A785GM-M 1043 82ef M3A78-EH Motherboard @@ -834,7 +860,7 @@ 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO - 174b 1001 Sapphire PURE Fusion Mini + 174b 1001 PURE Fusion Mini 43a0 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 0) 43a1 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 1) 43a2 SB900 PCI to PCI bridge (PCIE port 2) @@ -926,7 +952,7 @@ 148c 2039 RV250 If [Radeon 9000 Pro "Evil Commando"] 1509 9a00 RV250 If [Radeon 9000 "AT009"] 1681 0040 RV250 If [3D prophet 9000] - 174b 7176 RV250 If [Sapphire Radeon 9000 Pro] + 174b 7176 Radeon 9000 Pro 174b 7192 RV250 If [Radeon 9000 "Atlantis"] 17af 2005 RV250 If [Excalibur Radeon 9000 Pro] 17af 2006 RV250 If [Excalibur Radeon 9000] @@ -1086,7 +1112,7 @@ 1002 013a Radeon 8500 148c 2026 R200 QL [Radeon 8500 Evil Master II Multi Display Edition] 1681 0010 Radeon 8500 [3D Prophet 8500 128Mb] - 174b 7149 Radeon R200 QL [Sapphire Radeon 8500 LE] + 174b 7149 Radeon 8500 LE 1787 0f08 Radeon R200 QL [PowerMagic Radeon 8500] 514d R200 [Radeon 9100] 5157 RV200 [Radeon 7500/7500 LE] @@ -1098,7 +1124,7 @@ 148c 2025 RV200 QW [Radeon 7500 Evil Master Multi Display Edition] 148c 2036 RV200 QW [Radeon 7500 PCI Dual Display] 174b 7146 RV200 QW [Radeon 7500 LE] - 174b 7147 RV200 QW [Sapphire Radeon 7500LE] + 174b 7147 Radeon 7500 LE 174b 7161 Radeon RV200 QW [Radeon 7500 LE] 17af 0202 RV200 QW [Excalibur Radeon 7500LE] 5159 RV100 [Radeon 7000 / Radeon VE] @@ -1122,8 +1148,8 @@ 148c 2003 RV100 QY [Radeon 7000 Multi-Display Edition] 148c 2023 RV100 QY [Radeon 7000 Evil Master Multi-Display] 174b 0280 Radeon RV100 QY [Radeon 7000/VE] - 174b 7112 RV100 QY [Sapphire Radeon VE 7000] - 174b 7c28 Sapphire Radeon VE 7000 DDR + 174b 7112 Radeon VE 7000 + 174b 7c28 Radeon VE 7000 DDR 1787 0202 RV100 QY [Excalibur Radeon 7000] 17ee 1001 Radeon 7000 64MB DDR + DVI 515e ES1000 @@ -1223,10 +1249,10 @@ 5940 RV280 [Radeon 9200 PRO] (Secondary) 17af 2021 Excalibur Radeon 9250 (Secondary) 5941 RV280 [Radeon 9200] (Secondary) - 1458 4019 Gigabyte Radeon 9200 - 174b 7c12 Sapphire Radeon 9200 + 1458 4019 Radeon 9200 + 174b 7c12 Radeon 9200 17af 200d Excalibur Radeon 9200 - 18bc 0050 GeXcube GC-R9200-C3 (Secondary) + 18bc 0050 GC-R9200-C3 (Secondary) 5944 RV280 [Radeon 9200 SE PCI] 5950 RS480/RS482/RS485 Host Bridge 1025 0080 Aspire 5024WLMMi @@ -1253,21 +1279,21 @@ 1002 2f72 All-in-Wonder 9200 Series 1019 4c30 Radeon 9200 VIVO 12ab 5961 YUAN SMARTVGA Radeon 9200 - 1458 4018 Gigabyte Radeon 9200 - 174b 7c13 Sapphire Radeon 9200 + 1458 4018 Radeon 9200 + 174b 7c13 Radeon 9200 17af 200c Excalibur Radeon 9200 18bc 0050 Radeon 9200 Game Buster - 18bc 0051 GeXcube GC-R9200-C3 + 18bc 0051 GC-R9200-C3 18bc 0053 Radeon 9200 Game Buster VIVO 5962 RV280 [Radeon 9200] 5964 RV280 [Radeon 9200 SE] 1002 5964 Radeon 9200 SE, 64-bit 128MB DDR, 200/166MHz - 1043 c006 ASUS Radeon 9200 SE / TD / 128M + 1043 c006 Radeon 9200 SE / TD / 128M 1458 4018 Radeon 9200 SE 1458 4032 Radeon 9200 SE 128MB 147b 6191 R9200SE-DT 148c 2073 CN-AG92E - 174b 7c13 Sapphire Radeon 9200 SE + 174b 7c13 Radeon 9200 SE 1787 5964 Excalibur 9200SE VIVO 128M 17af 2012 Radeon 9200 SE Excalibur 18bc 0170 Sapphire Radeon 9200 SE 128MB Game Buster @@ -1277,13 +1303,13 @@ 103c 280a DC5750 Microtower 1462 7141 Aspire L250 5975 RS482M [Mobility Radeon Xpress 200] - 5978 RD790 PCI to PCI bridge (external gfx0 port A) + 5978 RX780/RD790 PCI to PCI bridge (external gfx0 port A) 1849 5957 A770CrossFire Motherboard 5979 RD790 PCI to PCI bridge (external gfx0 port B) 597a RD790 PCI to PCI bridge (PCI express gpp port A) - 597b RD790 PCI to PCI bridge (PCI express gpp port B) + 597b RX780/RD790 PCI to PCI bridge (PCI express gpp port B) 597c RD790 PCI to PCI bridge (PCI express gpp port C) - 597d RD790 PCI to PCI bridge (PCI express gpp port D) + 597d RX780/RD790 PCI to PCI bridge (PCI express gpp port D) 597e RD790 PCI to PCI bridge (PCI express gpp port E) 1849 5957 A770CrossFire Motherboard 597f RD790 PCI to PCI bridge (PCI express gpp port F) @@ -1342,7 +1368,7 @@ 5b70 RV370 [Radeon X300 SE] # RX300SE-TD128E 1462 0403 Radeon X300 SE 128MB DDR - 174b 0501 Sapphire Radeon X300 SE + 174b 0501 Radeon X300 SE 196d 1087 Radeon X300 SE HyperMemory 5b72 RV380 [Radeon X300/X550/X1050 Series] (Secondary) 5b73 RV370 [Radeon X300/X550/X1050 Series] (Secondary) @@ -1356,7 +1382,7 @@ 1458 4019 Radeon 9200 SE (Secondary) 1458 4032 Radeon 9200 SE 128MB 147b 6190 R9200SE-DT (Secondary) - 174b 7c12 Sapphire Radeon 9200 SE (Secondary) + 174b 7c12 Radeon 9200 SE (Secondary) 1787 5965 Excalibur 9200SE VIVO 128M (Secondary) 17af 2013 Radeon 9200 SE Excalibur (Secondary) 18bc 0171 Radeon 9200 SE 128MB Game Buster (Secondary) @@ -1371,11 +1397,11 @@ 5d50 R480 GL [FireGL V7200] 5d52 R480 [Radeon X850 XT] 1002 0b12 PowerColor X850XT PCIe (Primary) - 1002 0b13 PowerColor X850XT PCIe (Secondary) 5d57 R423 [Radeon X800 XT] 5d6d R480 [Radeon X850 XT Platinum Edition] (Secondary) 5d6f R480 [Radeon X800 GTO] (Secondary) 5d72 R480 [Radeon X850 XT] (Secondary) + 1002 0b13 PowerColor X850XT PCIe (Secondary) 5d77 R423 [Radeon X800 XT] (Secondary) 5e48 RV410 GL [FireGL V5000] 5e49 RV410 [Radeon X700 Series] @@ -1383,12 +1409,12 @@ 5e4b RV410 [Radeon X700 PRO] 5e4c RV410 [Radeon X700 SE] 5e4d RV410 [Radeon X700] - 148c 2116 PowerColor Bravo X700 + 148c 2116 Bravo X700 5e4f RV410 [Radeon X700] 1569 1e4f Radeon X550 XT 5e6b RV410 [Radeon X700 PRO] (Secondary) 5e6d RV410 [Radeon X700] (Secondary) - 148c 2117 PowerColor Bravo X700 + 148c 2117 Bravo X700 (Secondary) 5f57 R423 [Radeon X800 XT] 6600 Mars [Radeon HD 8670A/8750M] 6601 Mars [Radeon HD 8730M] @@ -1397,13 +1423,13 @@ 6606 Mars XTX [Radeon HD 8790M] 6607 Mars LE [Radeon HD 8530M] 6610 Oland [Radeon HD 8600 Series] - 6611 Oland [Radeon HD 8500 Series] + 6611 Oland [Radeon HD 8570] 6613 Oland [Radeon HD 8500 Series] 6620 Mars 6621 Mars PRO 6623 Mars 6631 Oland - 6640 Saturn XT + 6640 Saturn [Radeon HD 8950] 6641 Saturn PRO 6649 Bonaire 6650 Bonaire @@ -1419,10 +1445,13 @@ # 100356OCL / 11210-01-20G 174b e253 Radeon HD 7790 Dual-X OC 1787 2329 Radeon HD 7790 TurboDuo - 6660 Sun XT [Radeon HD 8600M Series] + 665d Bonaire + 6660 Sun XT [Radeon HD 8670A] 6663 Sun PRO [Radeon HD 8500M Series] - 6667 Sun - 666f Sun LE + 6664 Sun [Radeon R5 M200 Series] + 6665 Sun [Radeon R5 M200 Series] + 6667 Sun [Radeon R5 M200 Series] + 666f Sun [Radeon HD 8500M] 6670 Hainan 6704 Cayman PRO GL [FirePro V7900] 6707 Cayman LE GL [FirePro V5900] @@ -1454,31 +1483,383 @@ 673e Barts LE [Radeon HD 6790] 148c 7720 Radeon HD 7720 OEM 6740 Whistler [Radeon HD 6730M/6770M/7690M XT] + 1019 238c Radeon HD 6730M + 1019 238e Radeon HD 6730M + 1019 2391 Radeon HD 6730M + 1019 2392 Radeon HD 6770M 1028 04a3 Precision M4600 - 6741 Whistler [Radeon HD 6600M/6700M/7600M Series] + 1028 053e FirePro M5950 + 103c 1630 FirePro M5950 + 103c 1631 FirePro M5950 + 103c 164b Radeon HD 6730M + 103c 164e Radeon HD 6730M + 103c 1657 Radeon HD 6770M + 103c 1658 Radeon HD 6770M + 103c 165a Radeon HD 6770M + 103c 165b Radeon HD 6770M + 103c 1688 Radeon HD 6770M + 103c 1689 Radeon HD 6770M + 103c 168a Radeon HD 6770M + 103c 185e Radeon HD 7690M XT + 103c 3388 Radeon HD 6770M + 103c 3389 Radeon HD 6770M + 103c 3582 Radeon HD 6770M + 103c 366c Radeon HD 6730M + 1043 1d02 Radeon HD 6730M + 1043 1d12 Radeon HD 6730M + 104d 9084 Radeon HD 6730M + 104d 9085 Radeon HD 6730M + 144d b074 Radeon HD 6730M + 144d b077 Radeon HD 6730M + 144d b084 Radeon HD 6730M + 144d b088 Radeon HD 6730M + 17aa 3982 Radeon HD 6730M + 6741 Whistler [Radeon HD 6630M/6650M/6750M/7670M/7690M] + 1019 238e Radeon HD 6650M + 1019 238f Radeon HD 6650M + 1025 0379 Radeon HD 6650M + 1025 037b Radeon HD 6650M + 1025 037e Radeon HD 6650M + 1025 0382 Radeon HD 6650M + 1025 0384 Radeon HD 6650M + 1025 0385 Radeon HD 6650M + 1025 0386 Radeon HD 6650M + 1025 0387 Radeon HD 6650M + 1025 0388 Radeon HD 6650M + 1025 0442 Radeon HD 6650M + 1025 0451 Radeon HD 6650M + 1025 0489 Radeon HD 6650M + 1025 048b Radeon HD 6650M + 1025 048c Radeon HD 6650M + 1025 050a Radeon HD 6650M + 1025 050b Radeon HD 6650M + 1025 050c Radeon HD 6650M + 1025 050e Radeon HD 6650M + 1025 050f Radeon HD 6650M + 1025 0513 Radeon HD 6650M + 1025 0514 Radeon HD 6650M + 1025 0515 Radeon HD 6650M + 1025 0516 Radeon HD 6650M + 1025 051e Radeon HD 6650M + 1025 051f Radeon HD 6650M + 1025 0520 Radeon HD 6650M + 1025 0521 Radeon HD 6650M + 1025 052a Radeon HD 6650M + 1025 0555 Radeon HD 6650M + 1025 0556 Radeon HD 6650M + 1025 055d Radeon HD 6650M + 1025 055e Radeon HD 6650M + 1025 056d Radeon HD 6650M + 1025 059a Radeon HD 6650M + 1025 059b Radeon HD 6650M + 1025 059e Radeon HD 6650M + 1025 059f Radeon HD 6650M + 1025 0600 Radeon HD 6650M + 1025 0605 Radeon HD 6650M + 1025 0606 Radeon HD 6650M + 1025 0619 Radeon HD 6650M + 1028 04c1 Radeon HD 6630M + 1028 04c5 Radeon HD 6630M + 1028 04cd Radeon HD 6630M + 1028 04d7 Radeon HD 6630M + 1028 04d9 Radeon HD 6630M + 1028 052d Radeon HD 6630M + 103c 1617 Radeon HD 6650M + 103c 1646 Radeon HD 6750M + 103c 1647 Radeon HD 6650M + 103c 164b Radeon HD 6650M + 103c 164e Radeon HD 6650M + 103c 1688 Radeon HD 6750M + 103c 1689 Radeon HD 6750M + 103c 168a Radeon HD 6750M + 103c 1860 Radeon HD 7690M + 103c 3385 Radeon HD 6630M + 103c 3560 Radeon HD 6750M + 103c 358d Radeon HD 6750M + 103c 3590 Radeon HD 6750M + 103c 3593 Radeon HD 6750M + 103c 366c Radeon HD 6650M + 1043 1cd2 Radeon HD 6650M + 1043 2121 Radeon HD 6650M + 1043 2122 Radeon HD 6650M + 1043 2123 Radeon HD 6650M + 1043 2125 Radeon HD 7670M + 1043 2127 Radeon HD 7670M + 104d 907b Radeon HD 6630M + 104d 9080 Radeon HD 6630M + 104d 9081 Radeon HD 6630M 106b 00e2 MacBookPro8,2 [Core i7, 15", Late 2011] + 1179 fd63 Radeon HD 6630M + 1179 fd65 Radeon HD 6630M + 144d c093 Radeon HD 6650M + 144d c0ac Radeon HD 6650M + 144d c0b3 Radeon HD 6750M + 144d c539 Radeon HD 6630M + 144d c609 Radeon HD 6630M + 152d 0914 Radeon HD 6650M + 17aa 21e1 Radeon HD 6630M + 17aa 3970 Radeon HD 6650M + 17aa 3976 Radeon HD 6650M + 1854 0907 Radeon HD 6650M 6742 Whistler LE [Radeon HD 6610M/7610M] + 1002 6570 Turks [Radeon HD 6570] + 1019 2393 Radeon HD 6610M 1043 1d82 K53SK Laptop Radeon HD 7610M + 1179 fb22 Radeon HD 7610M + 1179 fb23 Radeon HD 7610M + 1179 fb27 Radeon HD 7610M + 1179 fb2a Radeon HD 7610M + 1179 fb2c Radeon HD 7610M + 1179 fb30 Radeon HD 7610M + 1179 fb31 Radeon HD 7610M + 1179 fb32 Radeon HD 7610M + 1179 fb38 Radeon HD 7610M + 1179 fb39 Radeon HD 7610M + 1179 fb3a Radeon HD 7610M + 1179 fb3b Radeon HD 7610M + 1179 fb40 Radeon HD 7610M + 1179 fb41 Radeon HD 7610M + 1179 fb47 Radeon HD 7610M + 1179 fb48 Radeon HD 7610M + 1179 fb49 Radeon HD 7610M + 1179 fb51 Radeon HD 7610M + 1179 fb52 Radeon HD 7610M + 1179 fb53 Radeon HD 7610M + 1179 fb56 Radeon HD 7610M + 1179 fb81 Radeon HD 7610M + 1179 fb82 Radeon HD 7610M + 1179 fb83 Radeon HD 7610M + 1179 fc56 Radeon HD 7610M + 1179 fcd4 Radeon HD 7610M + 1179 fcee Radeon HD 7610M + 1458 6570 Turks [Radeon HD 6570] + 1462 6570 Turks [Radeon HD 6570] + 148c 6570 Turks [Radeon HD 6570] + 1682 6570 Turks [Radeon HD 6570] + 174b 6570 Turks [Radeon HD 6570] + 1787 6570 Turks [Radeon HD 6570] + 17af 6570 Turks [Radeon HD 6570] 8086 2111 Radeon HD 6625M 6743 Whistler [Radeon E6760] 6749 Turks GL [FirePro V4900] 674a Turks GL [FirePro V3900] - 6750 Onega [Radeon HD 6650A / 7650A] - 6751 Turks XT [Radeon HD 7670A] - 6758 Turks XT [Radeon HD 6670] - 6759 Turks PRO [Radeon HD 6570] + 6750 Onega [Radeon HD 6650A/7650A] + 1462 2670 Radeon HD 6670A + 17aa 3079 Radeon HD 7650A + 17aa 307a Radeon HD 6650A + 17aa 3087 Radeon HD 7650A + 17aa 3618 Radeon HD 6650A + 17aa 3623 Radeon HD 6650A + 17aa 3627 Radeon HD 6650A + 6751 Turks [Radeon HD 7650A/7670A] + 1028 0548 Radeon HD 7650A + 1462 2671 Radeon HD 7670A + 1462 2672 Radeon HD 7670A + 1462 2680 Radeon HD 7650A + 1462 2681 Radeon HD 7650A + 17aa 3087 Radeon HD 7650A + 6758 Turks XT [Radeon HD 6670/7670] + 1028 0b0e Radeon HD 6670 + 103c 6882 Radeon HD 6670 + 1462 250a Radeon HD 7670 + 148c 7670 Radeon HD 7670 + 1545 7670 Radeon HD 7670 + 1682 3300 Radeon HD 7670 + 174b 7670 Radeon HD 7670 + 174b e181 Radeon HD 6670 + 6759 Turks PRO [Radeon HD 6570/7570] + 103c 3130 Radeon HD 6570 + 1462 2500 Radeon HD 6570 + 1462 2509 Radeon HD 7570 148c 7570 Radeon HD 7570 + 1642 3a67 Radeon HD 6570 + 1682 3280 Radeon HD 7570 174b 7570 Radeon HD 7570 + 174b e142 Radeon HD 6570 + 174b e181 Radeon HD 6570 + 1b0a 908f Radeon HD 6570 + 1b0a 9090 Radeon HD 6570 + 1b0a 9091 Radeon HD 6570 + 1b0a 9092 Radeon HD 6570 + 1b0a 909e Radeon HD 6570 + 1b0a 90b5 Radeon HD 7570 + 1b0a 90b6 Radeon HD 7570 675d Turks PRO [Radeon HD 7570] - 675f Turks LE [Radeon HD 5570/6510/7510] + 675f Turks LE [Radeon HD 5570/6510/7510/8510] 148c 6510 Radeon HD 6510 + 148c 6530 Radeon HD 6530 + 148c 7510 Radeon HD 7510 + 1545 7570 Radeon HD 7570 174b 6510 Radeon HD 6510 174b 7510 Radeon HD 7510 + 174b 8510 Radeon HD 8510 1787 2012 Radeon HD 5570 2GB GDDR3 1787 2314 Radeon HD 5570 1GB DDR2/GDDR3 6760 Seymour [Radeon HD 6400M/7400M Series] + 1002 0124 Radeon HD 6470M + 1002 0134 Radeon HD 6470M + 1019 238b Radeon HD 6470M + 1019 238e Radeon HD 6470M + 1019 2390 Radeon HD 6470M + 1019 9985 Radeon HD 6470M + 1028 04c1 Radeon HD 6470M + 1028 04c3 Radeon HD 6470M + 1028 04ca Radeon HD 6470M + 1028 04cb Radeon HD 6470M 1028 04cc Vostro 3350 - 1043 84a0 Seymour XT [Radeon HD 6470M] + 1028 04d1 Radeon HD 6470M + 1028 04d3 Radeon HD 6470M + 1028 04d7 Radeon HD 6470M + 1028 0502 Radeon HD 6470M + 1028 0503 Radeon HD 6470M + 1028 0506 Radeon HD 6470M + 1028 0507 Radeon HD 6470M + 1028 0514 Radeon HD 6470M + 1028 051c Radeon HD 6450M + 1028 051d Radeon HD 6450M + 103c 161a Radeon HD 6470M + 103c 161b Radeon HD 6470M + 103c 161e Radeon HD 6470M + 103c 161f Radeon HD 6470M + 103c 1622 Radeon HD 6450M + 103c 1623 Radeon HD 6450M + 103c 164a Radeon HD 6470M + 103c 164d Radeon HD 6470M + 103c 1651 Radeon HD 6470M + 103c 1656 Radeon HD 6490M + 103c 1658 Radeon HD 6490M + 103c 1659 Radeon HD 6490M + 103c 165b Radeon HD 6490M + 103c 165d Radeon HD 6470M + 103c 165f Radeon HD 6470M + 103c 1661 Radeon HD 6470M + 103c 1663 Radeon HD 6470M + 103c 1665 Radeon HD 6470M + 103c 1667 Radeon HD 6470M + 103c 1669 Radeon HD 6470M + 103c 166b Radeon HD 6470M + 103c 166c Radeon HD 6470M + 103c 166e Radeon HD 6470M + 103c 1670 Radeon HD 6470M + 103c 1672 Radeon HD 6470M + 103c 167a Radeon HD 6470M + 103c 167b Radeon HD 6470M + 103c 167d Radeon HD 6490M + 103c 167f Radeon HD 6490M + 103c 168c Radeon HD 6470M + 103c 168f Radeon HD 6470M + 103c 1694 Radeon HD 6470M + 103c 1696 Radeon HD 6470M + 103c 1698 Radeon HD 6470M + 103c 169a Radeon HD 6470M + 103c 169c Radeon HD 6490M + 103c 1855 Radeon HD 7450M + 103c 1859 Radeon HD 7450M + 103c 185c Radeon HD 7450M + 103c 185d Radeon HD 7470M + 103c 185f Radeon HD 7470M + 103c 1863 Radeon HD 7450M + 103c 355c Radeon HD 6490M + 103c 355f Radeon HD 6490M + 103c 3563 Radeon HD 6470M + 103c 3565 Radeon HD 6470M + 103c 3567 Radeon HD 6470M + 103c 3569 Radeon HD 6470M + 103c 3581 Radeon HD 6490M + 103c 3584 Radeon HD 6470M + 103c 358c Radeon HD 6490M + 103c 358f Radeon HD 6490M + 103c 3592 Radeon HD 6490M + 103c 3596 Radeon HD 6490M + 103c 366b Radeon HD 6470M + 103c 3671 FirePro M3900 + 103c 3673 Radeon HD 6470M + 1043 100a Radeon HD 7470M + 1043 100c Radeon HD 6470M + 1043 101b Radeon HD 6470M + 1043 101c Radeon HD 6470M + 1043 102a Radeon HD 7450M + 1043 102c Radeon HD 6470M + 1043 104b Radeon HD 7470M + 1043 105d Radeon HD 7470M + 1043 106b Radeon HD 7470M + 1043 106d Radeon HD 7470M + 1043 107d Radeon HD 7470M + 1043 1cb2 Radeon HD 6470M + 1043 1d22 Radeon HD 6470M + 1043 1d32 Radeon HD 6470M + 1043 2001 Radeon HD 6470M + 1043 2002 Radeon HD 7470M + 1043 2107 Radeon HD 7470M + 1043 2108 Radeon HD 7470M + 1043 2109 Radeon HD 7470M + 1043 84a0 Radeon HD 6470M + 1043 84e9 Radeon HD 6470M + 1043 8515 Radeon HD 7470M + 1043 8517 Radeon HD 7470M + 1043 855a Radeon HD 7470M + 104d 907b Radeon HD 6470M + 104d 9081 Radeon HD 6470M + 104d 9084 Radeon HD 6470M + 104d 9085 Radeon HD 6470M + 1179 0001 Radeon HD 6450M + 1179 0003 Radeon HD 6450M + 1179 0004 Radeon HD 6450M + 1179 fb22 Radeon HD 7470M + 1179 fb23 Radeon HD 7470M + 1179 fb2c Radeon HD 7470M + 1179 fb31 Radeon HD 7470M + 1179 fb32 Radeon HD 7470M + 1179 fb33 Radeon HD 7470M + 1179 fb38 Radeon HD 7470M + 1179 fb39 Radeon HD 7470M + 1179 fb3a Radeon HD 7470M + 1179 fb40 Radeon HD 7470M + 1179 fb41 Radeon HD 7470M + 1179 fb42 Radeon HD 7470M + 1179 fb47 Radeon HD 7470M + 1179 fb48 Radeon HD 7470M + 1179 fb51 Radeon HD 7470M + 1179 fb52 Radeon HD 7470M + 1179 fb53 Radeon HD 7470M + 1179 fb81 Radeon HD 7470M + 1179 fb82 Radeon HD 7470M + 1179 fb83 Radeon HD 7470M + 1179 fc51 Radeon HD 6470M + 1179 fc52 Radeon HD 7470M + 1179 fc56 Radeon HD 7470M + 1179 fcd3 Radeon HD 7470M + 1179 fcd4 Radeon HD 7470M + 1179 fcee Radeon HD 7470M + 1179 fdee Radeon HD 7470M + 144d b074 Radeon HD 6470M + 144d b084 Radeon HD 6470M + 144d c095 Radeon HD 6470M + 144d c0b3 Radeon HD 6490M + 144d c538 Radeon HD 6470M + 144d c581 Radeon HD 6470M + 144d c589 Radeon HD 6470M + 144d c609 Radeon HD 7470M + 144d c625 Radeon HD 7470M + 144d c636 Radeon HD 7450M + 1462 10ac Radeon HD 6470M + 152d 0916 Radeon HD 6470M + 17aa 21e5 Radeon HD 6470M + 17aa 3900 Radeon HD 7450M + 17aa 3902 Radeon HD 7450M + 17aa 3969 Radeon HD 6470M + 17aa 3970 Radeon HD 7450M + 17aa 3976 Radeon HD 6470M + 17aa 397b Radeon HD 6470M + 17aa 397d Radeon HD 6470M + 17aa 5101 Radeon HD 7470M + 17aa 5102 Radeon HD 7450M + 17aa 5103 Radeon HD 7450M + 17aa 5106 Radeon HD 7450M + 1854 0897 Radeon HD 6470M + 1854 0900 Radeon HD 6470M + 1854 0908 Radeon HD 6470M + 1854 2015 Radeon HD 6470M 6761 Seymour LP [Radeon HD 6430M] 6763 Seymour [Radeon E6460] 6764 Seymour [Radeon HD 6400M Series] @@ -1487,15 +1868,57 @@ 6767 Caicos 6768 Caicos 6770 Caicos [Radeon HD 6450A/7450A] + 17aa 308d Radeon HD 7450A + 17aa 3623 Radeon HD 6450A + 17aa 3627 Radeon HD 6450A + 17aa 3629 Radeon HD 6450A + 17aa 363c Radeon HD 6450A + 17aa 3658 Radeon HD 7470A 6771 Caicos XTX [Radeon HD 8490] 6772 Caicos [Radeon HD 7450A] - 6778 Caicos XT [Radeon HD 7470] + 6778 Caicos XT [Radeon HD 7470/8470] + 1019 0024 Radeon HD 7470 + 1019 0027 Radeon HD 8470 + 1028 2120 Radeon HD 7470 + 1462 b491 Radeon HD 8470 + 1462 b492 Radeon HD 8470 1462 b493 Radeon HD 8470 OEM - 6779 Caicos [Radeon HD 6450] + 1642 3c65 Radeon HD 8470 + 1642 3c75 Radeon HD 8470 + 174b 8145 Radeon HD 8470 + 174b e145 Radeon HD 7470 + 6779 Caicos [Radeon HD 6450/7450/8450] + 1019 0016 Radeon HD 6450 + 1019 0017 Radeon HD 6450 + 1019 0018 Radeon HD 6450 + 1028 2120 Radeon HD 6450 + 103c 2128 Radeon HD 6450 + 103c 2aee Radeon HD 7450A + 1462 2346 Radeon HD 7450 + 1462 2490 Radeon HD 6450 + 1462 2494 Radeon HD 6450 + 1462 2496 Radeon HD 7450 + 148c 7450 Radeon HD 7450 148c 8450 Radeon HD 8450 OEM + 1545 7470 Radeon HD 7470 + 1642 3a65 Radeon HD 6450 + 1642 3a66 Radeon HD 7450 + 1642 3a75 Radeon HD 6450 + 1642 3a76 Radeon HD 7450 + 1682 3200 Radeon HD 7450 174b 7450 Radeon HD 7450 + 174b e127 Radeon HD 6450 + 174b e153 Radeon HD 6450 174b e164 Radeon HD 6450 1 GB DDR3 + 174b e180 Radeon HD 6450 + 174b e201 Radeon HD 6450 17af 8450 Radeon HD 8450 OEM + 1b0a 9096 Radeon HD 6450 + 1b0a 9097 Radeon HD 6450 + 1b0a 90a8 Radeon HD 6450A + 1b0a 90b1 Radeon HD 6450 + 1b0a 90b3 Radeon HD 7450A + 1b0a 90bb Radeon HD 7450A 677b Caicos PRO [Radeon HD 7450] 6780 Tahiti XT GL [FirePro W9000] 6784 Tahiti [ATI FirePro V (FireGL V) Graphics Adapter] @@ -1510,6 +1933,7 @@ 6792 Tahiti 6798 Tahiti XT [Radeon HD 7970] 1002 3000 Tahiti XT2 [Radeon HD 7970 GHz Edition] + 1002 4000 Radeon HD 8970 OEM 1043 041c HD 7970 DirectCU II 1043 0420 HD 7970 DirectCU II TOP 1043 0444 HD 7970 DirectCU II TOP @@ -1533,8 +1957,18 @@ 1002 3000 Tahiti PRO2 [Radeon HD 7950 Boost] 1462 3000 Radeon HD 8950 OEM 679b Malta [Radeon HD 7990] + 1002 0b28 Radeon HD 8990 OEM + 1002 0b2a Radeon HD 7990 + 1462 8036 Radeon HD 8990 OEM 679e Tahiti LE [Radeon HD 7870 XT] 679f Tahiti + 67a0 Hawaii XT GL + 67a1 Hawaii GL + 67a2 Hawaii GL + 67b0 Hawaii XT [Radeon HD 8970] + 67b1 Hawaii PRO + 67b9 Vesuvius + 67be Hawaii LE 6800 Wimbledon XT [Radeon HD 7970M] 1002 0124 Radeon HD 7970M 8086 2110 Radeon HD 7970M @@ -1553,24 +1987,29 @@ 6816 Pitcairn 6817 Pitcairn 6818 Pitcairn XT [Radeon HD 7870 GHz Edition] - 1002 0b05 Pitcairn XT [Radeon HD 8870 OEM] + 1002 0b05 Radeon HD 8870 OEM + 174b 8b04 Radeon HD 8860 6819 Pitcairn PRO [Radeon HD 7850] - 174b e221 Sapphire Radeon HD 7850 2 GB GDDR5 DVI-I/DVI-D/HDMI/DP + 174b e221 Radeon HD 7850 2GB GDDR5 DVI-I/DVI-D/HDMI/DP 6820 Venus XTX [Radeon HD 8800M Series] + 103c 1851 Radeon HD 7750M 6821 Venus XT [Radeon HD 8800M Series] + 6822 Venus PRO 6823 Venus PRO [Radeon HD 8800M Series] - 6824 Chelsea [Radeon HD 7700M Series] 6825 Heathrow XT [Radeon HD 7870M] 8086 2111 Chelsea PRO 6826 Chelsea LP [Radeon HD 7700M Series] 6827 Heathrow PRO [Radeon HD 7850M/8850M] 6828 Cape Verde PRO [FirePro W600] 6829 Cape Verde + 682a Venus PRO 682b Venus LE [Radeon HD 8800M Series] 682d Chelsea XT GL [FirePro M4000] 682f Chelsea LP [Radeon HD 7730M] + 103c 1851 Radeon HD 7750M 6830 Cape Verde [Radeon HD 7800M Series] 6831 Cape Verde [AMD Radeon HD 7700M Series] + 6835 Cape Verde PRX 6837 Cape Verde LE [Radeon HD 7730] 1787 3000 Radeon HD 6570 6838 Cape Verde @@ -1581,12 +2020,115 @@ 1019 0030 Radeon HD 8760 OEM 103c 6890 Radeon HD 8760 OEM 683f Cape Verde PRO [Radeon HD 7750] - 6840 Thames XT [Radeon HD 7670M] + 6840 Thames [Radeon HD 7500M/7600M Series] + 1025 050e Radeon HD 7670M + 1025 050f Radeon HD 7670M + 1025 0513 Radeon HD 7670M + 1025 0514 Radeon HD 7670M + 1025 056d Radeon HD 7670M + 1025 059a Radeon HD 7670M + 1025 059b Radeon HD 7670M + 1025 059e Radeon HD 7670M + 1025 0600 Radeon HD 7670M + 1025 0606 Radeon HD 7670M + 1025 0696 Radeon HD 7650M + 1025 0697 Radeon HD 7650M + 1025 0698 Radeon HD 7650M + 1025 0699 Radeon HD 7650M + 1025 0757 Radeon HD 7670M + 1028 056a Radeon HD 7670M + 1028 056e Radeon HD 7670M + 1028 0598 Radeon HD 7670M + 1028 059d Radeon HD 7670M + 1028 05a3 Radeon HD 7670M + 1028 05b9 Radeon HD 7670M + 1028 05bb Radeon HD 7670M + 103c 17f1 Radeon HD 7570M + 103c 17f4 Radeon HD 7650M + 103c 1813 Radeon HD 7590M + 103c 182f Radeon HD 7670M + 103c 1830 Radeon HD 7670M + 103c 1835 Radeon HD 7670M + 103c 183a Radeon HD 7670M + 103c 183c Radeon HD 7670M + 103c 183e Radeon HD 7670M + 103c 1840 Radeon HD 7670M + 103c 1842 Radeon HD 7670M + 103c 1844 Radeon HD 7670M + 103c 1848 Radeon HD 7670M + 103c 184a Radeon HD 7670M + 103c 184c Radeon HD 7670M + 103c 1895 Radeon HD 7670M + 103c 1897 Radeon HD 7670M + 103c 18a5 Radeon HD 7670M + 103c 18a7 Radeon HD 7670M + 103c 18f4 Radeon HD 7670M + 1043 100a Radeon HD 7670M + 1043 104b Radeon HD 7670M + 1043 10dc Radeon HD 7670M + 1043 2121 Radeon HD 7670M + 1043 2122 Radeon HD 7670M + 1043 2123 Radeon HD 7670M + 1043 2125 Radeon HD 7670M + 1043 2127 Radeon HD 7670M + 1179 fb11 Radeon HD 7670M + 1179 fb22 Radeon HD 7670M + 1179 fb23 Radeon HD 7670M + 1179 fb2c Radeon HD 7670M + 1179 fb31 Radeon HD 7670M + 1179 fb32 Radeon HD 7670M + 1179 fb38 Radeon HD 7670M + 1179 fb39 Radeon HD 7670M + 1179 fb3a Radeon HD 7670M + 1179 fb40 Radeon HD 7670M + 1179 fb41 Radeon HD 7670M + 1179 fb47 Radeon HD 7670M + 1179 fb48 Radeon HD 7670M + 1179 fb51 Radeon HD 7670M + 1179 fb52 Radeon HD 7670M + 1179 fb53 Radeon HD 7670M + 1179 fb81 Radeon HD 7670M + 1179 fb82 Radeon HD 7670M + 1179 fb83 Radeon HD 7670M + 1179 fc56 Radeon HD 7670M + 1179 fcd4 Radeon HD 7670M + 1179 fcee Radeon HD 7670M + 144d c0c5 Radeon HD 7690M + 144d c0ce Radeon HD 7670M + 144d c0da Radeon HD 7670M + 17aa 3970 Radeon HD 7670M + 17aa 397b Radeon HD 7670M + 17aa 5101 Radeon HD 7670M + 17aa 5102 Radeon HD 7670M + 17aa 5103 Radeon HD 7670M 6841 Thames [Radeon 7550M/7570M/7650M] + 1028 0561 Radeon HD 7650M + 1028 056c Radeon HD 7650M + 1028 057f Radeon HD 7570M + 103c 17f1 Radeon HD 7570M + 103c 17f4 Radeon HD 7650M + 103c 1813 Radeon HD 7570M + 103c 183a Radeon HD 7650M + 103c 183c Radeon HD 7650M + 103c 183e Radeon HD 7650M + 103c 1840 Radeon HD 7650M + 103c 1842 Radeon HD 7650M + 103c 1844 Radeon HD 7650M + 1043 100a Radeon HD 7650M + 1043 104b Radeon HD 7650M + 1043 10dc Radeon HD 7650M + 1043 2134 Radeon HD 7650M + 1179 0001 Radeon HD 7570M + 1179 0002 Radeon HD 7570M + 1179 fb43 Radeon HD 7550M + 1179 fb91 Radeon HD 7550M + 1179 fb92 Radeon HD 7550M + 1179 fb93 Radeon HD 7550M + 1179 fba2 Radeon HD 7550M + 1179 fba3 Radeon HD 7550M + 144d c0c7 Radeon HD 7550M 6842 Thames LE [Radeon HD 7000M Series] 6843 Thames [Radeon HD 7670M] - 6849 Lombok [AMD Radeon HD 7400 Series] - 6880 Cypress 6888 Cypress XT [FirePro V8800] 6889 Cypress PRO [FirePro V7800] 1002 0301 FirePro V7800P @@ -1616,7 +2158,26 @@ 68a1 Broadway PRO [Mobility Radeon HD 5850] 106b 00cc iMac MC511 Mobility Radeon HD 5850 MXM Module 68a8 Granville [Radeon HD 6850M/6870M] + 1025 0442 Radeon HD 6850M + 1025 0451 Radeon HD 6850M + 1025 050a Radeon HD 6850M + 1025 050b Radeon HD 6850M + 1025 050c Radeon HD 6850M + 1025 050e Radeon HD 6850M + 1025 050f Radeon HD 6850M + 1025 0513 Radeon HD 6850M + 1025 0514 Radeon HD 6850M + 1025 0515 Radeon HD 6850M + 1025 0516 Radeon HD 6850M + 1025 0525 Radeon HD 6850M + 1025 0526 Radeon HD 6850M + 1025 056d Radeon HD 6850M + 1028 048f Radeon HD 6870M + 1028 0490 Radeon HD 6870M + 1028 04b9 Radeon HD 6870M + 1028 04ba Radeon HD 6870M 103c 159b Radeon HD 6850M + 144d c0ad Radeon HD 6850M 68a9 Juniper XT [FirePro V5800] 68b8 Juniper XT [Radeon HD 5770] 106b 00cf MacPro5,1 [Mac Pro 2.8GHz DDR3] @@ -1627,60 +2188,405 @@ 68bf Juniper PRO [Radeon HD 6750] 174b 6750 Radeon HD 6750 68c0 Madison [Mobility Radeon HD 5730 / 6570M] + 1019 2383 Mobility Radeon HD 5730 + 1028 02a2 Mobility Radeon HD 5730 + 1028 02fe Mobility Radeon HD 5730 + 1028 0419 Mobility Radeon HD 5730 + 103c 147d Mobility Radeon HD 5730 103c 1521 Madison XT [FirePro M5800] 103c 1593 Mobility Radeon HD 6570 103c 1596 Mobility Radeon HD 6570 103c 1599 Mobility Radeon HD 6570 - 68c1 Madison [Mobility Radeon HD 5650/5750 / 6550M] + 1043 1c22 Mobility Radeon HD 5730 + 17aa 3927 Mobility Radeon HD 5730 + 17aa 3952 Mobility Radeon HD 5730 + 17aa 3978 Radeon HD 6570M + 68c1 Madison [Mobility Radeon HD 5650/5750 / 6530M/6550M] + 1025 0205 Mobility Radeon HD 5650 + 1025 0293 Mobility Radeon HD 5650 + 1025 0294 Mobility Radeon HD 5650 + 1025 0296 Mobility Radeon HD 5650 + 1025 0308 Mobility Radeon HD 5650 + 1025 030a Mobility Radeon HD 5650 + 1025 0311 Mobility Radeon HD 5650 + 1025 0312 Mobility Radeon HD 5650 + 1025 031c Mobility Radeon HD 5650 + 1025 031d Mobility Radeon HD 5650 1025 033d Mobility Radeon HD 5650 + 1025 033e Mobility Radeon HD 5650 + 1025 033f Mobility Radeon HD 5650 + 1025 0346 Mobility Radeon HD 5650 1025 0347 Aspire 7740G + 1025 0348 Mobility Radeon HD 5650 + 1025 0356 Mobility Radeon HD 5650 + 1025 0357 Mobility Radeon HD 5650 + 1025 0358 Mobility Radeon HD 5650 + 1025 0359 Mobility Radeon HD 5650 + 1025 035a Mobility Radeon HD 5650 + 1025 035b Mobility Radeon HD 5650 + 1025 035c Mobility Radeon HD 5650 + 1025 035d Mobility Radeon HD 5650 + 1025 035e Mobility Radeon HD 5650 + 1025 0360 Mobility Radeon HD 5650 + 1025 0362 Mobility Radeon HD 5650 + 1025 0364 Mobility Radeon HD 5650 + 1025 0365 Mobility Radeon HD 5650 + 1025 0366 Mobility Radeon HD 5650 + 1025 0367 Mobility Radeon HD 5650 + 1025 0368 Mobility Radeon HD 5650 + 1025 036c Mobility Radeon HD 5650 + 1025 036d Mobility Radeon HD 5650 + 1025 036e Mobility Radeon HD 5650 + 1025 036f Mobility Radeon HD 5650 + 1025 0372 Mobility Radeon HD 5650 + 1025 0373 Mobility Radeon HD 5650 + 1025 0377 Mobility Radeon HD 5650 + 1025 0378 Mobility Radeon HD 5650 + 1025 0379 Mobility Radeon HD 5650 + 1025 037a Mobility Radeon HD 5650 + 1025 037b Mobility Radeon HD 5650 + 1025 037e Mobility Radeon HD 5650 + 1025 037f Mobility Radeon HD 5650 + 1025 0382 Mobility Radeon HD 5650 + 1025 0383 Mobility Radeon HD 5650 + 1025 0384 Mobility Radeon HD 5650 + 1025 0385 Mobility Radeon HD 5650 + 1025 0386 Mobility Radeon HD 5650 + 1025 0387 Mobility Radeon HD 5650 + 1025 0388 Mobility Radeon HD 5650 + 1025 038b Mobility Radeon HD 5650 + 1025 038c Mobility Radeon HD 5650 + 1025 039a Mobility Radeon HD 5650 + 1025 0411 Mobility Radeon HD 5650 + 1025 0412 Mobility Radeon HD 5650 + 1025 0418 Mobility Radeon HD 5650 + 1025 0419 Mobility Radeon HD 5650 + 1025 0420 Mobility Radeon HD 5650 + 1025 0421 Mobility Radeon HD 5650 + 1025 0425 Mobility Radeon HD 5650 + 1025 042a Mobility Radeon HD 5650 + 1025 042e Mobility Radeon HD 5650 + 1025 042f Mobility Radeon HD 5650 + 1025 0432 Mobility Radeon HD 5650 + 1025 0433 Mobility Radeon HD 5650 + 1025 0442 Mobility Radeon HD 5650 + 1025 044c Mobility Radeon HD 5650 + 1025 044e Mobility Radeon HD 5650 + 1025 0451 Mobility Radeon HD 5650 + 1025 0454 Mobility Radeon HD 5650 + 1025 0455 Mobility Radeon HD 5650 + 1025 0475 Mobility Radeon HD 5650 + 1025 0476 Mobility Radeon HD 5650 + 1025 0487 Mobility Radeon HD 5650 + 1025 0489 Mobility Radeon HD 5650 + 1025 0498 Mobility Radeon HD 5650 + 1025 0517 Radeon HD 6550M + 1025 051a Radeon HD 6550M + 1025 051b Radeon HD 6550M + 1025 051c Radeon HD 6550M + 1025 051d Radeon HD 6550M + 1025 0525 Radeon HD 6550M + 1025 0526 Radeon HD 6550M + 1025 052b Radeon HD 6550M + 1025 052c Radeon HD 6550M + 1025 053c Radeon HD 6550M + 1025 053d Radeon HD 6550M + 1025 053e Radeon HD 6550M + 1025 053f Radeon HD 6550M + 1025 0607 Radeon HD 6550M + 1028 041b Mobility Radeon HD 5650 + 1028 0447 Mobility Radeon HD 5650 + 1028 0448 Mobility Radeon HD 5650 + 1028 0456 Mobility Radeon HD 5650 + 1028 0457 Mobility Radeon HD 5650 + 103c 1436 Mobility Radeon HD 5650 + 103c 1437 Mobility Radeon HD 5650 + 103c 1440 Mobility Radeon HD 5650 + 103c 1448 Mobility Radeon HD 5650 + 103c 1449 Mobility Radeon HD 5650 + 103c 144a Mobility Radeon HD 5650 + 103c 144b Mobility Radeon HD 5650 + 103c 147b Mobility Radeon HD 5650 + 103c 149c Mobility Radeon HD 5650 + 103c 149e Mobility Radeon HD 5650 103c 1521 Madison Pro [FirePro M5800] + 1043 1bc2 Mobility Radeon HD 5650 + 104d 9071 Mobility Radeon HD 5650 + 104d 9077 Mobility Radeon HD 5650 + 104d 9081 Mobility Radeon HD 5650 + 1179 fd00 Mobility Radeon HD 5650 + 1179 fd12 Mobility Radeon HD 5650 + 1179 fd1a Mobility Radeon HD 5650 + 1179 fd30 Mobility Radeon HD 5650 + 1179 fd31 Mobility Radeon HD 5650 + 1179 fd50 Mobility Radeon HD 5650 + 1179 fd52 Radeon HD 6530M + 1179 fd63 Radeon HD 6530M + 1179 fd65 Radeon HD 6530M + 1179 fdd0 Mobility Radeon HD 5650 + 1179 fdd2 Radeon HD 6530M + 144d c07e Mobility Radeon HD 5650 + 144d c085 Mobility Radeon HD 5650 + 14c0 0043 Mobility Radeon HD 5650 + 14c0 004d Mobility Radeon HD 5650 + 17aa 3928 Mobility Radeon HD 5650 + 17aa 3951 Mobility Radeon HD 5650 + 17aa 3977 Radeon HD 6550M 68c7 Madison [Mobility Radeon HD 5570/6550A] + 1462 2241 Mobility Radeon HD 5570 + 1462 2243 Mobility Radeon HD 5570 + 1462 2244 Mobility Radeon HD 5570 + 1462 2245 Radeon HD 6550A + 1462 2246 Radeon HD 6550A 68c8 Redwood XT GL [FirePro V4800] 68c9 Redwood PRO GL [FirePro V3800] - 68d8 Redwood XT [Radeon HD 5670] + 68d8 Redwood XT [Radeon HD 5670/5690/5730] + 1028 68e0 Radeon HD 5670 + 174b 5690 Radeon HD 5690 + 174b 5730 Radeon HD 5730 + 174b e151 Radeon HD 5670 1787 3000 Radeon HD 5730 - 68d9 Redwood PRO [Radeon HD 5570] + 17af 3010 Radeon HD 5730 + 17af 3011 Radeon HD 5690 + 68d9 Redwood PRO [Radeon HD 5550/5570/5630/6510/6610/7570] + 103c 6870 Radeon HD 5570 + 103c 6872 Radeon HD 5570 + 1043 03ce Radeon HD 5550 + 1462 2151 Radeon HD 5570 + 1462 2240 Radeon HD 5570 148c 3000 Radeon HD 6510 148c 3001 Radeon HD 6610 - 68da Redwood LE [Radeon HD 5550] + 1545 5550 Radeon HD 5550 + 1545 7570 Radeon HD 7570 + 1642 3985 Radeon HD 5570 + 1642 3996 Radeon HD 5570 + 174b 3000 Radeon HD 6510 + 174b 6510 Radeon HD 6510 + 174b 6610 Radeon HD 6610 + 174b e142 Radeon HD 5570 + 1787 3000 Radeon HD 6510 + 17af 3000 Radeon HD 6510 + 17af 3010 Radeon HD 5630 + 68da Redwood LE [Radeon HD 5550/5570/5630/6390/6490/7570] 148c 3000 Radeon HD 6390 148c 3001 Radeon HD 6490 + 1545 7570 Radeon HD 7570 + 174b 3000 Radeon HD 6390 + 174b 5570 Radeon HD 5570 + 174b 5630 Radeon HD 5630 + 174b 6490 Radeon HD 6490 + 1787 3000 Radeon HD 5630 + 17af 3000 Radeon HD 6390 + 17af 3010 Radeon HD 5630 68de Redwood 68e0 Park [Mobility Radeon HD 5430/5450/5470] + 1028 0404 Mobility Radeon HD 5450 + 1028 0414 Mobility Radeon HD 5450 + 1028 0434 Mobility Radeon HD 5450 + 103c 1433 Mobility Radeon HD 5450 + 103c 1434 Mobility Radeon HD 5450 + 103c 1469 Mobility Radeon HD 5450 + 103c 146b Mobility Radeon HD 5450 103c 1486 TouchSmart tm2-2050er discrete GPU (Mobility Radeon HD 5450) + 103c 1622 Mobility Radeon HD 5450 + 103c 1623 Mobility Radeon HD 5450 + 103c eeee Mobility Radeon HD 5450 + 104d 9076 Mobility Radeon HD 5450 + 1682 304e Caicos [Radeon HD 5450] + 1682 6000 Caicos [Radeon HD 5450] + 17aa 9e52 FirePro M3800 + 17aa 9e53 FirePro M3800 68e1 Park [Mobility Radeon HD 5430] + 1043 041f Caicos [Radeon HD 7350] + 1043 3000 Caicos [Radeon HD 5450] + 148c 3000 Caicos [Radeon HD 5450] + 148c 3001 Caicos [Radeon HD 6230] + 148c 3002 Caicos [Radeon HD 6250] + 148c 3003 Caicos [Radeon HD 6350] 148c 7350 Caicos [Radeon HD 7350] + 148c 8350 Caicos [Radeon HD 8350] 1545 5450 Caicos [Radeon HD 5450] + 1545 7350 Caicos [Radeon HD 7350] + 1682 3000 Caicos [Radeon HD 5450] + 1682 6000 Caicos [Radeon HD 5450] + 1682 7350 Caicos [Radeon HD 7350] + 174b 3000 Caicos [Radeon HD 5450] 174b 5470 Caicos [Radeon HD 5470] + 174b 6000 Caicos [Radeon HD 5450] + 174b 6230 Caicos [Radeon HD 6230] 174b 6350 Caicos [Radeon HD 6350] + 174b 7350 Caicos [Radeon HD 7350] + 1787 3000 Caicos [Radeon HD 5450] + 17af 3000 Caicos [Radeon HD 5450] + 17af 3001 Caicos [Radeon HD 6230] + 17af 3014 Caicos [Radeon HD 6350] 17af 3015 Caicos [Radeon HD 7350] 17af 8350 Caicos [Radeon HD 8350 OEM] 68e4 Robson CE [Radeon HD 6370M/7370M] + 1019 2386 Radeon HD 6350M + 1019 2387 Radeon HD 6350M + 1019 238d Radeon HD 6370M + 1019 238e Radeon HD 6370M + 1025 0382 Radeon HD 6370M + 1025 0489 Radeon HD 6370M + 1025 048a Radeon HD 6370M + 1025 048b Radeon HD 6370M + 1025 048c Radeon HD 6370M + 1028 04c1 Radeon HD 6370M + 1028 04ca Radeon HD 6370M + 1028 04cc Radeon HD 6370M + 1028 04cd Radeon HD 6370M + 1028 04d7 Radeon HD 6370M + 103c 1411 Radeon HD 6370M + 103c 1421 Radeon HD 6370M + 103c 1426 Radeon HD 6370M + 103c 1428 Radeon HD 6370M + 103c 142a Radeon HD 6370M + 103c 142b Radeon HD 6370M + 103c 143a Radeon HD 6370M + 103c 143c Radeon HD 6370M + 103c 1445 Radeon HD 6370M + 103c 162c Radeon HD 6370M + 103c 162d Radeon HD 6370M + 103c 162e Radeon HD 6370M + 103c 162f Radeon HD 6370M + 103c 1639 Radeon HD 6370M + 103c 163a Radeon HD 6370M + 103c 163b Radeon HD 6370M + 103c 163c Radeon HD 6370M + 103c 163d Radeon HD 6370M + 103c 163e Radeon HD 6370M + 103c 163f Radeon HD 6370M + 103c 1641 Radeon HD 6370M + 103c 1643 Radeon HD 6370M + 103c 3578 Radeon HD 6370M + 103c 357a Radeon HD 6370M + 103c 3673 Radeon HD 6370M + 103c 3675 Radeon HD 6370M + 1043 1c92 Radeon HD 6370M + 1043 84a1 Radeon HD 6370M + 1043 84ad Radeon HD 6370M + 104d 9081 Radeon HD 6370M + 1545 7350 Cedar [Radeon HD 7350] + 1558 4510 Radeon HD 6370M + 1558 5505 Radeon HD 6370M + 174b 5450 Cedar [Radeon HD 5450] + 17aa 21dd Radeon HD 6370M + 17aa 21e9 Radeon HD 6370M + 17aa 3971 Radeon HD 6370M + 17aa 3972 Radeon HD 7370M + 17aa 397a Radeon HD 6370M/7370M + 17aa 397b Radeon HD 6370M/7370M + 17aa 397f Radeon HD 7370M 68e5 Robson LE [Radeon HD 6330M] - 148c 7350 Radeon HD 7350 + 1179 fd3c Radeon HD 6330M + 1179 fd50 Radeon HD 6330M + 1179 fd52 Radeon HD 6330M + 1179 fd63 Radeon HD 6330M + 1179 fd65 Radeon HD 6330M + 1179 fd73 Radeon HD 6330M + 1179 fd75 Radeon HD 6330M + 1179 fdd0 Radeon HD 6330M + 1179 fdd2 Radeon HD 6330M + 1179 fdea Radeon HD 6330M + 1179 fdf8 Radeon HD 6330M + 148c 5450 Cedar [Radeon HD 5450] + 148c 6350 Cedar [Radeon HD 6350] + 148c 7350 Cedar [Radeon HD 7350] + 148c 8350 Cedar [Radeon HD 8350] + 1545 7350 Cedar [Radeon HD 7350] 68e8 Cedar 68e9 Cedar [ATI FirePro (FireGL) Graphics Adapter] 68f1 Cedar GL [FirePro 2460] 68f2 Cedar GL [FirePro 2270] 68f8 Cedar [Radeon HD 7300 Series] - 68f9 Cedar [Radeon HD 5000/6000/7350 Series] + 68f9 Cedar [Radeon HD 5000/6000/7350/8350 Series] 1019 0001 Radeon HD 5450 + 1019 0002 Radeon HD 5450 1019 0019 Radeon HD 6350 + 1025 0518 Radeon HD 5450 + 1025 0519 Radeon HD 5450 1028 010e XPS 8300 + 1028 2126 Radeon HD 6350 + 103c 2126 Radeon HD 6350 + 103c 2aac Radeon HD 5450 + 103c 2aae Radeon HD 5450 + 103c 3580 Radeon HD 5450 1043 03c2 EAH5450 SILENT/DI/512MD2 (LP) + 1462 2130 Radeon HD 5450 + 1462 2131 Radeon HD 5450 + 1462 2133 Radeon HD 6350 + 1462 2180 Radeon HD 5450 + 1462 2181 Radeon HD 5450 + 1462 2182 Radeon HD 6350 + 1462 2183 Radeon HD 6350 + 1462 2230 Radeon HD 5450 + 1462 2231 Radeon HD 5450 + 1462 2495 Radeon HD 6350 148c 3001 Radeon HD 5530/6250 148c 3002 Radeon HD 6290 148c 3003 Radeon HD 6230 148c 3004 Radeon HD 6350 148c 7350 Radeon HD 7350 + 148c 8350 Radeon HD 8350 + 1545 7350 Radeon HD 7350 + 1642 3983 Radeon HD 5450 + 1642 3984 Radeon HD 6350 + 1642 3987 Radeon HD 6350 + 1642 3997 Radeon HD 5450 + 1642 3a05 Radeon HD 5450 + 1642 3b31 Radeon HD 6350A + 1682 3270 Radeon HD 7350 + 174b 3000 Radeon HD 6230 + 174b 3987 Radeon HD 6350 174b 5470 Radeon HD 5470 174b 5490 Radeon HD 5490 174b 5530 Radeon HD 5530 + 174b 6230 Radeon HD 6230 + 174b 6250 Radeon HD 6250 + 174b 6290 Radeon HD 6290 + 174b 6350 Radeon HD 6350 174b 7350 Radeon HD 7350 - 68fa Cedar [Radeon HD 7350] + 174b 8350 Radeon HD 8350 + 174b e127 Radeon HD 5450 + 174b e145 Radeon HD 5450 + 174b e153 Radeon HD 5450 + 1787 3000 Radeon HD 5470 + 1787 3001 Radeon HD 5530 + 1787 3002 Radeon HD 5490 + 17aa 3602 Radeon HD 5450 + 17aa 3603 Radeon HD 5450 + 17aa 360f Radeon HD 5450 + 17aa 3619 Radeon HD 5450 + 17af 3000 Radeon HD 6250 + 17af 3001 Radeon HD 6230 + 17af 3002 Radeon HD 6290 + 17af 3011 Radeon HD 5470 + 17af 3012 Radeon HD 5490 + 17af 3013 Radeon HD 5470 + 17af 3014 Radeon HD 6350 + 68fa Cedar [Radeon HD 7350/8350] + 1019 0019 Radeon HD 7350 + 1019 0021 Radeon HD 7350 + 1019 0022 Radeon HD 7350 + 1019 0026 Radeon HD 8350 + 103c 2adf Radeon HD 7350A + 103c 2ae8 Radeon HD 7350A + 1043 8350 Radeon HD 8350 + 1462 2128 Radeon HD 7350 + 1462 2184 Radeon HD 7350 + 1462 2186 Radeon HD 7350 + 1462 2495 Radeon HD 7350 + 1462 b490 Radeon HD 7350 + 1642 3985 Radeon HD 7350 + 174b 7350 Radeon HD 7350 + 174b 8153 Radeon HD 8350 + 174b e127 Radeon HD 7350 + 174b e153 Radeon HD 7350 + 174b e180 Radeon HD 7350 17af 3015 Radeon HD 7350 68fe Cedar LE + 6920 Tonga 700f RS100 AGP Bridge 7010 RS200/RS250 AGP Bridge 7100 R520 [Radeon X1800 XT] @@ -1847,7 +2753,7 @@ 9441 R700 [Radeon HD 4870 X2] 9442 RV770 [Radeon HD 4850] 1002 0502 MSI Radeon HD 4850 512MB GDDR3 - 174b e810 Sapphire Radeon HD 4850 512MB GDDR3 + 174b e810 Radeon HD 4850 512MB GDDR3 9443 R700 [Radeon HD 4850 X2] 9444 RV770 GL [FirePro V8750] 9446 RV770 GL [FirePro V7760] @@ -1855,7 +2761,7 @@ 944b RV770/M98 [Mobility Radeon HD 4850 X2] 944c RV770 LE [Radeon HD 4830] 944e RV770 CE [Radeon HD 4710] - 174b 3261 Sapphire Radeon HD 4810 + 174b 3261 Radeon HD 4810 9450 RV770 GL [FireStream 9270] 9452 RV770 GL [FireStream 9250] 9456 RV770 GL [FirePro V8700] @@ -1864,7 +2770,7 @@ 9462 RV790 [Radeon HD 4860] 946a RV770 GL [FirePro M7750] 9480 RV730/M96 [Mobility Radeon HD 4650/5165] - 103c 3628 ATI Mobility Radeon HD 4650 [dv6-1190en] + 103c 3628 Mobility Radeon HD 4650 [dv6-1190en] 9488 RV730/M96-XT [Mobility Radeon HD 4670] 9489 RV730/M96 GL [Mobility FireGL V5725] 9490 RV730 XT [Radeon HD 4670] @@ -1890,8 +2796,8 @@ 1028 0d02 Optiplex 755 94c3 RV610 [Radeon HD 2400 PRO] 1028 0302 Radeon HD 2400 Pro - 174b e400 Sapphire Radeon HD 2400 PRO - 18bc 3550 GeCube Radeon HD 2400 PRO + 174b e400 Radeon HD 2400 PRO + 18bc 3550 Radeon HD 2400 PRO 94c4 RV610 LE [Radeon HD 2400 PRO AGP] 94c5 RV610 [Radeon HD 2400 LE] 94c7 RV610 [Radeon HD 2350] @@ -1902,7 +2808,7 @@ 94cc RV610 LE [Radeon HD 2400 PRO PCI] 9500 RV670 [Radeon HD 3850 X2] 9501 RV670 [Radeon HD 3870] - 174b e620 Sapphire Radeon HD 3870 PCIe 2.0 + 174b e620 Radeon HD 3870 9504 RV670/M88 [Mobility Radeon HD 3850] 9505 RV670 [Radeon HD 3690/3850] 148c 3000 Radeon HD 3850 @@ -1931,6 +2837,19 @@ # 113-2E172001-003 174b 3000 Radeon HD 4350/4550 HyperMemory DDR2 9553 RV710/M92 [Mobility Radeon HD 4530/4570/545v] + 1025 015e Mobility Radeon HD 4570 + 1025 017d Mobility Radeon HD 4570 + 1025 0205 Mobility Radeon HD 4570 + 1025 0206 Mobility Radeon HD 4570 + 1025 0237 Mobility Radeon HD 4570 + 1028 02be Mobility Radeon HD 4570 + 1028 02e8 Mobility Radeon HD 4530 + 103c 3624 Mobility Radeon HD 4530 + 103c 3628 Mobility Radeon HD 4530 + 103c 3636 Mobility Radeon HD 4530 + 1043 1b32 Mobility Radeon HD 4570 + 1043 1b42 Mobility Radeon HD 4570 + 104d 9056 Mobility Radeon HD 4570 1179 ff82 Satellite L505-13T GPU (Mobility Radeon HD 5145) 9555 RV710/M92 [Mobility Radeon HD 4350/4550] 103c 1411 ProBook 4720s GPU (Mobility Radeon HD 4350) @@ -2013,7 +2932,7 @@ 1043 843e M5A88-V EVO # Radeon HD 6250 too? 9802 Wrestler [Radeon HD 6310] - 174b 1001 Sapphire PURE Fusion Mini + 174b 1001 PURE Fusion Mini 9803 Wrestler [Radeon HD 6310] 9804 Wrestler [Radeon HD 6250] 9805 Wrestler [Radeon HD 6250] @@ -2035,9 +2954,25 @@ 983a Kabini 983b Kabini 983c Kabini - 983d Kabini [Radeon HD 8250] + 983d Temash [Radeon HD 8250/8280G] 983e Kabini 983f Kabini + 9850 Mullins [Radeon APU A6-6200 with R3 Graphics] + 9851 Mullins [Radeon APU A4-6000 with R2 Graphics] + 9852 Mullins [Radeon APU A4-6000 with R2 Graphics] + 9853 Mullins [Radeon APU E2-4000 with R2 Graphics] + 9854 Mullins [Radeon APU E2-3700 with R2 Graphics] + 9855 Mullins [Radeon APU XX-2450M with R3 Graphics] + 9856 Mullins [Radeon APU XX-2200M with R2 Graphics] + 9857 Mullins [Radeon APU XX-2200M with R2 Graphics] + 9858 Mullins + 9859 Mullins + 985a Mullins + 985b Mullins + 985c Mullins + 985d Mullins + 985e Mullins + 985f Mullins # AMD A10-5800K CPU 9901 Trinity [Radeon HD 7660D] 9902 Trinity HDMI Audio Controller @@ -2079,16 +3014,15 @@ aa00 R600 HDMI Audio [Radeon HD 2900 Series] aa08 RV630 HDMI Audio [Radeon HD 2600 Series] aa10 RV610 HDMI Audio [Radeon HD 2350/2400 Series] - 174b aa10 Sapphire HD 2400 PRO audio device - 18bc aa10 GeCube Radeon HD 2400 PRO HDCP-capable digital-only audio device + 174b aa10 Radeon HD 2400 PRO + 18bc aa10 Radeon HD 2400 PRO aa18 RV670/680 HDMI Audio [Radeon HD 3690/3800 Series] aa20 RV635 HDMI Audio [Radeon HD 3600 Series] aa28 RV620 HDMI Audio [Radeon HD 3400 Series] aa30 RV770 HDMI Audio [Radeon HD 4850/4870] - 174b aa30 Sapphire HD 4850 512MB GDDR3 PCI-E Dual Slot Fansink + 174b aa30 Radeon HD 4850 512MB GDDR3 PCI-E Dual Slot Fansink aa38 RV710/730 HDMI Audio [Radeon HD 4000 series] - 103c 3628 ATI RV710/730 [dv6-1190en] - 174b aa38 R700 Audio Device [Radeon HD 4000 Series] + 103c 3628 dv6-1190en aa50 Cypress HDMI Audio [Radeon HD 5800 Series] aa58 Juniper HDMI Audio [Radeon HD 5700 Series] # 5500, 5600 and mobile 5700 series @@ -2102,7 +3036,7 @@ aa90 Turks/Whistler HDMI Audio [Radeon HD 6000 Series] 1028 04a3 Precision M4600 aa98 Caicos HDMI Audio [Radeon HD 6400 Series] - 174b aa98 Sapphire HD 6450 1GB DDR3 + 174b aa98 Radeon HD 6450 1GB DDR3 aaa0 Tahiti XT HDMI Audio [Radeon HD 7970 Series] aab0 Cape Verde/Pitcairn HDMI Audio [Radeon HD 7700/7800 Series] ac00 Theater 600 Pro @@ -2507,6 +3441,7 @@ 1014 035d PCIe3 1.8GB Cache RAID SAS Adapter Quad-port 6GB (57C8) 1014 035e PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57CE) 1014 03fb PCIe3 28GB Cache RAID SAS Enclosure 6Gb x 16 (57D5) + 04aa Flash Adapter 900GB Full Height 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -2610,9 +3545,8 @@ 1419 Family 15h (Models 10h-1fh) I/O Memory Management Unit 1439 Family 16h Processor Functions 5:1 1510 Family 14h Processor Root Complex - 174b 1001 Sapphire PURE Fusion Mini + 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port - 174b 1001 Sapphire PURE Fusion Mini 1513 Family 14h Processor Root Port 1514 Family 14h Processor Root Port 1515 Family 14h Processor Root Port @@ -2761,11 +3695,14 @@ 780b FCH SMBus Controller 780c FCH IDE Controller 780d FCH Azalia Controller + 1043 8444 F2A85-M Series 780e FCH LPC Bridge 780f FCH PCI Bridge 7812 FCH USB XHCI Controller 7813 FCH SD Flash Controller 7814 FCH USB XHCI Controller + 7900 CZ SATA Controller [IDE mode] + 790b CZ SMBus Controller 9600 RS780 Host Bridge 1043 82f1 M3A78-EH Motherboard 9601 RS880 Host Bridge @@ -2776,7 +3713,7 @@ 9604 RS780/RS880 PCI to PCI bridge (PCIE port 0) 9605 RS780/RS880 PCI to PCI bridge (PCIE port 1) 9606 RS780 PCI to PCI bridge (PCIE port 2) - 9607 RS780 PCI to PCI bridge (PCIE port 3) + 9607 RS780/RS880 PCI to PCI bridge (PCIE port 3) 9608 RS780/RS880 PCI to PCI bridge (PCIE port 4) 9609 RS780/RS880 PCI to PCI bridge (PCIE port 5) 960a RS780 PCI to PCI bridge (NB-SB link) @@ -3634,15 +4571,21 @@ 103c 3355 P220i # New Smart Array controllers for Gen8+ servers 323c Smart Array Gen8+ Controllers - 103c 1920 Smart Array - 103c 1921 Smart Array - 103c 1922 Smart Array - 103c 1923 Smart Array - 103c 1924 Smart Array +# Add marketing names for Gen8+ Smart Array + 103c 1920 P430i +# Add marketing names for Gen8+ Smart Array + 103c 1921 P830i +# Add marketing names for Gen8+ Smart Array + 103c 1922 P430 +# Add marketing names for Gen8+ Smart Array + 103c 1923 P431 +# Add marketing names for Gen8+ Smart Array + 103c 1924 P830 103c 1925 Smart Array - 103c 1926 Smart Array - 103c 1927 Smart Array - 103c 1928 Smart Array +# Add marketing names for Gen8+ Smart Array + 103c 1926 P731m +# Add marketing names for Gen8+ Smart Array + 103c 1928 P230i 3300 Integrated Lights-Out Standard Virtual USB Controller 103c 3304 iLO2 103c 3305 iLO2 @@ -3952,7 +4895,7 @@ 103c 30aa nc6310 8101 TSB43DB42 IEEE-1394a-2000 Controller (PHY/Link) 8201 PCI1620 Firmware Loading Function - 8204 PCI7410,7510,7610 PCI Firmware Loading Function + 8204 PCI7410/7510/7610 PCI Firmware Loading Function 1028 0139 Latitude D400 1028 014e Latitude D800 8231 XIO2000(A)/XIO2200A PCI Express-to-PCI Bridge @@ -4045,7 +4988,7 @@ 1028 014e Latitude D800 ac48 PCI7610 PC Card Cardbus Controller ac49 PCI7410 PC Card Cardbus Controller - ac4a PCI7510,7610 PC card Cardbus Controller + ac4a PCI7510/7610 CardBus Bridge 1028 0139 Latitude D400 1028 014e Latitude D800 ac4b PCI7610 SD/MMC controller @@ -4083,7 +5026,7 @@ ac8d PCI 7620 ac8e PCI7420 CardBus Controller 1028 018d Inspiron 700m/710m - ac8f PCI7420/7620 Combo CardBus, 1394a-2000 OHCI and SD/MS-Pro Controller + ac8f PCI7420/7620 SD/MS-Pro Controller 1028 018d Inspiron 700m/710m b001 TMS320C6424 fe00 FireWire Host Controller @@ -4572,6 +5515,7 @@ 103c 12dd 4Gb Fibre Channel [AB429A] 2432 ISP2432-based 4Gb Fibre Channel to PCI Express HBA 2532 ISP2532-based 8Gb Fibre Channel to PCI Express HBA + 103c 3262 StorageWorks 81Q 1077 0167 QME2572 Dual Port FC8 HBA Mezzanine 3022 ISP4022-based Ethernet NIC 3032 ISP4032-based Ethernet IPv6 NIC @@ -4655,7 +5599,6 @@ 1083 Forex Computer Corporation 0001 FR710 1084 Parador -1085 Tulip Computers Int.B.V. 1086 J. Bond Computer Systems 1087 Cache Computer 1088 Microcomputer Systems (M) Son @@ -5892,6 +6835,7 @@ 0043 NV40 [GeForce 6800 XE] 0044 NV40 [GeForce 6800 XT] 0045 NV40 [GeForce 6800 GT] + 1043 817d V9999GT 1458 3140 GV-N68T256D 0047 NV40 [GeForce 6800 GS] 1682 2109 GeForce 6800 GS @@ -6974,6 +7918,7 @@ 05e1 GT200 [GeForce GTX 280] 05e2 GT200 [GeForce GTX 260] 05e3 GT200b [GeForce GTX 285] + 1682 2490 GX-285N-ZDF 05e6 GT200b [GeForce GTX 275] 05e7 GT200GL [Tesla C1060 / M1060] 05ea GT200 [GeForce GTX 260] @@ -7306,6 +8251,7 @@ 0861 C79 [GeForce 9400] 0862 C79 [GeForce 9400M G] 0863 C79 [GeForce 9400M] + 106b 00aa MacBook5,1 0864 C79 [GeForce 9300] 0865 C79 [GeForce 9300/ION] 0866 C79 [GeForce 9400M G] @@ -7321,7 +8267,14 @@ 0870 C79 [GeForce 9400M] 0871 C79 [GeForce 9200] 0872 C79 [GeForce G102M] + 1043 19b4 GeForce G102M + 1043 1aa2 GeForce G102M + 1043 1c02 GeForce G102M + 1043 1c42 GeForce G205M 0873 C79 [GeForce G102M] + 1043 19b4 GeForce G102M + 1043 1c12 GeForce G102M + 1043 1c52 GeForce G205M 0874 C79 [ION] 0876 ION VGA [GeForce 9400M] 087a C79 [GeForce 9400] @@ -7558,8 +8511,9 @@ 10b0 104a Gainward GeForce GT 610 0e09 GF110 High Definition Audio Controller 0e0a GK104 HDMI Audio Controller + 0e0b GK106 HDMI Audio Controller 0e0c GF114 HDMI Audio Controller - 0e1a GK110 HDMI Audio [GeForce GTX Titan] + 0e1a GK110 HDMI Audio 0e1b GK107 HDMI Audio Controller 1043 8428 GTX650-DC-1GD5 0e22 GF104 [GeForce GTX 460] @@ -7584,6 +8538,10 @@ 1043 2105 GeForce GT 650M 1043 2141 GeForce GT 650M 0fd2 GK107M [GeForce GT 640M] + 1028 054f GeForce GT 640M + 1028 055f GeForce GT 640M + 1028 0595 GeForce GT 640M LE + 1028 05b2 GeForce GT 640M LE 0fd3 GK107M [GeForce GT 640M LE] 0fd4 GK107M [GeForce GTX 660M] 0fd5 GK107M [GeForce GT 650M Mac Edition] @@ -7596,11 +8554,14 @@ 0fe4 GK107M [GeForce GT 750M] 0fe5 GK107 [GeForce K340 USM] 0fe6 GK107 [NVS K1 USM] + 0fe7 GRID K1 vGPU + 10de 101e GRID K100 0fef GK107GL [GRID K340] 0ff1 GK107 [NVS 1000] 0ff2 GK107GL [GRID K1] 0ff5 GK107GL [Tesla K1 USM] 0ff7 GK107GL [Quadro K1 USM] + 10de 1037 GRID K140Q 0ff9 GK107GL [Quadro K2000D] 0ffa GK107GL [Quadro K600] 0ffb GK107GLM [Quadro K2000M] @@ -7609,6 +8570,7 @@ 0ffe GK107GL [Quadro K2000] 0fff GK107GL [Quadro 410] 1003 GK110 [GeForce GTX Titan LE] + 1004 GK110 [GeForce GTX 780] 1005 GK110 [GeForce GTX Titan] 1043 8451 GTXTITAN-6GD5 # Reference Model @@ -7652,6 +8614,7 @@ 1043 2111 GeForce GT 610M 1043 2112 GeForce GT 610M 105b GF119M [GeForce 705M] + 103c 2afb GeForce 705A 107c GF119 [NVS 315] 107d GF119 [NVS 310] 1080 GF110 [GeForce GTX 580] @@ -7681,23 +8644,69 @@ 10c5 GT218 [GeForce 405] 10d8 GT218 [NVS 300] 1140 GF117M [GeForce 610M/710M / GT 620M/625M/630M/720M] + 1025 0600 GeForce GT 620M + 1025 0606 GeForce GT 620M 1025 064a GeForce GT 620M 1025 064c GeForce GT 620M + 1025 067a GeForce GT 620M + 1025 0680 GeForce GT 620M + 1025 0686 GeForce 710M + 1025 0689 GeForce 710M + 1025 068b GeForce 710M + 1025 068d GeForce 710M + 1025 068e GeForce 710M 1025 0691 GeForce 710M + 1025 0692 GeForce GT 620M + 1025 0694 GeForce GT 620M + 1025 0702 GeForce GT 620M 1025 0719 GeForce GT 620M 1025 0725 GeForce GT 620M + 1025 0728 GeForce GT 620M 1025 072b GeForce GT 620M + 1025 072e GeForce GT 620M + 1025 0732 GeForce GT 620M + 1025 0763 GeForce GT 720M 1025 0773 GeForce 710M + 1025 0774 GeForce 710M + 1025 0776 GeForce GT 720M + 1025 077a GeForce 710M + 1025 077b GeForce 710M + 1025 077c GeForce 710M + 1025 077d GeForce 710M + 1025 077e GeForce 710M + 1025 077f GeForce 710M + 1025 0781 GeForce GT 720M + 1025 0798 GeForce GT 720M + 1025 079b GeForce GT 720M + 1025 0821 GeForce GT 720M 1028 054d GeForce GT 630M 1028 054e GeForce GT 630M 1028 0554 GeForce GT 620M 1028 0557 GeForce GT 620M 1028 0565 GeForce GT 630M + 1028 0568 GeForce GT 630M + 1028 0590 GeForce GT 630M + 1028 0592 GeForce GT 625M + 1028 0594 GeForce GT 625M + 1028 0595 GeForce GT 625M + 1028 05a2 GeForce GT 625M + 1028 05b1 GeForce GT 625M + 1028 05b3 GeForce GT 625M + 1028 05da GeForce GT 630M + 1028 05e8 GeForce GT 630M + 103c 18ef GeForce GT 630M + 103c 18f9 GeForce GT 630M + 103c 18fb GeForce GT 630M + 103c 18fd GeForce GT 630M + 103c 18ff GeForce GT 630M + 103c 2aef GeForce GT 720A + 103c 2af9 GeForce 710A 1043 10dd NVS 5200M 1043 10ed NVS 5200M 1043 11fd GeForce GT 720M 1043 124d GeForce GT 720M 1043 126d GeForce GT 720M + 1043 131d GeForce GT 720M 1043 14c7 GeForce GT 720M 1043 1507 GeForce GT 620M 1043 2132 GeForce GT 620M @@ -7705,30 +8714,99 @@ 1043 21ba GeForce GT 720M 1043 21fa GeForce GT 720M 1043 220a GeForce GT 720M + 1043 221a GeForce GT 720M + 1179 fa01 GeForce 710M + 1179 fa02 GeForce 710M + 1179 fa03 GeForce 710M + 1179 fa05 GeForce 710M + 1179 fa11 GeForce 710M + 1179 fa13 GeForce 710M + 1179 fa18 GeForce 710M + 1179 fa19 GeForce 710M + 1179 fa21 GeForce 710M + 1179 fa23 GeForce 710M + 1179 fa2a GeForce 710M + 1179 fa32 GeForce 710M + 1179 fa33 GeForce 710M + 1179 fa36 GeForce 710M + 1179 fa38 GeForce 710M + 1179 fa42 GeForce 710M + 1179 fa43 GeForce 710M + 1179 fa45 GeForce 710M + 1179 fa47 GeForce 710M + 1179 fa49 GeForce 710M + 1179 fa58 GeForce 710M + 1179 fa59 GeForce 710M + 1179 fa88 GeForce 710M + 1179 fa89 GeForce 710M + 144d c0d5 GeForce GT 630M 144d c0d7 GeForce GT 620M + 144d c0e2 NVS 5200M + 144d c0e3 NVS 5200M + 144d c0e4 NVS 5200M 144d c652 GeForce GT 620M + 144d c709 GeForce 710M + 144d c711 GeForce 710M + 1462 10b8 GeForce GT 710M + 1462 10e9 GeForce GT 720M + 152d 0926 GeForce 620M + 152d 0982 GeForce GT 630M + 152d 0983 GeForce GT 630M + 152d 1030 GeForce GT 630M 17aa 2200 NVS 5200M + 17aa 3656 GeForce GT 620M + 17aa 3800 GeForce GT 720M + 17aa 3801 GeForce GT 720M + 17aa 3802 GeForce GT 720M + 17aa 3803 GeForce GT 720M 17aa 3901 GeForce 610M / GT 620M + 17aa 3902 GeForce 710M + 17aa 3903 GeForce 610M/710M 17aa 3904 GeForce GT 620M/625M + 17aa 3905 GeForce GT 720M + 17aa 3910 GeForce 720M + 17aa 3912 GeForce 720M + 17aa 3977 GeForce GT 720M 17aa 3983 GeForce 610M + 17aa 5003 GeForce GT 720M 17aa 500d GeForce GT 620M + 17aa 5014 GeForce 710M + 17aa 5017 GeForce 710M + 17aa 5019 GeForce 710M + 17aa 501a GeForce 710M + 17aa 501f GeForce GT 720M + 17aa 5027 GeForce 710M + 17aa 502a GeForce 710M + 1854 0177 GeForce 710M + 1854 0180 GeForce 710M + 1b0a 20dd GeForce GT 620M + 1b0a 20df GeForce GT 620M 1180 GK104 [GeForce GTX 680] 3842 3682 GeForce GTX 680 Mac Edition + 1182 GK104 [GeForce GTX 760 Ti] 1183 GK104 [GeForce GTX 660 Ti] + 1184 GK104 [GeForce GTX 770] 1185 GK104 [GeForce GTX 660 OEM] + 1187 GK104 [GeForce GTX 760] 1188 GK104 [GeForce GTX 690] 1189 GK104 [GeForce GTX 670] 118a GK104GL [GRID K520] 118b GK104 [GeForce K2 USM] 118c GK104 [NVS K2 USM] + 118d GRID K2 vGPU + 10de 101d GRID K200 118f GK104GL [Tesla K10] + 119d GK104M [GeForce GTX 775M] 119f GK104M [GeForce GTX 780M] 11a0 GK104M [GeForce GTX 680M] 11a1 GK104M [GeForce GTX 670MX] 11a2 GK104M [GeForce GTX 675MX Mac Edition] 11a3 GK104M [GeForce GTX 680MX] + 106b 010d iMac 13,2 11a7 GK104M [GeForce GTX 675MX] 11b0 GK104GL [Quadro K2 USM] + 10de 101a GRID K240Q + 10de 101b GRID K260Q 11b1 GK104GL [Tesla K2 USM] 11ba GK104GL [Quadro K5000] 11bb GK104GL [Quadro 4100] @@ -7749,6 +8827,7 @@ 11c4 GK106 [GeForce GTX 645 OEM] 11c6 GK106 [GeForce GTX 650 Ti] 11e0 GK106M [GeForce GTX 770M] + 11e1 GK106M [GeForce GTX 765M] 11e2 GK106M [GeForce GTX 765M] 11e3 GK106M [GeForce GTX 760M] 11fa GK106GL [Quadro K4000] @@ -7782,7 +8861,13 @@ 124d GF116M [GeForce GT 555M/635M] 1251 GF116M [GeForce GT 560M] 1280 GK208 [GeForce GT 635] + 1282 GK208 [GeForce GT 640 Rev. 2] + 1284 GK208 [GeForce GT 630 Rev. 2] 1290 GK208M [GeForce GT 730M] + 103c 2afa GeForce GT 730A + 103c 2b04 GeForce GT 730A + 1043 13ad GeForce GT 730M + 1043 13cd GeForce GT 730M 1291 GK208M [GeForce GT 735M] 1292 GK208M [GeForce GT 740M] 1293 GK208M [GeForce GT 730M] @@ -8003,7 +9088,7 @@ 1458 e000 GA-MA69G-S3H Motherboard 1462 235c P965 Neo MS-7235 mainboard 1462 236c 945P Neo3-F motherboard - 8168 RTL8111/8168 PCI Express Gigabit Ethernet controller + 8168 RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller 1019 8168 RTL8111/8168 PCI Express Gigabit Ethernet controller 1028 04b2 Vostro 3350 1028 04da Vostro 3750 @@ -12947,7 +14032,7 @@ 1489 KYE Systems Corporation 148a OPTO 148b INNOMEDIALOGIC Inc. -148c C.P. Technology Co. Ltd +148c Tul Corporation / PowerColor 148d DIGICOM Systems, Inc. 1003 HCF 56k Data/Fax Modem 148e OSI Plus Corporation @@ -12968,7 +14053,8 @@ 21cc TCP460 CompactPCI 16 Channel Serial Interface RS232/RS422 21cd TCP461 CompactPCI 8 Channel Serial Interface RS232/RS422 3064 TPCI100 (2 Slot IndustryPack PCI Carrier) - 30c8 TPCI200 + 30c8 TPCI200 4 Slot IndustryPack PCI Carrier + 70c8 TPCE200 4 Slot IndustryPack PCIe Carrier 1499 EMTEC CO., Ltd 149a ANDOR Technology Ltd 149b SEIKO Instruments Inc @@ -13148,6 +14234,7 @@ 1028 029c PowerEdge M710 BCM5709S Gigabit Ethernet 103c 171d NC382m Dual Port 1GbE Multifunction BL-c Adapter 103c 7056 NC382i Integrated Quad Port PCI Express Gigabit Server Adapter + 1259 2984 AT-2973SX 163b NetXtreme II BCM5716 Gigabit Ethernet 1028 028c PowerEdge R410 BCM5716 Gigabit Ethernet 1028 028d PowerEdge T410 BCM5716 Gigabit Ethernet @@ -13438,7 +14525,9 @@ 16b5 NetLink BCM57785 Gigabit Ethernet PCIe 16b6 NetLink BCM57795 Gigabit Ethernet PCIe 16b7 NetXtreme BCM57782 Gigabit Ethernet PCIe - 16bc NetXtreme BCM57765 Memory Card Reader + 16bc BCM57765/57785 SDXC/MMC Card Reader + 16be BCM57765/57785 MS Card Reader + 16bf BCM57765/57785 xD-Picture Card Reader 16c6 NetXtreme BCM5702A3 Gigabit Ethernet 10b7 1100 3C1000B-T 10/100/1000 PCI 14e4 000c BCM5702 1000Base-T @@ -13646,6 +14735,7 @@ 103c 182c BCM943228HM4L 802.11a/b/g/n 2x2 Wi-Fi Adapter 4365 BCM43142 802.11b/g/n 1028 0016 Wireless 1704 802.11n + BT 4.0 + 43a0 BCM4360 802.11ac Wireless Network Adapter 43b1 BCM4352 802.11ac Wireless Network Adapter 4401 BCM4401 100Base-T 1025 0035 TravelMate 660 @@ -13680,7 +14770,7 @@ 4718 Sentry5 Crypto Accelerator 4719 BCM47xx/53xx RoboSwitch Core 4720 BCM4712 MIPS CPU - 4727 BCM4313 802.11b/g/n Wireless LAN Controller + 4727 BCM4313 802.11bgn Wireless Network Adapter 1028 0010 Inspiron M5010 / XPS 8300 5365 BCM5365P Sentry5 Host Bridge 5600 BCM5600 StrataSwitch 24+2 Ethernet Switch Controller @@ -14541,6 +15631,7 @@ 3052 SmartLink SmartPCI562 56K Modem 5449 SmartPCI561 Modem 1641 MKNet Corp. +1642 Bitland(ShenZhen) Information Technology Co., Ltd. 1657 Brocade Communications Systems, Inc. 0013 425/825/42B/82B 4Gbps/8Gbps PCIe dual port FC HBA 103c 1742 HP 82B 8Gbps dual port FC HBA @@ -14971,7 +16062,7 @@ 2020 XCode II Series 2100 XCode 2100 Series 1749 RLX Technologies -174b PC Partner Limited +174b PC Partner Limited / Sapphire Technology 174d WellX Telecom SA 175c AudioScience Inc 175e Sanera Systems, Inc. @@ -15317,7 +16408,8 @@ db78 FusionHDTV DVB-T Dual Express 18b8 Ammasso b001 AMSO 1100 iWARP/RDMA Gigabit Ethernet Coprocessor -18bc Info-Tek Corp. +# formally Info-Tek Corp. +18bc GeCube Technologies, Inc. 18c3 Micronas Semiconductor Holding AG 0720 nGene PCI-Express Multimedia Controller 07ca 032e Hybrid M779 PCI-E @@ -15409,6 +16501,10 @@ 00e5 NT40E2-1 Network Adapter 1x40Gb # 4-Port Adapter for 1 GbE In-Line Bypass Applications 00f5 NT4E2-4T-BP Network Adapter 4x1Gb with Electrical Bypass + 0105 NT4E2-4-PTP Network Adapter 4x1Gb + 0115 NT20E2-PTP Network Adapter 2x10Gb + 0125 NT4E2-4-PTP Network Adapter 4x1Gb + 0135 NT20E2-PTP Network Adapter 2x10Gb 18f6 NextIO 1000 [Nexsis] Switch Virtual P2P PCIe Bridge 1001 [Texsis] Switch Virtual P2P PCIe Bridge @@ -15449,6 +16545,12 @@ 0021 422/8-PCIe Serial PCIe Adapter [Fastcom] # RS-644 Only 0022 SuperFSCC/4-LVDS Serial PCIe Adapter [Fastcom] +# Software UARTs + 0023 SuperFSCC/4 Serial cPCI Adapter [Fastcom] +# RS-644 Only, Software UARTs + 0025 SuperFSCC/4-LVDS Serial PCI Adapter [Fastcom] +# RS-644 Only, Software UARTs + 0026 SuperFSCC-LVDS Serial PCI Adapter [Fastcom] 18fb Resilience Corporation 1904 Hangzhou Silan Microelectronics Co., Ltd. 2031 SC92031 PCI Fast Ethernet Adapter @@ -15498,6 +16600,12 @@ 1924 5201 SFN4112F-R1 1924 5202 SFN4112F-R2 0803 SFC9020 [Solarstorm] + 1014 0478 2-port 10GbE Low-Latency (R7) + 1014 0479 2-port 10GbE OpenOnload (R7) + 1014 04a7 Solarflare 10Gb Low-latency Dual-port HBA (R7) + 1014 04a8 Solarflare 10Gb Dual-port HBA (R7) + 103c 2132 Ethernet 10Gb 2-port 570FLR-SFP+ Adapter (R1) + 103c 2136 Ethernet 10Gb 2-port 570SFP+ Adapter (R7) 1924 1201 SFA6902F-R1 SFP+ AOE Adapter 1924 6200 SFN5122F-R0 SFP+ Server Adapter 1924 6201 SFN5122F-R1 SFP+ Server Adapter @@ -15824,7 +16932,8 @@ 1a41 Tilera Corp. 0001 TILE64 processor 0002 TILEPro processor - 0200 TILE-Gx36 processor + 0200 TILE-Gx processor + 2000 TILE-Gx PCI Express Bridge 1a4a SLAC National Accelerator Lab PPA-REG 1000 MCOR Power Supply Controller 1010 AMC EVR - Stockholm Timing Board @@ -15867,6 +16976,8 @@ 1a78 0038 FlashMAX PCIe SSD [rev 4] 1a78 0039 FlashMAX PCIe SSD [rev 4D] 0040 FlashMAX II + 0041 FlashMAX II + 0042 FlashMAX II 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) 1a88 MEN Mikro Elektronik @@ -15887,7 +16998,7 @@ 4005 Accelerated Virtual Video Adapter 4006 Memory Ballooning Controller 1ab9 Espia Srl -1acc Point of View B.V +1acc Point of View BV 1ad7 Spectracom Corporation 8000 TSync-PCIe Time Code Processor 9100 TPRO-PCI-66U Timecode Reader/Generator @@ -15901,6 +17012,11 @@ 0a41 microEnable IV-FULL x1 0a44 microEnable IV-FULL x4 0e44 microEnable IV-GigE x4 +1ae9 Wilocity Ltd. + 0101 Wil6200 PCI Express Root Port + 0200 Wil6200 PCI Express Port + 0201 Wil6200 Wireless PCI Express Port + 0301 Wil6200 802.11ad Wireless Network Adapter 1aec Wolfson Microelectronics 1aed Fusion-io 1003 ioDimm3 (v1.2) @@ -15931,6 +17047,7 @@ 1b03 Magnum Semiconductor, Inc, 6100 DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder 1b08 MSC Vertriebs GmbH +1b0a Pegatron 1b13 Jaton Corp 1b1a K&F Computing Research Co. 0e70 GRAPE @@ -15939,6 +17056,7 @@ 0612 ASM1062 Serial ATA Controller 1042 ASM1042 SuperSpeed USB Host Controller 1080 ASM1083/1085 PCIe to PCI Bridge +1b2c Opal-RT Technologies Inc. 1b36 Red Hat, Inc. 1b37 Signal Processing Devices Sweden AB 0014 ADQ412 @@ -15995,6 +17113,7 @@ 1bad ReFLEX CES 1bb0 SimpliVity Corporation 0002 OmniCube Accelerator OA-3000 + 0010 OmniCube Accelerator OA-3000-2 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -16737,6 +17856,7 @@ 0153 3rd Gen Core Processor Thermal Subsystem 1043 1517 Zenbook Prime UX31A 0154 3rd Gen Core processor DRAM Controller + 103c 17f6 ProBook 4540s 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 0155 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port @@ -16779,12 +17899,14 @@ 0372 80333 Segment-B PCI Express-to-PCI Express Bridge 0373 80333 B-Bus IOAPIC 0374 80333 Address Translation Unit - 0402 Haswell Integrated Graphics Controller - 0406 Haswell Integrated Graphics Controller - 040a Haswell Integrated Graphics Controller - 0412 Haswell Integrated Graphics Controller - 0416 Haswell Integrated Graphics Controller - 041a Haswell Integrated Graphics Controller + 0402 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller + 0406 4th Gen Core Processor Integrated Graphics Controller + 040a Xeon E3-1200 v3 Processor Integrated Graphics Controller + 0412 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller + 0416 4th Gen Core Processor Integrated Graphics Controller + 041a Xeon E3-1200 v3 Processor Integrated Graphics Controller + 0433 Coleto Creek ACC - ME/CPM interface + 0435 Coleto Creek PCIe Endpoint 0436 DH8900CC Null Device 0438 DH8900CC Series Gigabit Network Connection 043a DH8900CC Series Gigabit Fiber Network Connection @@ -17034,13 +18156,13 @@ 105b 0d7c D270S/D250S Motherboard 0bf6 Atom Processor D2xxx/N2xxx DRAM Controller 0bf7 Atom Processor D2xxx/N2xxx DRAM Controller - 0c00 Haswell DRAM Controller - 0c01 Haswell PCI Express x16 Controller - 0c04 Haswell DRAM Controller - 0c05 Haswell PCI Express x8 Controller - 0c08 Haswell DRAM Controller - 0c09 Haswell PCI Express x4 Controller - 0c0c Haswell HD Audio Controller + 0c00 4th Gen Core Processor DRAM Controller + 0c01 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x16 Controller + 0c04 Xeon E3-1200 v3/4th Gen Core Processor DRAM Controller + 0c05 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x8 Controller + 0c08 Xeon E3-1200 v3 Processor DRAM Controller + 0c09 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x4 Controller + 0c0c Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller 0c46 Atom Processor S1200 PCI Express Root Port 1 0c47 Atom Processor S1200 PCI Express Root Port 2 0c48 Atom Processor S1200 PCI Express Root Port 3 @@ -17734,6 +18856,7 @@ 8086 0002 Ethernet Server Adapter X520-DA2 8086 0003 Ethernet Server Adapter X520-2 8086 0006 Ethernet Server Adapter X520-1 + 8086 0008 Ethernet OCP Server Adapter X520-2 8086 000a Ethernet Server Adapter X520-1 8086 000c Ethernet Server Adapter X520-2 8086 7a11 Ethernet Server Adapter X520-2 @@ -18015,6 +19138,8 @@ 8086 0002 Ethernet Server Adapter I350-T2 8086 0003 Ethernet Server Adapter I350-F4 8086 0004 Ethernet Server Adapter I350-F2 + 8086 0005 Ethernet Server Adapter I350-F1 + 8086 00a2 Ethernet Server Adapter I350-T2 8086 00a3 Ethernet Server Adapter I350-F4 8086 00a4 Ethernet Server Adapter I350-F2 1523 I350 Gigabit Backplane Connection @@ -18065,10 +19190,19 @@ 154d Ethernet 10G 2P X520 Adapter 8086 7b11 10GbE 2P X520 Adapter 1557 82599 10 Gigabit Network Connection + 8086 0001 Ethernet OCP Server Adapter X520-1 1559 Ethernet Connection I218-V 155a Ethernet Connection I218-LM + 155c Ethernet Server Bypass Adapter + 8086 0001 Ethernet Server Bypass Adapter X540-T2 + 155d Ethernet Server Bypass Adapter + 8086 0001 Ethernet Server Bypass Adapter X520-SR2 1560 Ethernet Controller X540-AT1 157b I210 Gigabit Network Connection + 15a0 Ethernet Connection (2) I218-LM + 15a1 Ethernet Connection (2) I218-V + 15a2 Ethernet Connection (3) I218-LM + 15a3 Ethernet Connection (3) I218-V 1960 80960RP (i960RP) Microprocessor 101e 0431 MegaRAID 431 RAID Controller 101e 0438 MegaRAID 438 Ultra2 LVD RAID Controller @@ -18447,7 +19581,9 @@ 1f43 Avoton GbE EEPROM-less 1f44 Avoton GbE Virtual Function 1f45 Avoton GbE 2500base-KX - 2250 Xeon Phi Coprocessor 5110P + 2250 Xeon Phi coprocessor 5100 series + 225c Xeon Phi coprocessor SE10/7120 series + 225d Xeon Phi coprocessor 3120 series 2310 DH89xxCC LPC Controller 2323 DH89xxCC 4 Port SATA AHCI Controller 2330 DH89xxCC SMBus Controller @@ -18466,6 +19602,26 @@ 2360 DH89xxCC Watchdog Timer 2364 DH89xxCC MEI 0 2365 DH89xxCC MEI 1 + 2390 Coleto Creek LPC Controller + 23a1 Coleto Creek 2-Port SATA Controller [IDE Mode] + 23a3 Coleto Creek 4-Port SATA Controller [AHCI Mode] + 23a6 Coleto Creek 2-Port SATA Controller [IDE Mode] + 23b0 Coleto Creek SMBus Controller + 23b1 Coleto Creek CHAP Counter + 23b2 Coleto Creek Thermal Management Controller + 23b4 Coleto Creek USB2 Enhanced Host Controller #1 + 23b5 Coleto Creek USB2 Enhanced Host Controller #1 + 23c2 Coleto Creek PCI Express Root Port #1 + 23c3 Coleto Creek PCI Express Root Port #1 + 23c4 Coleto Creek PCI Express Root Port #2 + 23c5 Coleto Creek PCI Express Root Port #2 + 23c6 Coleto Creek PCI Express Root Port #3 + 23c7 Coleto Creek PCI Express Root Port #3 + 23c8 Coleto Creek PCI Express Root Port #4 + 23c9 Coleto Creek PCI Express Root Port #4 + 23e0 Coleto Creek Watchdog Timer + 23e4 Coleto Creek MEI Controller #1 + 23e5 Coleto Creek MEI Controller #2 2410 82801AA ISA Bridge (LPC) 2411 82801AA IDE Controller 2412 82801AA USB Controller @@ -20633,6 +21789,19 @@ 2f09 Haswell-E PCI Express Root Port 3 2f0a Haswell-E PCI Express Root Port 3 2f0b Haswell-E PCI Express Root Port 3 + 2f10 Haswell-E IIO Debug + 2f11 Haswell-E IIO Debug + 2f12 Haswell-E IIO Debug + 2f13 Haswell-E IIO Debug + 2f14 Haswell-E IIO Debug + 2f15 Haswell-E IIO Debug + 2f16 Haswell-E IIO Debug + 2f17 Haswell-E IIO Debug + 2f18 Haswell-E IIO Debug + 2f19 Haswell-E IIO Debug + 2f1a Haswell-E IIO Debug + 2f1b Haswell-E IIO Debug + 2f1c Haswell-E IIO Debug 2f1d Haswell-E PCIe Ring Interface 2f1e Haswell-E Scratchpad & Semaphore Registers 2f1f Haswell-E Scratchpad & Semaphore Registers @@ -20663,6 +21832,9 @@ 2f40 Haswell-E QPI Link 2 2f41 Haswell-E R3 QPI Link 2 Monitoring 2f43 Haswell-E QPI Link 2 + 2f45 Haswell-E QPI Link 2 Debug + 2f46 Haswell-E QPI Link 2 Debug + 2f47 Haswell-E QPI Link 2 Debug 2f60 Haswell-E Home Agent 1 2f68 Haswell-E Integrated Memory Controller 1 Target Address, Thermal & RAS Registers 2f6a Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder @@ -20673,14 +21845,27 @@ 2f6f Haswell-E DDRIO Global Broadcast 2f70 Haswell-E Home Agent 0 Debug 2f71 Haswell-E Integrated Memory Controller 0 Target Address, Thermal & RAS Registers + 2f76 Haswell-E E3 QPI Link Debug 2f78 Haswell-E Home Agent 1 Debug 2f79 Haswell-E Integrated Memory Controller 1 Target Address, Thermal & RAS Registers 2f7d Haswell-E Scratchpad & Semaphore Registers + 2f7e Haswell-E E3 QPI Link Debug 2f80 Haswell-E QPI Link 0 2f81 Haswell-E R3 QPI Link 0 & 1 Monitoring 2f83 Haswell-E QPI Link 0 + 2f85 Haswell-E QPI Link 0 Debug + 2f86 Haswell-E QPI Link 0 Debug + 2f87 Haswell-E QPI Link 0 Debug + 2f88 Haswell-E VCU + 2f8a Haswell-E VCU 2f90 Haswell-E QPI Link 1 2f93 Haswell-E QPI Link 1 + 2f95 Haswell-E QPI Link 1 Debug + 2f96 Haswell-E QPI Link 1 Debug + 2f98 Haswell-E Power Control Unit + 2f99 Haswell-E Power Control Unit + 2f9a Haswell-E Power Control Unit + 2f9c Haswell-E Power Control Unit 2fa0 Haswell-E Home Agent 0 2fa8 Haswell-E Integrated Memory Controller 0 Target Address, Thermal & RAS Registers 2faa Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder @@ -20695,6 +21880,8 @@ 2fb3 Haswell-E Integrated Memory Controller 0 Channel 1 ERROR Registers 2fb4 Haswell-E Integrated Memory Controller 0 Channel 2 Thermal Control 2fb5 Haswell-E Integrated Memory Controller 0 Channel 3 Thermal Control + 2fb6 Haswell-E Integrated Memory Controller 0 Channel 2 ERROR Registers + 2fb7 Haswell-E Integrated Memory Controller 0 Channel 3 ERROR Registers 2fb8 Haswell-E DDRIO (VMSE) 2 & 3 2fb9 Haswell-E DDRIO (VMSE) 2 & 3 2fba Haswell-E DDRIO (VMSE) 2 & 3 @@ -20705,10 +21892,10 @@ 2fbf Haswell-E DDRIO (VMSE) 0 & 1 2fc0 Haswell-E Power Control Unit 2fc1 Haswell-E Power Control Unit - 2fc2 Power Control Unit - 2fc3 Power Control Unit - 2fc4 Power Control Unit - 2fc5 Power Control Unit + 2fc2 Haswell-E Power Control Unit + 2fc3 Haswell-E Power Control Unit + 2fc4 Haswell-E Power Control Unit + 2fc5 Haswell-E Power Control Unit 2fd0 Haswell-E Integrated Memory Controller 1 Channel 0 Thermal Control 2fd1 Haswell-E Integrated Memory Controller 1 Channel 1 Thermal Control 2fd2 Haswell-E Integrated Memory Controller 1 Channel 0 ERROR Registers @@ -21662,80 +22849,80 @@ 8817 Platform Controller Hub EG20T I2C Controller 8818 Platform Controller Hub EG20T Controller Area Network (CAN) Controller 8819 Platform Controller Hub EG20T IEEE 1588 Hardware Assist - 8c00 Lynx Point 4-port SATA Controller 1 [IDE mode] - 8c01 Lynx Point 4-port SATA Controller 1 [IDE mode] - 8c02 Lynx Point 6-port SATA Controller 1 [AHCI mode] - 8c03 Lynx Point 6-port SATA Controller 1 [AHCI mode] - 8c04 Lynx Point SATA Controller 1 [RAID mode] - 8c05 Lynx Point SATA Controller 1 [RAID mode] - 8c06 Lynx Point SATA Controller 1 [RAID mode] - 8c07 Lynx Point SATA Controller 1 [RAID mode] - 8c08 Lynx Point 2-port SATA Controller 2 [IDE mode] - 8c09 Lynx Point 2-port SATA Controller 2 [IDE mode] - 8c0e Lynx Point SATA Controller 1 [RAID mode] - 8c0f Lynx Point SATA Controller 1 [RAID mode] - 8c10 Lynx Point PCI Express Root Port #1 - 8c11 Lynx Point PCI Express Root Port #1 - 8c12 Lynx Point PCI Express Root Port #2 - 8c13 Lynx Point PCI Express Root Port #2 - 8c14 Lynx Point PCI Express Root Port #3 - 8c15 Lynx Point PCI Express Root Port #3 - 8c16 Lynx Point PCI Express Root Port #4 - 8c17 Lynx Point PCI Express Root Port #4 - 8c18 Lynx Point PCI Express Root Port #5 - 8c19 Lynx Point PCI Express Root Port #5 - 8c1a Lynx Point PCI Express Root Port #6 - 8c1b Lynx Point PCI Express Root Port #6 - 8c1c Lynx Point PCI Express Root Port #7 - 8c1d Lynx Point PCI Express Root Port #7 - 8c1e Lynx Point PCI Express Root Port #8 - 8c1f Lynx Point PCI Express Root Port #8 - 8c20 Lynx Point High Definition Audio Controller - 8c21 Lynx Point High Definition Audio Controller - 8c22 Lynx Point SMBus Controller - 8c23 Lynx Point CHAP Counters - 8c24 Lynx Point Thermal Management Controller - 8c26 Lynx Point USB Enhanced Host Controller #1 - 8c2d Lynx Point USB Enhanced Host Controller #2 - 8c31 Lynx Point USB xHCI Host Controller - 8c33 Lynx Point LAN Controller - 8c34 Lynx Point NAND Controller - 8c3a Lynx Point MEI Controller #1 - 8c3b Lynx Point MEI Controller #2 - 8c3c Lynx Point IDE-r Controller - 8c3d Lynx Point KT Controller - 8c40 Lynx Point LPC Controller - 8c41 Lynx Point LPC Controller - 8c42 Lynx Point LPC Controller - 8c43 Lynx Point LPC Controller - 8c44 Lynx Point LPC Controller - 8c45 Lynx Point LPC Controller - 8c46 Lynx Point LPC Controller - 8c47 Lynx Point LPC Controller - 8c48 Lynx Point LPC Controller - 8c49 Lynx Point LPC Controller - 8c4a Lynx Point LPC Controller - 8c4b Lynx Point LPC Controller - 8c4c Lynx Point LPC Controller - 8c4d Lynx Point LPC Controller - 8c4e Lynx Point LPC Controller - 8c4f Lynx Point LPC Controller - 8c50 Lynx Point LPC Controller - 8c51 Lynx Point LPC Controller - 8c52 Lynx Point LPC Controller - 8c53 Lynx Point LPC Controller - 8c54 Lynx Point LPC Controller - 8c55 Lynx Point LPC Controller - 8c56 Lynx Point LPC Controller - 8c57 Lynx Point LPC Controller - 8c58 Lynx Point LPC Controller - 8c59 Lynx Point LPC Controller - 8c5a Lynx Point LPC Controller - 8c5b Lynx Point LPC Controller - 8c5c Lynx Point LPC Controller - 8c5d Lynx Point LPC Controller - 8c5e Lynx Point LPC Controller - 8c5f Lynx Point LPC Controller + 8c00 8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode] + 8c01 8 Series Chipset Family 4-port SATA Controller 1 [IDE mode] - Mobile + 8c02 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] + 8c03 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] + 8c04 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c05 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c06 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c07 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c08 8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode] + 8c09 8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode] + 8c0e 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c0f 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c10 8 Series/C220 Series Chipset Family PCI Express Root Port #1 + 8c11 8 Series/C220 Series Chipset Family PCI Express Root Port #1 + 8c12 8 Series/C220 Series Chipset Family PCI Express Root Port #2 + 8c13 8 Series/C220 Series Chipset Family PCI Express Root Port #2 + 8c14 8 Series/C220 Series Chipset Family PCI Express Root Port #3 + 8c15 8 Series/C220 Series Chipset Family PCI Express Root Port #3 + 8c16 8 Series/C220 Series Chipset Family PCI Express Root Port #4 + 8c17 8 Series/C220 Series Chipset Family PCI Express Root Port #4 + 8c18 8 Series/C220 Series Chipset Family PCI Express Root Port #5 + 8c19 8 Series/C220 Series Chipset Family PCI Express Root Port #5 + 8c1a 8 Series/C220 Series Chipset Family PCI Express Root Port #6 + 8c1b 8 Series/C220 Series Chipset Family PCI Express Root Port #6 + 8c1c 8 Series/C220 Series Chipset Family PCI Express Root Port #7 + 8c1d 8 Series/C220 Series Chipset Family PCI Express Root Port #7 + 8c1e 8 Series/C220 Series Chipset Family PCI Express Root Port #8 + 8c1f 8 Series/C220 Series Chipset Family PCI Express Root Port #8 + 8c20 8 Series/C220 Series Chipset High Definition Audio Controller + 8c21 8 Series/C220 Series Chipset High Definition Audio Controller + 8c22 8 Series/C220 Series Chipset Family SMBus Controller + 8c23 8 Series Chipset Family CHAP Counters + 8c24 8 Series Chipset Family Thermal Management Controller + 8c26 8 Series/C220 Series Chipset Family USB EHCI #1 + 8c2d 8 Series/C220 Series Chipset Family USB EHCI #2 + 8c31 8 Series/C220 Series Chipset Family USB xHCI + 8c33 8 Series/C220 Series Chipset Family LAN Controller + 8c34 8 Series/C220 Series Chipset Family NAND Controller + 8c3a 8 Series/C220 Series Chipset Family MEI Controller #1 + 8c3b 8 Series/C220 Series Chipset Family MEI Controller #2 + 8c3c 8 Series/C220 Series Chipset Family IDE-r Controller + 8c3d 8 Series/C220 Series Chipset Family KT Controller + 8c40 8 Series/C220 Series Chipset Family LPC Controller + 8c41 8 Series Chipset Family Mobile Super SKU LPC Controller + 8c42 8 Series/C220 Series Chipset Family Desktop Super SKU LPC Controller + 8c43 8 Series/C220 Series Chipset Family LPC Controller + 8c44 Z87 Express LPC Controller + 8c45 8 Series/C220 Series Chipset Family LPC Controller + 8c46 Z85 Express LPC Controller + 8c47 8 Series/C220 Series Chipset Family LPC Controller + 8c48 8 Series/C220 Series Chipset Family LPC Controller + 8c49 HM86 Express LPC Controller + 8c4a H87 Express LPC Controller + 8c4b HM87 Express LPC Controller + 8c4c Q85 Express LPC Controller + 8c4d 8 Series/C220 Series Chipset Family LPC Controller + 8c4e Q87 Express LPC Controller + 8c4f QM87 Express LPC Controller + 8c50 B85 Express LPC Controller + 8c51 8 Series/C220 Series Chipset Family LPC Controller + 8c52 C222 Series Chipset Family Server Essential SKU LPC Controller + 8c53 8 Series/C220 Series Chipset Family LPC Controller + 8c54 C224 Series Chipset Family Server Standard SKU LPC Controller + 8c55 8 Series/C220 Series Chipset Family LPC Controller + 8c56 C226 Series Chipset Family Server Advanced SKU LPC Controller + 8c57 8 Series/C220 Series Chipset Family LPC Controller + 8c58 8 Series/C220 Series Chipset Family WS SKU LPC Controller + 8c59 8 Series/C220 Series Chipset Family LPC Controller + 8c5a 8 Series/C220 Series Chipset Family LPC Controller + 8c5b 8 Series/C220 Series Chipset Family LPC Controller + 8c5c C220 Series Chipset Family H81 Express LPC Controller + 8c5d 8 Series/C220 Series Chipset Family LPC Controller + 8c5e 8 Series/C220 Series Chipset Family LPC Controller + 8c5f 8 Series/C220 Series Chipset Family LPC Controller 8d00 Wellsburg 4-port SATA Controller [IDE mode] 8d02 Wellsburg 6-Port SATA Controller [AHCI mode] 8d04 Wellsburg SATA Controller [RAID mode] @@ -22384,8 +23571,16 @@ b1d9 ATCOM Technology co., LTD. # Pinnacle should be 11bd, but they got it wrong several times --mj bd11 Pinnacle Systems, Inc. (Wrong ID) bdbd Blackmagic Design -# HD/SDI input and output card for PCI Express 1x - a11b DeckLink SDI + a117 Intensity Pro + a11a DeckLink HD Extreme 2 + a11b DeckLink SDI/Duo/Quad + a11c DeckLink HD Extreme 3 + a11d DeckLink Studio + a11e DeckLink Optical Fibre + a121 DeckLink HD Extreme 3D/3D+ + a12e DeckLink 4K Extreme + a12f DeckLink Mini Monitor + a130 DeckLink Mini Recorder c001 TSI Telsys c0a9 Micron/Crucial Technology c0de Motorola @@ -22429,6 +23624,8 @@ d161 Digium, Inc. 8006 Wildcard AEX410 4-port analog card (PCI-Express) 8007 Hx8 Series 8-port Base Card 8008 Hx8 Series 8-port Base Card (PCI-Express) + 800a Wildcard TE133 single-span T1/E1/J1 card (PCI Express) + 800b Wildcard TE134 single-span T1/E1/J1 card b410 Wildcard B410 quad-BRI card d4d4 Dy4 Systems Inc 0601 PCI Mezzanine Card @@ -22443,7 +23640,19 @@ dcba Dynamic Engineering # PMC Format FPGA design with 8 high speed UART channels 0048 PMC-Biserial-III-BAE9 dd01 Digital Devices GmbH - 0003 Octopus LE DVB adapter + 0003 Octopus DVB Adapter + dd01 0001 Octopus DVB adapter + dd01 0002 Octopus LE DVB adapter + dd01 0003 Octopus OEM + dd01 0004 Octopus V3 DVB adapter + dd01 0010 Octopus Mini + dd01 0020 Cine S2 V6 DVB adapter + dd01 0021 Cine S2 V6.5 DVB adapter + dd01 0030 Cine CT V6.1 DVB adapter + dd01 db03 Mystique SaTiX-S2 V3 DVB adapter + 0011 Octopus CI DVB Adapter + dd01 0040 Octopus CI + dd01 0041 Octopus CI Single dead Indigita Corporation deaf Middle Digital Inc. 9050 PC Weasel Virtual VGA diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids index 859d3b3..3cd0163 100644 --- a/src/hwdata/usb.ids +++ b/src/hwdata/usb.ids @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2013.03.25 -# Date: 2013-03-25 20:34:03 +# Version: 2013.05.24 +# Date: 2013-05-24 20:34:03 # # Vendors, devices and interfaces. Please keep sorted. @@ -9812,6 +9812,8 @@ 0955 NVidia Corp. 7030 Tegra 3 (recovery mode) 7100 Notion Ink Adam + b400 SHIELD (debug) + b401 SHIELD 0956 BSquare Corp. 0957 Agilent Technologies, Inc. 0200 E-Video DC-350 Camera diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 1185921..a02097e 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -22,8 +22,31 @@ fi SHOW_SRV=1 +function dns_forward_args() { + local file="${1}" + + # Do nothing if file is empty. + [ -s "${file}" ] || return + + local cmdline + + local enabled zone server remark + while IFS="," read -r enabled zone server remark; do + # Line must be enabled. + [ "${enabled}" = "on" ] || continue + + cmdline="${cmdline} --server=/${zone}/${server}" + done < ${file} + + echo "${cmdline}" +} + + case "${1}" in start) + # kill already running copy of dnsmasq... + killproc /usr/sbin/dnsmasq 2>&1 > /dev/null + boot_mesg "Starting Domain Name Service Proxy..." eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) @@ -44,8 +67,12 @@ case "${1}" in fi fi [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf" - + ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`" + + # Add custom forward dns zones. + ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)" + ARGS="$ARGS $CUSTOM_ARGS" loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS diff --git a/src/initscripts/init.d/networking/functions.network b/src/initscripts/init.d/networking/functions.network new file mode 100644 index 0000000..f459b77 --- /dev/null +++ b/src/initscripts/init.d/networking/functions.network @@ -0,0 +1,147 @@ +#!/bin/sh +# +######################################################################## +# Begin +# +# Description : A collection of functions for the IPFire network scripts +# +# Authors : IPFire Development Team <developers(a)ipfire.org> +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. $rc_functions + + +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) +eval $(/usr/local/bin/readhash /var/ipfire/dns/settings) + +dhcpcd_get_pid() { + # This function returns the pid of a dhcpcd by a given + # network device, if a pidfile exists. + + local device="$1" + local pidfile="/var/run/dhcpcd-${device}.pid" + + # Check if a pid file exists. + if [ -f "${pidfile}" ] ; then + + # Get the pid from the file. + local pid="$(<"${pidfile}")" + + echo "${pid}" + fi +} + +dhcpcd_is_running() { + # This functions checks if a dhcpcd is running by a given pid. + + local pid="$1" + + # Check if a dhcpcd is running. + if [ -n "${pid}" -a -d "/proc/${pid}" ]; then + # Return "0" (True) if a dhcpcd is running. + return 0 + fi + + # Return 1 (False) no dhcpcd is running. + return 1 +} + +dhcpcd_start() { + # This function will start a dhcpcd on a speciefied device. + + local device="$1" + local dhcp_start="" + + boot_mesg -n "Starting dhcpcd on the ${device} interface..." + + # Check if a dhcpcd is already running. + local pid="$(dhcpcd_get_pid "${device}")" + + if dhcpcd_is_running "${pid}"; then + boot_mesg "dhcpcd already running!" ${WARNING} + echo_warning + exit 2 + fi + + # Check if a DHCP hostname has been set. + if [ -n "${RED_DHCP_HOSTNAME}" ]; then + dhcp_start+="-h ${RED_DHCP_HOSTNAME}" + fi + + # Start dhcpcd. + /sbin/dhcpcd "${device}" "${dhcp_start}" >/dev/null 2>&1 + ret="$?" + + if [ "${ret}" -eq 0 ]; then + . /var/ipfire/dhcpc/dhcpcd-"${device}".info + echo "" + echo_ok + boot_mesg " DHCP Assigned Settings for ${device}:" + boot_mesg_flush + boot_mesg " IP Address: $ip_address" + boot_mesg_flush + + if [ -n "${RED_DHCP_HOSTNAME}" ]; then + boot_mesg " Hostname: $RED_DHCP_HOSTNAME" + boot_mesg_flush + fi + + boot_mesg " Subnet Mask: $subnet_mask" + boot_mesg_flush + boot_mesg " Default Gateway: $routers" + boot_mesg_flush + boot_mesg " DNS Server: $domain_name_servers" + boot_mesg_flush + else + echo "" + $(exit "${ret}") + evaluate_retval + fi +} + +dhcpcd_stop() { + # This function stops a previously started dhcpcd on a given device. + + local device="$1" + local dhcp_stop="-k" + local leaseinfo="/var/ipfire/dhcpc/dhcpcd-${device}.info" + + boot_mesg -n "Stopping dhcpcd on the ${device} interface..." + + # Check if a dhcpcd is running. + local pid="$(dhcpcd_get_pid "${device}")" + + if ! dhcpcd_is_running "${pid}"; then + boot_mesg " Not running." ${WARNING} + echo_warning + exit 1 + fi + + # Stop dhcpcd. + /sbin/dhcpcd "${device}" "${dhcp_stop}" &> /dev/null + ret="$?" + + # Wait until dhcpd has stopped. + while [ -d "/proc/${pid}" ]; do + sleep 1 + done + + # Display console message, depended on the exit code + # of the stopped dhcpcd. + if [ "${ret}" -eq 0 ]; then + boot_mesg + echo_ok + elif [ "${ret}" -eq 1 ]; then + boot_mesg "failed to stop dhcpcd!" ${WARNING} + echo_warning + else + boot_mesg + echo_failure + fi +} diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index 421c6f6..b33c03f 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -17,6 +17,7 @@ . /etc/sysconfig/rc . ${rc_functions} +. /etc/init.d/networking/functions.network #Define some defaults INET_VLAN=7 @@ -77,11 +78,6 @@ if [ "${TYPE}" == "STATIC" ]; then fi fi -PIDFILE="/var/run/dhcpcd-${DEVICE}.pid" -LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info" -DHCP_START=" " -DHCP_STOP="-k " - case "${1}" in start) if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then @@ -137,87 +133,24 @@ case "${1}" in /usr/local/bin/setaliases elif [ "${TYPE}" == "DHCP" ]; then + # Add firewall rules to allow comunication with the dhcp server on red. + iptables -A REDINPUT -p tcp --source-port 67 --destination-port 68 -i ${DEVICE} -j ACCEPT + iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i ${DEVICE} -j ACCEPT - if [ -e $LEASEINFO ]; then - boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..." - . $LEASEINFO - if [ "$dhcp_lease_time" = "4294967295" ]; then - # do nothing, just echo ok - echo "" - echo_ok - else - if [ -n "$DHCP_STOP" ]; then - /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null - RET="$?" - if [ "$RET" -eq 0 ]; then - echo "" - echo_ok - elif [ "$RET" -eq 1 ]; then - boot_mesg "dhcpcd not running!" ${WARNING} - echo_warning - else - echo "" - echo_failure - fi - else - echo "" - killproc dhcpcd - fi - fi - fi - - boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..." echo -n "${DEVICE}" > /var/ipfire/red/iface + # Check if the wlan-client is used on red. + # To determine this we check if a wpa_supplicant is running. + pid="$(pidof wpa_supplicant)" + + if [ -z "${pid}" ]; then + # No wpa_supplicant is running. So it's save to start dhcpcd. + dhcpcd_start "${DEVICE}" + fi + ## Create & Enable vnstat /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - # Test to see if there is a stale pid file - if [ -f "$PIDFILE" ]; then - ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null - if [ $? != 0 ]; then - rm -f /var/run/dhcpcd-${DEVICE}.pid > /dev/null - else - boot_mesg "dhcpcd already running!" ${WARNING} - echo_warning - exit 2 - fi - fi - - iptables -A REDINPUT -p tcp --source-port 67 --destination-port 68 -i ${DEVICE} -j ACCEPT - iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i ${DEVICE} -j ACCEPT - - if [ -n "${RED_DHCP_HOSTNAME}" ]; then - DHCP_START+="-h ${RED_DHCP_HOSTNAME} " - fi - - /sbin/dhcpcd ${DEVICE} ${DHCP_START} >/dev/null 2>&1 - RET="$?" - - if [ "$RET" = "0" ]; then - . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.info - echo "" - echo_ok - boot_mesg " DHCP Assigned Settings for ${DEVICE}:" - boot_mesg_flush - boot_mesg " IP Address: $ip_address" - boot_mesg_flush - if [ -n "${RED_DHCP_HOSTNAME}" ]; then - boot_mesg " Hostname: $RED_DHCP_HOSTNAME" - boot_mesg_flush - fi - boot_mesg " Subnet Mask: $subnet_mask" - boot_mesg_flush - boot_mesg " Default Gateway: $routers" - boot_mesg_flush - boot_mesg " DNS Server: $domain_name_servers" - boot_mesg_flush - else - echo "" - $(exit "$RET") - evaluate_retval - fi - elif [ "$TYPE" == "PPPOE" ]; then if ( ps ax | grep -q [p]ppd ); then @@ -455,10 +388,18 @@ case "${1}" in ### Standard PPP options we always use # PPP_STD_OPTIONS="$PLUGOPTS $DNS defaultroute noipdefault noauth" - PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach mtu ${MTU}" + PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach" PPP_STD_OPTIONS+=" mru ${MRU} noaccomp nodeflate nopcomp novj novjccomp" PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20" PPP_STD_OPTIONS+=" lcp-echo-failure 5 ${AUTH}" + + if [ -n "${MTU}" ]; then + PPP_STD_OPTIONS="${PPP_STD_OPTIONS} mtu ${MTU}" + fi + + if [ -n "${MRU}" ]; then + PPP_STD_OPTIONS="${PPP_STD_OPTIONS} mru ${MRU}" + fi ### Debugging # @@ -525,33 +466,15 @@ case "${1}" in # Add a NaN value to ppp0 rrd to supress spikes at reconnect rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \ $(date +%s):: > /dev/null 2>&1 - fi - if [ -e $LEASEINFO ]; then - boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..." - . $LEASEINFO - if [ "$dchp_lease_time" = "4294967295" ]; then - # do nothing, just echo ok - echo "" - echo_ok - else - if [ -n "$DHCP_STOP" ]; then - /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null - RET="$?" - if [ "$RET" -eq 0 ]; then - echo "" - echo_ok - elif [ "$RET" -eq 1 ]; then - boot_mesg "dhcpcd not running!" ${WARNING} - echo_warning - else - echo "" - echo_failure - fi - else - echo "" - killproc dhcpcd - fi + elif [ "$TYPE" == "DHCP" ]; then + # Check if the wlan-client is used on red. + # To determine this we check if a wpa_supplicant is running. + pid="$(pidof wpa_supplicant)" + + if [ -z "${pid}" ]; then + # Stop dhcpcd. + dhcpcd_stop "${DEVICE}" fi fi diff --git a/src/initscripts/init.d/networking/wpa_supplicant.exe b/src/initscripts/init.d/networking/wpa_supplicant.exe new file mode 100644 index 0000000..b5ad8ff --- /dev/null +++ b/src/initscripts/init.d/networking/wpa_supplicant.exe @@ -0,0 +1,50 @@ +#!/bin/bash +######################################################################## +# Begin +# +# Description : wpa_supplicant Script +# +# Authors : IPFire Development Team <developers(a)ipfire.org> +# +# Version : 01.00 +# +# Notes : This script starts/stops the dhclient if a WPA/WPA2 +# connection to an AP successfull has been established +# or disconnected. +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} +. /etc/init.d/networking/functions.network + +# Gather required information from wpa_cli. +device="$1" +wpa_state="$2" + +# Check if the RED device has been configured to use DHCP or exit immediately. +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) +if [ ! "${RED_TYPE}" == "DHCP" ] ; then + exit 0 +fi + +case "${wpa_state}" in + CONNECTED) + # Start dhcpcd. + dhcpcd_start "${device}" + + exit 0 + ;; + + DISCONNECTED) + # Stop dhcpcd. + dhcpcd_stop "${device}" + + exit 0 + ;; + + *) + # When we ever got here, there is a really big problem. + exit 1 + ;; +esac diff --git a/src/initscripts/init.d/wlanclient b/src/initscripts/init.d/wlanclient new file mode 100644 index 0000000..ee24c43 --- /dev/null +++ b/src/initscripts/init.d/wlanclient @@ -0,0 +1,283 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/wlan_client +# +# Description : Wireless client initscript +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + +WIRELESS_CONFIG="/var/ipfire/ethernet/wireless" + +function device_is_wireless() { + local device=${1} + + if [ -d "/sys/class/net/${device}/wireless" ]; then + return 0 + fi + + return 1 +} + +function wpa_supplicant_make_config() { + local device=${1} + local config=${2} + shift 2 + + # Check if device is wireless. + local wireless="false" + if device_is_wireless ${device}; then + wireless="true" + fi + + # Write a configuration file header. + ( + echo "#" + echo "# THIS FILE IS AUTOMATICALLY GENERATED AND" + echo "# ANY CUSTOM CHANGES WILL BE OVERWRITTEN!" + echo "#" + echo + echo "ctrl_interface=/var/run/wpa_supplicant" + echo + ) > ${config} + + local items=0 + + local line + while IFS="," read -ra line; do + # Skip commented lines. + [ "${line:0:1}" = "#" ] && continue + + # Skip disabled entries. + [ "${line[2]}" = "on" ] || continue + + wpa_supplicant_config_line \ + ${device} ${config} \ + --wireless="${wireless}" \ + --mode="${line[3]}" \ + --wpa-mode="${line[4]}" \ + --ssid="${line[5]}" \ + --psk="${line[6]}" \ + --priority="${line[7]}" + + items=$(( ${items} + 1 )) + + done < ${WIRELESS_CONFIG} + + # Return exit code 2, when there are no entries in the + # configuration file. + if [ "${items}" = "0" ]; then + return 2 + fi + + return 0 +} + +function wpa_supplicant_config_line() { + local device=${1} + local config=${2} + shift 2 + + local auth_alg + local proto + local key_mgmt + local pairwise + local group + local mode + local priority + local psk + local ssid + local wep_tx_keyidx + local wep_key0 + local wireless="true" + local wpa_mode + + while [ $# -gt 0 ]; do + case "${1}" in + --mode=*) + mode=${1#--mode=} + ;; + --priority=*) + priority=${1#--priority=} + ;; + --psk=*) + psk=${1#--psk=} + ;; + --ssid=*) + ssid=${1#--ssid=} + ;; + --wireless=*) + wireless=${1#--wireless=} + ;; + --wpa-mode=*) + wpa_mode=${1#--wpa-mode=} + ;; + esac + shift + done + + case "${mode}" in + WPA2) + auth_alg="OPEN" + proto="RSN" + key_mgmt="WPA-PSK" + ;; + WPA) + auth_alg="OPEN" + proto="WPA" + key_mgmt="WPA-PSK" + ;; + WEP) + auth_alg="SHARED" + key_mgmt="NONE" + + wep_tx_keyidx=0 + wep_key0=${psk} + psk="" + ;; + NONE) + auth_alg="OPEN" + key_mgmt="NONE" + ;; + *) + # Unsupported mode. + return 1 + ;; + esac + + if [ "${mode}" = "WPA" -o "${mode}" = "WPA2" ]; then + case "${wpa_mode}" in + CCMP-CCMP) + pairwise="CCMP" + group="CCMP" + ;; + CCMP-TKIP) + pairwise="CCMP" + group="TKIP" + ;; + TKIP-TKIP) + pairwise="TKIP" + group="TKIP" + ;; + *) + pairwise="CCMP TKIP" + group="CCMP TKIP" + ;; + esac + fi + + ( + echo "network={" + + if [ -n "${ssid}" ]; then + echo " ssid=\"${ssid}\"" + fi + if [ "${wireless}" = "true" ]; then + echo " scan_ssid=1" + fi + if [ -n "${auth_alg}" ]; then + echo " auth_alg=${auth_alg}" + fi + if [ -n "${key_mgmt}" ]; then + echo " key_mgmt=${key_mgmt}" + fi + if [ -n "${psk}" ]; then + echo " psk=\"${psk}\"" + fi + if [ -n "${wep_tx_keyidx}" ]; then + echo " wep_tx_keyidx=${wep_tx_keyidx}" + fi + if [ -n "${wep_key0}" ]; then + echo " wep_key0=\"${wep_key0}\"" + fi + if [ -n "${proto}" ]; then + echo " proto=${proto}" + fi + if [ -n "${pairwise}" -a -n "${group}" ]; then + echo " pairwise=${pairwise}" + echo " group=${group}" + fi + if [ -n "${priority}" ]; then + echo " priority=${priority}" + fi + + echo "}" + echo + ) >> ${config} +} + +function wpa_supplicant_start() { + local device=${1} + local config="/etc/wpa_supplicant.conf" + + # Write configuration file. + wpa_supplicant_make_config ${device} ${config} + [ $? -eq 0 ] || return 0 + + # Build wpa_supplicant command line. + local wpa_suppl_cmd="wpa_supplicant -B -qqq -i${device} -c${config}" + + if device_is_wireless ${device}; then + wpa_suppl_cmd="${wpa_suppl_cmd} -Dwext" + else + wpa_suppl_cmd="${wpa_suppl_cmd} -Dwired" + fi + + # Run the shiz. + boot_mesg "Starting wireless client on ${RED_DEV}..." + loadproc ${wpa_suppl_cmd} + + # Run wpa_cli to handle reconnection events. + boot_mesg "Starting wireless event handler on ${RED_DEV}..." + wpa_cli -B -a /etc/rc.d/init.d/networking/wpa_supplicant.exe +} + +function wpa_supplicant_stop() { + boot_mesg "Stopping wireless event handler on ${RED_DEV}..." + killproc wpa_cli + + # wpa_cli does not send a disconnect event when get stopped. + # So we manually have to send it to the wpa_supplicant.exe. + /etc/rc.d/init.d/networking/wpa_supplicant.exe "${RED_DEV}" DISCONNECTED + + boot_mesg "Stopping wireless client on ${RED_DEV}..." + killproc wpa_supplicant + + # Tidy up /tmp directory. + rm -f /tmp/wpa_ctrl_* +} + +case "${1}" in + start) + if [ -n "${RED_DEV}" ] && device_is_wireless ${RED_DEV}; then + wpa_supplicant_start ${RED_DEV} + fi + ;; + + stop) + if [ -n "${RED_DEV}" ] && device_is_wireless ${RED_DEV}; then + wpa_supplicant_stop + fi + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc wpa_supplicant + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/wlan_client diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index cc33266..2ec7878 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -33,7 +33,8 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \ redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \ - getconntracktable + getconntracktable wirelessclient dnsmasqctrl +SUID_UPDX = updxsetperms install : all install -m 755 $(PROGS) /usr/local/bin @@ -157,3 +158,9 @@ rebuildroutes: rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o getconntracktable: getconntracktable.c setuid.o ../install+setup/libsmooth/varval.o $(COMPILE) -I../install+setup/libsmooth/ getconntracktable.c setuid.o ../install+setup/libsmooth/varval.o -o $@ + +wirelessclient: wirelessclient.c setuid.o ../install+setup/libsmooth/varval.o + $(COMPILE) -I../install+setup/libsmooth/ wirelessclient.c setuid.o ../install+setup/libsmooth/varval.o -o $@ + +dnsmasqctrl: dnsmasqctrl.c setuid.o ../install+setup/libsmooth/varval.o + $(COMPILE) -I../install+setup/libsmooth/ dnsmasqctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@ diff --git a/src/misc-progs/dnsmasqctrl.c b/src/misc-progs/dnsmasqctrl.c new file mode 100644 index 0000000..8ac3360 --- /dev/null +++ b/src/misc-progs/dnsmasqctrl.c @@ -0,0 +1,34 @@ +/* This file is part of the IPFire Firewall. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> +#include <fcntl.h> +#include "setuid.h" + +int main(int argc, char *argv[]) { + + if (!(initsetuid())) + exit(1); + + if (argc < 2) { + fprintf(stderr, "\nNo argument given.\n\ndnsmasqctrl (restart)\n\n"); + exit(1); + } + + if (strcmp(argv[1], "restart") == 0) { + safe_system("/etc/rc.d/init.d/dnsmasq restart"); + } else { + fprintf(stderr, "\nBad argument given.\n\ndnsmasqctrl (restart)\n\n"); + exit(1); + } + + return 0; +} diff --git a/src/misc-progs/wirelessclient.c b/src/misc-progs/wirelessclient.c new file mode 100644 index 0000000..c85e531 --- /dev/null +++ b/src/misc-progs/wirelessclient.c @@ -0,0 +1,26 @@ +/* IPFire helper program - wirelessclient + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + */ + +#include <stdio.h> +#include <stdlib.h> +#include "setuid.h" + +int main(int argc, char *argv[]) { + if (!(initsetuid())) + exit(1); + + if (strcmp(argv[1], "restart") == 0) { + safe_system("/etc/rc.d/init.d/wlanclient restart >/dev/null 2>&1"); + return 0; + } + + if (strcmp(argv[1], "status") == 0) { + safe_system("/usr/sbin/wpa_cli status verbose"); + return 0; + } + + return 0; +} diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index be75bf5..1c74f3c 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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 # diff --git a/src/paks/igmpproxy/install.sh b/src/paks/igmpproxy/install.sh new file mode 100644 index 0000000..31c5fec --- /dev/null +++ b/src/paks/igmpproxy/install.sh @@ -0,0 +1,27 @@ +#!/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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/igmpproxy/uninstall.sh b/src/paks/igmpproxy/uninstall.sh new file mode 100644 index 0000000..eb6ff5f --- /dev/null +++ b/src/paks/igmpproxy/uninstall.sh @@ -0,0 +1,28 @@ +#!/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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +extract_backup_includes +make_backup ${NAME} +remove_files diff --git a/src/paks/igmpproxy/update.sh b/src/paks/igmpproxy/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/igmpproxy/update.sh @@ -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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh index 9551602..4b54216 100644 --- a/src/paks/squidclamav/update.sh +++ b/src/paks/squidclamav/update.sh @@ -35,4 +35,14 @@ if [ "$VERSION" -lt "11" ]; then sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf fi +if [ "$VERSION" -lt "16" ]; then + sed -e "s/proxy none//g" -i /etc/squidclamav.conf + sed -e "s/^#squid_ip 127\.0\.0\.1/squid_ip 127\.0\.0\.1/g" \ + -e "s/^#squid_port 3128/squid_port 800/g" \ + -e "s/^#trust_cache 1/trust_cache 1/g" -i /etc/squidclamav.conf + + # Regenerate configuration files. + perl /srv/web/ipfire/cgi-bin/proxy.cgi +fi + /etc/init.d/squid restart diff --git a/src/patches/jwhois-4.0-conf_update.patch b/src/patches/jwhois-4.0-conf_update.patch new file mode 100644 index 0000000..512d300 --- /dev/null +++ b/src/patches/jwhois-4.0-conf_update.patch @@ -0,0 +1,714 @@ +diff -up jwhois-4.0/example/jwhois.conf.orig jwhois-4.0/example/jwhois.conf +--- jwhois-4.0/example/jwhois.conf.orig 2007-03-26 11:12:08.000000000 +0200 ++++ jwhois-4.0/example/jwhois.conf 2010-12-20 14:26:06.450882316 +0100 +@@ -17,6 +17,11 @@ whois-servers { + type = regex; + + # ++ # Catch ENUM domains ++ # ++ "\$[0-9]\\.\$+e164\\.arpa" = "struct enum-blocks"; ++ ++ # + # You can use the special value `struct' to redirect the query + # to another block which optionally can use another type of matching. + # Here we use it to have IPv4 numbers matched using CIDR blocks instead +@@ -27,6 +32,7 @@ whois-servers { + "^CORE-[0-9]+$" = "struct handles"; + "^CO[CH]O-[0-9]+$" = "struct handles"; + ".*-[A-Z]+$" = "struct handles"; ++ ".*-6BONE$" = "struct handles"; + + # + # Catch AS numbers +@@ -81,6 +87,7 @@ whois-servers { + # Pseudo-ccTLDs must be listed above gTLDs + # + "\\.ae\\.org$" = "whois.centralnic.net"; ++ "\\.ar\\.com$" = "whois.centralnic.com"; + "\\.br\\.com$" = "whois.centralnic.net"; + "\\.cn\\.com$" = "whois.centralnic.net"; + "\\.de\\.com$" = "whois.centralnic.net"; +@@ -103,17 +110,30 @@ whois-servers { + "\\.uy\\.com$" = "whois.centralnic.net"; + "\\.web\\.com$" = "whois.centralnic.net"; + "\\.za\\.com$" = "whois.centralnic.net"; ++ "\\.za\\.net$" = "whois.za.net"; ++ "\\.za\\.org$" = "whois.za.org"; + + "\\.ac$" = "whois.nic.ac"; +- "\\.ae$" = "whois.uaenic.ae"; ++ "\\.ae$" = "whois.aeda.net.ae"; ++ "\\.co\\.ae$" = "whois.aeda.net.ae"; ++ "\\.net\\.ae$" = "whois.aeda.net.ae"; ++ "\\.org\\.ae$" = "whois.aeda.net.ae"; ++ "\\.sch\\.ae$" = "whois.aeda.net.ae"; ++ "\\.ac\\.ae$" = "whois.aeda.net.ae"; ++ "\\.mil\\.ae$" = "whois.aeda.net.ae"; ++ "\\.gov\\.ae$" = "whois.aeda.net.ae"; ++ "\\.1\\.7\\.9\\.e164\\.arpa$" = "whois.aeda.net.ae"; + "\\.aero$" = "whois.aero"; +- "\\.af$" = "whois.nic.af"; ++ "\\.af$" = "whois.cocca.cx"; + "\\.ag$" = "whois.nic.ag"; +- "\\.ai$" = "whois.offshore.ai"; +- "\\.al$" = "whois.ripe.net"; ++ "\\.ai$" = "whois.ai"; ++ "\\.al$" = "www.ert.gov.al"; + "\\.am$" = "whois.amnic.net"; ++ "\\.edu\\.ar$" = "www.riu.edu.ar"; + "\\.ar$" = "www.nic.ar"; ++ "\\.arpa$" = "whois.iana.org"; + "\\.as$" = "whois.nic.as"; ++ "\\.asia$" = "whois.nic.asia"; + "\\.at$" = "whois.nic.at"; + "\\.asn\\.au$" = "whois.ausregistry.net.au"; + "\\.com\\.au$" = "whois.ausregistry.net.au"; +@@ -125,30 +145,40 @@ whois-servers { + "\\.ba$" = "whois.ripe.net"; + "\\.be$" = "whois.dns.be"; + "\\.bg$" = "whois.register.bg"; +- "\\.bi$" = "www.nic.bi"; +- "\\.biz$" = "whois.neulevel.biz"; ++ "\\.bi$" = "whois.nic.bi"; ++ "\\.biz$" = "whois.biz"; + "\\.bj$" = "whois.nic.bj"; + "\\.bm$" = "rwhois.ibl.bm 4321"; ++ "\\.bo$" = "whois.nic.bo"; + "\\.br$" = "whois.nic.br"; ++ "\\.bs$" = "www.register.bs"; + "\\.bv$" = "whois.ripe.net"; +- "\\.by$" = "whois.ripe.net"; ++ "\\.by$" = "www.domain.by"; + "\\.bz$" = "whois.belizenic.bz"; ++ "\\.co\\.ca$" = "whois.co.ca"; + "\\.ca$" = "whois.cira.ca"; + "\\.cat$" = "whois.cat"; +- "\\.cc$" = "whois.nic.cc"; ++ "\\.cc$" { ++ whois-server = "ccwhois.verisign-grs.com"; ++ query-format = "domain $*"; ++ } + "\\.cd$" = "whois.nic.cd"; + "\\.cg$" = "www.nic.cg"; + "\\.ch$" = "whois.nic.ch"; + "\\.ci$" = "whois.nic.ci"; + "\\.ck$" = "whois.nic.ck"; + "\\.cl$" = "whois.nic.cl"; ++ "\\.co\\.cm$" = "whois.netcom.cm"; ++ "\\.com\\.cm$" = "whois.netcom.cm"; ++ "\\.net\\.cm$" = "whois.netcom.cm"; + "\\.edu\\.cn$" = "whois.edu.cn"; +- "\\.cn$" = "whois.cnnic.net.cn"; ++ "\\.cn$" = "whois.cnnic.cn"; + "\\.com$" { + whois-server = "whois.verisign-grs.com"; + query-format = "domain $*"; + } + "\\.coop$" = "whois.nic.coop"; ++ "\\.cu$" = "www.nic.cu"; + "\\.cx$" = "whois.nic.cx"; + "\\.cy$" = "whois.ripe.net"; + "\\.cz$" = "whois.nic.cz"; +@@ -156,12 +186,15 @@ whois-servers { + whois-server = "whois.denic.de"; + query-format = "-C UTF-8 -T dn,ace $*"; + } +- "\\.dk$" = "whois.dk-hostmaster.dk"; ++ "\\.dk$" { ++ whois-server = "whois.dk-hostmaster.dk"; ++ query-format = "--show-handles $*"; ++ } + "\\.dm$" = "whois.nic.dm"; + "\\.do$" = "whois.nic.do"; +- "\\.dz$" = "whois.ripe.net"; ++ "\\.dz$" = "www.nic.dz"; + "\\.ec$" = "www.nic.ec"; +- "\\.edu$" = "whois.educause.net"; ++ "\\.edu$" = "whois.educause.edu"; + "\\.ee$" = "whois.eenet.ee"; + "\\.eg$" = "whois.ripe.net"; + "\\.es$" = "www.nic.es"; +@@ -171,17 +204,20 @@ whois-servers { + "\\.fm$" = "www.dot.fm"; + "\\.fo$" = "whois.ripe.net"; + "\\.fr$" = "whois.nic.fr"; +- "\\.gi$" = "www.nic.gi"; ++ "\\.gd$" = "whois.adamsnames.com"; ++ "\\.gi$" = "whois2.afilias-grs.net"; + "\\.gov$" = "whois.nic.gov"; +- "\\.gg$" = "whois.isles.net"; ++ "\\.gg$" = "whois.gg"; + "\\.gm$" = "whois.ripe.net"; + "\\.gp$" = "whois.nic.gp"; + "\\.gr$" = "whois.ripe.net"; +- "\\.gs$" = "203.119.12.22"; ++ "\\.gs$" = "whois.nic.gs"; + "\\.gt$" = "www.gt"; +- "\\.hk$" = "whois.hkdnr.net.hk"; ++ "\\.hk$" = "whois.hkirc.hk"; + "\\.hm$" = "whois.registry.hm"; ++ "\\.hn$" = "whois2.afilias-grs.net"; + "\\.hr$" = "www.dns.hr"; ++ "\\.ht$" = "whois.nic.ht"; + "\\.hu$" = "whois.nic.hu"; + "\\.id$" = "whois.idnic.net.id"; + "\\.ie$" = "whois.domainregistry.ie"; +@@ -195,69 +231,94 @@ whois-servers { + "\\.is$" = "whois.isnic.is"; + "\\.it$" = "whois.nic.it"; + "\\.je$" = "whois.isles.net"; ++ "\\.jobs$" { ++ whois-server = "jobswhois.verisign-grs.com"; ++ query-format = "domain $*"; ++ } + "\\.jp$" { + whois-server = "whois.jprs.jp"; + query-format = "$* /e"; + } ++ "\\.ke$" = "whois.kenic.or.ke"; ++ "\\.kp$" = "whois.kcce.kp"; + "\\.kg$" = "whois.domain.kg"; +- "\\.ki$" = "whois.nic.ki"; ++ "\\.ki$" = "whois.cocca.cx"; + "\\.kr$" = "whois.krnic.net"; + "\\.kz$" = "whois.nic.kz"; + "\\.la$" = "whois.nic.la"; + "\\.lb$" = "cgi.aub.edu.lb"; ++ "\\.lc$" = "whois2.afilias-grs.net"; + "\\.li$" = "whois.nic.li"; + "\\.lk$" = "whois.nic.lk"; + "\\.lt$" = "whois.domreg.lt"; + "\\.lu$" = "whois.dns.lu"; + "\\.lv$" = "whois.nic.lv"; + "\\.ly$" = "whois.nic.ly"; +- "\\.ma$" = "whois.ripe.net"; ++ "\\.ma$" = "whois.iam.net.ma"; ++ "\\.md$" = "whois.nic.md"; ++ "\\.me$" = "whois.nic.me"; + "\\.mil$" = "whois.nic.mil"; + "\\.mk$" = "whois.ripe.net"; + "\\.mm$" = "whois.nic.mm"; ++ "\\.mn$" = "whois2.afilias-grs.net"; + "\\.mobi$" = "whois.dotmobiregistry.net"; +- "\\.ms$" = "whois.adamsnames.tc"; +- "\\.mt$" = "www.um.edu.mt"; ++ "\\.ms$" = "whois.nic.ms"; ++ "\\.mt$" = "whois.nic.org.mt"; + "\\.mu$" = "whois.nic.mu"; + "\\.museum$" = "whois.museum"; + "\\.mw$" = "www.tarsus.net"; + "\\.mx$" = "whois.nic.mx"; +- "\\.my$" = "whois.mynic.net.my"; ++ "\\.my$" = "whois.domainregistry.my"; + "\\.na$" = "whois.na-nic.com.na"; +- "\\.name$" = "whois.nic.name"; ++ "\\.name$" { ++ whois-server = "whois.nic.name"; ++ query-format = "domain = $*"; ++ } + "\\.net$" { + whois-server = "whois.verisign-grs.com"; + query-format = "domain $*"; + } +- "\\.ng$" = "whois.rg.net"; ++ "\\.nf$" = "whois.cocca.cx"; ++ "\\.ng$" = "whois.nic.net.ng"; + "\\.nl$" = "whois.domain-registry.nl"; + "\\.no$" = "whois.norid.no"; + "\\.nu$" = "whois.nic.nu"; + "\\.nz$" = "whois.srs.net.nz"; + "\\.org$" = "whois.publicinterestregistry.net"; +- "\\.pe$" = "whois.nic.pe"; ++ "\\.pa$" = "www.nic.pa"; ++ "\\.pe$" = "kero.yachay.pe"; + "\\.pk$" = "pknic.net.pk"; + "\\.pl$" = "whois.dns.pl"; + "\\.pm$" = "whois.nic.pm"; ++ "\\.pr$" = "whois.nic.pr"; + "\\.pro$" = "whois.registrypro.pro"; ++ "\\.ps$" = "www.nic.ps"; + "\\.pt$" = "whois.dns.pt"; + "\\.pw$" = "whois.nic.pw"; + "\\.re$" = "whois.nic.re"; + "\\.ro$" = "whois.rotld.ro"; ++ "\\.edu\.ru$" = "whois.informika.ru"; + "\\.ru$" = "whois.ripn.net"; + "\\.rw$" = "www.nic.rw"; + "\\.sa$" = "saudinic.net.sa"; ++ "\\.sb$" = "whois.nic.sb"; ++ "\\.sc$" = "whois2.afilias-grs.net"; + "\\.se$" = "whois.iis.se"; +- "\\.sg$" = "whois.nic.net.sg"; ++ "\\.sg$" = "whois.sgnic.sg"; + "\\.sh$" = "whois.nic.sh"; + "\\.si$" = "whois.arnes.si"; + "\\.sj$" = "whois.ripe.net"; +- "\\.sk$" = "whois.ripe.net"; ++ "\\.sk$" = "whois.sk-nic.sk"; ++ "\\.sl$" = "whois.nic.sl"; + "\\.sm$" = "whois.ripe.net"; ++ "\\.sn$" = "whois.nic.sn"; ++ "\\.so$" = "whois.nic.so"; + "\\.sr$" = "whois.register.sr"; + "\\.st$" = "whois.nic.st"; + "\\.su$" = "whois.ripn.net"; ++ "\\.sv$" = "www.svnet.org.sv"; + "\\.tc$" = "whois.adamsnames.tc"; ++ "\\.tel$" = "whois.nic.tel"; + "\\.tf$" = "whois.afnic.fr"; + "\\.tg$" = "www.nic.tg"; + "\\.th$" = "whois.thnic.net"; +@@ -268,8 +329,12 @@ whois-servers { + "\\.tn$" = "whois.ripe.net"; + "\\.to$" = "whois.tonic.to"; + "\\.tr$" = "whois.nic.tr"; ++ "\\.travel$" = "whois.nic.travel"; + "\\.tt$" = "www.nic.tt"; +- "\\.tv$" = "whois.nic.tv"; ++ "\\.tv$" { ++ whois-server = "tvwhois.verisign-grs.com"; ++ query-format = "domain $*"; ++ } + "\\.tw$" = "whois.twnic.net"; + "\\.ua$" = "whois.com.ua"; + "\\.ug$" = "whois.co.ug"; +@@ -279,9 +344,12 @@ whois-servers { + "\\.fed\\.us$" = "whois.nic.gov"; + "\\.us$" = "whois.nic.us"; + "\\.com\\.uy$" = "dns.antel.net.uy"; +- "\\.uy$" = "www.rau.edu.uy"; # is a whois server +- "\\.uz$" = "www.noc.uz"; ++ "\\.uy$" = "whois.nic.org.uy"; ++ "\\.co\\.uz$" = "whois.reg.uz"; ++ "\\.com\\.uz$" = "whois.reg.uz"; ++ "\\.uz$" = "whois.cctld.uz"; + "\\.va$" = "whois.ripe.net"; ++ "\\.vc$" = "whois2.afilias-grs.net"; + "\\.ve$" = "whois.nic.ve"; + "\\.vi$" = "www.nic.vi"; + "\\.vg$" = "whois.adamsnames.tc"; +@@ -289,12 +357,15 @@ whois-servers { + "\\.vu$" = "www.vunic.vu"; + "\\.wf$" = "whois.nic.wf"; + "\\.ws$" = "whois.worldsite.ws"; ++ "\\.xn--mgbaam7a8h$" = "whois.aeda.net.ae"; + "\\.yt$" = "whois.nic.yt"; +- "\\.yu$" = "whois.ripe.net"; ++ "\\.yu$" = "www.nic.yu"; + "\\.ac\\.za$" = "whois.ac.za"; + "\\.org\\.za$" = "rwhois.org.za 4321"; + "\\.co\\.za$" = "whois.co.za"; ++ "\\.nom\\.za$" = "www.nom.za"; + # "\\.za$" = "whois.frd.ac.za"; ++ "\\.co\\.zw$" = "www.zispa.co.zw"; + + # + # Specify different port numbers to connect to by postfixing the IP +@@ -311,6 +382,16 @@ whois-servers { + } + + # ++# enum-blocks ++# ++enum-blocks { ++ type = regex; ++ ++ "\\.9\\.4\\.e164\\.arpa$" = "whois.enum.denic.de"; ++ "\\.1\\.6\\.e164\\.arpa$" = "whois-check.enum.com.au"; ++} ++ ++# + # cidr-blocks contains a list of all known CIDR blocks assigned to + # RIPE or APNIC. Default all queries to ARIN which has most other blocks. + # +@@ -580,7 +661,7 @@ cidr-blocks { + cidr6-blocks { + type = cidr6; + +- "2001:0000::/23" = "whois.iana.org"; ++ "2001:0000::/23" = "whois.iana.org"; # correct, but nothing usable is returned + "2001:0200::/23" = "whois.apnic.net"; + "2001:0400::/23" = "whois.arin.net"; + "2001:0600::/23" = "whois.ripe.net"; +@@ -593,13 +674,13 @@ cidr6-blocks { + "2001:1600::/23" = "whois.ripe.net"; + "2001:1800::/23" = "whois.arin.net"; + "2001:1A00::/23" = "whois.ripe.net"; +- "2001:1C00::/23" = "whois.ripe.net"; +- "2001:1E00::/23" = "whois.ripe.net"; ++ "2001:1C00::/22" = "whois.ripe.net"; + "2001:2000::/20" = "whois.ripe.net"; + "2001:3000::/21" = "whois.ripe.net"; + "2001:3800::/22" = "whois.ripe.net"; ++ "2001:3C00::/22" = "whois.arin.net"; # not correct, but shows better information + "2001:4000::/23" = "whois.ripe.net"; +- "2001:4200::/23" = "whois.arin.net"; ++ "2001:4200::/23" = "whois.afrinic.net"; + "2001:4400::/23" = "whois.apnic.net"; + "2001:4600::/23" = "whois.ripe.net"; + "2001:4800::/23" = "whois.arin.net"; +@@ -610,23 +691,47 @@ cidr6-blocks { + "2001:A000::/20" = "whois.apnic.net"; + "2001:B000::/20" = "whois.apnic.net"; + ++ "2002:0000::/16" = "whois.arin.net"; # not correct, but shows better information ++ + "2003:0000::/18" = "whois.ripe.net"; + +- "2400:0000::/19" = "whois.apnic.net"; +- "2400:2000::/19" = "whois.apnic.net"; +- "2400:4000::/21" = "whois.apnic.net"; +- "2404:0000::/23" = "whois.apnic.net"; +- +- "2600:0000::/22" = "whois.arin.net"; +- "2604:0000::/22" = "whois.arin.net"; +- "2608:0000::/22" = "whois.arin.net"; +- "260C:0000::/22" = "whois.arin.net"; ++ "2400:0000::/12" = "whois.apnic.net"; ++ ++ "2600:0000::/12" = "whois.arin.net"; + "2610:0000::/23" = "whois.arin.net"; ++ "2620:0000::/23" = "whois.arin.net"; ++ ++ "2800:0000::/12" = "whois.lacnic.net"; + +- "2800:0000::/23" = "whois.lacnic.net"; ++ "2C00:0000::/12" = "whois.afrinic.net"; + +- "2A00:0000::/21" = "whois.ripe.net"; +- "2A01:0000::/16" = "whois.ripe.net"; ++ # ++ # IPv6 blocks by carriers used for SixXS; ++ # see e.g. http://www.sixxs.net/pops/ ++ # ++ "2001:0610::/32" = "whois.sixxs.net"; ++ "2001:06A0::/32" = "whois.sixxs.net"; ++ "2001:06A8::/32" = "whois.sixxs.net"; ++ "2001:06F8::/32" = "whois.sixxs.net"; ++ "2001:0770::/32" = "whois.sixxs.net"; ++ "2001:07B8::/32" = "whois.sixxs.net"; ++ "2001:0808::/32" = "whois.sixxs.net"; ++ "2001:0838::/32" = "whois.sixxs.net"; ++ "2001:0960::/32" = "whois.sixxs.net"; ++ "2001:0A60::/32" = "whois.sixxs.net"; ++ "2001:0AD0::/32" = "whois.sixxs.net"; ++ "2001:0B18::/32" = "whois.sixxs.net"; ++ "2001:1418::/32" = "whois.sixxs.net"; ++ "2001:14B8::/32" = "whois.sixxs.net"; ++ "2001:15C0::/32" = "whois.sixxs.net"; ++ "2001:16D8::/32" = "whois.sixxs.net"; ++ "2001:1938::/32" = "whois.sixxs.net"; ++ "2001:4830::/32" = "whois.sixxs.net"; ++ "2001:4978::/32" = "whois.sixxs.net"; ++ "2001:41E0::/32" = "whois.sixxs.net"; ++ "2001:4428::/32" = "whois.sixxs.net"; ++ "2A01:0198::/32" = "whois.sixxs.net"; ++ "2A01:0348::/32" = "whois.sixxs.net"; + + # + # Experimental IPv6 network 6bone (RFC2471) +@@ -662,7 +767,7 @@ handles { + ".*-NICAT$" = "whois.nic.at"; + ".*-CZ$" = "whois.nic.cz"; + ".*-NICIR$" = "whois.nic.ir"; +- ".*-UYNIC$" = "www.rau.edu.uy"; ++ ".*-UYNIC$" = "whois.nic.org.uy"; + ".*-ITNIC$" = "whois.nic.it"; + ".*-FRNIC$" = "whois.nic.fr"; + ".*-LACNIC$" = "whois.lacnic.net"; +@@ -671,6 +776,49 @@ handles { + whois-server = "saudinic.net.sa"; + query-format = "PERSON $*"; + } ++ ".*-SIXXS$" = "whois.sixxs.net"; ++ ".*-6BONE$" = "whois.6bone.net"; ++ ".*-IRNIC$" = "whois.nic.ir"; ++ ".*-RIPN$" = "whois.ripn.net"; ++ ".*-AFRINIC$" = "whois.afrinic.net"; ++ "^C[0-9]+-LRMS$" { ++ whois-server = "whois.afilias.info"; ++ query-format = "CONTACT ID $*"; ++ } ++ "^D[0-9]+-LRMS$" { ++ whois-server = "whois.afilias.info"; ++ query-format = "DOMAIN ID $*"; ++ } ++ "^H[0-9]+-LRMS$" { ++ whois-server = "whois.afilias.info"; ++ query-format = "HOST ID $*"; ++ } ++ "^R[0-9]+-LRMS$" { ++ whois-server = "whois.afilias.info"; ++ query-format = "REGISTRAR ID $*"; ++ } ++ ".*-KENIC$" = "whois.kenic.or.ke"; ++ ".*-UANIC$" = "whois.com.ua"; ++ ".*-COOP$" { ++ whois-server = "whois.nic.coop"; ++ query-format = "CONTACT $*"; ++ } ++ ".*CONTACT-NAME$" { ++ whois-server = "whois.nic.name"; ++ query-format = "contact = $*"; ++ } ++ ".*REGISTRAR-NAME$" { ++ whois-server = "whois.nic.name"; ++ query-format = "registrar = $*"; ++ } ++ "^C[0-9]+-AERO$" { ++ whois-server = "whois.aero"; ++ query-format = "CONTACT ID $*"; ++ } ++ "^D[0-9]+-AERO$" { ++ whois-server = "whois.aero"; ++ query-format = "DOMAIN ID $*"; ++ } + } + + # +@@ -678,11 +826,6 @@ handles { + # each host. + # + server-options { +- "rwhois\\.nic\\.ve" { +- rwhois = true; +- rwhois-display = "dump"; +- rwhois-limit = 10; +- } + "rwhois\\.exodus\\.net" { + rwhois = true; + } +@@ -754,13 +897,6 @@ server-options { + form-element = "name"; + } + +- "www\\.um\\.edu\\.mt" { +- http = "true"; +- http-method = "GET"; +- http-action = "/cgi-bin/nic/whois"; +- form-element = "domain"; +- } +- + "www\\.gt" { + http = "true"; + http-method = "GET"; +@@ -777,13 +913,6 @@ server-options { + query-format = "Upit=${+2}"; # All but last domain segment + } + +- "whois\\.offshore\\.ai" { +- http = "true"; +- http-method = "POST"; +- http-action = "/cgi-bin/whois.pl"; +- form-element = "domain-name"; +- } +- + "www\\.io\\.io" { + http = "true"; + http-method = "GET"; +@@ -813,11 +942,12 @@ server-options { + form-element = "query"; + } + +- "www\\.nic\\.bi" { +- http = "true"; +- http-method = "POST"; +- http-action = "/cgi-bin/whoisbi.pl"; # Formatting problems in Lynx +- form-element = "DOMAINWHOIS"; ++ "whois\\.nic\\.bi" { ++ http = "true"; # I can't connect on port 43 ++ http-method = "GET"; ++ http-action = "/register/whois.hei"; ++ form-element = "query"; ++ form-extra = "type=domain"; + } + + "www\\.nic\\.cg" { +@@ -848,13 +978,6 @@ server-options { + form-element = "name"; + } + +- "www\\.noc\\.uz" { +- http = "true"; +- http-method = "POST"; +- http-action = "/whois.php4"; +- form-element = "dname"; +- } +- + "www\\.nic\\.vi" { + http = "true"; + http-method = "POST"; +@@ -878,9 +1001,9 @@ server-options { + + "www\\.nic\\.tg" { + http = "true"; +- http-method = "GET"; +- http-action = "/moteur/info_dom.php"; +- form-element = "domaine"; ++ http-method = "POST"; ++ http-action = "/nictg/indexplus.php?pg=verifdom&op=whois"; ++ query-format = "tosearch=${+2}&typedom=.tg"; + } + + "cgi\\.aub\\.edu\\.lb" { +@@ -910,33 +1033,152 @@ server-options { + form-element = "nombre"; + } + +- "www\\.denic\\.de" { +- http = "true"; +- http-method = "POST"; +- http-action = "/en/whois/data.jsp"; +- form-element = "domainname"; +- form-extra = "service=WhoisData&lang=en&submit=Accept"; +- } + "whois\\.denic\\.de" { + whois-server = "whois.denic.de"; + query-format = "-C UTF-8 -T dn,ace $*"; + answer-charset = "UTF-8"; + } ++ ++ "whois\\.enum\\.denic\\.de" { ++ whois-server = "whois.enum.denic.de"; ++ query-format = "-C UTF-8 -T dn $*"; ++ answer-charset = "UTF-8"; ++ } ++ + "whois\\.nic\\.ad\\.jp" { + query-format = "$*/e"; + } ++ + "whois\\.nic\\.ch" { + answer-charset = "UTF-8"; + } ++ + "whois\\.nic\\.li" { + answer-charset = "UTF-8"; + } ++ + "whois\\.centralnic\\.*" { + whois-redirect = ".*Whois Server: \$.*\$"; + } ++ + ".*\\.verisign-grs\\.com" { + whois-redirect = ".*Whois Server: \$.*\$"; + } ++ ++ "whois\\.sixxs\\.net" { ++ whois-redirect = ".*ReferralServer: whois:\/\/\$.*\$"; ++ } ++ ++ "whois2\\.afilias-grs\\.net" { ++ whois-redirect = "Whois Server:\$.*\$"; ++ } ++ ++ "whois\\.registrar\\.telekom\\.de" { ++ query-format = "full $*"; ++ } ++ ++ "whois\\.rrpproxy\\.net" { ++ answer-charset = "UTF-8"; ++ } ++ ++ "www\\.nom\\.za" { ++ http = "true"; ++ http-method = "POST"; ++ http-action = "/do.php"; ++ query-format = "chkDomain=${+3}&chkAvail=Check"; ++ } ++ ++ "www\\.nic\\.pa" { ++ http = "true"; ++ http-method = "GET"; ++ http-action = "/egh/whois.php"; ++ form-element = "nombre_d"; ++ } ++ ++ "www\\.nic\\.dz" { ++ http = "true"; ++ http-method = "POST"; ++ http-action = "/index.php?option=com_content&task=view&id=37&Itemid=51"; ++ form-element = "domain_name"; ++ } ++ ++ "www\\.nic\\.yu" { ++ http = "true"; ++ http-method = "GET"; ++ http-action = "/cgi-bin/checkavail.cgi"; ++ form-element = "domain"; ++ } ++ ++ "whois\\.dotster\\.com" { ++ answer-charset = "UTF-8"; ++ } ++ ++ "www\\.ert\\.gov\\.al" { ++ http = "true"; ++ http-method = "POST"; ++ http-action = "/ert_eng/domain_res.html"; ++ query-format = "Domain=${+2}"; ++ } ++ ++ "www\\.nic\\.cu" { ++ http = "true"; ++ http-method = "GET"; ++ http-action = "/dom_det.php"; ++ form-element = "domsrch"; ++ } ++ ++ "www\\.nic\\.ps" { ++ http = "true"; ++ http-method = "GET"; ++ http-action = "/whois/domain_whois.php"; ++ form-element = "dname"; ++ } ++ ++ "www\\.svnet\\.org\\.sv" { ++ http = "true"; ++ http-method = "POST"; ++ http-action = "/registro/consultas/whois.php"; ++ form-element = "subdominio"; ++ } ++ ++ "www\\.zispa\\.co\\.zw" { ++ http = "true"; ++ http-method = "GET"; ++ http-action = "/cgi-bin/search"; ++ form-element = "domain"; ++ } ++ ++ "www\\.riu\\.edu\\.ar" { ++ http = "true"; ++ http-method = "POST"; ++ http-action = "/cgi-bin/verdom.pl.nuevo"; ++ query-format = "username=${+3}"; ++ } ++ ++ "www\\.register\\.bs" { ++ http = "true"; ++ http-method = "POST"; ++ http-action = "/cgi-bin/search.pl"; ++ form-element = "name"; ++ } ++ ++ "www\\.domain\\.by" { ++ http = "true"; ++ http-method = "POST"; ++ http-action = "/cgi-bin/registry.cgi"; ++ query-format = "domain=${+2}&lang=e&mode=slquest"; ++ } ++ ++ "www\\.nic\\.ac" { ++ http = "true"; ++ http-method = "GET"; ++ http-action = "/cgi-bin/whois"; ++ form-element = "textfield"; ++ } ++ ++ "whois\\.1api\\.net" { ++ answer-charset = "UTF-8"; ++ } + } + + # diff --git a/src/patches/jwhois-4.0-conf_update2.patch b/src/patches/jwhois-4.0-conf_update2.patch new file mode 100644 index 0000000..72dd300 --- /dev/null +++ b/src/patches/jwhois-4.0-conf_update2.patch @@ -0,0 +1,163 @@ +Patch by Robert Scheck <robert(a)fedoraproject.org> for jwhois >= 4.0, which adds various new +IDN top-level-domains, updates some whois servers of ccTLDs and corrects the answer charset +setting for some whois servers, too. + +--- jwhois-4.0/example/jwhois.conf 2011-05-22 20:36:19.000000000 +0200 ++++ jwhois-4.0/example/jwhois.conf.conf_update2 2011-05-22 23:46:21.000000000 +0200 +@@ -122,7 +122,6 @@ + "\\.ac\\.ae$" = "whois.aeda.net.ae"; + "\\.mil\\.ae$" = "whois.aeda.net.ae"; + "\\.gov\\.ae$" = "whois.aeda.net.ae"; +- "\\.1\\.7\\.9\\.e164\\.arpa$" = "whois.aeda.net.ae"; + "\\.aero$" = "whois.aero"; + "\\.af$" = "whois.cocca.cx"; + "\\.ag$" = "whois.nic.ag"; +@@ -192,7 +191,7 @@ + } + "\\.dm$" = "whois.nic.dm"; + "\\.do$" = "whois.nic.do"; +- "\\.dz$" = "www.nic.dz"; ++ "\\.dz$" = "whois.nic.dz"; + "\\.ec$" = "www.nic.ec"; + "\\.edu$" = "whois.educause.edu"; + "\\.ee$" = "whois.eenet.ee"; +@@ -243,7 +242,7 @@ + "\\.kp$" = "whois.kcce.kp"; + "\\.kg$" = "whois.domain.kg"; + "\\.ki$" = "whois.cocca.cx"; +- "\\.kr$" = "whois.krnic.net"; ++ "\\.kr$" = "whois.kr"; + "\\.kz$" = "whois.nic.kz"; + "\\.la$" = "whois.nic.la"; + "\\.lb$" = "cgi.aub.edu.lb"; +@@ -292,13 +291,14 @@ + "\\.pm$" = "whois.nic.pm"; + "\\.pr$" = "whois.nic.pr"; + "\\.pro$" = "whois.registrypro.pro"; +- "\\.ps$" = "www.nic.ps"; ++ "\\.ps$" = "whois.pnina.ps"; + "\\.pt$" = "whois.dns.pt"; + "\\.pw$" = "whois.nic.pw"; + "\\.re$" = "whois.nic.re"; + "\\.ro$" = "whois.rotld.ro"; ++ "\\.rs$" = "whois.rnids.rs"; + "\\.edu\.ru$" = "whois.informika.ru"; +- "\\.ru$" = "whois.ripn.net"; ++ "\\.ru$" = "whois.tcinet.ru"; + "\\.rw$" = "www.nic.rw"; + "\\.sa$" = "saudinic.net.sa"; + "\\.sb$" = "whois.nic.sb"; +@@ -317,6 +317,7 @@ + "\\.st$" = "whois.nic.st"; + "\\.su$" = "whois.ripn.net"; + "\\.sv$" = "www.svnet.org.sv"; ++ "\\.sy$" = "whois.tld.sy"; + "\\.tc$" = "whois.adamsnames.tc"; + "\\.tel$" = "whois.nic.tel"; + "\\.tf$" = "whois.afnic.fr"; +@@ -335,7 +336,7 @@ + whois-server = "tvwhois.verisign-grs.com"; + query-format = "domain $*"; + } +- "\\.tw$" = "whois.twnic.net"; ++ "\\.tw$" = "whois.twnic.net.tw"; + "\\.ua$" = "whois.com.ua"; + "\\.ug$" = "whois.co.ug"; + "\\.ac\\.uk$" = "whois.ja.net"; +@@ -357,9 +358,25 @@ + "\\.vu$" = "www.vunic.vu"; + "\\.wf$" = "whois.nic.wf"; + "\\.ws$" = "whois.worldsite.ws"; ++ "\\.xn--3e0b707e$" = "whois.kr"; ++ "\\.xn--90a3ac$" = "whois.rnids.rs"; ++ "\\.xn--clchc0ea0b2g2a9gcd$" = "whois.sgnic.sg"; ++ "\\.xn--fiqs8s$" = "cwhois.cnnic.cn"; ++ "\\.xn--fiqz9s$" = "cwhois.cnnic.cn"; ++ "\\.xn--fzc2c9e2c$" = "whois.nic.lk"; ++ "\\.xn--j6w193g$" = "whois.hkirc.hk"; ++ "\\.xn--kprw13d$" = "whois.twnic.net.tw"; ++ "\\.xn--kpry57d$" = "whois.twnic.net.tw"; ++ "\\.xn--lgbbat1ad8j$" = "whois.nic.dz"; + "\\.xn--mgbaam7a8h$" = "whois.aeda.net.ae"; ++ "\\.xn--mgberp4a5d4ar$" = "whois.nic.net.sa"; ++ "\\.xn--o3cw4h$" = "whois.thnic.co.th"; ++ "\\.xn--ogbpf8fl$" = "whois.tld.sy"; ++ "\\.xn--p1ai$" = "whois.tcinet.ru"; ++ "\\.xn--xkc2al3hye2a$" = "whois.nic.lk"; ++ "\\.xn--yfro4i67o$" = "whois.sgnic.sg"; ++ "\\.xn--ygbi2ammx$" = "whois.pnina.ps"; + "\\.yt$" = "whois.nic.yt"; +- "\\.yu$" = "www.nic.yu"; + "\\.ac\\.za$" = "whois.ac.za"; + "\\.org\\.za$" = "rwhois.org.za 4321"; + "\\.co\\.za$" = "whois.co.za"; +@@ -389,6 +406,7 @@ + + "\\.9\\.4\\.e164\\.arpa$" = "whois.enum.denic.de"; + "\\.1\\.6\\.e164\\.arpa$" = "whois-check.enum.com.au"; ++ "\\.1\\.7\\.9\\.e164\\.arpa$" = "whois.aeda.net.ae"; + } + + # +@@ -1095,20 +1113,6 @@ + form-element = "nombre_d"; + } + +- "www\\.nic\\.dz" { +- http = "true"; +- http-method = "POST"; +- http-action = "/index.php?option=com_content&task=view&id=37&Itemid=51"; +- form-element = "domain_name"; +- } +- +- "www\\.nic\\.yu" { +- http = "true"; +- http-method = "GET"; +- http-action = "/cgi-bin/checkavail.cgi"; +- form-element = "domain"; +- } +- + "whois\\.dotster\\.com" { + answer-charset = "UTF-8"; + } +@@ -1127,13 +1131,6 @@ + form-element = "domsrch"; + } + +- "www\\.nic\\.ps" { +- http = "true"; +- http-method = "GET"; +- http-action = "/whois/domain_whois.php"; +- form-element = "dname"; +- } +- + "www\\.svnet\\.org\\.sv" { + http = "true"; + http-method = "POST"; +@@ -1179,6 +1176,26 @@ + "whois\\.1api\\.net" { + answer-charset = "UTF-8"; + } ++ ++ "whois\\.kr" { ++ answer-charset = "EUC-KR"; ++ } ++ ++ "whois\\.nic\\.or\\.kr" { ++ answer-charset = "EUC-KR"; ++ } ++ ++ "whois\\.nic\\.dz" { ++ answer-charset = "UTF-8"; ++ } ++ ++ "whois\\.nic\\.lk" { ++ answer-charset = "ISO-8859-11"; ++ } ++ ++ "whois\\.iana\\.org" { ++ answer-charset = "UTF-8"; ++ } + } + + # diff --git a/src/patches/jwhois-4.0-connect.patch b/src/patches/jwhois-4.0-connect.patch new file mode 100644 index 0000000..2a639d7 --- /dev/null +++ b/src/patches/jwhois-4.0-connect.patch @@ -0,0 +1,58 @@ +This fixes somewhat reversed logic of trying to connect to WHOIS server. +Tue Nov 20 2007, Lubomir Kundrak <lkundrak(a)redhat.com> + +--- jwhois-4.0/src/utils.c.connect 2007-06-26 09:00:20.000000000 +0200 ++++ jwhois-4.0/src/utils.c 2007-11-20 17:05:33.000000000 +0100 +@@ -247,7 +247,7 @@ make_connect(const char *host, int port) + { + return -1; + } +- while (res) ++ for (; res; res = res->ai_next) + { + sa = res->ai_addr; + sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol); +@@ -266,15 +266,15 @@ make_connect(const char *host, int port) + flags = fcntl(sockfd, F_GETFL, 0); + if (fcntl(sockfd, F_SETFL, flags|O_NONBLOCK) == -1) + { ++ close (sockfd); + return -1; + } + +- + error = connect(sockfd, res->ai_addr, res->ai_addrlen); +- + if (error < 0 && errno != EINPROGRESS) + { +- break; ++ close (sockfd); ++ continue; + } + + FD_ZERO(&fdset); +@@ -283,18 +283,20 @@ make_connect(const char *host, int port) + error = select(FD_SETSIZE, NULL, &fdset, NULL, &timeout); + if (error == 0) + { +- break; ++ close (sockfd); ++ return -1; + } + + retlen = sizeof(retval); + error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen); + if (error < 0 || retval) + { +- break; ++ close (sockfd); ++ return -1; + } +- res = res->ai_next; ++ ++ break; + } +- if (error < 0 || retval) return -1; + #endif + + return sockfd; diff --git a/src/patches/jwhois-4.0-fclose.patch b/src/patches/jwhois-4.0-fclose.patch new file mode 100644 index 0000000..e9c896f --- /dev/null +++ b/src/patches/jwhois-4.0-fclose.patch @@ -0,0 +1,12 @@ +diff -up jwhois-4.0/src/init.c_old jwhois-4.0/src/init.c +--- jwhois-4.0/src/init.c_old 2007-06-26 08:59:17.000000000 +0200 ++++ jwhois-4.0/src/init.c 2009-01-27 15:49:35.000000000 +0100 +@@ -283,6 +283,8 @@ parse_args(int *argc, char ***argv) + if (in) + jconfig_parse_file(in); + ++ fclose(in); ++ + if (verbose>1) + { + printf("[Debug: Cache = %s]\n", cache?"On":"Off"); diff --git a/src/patches/jwhois-4.0-idna.patch b/src/patches/jwhois-4.0-idna.patch new file mode 100644 index 0000000..ff13a4f --- /dev/null +++ b/src/patches/jwhois-4.0-idna.patch @@ -0,0 +1,43 @@ +diff -up jwhois-4.0/src/jwhois.c.orig jwhois-4.0/src/jwhois.c +--- jwhois-4.0/src/jwhois.c.orig 2007-06-26 08:59:35.000000000 +0200 ++++ jwhois-4.0/src/jwhois.c 2011-05-24 12:29:37.398892451 +0200 +@@ -98,7 +98,7 @@ main(int argc, char **argv) + + /* Parse remaining arguments and place them into the wq + structure. */ +- while (optind < argc) ++ while (optind < argc-1) + { + count += strlen(argv[optind])+1; + if (!qstring) +@@ -116,19 +116,25 @@ main(int argc, char **argv) + strcat(qstring, " "); + optind++; + } +- qstring[strlen(qstring)-1] = '\0'; + #ifdef LIBIDN +- rc = idna_to_ascii_lz(qstring, &idn, 0); ++ rc = idna_to_ascii_lz(argv[optind], &idn, 0); + if (rc != IDNA_SUCCESS) + { +- printf("[IDN encoding of '%s' failed with error code %d]\n", qstring, rc); ++ printf("[IDN encoding of '%s' failed with error code %d]\n", argv[optind], rc); + exit(1); + } +- wq.query = strdup(idn); ++ qstring = realloc(qstring, count+strlen(idn)+1); ++ memcpy(qstring+count, ++ idn, ++ strlen(idn)+1); + free(idn); + #else +- wq.query = qstring; ++ qstring = realloc(qstring, count+strlen(argv[optind])+1); ++ memcpy(qstring+count, ++ argv[optind], ++ strlen(argv[optind])+1); + #endif ++ wq.query = qstring; + + if (ghost) + { diff --git a/src/patches/jwhois-4.0-ipv6match.patch b/src/patches/jwhois-4.0-ipv6match.patch new file mode 100644 index 0000000..0e5ad0e --- /dev/null +++ b/src/patches/jwhois-4.0-ipv6match.patch @@ -0,0 +1,15 @@ +When IPv6 address mask did not end on an octed boundary, the the opposite +part of last byte of host address was taken into account when a match was +attempted. -- Lubomir Kundrak <lkundrak(a)redhat.com> + +--- jwhois-4.0/src/lookup.c.ipv6-match 2007-12-04 17:09:57.000000000 +0100 ++++ jwhois-4.0/src/lookup.c 2007-12-04 17:10:20.000000000 +0100 +@@ -149,7 +149,7 @@ static int ipv6_address_is_in_network(co + } + /* i == bits / 8 */ + if (bits % 8 != 0 +- && (addr->s6_addr[i] & (0xFFu << (bits % 8))) != net->s6_addr[i]) ++ && (addr->s6_addr[i] & (0xFFu << 8-(bits % 8))) != net->s6_addr[i]) + return 0; + return 1; + } diff --git a/src/patches/jwhois-4.0-multi-homed.patch b/src/patches/jwhois-4.0-multi-homed.patch new file mode 100644 index 0000000..05d6f46 --- /dev/null +++ b/src/patches/jwhois-4.0-multi-homed.patch @@ -0,0 +1,15 @@ +diff -up jwhois-4.0/src/utils.c.orig jwhois-4.0/src/utils.c +--- jwhois-4.0/src/utils.c.orig 2010-09-29 16:19:24.453608330 +0200 ++++ jwhois-4.0/src/utils.c 2010-09-29 16:20:10.686608189 +0200 +@@ -292,7 +292,10 @@ make_connect(const char *host, int port) + if (error < 0 || retval) + { + close (sockfd); +- return -1; ++ if (retval == ENETUNREACH) ++ continue; ++ else ++ return -1; + } + + break; diff --git a/src/patches/jwhois-4.0-select.patch b/src/patches/jwhois-4.0-select.patch new file mode 100644 index 0000000..b60ec96 --- /dev/null +++ b/src/patches/jwhois-4.0-select.patch @@ -0,0 +1,27 @@ +diff -ur jwhois-4.0.old/src/whois.c jwhois-4.0/src/whois.c +--- jwhois-4.0.old/src/whois.c 2007-06-26 03:00:29.000000000 -0400 ++++ jwhois-4.0/src/whois.c 2009-04-29 11:42:56.000000000 -0400 +@@ -115,6 +115,7 @@ + unsigned int count, start_count; + int ret; + char data[MAXBUFSIZE]; ++ fd_set rfds; + + count = 0; + +@@ -124,7 +125,15 @@ + + do + { ++ FD_ZERO(&rfds); ++ FD_SET(fd, &rfds); ++ ret = select(fd + 1, &rfds, NULL, NULL, NULL); ++ ++ if (ret <= 0) ++ return -1; ++ + ret = read(fd, data, MAXBUFSIZE-1); ++ + if (ret >= 0) + { + count += ret; diff --git a/src/patches/oinkmaster-2.0-add_community_rules.patch b/src/patches/oinkmaster-2.0-add_community_rules.patch new file mode 100644 index 0000000..720efd6 --- /dev/null +++ b/src/patches/oinkmaster-2.0-add_community_rules.patch @@ -0,0 +1,14 @@ +diff -Naur oinkmaster-2.0.org/oinkmaster.pl oinkmaster-2.0/oinkmaster.pl +--- oinkmaster-2.0.org/oinkmaster.pl 2007-04-20 05:20:32.000000000 +0200 ++++ oinkmaster-2.0/oinkmaster.pl 2013-07-15 16:46:40.000000000 +0200 +@@ -1159,6 +1159,10 @@ + } + } + ++ # hack for community-ruleset. ++ if (-d "$dir/community-rules") { ++ move("$dir/community-rules","$dir/$rules_dir"); ++ } + # Make sure that non-empty rules directory existed in archive. + # We permit empty rules directory if min_files is set to 0 though. + clean_exit("$url: no \"$rules_dir\" directory found in tar file.") diff --git a/src/patches/squidclamav-5.11-dont_use_ipv6.patch b/src/patches/squidclamav-5.11-dont_use_ipv6.patch new file mode 100644 index 0000000..4588962 --- /dev/null +++ b/src/patches/squidclamav-5.11-dont_use_ipv6.patch @@ -0,0 +1,13 @@ +diff -Nur a/src/squidclamav.c b/src/squidclamav.c +--- a/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 ++++ b/src/squidclamav.c 2013-07-06 19:10:56.375292374 +0200 +@@ -413,6 +413,9 @@ + /* Suppress error: SSL certificate problem, verify that the CA cert is OK */ + curl_easy_setopt (eh, CURLOPT_SSL_VERIFYHOST, 0); + curl_easy_setopt (eh, CURLOPT_SSL_VERIFYPEER, 0); ++ ++ /* Prevent squidclamav from using IPv6 - fix by Nico Prenzel */ ++ curl_easy_setopt (eh, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); + } + } + /* create a squidguard child process and setup pipes */ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-core71, created. 15f78770b1d4ee730dca39166590393e3b24a666
by git＠ipfire.org 16 Jul '13

16 Jul '13

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 tag, v2.13-core71 has been created at 15f78770b1d4ee730dca39166590393e3b24a666 (commit) - Log ----------------------------------------------------------------- commit 15f78770b1d4ee730dca39166590393e3b24a666 Merge: 2dd319f 920cc72 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 08:36:54 2013 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15f78770b1d4ee730dca39166590393e3b24a666
by git＠ipfire.org 16 Jul '13

16 Jul '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 920cc7233335608630a117183b24ee0d5ff2a908
by git＠ipfire.org 15 Jul '13

15 Jul '13

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 920cc7233335608630a117183b24ee0d5ff2a908 (commit) via a610e13655dcf9fcb50a2b1e16bd39ffe37f30ad (commit) from c50ba483d2e9e6c5b403847152e76afe1470453b (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 920cc7233335608630a117183b24ee0d5ff2a908 Merge: a610e13 c50ba48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 15 22:05:12 2013 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit a610e13655dcf9fcb50a2b1e16bd39ffe37f30ad Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 15 22:04:59 2013 +0200 squid: Allow to set more FDs in CGI. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/proxy.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index c42d35a..76d52b4 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -381,7 +381,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'} } } if (!($proxysettings{'FILEDESCRIPTORS'} =~ /^\d+/) || - ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 16384)) + ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 65536)) { $errormessage = $Lang::tr{'proxy errmsg filedescriptors'}; goto ERROR; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c50ba483d2e9e6c5b403847152e76afe1470453b
by git＠ipfire.org 15 Jul '13

15 Jul '13

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 c50ba483d2e9e6c5b403847152e76afe1470453b (commit) via 8245f77ee35511458ba528d9083394af72574757 (commit) via be3aaa7961be31becab7aa7e8138e5934b258670 (commit) via 3e862ce4f99059002b60994addc87a013d298b38 (commit) via f9dec458f39323bead4686f9e1a3bb827a9bd134 (commit) via c47f57d4e73f04da8a57f5f90fd3bb0ab8e9170a (commit) via e4ba53ed590428632025982d0dbd7af9b4e71084 (commit) via 900e2e99c4464a0b4200e6d9873a3c2570bcc30e (commit) via 5ced384b719877abfe0c78d9345a645f4531e38a (commit) via f7a617a02573dccce4713ce3448116d2bc173757 (commit) via dfee7582f9b386126fcaa6c8cdcb98677e34f5b4 (commit) from 774df2479dfc7f1dba314da193d62bf828bb9edf (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 c50ba483d2e9e6c5b403847152e76afe1470453b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 21:56:56 2013 +0200 misc-progs: rootfile updates. commit 8245f77ee35511458ba528d9083394af72574757 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 21:53:47 2013 +0200 misc-progs: fix typo in Makefile. commit be3aaa7961be31becab7aa7e8138e5934b258670 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:51:42 2013 +0200 core71: add proxy-squidclam changes to updater. commit 3e862ce4f99059002b60994addc87a013d298b38 Merge: f9dec45 5ced384 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:49:23 2013 +0200 Merge remote-tracking branch 'stevee/proxy-squidclamav' into next Conflicts: config/cfgroot/general-functions.pl commit f9dec458f39323bead4686f9e1a3bb827a9bd134 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:42:59 2013 +0200 core71: add dnsforward to updater. commit c47f57d4e73f04da8a57f5f90fd3bb0ab8e9170a Merge: 774df24 e4ba53e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 15 20:38:27 2013 +0200 Merge remote-tracking branch 'stevee/dnsforward' into next commit e4ba53ed590428632025982d0dbd7af9b4e71084 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 14 11:55:29 2013 +0200 dnsmasq: Add feature to forward domains to certain DNS servers. Fixes #10369. commit 900e2e99c4464a0b4200e6d9873a3c2570bcc30e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 14 13:01:13 2013 +0200 Cleanup in 30-network.menu. * Removed entry for non existing upload.cgi. * Fix indentation for several menu points. commit 5ced384b719877abfe0c78d9345a645f4531e38a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 7 10:26:30 2013 +0200 squidclamav: Never use IPv6. Squidclamav uses curl to resolve all kind of addresses which the system allow. If the remote address is an IPv6 address, squidclamav hangs forever. Nico Prenzel has found a solution to force the usage of IPv4 to prevent from this issue. Fixes #10376. commit f7a617a02573dccce4713ce3448116d2bc173757 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 22:45:57 2013 +0200 squidclamav: Update squidclamav.conf to use and trust the proxy cache. If squidclamav is already installed, the configuration will be saved and updated during the upgrade process. Reference #10367. commit dfee7582f9b386126fcaa6c8cdcb98677e34f5b4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 23 22:29:30 2013 +0200 Increase performance of the squidclamav redirector. To boost up the performance, now we trust the proxy cache. I add some changes to the proxy.cgi to configure the proxy and the squidclamav in the right way. I also add a hook that allows us to generate a new configuration if the cgi script will be launched from the shell. Fixes #10367. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 23 ++ config/menu/30-network.menu | 30 +- config/rootfiles/common/misc-progs | 1 + config/rootfiles/core/71/filelists/files | 5 + config/squidclamav/squidclamav.conf | 9 +- html/cgi-bin/dnsforward.cgi | 359 +++++++++++++++++++++++ html/cgi-bin/proxy.cgi | 41 ++- langs/de/cgi-bin/de.pl | 7 + langs/en/cgi-bin/en.pl | 7 + lfs/squidclamav | 3 +- src/initscripts/init.d/dnsmasq | 26 +- src/misc-progs/Makefile | 5 +- src/misc-progs/{updxsetperms.c => dnsmasqctrl.c} | 12 +- src/paks/squidclamav/update.sh | 10 + src/patches/squidclamav-5.11-dont_use_ipv6.patch | 13 + 15 files changed, 519 insertions(+), 32 deletions(-) create mode 100644 html/cgi-bin/dnsforward.cgi copy src/misc-progs/{updxsetperms.c => dnsmasqctrl.c} (59%) create mode 100644 src/patches/squidclamav-5.11-dont_use_ipv6.patch Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 3cdb36f..41643d8 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -1030,4 +1030,27 @@ sub RedIsWireless() { return 0; } +# Function to read a file with UTF-8 charset. +sub read_file_utf8 ($) { + my ($file) = @_; + + open my $in, '<:encoding(UTF-8)', $file or die "Could not open '$file' for reading $!"; + local $/ = undef; + my $all = <$in>; + close $in; + + return $all; +} + +# Function to write a file with UTF-8 charset. +sub write_file_utf8 ($) { + my ($file, $content) = @_; + + open my $out, '>:encoding(UTF-8)', $file or die "Could not open '$file' for writing $!";; + print $out $content; + close $out; + + return; +} + 1; diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu index f4645b8..c50508f 100644 --- a/config/menu/30-network.menu +++ b/config/menu/30-network.menu @@ -35,37 +35,37 @@ 'title' => "$Lang::tr{'edit hosts'}", 'enabled' => 1, }; - $subnetwork->{'51.routes'} = { + $subnetwork->{'51.dnsmenu'} = { + 'caption' => $Lang::tr{'dns menu'}, + 'uri' => '/cgi-bin/dns.cgi', + 'title' => "$Lang::tr{'dns menu'}", + 'enabled' => `grep "RED_TYPE=DHCP" /var/ipfire/ethernet/settings`, + }; + $subnetwork->{'52.dnsforward'} = { + 'caption' => $Lang::tr{'dnsforward'}, + 'uri' => '/cgi-bin/dnsforward.cgi', + 'title' => "$Lang::tr{'dnsforward'}", + 'enabled' => 1 + }; + $subnetwork->{'60.routes'} = { 'caption' => $Lang::tr{'static routes'}, 'uri' => '/cgi-bin/routing.cgi', 'title' => "$Lang::tr{'static routes'}", 'enabled' => 1, }; - $subnetwork->{'60.upload'} = { - 'caption' => $Lang::tr{'upload'}, - 'uri' => '/cgi-bin/upload.cgi', - 'title' => "$Lang::tr{'upload'}", - 'enabled' => 0, - }; $subnetwork->{'70.aliases'} = { 'caption' => $Lang::tr{'aliases'}, 'uri' => '/cgi-bin/aliases.cgi', 'title' => "$Lang::tr{'aliases'}", 'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`, }; - $subnetwork->{'80.dnsmenu'} = { - 'caption' => $Lang::tr{'dns menu'}, - 'uri' => '/cgi-bin/dns.cgi', - 'title' => "$Lang::tr{'dns menu'}", - 'enabled' => `grep "RED_TYPE=DHCP" /var/ipfire/ethernet/settings`, - }; - $subnetwork->{'90.macadressmenu'} = { + $subnetwork->{'80.macadressmenu'} = { 'caption' => $Lang::tr{'mac address menu'}, 'uri' => '/cgi-bin/mac.cgi', 'title' => "$Lang::tr{'mac address menu'}", 'enabled' => 1, }; - $subnetwork->{'99.wakeonlan'} = { + $subnetwork->{'90.wakeonlan'} = { 'caption' => $Lang::tr{'WakeOnLan'}, 'uri' => '/cgi-bin/wakeonlan.cgi', 'title' => "$Lang::tr{'WakeOnLan'}", diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index 3f48f83..a8dac59 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -3,6 +3,7 @@ usr/local/bin/addonctrl usr/local/bin/backupctrl #usr/local/bin/clamavctrl usr/local/bin/dhcpctrl +usr/local/bin/dnsmasqctrl usr/local/bin/extrahdctrl usr/local/bin/fireinfoctrl usr/local/bin/getconntracktable diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files index db039f3..9dd0e30 100644 --- a/config/rootfiles/core/71/filelists/files +++ b/config/rootfiles/core/71/filelists/files @@ -3,6 +3,7 @@ etc/issue var/ipfire/general-functions.pl var/ipfire/header.pl var/ipfire/menu.d/10-system.menu +var/ipfire/menu.d/30-network.menu etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/wlanclient etc/rc.d/init.d/networking/functions.network @@ -11,9 +12,13 @@ etc/rc.d/init.d/networking/red etc/rc.d/rc0.d/K82wlanclient etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc6.d/K82wlanclient +usr/local/bin/dnsmasqctrl usr/local/bin/wirelessclient +srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi +var/ipfire/general-functions.pl var/ipfire/langs var/ipfire/backup/include diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf index 19bffa0..2b8f5dc 100644 --- a/config/squidclamav/squidclamav.conf +++ b/config/squidclamav/squidclamav.conf @@ -1,6 +1,5 @@ -#squid_ip 127.0.0.1 -#squid_port 3128 -proxy none +squid_ip 127.0.0.1 +squid_port 800 # logfile /var/log/squid/squidclamav.log redirect http://127.0.0.1:81/clwarn.cgi @@ -15,7 +14,7 @@ clamd_local /var/run/clamav/clamd maxsize 5000000 maxredir 30 timeout 60 -#trust_cache 1 +trust_cache 1 # # Do not scan standard HTTP images abort ^.*\.(ico|gif|png|jpg)$ @@ -37,4 +36,4 @@ abortcontent ^video\/x-flv$ abortcontent ^.*application\/x-mms-framed.*$ # # White list some sites -whitelist .*\.clamav.net \ No newline at end of file +whitelist .*\.clamav.net diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi new file mode 100644 index 0000000..15d430c --- /dev/null +++ b/html/cgi-bin/dnsforward.cgi @@ -0,0 +1,359 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 IPFire Development Team # +# # +# 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/>. # +# # +############################################################################### + +use strict; + +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; + +#workaround to suppress a warning when a variable is used only once +my @dummy = ( ${Header::colouryellow} ); +undef (@dummy); + +my %cgiparams=(); +my %checked=(); +my %selected=(); +my $errormessage = ''; +my $filename = "${General::swroot}/dnsforward/config"; +my $changed = 'no'; + +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + +&Header::showhttpheaders(); + +$cgiparams{'ENABLED'} = 'off'; +$cgiparams{'ACTION'} = ''; +$cgiparams{'ZONE'} = ''; +$cgiparams{'FORWARD_SERVER'} = ''; +$cgiparams{'REMARK'} =''; +&Header::getcgihash(\%cgiparams); +open(FILE, $filename) or die 'Unable to open config file.'; +my @current = <FILE>; +close(FILE); + +### +# Add / Edit entries. +# +if ($cgiparams{'ACTION'} eq $Lang::tr{'add'}) +{ + # Check if the entered domainname is valid. + unless (&General::validdomainname($cgiparams{'ZONE'})) { + $errormessage = $Lang::tr{'invalid domain name'}; + } + + # Check if the settings for the forward server are valid. + unless(&General::validip($cgiparams{'FORWARD_SERVER'})) { + $errormessage = $Lang::tr{'invalid ip'}; + } + + # Go further if there was no error. + if ( ! $errormessage) + { + # Check if a remark has been entered. + $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); + + # Check if we want to edit an existing or add a new entry. + if($cgiparams{'EDITING'} eq 'no') { + open(FILE,">>$filename") or die 'Unable to open config file.'; + flock FILE, 2; + print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n"; + } else { + open(FILE, ">$filename") or die 'Unable to open config file.'; + flock FILE, 2; + my $id = 0; + foreach my $line (@current) + { + $id++; + if ($cgiparams{'EDITING'} eq $id) { + print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n"; + } else { print FILE "$line"; } + } + } + close(FILE); + undef %cgiparams; + $changed = 'yes'; + } else { + # stay on edit mode if an error occur + if ($cgiparams{'EDITING'} ne 'no') + { + $cgiparams{'ACTION'} = $Lang::tr{'edit'}; + $cgiparams{'ID'} = $cgiparams{'EDITING'}; + } + } + # Restart dnsmasq. + system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); +} + +### +# Remove existing entries. +# +if ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) +{ + my $id = 0; + open(FILE, ">$filename") or die 'Unable to open config file.'; + flock FILE, 2; + foreach my $line (@current) + { + $id++; + unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; } + } + close(FILE); + # Restart dnsmasq. + system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); +} + +### +# Toggle Enable/Disable for entries. +# +if ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) +{ + open(FILE, ">$filename") or die 'Unable to open config file.'; + flock FILE, 2; + my $id = 0; + foreach my $line (@current) + { + $id++; + unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; } + else + { + chomp($line); + my @temp = split(/\,/,$line); + print FILE "$cgiparams{'ENABLE'},$temp[1],$temp[2],$temp[3]\n"; + } + } + close(FILE); + # Restart dnsmasq. + system('/usr/local/bin/dnsmasqctrl restart >/dev/null'); +} + +### +# Read items for edit mode. +# +if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) +{ + my $id = 0; + foreach my $line (@current) + { + $id++; + if ($cgiparams{'ID'} eq $id) + { + chomp($line); + my @temp = split(/\,/,$line); + $cgiparams{'ENABLED'} = $temp[0]; + $cgiparams{'ZONE'} = $temp[1]; + $cgiparams{'FORWARD_SERVER'} = $temp[2]; + $cgiparams{'REMARK'} = $temp[3]; + } + } +} + +$checked{'ENABLED'}{'off'} = ''; +$checked{'ENABLED'}{'on'} = ''; +$checked{'ENABLED'}{$cgiparams{'ENABLED'}} = "checked='checked'"; + +&Header::openpage($Lang::tr{'dnsforward configuration'}, 1, ''); + +&Header::openbigbox('100%', 'left', '', $errormessage); + +### +# Error messages layout. +# +if ($errormessage) { + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print "<class name='base'>$errormessage\n"; + print " </class>\n"; + &Header::closebox(); +} + +print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n"; + +my $buttontext = $Lang::tr{'add'}; +if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { + &Header::openbox('100%', 'left', $Lang::tr{'dnsforward edit an entry'}); + $buttontext = $Lang::tr{'update'}; +} else { + &Header::openbox('100%', 'left', $Lang::tr{'dnsforward add a new entry'}); +} + +### +# Content of the main page. +# +print <<END +<table width='100%'> + <tr> + <td width='20%' class='base'><font>$Lang::tr{'dnsforward zone'}:</font></td> + <td><input type='text' name='ZONE' value='$cgiparams{'ZONE'}' size='24' /></td> + <td width='30%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> + </tr> + + <tr> + <td width='20%' class='base'><font>$Lang::tr{'dnsforward forward_server'}:</font></td> + <td><input type='text' name='FORWARD_SERVER' value='$cgiparams{'FORWARD_SERVER'}' size='24' /></td> + </tr> +</table> + +<table width='100%'> + <tr> + <td width ='20%' class='base'><font class='boldbase'>$Lang::tr{'remark'}:</font> <img src='/blob.gif' alt='*' /></td> + <td><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' maxlength='50' /></td> + </tr> +</table> + +<hr> + +<table width='100%'> + <tr> + <td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' /> <font class='base'>$Lang::tr{'this field may be blank'}</font></td> + <td width='40%' align='center'> + <input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /> + <input type='submit' name='SUBMIT' value='$buttontext' /> + </td> + </tr> +</table> +END +; +if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { + print "<input type='hidden' name='EDITING' value='$cgiparams{'ID'}' />\n"; +} else { + print "<input type='hidden' name='EDITING' value='no' />\n"; +} + +&Header::closebox(); +print "</form>\n"; + +### +# Existing rules. +# +&Header::openbox('100%', 'left', $Lang::tr{'dnsforward entries'}); +print <<END +<table width='100%'> + <tr> + <td width='35%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward zone'}</b></td> + <td width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_server'}</b></td> + <td width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td> + <td width='5%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></td> + </tr> +END +; + +# If something has happened re-read config +if($cgiparams{'ACTION'} ne '' or $changed ne 'no') +{ + open(FILE, $filename) or die 'Unable to open config file.'; + @current = <FILE>; + close(FILE); +} + +### +# Re-read entries and highlight selected item for editing. +# +my $id = 0; +foreach my $line (@current) +{ + $id++; + chomp($line); + my @temp = split(/\,/,$line); + my $toggle = ''; + my $gif = ''; + my $gdesc = ''; + my $toggle = ''; + + if($cgiparams{'ACTION'} eq $Lang::tr{'edit'} && $cgiparams{'ID'} eq $id) { + print "<tr bgcolor='${Header::colouryellow}'>\n"; } + elsif ($id % 2) { + print "<tr bgcolor='$color{'color22'}'>\n"; } + else { + print "<tr bgcolor='$color{'color20'}'>\n"; } + + if ($temp[0] eq 'on') { $gif='on.gif'; $toggle='off'; $gdesc=$Lang::tr{'click to disable'};} + else { $gif='off.gif'; $toggle='on'; $gdesc=$Lang::tr{'click to enable'}; } + +### +# Display edit page. +# +print <<END + <td align='center'>$temp[1]</td> + <td align='center'>$temp[2]</td> + <td align='center'>$temp[3]</td> + <td align='center'> + <form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' title='$gdesc' alt='$gdesc' /> + <input type='hidden' name='ID' value='$id' /> + <input type='hidden' name='ENABLE' value='$toggle' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' /> + </form> + </td> + <td align='center'> + <form method='post' name='frmb$id' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' title='$Lang::tr{'edit'}' alt='$Lang::tr{'edit'}' /> + <input type='hidden' name='ID' value='$id' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' /> + </form> + </td> + <td align='center'> + <form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' /> + <input type='hidden' name='ID' value='$id' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' /> + </form> + </td> +</tr> +END + ; +} +print "</table>\n"; + +### +# Print the legend at the bottom if there are any configured entries. +# +# Check if the file size is zero - no existing entries. +if ( ! -z "$filename") { +print <<END +<table> + <tr> + <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> + <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> + <td class='base'>$Lang::tr{'click to disable'}</td> + <td>    <img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td> + <td class='base'>$Lang::tr{'click to enable'}</td> + <td>    <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td> + <td class='base'>$Lang::tr{'edit'}</td> + <td>    <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> + <td class='base'>$Lang::tr{'remove'}</td> + </tr> +</table> +END +; +} + +&Header::closebox(); + +&Header::closebigbox(); + +&Header::closepage(); diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index fb313ac..c42d35a 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -699,6 +699,16 @@ if (!$errormessage) &read_acls; } +# ------------------------------------------------------------------ + +# Hook to regenerate the configuration files, if cgi got called from command line. +if ($ENV{"REMOTE_ADDR"} eq "") { + writeconfig(); + exit(0); +} + +# ------------------------------------------------------------------- + $checked{'ENABLE'}{'off'} = ''; $checked{'ENABLE'}{'on'} = ''; $checked{'ENABLE'}{$proxysettings{'ENABLE'}} = "checked='checked'"; @@ -3061,12 +3071,6 @@ icp_port 0 END ; - - # Include file with user defined settings. - if (-e "/etc/squid/squid.conf.pre.local") { - print FILE "include /etc/squid/squid.conf.pre.local\n\n"; - } - print FILE "http_port $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}"; if ($proxysettings{'TRANSPARENT'} eq 'on') { print FILE " transparent" } if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " no-connection-auth" } @@ -3448,6 +3452,19 @@ END close (ACL); } if ((!-z $extgrp) && ($proxysettings{'AUTH_METHOD'} eq 'ncsa') && ($proxysettings{'NCSA_BYPASS_REDIR'} eq 'on')) { print FILE "\nredirector_access deny for_extended_users\n"; } + + # Check if squidclamav is enabled. + if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') { + print FILE "\n#Settings for squidclamav:\n"; + print FILE "http_port 127.0.0.1:$proxysettings{'PROXY_PORT'} transparent\n"; + print FILE "acl to_localhost dst 127.0.0.0/8\n"; + print FILE "acl purge method PURGE\n"; + print FILE "http_access deny to_localhost\n"; + print FILE "http_access allow localhost\n"; + print FILE "http_access allow purge localhost\n"; + print FILE "http_access deny purge\n"; + print FILE "url_rewrite_access deny localhost\n"; + } print FILE <<END #Access to squid: @@ -3963,6 +3980,18 @@ END print FILE "include /etc/squid/squid.conf.local\n"; } close FILE; + + # Proxy settings for squidclamav - if installed. + # + # Check if squidclamav is enabled. + if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') { + + my $configfile='/etc/squidclamav.conf'; + + my $data = &General::read_file_utf8($configfile); + $data =~ s/squid_port [0-9]+/squid_port $proxysettings{'PROXY_PORT'}/g; + &General::write_file_utf8($configfile, $data); + } } # ------------------------------------------------------------------- diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 1ed9ccd..d1ad7b0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -714,6 +714,13 @@ 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', 'dns server' => 'DNS Server', 'dns title' => 'Domain Name System', +'dnsforward' => 'DNS-Weiterleitung', +'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen:', +'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung', +'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten:', +'dnsforward entries' => 'Aktuelle Einträge:', +'dnsforward forward_server' => 'DNS-Server', +'dnsforward zone' => 'Zone', '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:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index cdca462..30d0734 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -737,6 +737,13 @@ 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', 'dns server' => 'DNS Server', 'dns title' => 'Domain Name System', +'dnsforward' => 'DNS forwarding', +'dnsforward add a new entry' => 'Add a new entry:', +'dnsforward configuration' => 'DNS forward configuration', +'dnsforward edit an entry' => 'Edit an existing entry:', +'dnsforward entries' => 'Current entries:', +'dnsforward forward_server' => 'Nameserver', +'dnsforward zone' => 'Zone', '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:', diff --git a/lfs/squidclamav b/lfs/squidclamav index 86255f8..79bf5d0 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 15 +PAK_VER = 17 DEPS = "clamav" @@ -77,6 +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/squidclamav-5.11-dont_use_ipv6.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make install install -v -m 755 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 1b2c0c2..a02097e 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -22,6 +22,26 @@ fi SHOW_SRV=1 +function dns_forward_args() { + local file="${1}" + + # Do nothing if file is empty. + [ -s "${file}" ] || return + + local cmdline + + local enabled zone server remark + while IFS="," read -r enabled zone server remark; do + # Line must be enabled. + [ "${enabled}" = "on" ] || continue + + cmdline="${cmdline} --server=/${zone}/${server}" + done < ${file} + + echo "${cmdline}" +} + + case "${1}" in start) # kill already running copy of dnsmasq... @@ -47,8 +67,12 @@ case "${1}" in fi fi [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf" - + ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`" + + # Add custom forward dns zones. + ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)" + ARGS="$ARGS $CUSTOM_ARGS" loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index 0a4fda6..2ec7878 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -33,7 +33,7 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \ redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \ - getconntracktable wirelessclient + getconntracktable wirelessclient dnsmasqctrl SUID_UPDX = updxsetperms install : all @@ -161,3 +161,6 @@ getconntracktable: getconntracktable.c setuid.o ../install+setup/libsmooth/varva wirelessclient: wirelessclient.c setuid.o ../install+setup/libsmooth/varval.o $(COMPILE) -I../install+setup/libsmooth/ wirelessclient.c setuid.o ../install+setup/libsmooth/varval.o -o $@ + +dnsmasqctrl: dnsmasqctrl.c setuid.o ../install+setup/libsmooth/varval.o + $(COMPILE) -I../install+setup/libsmooth/ dnsmasqctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@ diff --git a/src/misc-progs/dnsmasqctrl.c b/src/misc-progs/dnsmasqctrl.c new file mode 100644 index 0000000..8ac3360 --- /dev/null +++ b/src/misc-progs/dnsmasqctrl.c @@ -0,0 +1,34 @@ +/* This file is part of the IPFire Firewall. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> +#include <fcntl.h> +#include "setuid.h" + +int main(int argc, char *argv[]) { + + if (!(initsetuid())) + exit(1); + + if (argc < 2) { + fprintf(stderr, "\nNo argument given.\n\ndnsmasqctrl (restart)\n\n"); + exit(1); + } + + if (strcmp(argv[1], "restart") == 0) { + safe_system("/etc/rc.d/init.d/dnsmasq restart"); + } else { + fprintf(stderr, "\nBad argument given.\n\ndnsmasqctrl (restart)\n\n"); + exit(1); + } + + return 0; +} diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh index 9551602..4b54216 100644 --- a/src/paks/squidclamav/update.sh +++ b/src/paks/squidclamav/update.sh @@ -35,4 +35,14 @@ if [ "$VERSION" -lt "11" ]; then sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf fi +if [ "$VERSION" -lt "16" ]; then + sed -e "s/proxy none//g" -i /etc/squidclamav.conf + sed -e "s/^#squid_ip 127\.0\.0\.1/squid_ip 127\.0\.0\.1/g" \ + -e "s/^#squid_port 3128/squid_port 800/g" \ + -e "s/^#trust_cache 1/trust_cache 1/g" -i /etc/squidclamav.conf + + # Regenerate configuration files. + perl /srv/web/ipfire/cgi-bin/proxy.cgi +fi + /etc/init.d/squid restart diff --git a/src/patches/squidclamav-5.11-dont_use_ipv6.patch b/src/patches/squidclamav-5.11-dont_use_ipv6.patch new file mode 100644 index 0000000..4588962 --- /dev/null +++ b/src/patches/squidclamav-5.11-dont_use_ipv6.patch @@ -0,0 +1,13 @@ +diff -Nur a/src/squidclamav.c b/src/squidclamav.c +--- a/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 ++++ b/src/squidclamav.c 2013-07-06 19:10:56.375292374 +0200 +@@ -413,6 +413,9 @@ + /* Suppress error: SSL certificate problem, verify that the CA cert is OK */ + curl_easy_setopt (eh, CURLOPT_SSL_VERIFYHOST, 0); + curl_easy_setopt (eh, CURLOPT_SSL_VERIFYPEER, 0); ++ ++ /* Prevent squidclamav from using IPv6 - fix by Nico Prenzel */ ++ curl_easy_setopt (eh, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); + } + } + /* create a squidguard child process and setup pipes */ hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2013