IPFire-SCM January 2011

ipfire-scm@lists.ipfire.org

1 participants
93 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6fea934bf60b770d08c8d36c442b5904539875ff
by git＠ipfire.org 10 Jan '11

10 Jan '11

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 6fea934bf60b770d08c8d36c442b5904539875ff (commit) from fae0d5e39422c860c22217bf5cb1afc6e09a0c20 (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 6fea934bf60b770d08c8d36c442b5904539875ff Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Jan 10 22:42:05 2011 +0100 Fixed typo in credits.cgi ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/credits.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 2907c5a..e667c83 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -95,7 +95,7 @@ There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connec Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik. -This product includes GeoLite data crated by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. +This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. END ; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fae0d5e39422c860c22217bf5cb1afc6e09a0c20
by git＠ipfire.org 10 Jan '11

10 Jan '11

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 fae0d5e39422c860c22217bf5cb1afc6e09a0c20 (commit) via 305d7fc9b8056a1a8bfb2f954f778a179b1f28e2 (commit) via ca80b7118030976ddcb8eec1172df3cd02832b00 (commit) via 6faaa95804be63b98d341207dd682164c9a28395 (commit) from 42d9192e0cc8f7544016af09c2277853fc3d884c (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 fae0d5e39422c860c22217bf5cb1afc6e09a0c20 Merge: 305d7fc 42d9192 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 10 22:13:30 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit 305d7fc9b8056a1a8bfb2f954f778a179b1f28e2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 10 22:10:38 2011 +0100 Updated usb_modeswitch (1.0.6) and database (22.12.2010). commit ca80b7118030976ddcb8eec1172df3cd02832b00 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 10 22:09:50 2011 +0100 Updated GeoIP datebase. Add needed credits for using GeoIP databese. commit 6faaa95804be63b98d341207dd682164c9a28395 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 10 20:17:15 2011 +0100 Update hwdatabase. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/usb_modeswitch_data | 15 ++- config/rootfiles/core/44/update.sh | 2 + html/cgi-bin/credits.cgi | 6 +- lfs/GeoIP | 4 +- lfs/usb_modeswitch | 4 +- lfs/usb_modeswitch_data | 4 +- src/hwdata/pci.ids | 323 +++++++++++++++++---------- src/hwdata/usb.ids | 137 ++++++++++-- 8 files changed, 351 insertions(+), 144 deletions(-) Difference in files: diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index 58d6db1..e7b3079 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -1,6 +1,8 @@ #etc/usb_modeswitch.d etc/usb_modeswitch.d/0421:060c etc/usb_modeswitch.d/0421:0610 +etc/usb_modeswitch.d/0421:0622 +etc/usb_modeswitch.d/0421:0627 etc/usb_modeswitch.d/0471:1210 etc/usb_modeswitch.d/0471:1237 etc/usb_modeswitch.d/0482:024d @@ -14,6 +16,7 @@ etc/usb_modeswitch.d/05c6:1000:uMa=SAMSUNG etc/usb_modeswitch.d/05c6:1000:uMa=Vertex etc/usb_modeswitch.d/05c6:2001 etc/usb_modeswitch.d/05c6:f000 +etc/usb_modeswitch.d/05c7:1000 etc/usb_modeswitch.d/072f:100d etc/usb_modeswitch.d/0930:0d46 etc/usb_modeswitch.d/0ace:2011 @@ -68,15 +71,21 @@ etc/usb_modeswitch.d/0af0:d357 etc/usb_modeswitch.d/0b3c:c700 etc/usb_modeswitch.d/0b3c:f000 etc/usb_modeswitch.d/0cf3:20ff +etc/usb_modeswitch.d/0d46:45a1 +etc/usb_modeswitch.d/0d46:45a5 +etc/usb_modeswitch.d/0e8d:7109 etc/usb_modeswitch.d/0fce:d0cf etc/usb_modeswitch.d/0fce:d0e1 etc/usb_modeswitch.d/0fce:d103 +etc/usb_modeswitch.d/0fd1:1000 etc/usb_modeswitch.d/1004:1000 etc/usb_modeswitch.d/1004:607f etc/usb_modeswitch.d/1004:613a etc/usb_modeswitch.d/1004:613f +etc/usb_modeswitch.d/1004:6190 etc/usb_modeswitch.d/1033:0035 etc/usb_modeswitch.d/106c:3b03 +etc/usb_modeswitch.d/106c:3b05 etc/usb_modeswitch.d/106c:3b06 etc/usb_modeswitch.d/1076:7f40 etc/usb_modeswitch.d/1199:0fff @@ -92,13 +101,16 @@ etc/usb_modeswitch.d/12d1:14c1 etc/usb_modeswitch.d/12d1:1520 etc/usb_modeswitch.d/12d1:1521 etc/usb_modeswitch.d/12d1:1523 +etc/usb_modeswitch.d/12d1:1553 etc/usb_modeswitch.d/12d1:1557 +etc/usb_modeswitch.d/12d1:1c0b etc/usb_modeswitch.d/1410:5010 etc/usb_modeswitch.d/1410:5020 etc/usb_modeswitch.d/1410:5030 etc/usb_modeswitch.d/1410:5031 etc/usb_modeswitch.d/1410:5041 etc/usb_modeswitch.d/148f:2578 +etc/usb_modeswitch.d/16d8:6281 etc/usb_modeswitch.d/16d8:6803 etc/usb_modeswitch.d/16d8:6803:? etc/usb_modeswitch.d/16d8:700a @@ -120,7 +132,6 @@ etc/usb_modeswitch.d/19d2:2000 etc/usb_modeswitch.d/19d2:fff5 etc/usb_modeswitch.d/19d2:fff6 etc/usb_modeswitch.d/1a8d:1000 -etc/usb_modeswitch.d/1a8d:1000:uPr=5G etc/usb_modeswitch.d/1ab7:5700 etc/usb_modeswitch.d/1b7d:0700 etc/usb_modeswitch.d/1bbb:f000 @@ -130,8 +141,10 @@ etc/usb_modeswitch.d/1c9e:9e00 etc/usb_modeswitch.d/1c9e:f000 etc/usb_modeswitch.d/1dd6:1000 etc/usb_modeswitch.d/1e0e:f000 +etc/usb_modeswitch.d/1edf:6003 etc/usb_modeswitch.d/1ee8:0009 etc/usb_modeswitch.d/1ee8:0013 etc/usb_modeswitch.d/1f28:0021 etc/usb_modeswitch.d/1fac:0130 +etc/usb_modeswitch.d/230d:0001 lib/udev/rules.d/40-usb_modeswitch.rules diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index eedc44f..2141b3a 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -75,6 +75,8 @@ rm -rf /lib/initcpio rm -rf /sbin/mkinitcpio # Remove old iw (new is in usr/sbin) rm -rf /usr/bin/iw +# Remove old usb_modeswitch data +rm -rf /etc/usb_modeswitch.d # # Backup grub.conf # diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 60b5b90..2907c5a 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 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 # @@ -93,6 +93,10 @@ Sponsor - Rene Zingel Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too. There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN. Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik. + + +This product includes GeoLite data crated by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. + END ; &Header::closebox(); diff --git a/lfs/GeoIP b/lfs/GeoIP index ceea003..e22dc26 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -25,7 +25,7 @@ include Config VER = 1.17 -DATVER = 01122010 +DATVER = 01012011 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 = 42a6b039337ed271ee0c8f40497ceba9 +GeoIP.dat-$(DATVER).gz_MD5 = 560eaeef02761b866d106cda42929d4c install : $(TARGET) diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 75fa84c..3046171 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -24,7 +24,7 @@ include Config -VER = 1.1.4 +VER = 1.1.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 = a04db36bd0fc6fb303df7567f677b714 +$(DL_FILE)_MD5 = be3c7fc908e6ab50eb9fd29d187ad176 install : $(TARGET) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index d1b23c6..f322080 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -24,7 +24,7 @@ include Config -VER = 20100826 +VER = 20101222 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 = 85c16bb87a6f05c2d04b93a22fe87e91 +$(DL_FILE)_MD5 = e386386bc389c2a8184c7ea4136fde0e install : $(TARGET) diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids index 2eda2f2..1eb38cc 100644 --- a/src/hwdata/pci.ids +++ b/src/hwdata/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2010.11.24 -# Date: 2010-11-24 03:15:02 +# Version: 2011.01.06 +# Date: 2011-01-06 14:51:03 # # Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the # PCI ID Project at http://pciids.sf.net/. @@ -75,6 +75,7 @@ 1012 1012 PCMCIA 10/100 Ethernet Card [RTL81xx] 02e0 XFX Pine Group Inc 0303 Hewlett-Packard Company (Wrong ID) +0308 ZyXEL Communications Corporation 0315 SK-Electronics Co., Ltd. 0357 TTTech AG 000a TTP-Monitoring Card V2.0 @@ -93,9 +94,6 @@ 8818 CS8818 USB2.0-to-ATAPI Bridge Controller with Embedded PHY 050d Belkin 001a FSD7000 802.11g PCI Wireless card - 700f F5D7001 - Wireless G Plus Desktop Card - 7050 F5D7050 802.11g Wireless USB Adapter - 705c F5D7050 v4 058f Alcor Micro Corporation 05a9 OmniVision 8519 OV519 series @@ -460,6 +458,7 @@ 1000 9263 MegaRAID SAS 9261-8i 1000 9264 MegaRAID SAS 9264-8i 1000 9275 MegaRAID SAS 9280-8ex + 1000 9276 MR9260-16i 1000 9280 MegaRAID SAS 9280-8e 1000 9281 MegaRAID SAS 9281-8E 1000 9282 MegaRAID SAS 9280-4i4e @@ -751,12 +750,14 @@ 103c 280a DC5750 Microtower 1043 8230 M3A78-EH Motherboard 1043 836c M4A785TD Motherboard + 1458 a022 GA-MA770-DS3rev2.0 Motherboard 17f2 5000 KI690-AM2 Motherboard 4384 SBx00 PCI to PCI Bridge 4385 SBx00 SMBus Controller 103c 280a DC5750 Microtower 1043 82ef M3A78-EH Motherboard 1043 8389 M4A785TD Motherboard + 1458 4385 GA-MA770-DS3rev2.0 Motherboard 1462 7368 K9AG Neo2 17f2 5000 KI690-AM2 Motherboard 4386 SB600 USB Controller (EHCI) @@ -796,6 +797,7 @@ 4390 SB700/SB800 SATA Controller [IDE mode] 1043 82ef M3A78-EH Motherboard 1043 8389 M4A785TD Motherboard + 1458 b002 GA-MA770-DS3rev2.0 Motherboard 1849 4390 Motherboard (one of many) 4391 SB700/SB800 SATA Controller [AHCI mode] 1043 82ef M3A78-EH Motherboard @@ -1434,6 +1436,7 @@ 5e6d RV410 [Radeon X700 (PCIE)] (Secondary) 148c 2117 PowerColor Bravo X700 5f57 R423 [Radeon X800XT (PCIE)] + 6738 AMD Radeon HD 6800 Series Video Card 6741 NI Whistler [AMD Radeon HD 6600M Series] 6759 NI Turks [AMD Radeon HD 6500] 6760 NI Seymour [AMD Radeon HD 6470M] @@ -3482,6 +3485,8 @@ 9000 Wireless Interface (of unknown type) 9065 TMS320DM642 9066 ACX 111 54Mbps Wireless Interface + 0308 3404 G-102 v1 802.11g Wireless Cardbus Adapter + 0308 3406 G-162 v2 802.11g Wireless Cardbus Adapter 104c 9066 WL212 Sitecom Wireless Network PCI-Card 100M (Version 1) 104c 9096 Trendnet TEW-412PC Wireless PCI Adapter (Version A) 1186 3b04 DWL-G520+ Wireless PCI Adapter @@ -3491,8 +3496,11 @@ 13d1 aba0 SWLMP-54108 108Mbps Wireless mini PCI card 802.11g+ 14ea ab07 GW-NS54GM Wireless Cardbus Adapter 16ec 010d USR5416 802.11g Wireless Turbo PCI Adapter + 16ec 010e USR5410 802.11g Wireless Cardbus Adapter 1737 0033 WPC54G v2 802.11g Wireless-G Notebook Adapter 17cf 0033 Z-Com XG650 Wireless miniPCI 802.11b/g + 187e 340b G-302 v2 802.11g Wireless PCI Adapter + 187e 340c G-360 v2 802.11g Wireless PCI Adapter a001 TDC1570 a100 TDC1561 a102 TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f @@ -6617,6 +6625,8 @@ 0a69 G98M [GeForce G105M] 0a6a GT218 [NVS 2100M] 0a6c GT218 [NVS 3100M] + 1028 040b Latitude E6510 + 17aa 2142 ThinkPad T410 0a6e GT218 [GeForce 305M] 0a6f GT218 [ION] 0a70 GT218 [GeForce 310M] @@ -6696,9 +6706,14 @@ 0ad8 MCP78S [GeForce 8200] SATA Controller (RAID mode) 0be2 High Definition Audio Controller 0be3 High Definition Audio Controller + 1028 040b Latitude E6510 0be4 High Definition Audio Controller 0be5 GF100 High Definition Audio Controller + 0be9 GF106 High Definition Audio Controller + 1558 8687 CLEVO/KAPOK W860CU + 0bea GF108 High Definition Audio Controller 0beb GF104 High Definition Audio Controller + 1462 2322 N460GTX Cyclone 1GD5/OC 0ca0 GT215 [GeForce GT 330] 0ca2 GT215 [GeForce GT 320] 0ca3 GT215 [GeForce GT 240] @@ -6726,7 +6741,13 @@ 0d9c MCP89 OHCI USB 1.1 Controller 0d9d MCP89 EHCI USB 2.0 Controller 0dc4 GF106 [GeForce 450 GTS] + 0dd1 GeForce GTX 460M (rev a1) + 1558 8687 CLEVO/KAPOK W860CU + 0de1 GF108 [GeForce GT 430] + 0e09 GF110 High Definition Audio Controller 0e22 GF104 [GeForce GTX 460] + 1462 2322 N460GTX Cyclone 1GD5/OC + 1080 GF110 [Geforce GTX 580] 10c3 G98 [GeForce 8400GS] 10df Emulex Corporation 1ae5 LP6000 Fibre Channel Host Adapter @@ -7136,12 +7157,14 @@ 1720 RocketRAID 1720 (2x SATA II RAID Controller) 1740 RocketRAID 1740 1742 RocketRAID 1742 + 2210 RocketRAID 2210 SATA-II Controller 2300 RocketRAID 230x 4 Port SATA-II Controller 2310 RocketRAID 2310 4 Port SATA-II Controller 2320 RocketRAID 2320 SATA-II Controller 2322 RocketRAID 2322 SATA-II Controller 2340 RocketRAID 2340 16 Port SATA-II Controller 2640 RocketRAID 2640 SAS/SATA Controller + 2722 RocketRAID 2722 3220 RocketRAID 3220 3320 RocketRAID 3320 1104 RasterOps Corp. @@ -7192,8 +7215,10 @@ 0364 CN896/VN896/P4M900 Host Bridge 1043 81ce P5VD2-VM mothervoard 0391 VT8371 [KX133] + 0397 VT1708S HD Audio + 1043 836c P7H55 0409 VX855/VX875 Host Bridge: Host Control - 0415 PATA IDE Host Controller + 0415 VT6415 PATA IDE Host Controller 0501 VT8501 [Apollo MVP4] 0505 VT82C505 # Shares chip with :0576. The VT82C576M has :1571 instead of :0561. @@ -8015,6 +8040,7 @@ 5168 2520 LifeView FlyDVB-S Duo CardBus 5168 3502 LifeView FlyDVB-T Hybrid CardBus 5168 3520 LifeView FlyDVB Trio N CardBus + 5ace 7595 Behold TV X7 7134 SAA7134/SAA7135HL Video Broadcast Decoder 1019 4cb4 Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM) 1043 0210 Digimatrix TV @@ -8722,7 +8748,9 @@ 1324 10cf P7120 e230 Memory Stick Host Controller e822 MMC/SD Host Controller + 1028 040b Latitude E6510 e832 FireWire Host Controller + 1028 040b Latitude E6510 1181 Telmatics International 1183 Fujikura Ltd 1184 Forks Inc @@ -8744,7 +8772,9 @@ 1540 DFE-680TX 1541 DFE-680TXD CardBus PC Card 1561 DRP-32TXD Cardbus PC Card - 3300 DWL-510 2.4GHz Wireless PCI Adapter + 3300 DWL-510 / DWL-610 802.11b [Realtek RTL8180L] + 1186 3300 DWL-610 Wireless Cardbus Adapter + 1186 3301 DWL-510 Wireless PCI Adapter 3a03 AirPro DWL-A650 Wireless Cardbus Adapter(rev.B) 3a04 AirPro DWL-AB650 Multimode Wireless Cardbus Adapter 3a05 AirPro DWL-AB520 Multimode Wireless PCI Adapter @@ -8753,7 +8783,6 @@ 3a10 AirXpert DWL-AG650 Wireless Cardbus Adapter(rev.B) 3a11 AirXpert DWL-AG520 Wireless PCI Adapter(rev.B) 3a12 AirPlus DWL-G650 Wireless Cardbus Adapter(rev.C) - 3a14 AirPremier DWL-AG530 Wireless PCI Adapter 3a63 AirXpert DWL-AG660 Wireless Cardbus Adapter 3a70 DWA-556 Xtreme N PCI Express Desktop Adapter 3c00 D-link DWL-G650X @@ -9018,7 +9047,8 @@ 436d 88E8055 PCI-E Gigabit Ethernet Controller 4370 88E8075 PCI-E Gigabit Ethernet Controller 4380 88E8057 PCI-E Gigabit Ethernet Controller - 4381 88E8059 PCI-E Gigabit Ethernet Controller +# AVB = "Audio Video Bridging" + 4381 Yukon Optima 88E8059 [PCIe Gigabit Ethernet Controller with AVB] 4611 GT-64115 System Controller 4620 GT-64120/64120A/64121A System Controller 4801 GT-48001 @@ -9738,6 +9768,7 @@ 3872 Prism 2.5 Wavelan chipset 1468 0202 LAN-Express IEEE 802.11b Wireless LAN 3873 Prism 2.5 Wavelan chipset + 10cf 1169 MBH7WM01-8734 802.11b Wireless Mini PCI Card 1186 3501 DWL-520 Wireless PCI Adapter 1186 3700 DWL-520 Wireless PCI Adapter, Rev E1 1385 4105 MA311 802.11b wireless adapter @@ -9765,6 +9796,7 @@ 16a5 1605 ALLNET ALL0271 Wireless PCI Adapter 17cf 0014 XG-600 and clones Wireless Adapter 17cf 0020 XG-900 and clones Wireless Adapter + 187e 3403 G-110 802.11g Wireless Cardbus Adapter 8130 HMP8130 NTSC/PAL Video Decoder 8131 HMP8131 NTSC/PAL Video Decoder # This is probably more likely a HW fault, but I am keeping it for now --mj @@ -11261,7 +11293,7 @@ 131f 2051 CyberSerial 4S Plus 15ed 2000 MCCR Serial p0-3 of 8 15ed 2001 MCCR Serial p0-3 of 16 - 9505 16950 Compatible (dual) serial controller + 9505 OXuPCI952 (Dual 16C950 UART) 950a EXSYS EX-41092 Dual 16950 Serial adapter 950b OXCB950 Cardbus 16950 UART 9510 OX16PCI954 (Quad 16950 UART) function 1 (Disabled) @@ -11558,6 +11590,7 @@ 14a2 Millennium Engineering Inc 14a3 Maverick Networks 14a4 GVC/BCM Advanced Research + 4318 BCM4318 [AirForce One 54g] 802.11g Wireless LAN Controller 14a5 XIONICS Document Technologies Inc 14a6 INOVA Computers GmBH & Co KG 14a7 MYTHOS Systems Inc @@ -11709,6 +11742,7 @@ 107b 5048 E4500 Onboard 1601 NetXtreme BCM5752M Gigabit Ethernet PCI Express 1612 BCM70012 Video Decoder [Crystal HD] + 1615 BCM70015 Video Decoder [Crystal HD] 1639 NetXtreme II BCM5709 Gigabit Ethernet 1028 0235 PowerEdge R710 BCM5709 Gigabit Ethernet 1028 0236 PowerEdge R610 BCM5709 Gigabit Ethernet @@ -12071,6 +12105,10 @@ 1737 0042 WMP54GS v1.1 802.11g Wireless-G PCI Adapter with SpeedBooster 1737 0048 WPC54G v3 802.11g Wireless-G Notebook Adapter 1737 0049 WPC54GS v2 802.11g Wireless-G Notebook Adapter with SpeedBooster + 1799 7000 F5D7000 v4000 Wireless G Desktop Card + 1799 7001 F5D7001 v2000 Wireless G Plus Desktop Card + 1799 7010 F5D7010 v4000 Wireless G Notebook Card + 1799 7011 F5D7011 v2000 High-Speed Mode Wireless G Notebook Card 4319 BCM4311 [AirForce 54g] 802.11a/b/g PCI Express Transceiver 1028 0005 Wireless 1470 Dual Band WLAN Mini-PCI Card 1028 0006 Wireless 1470 Dual Band WLAN PC Card @@ -12095,10 +12133,10 @@ 14e4 4320 Linksys WMP54G PCI 1737 0015 WMP54GS v1.0 802.11g Wireless-G PCI Adapter with SpeedBooster 1737 4320 WPC54G v1 / WPC54GS v1 802.11g Wireless-G Notebook Adapter - 1799 7000 F5D7000uk 54G Wireless Network Card - 1799 7001 Belkin F5D7001 High-Speed Mode Wireless G Network Card - 1799 7010 Belkin F5D7010 54g Wireless Network card - 1799 7011 F5D7011 54g+ Wireless Network card + 1799 7000 F5D7000 v1000 Wireless G Desktop Card + 1799 7001 F5D7001 v1000 Wireless G Plus Desktop Card + 1799 7010 F5D7010 v1000 Wireless G Notebook Card + 1799 7011 F5D7011 v1000 High-Speed Mode Wireless G Notebook Card 185f 1220 TravelMate 290E WLAN Mini-PCI Card 4321 BCM4306 802.11a Wireless LAN Controller 4322 BCM4306 UART @@ -13053,10 +13091,12 @@ 168c Atheros Communications Inc. 0007 AR5000 802.11a Wireless Adapter 1737 0007 WPC54A Wireless PC Card + 8086 2501 PRO/Wireless 5000 LAN PCI Adapter Module 0011 AR5210 802.11a NIC 0012 AR5211 802.11ab NIC 126c 8031 2201 Mobile Adapter 0013 Atheros AR5001X+ Wireless Network Adapter + 0308 3405 G-102 v2 802.11g Wireless Cardbus Adapter 0e11 00e5 NC6000 laptop 10b7 6002 3CRWE154A72 802.11abg Cardbus Adapter 1113 d301 Philips CPWNA100 Wireless CardBus adapter @@ -13067,7 +13107,7 @@ 1186 3203 AirPlus DWL-G520 Wireless PCI Adapter (rev. A) 1186 3a12 D-Link AirPlus DWL-G650 Wireless Cardbus Adapter(rev.C) 1186 3a13 AirPlus DWL-G520 Wireless PCI Adapter (rev. B) - 1186 3a14 D-Link AirPremier DWL-AG530 Wireless PCI Adapter + 1186 3a14 AirPremier AG DWL-AG530 Wireless PCI Adapter (rev.A) 1186 3a17 D-Link AirPremier DWL-G680 Wireless Cardbus Adapter 1186 3a18 D-Link AirPremier DWL-G550 Wireless PCI Adapter 1186 3a63 D-Link AirPremier DWL-AG660 Wireless Cardbus Adapter @@ -13122,10 +13162,12 @@ 168c 2052 Compex Wireless 802.11 b/g MiniPCI Adapter, Rev A1 [WLM54G] 16ec 0122 Wireless PCI Adapter Model 5418 1737 0053 WPC54G v7 802.11g Wireless-G Notebook Adapter + 1799 700c F5D7000 v5000 Wireless G Desktop Card + 1799 701d F5D7010 v5000 Wireless G Notebook Card # the name AR5006X is used for the reference design using AR5413 001b AR5413 802.11abg NIC 1186 3a19 D-Link AirPremier AG DWL-AG660 Wireless Cardbus Adapter - 1186 3a22 D-Link AirPremier AG DWL-AG530 Wireless PCI Adapter + 1186 3a22 AirPremier AG DWL-AG530 Wireless PCI Adapter (rev.B) 1458 e901 GN-WI01HT Wireless a/b/g MiniPCI Adapter 168c 001b Wireless LAN PCI LiteOn 168c 2062 EnGenius EMP-8602 (400mw) or Compex WLM54AG (SuperAG) @@ -13144,9 +13186,14 @@ 168c 3067 AR242x 802.11abg Wireless PCI Express Adapter (rev 01) 1a3b 1026 AR5007EG 802.11bg Wi-Fi mini PCI express card 001d AR5007G Wireless Network Adapter + 1799 720b F5D7000 v8000 Wireless G Desktop Card + 1799 721b F5D7010 v8000 Wireless G Notebook Card # the name AR5005VL is used for some AR5513 based designs 0020 AR5513 802.11abg Wireless NIC + 0308 3407 M-102 802.11g Wireless Cardbus Adapter 1186 3a67 DWL-G650M Super G MIMO Wireless Notebook Adapter + 1186 3a68 DWL-G520M Wireless 108G MIMO Desktop Adapter + 187e 340e M-302 802.11g Wireless PCI Adapter 0023 AR5008 Wireless Network Adapter 1154 0365 Buffalo WLP-CB-AG300 802.11abgn Cardbus Adapter 1186 3a6a DWA-642 802.11n RangeBooster N CardBus Adapter @@ -13165,6 +13212,7 @@ 002d AR9287 Wireless Network Adapter 002e AR9287 Wireless Network Adapter (PCI-Express) 0030 AR9300 Wireless LAN adaptor + 0032 AR9485 Wireless Network Adapter 0033 11a/b/g/n Wireless LAN Mini-PCI Express Adapter 0207 AR5210 1014 AR5212 802.11abg NIC @@ -13349,12 +13397,11 @@ 6801 TW6802 multimedia video card 6802 TW6802 multimedia other device 1799 Belkin - 6001 Wireless PCI Card - F5D6001 - 6020 Wireless PCMCIA Card - F5D6020 v3000 [Realtek RTL8180] - 6060 Wireless PDA Card - F5D6060 - 7000 Wireless PCI Card - F5D7000 - 700a Wireless PCI Card - F5D7000UK - 7010 BCM4306 802.11b/g Wireless Lan Controller F5D7010 + 6001 F5D6001 Wireless PCI Card [Realtek RTL8180] + 6020 F5D6020 v3000 Wireless PCMCIA Card [Realtek RTL8180] + 6060 F5D6060 Wireless PDA Card + 700f F5D7000 v7000 Wireless G Desktop Card [Realtek RTL8185] + 701f F5D7010 v7000 Wireless G Notebook Card [Realtek RTL8185] 179a id Quantique 0001 Quantis PCI 16Mbps 179c Data Patterns @@ -13491,8 +13538,8 @@ 1462 6833 Unknown 802.11g mini-PCI Adapter 1462 6835 Wireless 11G CardBus CB54G2 1737 0032 WMP54G 2.0 PCI Adapter - 1799 700a F5D7000 Wireless G Desktop Network Card - 1799 701a F5D7010 Wireless G Notebook Network Card + 1799 700a F5D7000 v2000/v3000 Wireless G Desktop Card + 1799 701a F5D7010 v2000/v3000 Wireless G Notebook Card 185f 22a0 CN-WF513 Wireless Cardbus Adapter 0300 Wireless Adapter Canyon CN-WF511 0301 RT2561/RT61 802.11g PCI @@ -13502,6 +13549,8 @@ 1458 e933 GN-WI01GS 1458 e934 GN-WP01GS 1737 0055 WMP54G ver 4.1 + 1799 700e F5D7000 v6000 Wireless G Desktop Card + 1799 701e F5D7010 v6000 Wireless G Notebook Card 1814 2561 EW-7108PCg 0302 RT2561/RT61 rev B 802.11g 1186 3a71 DWA-510 Wireless G Desktop Adapter @@ -14082,6 +14131,7 @@ 1005 ioDimm3 1006 ioXtreme 1007 ioXtreme Pro + 1008 ioXtreme-2 1aee Caustic Graphics Inc. # nee Qumranet, Inc. 1af4 Red Hat, Inc @@ -14104,6 +14154,7 @@ 1b40 Schooner Information Technology, Inc. 1b4b Marvell Technology Group Ltd. 9123 88SE9123 PCIe SATA 6.0 Gb/s controller + 9128 88SE9128 PCIe SATA 6 Gb/s RAID controller 1b55 NetUP Inc. 2a2c Dual DVB-S2-CI card e2e4 Dual DVB-T/C-CI RF card @@ -14720,7 +14771,12 @@ 004b Core Processor Secondary PCI Express Root Port 0050 Core Processor Thermal Management Controller 0069 Core Processor DRAM Controller - 0082 6000 Series Gen2 + 0082 Centrino Advanced-N 6205 + 8086 1301 Centrino Advanced-N 6205 AGN + 8086 1306 Centrino Advanced-N 6205 ABG + 8086 1307 Centrino Advanced-N 6205 BG + 8086 1321 Centrino Advanced-N 6205 AGN + 8086 1326 Centrino Advanced-N 6205 ABG 0083 Centrino Wireless-N 1000 8086 1205 Centrino Wireless-N 1000 BGN 8086 1206 Centrino Wireless-N 1000 BG @@ -14735,7 +14791,9 @@ 8086 1216 Centrino Wireless-N 1000 BG 8086 1315 Centrino Wireless-N 1000 BGN 8086 1316 Centrino Wireless-N 1000 BG - 0085 6000 Series Gen2 + 0085 Centrino Advanced-N 6205 + 8086 1311 Centrino Advanced-N 6205 AGN + 8086 1316 Centrino Advanced-N 6205 ABG 0087 Centrino Advanced-N + WiMAX 6250 8086 1301 Centrino Advanced-N + WiMAX 6250 2x2 AGN 8086 1306 Centrino Advanced-N + WiMAX 6250 2x2 ABG @@ -14744,26 +14802,44 @@ 0089 Centrino Advanced-N + WiMAX 6250 8086 1311 Centrino Advanced-N + WiMAX 6250 2x2 AGN 8086 1316 Centrino Advanced-N + WiMAX 6250 2x2 ABG - 008f 6000 Series Gen3 - 0090 6000 Series Gen3 - 0100 Sandy Bridge DRAM Controller - 0101 Sandy Bridge PCI Express Root Port - 0102 Sandy Bridge Integrated Graphics Controller - 0103 Sandy Bridge Thermal Management Controller - 0104 Sandy Bridge DRAM Controller - 0105 Sandy Bridge PCI Express Root Port - 0106 Sandy Bridge Integrated Graphics Controller - 0108 Sandy Bridge DRAM Controller - 0109 Sandy Bridge PCI Express Root Port - 010a Sandy Bridge Integrated Graphics Controller - 010b Sandy Bridge Integrated Graphics Controller - 010c Sandy Bridge DRAM Controller - 010d Sandy Bridge PCI Express Root Port - 010e Sandy Bridge Integrated Graphics Controller - 0112 Sandy Bridge Integrated Graphics Controller - 0116 Sandy Bridge Integrated Graphics Controller - 0122 Sandy Bridge Integrated Graphics Controller - 0126 Sandy Bridge Integrated Graphics Controller + 008a Centrino Wireless-N 1030 + 8086 5305 Centrino Wireless-N 1030 BGN + 8086 5307 Centrino Wireless-N 1030 BG + 8086 5325 Centrino Wireless-N 1030 BGN + 8086 5327 Centrino Wireless-N 1030 BG + 008b Centrino Wireless-N 1030 + 8086 5315 Centrino Wireless-N 1030 BGN + 8086 5317 Centrino Wireless-N 1030 BG + 0090 Centrino Advanced-N 6230 + 8086 5211 Centrino Advanced-N 6230 AGN + 8086 5215 Centrino Advanced-N 6230 BGN + 8086 5216 Centrino Advanced-N 6230 ABG + 0091 Centrino Advanced-N 6230 + 8086 5201 Centrino Advanced-N 6230 AGN + 8086 5205 Centrino Advanced-N 6230 BGN + 8086 5206 Centrino Advanced-N 6230 ABG + 8086 5207 Centrino Advanced-N 6230 BG + 8086 5221 Centrino Advanced-N 6230 AGN + 8086 5225 Centrino Advanced-N 6230 BGN + 8086 5226 Centrino Advanced-N 6230 ABG + 0100 2nd Generation Core Processor Family DRAM Controller + 0101 2nd Generation Core Processor Family PCI Express Root Port + 0102 2nd Generation Core Processor Family Integrated Graphics Controller + 0103 2nd Generation Core Processor Family Thermal Management Controller + 0104 2nd Generation Core Processor Family DRAM Controller + 0105 2nd Generation Core Processor Family PCI Express Root Port + 0106 2nd Generation Core Processor Family Integrated Graphics Controller + 0108 2nd Generation Core Processor Family DRAM Controller + 0109 2nd Generation Core Processor Family PCI Express Root Port + 010a 2nd Generation Core Processor Family Integrated Graphics Controller + 010b 2nd Generation Core Processor Family Integrated Graphics Controller + 010c 2nd Generation Core Processor Family DRAM Controller + 010d 2nd Generation Core Processor Family PCI Express Root Port + 010e 2nd Generation Core Processor Family Integrated Graphics Controller + 0112 2nd Generation Core Processor Family Integrated Graphics Controller + 0116 2nd Generation Core Processor Family Integrated Graphics Controller + 0122 2nd Generation Core Processor Family Integrated Graphics Controller + 0126 2nd Generation Core Processor Family Integrated Graphics Controller 0309 80303 I/O Processor PCI-to-PCI Bridge 030d 80312 I/O Companion Chip PCI-to-PCI Bridge 0326 6700/6702PXH I/OxAPIC Interrupt Controller A @@ -14788,7 +14864,10 @@ 0373 80333 B-Bus IOAPIC 0374 80333 Address Translation Unit 0436 DH89xxCC Gigabit SGMII Connection - 0438 DH89xxCC Gigabit SerDes Connection + 0438 DH8900CC Series Gigabit Network Connection + 043a DH8900CC Series Gigabit Fiber Network Connection + 043c DH8900CC Series Gigabit Backplane Network Connection + 0440 DH8900CC Series Gigabit SFP Network Connection 0482 82375EB/SB PCI to EISA Bridge 0483 82424TX/ZX [Saturn] CPU to PCI bridge 0484 82378ZB/IB, 82379AB (SIO, SIO.A) PCI to ISA Bridge @@ -14853,8 +14932,14 @@ 0813 Moorestown SC DMA 0814 Moorestown LPE DMA 0815 Moorestown SSP0 - 0885 WiFi+WiMAX 6050 Series Gen2 - 0886 WiFi+WiMAX 6050 Series Gen2 + 0885 Centrino Wireless-N + WiMAX 6150 + 8086 1305 Centrino Wireless-N + WiMAX 6150 BGN + 8086 1307 Centrino Wireless-N + WiMAX 6150 BG + 8086 1325 Centrino Wireless-N + WiMAX 6150 BGN + 8086 1327 Centrino Wireless-N + WiMAX 6150 BG + 0886 Centrino Wireless-N + WiMAX 6150 + 8086 1315 Centrino Wireless-N + WiMAX 6150 BGN + 8086 1317 Centrino Wireless-N + WiMAX 6150 BG 0896 WiFi 130 Series 0897 WiFi 130 Series 08ae WiFi 100 Series @@ -15296,6 +15381,7 @@ 8086 a02b Gigabit ET Quad Port Server Adapter 8086 a02c Gigabit ET Quad Port Server Adapter 10ea 82577LM Gigabit Network Connection + 1028 040b Latitude E6510 10eb 82577LC Gigabit Network Connection 10ec 82598EB 10-Gigabit AT CX4 Network Connection 8086 a01f 10-Gigabit CX4 Dual Port Server Adapter @@ -15629,74 +15715,67 @@ 1b48 82597EX 10GbE Ethernet Controller 8086 a01f PRO/10GbE LR Server Adapter 8086 a11f PRO/10GbE LR Server Adapter - 1c00 Cougar Point 4 port SATA IDE Controller - 1c01 Cougar Point 4 port SATA IDE Controller - 1c02 Cougar Point 6 port SATA AHCI Controller - 1c03 Cougar Point 6 port SATA AHCI Controller - 1c04 Cougar Point SATA RAID Controller - 1c05 Cougar Point SATA RAID Controller - 1c06 Cougar Point SATA Premium RAID Controller - 1c07 Cougar Point SATA Premium RAID Controller - 1c08 Cougar Point 2 port SATA IDE Controller - 1c09 Cougar Point 2 port SATA IDE Controller - 1c10 Cougar Point PCI Express Root Port 1 - 1c12 Cougar Point PCI Express Root Port 2 - 1c14 Cougar Point PCI Express Root Port 3 - 1c16 Cougar Point PCI Express Root Port 4 - 1c18 Cougar Point PCI Express Root Port 5 - 1c1a Cougar Point PCI Express Root Port 6 - 1c1c Cougar Point PCI Express Root Port 7 - 1c1e Cougar Point PCI Express Root Port 8 - 1c20 Cougar Point High Definition Audio Controller - 1c22 Cougar Point SMBus Controller - 1c24 Cougar Point Thermal Management Controller - 1c25 Cougar Point DMI to PCI Bridge - 1c26 Cougar Point USB Enhanced Host Controller #1 - 1c27 Cougar Point USB Universal Host Controller #1 - 1c28 Cougar Point USB Universal Host Controller #2 - 1c29 Cougar Point USB Universal Host Controller #3 - 1c2a Cougar Point USB Universal Host Controller #4 - 1c2b Cougar Point USB Universal Host Controller #8 - 1c2c Cougar Point USB Universal Host Controller #5 - 1c2d Cougar Point USB Enhanced Host Controller #2 - 1c2e Cougar Point USB Universal Host Controller #6 - 1c2f Cougar Point USB Universal Host Controller #7 - 1c30 Cougar Point USB Universal Host Controller #9 - 1c33 Cougar Point LAN Controller - 1c35 Cougar Point VECI Controller - 1c3a Cougar Point HECI Controller #1 - 1c3b Cougar Point HECI Controller #2 - 1c3c Cougar Point IDE-r Controller - 1c3d Cougar Point KT Controller - 1c42 Cougar Point LPC Controller - 1c43 Cougar Point LPC Controller - 1c44 Cougar Point LPC Controller - 1c45 Cougar Point LPC Controller - 1c46 Cougar Point LPC Controller - 1c47 Cougar Point LPC Controller - 1c48 Cougar Point LPC Controller - 1c49 Cougar Point LPC Controller - 1c4a Cougar Point LPC Controller - 1c4b Cougar Point LPC Controller - 1c4c Cougar Point LPC Controller - 1c4d Cougar Point LPC Controller - 1c4e Cougar Point LPC Controller - 1c4f Cougar Point LPC Controller - 1c50 Cougar Point LPC Controller - 1c51 Cougar Point LPC Controller - 1c52 Cougar Point LPC Controller - 1c53 Cougar Point LPC Controller - 1c54 Cougar Point LPC Controller - 1c55 Cougar Point LPC Controller - 1c56 Cougar Point LPC Controller - 1c57 Cougar Point LPC Controller - 1c58 Cougar Point LPC Controller - 1c59 Cougar Point LPC Controller - 1c5a Cougar Point LPC Controller - 1c5b Cougar Point LPC Controller - 1c5c Cougar Point LPC Controller - 1c5d Cougar Point LPC Controller - 1c5f Cougar Point LPC Controller + 1c00 6 Series Chipset Family 4 port SATA IDE Controller + 1c01 6 Series Chipset Family 4 port SATA IDE Controller + 1c02 6 Series Chipset Family 6 port SATA AHCI Controller + 1c03 6 Series Chipset Family 6 port SATA AHCI Controller + 1c04 6 Series Chipset Family SATA RAID Controller + 1c05 6 Series Chipset Family SATA RAID Controller + 1c06 6 Series Chipset Family SATA RAID Controller + 1c08 6 Series Chipset Family 2 port SATA IDE Controller + 1c09 6 Series Chipset Family 2 port SATA IDE Controller + 1c10 6 Series Chipset Family PCI Express Root Port 1 + 1c12 6 Series Chipset Family PCI Express Root Port 2 + 1c14 6 Series Chipset Family PCI Express Root Port 3 + 1c16 6 Series Chipset Family PCI Express Root Port 4 + 1c18 6 Series Chipset Family PCI Express Root Port 5 + 1c1a 6 Series Chipset Family PCI Express Root Port 6 + 1c1c 6 Series Chipset Family PCI Express Root Port 7 + 1c1e 6 Series Chipset Family PCI Express Root Port 8 + 1c20 6 Series Chipset Family High Definition Audio Controller + 1c22 6 Series Chipset Family SMBus Controller + 1c24 6 Series Chipset Family Thermal Management Controller + 1c25 6 Series Chipset Family DMI to PCI Bridge + 1c26 6 Series Chipset Family USB Enhanced Host Controller #1 + 1c2d 6 Series Chipset Family USB Enhanced Host Controller #2 + 1c33 6 Series Chipset Family LAN Controller + 1c35 6 Series Chipset Family VECI Controller + 1c3a 6 Series Chipset Family HECI Controller #1 + 1c3b 6 Series Chipset Family HECI Controller #2 + 1c3c 6 Series Chipset Family IDE-r Controller + 1c3d 6 Series Chipset Family KT Controller + 1c40 6 Series Chipset Family LPC Controller + 1c41 6 Series Chipset Family LPC Controller + 1c42 6 Series Chipset Family LPC Controller + 1c43 6 Series Chipset Family LPC Controller + 1c44 6 Series Chipset Family LPC Controller + 1c45 6 Series Chipset Family LPC Controller + 1c46 P67 Express Chipset Family LPC Controller + 1c47 6 Series Chipset Family LPC Controller + 1c48 6 Series Chipset Family LPC Controller + 1c49 HM65 Express Chipset Family LPC Controller + 1c4a H67 Express Chipset Family LPC Controller + 1c4b HM67 Express Chipset Family LPC Controller + 1c4c 6 Series Chipset Family LPC Controller + 1c4d 6 Series Chipset Family LPC Controller + 1c4e 6 Series Chipset Family LPC Controller + 1c4f 6 Series Chipset Family LPC Controller + 1c50 6 Series Chipset Family LPC Controller + 1c51 6 Series Chipset Family LPC Controller + 1c52 6 Series Chipset Family LPC Controller + 1c53 6 Series Chipset Family LPC Controller + 1c54 6 Series Chipset Family LPC Controller + 1c55 6 Series Chipset Family LPC Controller + 1c56 6 Series Chipset Family LPC Controller + 1c57 6 Series Chipset Family LPC Controller + 1c58 6 Series Chipset Family LPC Controller + 1c59 6 Series Chipset Family LPC Controller + 1c5a 6 Series Chipset Family LPC Controller + 1c5b 6 Series Chipset Family LPC Controller + 1c5c 6 Series Chipset Family LPC Controller + 1c5d 6 Series Chipset Family LPC Controller + 1c5e 6 Series Chipset Family LPC Controller + 1c5f 6 Series Chipset Family LPC Controller 1d00 Patsburg 4-Port SATA IDE Controller 1d02 Patsburg 6-Port SATA AHCI Controller 1d04 Patsburg SATA RAID Controller @@ -17046,6 +17125,7 @@ 17aa 20a7 ThinkPad T61 e4bf cc47 CCG-RUMBA 282a Mobile 82801 SATA RAID Controller + 1028 040b Latitude E6510 2830 82801H (ICH8 Family) USB UHCI Controller #1 1025 0121 Acer Aspire 5920G 1028 01da OptiPlex 745 @@ -17495,7 +17575,7 @@ 2b5e Xeon 7500 QPI Physical Port 3: Misc. control/status 2b60 Xeon 7500 SMI Physical Port 0: REUT control/status 2b62 Xeon 7500 SMI Physical Port 0: Misc control/status - 2b64 Xeon 7500 SMI Physical Port 0: REUT control/status + 2b64 Xeon 7500 SMI Physical Port 1: REUT control/status 2b66 Xeon 7500 SMI Physical Port 1: Misc control/status 2b68 Westmere-EX Last Level Cache Coherence Engine 8 2b6c Westmere-EX Last Level Cache Coherence Engine 9 @@ -18031,6 +18111,7 @@ 3b05 Mobile 5 Series Chipset LPC Interface Controller 3b06 5 Series Chipset LPC Interface Controller 3b07 Mobile 5 Series Chipset LPC Interface Controller + 1028 040b Latitude E6510 3b08 5 Series Chipset LPC Interface Controller 3b09 Mobile 5 Series Chipset LPC Interface Controller 1025 0347 Aspire 7740G @@ -18071,10 +18152,12 @@ 3b2f 5 Series/3400 Series Chipset 6 port SATA AHCI Controller 3b30 5 Series/3400 Series Chipset SMBus Controller 1025 0347 Aspire 7740G + 1028 040b Latitude E6510 3b32 5 Series/3400 Series Chipset Thermal Subsystem 1025 0347 Aspire 7740G 3b34 5 Series/3400 Series Chipset USB2 Enhanced Host Controller 1025 0347 Aspire 7740G + 1028 040b Latitude E6510 3b36 5 Series/3400 Series Chipset USB Universal Host Controller 3b37 5 Series/3400 Series Chipset USB Universal Host Controller 3b38 5 Series/3400 Series Chipset USB Universal Host Controller @@ -18083,6 +18166,7 @@ 3b3b 5 Series/3400 Series Chipset USB Universal Host Controller 3b3c 5 Series/3400 Series Chipset USB2 Enhanced Host Controller 1025 0347 Aspire 7740G + 1028 040b Latitude E6510 3b3e 5 Series/3400 Series Chipset USB Universal Host Controller 3b3f 5 Series/3400 Series Chipset USB Universal Host Controller 3b40 5 Series/3400 Series Chipset USB Universal Host Controller @@ -18098,6 +18182,8 @@ 3b53 5 Series/3400 Series Chipset VECI Controller 3b56 5 Series/3400 Series Chipset High Definition Audio 1025 0347 Aspire 7740G + 1028 040b Latitude E6510 + 3b57 5 Series/3400 Series Chipset High Definition Audio 3b64 5 Series/3400 Series Chipset HECI Controller 1025 0347 Aspire 7740G 3b65 5 Series/3400 Series Chipset HECI Controller @@ -18552,6 +18638,7 @@ d130 Core Processor DMI d131 Core Processor DMI d132 Core Processor DMI + 1028 040b Latitude E6510 d133 Core Processor DMI d134 Core Processor DMI d135 Core Processor DMI diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids index 3706d6d..d7790d1 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: 2010.12.07 -# Date: 2010-12-07 20:34:05 +# Version: 2010.12.24 +# Date: 2010-12-24 20:34:02 # # Vendors, devices and interfaces. Please keep sorted. @@ -679,6 +679,7 @@ f070 Serial Converter 422/485 [Vardaan VEUSB422R3] f1a0 Asix PRESTO Programmer f208 Papenmeier Braille-Display + f3c0 4N-GALAXY Serial Converter f680 Suunto Sports Instrument f758 GW Instek GDS-8x0 Oscilloscope f850 USB-UIRT (Universal Infrared Receiver+Transmitter) @@ -1315,6 +1316,7 @@ 2602 USB 2.0 Hub 2640 USB 2.0 Hub 4060 Ultra Fast Media Reader + 4064 Ultra Fast Media Reader 0425 Motorola Semiconductors HK, Ltd 0101 G-Tech Wireless Mouse & Keyboard f102 G-Tech U+P Wireless Mouse @@ -1957,9 +1959,15 @@ 04e8 Windows Powered Smartphone 2003 04e9 Windows Powered Smartphone 2003 04ea Windows Powered Smartphone 2003 + 04ec Windows Phone (Zune) + 063e Zune HD Media Player + 0640 KIN Phone + 0641 KIN Phone + 0642 KIN Phone 0707 Wireless Laser Mouse 8000 0708 Transceiver v 3.0 for Bluetooth 070a Charon Bluetooth Dongle (DFU) + 0710 Zune Media Player 0713 Wireless Presenter Mouse 8000 0719 Xbox 360 Wireless Adapter 0721 LifeCam NX-3000 (UVC-compliant) @@ -2027,7 +2035,7 @@ 4d2b Wireless Laser Mini Mouse (HID) 4d2c PoPo Mini Pointer Mouse (HID) 4d2e Optical Mobile Mouse (HID) - 4d51 DELL Laser Mouse + 4d51 0Y357C MOCZUL [Dell Laser Mouse Kit] 0463 MGE UPS Systems 0001 UPS ffff UPS @@ -2176,6 +2184,7 @@ 0a0b ClearChat Pro USB 0a0c Clear Chat Comfort USB Headset 0a13 Z-5 Speakers + 0a17 G330 Headset 0b02 BT Mini-Receiver (HID proxy mode) 8801 Video Camera b305 BT Mini-Receiver @@ -2257,6 +2266,7 @@ c219 Cordless RumblePad 2 c21a Precision Gamepad c21c G13 Advanced Gameboard + c21d F310 Gamepad [XInput Mode] c21f F710 Wireless Gamepad [XInput Mode] c221 G11/G15 Keyboard / Keyboard c222 G15 Keyboard / LCD @@ -2453,6 +2463,7 @@ 1801 Diva MP3 player 200a Wireless Network Adapter 200f 802.11n Wireless Adapter + 2021 SDE3273FC/97 2.5" SATA HDD Enclosure [INIC-1608L] 2022 GoGear SA52XX 2034 Webcam SPC530NC 203f TSU9200 Remote Control @@ -2460,6 +2471,7 @@ 204e GoGear RaGa (SA1942/02) 205e TSU9300 Remote Control 2070 GoGear Mix + 2076 GoGear Aria 2079 GoGear Opus 2088 MCE IR Receiver with ALS- Spinel plus for ASUS 262c SPC230NC Webcam @@ -3006,10 +3018,14 @@ 1729 MX700 ser 172b MP140 ser 173e MP560 + 173f Pixma MP640 Multifunction device 1900 CanoScan LiDE 90 1901 CanoScan 8800F 1904 CanoScan LiDE 100 1905 CanoScan LiDE 200 + 1907 CanoScan LiDE 700F + 1909 CanoScan LiDE 110 + 190a CanoScan LiDE 210 2200 CanoScan LiDE 25 2201 CanoScan FB320U 2202 CanoScan FB620U @@ -3037,6 +3053,7 @@ 221e CanoScan 8400F 221f CanoScan LiDE 500F 2220 CanoScan LIDE 25 + 2224 CanoScan LiDE 600F 2225 CanoScan LiDE 70 2228 CanoScan 4400F 2602 MultiPASS C555 @@ -3915,6 +3932,7 @@ 5120 SCR331-DI SmartCard Reader 5121 SDI010 Smart Card Reader 5151 SCR338 Keyboard Smart Card Reader + 5292 SCL011 RFID reader 5410 SCR35xx Smart Card Reader e000 SCRx31 Reader e001 SCR331 SmartCard Reader @@ -4068,6 +4086,7 @@ 5f02 NEXiO Sync 5f03 NEXiO Sync 5f04 NEXiO Sync + 6032 G2 Portable hard drive 6601 Mobile Phone 6602 Galaxy 6603 Galaxy @@ -4878,6 +4897,7 @@ 0317 WALKMAN 031a Walkman NWD-B103F 031e PRS-505 reader + 033e DSC-W120 0346 Handycam DCR-SR55E 0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1) 03bc Webbie HD - MHS-CM1 @@ -6169,7 +6189,7 @@ 0660 USB 2.0 Hub 0700 SIIG US2256 CompactFlash Card Reader 0701 USB 2.0 IDE Adapter - 0702 USB 2.0 IDE Adapter + 0702 USB 2.0 IDE Adapter [GL811E] 0703 Card Reader 0704 Card Reader 0705 Card Reader @@ -6412,6 +6432,7 @@ a103 Acer/HP Integrated Webcam [CN0314] a110 HP Webcam a136 Asus Integrated Webcam [CN031B] + a219 1.3M WebCam (notebook emachines E730, Acer sub-brand) c107 HP webcam [dv6-1190en] d101 Acer CrystalEye Webcam e201 Lenovo Integrated Webcam @@ -6594,7 +6615,7 @@ 0673 HCL 5000 Keyboard 0674 Key Mouse Electronic Enterprise Co., Ltd -0675 Draytech +0675 DrayTek Corp. 0110 Vigor 128 ISDN TA 0530 Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280) 0550 Vigor550 @@ -6821,6 +6842,7 @@ 5509 P3000 Wireless Pad 8000 Gamers' Keyboard 801e Cyborg 3D Digital Stick II + 8020 Eclipse Keyboard 8021 Eclipse II Keyboard 802d P750 Pad 803f X36 Flight Controller @@ -7158,6 +7180,7 @@ e020 HWGUSB2-54V2-AP e031 Hercules HWNUm-300 Wireless N mini [Realtek RTL8191S] e032 HWGUm-54 [Hercules Wireless G Ultra Mini Key] +06f9 ASYST electronic d.o.o. 06fa HSD S.r.L 06fc Motorola Semiconductor Products Sector 06fd Boston Acoustics @@ -7386,7 +7409,7 @@ 201b M-Audio RunTime DFU 201d M-Audio Producer 2080 M-Audio RunTime DFU - 2081 M-Audio RunTime DFU + 2081 M-Audio RunTime DFU / Fast Track Ultra 8R 2803 M-Audio Audiophile DFU 2804 M-Audio MobilePre DFU 2806 M-Audio Transit DFU @@ -7778,7 +7801,7 @@ b031 BCM92045DG-Flash with trace filter b032 BCM92045DG-Flash with trace filter b033 BCM92045DG-Flash with trace filter - b21a 802.11g Wireless Adapter + b21a WUG2400 802.11g Wireless Adapter [Texas Instruments TNETW1450] b21b HWU54DM b21c RT2573 b21d RT2573 @@ -8033,7 +8056,7 @@ 0005 ScanLogic/Century Corporation uATA 011e Century USB Disk Enclosure 07f9 Dotop Technology, Inc. -07fa Draytek +07fa DrayTek Corp. 0778 miniVigor 128 ISDN TA 1012 BeWAN ADSL USB ST (grey) 1196 BWIFI-USB54AR 802.11bg @@ -8164,6 +8187,7 @@ 1009 Digimax V4 1012 6500 Document Camera 1058 S730 Camera + 1064 Digimax D830 Camera 1542 Digimax 50 Duo 3000 Digimax 35 MP3 083a Accton Technology Corp. @@ -8661,6 +8685,7 @@ 3720 Silicon Motion Camera 37c0 Silicon Motion Camera 6000 SD/SDHC Card Reader (SG365 / FlexiDrive XC+) + 6200 microSD card reader 837b Silicon Motion Camera 937b Silicon Motion Camera b370 Silicon Motion SM370 Camera @@ -8822,7 +8847,7 @@ 653e Flash Memory 6540 TransMemory Flash Memory 6544 Kingston DataTraveler 2.0 Stick (2GB) - 6545 Kingston DataTraveler 102 flash drive + 6545 Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick 0931 Harmonic Data Systems, Ltd 0932 Crescentec Corp. 0300 VideoAdvantage @@ -8910,6 +8935,7 @@ 1613 DataTraveler DT101C Flash Drive 1625 DataTraveler 101 II 162a DataTraveler 112 4GB Pen Drive + 1643 DataTraveler G3 4GB 0954 RPM Systems Corp. 0955 NVidia Corp. 0956 BSquare Corp. @@ -9044,6 +9070,8 @@ 09e8 AKAI Professional M.I. Corp. 0062 MPD16 MIDI Pad Controller Unit 006d EWI electronic wind instrument + 0071 MPK25 MIDI Keyboard + 0076 LPK25 MIDI Keyboard 09e9 Chen-Source, Inc. 09eb IM Networks, Inc. 4331 iRhythm Tuner Remote @@ -9271,6 +9299,7 @@ 0a5d Diatrend Corp. 0a5f Zebra 0009 LP2844 Printer + 0081 GK420t Label Printer 008b HC100 wristbands Printer 930a Printer 0a62 MPMan @@ -9538,6 +9567,7 @@ 1761 802.11n Network Adapter 1774 Gobi Wireless Modem (QDL mode) 1776 Gobi Wireless Modem + 1779 My Cinema U3100 Mini Plus [AF9035A] 1784 USB-N13 802.11n Network Adapter [Ralink RT2870] 6101 Cable Modem 620a Remote NDIS Device @@ -10122,6 +10152,7 @@ 03a2 iDEN Smartphone 41d9 i1 phone 0c45 Microdia + 0011 EBUDDY 1020 Mass Storage Reader 1028 Mass Storage Reader 1030 Mass Storage Reader @@ -10251,6 +10282,7 @@ 0c4b Reiner SCT Kartensysteme GmbH 0100 cyberJack e-com/pinpad 0300 cyberJack pinpad(a) + 9102 cyberJack RFID basis contactless smartcard reader 0c52 Sealevel Systems, Inc. 2101 Serial Converter 0c53 ViewPLUS, Inc. @@ -10422,7 +10454,7 @@ 0018 NB 802.11a/b/g Wireless LAN Adapter(3887A) 001a 802.11bg 001c 802.11b/g Wireless Network Adapter - 0020 Wi-Fi Wireless LAN Adapter + 0020 AG-760A 802.11abg Wireless Adapter [ZyDAS ZD1211B] 0022 802.11b/g/n Wireless Network Adapter 0023 UB81 802.11bgn 0025 802.11b/g/n USB Wireless Network Adapter @@ -10445,11 +10477,12 @@ 0006 AR5523 (no firmware) 1001 Thomson TG121N [Atheros AR9001U-(2)NG] 1002 TP-Link TL-WN821N v2 [Atheros AR9001U-(2)NG] - 1006 TP-Link TL-WN422G v2 802.11g [Atheros AR9271] + 1006 TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271] 1010 3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170] 3000 AR3011 9170 AR9170 802.11n 9271 AR9271 802.11n + b002 Ubiquiti WiFiStation 802.11n [Atheros AR9271] b003 AR9271 802.11n 0cf4 Fomtex Corp. 0cf5 Cellink Co., Ltd @@ -10710,7 +10743,13 @@ 0d9e Avaya 0300 Wireless Card 0d9f Powercom Co., Ltd - 0002 Uninterruptible power supply + 0001 Uninterruptible Power Supply + 0002 Black Knight PRO / WOW Uninterruptible Power Supply (Cypress HID->COM RS232) + 00a2 Imperial Uninterruptible Power Supply (HID PDC) + 00a3 Smart King PRO Uninterruptible Power Supply (HID PDC) + 00a4 WOW Uninterruptible Power Supply (HID PDC) + 00a5 Vanguard Uninterruptible Power Supply (HID PDC) + 00a6 Black Knight PRO Uninterruptible Power Supply (HID PDC) 0da0 Danger Research 0da1 Suzhou Peter's Precise Industrial Co., Ltd 0da2 Land Instruments International, Ltd @@ -10906,6 +10945,7 @@ 0e0c Gesytec 0101 LonUSB LonTalk Network Adapter 0e0f VMware, Inc. + 0001 Device 0002 Virtual USB Hub 0003 Virtual Mouse 0004 Virtual CCID @@ -11289,8 +11329,10 @@ 2105 W715 Phone 2137 Xperia X10 mini (USB debug) 2138 Xperia X10 mini pro (Debug) + 2149 Xperia X8 (debug) 3137 Xperia X10 mini 3138 Xperia X10 mini pro + 3149 Xperia X8 8004 9000 Phone [Mass Storage] d008 V800-Vodafone 802SE Phone d016 K750i Phone @@ -11359,6 +11401,8 @@ 6000 KU330/KU990/VX4400/VX6000 6005 T5100 6018 GM360/GD510/GW520/KP501 + 618e Ally (debug mode) + 618f Ally 6800 CDMA Modem 7000 LG LDP-7024D(LD)USB a400 Renoir (KC910) @@ -11463,6 +11507,7 @@ 8901 Bluetooth Device 9967 W9967CF/W9968CF Webcam IC 1048 Targus Group International +104b Mylex / Buslogic 104c AMCO TEC International, Inc. 104d Newport Corporation 1003 Model-52 LED Light Source Power Supply and Driver @@ -11606,7 +11651,8 @@ 10a0 Hirotech, Inc. 10a3 Mitsubishi Materials Corp. 10a9 SK Teletech Co., Ltd - 1102 Sky IM-U460K + 1102 Sky Love Actually IM-U460K + 1104 Sky Vega IM-A650S 10aa Cables To Go 10ab USI Co., Ltd 1002 Bluetooth Device @@ -11778,6 +11824,7 @@ 1163 DeLorme Publishing, Inc. 0100 Earthmate GPS (orig) 0200 Earthmate GPS (LT-20, LT-40) + 2020 Earthmate GPS (PN-40) 1164 YUAN High-Tech Development Co., Ltd 0300 ELSAVISION 460D 0601 Analog TV Tuner @@ -11926,6 +11973,7 @@ 125c Apogee Inc. 0010 Alta series CCD 125f A-DATA Technology Co., Ltd. + c81a Flash drive 1260 Standard Microsystems Corp. ee22 SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887] 1264 Covidien Energy-based Devices @@ -11943,6 +11991,7 @@ 1325 Mobile Disk 2168 Mobile Disk III a006 G240 802.11bg +1274 Ensoniq 1275 Xaxero Marine Software Engineering, Ltd. 0002 WeatherFax 2000 Demodulator 0080 SkyEye Weather Satellite Receiver @@ -12162,6 +12211,7 @@ 13be Ricoh Printing Systems, Ltd. 13ca JyeTai Precision Industrial Co., Ltd. 13cf Wisair Ltd. + 1200 Olidata Wireless Multimedia Adapter 13d0 Techsan Electronics Co., Ltd. 2282 TechniSat DVB-PC TV Star 2 13d1 A-Max Technology Macao Commercial Offshore Co. Ltd. @@ -12225,6 +12275,7 @@ 1340 Hi-Speed USB to SATA Bridge 160f RocketFish SATA Bridge [INIC-1611] 1640 ASUS SDRW-08D1S-U DVD-RW + 1840 Shintaro SH23SDOCK Hard Drive Docker [INIC-1608L] 13fe Kingston Technology Company Inc. 1a00 512MB/1GB Flash Drive 1a23 512MB Flash Drive @@ -12316,6 +12367,7 @@ e018 eHome Infrared Receiver e03a eHome Infrared Receiver e03c eHome Infrared Receiver + e03e Infrared Receiver [IR605A/Q] 147e Upek 1000 Biometric Touchchip/Touchstrip Fingerprint Sensor 2016 Biometric Touchchip/Touchstrip Fingerprint Sensor @@ -12376,6 +12428,9 @@ 0250 Storage Adapter V2 0350 Storage Adapter V2 14cd Super Top + 121c microSD card reader + 123a SD/MMC/RS-MMC Card Reader + 127b SDXC Reader 6600 USB 2.0 IDE DEVICE 6700 Card Reader 6900 Card Reader @@ -12488,6 +12543,7 @@ 0010 802.11n USB Wireless Card 0012 WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870] 15aa Gearway Electronics (Dong Guan) Co., Ltd. +15ad VMware Inc. 15ba Olimex Ltd. 0003 OpenOCD JTAG 0004 OpenOCD JTAG TINY @@ -12838,6 +12894,7 @@ 170b Swissonic 0011 MIDI-USB 1x1 170d Avnera +1725 Vitesse Semiconductor 1726 Axesstel, Inc. 1000 wireless modem 2000 wireless modem @@ -12922,6 +12979,7 @@ 0007 eHome Infrared Transceiver 0008 eHome Infrared Transceiver 000a eHome Infrared Transceiver +1787 ATI AIB 1788 ShenZhen Litkconn Technology Co., Ltd. 1796 Printrex, Inc. 1797 JALCO CO., LTD. @@ -12997,6 +13055,7 @@ 183d VIVOphone 0010 VoiceKey 1843 Vaisala +1849 ASRock Incorporation 1852 GYROCOM C&C Co., LTD 7922 Audiotrak DR.DAC2 DX 1854 Memory Devices Ltd. @@ -13021,6 +13080,7 @@ 0202 Nice 0300 Vega 0301 VeNice +1892 Vast Technologies, Inc. 1894 Topseed 5632 Atek Tote Remote 5641 TSAM-004 Presentation Remote @@ -13056,6 +13116,7 @@ 1000 DocuPen RC800 18e3 Fitipower Integrated Technology Inc 7102 Multi Card Reader (Internal) + 9101 All-in-1 Card Reader 9102 Multi Card Reader 18e8 Qcom 6196 RT2573 @@ -13174,9 +13235,10 @@ 19d2 ONDA Communication S.p.A. 0002 ET502HS/MT505UP ZTE MF632 0007 ZTE TU25 WiMAX Adapter [Beceem BCS200] - 0031 ZTE MF636 + 0031 ZTE MF110/MF636 0063 ZTE K3565-Z HSDPA 0064 ZTE MF627 AU + 0083 ZTE MF190 0103 ZTE MF112 2000 ZTE MF627/MF628/MF628+/MF636+ HSDPA/HSUPA fff2 Gobi Wireless Modem (QDL mode) @@ -13214,8 +13276,10 @@ 1a6f Sagem Orga GmbH 1a79 Bayer Health Care LLC 1a7b Lumberg Connect GmbH & Co. KG -1a7c Kingsis Peripherals - 0068 Evoluent VerticalMouse 3 +1a7c Evoluent + 0068 VerticalMouse 3 + 0168 VerticalMouse 3 Wireless + 0191 VerticalMouse 4 1a86 QinHeng Electronics 5523 CH341 in serial mode, usb to serial port converter 5584 CH341 in parallel mode, usb to printer port converter @@ -13225,6 +13289,9 @@ e008 HID-based USB-serial converter, full-speed, similar to HE2325U 1a89 Dynalith Systems Co., Ltd. 1a8b SGS Taiwan Ltd. +1a8d BandRich, Inc. + 1002 BandLuxe 3.5G HSDPA Adapter + 1009 BandLuxe 3.5G HSPA Adapter 1a90 Corsair Voyager GT 16GB 1a98 Leica Camera AG 1aa4 Data Drive Thru, Inc. @@ -13356,6 +13423,8 @@ 1b5a Chao Zhou Kai Yuan Electric Co., Ltd. 1b65 The Hong Kong Standards and Testing Centre Ltd. 1b72 ATERGI TECHNOLOGY CO., LTD. +1b73 Fresco Logic + 1000 xHC1 Controller 1b75 Ovislink Corp. 3072 AirLive WN-360USB adapter 1b76 Legend Silicon Corp. @@ -13371,6 +13440,7 @@ e386 DVB-T UB385-T [af9015] e39a DVB-T395U [af9015] e39b DVB-T395U [af9015] + e409 IT9137FN Dual DVB-T [KWorld UB499-2T] 1b86 Dongguan Guanshang Electronics Co., Ltd. 1b88 ShenMing Electron (Dong Guan) Co., Ltd. 1b8c Altium Limited @@ -13485,6 +13555,7 @@ 1101 DK DVB-T Dongle 1102 DK mini DVB-T Dongle 1103 DK 5217 DVB-T Dongle + 8202 DK DVBC/T DONGLE 1d1f Diostech Co., Ltd. 1d20 SAMTACK INC. 1d4d PEGATRON CORPORATION @@ -13500,6 +13571,11 @@ 0003 3.0 root hub 0100 PTP Gadget 0101 Audio Gadget + 0102 EEM Gadget + 0103 NCM (Ethernet) Gadget + 0104 Multifunction Composite Gadget + 0105 FunctionFS Gadget + 0200 Qemu Audio Device 1e0e Qualcomm / Option 1e10 Point Grey Research, Inc. 2004 Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon] @@ -13508,7 +13584,19 @@ 1e1f INVIA 1e29 Festo AG & Co. KG 0101 CPX Adapter - 0401 iL3-TP + 0102 CPX Adapter >=HW10.09 [CP2102] + 0401 iL3-TP [AT90USB646] + 0402 FTDI232 [EasyPort] + 0403 FTDI232 [EasyPort Mini] + 0404 FTDI232 [Netzteil-GL] + 0405 FTDI232 [MotorPrüfstand] + 0406 STM32F103 [EasyKit] + 0407 LPC2378 [Robotino] + 0408 LPC2378 [Robotino-Arm] + 0409 LPC2378 [Robotino-Arm Bootloader] + 040a LPC2378 [Robotino Bootloader] + 0501 CP2102 [CMSP] + 0601 CMMP-AS 1e41 Cleverscope 0001 CS328A PC Oscilloscope 1e54 TypeMatrix @@ -13553,7 +13641,7 @@ 3702 DWL-120 rev F 3703 AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886] 3704 AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887] - 3705 AirPlus G DWL-G120 Wireless Adapter(rev.C) + 3705 AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887] 3761 IEEE 802.11g USB2.0 Wireless Network Adapter-PN 3a00 DWL-AG132 [Atheros AR5523] 3a01 DWL-AG132 (no firmware) [Atheros AR5523] @@ -13682,6 +13770,10 @@ 2031 Network Blaster Wireless Adapter 500c DE5771 Modem Blaster 8001 Broadxent BritePort DSL Bridge 8010U +2184 GW Instek + 0005 GDS-3000 Oscilloscope + 0006 GDS-3000 Oscilloscope + 0011 AFG Function Generator (CDC) 21a1 Emotiv Systems Pty. Ltd. 0001 EPOC Consumer Headset Wireless Dongle 21d6 Agecodagis SARL @@ -13731,6 +13823,7 @@ 2a83 MSM6025 chipset flash 2ac1 MSM6100 chipset 2ac3 MSM6100 chipset flash + 2d78 XT300[SPICE] 3001 A835/E1000 GSM Phone (P2K) 3002 A835/E1000 GSM Phone (AT) 3801 C350L/C450 (P2K) @@ -14119,6 +14212,9 @@ 9394 Game Cube USB Memory Adaptor 64M 4752 Miditech 0011 Midistart-2 +4757 GW Instek + 2009 PEL-2000 Series Electronic Load (CDC) + 2010 PEL-2000 Series Electronic Load (CDC) 4766 Aceeca 0001 MEZ1000 RDA 4855 Memorex @@ -14243,6 +14339,8 @@ 7811 EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS] 8086 Intel Corp. 0001 AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter + 0044 CPU DRAM Controller + 0046 HD Graphics 0100 Personal Audio Player 3000 0101 Personal Audio Player 3000 0110 Easy PC Camera @@ -14270,6 +14368,7 @@ 1403 WiMAX Connection 2400m 1405 WiMAX Connection 2400m 1406 WiMAX Connection 2400m + 2448 82801 PCI Bridge 3100 PRO/DSL 3220 Modem - WAN 3101 PRO/DSL 3220 Modem 3240 AnyPoint® 3240 Modem - WAN @@ -14307,8 +14406,10 @@ 7715 MCS7715 Parallel and serial port adapter 7717 MCS7717 3-port hub with serial and parallel adapter 7720 MCS7720 Dual serial port adapter + 7730 MCS7730 10/100 Mbps Ethernet adapter 7780 MCS7780 4Mbps Fast IrDA Adapter 7830 MCS7830 10/100 Mbps Ethernet adapter + 7832 MCS7832 10/100 Mbps Ethernet adapter 7840 MCS7820/MCS7840 2/4 port serial adapter 99fa Grandtec 8988 V.cap Camera Device hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3ad7d26cfcb3844407d7fb3feb004b99a077eead
by git＠ipfire.org 10 Jan '11

10 Jan '11

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 3.x development tree". The branch, master has been updated via 3ad7d26cfcb3844407d7fb3feb004b99a077eead (commit) via 4f95e1d1fe5852bd56575660a5744bca2f78aae8 (commit) via a9e4b4a5cc7eb652ea90f39f6414c75b0a5b12fe (commit) via 6e36cac1f1298556d5f2a333a20e32a3df8cadf6 (commit) via 8f5513345750b18b3a01ea830abcfaf42bb18c3d (commit) via 89cb01d54f51b4da8e8f54475b9eafd013ad1e8d (commit) via 84eb2e511d6194b72436a67027b0a918c9b480f7 (commit) via cf37c8854f26d6cfadeb2da7c004ef14a12a193a (commit) via 1c895816a620bd9a6cb7e7e335baeb17f30363b0 (commit) via 7dff6d968c6a0835066c138c03114f84c4e622ec (commit) via 03a8a0399d9c60e04a44306e0c040b0124025985 (commit) via 270e6641f990d80c240cb63964cb23fd4a839259 (commit) via 7ae28d5c7e910bbbfb6bd837c5d23412e58095f2 (commit) via bcc40cd6bba1e2a98ccd352d75ecc17b522d9838 (commit) via 0b846e53baba7c816424ba81dc7dc8826603d039 (commit) via 790db92c25ad677927251ae2384ba5df863ee424 (commit) via 79be82dc8507ba6a0e79eb98c7f675e2db66a763 (commit) via 9af9967a6324c3a69fea10355cbda998ca1bc961 (commit) via 971d195a1e8f008ec884c6a12f9773b33f5e21eb (commit) via 69d5bd4e252eb78625254fe0f52619ff240e430c (commit) via a589147d7a39811c5edcbaed22ec63d8b11782ef (commit) via c180be295f82e09f9bc9f415f51d3ae48be5909e (commit) via c29940ef1c55845f9cec4cb3fbc035b1d17a577e (commit) via b797993ba67d1cdab24247b403df911a7193f255 (commit) via a3164301ded260c2b0640d5f57ccea8344bc1d04 (commit) via 93558e75a89be713056291eded4456937ffc6de6 (commit) via 0878cdd7c0296c3a46502e17c4eb1352ccd94dd9 (commit) via 7a13f44205f6dad31a651f40d2e2571a9b8e459a (commit) via 77eff67bbb2be58888036ce483d3cc02820ccf58 (commit) via 9a877d1e1d341c7f972d8e6cad3f585daffa8ff2 (commit) via 889b554e33923c701400af97e2e36ee3696b3990 (commit) via 16cc3e67627a9fe94f37b36388ce990738169792 (commit) via 3c5b07f28f9b1dde96115e957496cd4eab16857c (commit) via 55030fe960f177b293d1f08d67509d6fbad17623 (commit) via 9c8317e79600e7883ac361c7af62e659961d69ed (commit) via bda907d37876f11cccc3ae429c3a6f9ac995b633 (commit) via 083fdda9d3181cec95e63df8cfa454eda64f820e (commit) via e1cd4e4b9bfc2b475df4fe0732ffa060744676de (commit) from f309ab6dd8dbe6e1592db3f0d3a157fd1fc89dac (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 3ad7d26cfcb3844407d7fb3feb004b99a077eead Merge: 4f95e1d 89cb01d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 10 12:09:48 2011 +0100 Merge remote branch 'stevee/selinux' commit 4f95e1d1fe5852bd56575660a5744bca2f78aae8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 10 12:00:13 2011 +0100 libvirt: Requires libgcrypt-devel for build. commit a9e4b4a5cc7eb652ea90f39f6414c75b0a5b12fe Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 19:17:54 2011 +0100 libvirt: Enable support for selinux. Reference #85. commit 6e36cac1f1298556d5f2a333a20e32a3df8cadf6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 10 11:43:44 2011 +0100 libvirt: Add missing build dependencies. Conflicts: pkgs/core/libvirt/libvirt.nm commit 8f5513345750b18b3a01ea830abcfaf42bb18c3d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 10 11:39:34 2011 +0100 xen: Fix build with newer kernels. Squashed commit of the following: commit 0f45e52d39523040a3f4f1adcae1dfc6390d33fe Author: Ben Schweikert <trikolon(a)ipfire.org> Date: Sat Jan 8 15:50:46 2011 +0100 Xen: removed xen-detect package and xen-detect is now in xen-runtimes. commit 488b0676070270b6459050d35cb0efeeaff60935 Author: Ben Schweikert <trikolon(a)ipfire.org> Date: Sat Jan 8 15:37:04 2011 +0100 libvirt: fixed xen-tools dependencies. commit 4fe8b5bf1ef19165e9959aba8f2d7f80459d9195 Author: Ben Schweikert <trikolon(a)ipfire.org> Date: Sat Jan 8 15:32:35 2011 +0100 Xen: added extra package for xen-detect and fixed a error with \ WRITE definition. commit 89cb01d54f51b4da8e8f54475b9eafd013ad1e8d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 17:22:31 2011 +0100 xorg-x11-server: Enable support for selinux. Reference #85. commit 84eb2e511d6194b72436a67027b0a918c9b480f7 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 16:06:30 2011 +0100 glib2: Enable support for selinux. Reference #85. commit cf37c8854f26d6cfadeb2da7c004ef14a12a193a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 15:52:10 2011 +0100 joe: Enable support for selinux. Reference #85. commit 1c895816a620bd9a6cb7e7e335baeb17f30363b0 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 15:44:03 2011 +0100 net-snmp: Enable support for selinux. Reference #85. commit 7dff6d968c6a0835066c138c03114f84c4e622ec Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 15:25:09 2011 +0100 python-pyblock: Enable support for selinux. Referece #85. commit 03a8a0399d9c60e04a44306e0c040b0124025985 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 15:16:03 2011 +0100 passwd: Clean up NM add popt-devel as dependency. commit 270e6641f990d80c240cb63964cb23fd4a839259 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 15:08:02 2011 +0100 iptables: Enable support for selinux. Reference #85. commit 7ae28d5c7e910bbbfb6bd837c5d23412e58095f2 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 14:56:28 2011 +0100 sed: Enable support for selinux. Reference #85. commit bcc40cd6bba1e2a98ccd352d75ecc17b522d9838 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 14:39:45 2011 +0100 lsof: Enable support for selinux. Reference #85. commit 0b846e53baba7c816424ba81dc7dc8826603d039 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 14:36:15 2011 +0100 sudo: Enable support for selinux. Reference #85. commit 790db92c25ad677927251ae2384ba5df863ee424 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 14:17:43 2011 +0100 net-tools: Enable support for selinux. Reference #85. commit 79be82dc8507ba6a0e79eb98c7f675e2db66a763 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 13:43:54 2011 +0100 util-linux-ng: Enable suppor for selinux. Reference #85. commit 9af9967a6324c3a69fea10355cbda998ca1bc961 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 13:34:28 2011 +0100 procps: Enable support for selinux. Reference #85. commit 971d195a1e8f008ec884c6a12f9773b33f5e21eb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 13:29:22 2011 +0100 sysvinit: Enable support for selinux. Reference #85. commit 69d5bd4e252eb78625254fe0f52619ff240e430c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 13:22:22 2011 +0100 psmisc: Enable support for selinux. Reference #85. commit a589147d7a39811c5edcbaed22ec63d8b11782ef Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 13:19:45 2011 +0100 openssh: Enable support for selinux. Reference #85. commit c180be295f82e09f9bc9f415f51d3ae48be5909e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 13:11:42 2011 +0100 libuser: Enable support for selinux. Reference #85. commit c29940ef1c55845f9cec4cb3fbc035b1d17a577e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jan 8 13:08:32 2011 +0100 vim: Enable support for selinux. commit b797993ba67d1cdab24247b403df911a7193f255 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 16:50:39 2011 +0100 smartmontools: Add gcc-c++ as dependency. commit a3164301ded260c2b0640d5f57ccea8344bc1d04 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 16:38:16 2011 +0100 fuse: Enable support for selinux. Reference #85. commit 93558e75a89be713056291eded4456937ffc6de6 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 16:30:34 2011 +0100 lvm2: Activate support for selinux. Reference #85. commit 0878cdd7c0296c3a46502e17c4eb1352ccd94dd9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 16:26:32 2011 +0100 udev: Activate support for selinux. Reference #85. commit 7a13f44205f6dad31a651f40d2e2571a9b8e459a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 16:20:41 2011 +0100 logrotate: Activate support for selinux. Reference #85. commit 77eff67bbb2be58888036ce483d3cc02820ccf58 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 16:14:10 2011 +0100 tar: Activate support for selinux. Reference #85. commit 9a877d1e1d341c7f972d8e6cad3f585daffa8ff2 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 16:05:25 2011 +0100 smartmontools: Update to 5.40, activate support for selinux. Reference #85. commit 889b554e33923c701400af97e2e36ee3696b3990 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 15:57:27 2011 +0100 mesa: Activate support for selinux. Reference #85 commit 16cc3e67627a9fe94f37b36388ce990738169792 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 15:41:38 2011 +0100 pam: Activate support for selinux and audit. commit 3c5b07f28f9b1dde96115e957496cd4eab16857c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 15:34:51 2011 +0100 parted: Activate support for selinux. commit 55030fe960f177b293d1f08d67509d6fbad17623 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 13:19:25 2011 +0100 findutils: Add support for selinux. commit 9c8317e79600e7883ac361c7af62e659961d69ed Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 13:03:32 2011 +0100 e2fsprogs: Aktivate support for selinux. commit bda907d37876f11cccc3ae429c3a6f9ac995b633 Merge: 083fdda 4ea11fe Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 6 12:53:55 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into selinux commit 083fdda9d3181cec95e63df8cfa454eda64f820e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Dec 30 17:13:36 2010 +0100 dmraid: Enable support for selinux. commit e1cd4e4b9bfc2b475df4fe0732ffa060744676de Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Dec 30 16:59:58 2010 +0100 dbus: Enable support for selinux. ----------------------------------------------------------------------- Summary of changes: pkgs/core/dbus/dbus.nm | 6 +- pkgs/core/dmraid/dmraid.nm | 7 +- pkgs/core/e2fsprogs/e2fsprogs.nm | 5 +- pkgs/core/findutils/findutils.nm | 4 +- pkgs/core/fuse/fuse.nm | 2 + pkgs/core/glib2/glib2.nm | 4 +- pkgs/core/iptables/iptables.nm | 4 +- pkgs/core/joe/joe.nm | 4 +- pkgs/core/joe/patches/joe-3.4-selinux.patch | 103 ++++++++++++++++++++ pkgs/core/libuser/libuser.nm | 8 +- pkgs/core/libvirt/libvirt.nm | 11 ++- pkgs/core/logrotate/logrotate.nm | 6 +- pkgs/core/lsof/lsof.nm | 4 +- pkgs/core/lvm2/lvm2.nm | 4 +- pkgs/core/mesa/mesa.nm | 6 +- pkgs/core/net-snmp/net-snmp.nm | 2 +- pkgs/core/net-tools/config.make | 2 +- pkgs/core/net-tools/net-tools.nm | 4 +- pkgs/core/openssh/openssh.nm | 7 +- pkgs/core/pam/pam.nm | 25 ++--- pkgs/core/parted/parted.nm | 8 +- pkgs/core/passwd/passwd.nm | 16 +-- .../core/procps/patches/procps-3.2.8-selinux.patch | 96 ++++++++++++++++++ pkgs/core/procps/procps.nm | 4 +- pkgs/core/psmisc/psmisc.nm | 7 +- pkgs/core/python-pyblock/python-pyblock.nm | 7 +- pkgs/core/sed/sed.nm | 22 ++--- pkgs/core/smartmontools/smartmontools.nm | 7 +- pkgs/core/sudo/sudo.nm | 10 +- pkgs/core/sysvinit/sysvinit.nm | 4 +- pkgs/core/tar/tar.nm | 5 +- pkgs/core/udev/udev.nm | 7 +- pkgs/core/util-linux-ng/util-linux-ng.nm | 7 +- pkgs/core/vim/vim.nm | 8 +- pkgs/core/xen/patches/xen-WRITE.patch | 23 +++++ pkgs/core/xen/xen.nm | 7 +- pkgs/core/xorg-x11-server/xorg-x11-server.nm | 16 ++-- 37 files changed, 359 insertions(+), 113 deletions(-) create mode 100644 pkgs/core/joe/patches/joe-3.4-selinux.patch create mode 100644 pkgs/core/procps/patches/procps-3.2.8-selinux.patch create mode 100644 pkgs/core/xen/patches/xen-WRITE.patch Difference in files: diff --git a/pkgs/core/dbus/dbus.nm b/pkgs/core/dbus/dbus.nm index 1a070ea..0f85d40 100644 --- a/pkgs/core/dbus/dbus.nm +++ b/pkgs/core/dbus/dbus.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.freedesktop.org/software/dbus/ PKG_LICENSE = GPLv2+ AFL PKG_SUMMARY = D-BUS message bus. -PKG_BUILD_DEPS+= expat-devel +PKG_BUILD_DEPS+= audit-devel expat-devel libselinux-devel define PKG_DESCRIPTION D-BUS is a system for sending messages between applications. It is \ @@ -52,7 +52,9 @@ CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ --localstatedir=/var \ --libdir=/lib \ - --libexecdir=/lib + --libexecdir=/lib \ + --enable-libaudit \ + --enable-selinux=yes define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/usr/lib diff --git a/pkgs/core/dmraid/dmraid.nm b/pkgs/core/dmraid/dmraid.nm index 0c1d660..892955d 100644 --- a/pkgs/core/dmraid/dmraid.nm +++ b/pkgs/core/dmraid/dmraid.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = dmraid PKG_VER = 1.0.0.rc15 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Filesystems @@ -34,7 +34,7 @@ PKG_URL = http://people.redhat.com/heinzm/sw/dmraid PKG_LICENSE = GPLv2+ PKG_SUMMARY = Device-mapper RAID tool and library. -PKG_BUILD_DEPS+= libdevmapper-devel +PKG_BUILD_DEPS+= libdevmapper-devel libselinux-devel define PKG_DESCRIPTION DMRAID supports RAID device discovery, RAID set activation, creation, \ @@ -56,7 +56,8 @@ CONFIGURE_OPTIONS += \ --sbindir=/sbin \ --libdir=/lib \ --disable-static \ - --disable-static_link + --disable-static_link \ + --enable-libselinux define STAGE_BUILD_CMDS cd $(DIR_APP) && make -C lib libdmraid.so diff --git a/pkgs/core/e2fsprogs/e2fsprogs.nm b/pkgs/core/e2fsprogs/e2fsprogs.nm index 498a4f6..b33988a 100644 --- a/pkgs/core/e2fsprogs/e2fsprogs.nm +++ b/pkgs/core/e2fsprogs/e2fsprogs.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = e2fsprogs PKG_VER = 1.41.11 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Filesystems @@ -42,7 +42,8 @@ define PKG_DESCRIPTION and third extended (ext2/ext3) filesystems. endef -PKG_BUILD_DEPS+= libblkid-devel libuuid-devel pkg-config +PKG_BUILD_DEPS+= libblkid-devel libselinux-devel libsepol-devel libuuid-devel\ + pkg-config PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/findutils/findutils.nm b/pkgs/core/findutils/findutils.nm index d588f97..bfbd060 100644 --- a/pkgs/core/findutils/findutils.nm +++ b/pkgs/core/findutils/findutils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = findutils PKG_VER = 4.5.9 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Tools @@ -34,6 +34,8 @@ PKG_URL = http://www.gnu.org/software/findutils/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = The GNU versions of find utilities (find and xargs). +PKG_BUILD_DEPS+= libselinux-devel + define PKG_DESCRIPTION The findutils package contains programs which will help you locate \ files on your system. The find utility searches through a hierarchy \ diff --git a/pkgs/core/fuse/fuse.nm b/pkgs/core/fuse/fuse.nm index 2ae82e0..9237c2c 100644 --- a/pkgs/core/fuse/fuse.nm +++ b/pkgs/core/fuse/fuse.nm @@ -34,6 +34,8 @@ PKG_URL = http://fuse.sf.net/ PKG_LICENSE = GPL+ PKG_SUMMARY = File System in Userspace (FUSE) utilities. +PKG_BUILD_DEPS+= libselinux-devel + PKG_PACKAGES += $(PKG_NAME_REAL)-devel define PKG_DESCRIPTION diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/core/glib2/glib2.nm index 91f0e79..f22fa05 100644 --- a/pkgs/core/glib2/glib2.nm +++ b/pkgs/core/glib2/glib2.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = glib PKG_VER = 2.27.3 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,7 +34,7 @@ PKG_URL = http://www.gtk.org PKG_LICENSE = LGPLv2+ PKG_SUMMARY = A library of handy utility functions. -PKG_BUILD_DEPS+= gettext pcre-devel pkg-config zlib-devel +PKG_BUILD_DEPS+= gettext libselinux-devel pcre-devel pkg-config zlib-devel define PKG_DESCRIPTION GLib is the low-level core library that forms the basis \ diff --git a/pkgs/core/iptables/iptables.nm b/pkgs/core/iptables/iptables.nm index 4d98234..355bdcb 100644 --- a/pkgs/core/iptables/iptables.nm +++ b/pkgs/core/iptables/iptables.nm @@ -26,7 +26,9 @@ include $(PKGROOT)/Include PKG_NAME = iptables PKG_VER = 1.4.10 -PKG_REL = 0 +PKG_REL = 1 + +PKG_BUILD_DEPS+= libselinux-devel PKG_MAINTAINER = PKG_GROUP = Networking/Tools diff --git a/pkgs/core/joe/joe.nm b/pkgs/core/joe/joe.nm index d5366eb..970cd33 100644 --- a/pkgs/core/joe/joe.nm +++ b/pkgs/core/joe/joe.nm @@ -26,7 +26,9 @@ include $(PKGROOT)/Include PKG_NAME = joe PKG_VER = 3.7 -PKG_REL = 0 +PKG_REL = 1 + +PKG_BUILD_DEPS+= libselinux-devel PKG_MAINTAINER = PKG_GROUP = Applications/Editors diff --git a/pkgs/core/joe/patches/joe-3.4-selinux.patch b/pkgs/core/joe/patches/joe-3.4-selinux.patch new file mode 100644 index 0000000..e9a9709 --- /dev/null +++ b/pkgs/core/joe/patches/joe-3.4-selinux.patch @@ -0,0 +1,103 @@ +diff -up joe-3.7/configure.selinux joe-3.7/configure +--- joe-3.7/configure.selinux 2008-10-30 04:07:22.000000000 +0100 ++++ joe-3.7/configure 2009-02-02 11:13:50.000000000 +0100 +@@ -6531,7 +6531,7 @@ if test "$ac_cv_header_selinux_selinux_h + cat >>confdefs.h <<\_ACEOF + #define HAVE_SELINUX 1 + _ACEOF +- ++LIBS="$LIBS -lselinux" + fi + + # Checks for typedefs, structures, and compiler characteristics. +diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c +--- joe-3.7/selinux.c.selinux 2006-05-22 06:15:41.000000000 +0200 ++++ joe-3.7/selinux.c 2009-02-02 11:13:50.000000000 +0100 +@@ -4,7 +4,9 @@ + */ + #include "types.h" + +-#ifdef WITH_SELINUX ++#include "config.h" ++ ++#ifdef HAVE_SELINUX + #include <selinux/selinux.h> + static int selinux_enabled = -1; + #endif +@@ -13,7 +15,7 @@ int + copy_security_context(const char *from_file, const char *to_file) + { + int status = 0; +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + security_context_t from_context; + security_context_t to_context; + +@@ -38,9 +40,7 @@ copy_security_context(const char *from_f + } + + if (getfilecon(to_file, &to_context) < 0) { +- MSG_PUTS(_(joe_gettext(_("\nCould not get security context for ")))); +- msg_outtrans(to_file); +- msg_putchar('\n'); ++ error(0, errno, "Could not get security context for %s", to_file); + freecon(from_context); + return 1; + } +@@ -63,7 +63,7 @@ copy_security_context(const char *from_f + int + match_default_security_context(const char *from_file) + { +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + security_context_t scontext; + + if (selinux_enabled == -1) +@@ -102,7 +102,7 @@ match_default_security_context(const cha + int + reset_default_security_context() + { +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + if (selinux_enabled == -1) + selinux_enabled = (is_selinux_enabled() > 0); + +@@ -121,7 +121,7 @@ reset_default_security_context() + int + output_security_context(char *from_file) + { +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + security_context_t scontext; + + if (selinux_enabled == -1) +@@ -153,7 +153,7 @@ output_security_context(char *from_file) + + /* + Test program compile using the following command +- cc -o t t.c -DWITH_SELINUX -DTEST -lselinux ++ cc -o t t.c -DHAVE_SELINUX -DTEST -lselinux + */ + + #include <stdio.h> +diff -up joe-3.7/ufile.c.selinux joe-3.7/ufile.c +--- joe-3.7/ufile.c.selinux 2008-11-02 21:39:52.000000000 +0100 ++++ joe-3.7/ufile.c 2009-02-02 11:13:50.000000000 +0100 +@@ -15,7 +15,7 @@ + #endif + #endif + +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + int copy_security_context(const char *from_file, const char *to_file); + #endif + +@@ -157,7 +157,7 @@ static int cp(unsigned char *from, unsig + utime((char *)to, &utbuf); + #endif + +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + copy_security_context(from,to); + #endif + diff --git a/pkgs/core/libuser/libuser.nm b/pkgs/core/libuser/libuser.nm index fb6e34c..5363c6a 100644 --- a/pkgs/core/libuser/libuser.nm +++ b/pkgs/core/libuser/libuser.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = libuser PKG_VER = 0.56.9 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,7 +34,8 @@ PKG_URL = https://fedorahosted.org/libuser/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = A user and group account administration library. -PKG_BUILD_DEPS+= glib2-devel openldap-devel pkg-config popt-devel python-devel +PKG_BUILD_DEPS+= glib2-devel libselinux-devel openldap-devel pkg-config\ + popt-devel python-devel define PKG_DESCRIPTION The libuser library implements a standardized interface for \ @@ -48,7 +49,8 @@ PKG_PACKAGES += $(PKG_NAME)-devel CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ - --with-ldap + --with-ldap \ + --with-selinux define STAGE_PREPARE_CMDS # Little hack that we don't build documentation that requires sgml2html diff --git a/pkgs/core/libvirt/libvirt.nm b/pkgs/core/libvirt/libvirt.nm index b4196f4..d52cdf7 100644 --- a/pkgs/core/libvirt/libvirt.nm +++ b/pkgs/core/libvirt/libvirt.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = libvirt PKG_VER = 0.8.1 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/Virtualization @@ -35,8 +35,10 @@ PKG_LICENSE = LGPLv2.1+ PKG_SUMMARY = A library for controlling VMs. PKG_BUILD_DEPS+= avahi-devel libcurl-devel cyrus-sasl-devel gnutls-devel \ - libpciaccess-devel libssh2-devel libtool libxml2-devel lvm2 parted-devel \ - pkg-config readline-devel libudev-devel xen-tools + libgcrypt-devel libselinux-devel libpciaccess-devel libssh2-devel \ + libtool libxml2-devel lvm2-devel lvm2 parted-devel perl-core pkg-config \ + readline-devel libudev-devel xen-devel + PKG_DEPS += lvm2 define PKG_DESCRIPTION @@ -64,4 +66,5 @@ CONFIGURE_OPTIONS += \ --with-storage-disk \ --with-avahi \ --with-udev \ - --with-libvirtd + --with-libvirtd \ + --with-selinux diff --git a/pkgs/core/logrotate/logrotate.nm b/pkgs/core/logrotate/logrotate.nm index 7242dfa..ebc7406 100644 --- a/pkgs/core/logrotate/logrotate.nm +++ b/pkgs/core/logrotate/logrotate.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = logrotate PKG_VER = 3.7.7 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,7 +34,7 @@ PKG_URL = https://fedorahosted.org/releases/l/o/logrotate/ PKG_LICENSE = GPL+ PKG_SUMMARY = Rotates, compresses, removes and mails system log files. -PKG_DEPS += coreutils gzip popt which +PKG_BUILD_DEPS+= coreutils gzip libselinux-devel popt-devel which define PKG_DESCRIPTION The logrotate utility is designed to simplify the administration of \ @@ -47,7 +47,7 @@ endef PKG_TARBALL = $(THISAPP).tar.gz define STAGE_BUILD - cd $(DIR_APP) && make RPM_OPT_FLAGS="$(CFLAGS)" $(PARALLELISMFLAGS) + cd $(DIR_APP) && make RPM_OPT_FLAGS="$(CFLAGS)" WITH_SELINUX=yes $(PARALLELISMFLAGS) endef define STAGE_TEST diff --git a/pkgs/core/lsof/lsof.nm b/pkgs/core/lsof/lsof.nm index f2a1f14..0b41797 100644 --- a/pkgs/core/lsof/lsof.nm +++ b/pkgs/core/lsof/lsof.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = lsof PKG_VER = 4.82 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Development/Debuggers @@ -34,6 +34,8 @@ PKG_URL = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof PKG_LICENSE = zlib PKG_SUMMARY = A utility which lists open files on a Linux/UNIX system. +PKG_BUILD_DEPS+= libselinux-devel + define PKG_DESCRIPTION Lsof stands for LiSt Open Files, and it does just that: \ it lists information about files that are open by the \ diff --git a/pkgs/core/lvm2/lvm2.nm b/pkgs/core/lvm2/lvm2.nm index db8ca72..67adadf 100644 --- a/pkgs/core/lvm2/lvm2.nm +++ b/pkgs/core/lvm2/lvm2.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = LVM2 PKG_VER = 2.02.54 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,7 +34,7 @@ PKG_URL = http://sources.redhat.com/lvm2/ PKG_LICENSE = GPLv2 PKG_SUMMARY = Userland logical volume management tools. -PKG_BUILD_DEPS+= pkg-config ncurses-devel readline-devel +PKG_BUILD_DEPS+= libselinux-devel pkg-config ncurses-devel readline-devel define PKG_DESCRIPTION LVM2 includes all of the support for handling read/write operations on \ diff --git a/pkgs/core/mesa/mesa.nm b/pkgs/core/mesa/mesa.nm index fcb19e0..0f3be09 100644 --- a/pkgs/core/mesa/mesa.nm +++ b/pkgs/core/mesa/mesa.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = mesa PKG_VER = 7.8.2 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -34,8 +34,8 @@ PKG_URL = http://www.mesa3d.org PKG_LICENSE = MIT PKG_SUMMARY = Mesa graphics libraries. -PKG_BUILD_DEPS+= pkg-config libX11-devel libXdamage-devel libXext-devel\ - libXxf86vm-devel libdrm-devel libxcb-devel +PKG_BUILD_DEPS+= expat-devel pkg-config libX11-devel libXdamage-devel libXext-devel\ + libXxf86vm-devel libdrm-devel libselinux-devel libxcb-devel PKG_PACKAGES += $(PKG_NAME)-devel diff --git a/pkgs/core/net-snmp/net-snmp.nm b/pkgs/core/net-snmp/net-snmp.nm index 251861c..b263321 100644 --- a/pkgs/core/net-snmp/net-snmp.nm +++ b/pkgs/core/net-snmp/net-snmp.nm @@ -34,7 +34,7 @@ PKG_URL = http://net-snmp.sourceforge.net PKG_LICENSE = BSD PKG_SUMMARY = Simple Network Management Protocol Daemon. -PKG_BUILD_DEPS+= perl +PKG_BUILD_DEPS+= libselinux-devel perl define PKG_DESCRIPTION Simple Network Management Protocol (SNMP) is a widely used protocol \ diff --git a/pkgs/core/net-tools/config.make b/pkgs/core/net-tools/config.make index 68fb178..e7cfc99 100644 --- a/pkgs/core/net-tools/config.make +++ b/pkgs/core/net-tools/config.make @@ -34,4 +34,4 @@ HAVE_HWIB=1 HAVE_FW_MASQUERADE=1 HAVE_IP_TOOLS=1 HAVE_MII=1 -HAVE_SELINUX=0 +HAVE_SELINUX=1 diff --git a/pkgs/core/net-tools/net-tools.nm b/pkgs/core/net-tools/net-tools.nm index 0b915a7..ec56935 100644 --- a/pkgs/core/net-tools/net-tools.nm +++ b/pkgs/core/net-tools/net-tools.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = net-tools PKG_VER = 1.60 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Sytem/Base @@ -34,7 +34,7 @@ PKG_URL = http://net-tools.berlios.de/ PKG_LICENSE = GPL+ PKG_SUMMARY = Basic networking tools. -PKG_BUILD_DEPS+= gettext +PKG_BUILD_DEPS+= gettext libselinux-devel define PKG_DESCRIPTION The net-tools package contains basic networking tools, \ diff --git a/pkgs/core/openssh/openssh.nm b/pkgs/core/openssh/openssh.nm index 9acc2d9..046d961 100644 --- a/pkgs/core/openssh/openssh.nm +++ b/pkgs/core/openssh/openssh.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = openssh PKG_VER = 5.4p1 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUP = Application/Internet @@ -34,7 +34,7 @@ PKG_URL = http://www.openssh.com/portable.html PKG_LICENSE = MIT PKG_SUMMARY = An open source implementation of SSH protocol versions 1 and 2. -PKG_BUILD_DEPS+= openssl-devel pam-devel zlib-devel +PKG_BUILD_DEPS+= libselinux-devel openssl-devel pam-devel zlib-devel PKG_DEPS-openssh = openssh-clients=$(THISVER) openssh-server=$(THISVER) define PKG_DESCRIPTION @@ -78,7 +78,8 @@ CONFIGURE_OPTIONS += \ --libexecdir=/usr/lib/openssh \ --with-md5-passwords \ --with-privsep-path=/var/lib/sshd \ - --with-pam + --with-pam \ + --with-selinux define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/etc/ssh diff --git a/pkgs/core/pam/pam.nm b/pkgs/core/pam/pam.nm index a3df9b2..99e4bf9 100644 --- a/pkgs/core/pam/pam.nm +++ b/pkgs/core/pam/pam.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = Linux-PAM PKG_VER = 1.1.0 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,7 +34,7 @@ PKG_URL = http://www.us.kernel.org/pub/linux/libs/pam/index.html PKG_LICENSE = BSD and GPLv2+ and BSD with advertising PKG_SUMMARY = An extensible library which provides authentication for applications. -PKG_BUILD_DEPS+= bison cracklib-devel flex +PKG_BUILD_DEPS+= audit-devel bison cracklib-devel flex libselinux-devel define PKG_DESCRIPTION PAM (Pluggable Authentication Modules) is a system security tool that \ @@ -46,21 +46,14 @@ PKG_TARBALL = $(THISAPP).tar.bz2 PKG_PACKAGES += $(PKG_NAME_REAL)-devel -define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --libdir=/lib \ - --sbindir=/lib/security \ - --enable-securedir=/lib/security \ - --docdir=/usr/share/doc/Linux-PAM-$(PKG_VER) \ - --enable-read-both-confs - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - -define STAGE_INSTALL - cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) +CONFIGURE_OPTIONS += \ + --libdir=/lib \ + --sbindir=/lib/security \ + --enable-securedir=/lib/security \ + --docdir=/usr/share/doc/Linux-PAM-$(PKG_VER) \ + --enable-read-both-confs +define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/sbin chmod -v 4755 $(BUILDROOT)/lib/security/unix_chkpwd mv -v $(BUILDROOT)/lib/security/pam_tally $(BUILDROOT)/sbin diff --git a/pkgs/core/parted/parted.nm b/pkgs/core/parted/parted.nm index 73a93e9..75ef2d6 100644 --- a/pkgs/core/parted/parted.nm +++ b/pkgs/core/parted/parted.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = parted PKG_VER = 2.1 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -34,7 +34,8 @@ PKG_URL = http://www.gnu.org/software/parted PKG_LICENSE = GPLv3+ PKG_SUMMARY = The GNU disk partition manipulation program. -PKG_BUILD_DEPS+= libdevmapper-devel libuuid-devel readline-devel +PKG_BUILD_DEPS+= libdevmapper-devel libselinux-devel libuuid-devel\ + readline-devel define PKG_DESCRIPTION The GNU Parted program allows you to create, destroy, resize, move, \ @@ -48,7 +49,8 @@ PKG_TARBALL = $(THISAPP).tar.gz PKG_PACKAGES += $(PKG_NAME)-devel CONFIGURE_OPTIONS += \ - --libdir=/lib + --libdir=/lib \ + --enable-selinux define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/usr/lib diff --git a/pkgs/core/passwd/passwd.nm b/pkgs/core/passwd/passwd.nm index a6a2919..a59d82e 100644 --- a/pkgs/core/passwd/passwd.nm +++ b/pkgs/core/passwd/passwd.nm @@ -35,7 +35,7 @@ PKG_LICENSE = BSD PKG_SUMMARY = An utility for setting or changing passwords using PAM. PKG_BUILD_DEPS+= audit-devel glib2-devel libuser-devel pam-devel pkg-config \ - libselinux-devel + libselinux-devel popt-devel define PKG_DESCRIPTION This package contains a system utility (passwd) which sets \ @@ -45,13 +45,9 @@ endef PKG_TARBALL = $(THISAPP).tar.bz2 -define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --with-selinux \ - --with-audit \ - --disable-static +CONFIGURE_OPTIONS +=\ + --with-selinux \ + --with-audit \ + --disable-static - cd $(DIR_APP) && make DEBUG= RPM_OPT_FLAGS="$(CFLAGS)" $(PARALLELISMFLAGS) -endef +STAGE_BUILD_TARGETS = DEBUG= RPM_OPT_FLAGS="$(CFLAGS)" diff --git a/pkgs/core/procps/patches/procps-3.2.8-selinux.patch b/pkgs/core/procps/patches/procps-3.2.8-selinux.patch new file mode 100644 index 0000000..a8c1f74 --- /dev/null +++ b/pkgs/core/procps/patches/procps-3.2.8-selinux.patch @@ -0,0 +1,96 @@ +diff --git a/Makefile b/Makefile +index 09fb3ed..4d05900 100644 +--- a/Makefile ++++ b/Makefile +@@ -73,12 +73,12 @@ CURSES := -lncurses + # Something like this is probably needed to make the SE Linux + # library loading not conflict with embedded systems stuff. + # +-#ifeq ($(SHARED),1) +-#ldl := -ldl +-#LIBTYPE := -DSHAREDLIB +-#else +-#LIBTYPE := -DSTATICLIB +-#endif ++ifeq ($(SHARED),1) ++ldl := -ldl ++LIBTYPE := -DSHAREDLIB ++else ++LIBTYPE := -DSTATICLIB ++endif + + # Preprocessor flags. + PKG_CPPFLAGS := -D_GNU_SOURCE -I proc +@@ -103,7 +103,7 @@ PKG_CFLAGS := -fno-common -ffast-math \ + # Note that some stuff below is conditional on CFLAGS containing + # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.) + CFLAGS := -O2 -s +-ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) ++ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE) + + PKG_LDFLAGS := -Wl,-warn-common + LDFLAGS := +diff --git a/ps/output.c b/ps/output.c +index 87bf9de..edbb4cb 100644 +--- a/ps/output.c ++++ b/ps/output.c +@@ -1099,7 +1099,7 @@ static int pr_sgi_p(char *restrict const outbuf, const proc_t *restrict const pp + return snprintf(outbuf, COLWID, "*"); + } + +- ++#ifdef STATICLIB + /****************** FLASK & seLinux security stuff **********************/ + // move the bulk of this to libproc sometime + +@@ -1131,7 +1131,7 @@ fail: + return 1; + } + +-#if 0 ++#else + // This needs more study, considering: + // 1. the static linking option (maybe disable this in that case) + // 2. the -z and -Z option issue +diff --git a/ps/parser.c b/ps/parser.c +index 5ad9035..2659d4d 100644 +--- a/ps/parser.c ++++ b/ps/parser.c +@@ -231,7 +231,7 @@ static const char *parse_sysv_option(void){ + // In the meantime, please do not add to it. The list is + // intended to ONLY contain flags defined by the POSIX and UNIX + // standards published by The Open Group, IEEE, and ISO. +- if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX ++ if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX + + switch(*flagptr){ + case 'A': +diff --git a/ps/ps.1 b/ps/ps.1 +index 64953d5..aab2584 100644 +--- a/ps/ps.1 ++++ b/ps/ps.1 +@@ -450,6 +450,9 @@ display virtual memory format + Do not show flags; show rss in place of addr. + This option can only be used with \fB\-l\fR. + ++.opt \-Z ++display security context format (SELinux, etc.) ++ + .opt \-\-format \ format + user\-defined format. Identical to \fB\-o\fR and \fBo\fR. + +diff --git a/w.c b/w.c +index 1b2a0fc..207a8a1 100644 +--- a/w.c ++++ b/w.c +@@ -163,6 +163,10 @@ static const proc_t *getproc(const utmp_t *restrict const u, const char *restric + if(best && tmp->start_time <= best->start_time) continue; + best = tmp; + } ++ /* It is there but SELinux wouldn't allow us to know the detail. Really ++ w should just be given rights */ ++ if(!kill(u->ut_pid, 0) || errno != ESRCH) ++ *found_utpid = 1; + return best ? best : secondbest; + } + diff --git a/pkgs/core/procps/procps.nm b/pkgs/core/procps/procps.nm index 4e838da..19533fd 100644 --- a/pkgs/core/procps/procps.nm +++ b/pkgs/core/procps/procps.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = procps PKG_VER = 3.2.8 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -34,7 +34,7 @@ PKG_URL = http://procps.sourceforge.net/ PKG_LICENSE = GPLv2+ and LGPLv2+ PKG_SUMMARY = System and process monitoring utilities. -PKG_BUILD_DEPS+= ncurses-devel +PKG_BUILD_DEPS+= libselinux-devel ncurses-devel define PKG_DESCRIPTION The procps package contains a set of system utilities that provide \ diff --git a/pkgs/core/psmisc/psmisc.nm b/pkgs/core/psmisc/psmisc.nm index d54ed04..4f1a602 100644 --- a/pkgs/core/psmisc/psmisc.nm +++ b/pkgs/core/psmisc/psmisc.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = psmisc PKG_VER = 22.10 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -34,7 +34,7 @@ PKG_URL = http://sourceforge.net/projects/psmisc PKG_LICENSE = GPLv2+ PKG_SUMMARY = Utilities for managing processes on your system. -PKG_BUILD_DEPS+= ncurses-devel +PKG_BUILD_DEPS+= libselinux-devel ncurses-devel define PKG_DESCRIPTION The psmisc package contains utilities for managing processes on your \ @@ -47,3 +47,6 @@ define PKG_DESCRIPTION endef PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --enable-selinux diff --git a/pkgs/core/python-pyblock/python-pyblock.nm b/pkgs/core/python-pyblock/python-pyblock.nm index 4c17526..6e7824e 100644 --- a/pkgs/core/python-pyblock/python-pyblock.nm +++ b/pkgs/core/python-pyblock/python-pyblock.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = pyblock PKG_VER = 0.46 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,7 +34,8 @@ PKG_URL = http://git.fedorahosted.org/git/?p=pyblock.git;a=summary PKG_LICENSE = GPLv2 or GPLv3 PKG_SUMMARY = Python modules for dealing with block devices. -PKG_BUILD_DEPS+= dmraid-devel libdevmapper-devel python-devel python-parted +PKG_BUILD_DEPS+= dmraid-devel libdevmapper-devel libselinux-devel python-devel\ + python-parted define PKG_DESCRIPTION The pyblock contains Python modules for dealing with block devices. @@ -47,7 +48,7 @@ define STAGE_PREPARE_CMDS endef define STAGE_BUILD - cd $(DIR_APP) && make USESELINUX=0 + cd $(DIR_APP) && make USESELINUX=1 endef define STAGE_INSTALL diff --git a/pkgs/core/sed/sed.nm b/pkgs/core/sed/sed.nm index 0f0af4c..6b3261c 100644 --- a/pkgs/core/sed/sed.nm +++ b/pkgs/core/sed/sed.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = sed PKG_VER = 4.1.5 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/Text @@ -34,6 +34,8 @@ PKG_URL = http://sed.sourceforge.net/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = A GNU stream text editor. +PKG_BUILD_DEPS+= libselinux-devel + define PKG_DESCRIPTION The sed (Stream EDitor) editor is a stream or batch (non-interactive) \ editor. Sed takes text as input, performs an operation or set of \ @@ -44,20 +46,10 @@ endef PKG_TARBALL = $(THISAPP).tar.gz -############################################################################### -# Installation Details -############################################################################### - -define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --bindir=/bin \ - --without-included-regex \ - --mandir=/usr/share/man - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef +CONFIGURE_OPTIONS += \ + --bindir=/bin \ + --without-included-regex \ + --mandir=/usr/share/man define STAGE_TEST cd $(DIR_APP) && make check diff --git a/pkgs/core/smartmontools/smartmontools.nm b/pkgs/core/smartmontools/smartmontools.nm index 91b8a4f..4828494 100644 --- a/pkgs/core/smartmontools/smartmontools.nm +++ b/pkgs/core/smartmontools/smartmontools.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = smartmontools -PKG_VER = 5.37 +PKG_VER = 5.40 PKG_REL = 0 PKG_MAINTAINER = @@ -34,6 +34,8 @@ PKG_URL = http://flex.sourceforge.net/ PKG_LICENSE = GPLv2 PKG_SUMMARY = A set of tools that watches HDD S.M.A.R.T status. +PKG_BUILD_DEPS+= gcc-c++ libselinux-devel + define PKG_DESCRIPTION The smartmontools package contains two utility programs (smartctl \ and smartd) to control and monitor storage systems using the \ @@ -47,7 +49,8 @@ PKG_TARBALL = $(THISAPP).tar.gz CONFIGURE_OPTIONS += \ --mandir=/usr/share/man \ - --sysconfdir=/etc + --sysconfdir=/etc \ + --with-selinux define STAGE_INSTALL_CMDS rm -rvf $(BUILDROOT)/etc/rc.d diff --git a/pkgs/core/sudo/sudo.nm b/pkgs/core/sudo/sudo.nm index 1f90803..679dae3 100644 --- a/pkgs/core/sudo/sudo.nm +++ b/pkgs/core/sudo/sudo.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = sudo PKG_VER = 1.7.4p3 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -34,8 +34,8 @@ PKG_URL = http://www.sudo.ws/sudo/download.html PKG_LICENSE = BSD PKG_SUMMARY = Allows restricted root access for specified users. -PKG_BUILD_DEPS+= cyrus-sasl-devel openldap-devel pam-devel -PKG_DEPS += vim +PKG_BUILD_DEPS+= audit-devel cyrus-sasl-devel libselinux-devel openldap-devel\ + pam-devel define PKG_DESCRIPTION Sudo (superuser do) allows a system administrator to give certain \ @@ -62,7 +62,9 @@ CONFIGURE_OPTIONS += \ --with-ignore-dot \ --with-tty-tickets \ --with-ldap \ - --with-passprompt="[sudo] password for %p: " + --with-passprompt="[sudo] password for %p: " \ + --with-selinux \ + --with-linux-audit define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/etc diff --git a/pkgs/core/sysvinit/sysvinit.nm b/pkgs/core/sysvinit/sysvinit.nm index 3f6b7b7..87ddd70 100644 --- a/pkgs/core/sysvinit/sysvinit.nm +++ b/pkgs/core/sysvinit/sysvinit.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = sysvinit PKG_VER = 2.86 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,6 +34,8 @@ PKG_URL = https://alioth.debian.org/projects/pkg-sysvinit/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = Programs which control basic system processes. +PKG_BUILD_DEPS+= libselinux-devel + define PKG_DESCRIPTION The sysvinit package contains a group of processes that control \ the very basic functions of your system. diff --git a/pkgs/core/tar/tar.nm b/pkgs/core/tar/tar.nm index 853a223..c1a3b27 100644 --- a/pkgs/core/tar/tar.nm +++ b/pkgs/core/tar/tar.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = tar PKG_VER = 1.23 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUP = System/Packaging @@ -52,7 +52,8 @@ CONFIGURE_ENVIRONMENT = CC="gcc -std=gnu99 -fgnu89-inline" CONFIGURE_OPTIONS += \ --bindir=/bin \ - --libexecdir=/usr/sbin + --libexecdir=/usr/sbin \ + --enable-selinux define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -i /SIGPIPE/d src/tar.c diff --git a/pkgs/core/udev/udev.nm b/pkgs/core/udev/udev.nm index 0f42999..1026c77 100644 --- a/pkgs/core/udev/udev.nm +++ b/pkgs/core/udev/udev.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = udev PKG_VER = 160 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,8 +34,8 @@ PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = A userspace implementation of devfs. -PKG_BUILD_DEPS+= glib2-devel gperf kbd libacl-devel libuuid-devel \ - libusb-compat-devel pciutils pkg-config usbutils +PKG_BUILD_DEPS+= glib2-devel gperf kbd libacl-devel libselinux-devel\ + libuuid-devel libusb-compat-devel pciutils pkg-config usbutils define PKG_DESCRIPTION The udev package contains an implementation of devfs in userspace using \ @@ -52,6 +52,7 @@ CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ --libexecdir=/lib/udev \ --with-rootlibdir=/lib \ + --with-selinux \ --disable-introspection define STAGE_INSTALL_CMDS diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/core/util-linux-ng/util-linux-ng.nm index 457b3e2..7ae6390 100644 --- a/pkgs/core/util-linux-ng/util-linux-ng.nm +++ b/pkgs/core/util-linux-ng/util-linux-ng.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = util-linux-ng PKG_VER = 2.18 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,7 +34,8 @@ PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng PKG_LICENSE = GPLv2 and GPLv2+ and BSD with advertising and Public Domain PKG_SUMMARY = A collection of basic system utilities. -PKG_BUILD_DEPS+= gettext libcap-devel ncurses-devel pam-devel zlib-devel +PKG_BUILD_DEPS+= audit-devel gettext libcap-devel libselinux-devel ncurses-devel\ + pam-devel zlib-devel define PKG_DESCRIPTION The util-linux-ng package contains a large variety of low-level system \ @@ -120,6 +121,8 @@ CONFIGURE_OPTIONS += \ --enable-login-utils \ --enable-partx \ --enable-write \ + --with-selinux \ + --with-audit \ --disable-makeinstall-chown \ --disable-static diff --git a/pkgs/core/vim/vim.nm b/pkgs/core/vim/vim.nm index 8ef7197..bb2f41d 100644 --- a/pkgs/core/vim/vim.nm +++ b/pkgs/core/vim/vim.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = vim PKG_VER = 7.3 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/Editors @@ -34,7 +34,7 @@ PKG_URL = http://www.vim.org PKG_LICENSE = PublicDomain/Charityware PKG_SUMMARY = Very feature- and powerful editor. -PKG_BUILD_DEPS+= libacl-devel ncurses-devel +PKG_BUILD_DEPS+= libacl-devel libselinux-devel ncurses-devel define PKG_DESCRIPTION Vim is a highly configurable text editor built to enable efficient \ @@ -46,7 +46,9 @@ PKG_TARBALL = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(PKG_NAME)73 -CONFIGURE_OPTIONS += --enable-multibyte +CONFIGURE_OPTIONS += \ + --enable-multibyte \ + --enable-selinux define STAGE_PREPARE_CMDS cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h diff --git a/pkgs/core/xen/patches/xen-WRITE.patch b/pkgs/core/xen/patches/xen-WRITE.patch new file mode 100644 index 0000000..eb4f062 --- /dev/null +++ b/pkgs/core/xen/patches/xen-WRITE.patch @@ -0,0 +1,23 @@ +diff -r d70d7c3311c4 -r 0236d8adb081 tools/blktap/drivers/blk_linux.c +--- xen-4.0.1/tools/blktap/drivers/blk_linux.c Tue Dec 14 17:10:49 2010 +0000 ++++ xen-4.0.1/tools/blktap/drivers/blk_linux.c Thu Dec 16 09:33:54 2010 +0000 +@@ -1,6 +1,6 @@ + #include <inttypes.h> + #include <sys/ioctl.h> +-#include <linux/fs.h> ++#include <sys/mount.h> + #include "tapdisk.h" + #include "blk.h" + +diff -r d70d7c3311c4 -r 0236d8adb081 tools/blktap2/drivers/blk_linux.c +--- xen-4.0.1/tools/blktap2/drivers/blk_linux.c Tue Dec 14 17:10:49 2010 +0000 ++++ xen-4.0.1/tools/blktap2/drivers/blk_linux.c Thu Dec 16 09:33:54 2010 +0000 +@@ -1,7 +1,7 @@ + #include <inttypes.h> ++#include <errno.h> + #include <sys/ioctl.h> +-#include <linux/fs.h> +-#include <linux/errno.h> ++#include <sys/mount.h> + #include "tapdisk.h" + #include "blk.h" diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm index 2848452..1c71ce3 100644 --- a/pkgs/core/xen/xen.nm +++ b/pkgs/core/xen/xen.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = xen PKG_VER = 4.0.1 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = Ben Schweikert <ben.schweikert(a)ipfire.org> PKG_GROUP = Applications/Virtualization @@ -40,8 +40,9 @@ define PKG_DESCRIPTION feature set for virtualization. endef -PKG_BUILD_DEPS+= gettext-devel libuuid-devel openssl-devel python python-devel \ - sdl-devel xorg-x11-proto-devel zlib-devel +PKG_BUILD_DEPS+= gettext-devel kernel-headers libuuid-devel ncurses-devel \ + openssl-devel python python-devel sdl-devel xorg-x11-proto-devel \ + zlib-devel PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/xorg-x11-server/xorg-x11-server.nm b/pkgs/core/xorg-x11-server/xorg-x11-server.nm index a4cac9c..631c433 100644 --- a/pkgs/core/xorg-x11-server/xorg-x11-server.nm +++ b/pkgs/core/xorg-x11-server/xorg-x11-server.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = xorg-x11-server PKG_VER = 1.8.2 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Server @@ -34,12 +34,13 @@ PKG_URL = http://www.x.org PKG_LICENSE = MIT PKG_SUMMARY = X.Org X11 X server. -PKG_BUILD_DEPS+= autoconf automake libcap libX11-devel libXau-devel libXdmcp-devel\ - libXext-devel libXfixes-devel libXfont-devel libXmu-devel libXrender-devel\ - libXres-devel libXt-devel libdrm-devel libfontenc-devel libpciaccess-devel\ - libtool libudev-devel libxcb-devel libxkbfile-devel mesa-devel pixman-devel\ - pkg-config xorg-x11-font-utils-devel xorg-x11-util-macros xorg-x11-proto-devel\ - xorg-x11-xtrans-devel +PKG_BUILD_DEPS+= audit-devel autoconf automake libcap libX11-devel libXau-devel \ + libXdmcp-devel libXext-devel libXfixes-devel libXfont-devel libXmu-devel \ + libXrender-devel libXres-devel libXt-devel libdrm-devel libfontenc-devel \ + libpciaccess-devel libselinux-devel libtool libudev-devel libxcb-devel \ + libxkbfile-devel mesa-devel pixman-devel pkg-config xorg-x11-font-utils-devel \ + xorg-x11-util-macros xorg-x11-proto-devel xorg-x11-xtrans-devel + PKG_DEPS += mesa pixman udev xkeyboard-config xorg-x11-fonts xorg-x11-font-utils \ xorg-x11-xkb-utils @@ -72,6 +73,7 @@ CONFIGURE_OPTIONS += \ --disable-xephyr \ --with-pic \ --enable-maintainer-mode \ + --enable-xselinux \ --with-int10=x86emu \ --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ --with-module-dir=/usr/lib/xorg/modules \ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f309ab6dd8dbe6e1592db3f0d3a157fd1fc89dac
by git＠ipfire.org 10 Jan '11

10 Jan '11

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 3.x development tree". The branch, master has been updated via f309ab6dd8dbe6e1592db3f0d3a157fd1fc89dac (commit) from fbcf3f8272c2553155346d4da05e641cec0d2107 (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 f309ab6dd8dbe6e1592db3f0d3a157fd1fc89dac Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 10 11:30:22 2011 +0100 ccache: Update to 3.1.4. Closes #122. ----------------------------------------------------------------------- Summary of changes: pkgs/core/ccache/ccache.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm index a0cfdcd..3c55710 100644 --- a/pkgs/core/ccache/ccache.nm +++ b/pkgs/core/ccache/ccache.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = ccache -PKG_VER = 3.1.3 +PKG_VER = 3.1.4 PKG_REL = 1 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 42d9192e0cc8f7544016af09c2277853fc3d884c
by git＠ipfire.org 09 Jan '11

09 Jan '11

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 42d9192e0cc8f7544016af09c2277853fc3d884c (commit) from c2cc3cf1b990cb84e0bc15ae1fd45d4786b0b6da (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 42d9192e0cc8f7544016af09c2277853fc3d884c Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Jan 9 13:08:50 2011 +0100 Fixed snort display bugs, 0000745, 0000751. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ids.cgi | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) Difference in files: diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index a4faf8d..8c219ae 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -278,7 +278,8 @@ 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 'nothing' ) || + ($snortsettings{'RULESTYPE'} eq 'community' )); &General::writehash("${General::swroot}/snort/settings", \%snortsettings); if ($snortsettings{'ENABLE_SNORT'} eq 'on') @@ -537,10 +538,8 @@ print <<END <td width='30%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' /> END ; - -if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} ) { - $snortsettings{'INSTALLDATE'} = `/bin/date +'%Y-%m-%d'`; - &General::writehash("${General::swroot}/snort/settings", \%snortsettings); +if ( -e "/var/tmp/snortrules.tar.gz"){ + $snortsettings{'INSTALLDATE'} = `ls -la /var/tmp/snortrules.tar.gz | cut -d" " -f6-8`; } print " $Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>"; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-rc1, created. c2cc3cf1b990cb84e0bc15ae1fd45d4786b0b6da
by git＠ipfire.org 08 Jan '11

08 Jan '11

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.9-rc1 has been created at c2cc3cf1b990cb84e0bc15ae1fd45d4786b0b6da (commit) - Log ----------------------------------------------------------------- commit c2cc3cf1b990cb84e0bc15ae1fd45d4786b0b6da Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 8 14:07:19 2011 +0100 Set version to 2.9rc1. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c2cc3cf1b990cb84e0bc15ae1fd45d4786b0b6da
by git＠ipfire.org 08 Jan '11

08 Jan '11

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 c2cc3cf1b990cb84e0bc15ae1fd45d4786b0b6da (commit) from ec8d7a31d6738315f29d48fc0b994ea97c9e5232 (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 c2cc3cf1b990cb84e0bc15ae1fd45d4786b0b6da Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 8 14:07:19 2011 +0100 Set version to 2.9rc1. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- src/scripts/backupiso | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index fa31d97..854f4a2 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.9beta3" # Version number +VERSION="2.9rc1" # Version number CORE="43" # Core Level (Filename) PAKFIRE_CORE="43" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch diff --git a/src/scripts/backupiso b/src/scripts/backupiso index f11c33a..6aacf8d 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -3,7 +3,7 @@ COREVER=`cat /opt/pakfire/db/core/mine` # FIXME: edit this lines before release URL=http://download.ipfire.org/iso/ -ISO=ipfire-2.9beta3.i586-full-core$COREVER.iso +ISO=ipfire-2.9rc1.i586-full-core$COREVER.iso if [ -z "$1" ]; then echo usage: $0 backup-file hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fbcf3f8272c2553155346d4da05e641cec0d2107
by git＠ipfire.org 08 Jan '11

08 Jan '11

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 3.x development tree". The branch, master has been updated via fbcf3f8272c2553155346d4da05e641cec0d2107 (commit) via eabd0eadccee163cb2c2d8102b8159cc6bbe9ee0 (commit) via 43798bc01ed700c28b11d073c577563b7d067685 (commit) via 69f855735d77a495c3b653d863278f84339068d5 (commit) from 4ea11fef92f2d78f60f64700d047bd3e90940db4 (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 fbcf3f8272c2553155346d4da05e641cec0d2107 Merge: eabd0ea 4ea11fe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jan 8 14:59:26 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit eabd0eadccee163cb2c2d8102b8159cc6bbe9ee0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 4 23:33:59 2011 +0100 radvd: Fix build error with flex library. commit 43798bc01ed700c28b11d073c577563b7d067685 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 4 23:30:32 2011 +0100 Revert "flex: Remove unneeded library." plus more. This reverts commit 4c8e2fc43ab3f70fcb764d460f0bfb50ade798d1. Adds a development package with the library. commit 69f855735d77a495c3b653d863278f84339068d5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 4 23:20:39 2011 +0100 lldpd: Fix build. Had wrong dependency to libxml2. ----------------------------------------------------------------------- Summary of changes: pkgs/core/flex/flex.nm | 6 +++--- pkgs/core/lldpd/lldpd.nm | 2 +- pkgs/core/radvd/radvd.nm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/pkgs/core/flex/flex.nm b/pkgs/core/flex/flex.nm index 0dd33fb..726fe38 100644 --- a/pkgs/core/flex/flex.nm +++ b/pkgs/core/flex/flex.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = flex PKG_VER = 2.5.35 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -51,6 +51,8 @@ endef PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_PACKAGES += $(PKG_NAME)-devel + CONFIGURE_OPTIONS += \ --mandir=/usr/share/man @@ -62,6 +64,4 @@ define STAGE_INSTALL_CMDS echo "#!/bin/sh" > $(BUILDROOT)/usr/bin/lex echo "exec /usr/bin/flex -l \"$$@\"" >> $(BUILDROOT)/usr/bin/lex chmod 755 $(BUILDROOT)/usr/bin/lex - - rm -rvf $(BUILDROOT)/usr/{include,lib} endef diff --git a/pkgs/core/lldpd/lldpd.nm b/pkgs/core/lldpd/lldpd.nm index a9f29cb..78a10db 100644 --- a/pkgs/core/lldpd/lldpd.nm +++ b/pkgs/core/lldpd/lldpd.nm @@ -34,7 +34,7 @@ PKG_URL = https://trac.luffy.cx/lldpd/ PKG_LICENSE = GPL PKG_SUMMARY = Utilities for the Link Layer Discovery Protocol. -PKG_DEPS += libxml2 +PKG_BUILD_DEPS+= libxml2-devel pkg-config define PKG_DESCRIPTION The LLDPD project aims to provide a comprehensive implementation of \ diff --git a/pkgs/core/radvd/radvd.nm b/pkgs/core/radvd/radvd.nm index c549b2b..97d0c88 100644 --- a/pkgs/core/radvd/radvd.nm +++ b/pkgs/core/radvd/radvd.nm @@ -34,7 +34,7 @@ PKG_URL = http://flex.sourceforge.net/ PKG_LICENSE = BSD with advertising PKG_SUMMARY = A Router Advertisement daemon. -PKG_BUILD_DEPS+= flex bison +PKG_BUILD_DEPS+= flex flex-devel bison define PKG_DESCRIPTION radvd is the router advertisement daemon for IPv6. It listens to \ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ec8d7a31d6738315f29d48fc0b994ea97c9e5232
by git＠ipfire.org 08 Jan '11

08 Jan '11

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 ec8d7a31d6738315f29d48fc0b994ea97c9e5232 (commit) via cfa86dfd17a94b85b2b7a6c45f2dd0d884ba9b53 (commit) from e5620b245f23b021e705edf1f9ad11fd4bfec4be (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 ec8d7a31d6738315f29d48fc0b994ea97c9e5232 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 8 14:51:49 2011 +0100 proxy: errorpage-css use the same red as other ipfire pages. commit cfa86dfd17a94b85b2b7a6c45f2dd0d884ba9b53 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 8 14:09:49 2011 +0100 Updated kernel (2.6.32.28). ----------------------------------------------------------------------- Summary of changes: config/proxy/errorpage-ipfire.css | 4 ++-- config/rootfiles/core/44/update.sh | 2 +- lfs/linux | 8 ++++---- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/proxy/errorpage-ipfire.css b/config/proxy/errorpage-ipfire.css index a1b53d3..e237b44 100644 --- a/config/proxy/errorpage-ipfire.css +++ b/config/proxy/errorpage-ipfire.css @@ -13,7 +13,7 @@ html body { margin: 0; padding: 0; - background: #700000; + background: #880400; font-size: 12px; color: #1e1e1e; } @@ -21,7 +21,7 @@ html body { /* Page displayed title area */ #titles { margin-left: 15px; - padding: 35px; + padding: 30px; padding-left: 170px; background: url('http://XXXhostXXX:81/images/IPFire.png') no-repeat left; } diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index 5b1b9ee..eedc44f 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.27" +KVER="2.6.32.28" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/linux b/lfs/linux index e885fb0..d01a046 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .27 -VER = 2.6.32.27 +PATCHLEVEL = .28 +VER = 2.6.32.28 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -35,7 +35,7 @@ CFLAGS = CXXFLAGS = PROG = linux-xen -PAK_VER = 14 +PAK_VER = 15 DEPS = "" # Normal build or XEN build. @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2d.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2 -$(DL_FILE)_MD5 = c8df8bed01a3b7e4ce13563e74181d71 +$(DL_FILE)_MD5 = 9ee6d4023f34eb055ec32f201b5f9206 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 5a61ce2..445af20 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.27 +KVER=2.6.32.28 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 104f674..f0be273 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.27 +KVER=2.6.32.28 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e5620b245f23b021e705edf1f9ad11fd4bfec4be
by git＠ipfire.org 08 Jan '11

08 Jan '11

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 e5620b245f23b021e705edf1f9ad11fd4bfec4be (commit) from 4495251167fc7daafbd48016be62c2ed3b48b830 (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 e5620b245f23b021e705edf1f9ad11fd4bfec4be Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 8 01:01:20 2011 +0100 Updated asix usb-lan driver to 3.5.0. ----------------------------------------------------------------------- Summary of changes: lfs/compat-wireless | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) Difference in files: diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 44a2dcc..a4c2197 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -46,11 +46,13 @@ TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) asix-3.5.0a.tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) +asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2 $(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505 +asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7 install : $(TARGET) @@ -81,6 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE) + # Enable some USB ID's in rt2800usb driver echo "CONFIG_RT2800USB_RT30XX=y" >> $(DIR_APP)/config.mk echo "CONFIG_RT2800USB_RT35XX=y" >> $(DIR_APP)/config.mk @@ -94,6 +97,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch + # Build Updated asix usb-lan driver + cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2 + cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \ KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules hooks/post-receive -- IPFire 2.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2011