April 2011 - openSUSE Commits - openSUSE Mailing Lists

commit libmodplug for openSUSE:Factory
by root＠hilbert.suse.de 04 Apr '11

04 Apr '11

Hello community, here is the log from the commit of package libmodplug for openSUSE:Factory checked in at Mon Apr 4 09:00:56 CEST 2011. -------- --- libmodplug/libmodplug.changes 2010-02-16 14:41:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/libmodplug/libmodplug.changes 2011-04-03 20:04:06.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Apr 3 17:58:42 UTC 2011 - reddwarf(a)opensuse.org + +- Updated to version 0.8.8.2 + * Improve compatibility with MSVC 2010 + * Improve PTM playback (Fix byteswapping) + * Improve S3M support (ignore corrupted data) + * Improve AMF support (bounds checking) +- Added pkg-config BuildRequire +- Make build verbose +- Remove execution permission from shared library + +------------------------------------------------------------------- +Sat Jul 17 11:40:27 UTC 2010 - reddwarf(a)opensuse.org + +- Updated to version 0.8.8.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libmodplug-0.8.7.tar.bz2 New: ---- _service _service:recompress:download_url:libmodplug-0.8.8.2.tar.bz2 _service:set_version:libmodplug.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service:set_version:libmodplug.spec ++++++ # # spec file for package libmodplug # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define soname 1 Name: libmodplug Summary: A MOD playing library Version: 0.8.8.2 Release: 1 Group: System/Libraries License: Public Domain Url: http://modplug-xmms.sourceforge.net Source: %{name}-%{version}.tar.bz2 Source1: baselibs.conf # PATCH-FIX-OPENSUSE libmodplug-timidity.patch -- set paths to openSUSE timidity package Patch1: libmodplug-timidity.patch BuildRequires: gcc-c++ pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libmodplug is the library behind -- Modplug-XMMS is a fully featured, complete input plugin for XMMS which plays mod-like music formats. It is based on the mod rendering code from ModPlug, a popular windows mod player written by Olivier Lapicque, found at http://www.modplug.com/. %package -n libmodplug%{soname} License: Public Domain Summary: Development files for libmodplug Group: Development/Libraries/C and C++ %description -n libmodplug%{soname} Modplug library based on the ModPlug sound engine. - plays 22 different mod formats. - plays zip, rar, gzip, and bzip2 compressed mods. - plays timidity's GUS patch files (*.pat). - plays all types of MIDI files (*.mid). - plays textfiles written in the ABC music notation (*.abc). %package devel License: Public Domain Summary: Development files for libmodplug Group: Development/Libraries/C and C++ Requires: libmodplug%{soname} = %{version} %description devel Files needed to program against libmodplug. %prep %setup -q %patch1 %build %configure --disable-static make %{?_smp_mflags} V=1 %install %makeinstall rm $RPM_BUILD_ROOT%{_libdir}/*.la %post -n libmodplug%{soname} -p /sbin/ldconfig %postun -n libmodplug%{soname} -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files -n libmodplug%{soname} %defattr(0644,root,root,0755) %{_libdir}/%{name}.so.%{soname}* %files devel %defattr(0644,root,root,0755) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_includedir}/%{name} %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %changelog ++++++ libmodplug.spec ++++++ --- /var/tmp/diff_new_pack.5eCrEZ/_old 2011-04-04 08:58:50.000000000 +0200 +++ /var/tmp/diff_new_pack.5eCrEZ/_new 2011-04-04 08:58:50.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libmodplug (Version 0.8.7) +# spec file for package libmodplug # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,12 @@ # +%define soname 1 Name: libmodplug Summary: A MOD playing library -Version: 0.8.7 -Release: 2 +Version: to_be_filled_by_service +Release: 1 Group: System/Libraries License: Public Domain Url: http://modplug-xmms.sourceforge.net @@ -28,7 +29,7 @@ Source1: baselibs.conf # PATCH-FIX-OPENSUSE libmodplug-timidity.patch -- set paths to openSUSE timidity package Patch1: libmodplug-timidity.patch -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,12 +38,13 @@ mod rendering code from ModPlug, a popular windows mod player written by Olivier Lapicque, found at http://www.modplug.com/. -%package -n libmodplug0 +%package -n libmodplug%{soname} + License: Public Domain Summary: Development files for libmodplug Group: Development/Libraries/C and C++ -%description -n libmodplug0 +%description -n libmodplug%{soname} Modplug library based on the ModPlug sound engine. - plays 22 different mod formats. - plays zip, rar, gzip, and bzip2 compressed mods. @@ -54,10 +56,7 @@ License: Public Domain Summary: Development files for libmodplug Group: Development/Libraries/C and C++ -Requires: libmodplug0 = %{version} -# Name in Packman and OBS before openSUSE 11.2, Never in openSUSE. -Provides: libmodplug0-devel = %{version} -Obsoletes: libmodplug0-devel < %{version} +Requires: libmodplug%{soname} = %{version} %description devel Files needed to program against libmodplug. @@ -67,31 +66,29 @@ %patch1 %build -autoreconf -f -i -%configure\ - --disable-static -make %{?_smp_mflags} +%configure --disable-static +make %{?_smp_mflags} V=1 %install %makeinstall rm $RPM_BUILD_ROOT%{_libdir}/*.la -%post -n libmodplug0 -p /sbin/ldconfig +%post -n libmodplug%{soname} -p /sbin/ldconfig -%postun -n libmodplug0 -p /sbin/ldconfig +%postun -n libmodplug%{soname} -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files -n libmodplug0 -%defattr(-,root,root) -%{_libdir}/*.so.* +%files -n libmodplug%{soname} +%defattr(0644,root,root,0755) +%{_libdir}/%{name}.so.%{soname}* %files devel -%defattr(-,root,root) +%defattr(0644,root,root,0755) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_includedir}/%{name} +%{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{name}.pc %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pciutils-ids for openSUSE:Factory
by root＠hilbert.suse.de 04 Apr '11

04 Apr '11

Hello community, here is the log from the commit of package pciutils-ids for openSUSE:Factory checked in at Mon Apr 4 08:58:38 CEST 2011. -------- --- AUTO/all/pciutils-ids/pciutils-ids.changes 2011-03-12 03:40:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/pciutils-ids/pciutils-ids.changes 2011-04-04 03:40:04.000000000 +0200 @@ -2 +2 @@ -Sat Mar 12 03:40:08 CET 2011 - autobuild(a)suse.de +Mon Apr 4 03:40:04 CEST 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-03-12 +- automated update on 2011-04-04 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils-ids.spec ++++++ --- /var/tmp/diff_new_pack.QvH3c5/_old 2011-04-04 08:54:45.000000000 +0200 +++ /var/tmp/diff_new_pack.QvH3c5/_new 2011-04-04 08:54:45.000000000 +0200 @@ -19,7 +19,7 @@ Name: pciutils-ids -Version: 2011.3.12 +Version: 2011.4.4 Release: 1 AutoReqProv: on Group: Hardware/Other ++++++ pci.ids.bz2 ++++++ --- /var/tmp/diff_new_pack.QvH3c5/_old 2011-04-04 08:54:46.000000000 +0200 +++ /var/tmp/diff_new_pack.QvH3c5/_new 2011-04-04 08:54:46.000000000 +0200 @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2011.03.12 -# Date: 2011-03-12 03:15:02 +# Version: 2011.04.04 +# Date: 2011-04-04 03:15:03 # # Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the # PCI ID Project at http://pciids.sf.net/. @@ -108,6 +108,7 @@ 1704 ISDN Adapter (PCI Bus, D, C) 069d Hughes Network Systems (HNS) 0721 Sapphire, Inc. +0777 Ubiquiti Networks, Inc. 0795 Wired Inc. 6663 Butane II (MPEG2 encoder board) 6666 MediaPress (MPEG2 encoder board) @@ -376,7 +377,7 @@ 103c 3229 SC44Ge Host Bus Adapter 0059 MegaRAID SAS 8208ELP/8208ELP 005a SAS1066E PCI-Express Fusion-MPT SAS - 005b MegaRAID SAS TB + 005b MegaRAID SAS 2208 [Thunderbolt] 1028 1f2d PERC H810 Adapter 1028 1f31 PERC H710 Adapter 1028 1f33 PERC H710 Mini (for blades) @@ -385,6 +386,7 @@ 1028 1f37 PERC H510 Mini (for blades) 1028 1f38 PERC H510 Mini (for monolithics) 005c SAS1064A PCI-X Fusion-MPT SAS + 005d MegaRAID SAS-3 3108 [Invader] 005e SAS1066 PCI-X Fusion-MPT SAS 0060 MegaRAID SAS 1078 1000 1006 MegaRAID SAS 8888ELP @@ -429,6 +431,7 @@ 1028 1f1e PERC H200 Integrated 1028 1f1f PERC H200 Modular 1028 1f20 PERC H200 Embedded + 1028 1f22 Internal Tape Adapter 0073 MegaRAID SAS 9240 1000 9240 MegaRAID SAS 9240-4i 1000 9241 MegaRAID SAS 9240-4i @@ -450,7 +453,7 @@ 0074 SAS2108 PCI-Express Fusion-MPT SAS-2 [Liberator] 0076 SAS2108 PCI-Express Fusion-MPT SAS-2 [Liberator] 0077 SAS2108 PCI-Express Fusion-MPT SAS-2 [Liberator] - 0079 LSI MegaSAS 9260 + 0079 MegaRAID SAS 2108 [Liberator] 1000 9251 MegaRAID SAS 9260-4ix 1000 9256 MegaRAID SAS 9260-8ix 1000 9262 MegaRAID SAS 9262-8i @@ -1457,6 +1460,7 @@ 6738 Barts XT [ATI Radeon HD 6800 Series] 6739 Barts PRO [ATI Radeon HD 6800 Series] 673e Barts LE [AMD Radeon HD 6700 Series] + 6740 Whistler XT [AMD Radeon HD 6700M Series] 6741 NI Whistler [AMD Radeon HD 6600M Series] 6759 NI Turks [AMD Radeon HD 6500] 6760 NI Seymour [AMD Radeon HD 6470M] @@ -1475,7 +1479,9 @@ 68a8 Broadway [ATI Mobility Radeon HD 6800 Series] 68b8 Juniper [Radeon HD 5700 Series] 68b9 Juniper [ATI Radeon HD 5600/5700] + 68ba Juniper XT [AMD Radeon HD 6000 Series] 68be Juniper [Radeon HD 5750 Series] + 68bf Juniper LE [AMD Radeon HD 6700 Series] 68c0 Madison [Mobility Radeon HD 5000 Series] 103c 1521 Madison XT [FirePro M5800] 68c1 Redwood [Radeon HD 5600 Series] @@ -1486,10 +1492,13 @@ 68d8 Redwood [Radeon HD 5670] 68d9 Redwood PRO [Radeon HD 5500 Series] 68da Redwood PRO [Radeon HD 5500 Series] - 68e0 Manhattan [Mobility Radeon HD 5000 Series] + 68e0 Manhattan [Mobility Radeon HD 5400 Series] + 103c 1486 HP TouchSmart tm2-2050er discrete GPU (Mobility Radeon HD 5450) 68e1 Manhattan [Mobility Radeon HD 5430 Series] 68e4 Robson CE [AMD Radeon HD 6300 Series] 68e5 Robson LE [AMD Radeon HD 6300M Series] + 68f1 Cadar [FirePro 2460] + 68f2 Cedar [FirePro 2270] 68f9 Cedar PRO [Radeon HD 5450] 700f PCI Bridge [IGP 320M] 7010 PCI Bridge [IGP 340M] @@ -1657,6 +1666,7 @@ 9440 RV770 [Radeon HD 4870] 9441 R700 [Radeon HD 4870 X2] 9442 RV770 [Radeon HD 4850] + 1002 0502 MSI R4850-T2D512 174b e810 Sapphire HD 4850 512MB GDDR3 PCI-E Dual Slot Fansink 9443 R700 [Radeon HD 4850] 944a M98L [Mobility Radeon HD 4850] @@ -1712,8 +1722,10 @@ 954f RV710 [Radeon HD 4350] 1462 1618 R4350 MD512H (MS-V161) 9552 M92 LP [Mobility Radeon HD 4300 Series] - 9553 M92 [Mobility Radeon HD 4500 Series] - 9555 M93 [Mobility Radeon HD 4500 Series] + 9553 M92 [Mobility Radeon HD 4500/5100 Series] + 1179 ff82 Satellite L505-13T GPU (Mobility Radeon HD 5145) + 9555 M93 [Mobility Radeon HD 4300/4500 Series] + 103c 1411 ProBook 4720s GPU (Mobility Radeon HD 4350) 9559 Mobility Radeon HD 3600 Series 955f M92 [Mobility Radeon HD 4330] 9581 M76 [Radeon Mobility HD 2600 Series] @@ -1730,6 +1742,7 @@ 9593 Radeon Mobility HD 3670 9595 M86GL [Mobility FireGL V5700] 9596 RV635 PRO AGP [Radeon HD 3650] + 1043 0028 EAH3650 SILENT/HTDI/512M/A 9598 Mobility Radeon HD 3600 Series 1002 9598 Mobility Radeon HD 3600 1043 01d6 EAH3650 Silent @@ -2269,6 +2282,12 @@ 1304 Family 11h Processor Link Control 1510 Pavilion DM1Z-3000 Host bridge 1022 1510 Pavilion DM1Z-3000 Host bridge + 1600 Family 15h Processor Function 0 + 1601 Family 15h Processor Function 1 + 1602 Family 15h Processor Function 2 + 1603 Family 15h Processor Function 3 + 1604 Family 15h Processor Function 4 + 1605 Family 15h Processor Function 5 1700 Family 12h/14h Processor Function 0 1701 Family 12h/14h Processor Function 1 1702 Family 12h/14h Processor Function 2 @@ -10375,6 +10394,7 @@ 12ca Integrated Computing Engines 12cb Antex Electronics Corporation 0027 SC4 (StudioCard) + 002e StudioCard 2000 12cc Pluto Technologies International 12cd Aims Lab 12ce Netspeed Inc. @@ -11858,6 +11878,7 @@ 14e2 INFOLIBRIA 14e3 AMTELCO 14e4 Broadcom Corporation + 0576 BCM43224 802.11a/b/g/n 0800 Sentry5 Chipcommon I/O Controller 0804 Sentry5 PCI Bridge 0805 Sentry5 MIPS32 CPU @@ -12074,9 +12095,9 @@ 1681 NetXtreme BCM5761 Gigabit Ethernet PCIe 1684 NetXtreme BCM5764M Gigabit Ethernet PCIe 1685 NetXtreme II BCM57500S Gigabit Ethernet - 168a NetXtreme II BCM57800S 10 Gigabit Ethernet - 168d NetXtreme II BCM57840S 20 Gigabit Ethernet - 168e NetXtreme II BCM57810S 10 Gigabit Ethernet + 168a NetXtreme II BCM57800 10 Gigabit Ethernet + 168d NetXtreme II BCM57840 10/20 Gigabit Ethernet + 168e NetXtreme II BCM57810 10 Gigabit Ethernet 1690 NetXtreme BCM57760 Gigabit Ethernet PCIe 1691 NetLink BCM57788 Gigabit Ethernet PCIe 1692 NetLink BCM57780 Gigabit Ethernet PCIe @@ -12099,6 +12120,7 @@ 1462 590c KT6 Delta-FIS2R (MS-6590) 169d NetLink BCM5789 Gigabit Ethernet PCI Express 16a0 NetLink BCM5785 Fast Ethernet + 16a5 NetXtreme II BCM57800 10 Gigabit Ethernet Multi Function 16a6 NetXtreme BCM5702X Gigabit Ethernet 0e11 00bb NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T) 1028 0126 BCM5702 1000Base-T @@ -12117,9 +12139,11 @@ 10a9 8014 Dual Port Gigabit Ethernet (PCI-X,Fiber) 10a9 801c Quad Port Gigabit Ethernet (PCI-E,Fiber) 10b7 2001 3C998-SX Dual Port 1000-SX PCI-X + 16a9 NetXtreme II BCM57800 10 Gigabit Ethernet Virtual Function 16aa NetXtreme II BCM5706S Gigabit Ethernet 103c 3102 NC370F MultifuNCtion Gigabit Server Adapter 103c 310c NC370i Multifunction Gigabit Server Adapter + 16ab NetXtreme II BCM57840 10/20 Gigabit Ethernet Multi Function 16ac NetXtreme II BCM5708S Gigabit Ethernet 1014 0304 NetXtreme II BCM5708S Gigabit Ethernet 1028 01bb PowerEdge 1955 Broadcom NetXtreme II BCM5708S @@ -12128,6 +12152,9 @@ 103c 7038 NC373i PCI Express Multifunction Gigabit Server Adapter 103c 703b NC373i Integrated Multifunction Gigabit Server Adapter 103c 703d NC373F PCI Express Multifunction Gigabit Server Adapter + 16ad NetXtreme II BCM57840 10/20 Gigabit Ethernet Virtual Function + 16ae NetXtreme II BCM57810 10 Gigabit Ethernet Multi Function + 16af NetXtreme II BCM57810 10 Gigabit Ethernet Virtual Function 16b0 NetXtreme BCM57761 Gigabit Ethernet PCIe 16b1 NetLink BCM57781 Gigabit Ethernet PCIe 16b2 NetLink BCM57791 Gigabit Ethernet PCIe @@ -12300,9 +12327,13 @@ 432c BCM4322 802.11b/g/n 1799 d311 Dynex DX-NNBX 802.11n WLAN Cardbus Card 432d BCM4322 802.11a/b/g/n + 4331 BCM4331 802.11a/b/g/n + 106b 00d6 AirPort Extreme 4344 EDGE/GPRS data and 802.11b/g combo cardbus [GC89] 4353 BCM43224 802.11a/b/g/n 4357 BCM43225 802.11b/g/n + 4358 BCM43227 802.11b/g/n + 4359 BCM43228 802.11a/b/g/n 4401 BCM4401 100Base-T 1025 0035 TravelMate 660 103c 08b0 tc1100 tablet @@ -13026,8 +13057,11 @@ 0015 ZBox 15b7 Sandisk Corp 15b8 ADDI-DATA GmbH + 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) + 1004 APCI2032 SP controller (32 digi outputs) 1005 APCI2200 SP controller (8/16 digi outputs (relay)) + 1006 APCI1564 SP controller (32 digi ins, 32 digi outs) 100a APCI1696 SP controller (96 TTL I/Os) 3001 APCI3501 SP controller (analog output board) 300f APCI3600 Noise and vibration measurement board @@ -13226,10 +13260,13 @@ 168c Atheros Communications Inc. 0007 AR5000 802.11a Wireless Adapter 1737 0007 WPC54A Wireless PC Card + 1b47 0110 (Proxim) Skyline 4030 / Harmony 8450 802.11a Wireless CardBus Adapter 8086 2501 PRO/Wireless 5000 LAN PCI Adapter Module 0011 AR5210 802.11a NIC 0012 AR5211 802.11ab NIC 126c 8031 2201 Mobile Adapter + 1385 4400 WAB501 802.11ab Wireless CardBus Card + 1b47 aa00 (Proxim) 8460 802.11ab Wireless CardBus Adapter 0013 Atheros AR5001X+ Wireless Network Adapter 0308 3402 AG-100 802.11ag Wireless Cardbus Adapter 0308 3405 G-102 v2 802.11g Wireless Cardbus Adapter @@ -13278,6 +13315,7 @@ 168c 2041 Engenius 5354MP Plus ARIES2 b/g MiniPCI Adapter 168c 2042 Engenius 5354MP Plus ARIES2 a/b/g MiniPCI Adapter 168c 2051 TRENDnet TEW-443PI Wireless PCI Adapter + 16a5 160a BWP712 802.11bg Wireless CardBus Adapter 16ab 7302 Trust Speedshare Turbo Pro Wireless PCI Adapter 1737 0017 WPC55AG 1737 0026 WMP55AG v1.1 @@ -13287,7 +13325,6 @@ 17cf 0042 Z-COMAX Highpower XG-622H (400mw) 802.11b/g mini-PCI Adapter 185f 1012 CM9 Wireless a/b/g MiniPCI Adapter 185f 2012 Wistron NeWeb WLAN a+b+g model CB9 - 1948 3aba RBTBJ-AW 802.11abg Cardbus Adapter a727 6801 3CRXJK10075 OfficeConnect Wireless 108Mbps 11g XJACK PC Card # the name AR5005G is used for the reference design using AR2413 001a AR2413 802.11bg NIC @@ -13308,17 +13345,26 @@ 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 + 17f9 0008 DX-WGNBC 802.11bg Wireless CardBus Adapter + 17f9 0018 DX-WGDTC 802.11bg Wireless PCI Adapter # the name AR5006X is used for the reference design using AR5413 001b AR5413 802.11abg NIC + 1154 034e WLI-CB-AG108HP 802.11abg Wireless CardBus Adapter 1186 3a19 D-Link AirPremier AG DWL-AG660 Wireless Cardbus 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 1062 IPN-W100CB 802.11abg Wireless CardBus Adapter 168c 2062 EnGenius EMP-8602 (400mw) or Compex WLM54AG (SuperAG) 168c 2063 EnGenius EMP-8602 (400mw) or Compex WLM54AG + 17f9 000b WL-711A 802.11abg Wireless CardBus Adapter + 17f9 000c WPIA-112AG 802.11abg Wireless PCI Adapter + 17f9 000d PC-686X 802.11abg Wireless Mini PCI Adapter 185f 1600 DCMA-82 High Power WLAN 802.11a/b/g mini-PCI Module (Super A/G, eXtended Range, 400mW) + 1948 3aba RBTBJ-AW 802.11abg Wireless Cardbus Adapter a727 6804 Wireless 11a/b/g PC Card with XJACK(r) Antenna - 001c AR5001 Wireless Network Adapter + 001c AR242x / AR542x Wireless Network Adapter (PCI-Express) + 0777 3006 SRX 802.11abg Wireless ExpressCard Adapter 1468 0428 AR5BXB63 802.11bg NIC 1468 042a AR5007EG 802.11bg NIC 147b 1033 AirPace Wi-Fi @@ -13338,9 +13384,11 @@ 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 + 1976 2003 TEW-601PC 802.11g Wireless CardBus Adapter 0023 AR5008 Wireless Network Adapter 0308 340b NWD-170N 802.11bgn Wireless CardBus Adapter 1154 0365 Buffalo WLP-CB-AG300 802.11abgn Cardbus Adapter + 1154 0367 WLI-CB-AG301N 802.11abgn Wireless CardBus Adapter 1186 3a6a DWA-642 802.11n RangeBooster N CardBus Adapter 1186 3a6d DWA-552 802.11n Xtreme N Desktop Adapter (rev A1) 1186 3a76 DWA-645 802.11n RangeBooster N 650 Notebook Adapter (rev A1) @@ -13348,11 +13396,14 @@ 1737 0069 WPC100 v1 802.11n RangePlus Wireless Notebook Adapter 1799 8011 F5D8011 v1 802.11n N1 Wireless Notebook Card 187e 3411 NWD-370N 802.11n Wireless PCI Adapter + 1976 2008 TEW-621PC 802.11bgn Wireless CardBus Adapter 0024 AR5008 Wireless Network Adapter 0027 AR9160 802.11abgn Wireless PCI Adapter + 0777 4082 SR71-A 802.11abgn Wireless Mini PCI Adapter 0029 AR922X Wireless Network Adapter 1186 3a7a DWA-552 802.11n Xtreme N Desktop Adapter (rev A2) 002a AR928X Wireless Network Adapter (PCI-Express) + 103c 3041 AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card 002b AR9285 Wireless Network Adapter (PCI-Express) 1931 0023 Option GTM67x PCIe WiFi Adapter 002c AR2427 Wireless Network Adapter (PCI-Express) @@ -13527,6 +13578,8 @@ 0080 Octeon CN52XX Network Processor 0090 Octeon II CN63XX Network Processor 0091 Octeon II CN68XX Network Processor + 0092 Octeon II CN65XX Network Processor + 0093 Octeon II CN61XX Network Processor 1787 Hightech Information System Ltd. 1789 Ennyah Technologies Corp. # also used by Struck Innovative Systeme for joint developments @@ -13604,6 +13657,7 @@ 17d3 1221 ARC-1221 8-Port PCI-Express to SATA RAID Controller 1300 ARC-1300ix-16 16-Port PCI-Express to SAS Non-RAID Host Adapter 1680 ARC-1680 8 port PCIe/PCI-X to SAS/SATA II RAID Controller + 1880 ARC-1880 8/12 port PCIe/PCI-X to SAS/SATA II RAID Controller # nee Neterion Inc., previously S2io Inc. 17d5 Exar Corp. 5731 Xframe 10-Gigabit Ethernet PCI-X @@ -13658,10 +13712,12 @@ 6060 R6060 USB 1.1 Controller 6061 R6061 USB 2.0 Controller 17f7 Topdek Semiconductor Inc. +17f9 Gemtek Technology Co., Ltd 17fe InProComm Inc. 2120 IPN 2120 802.11b 1737 0020 WMP11 v4 802.11b Wireless-B PCI Adapter 2220 IPN 2220 802.11g + 1468 0305 T60N871 802.11g Mini PCI Wireless Adapter 1737 0029 WPC54G v4 802.11g Wireless-G Notebook Adapter 17ff Benq Corporation 1803 ProdaSafe GmbH @@ -13703,6 +13759,7 @@ 1737 0055 WMP54G ver 4.1 1799 700e F5D7000 v6000 Wireless G Desktop Card 1799 701e F5D7010 v6000 Wireless G Notebook Card + 17f9 0012 AWLC3026T 802.11g Wireless CardBus Adapter 1814 2561 EW-7108PCg 0302 RT2561/RT61 rev B 802.11g 1186 3a71 DWA-510 Wireless G Desktop Adapter @@ -13713,6 +13770,8 @@ 1948 3c24 C54Ri v2 Wireless 11g PCI Adapter 0401 RT2600 802.11 MIMO 1737 0052 WPC54GR v1 802.11g Wireless-G Notebook Adapter with RangeBooster + 17f9 0011 WPCR-137G 802.11bg Wireless CardBus Adapter + 17f9 0016 WPIR-119GH 802.11bg Wireless Desktop Adapter 0601 RT2800 802.11n PCI 1799 801c F5D8011 v3 802.11n N1 Wireless Notebook Card 187e 3412 NWD-310N 802.11n Wireless PCI Adapter @@ -13980,6 +14039,8 @@ 1924 6904 SFN5111T-R4 1924 7104 SFN5161T-R4 1924 7904 SFN5151T-R4 + 1803 SFC9020 Virtual Function [Solarstorm] + 1813 SFL9021 Virtual Function [Solarstorm] 6703 SFC4000 rev A iSCSI/Onload [Solarstorm] 10b8 0102 SMC10GPCIe-10BT (A2) [TigerCard] 10b8 0103 SMC10GPCIe-10BT (A3) [TigerCard] @@ -14117,6 +14178,7 @@ 1011 Physics Processing Unit [PhysX] 1043 0001 PhysX P1 1974 TransferZentrum Mikroelektronik +1976 TRENDnet 1977 Parsec 197b JMicron Technology Corp. 0250 JMC250 PCI Express Gigabit Ethernet Controller @@ -14314,6 +14376,7 @@ 1b3e 00a3 BYNET BIC2SX 1b3e 00c3 BYNET BIC2SE 1b40 Schooner Information Technology, Inc. +1b47 Card Access, Inc. 1b4b Marvell Technology Group Ltd. 9123 88SE9123 PCIe SATA 6.0 Gb/s controller 9125 88SE9125 PCIe SATA 6.0 Gb/s controller @@ -14879,6 +14942,10 @@ 5851 Exacq Technologies 5853 XenSource, Inc. 0001 Xen Platform Device +# Virtual device surfaced in guests to provide HID events. + c110 Virtualized HID +# Device surfaced in guests to provide 2d graphics capabilities + c147 Virtualized Graphics Device 5ace Beholder International Ltd. 631c SmartInfra Ltd 1652 PXI-1652 Signal Generator @@ -15007,6 +15074,18 @@ 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 + 0150 Ivy Bridge DRAM Controller + 0151 Ivy Bridge PCI Express Root Port + 0152 Ivy Bridge Graphics Controller + 0154 Ivy Bridge DRAM Controller + 0155 Ivy Bridge PCI Express Root Port + 0156 Ivy Bridge Graphics Controller + 0158 Ivy Bridge DRAM Controller + 0159 Ivy Bridge PCI Express Root Port + 015a Ivy Bridge Graphics Controller + 015c Ivy Bridge DRAM Controller + 015d Ivy Bridge PCI Express Root Port + 015e Ivy Bridge 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 @@ -16020,15 +16099,17 @@ 1d3f Patsburg PCI Express Virtual Switch Port 1d40 Patsburg LPC Controller 1d41 Patsburg LPC Controller - 1d50 Patsburg 8-Port SATA/SAS Storage Control Unit - 1d58 Patsburg 8-Port SATA/SAS Storage Control Unit + 1d50 Patsburg Dual 4-Port SATA/SAS Storage Control Unit + 1d54 Patsburg Dual 4-Port SATA/SAS Storage Control Unit + 1d55 Patsburg 4-Port SATA/SAS Storage Control Unit + 1d58 Patsburg Dual 4-Port SATA/SAS Storage Control Unit 1d59 Patsburg 4-Port SATA/SAS Storage Control Unit 1d5b Patsburg 4-Port SATA Storage Control Unit - 1d60 Patsburg 8-Port SATA/SAS Storage Control Unit + 1d60 Patsburg Dual 4-Port SATA/SAS Storage Control Unit 1d61 Patsburg SAS Storage Control Unit 1 - 1d64 Patsburg 8-Port SATA/SAS Storage Control Unit + 1d64 Patsburg Dual 4-Port SATA/SAS Storage Control Unit 1d65 Patsburg 4-Port SATA/SAS Storage Control Unit - 1d68 Patsburg 8-Port SATA/SAS Storage Control Unit + 1d68 Patsburg Dual 4-Port SATA/SAS Storage Control Unit 1d69 Patsburg 4-Port SATA/SAS Storage Control Unit 1d6b Patsburg 4-Port SATA Storage Control Unit 1d70 Patsburg SMBus Controller 0 @@ -19345,6 +19426,7 @@ 1000 0022 2P2S (2 Parallel / 2 16550A Serial Port Adapter) 9865 PCI 9865 Multi-I/O Controller 9901 PCIe 9901 Multi-I/O Controller + 9904 4-Port PCIe Serial Adapter 9990 MCS9990 PCIe to 4‐Port USB 2.0 Host Controller 9902 Stargen Inc. 0001 SG2010 PCI over Starfabric Bridge @@ -19375,9 +19457,11 @@ 02e1 PCI2E1 2-port ISDN E1 interface 450e PCI4S0EC 4-port ISDN S0 interface dead Sirrix.PCI4S0 4-port ISDN S0 interface +b100 OpenVox Communication Co. Ltd. # Not registered officially b10b Uakron PCI Project b1b3 Shiva Europe Limited +b1d9 ATCOM Technology co., LTD. # Pinnacle should be 11bd, but they got it wrong several times --mj bd11 Pinnacle Systems, Inc. (Wrong ID) bdbd Blackmagic Design @@ -19440,6 +19524,7 @@ 0059 0003 128k ISDN-U Adapter 00a7 0001 TELES.S0/PCI 2.x ISDN Adapter 8086 0003 Digium X100P/X101P analogue PSTN FXO interface + b100 0003 OpenVox A400P 4-port analog card e159 0001 ATCOM AX400P 4-port analog card 0002 Tiger100APC ISDN chipset e4bf EKF Elektronik GmbH ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libopenvas for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '11

03 Apr '11

Hello community, here is the log from the commit of package libopenvas for openSUSE:Factory checked in at Sun Apr 3 12:34:30 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libopenvas/libopenvas.changes 2011-03-18 16:16:19.000000000 +0100 @@ -0,0 +1,260 @@ +------------------------------------------------------------------- +Fri Mar 18 15:16:18 UTC 2011 - cfarrell(a)novell.com + +- license update: GPLv2 + The correct syntax for GPL version 2 "only" is GPLv2 + +------------------------------------------------------------------- +Thu Mar 3 12:59:00 UTC 2011 - bitshuffler(a)opensuse.org + +- Update to 4.0.3 + * A bug which caused only the first NVT dependency to be considered has been fixed. + * A bug which caused WMI connects to fail has been fixed. + +------------------------------------------------------------------- +Wed Feb 23 18:12:52 UTC 2011 - bitshuffler(a)opensuse.org + +- Update to 4.0.2 + * The LSC RPM creator support script is now installed correctly. + * The build environment has been consolidated. + * A bug which could cause a segmentation fault when using IPv6 under certain + circumstances has been fixed. + * The check for administrative user privileges has been made more strict. + +------------------------------------------------------------------- +Thu Feb 3 19:26:34 UTC 2011 - bitshuffler(a)opensuse.org + +- Update to 4.0.0 + * Setting file handling has been updated to match changes in openvas-scanner. + * Support for pkg-config has been (re-)introduced. + * File locations have been adjusted to conform to the Filesystem Hierarchy + Standard. + +------------------------------------------------------------------- +Wed Jan 26 16:33:17 UTC 2011 - bitshuffler(a)opensuse.org + +- Update to 3.99.4 + * The build environment has fixed in a number of places to restore expected + behaviour after the move to cmake. + * The documentation has been updated to match the changes in the build + environment. + +------------------------------------------------------------------- +Tue Jan 25 17:13:15 UTC 2011 - bitshuffler(a)opensuse.org + +- Update to 3.99.3 + * Improved and fixed remote LDAP authentication. + * Former binary ".nes" NVTs "find_service", "openvas_tcp_scanner" + and "synscan" are now built-in NASL methods. + * Any autotools-related build environment was removed. + * At top-level a cmake-based build environment was introduced. + * libopenvas_omp: Activated escaping of characters so that + special characters can more save be allowed for some OMP commands. + * example_auth.conf was updated with more sensible values. + * Bug fix on Credential creation. + * this package now initially creates required directories in the + installation directory (if not present). This was done by other + modules previously (mostly openvas-scanner) + * Many old code paths for certain operting system environments + have been removed. Most likely, HPUX, Solaris and similar + won't compile this code anymore. + +------------------------------------------------------------------- +Mon Jan 10 14:22:01 UTC 2011 - bitshuffler(a)opensuse.org + +- Update to 3.99.2 + * The user creation process has been made more robust. + * More compiler warnings have been addressed. + +------------------------------------------------------------------- +Mon Dec 20 12:03:08 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.99.1 + * The documentation in the INSTALL_README file has been updated. + * A number of compiler warnings by gcc 4.4 has been addressed. + * A incorrect error message during user creation that only occurred in setuid + environments has been removed. + +------------------------------------------------------------------- +Fri Dec 3 16:06:58 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.98.2 + * Further code analysis has resulted in a number of fixes to the code and the + build environment in an effort to make the code even more secure and + compatible across a wider range of platforms. + * The arguments for the NASL functions for WMI and SMB connections have been + made more consistent. + * The handling of finished GnuTLS sessions has been improved, eliminating + superfluous log messages. + +------------------------------------------------------------------- +Fri Nov 19 16:35:14 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.98.1 + * Network level scan support. + * The code for providing OMP functionality has been cleaned up. + * Further code cleanup has lead to the removal of more than 3,500 lines of + unused code. + * A bug which tried to free memory that was not allocated before under some + circumstances has been fixed. + * Superfluous log messages regarding file uploads have been removed. + * NVT meta data management has been improved, resulting in a smaller memory + footprint of the scanner. + * The install path for header files has been made more consistent. + +------------------------------------------------------------------- +Fri Sep 10 07:53:05 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.1.3 + * Significant memory leaks are closed. + * Bug fix for handling shared file descriptors that now + prevents unnecessary use of new file descriptiors under + certain circumstances. + * Little fix in the nasl wmi api. + +------------------------------------------------------------------- +Wed Aug 4 06:53:34 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.1.2 + * A bug in the WMI interface stub which caused the build to fail when configured + without WMI has been fixed. + +------------------------------------------------------------------- +Tue Aug 3 19:00:48 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.1.1 + * Cross compile support for mingw32 has been added to libopenvas/base. + * Missing copyright and license information has been added to a number of files. + * The COPYING file has been updated to better indicate the licenses of + individual files and the full text for all licenses has been added. + * The WMI infrastructure has been updated to match necessary changes in the API + of the WMI patch. + * The documentation on using WMI in libopenvas has been updated. + +------------------------------------------------------------------- +Wed Jul 14 16:48:06 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.1.0 + * Code cleanup: Code from openvas-administrator and openvas-manager which could + be more appropriately placed in libopenvas has been moved here. + * Initial support for LDAP authentication has been added. + * IPv6 support has been improved. + * Support for building parts of libopenvas on Windows has been added. + * Support for reading preference file uploads from memory instead of from disk + has been added. + * Support for NTLMSSP has been added. + * Authentication mechanism extended to support LDAP and ADS. + * An issue which caused SSH logins with RSA keys on remote systems to fail under + certain circumstances has been fixed. + * Support for logging to syslog has been added. + * Support for scanning virtual web hosts has been added. + +------------------------------------------------------------------- +Fri Jul 2 20:31:13 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.1.0.rc3 + * An issue which caused the build to fail on Gentoo GNU/Linux systems has been + fixed. + * An issue which caused openvas-client, openvas-cli and openvas-manager to fail + to build with libopenvas has been fixed. + +------------------------------------------------------------------- +Mon Jun 28 16:12:40 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.1.0.rc2 + * QA: A number of compiler warnings have been addressed. + * Authentication mechanism extended to support LDAP and ADS. + * An issue which caused SSH logins with RSA keys on remote systems to fail under + certain circumstances has been fixed. + * A bug which caused segmentation faults when using NTLMSSP authentication in + libopenvas built with WMI supports has been fixed. + * Support for logging to syslog has been added. + * Support for scanning virtual web hosts has been added. + +------------------------------------------------------------------- +Wed May 19 16:47:18 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 3.1.0.rc1 + * Code cleanup: Code from openvas-administrator and openvas-manager which could + be more appropriately placed in libopenvas has been moved here. + * Initial support for LDAP authentication has been added. + * A bug which caused WMI support to be disabled in the standalone NASL + interpreter has been fixed. + * IPv6 support has been improved. + * Support for building parts of libopenvas on Windows has been added. + * Support for reading preference file uploads from memory instead of from disk + has been added. + * Support for NTLMSSP has been added. + +------------------------------------------------------------------- +Tue Apr 13 11:00:52 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 3.0.5 + * The build infrastructure for the hg and misc modules has been switch to CMake + from autoconf. + * Support for resuming tasks has been added to OMP. + * Packet forgery support for IPv6 has been improved. + * A build issue on Mandriva has been fixed. ++++ 63 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/libopenvas/libopenvas.changes calling whatdependson for head-i586 New: ---- debian.changelog debian.compat debian.control debian.libopenvas4-dev.dirs debian.libopenvas4-dev.install debian.libopenvas4.dirs debian.libopenvas4.install debian.rules debian.series libopenvas.changes libopenvas.dsc libopenvas.spec openvas-libraries-4.0-rc4-no_Werror.patch openvas-libraries-4.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopenvas.spec ++++++ # # spec file for package libopenvas # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define soname 4 Name: libopenvas Version: 4.0.3 Release: 1 License: GPLv2 Group: Productivity/Networking/Security Url: http://www.openvas.org Source: openvas-libraries-%{version}.tar.gz Patch0: openvas-libraries-4.0-rc4-no_Werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora_version} || 0%{?scientificlinux_version} BuildRequires: gpgme-devel BuildRequires: openldap-devel BuildRequires: libuuid-devel %endif %if 0%{?mandriva_version} BuildRequires: gpgme-devel BuildRequires: libldap-devel BuildRequires: pinentry-gtk2 %if 0%{?mandriva_version} < 201000 BuildRequires: ext2fs-devel %else BuildRequires: libuuid-devel %endif %endif %if 0%{?suse_version} BuildRequires: free-ttf-fonts BuildRequires: libgpgme-devel BuildRequires: libuuid-devel BuildRequires: openldap2-devel %if 0%{?suse_version} > 1130 BuildRequires: libassuan-devel %endif %endif BuildRequires: bison BuildRequires: cmake >= 2.6.0 BuildRequires: doxygen BuildRequires: fontconfig-devel BuildRequires: glib2-devel >= 2.12 BuildRequires: gnutls-devel BuildRequires: libpcap-devel BuildRequires: pkgconfig Summary: Support libraries for OpenVAS %description The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_base%{soname} Group: System/Libraries Summary: Support libraries for OpenVAS %description -n libopenvas_base%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_hg%{soname} Group: System/Libraries Summary: Support libraries for OpenVAS %description -n libopenvas_hg%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_misc%{soname} Group: System/Libraries Summary: Support libraries for OpenVAS %description -n libopenvas_misc%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_nasl%{soname} Group: System/Libraries Summary: Support libraries for OpenVAS %description -n libopenvas_nasl%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_omp%{soname} Group: System/Libraries Summary: Support libraries for OpenVAS %description -n libopenvas_omp%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package devel License: GPLv2 Group: Development/Libraries/C and C++ %if 0%{?fedora_version} || 0%{?scientificlinux_version} Requires: gpgme-devel Requires: libuuid-devel %endif %if 0%{?mandriva_version} Requires: gpgme-devel %if 0%{?mandriva_version} < 201000 Requires: ext2fs-devel %else Requires: libuuid-devel %endif %endif %if 0%{?suse_version} Requires: libgpgme-devel Requires: libuuid-devel %if 0%{?suse_version} > 1130 Requires: libassuan-devel %endif %endif Requires: gnutls-devel Requires: libpcap-devel Requires: libopenvas_base%{soname} = %{version} libopenvas_hg%{soname} = %{version} libopenvas_misc%{soname} = %{version} libopenvas_nasl%{soname} = %{version} libopenvas_omp%{soname} = %{version} Summary: Development files for libopenvas %description devel This package contains the development files (mainly C header files) for libopenvas. %prep %setup -qn openvas-libraries-%{version} %patch0 %build cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_VERBOSE_MAKEFILE=ON -DSYSCONFDIR=%{_sysconfdir} -DLOCALSTATEDIR=%{_localstatedir} -DLIBDIR=%{_libdir} -DBUILD_WITH_LDAP=ON -DCMAKE_BUILD_TYPE=release #__make %{?_smp_mflags} VERBOSE=1 make VERBOSE=1 %install %__make install DESTDIR=%{buildroot} find %{buildroot}%{_libdir} -name "*.a" -delete %post -n libopenvas_base%{soname} -p /sbin/ldconfig %post -n libopenvas_hg%{soname} -p /sbin/ldconfig %post -n libopenvas_misc%{soname} -p /sbin/ldconfig %post -n libopenvas_nasl%{soname} -p /sbin/ldconfig %post -n libopenvas_omp%{soname} -p /sbin/ldconfig %postun -n libopenvas_base%{soname} -p /sbin/ldconfig %postun -n libopenvas_hg%{soname} -p /sbin/ldconfig %postun -n libopenvas_misc%{soname} -p /sbin/ldconfig %postun -n libopenvas_nasl%{soname} -p /sbin/ldconfig %postun -n libopenvas_omp%{soname} -p /sbin/ldconfig %clean test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %files -n libopenvas_base%{soname} %defattr(-,root,root) %{_libdir}/libopenvas_base.so.%{soname}* %dir %{_datadir}/openvas %{_datadir}/openvas/openvas-lsc-rpm-creator.sh %{_datadir}/openvas/openvas-services %files -n libopenvas_hg%{soname} %defattr(-,root,root) %{_libdir}/libopenvas_hg.so.%{soname}* %files -n libopenvas_misc%{soname} %defattr(-,root,root) %{_libdir}/libopenvas_misc.so.%{soname}* %files -n libopenvas_nasl%{soname} %defattr(-,root,root) %{_bindir}/openvas-nasl %{_libdir}/libopenvas_nasl.so.%{soname}* %{_mandir}/man1/openvas-nasl.1.* %files -n libopenvas_omp%{soname} %defattr(-,root,root) %{_libdir}/libopenvas_omp.so.%{soname}* %files devel %defattr(-,root,root) %doc CHANGES %{_includedir}/openvas %{_libdir}/libopenvas_base.so %{_libdir}/libopenvas_hg.so %{_libdir}/libopenvas_misc.so %{_libdir}/libopenvas_nasl.so %{_libdir}/libopenvas_omp.so %{_libdir}/pkgconfig/libopenvas.pc %changelog ++++++ debian.changelog ++++++ libopenvas (4.0.3-1) unstable; urgency=low * New upstream release. - A bug which caused only the first NVT dependency to be considered has been fixed. - A bug which caused WMI connects to fail has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 03 Mar 2011 13:58:44 +0100 libopenvas (4.0.2-1) unstable; urgency=low * New upstream release. - The LSC RPM creator support script is now installed correctly. - The build environment has been consolidated. - A bug which could cause a segmentation fault when using IPv6 under certain circumstances has been fixed. - The check for administrative user privileges has been made more strict. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 23 Feb 2011 19:12:27 +0100 libopenvas (4.0.0-1) unstable; urgency=low * New upstream release. - Setting file handling has been updated to match changes in openvas-scanner. - Support for pkg-config has been (re-)introduced. - File locations have been adjusted to conform to the Filesystem Hierarchy Standard. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 03 Feb 2011 20:28:14 +0100 libopenvas (3.99.4-1) unstable; urgency=low * New upstream release. - The build environment has fixed in a number of places to restore expected behaviour after the move to cmake. - The documentation has been updated to match the changes in the build environment. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 26 Jan 2011 17:34:28 +0100 libopenvas (3.99.3-1) unstable; urgency=low * New upstream release. - Improved and fixed remote LDAP authentication. - Former binary ".nes" NVTs "find_service", "openvas_tcp_scanner" and "synscan" are now built-in NASL methods. - Any autotools-related build environment was removed. - At top-level a cmake-based build environment was introduced. - libopenvas_omp: Activated escaping of characters so that special characters can more save be allowed for some OMP commands. - example_auth.conf was updated with more sensible values. - Bug fix on Credential creation. - this package now initially creates required directories in the installation directory (if not present). This was done by other modules previously (mostly openvas-scanner) - Many old code paths for certain operting system environments have been removed. Most likely, HPUX, Solaris and similar won't compile this code anymore. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 25 Jan 2011 18:12:11 +0100 libopenvas (3.99.2-1) unstable; urgency=low * New upstream release. - The user creation process has been made more robust. - More compiler warnings have been addressed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 10 Jan 2011 15:21:24 +0100 libopenvas (3.99.1-1) unstable; urgency=low * New upstream release. - The documentation in the INSTALL_README file has been updated. - A number of compiler warnings by gcc 4.4 has been addressed. - A incorrect error message during user creation that only occurred in setuid environments has been removed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 20 Dec 2010 13:04:36 +0100 libopenvas (3.98.2-1) unstable; urgency=low * New upstream release. - Further code cleanup has lead to the removal of more than 3,500 lines of unused code. - A bug which tried to free memory that was not allocated before under some circumstances has been fixed. - Superfluous log messages regarding file uploads have been removed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 03 Dec 2010 17:10:07 +0100 libopenvas (3.98.1-1) unstable; urgency=low * New upstream release. - Network level scan support. - The code for providing OMP functionality has been cleaned up. - Further code cleanup has lead to the removal of more than 3,500 lines of unused code. - A bug which tried to free memory that was not allocated before under some circumstances has been fixed. - Superfluous log messages regarding file uploads have been removed. - NVT meta data management has been improved, resulting in a smaller memory footprint of the scanner. - The install path for header files has been made more consistent. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 19 Nov 2010 17:37:14 +0100 libopenvas (3.1.3-1) unstable; urgency=low * New upstream release. - Significant memory leaks are closed. - Bug fix for handling shared file descriptors that now prevents unnecessary use of new file descriptiors under certain circumstances. - Little fix in the nasl wmi api. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 10 Sep 2010 09:50:25 +0200 libopenvas (3.1.2-1) unstable; urgency=low * New upstream release. * A bug in the WMI interface stub which caused the build to fail when configured without WMI has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 04 Aug 2010 08:53:11 +0200 libopenvas (3.1.1-1) unstable; urgency=low * New upstream release. * Cross compile support for mingw32 has been added to libopenvas/base. * Missing copyright and license information has been added to a number of files. * The COPYING file has been updated to better indicate the licenses of individual files and the full text for all licenses has been added. * The WMI infrastructure has been updated to match necessary changes in the API of the WMI patch. * The documentation on using WMI in libopenvas has been updated. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 03 Aug 2010 21:00:16 +0200 libopenvas (3.1.0-2) unstable; urgency=low * Add openvas-nasl to libopenvas3-dev -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 15 Jul 2010 18:07:04 +0200 libopenvas (3.1.0-1) unstable; urgency=low * New upstream release. - Code cleanup: Code from openvas-administrator and openvas-manager which could be more appropriately placed in libopenvas has been moved here. - Initial support for LDAP authentication has been added. - IPv6 support has been improved. - Support for building parts of libopenvas on Windows has been added. - Support for reading preference file uploads from memory instead of from disk has been added. - Support for NTLMSSP has been added. - Authentication mechanism extended to support LDAP and ADS. - An issue which caused SSH logins with RSA keys on remote systems to fail under certain circumstances has been fixed. - Support for logging to syslog has been added. - Support for scanning virtual web hosts has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 14 Jul 2010 18:45:41 +0200 libopenvas (3.1.0.rc3) unstable; urgency=low * New upstream release. - An issue which caused the build to fail on Gentoo GNU/Linux systems has been fixed. - An issue which caused openvas-client, openvas-cli and openvas-manager to fail to build with libopenvas has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 02 Jul 2010 22:31:40 +0200 libopenvas (3.1.0.rc2) unstable; urgency=low * New upstream release. - QA: A number of compiler warnings have been addressed. - Authentication mechanism extended to support LDAP and ADS. - An issue which caused SSH logins with RSA keys on remote systems to fail under certain circumstances has been fixed. - A bug which caused segmentation faults when using NTLMSSP authentication in libopenvas built with WMI supports has been fixed. - Support for logging to syslog has been added. - Support for scanning virtual web hosts has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 28 Jun 2010 18:13:51 +0200 libopenvas (3.1.0.rc1) unstable; urgency=low * New upstream release. - Code cleanup: Code from openvas-administrator and openvas-manager which could be more appropriately placed in libopenvas has been moved here. - Initial support for LDAP authentication has been added. - A bug which caused WMI support to be disabled in the standalone NASL interpreter has been fixed. - IPv6 support has been improved. - Support for building parts of libopenvas on Windows has been added. - Support for reading preference file uploads from memory instead of from disk has been added. - Support for NTLMSSP has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 19 May 2010 18:48:25 +0200 libopenvas (3.0.5-1) unstable; urgency=low * New upstream release. - The build infrastructure for the hg and misc modules has been switch to CMake from autoconf. - Support for resuming tasks has been added to OMP. - Packet forgery support for IPv6 has been improved. - A build issue on Mandriva has been fixed. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 13 Apr 2010 13:01:33 +0200 libopenvas (3.0.4-1) unstable; urgency=low * New upstream release. - Several build issues on Mandriva have been fixed. - Support for using libopenvas in C++ code has been introduced for some OMP libraries. - The openvas-nasl standalone NASL interpreter is now linked dynamically. - A bug which caused some GnuTLS error messages to be printed to stderr instead of to the logs had been fix. - Support for registry hives has been added to the WMI registry functions. - Support for detecting libraries in non-standard locations during the configuration process has been added. - Support for multiple levels of subdirectories in the NVT directory has been improved. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 03 Mar 2010 21:00:41 +0100 libopenvas (3.0.3-1) unstable; urgency=low * New upstream release. - Initial support for dropping privileges. - New crypto functions and support for SMB NTLMv1 and NTLMv2. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 04 Feb 2010 22:15:24 +0100 libopenvas (3.0.2-1) unstable; urgency=low * New upstream release. - Support for modifying scanner configuration files has been added. - The API for retrieving settings has been improved. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 20 Jan 2010 08:47:08 +0100 libopenvas (3.0.1-1) unstable; urgency=low * New upstream release. - The OMP API has been updated. - An unnecessary GnuTLS call has been removed. - Minor code cleanups. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 12 Jan 2010 18:41:33 +0100 libopenvas (3.0.0-1) unstable; urgency=low * New upstream release. - IPv6 support - WMI-Client support (optional) - Integration of openvas-libnasl - New library "base" - New library "omp" - Former libopenvas renamed to libopenvas_misc - New NVT cache implementation to overcome limitations - Several files from openvas-client integrated - Use of "cmake" to build base, omp and nasl - glib dependency raised from 2.6 to 2.12 -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 25 Dec 2009 22:23:12 +0100 libopenvas (2.0.4-1) unstable; urgency=low * New upstream release. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 17 Aug 2009 18:47:35 +0200 libopenvas (2.0.3-1) unstable; urgency=low * New upstream release. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 12 Jun 2009 13:47:35 +0200 libopenvas (2.0.2-1) unstable; urgency=low * New upstream release. -- Michael Wiegand <michael.wiegand(a)intevation.de> Fri, 17 Apr 2009 08:41:24 +0200 libopenvas (2.0.1-1) unstable; urgency=low * New upstream release * Updated the control file to take account of translation work as part of the Smith review project * Fixed broken linking (linker-libs.dpatch) -- Tim Brown <timb(a)nth-dimension.org.uk> Sun, 22 Feb 2009 02:17:44 +0000 libopenvas (2.0.0-2) unstable; urgency=low * Brown paper bug upload: Restore the changes introduced since 1.0.1-5 * Make proper versioned binary packages for this library * Add a Build-Depend on libglib2.0-dev (Closes: 511627) * Conflict against libopenvas1-dev -- Javier Fernandez-Sanguino Pen~a <jfs(a)debian.org> Thu, 15 Jan 2009 22:19:53 +0100 libopenvas (2.0.0-1) unstable; urgency=low * New upstream release -- Javier Fernandez-Sanguino Pen~a <jfs(a)debian.org> Fri, 02 Jan 2009 01:21:09 +0100 libopenvas (2.0.0.beta2-1) UNRELEASED; urgency=low * New upstream release -- Tim Brown <timb(a)nth-dimension.org.uk> Sat, 15 Nov 2008 12:52:28 +0000 libopenvas (2.0.0.beta1-1) UNRELEASED; urgency=low * New upstream release * Cleaned up the rules * Updated copyright -- Tim Brown <timb(a)nth-dimension.org.uk> Sun, 12 Oct 2008 19:23:20 +0100 libopenvas (1.0.2-2) UNRELEASED; urgency=low * Not released yet -- Jan Wagner <waja(a)cyconet.org> Tue, 08 Jul 2008 10:10:47 +0200 libopenvas (1.0.2-1) unstable; urgency=low * New upstream release * Add Tim and myself to Uploaders * Set Debian Maintainers Mailing List as Maintainer * Add Vcs-Headers * Bump Standards Version to 3.8.0, no changes needed * Remove trailing whitespaces from EOL and EOF in debian/* * Move Section to right place for libopenvas in control * Also depend on libgnutls-dev, libpcap-dev for -dev * Remove debian/*.dirs since unneeded -- Jan Wagner <waja(a)cyconet.org> Mon, 07 Jul 2008 16:17:53 +0200 libopenvas (1.0.1-5) unstable; urgency=low * Fix the Makefile so that the library is linked with the appropriate libraries. Also change libopenvas.tmpl * Drop the libgpgme11-dev Build-Dep, we actually don't need it, none of the sources build use the gpgme.h header. -- Javier Fernandez-Sanguino Pen~a <jfs(a)debian.org> Fri, 02 May 2008 21:20:05 +0200 libopenvas (1.0.1-4) unstable; urgency=low * Minor updates to control and copyright file to fix issues highlighted by jfs in regard to the priority and copyright of the packaging respectively * Minor update to control to fix differing dependency between libopenvas and openvas-libnasl as highlighted by jfs -- Tim Brown <timb(a)nth-dimension.org.uk> Wed, 30 Apr 2008 23:23:27 +0100 libopenvas (1.0.1-3) unstable; urgency=low * Minor update to control file, fixed dependency on ${source:Version} substvar -- Tim Brown <timb(a)nth-dimension.org.uk> Wed, 16 Apr 2008 05:57:27 +0100 libopenvas (1.0.1-2) unstable; urgency=low * Minor updates to control file, now lists jfs as uploader, fixed deprecated ${Source-Version} substvar, Build-Depends directive * Minor update to rules file, DH_COMPAT environment variable no longer required * Minor update to libopenvas2-dev.install -- Tim Brown <timb(a)nth-dimension.org.uk> Wed, 16 Apr 2008 05:21:09 +0100 libopenvas (1.0.1-1) unstable; urgency=low * New upstream release -- Tim Brown <timb(a)nth-dimension.org.uk> Thu, 03 Apr 2008 01:18:00 +0100 libopenvas (1.0.0-1) unstable; urgency=low * New upstream release -- Tim Brown <timb(a)nth-dimension.org.uk> Tue, 05 Feb 2008 22:12:21 +0000 libopenvas (0.9.1-2) unstable; urgency=low * Minor updates to the control and copyright files -- Tim Brown <timb(a)nth-dimension.org.uk> Wed, 31 Oct 2007 02:29:25 +0000 libopenvas (0.9.1-1) unstable; urgency=low * Initial release -- Tim Brown <timb(a)nth-dimension.org.uk> Wed, 19 Sep 2007 01:41:35 +0100 ++++++ debian.compat ++++++ 5 ++++++ debian.control ++++++ Source: libopenvas Section: libs Priority: optional Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Build-Depends: bison, cmake (>= 2.6), debhelper (>= 5), doxygen, dpatch, hardening-wrapper, libgcrypt11-dev, libglib2.0-dev, libgnutls-dev, libgpgme11-dev (>= 1.1.2), libldap2-dev, libpcap-dev, uuid-dev Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Package: libopenvas4-dev Section: libdevel Architecture: any Depends: libopenvas4 (= ${binary:Version}), libgnutls-dev, libpcap-dev, libglib2.0-dev, libgpgme11-dev (>= 1.1.2), libgcrypt11-dev, uuid-dev Replaces: libopenvas1-dev, libopenvas2-dev Conflicts: libopenvas1-dev, libopenvas2-dev Description: remote network security auditor - static libraries and headers The Open Vulnerability Assessment System is a modular security auditing tool, used for testing remote systems for vulnerabilities that should be fixed. . It is made up of two parts: a server, and a client. The server/daemon, openvasd, is in charge of the attacks, whereas the client, OpenVAS-Client, provides an X11/GTK+ user interface. . This package contains the required static libraries, headers, and libopenvas-config script. Package: libopenvas4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: libopenvas1, libopenvas2, libopenvasnasl1, libopenvasnasl2 Conflicts: libopenvas1, libopenvas2, libopenvasnasl1, libopenvasnasl2 Description: remote network security auditor - shared libraries The Open Vulnerability Assessment System is a modular security auditing tool, used for testing remote systems for vulnerabilities that should be fixed. . It is made up of two parts: a server, and a client. The server/daemon, openvasd, is in charge of the attacks, whereas the client, OpenVAS-Client, provides an X11/GTK+ user interface. . This package contains the required shared libraries. Package: libopenvas4-dbg Section: debug Priority: extra Architecture: any Depends: ${misc:Depends}, libopenvas4 (= ${binary:Version}), libopenvas4-dev (= ${binary:Version}) Description: remote network security auditor (debug) The Open Vulnerability Assessment System is a modular security auditing tool, used for testing remote systems for vulnerabilities that should be fixed. . This package contains the debugging symbols. ++++++ debian.libopenvas4-dev.dirs ++++++ usr/lib usr/include ++++++ debian.libopenvas4-dev.install ++++++ usr/include/* usr/lib/libopenvas*.so usr/lib/pkgconfig/libopenvas.pc ++++++ debian.libopenvas4.dirs ++++++ usr/lib usr/share/doc/libopenvas4 ++++++ debian.libopenvas4.install ++++++ usr/bin/openvas-nasl usr/lib/libopenvas*.so.* usr/share/openvas/openvas-lsc-rpm-creator.sh usr/share/openvas/openvas-services usr/share/man/man1/openvas-nasl.1 ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 # Enable hardening-wrapper export DEB_BUILD_HARDENING=1 config: config-stamp config-stamp: dh_testdir cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DLOCALSTATEDIR=/var -DLIBDIR=/usr/lib -DBUILD_WITH_LDAP=ON -DCMAKE_BUILD_TYPE=release . touch $@ build: build-stamp build-stamp: config-stamp dh_testdir # Add here commands to compile the package. $(MAKE) VERBOSE=1 -j1 touch $@ clean: dh_testdir dh_testroot rm -f build-stamp config.stamp # Add here commands to clean up after the build process. dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs dh_install --sourcedir=debian/tmp ( cd debian/libopenvas4-dev/usr/share/doc/ ; rm -rf libopenvas4-dev; ln -s libopenvas4 libopenvas4-dev; ) dh_strip --dbg-package=libopenvas4-dbg dh_compress dh_fixperms dh_makeshlibs -V dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install ++++++ debian.series ++++++ openvas-libraries-4.0-rc4-no_Werror.patch -p0 ++++++ libopenvas.dsc ++++++ Format: 1.0 Source: libopenvas Binary: libopenvas4-dev, libopenvas4 Architecture: any Version: 4.0.3-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: bison, cmake (>= 2.6), debhelper (>= 5), doxygen, dpatch, hardening-wrapper, libgcrypt11-dev, libglib2.0-dev, libgnutls-dev, libgpgme11-dev (>= 1.1.2), libldap2-dev, libpcap-dev, uuid-dev Files: b55a7a72ba7b9c8da7b1372a91fbdf88 464106 libopenvas-4.0.3.tar.gz f657b454af293e32275da3400cc7c67b 4369 libopenvas-4.0.3.diff.gz ++++++ openvas-libraries-4.0-rc4-no_Werror.patch ++++++ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig 2011-01-26 11:58:48.000000000 +0100 +++ CMakeLists.txt 2011-01-26 17:25:55.601169807 +0100 @@ -230,7 +230,7 @@ configure_file (tools/libopenvas-config. set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now") set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") -set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -Werror") +set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall") add_subdirectory (base) add_subdirectory (misc) Index: nasl/CMakeLists.txt =================================================================== --- nasl/CMakeLists.txt.orig 2011-01-26 11:58:48.000000000 +0100 +++ nasl/CMakeLists.txt 2011-01-26 17:26:20.524044898 +0100 @@ -52,7 +52,7 @@ set (CMAKE_C_FLAGS_DEBUG "${CMAKE # The "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" is necessary for GPGME! # The "-fno-strict-aliasing" silences warnings caused by macros defined in byteorder.h. # Once the warnings have been addressed this flag should be removed. -set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -Werror -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing") +set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing") # The "-Wno-error=unprototyped-calls" silences warnings produced by an # openSUSE-patched gcc caused by code in regex.c. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit calibre for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '11

03 Apr '11

Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at Sun Apr 3 12:30:35 CEST 2011. -------- --- calibre/calibre.changes 2011-03-30 09:41:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/calibre/calibre.changes 2011-04-02 16:33:29.000000000 +0200 @@ -1,0 +2,51 @@ +Sat Apr 2 14:24:38 UTC 2011 - saigkill(a)opensuse.org + +- updated to version 0.7.53 +- New Features + o Email delivery: You can now specify a subject that calibre will use + when sending emails per email account, configured in + Preferences->Sending by email. The subject is a template of the same + kind used in Save to Disk, etc. So you can specift the + title/authors/series/whatever in the template. + o Apple driver: When an iDevice is detected, inform the user about the + Connect to iTunes method instead of trying to connect directly to the + device, as the latter can be buggy. See + http://www.mobileread.com/forums/showthread.php?t=127883 for details + o SONY driver: Search for books on the device in all directories not + just database/media/books. This can be turned off by customizing the + o SONY plugin in Preferences->Plugins + o EPUB Output: Remove any margins specified via an Adobe page template + in the input document. This means that the margins specified in + calibre are more likely to be the actual margins used. + o When reading metadata from filenames, allow publisher and published + date to be read from the filename + o Remove the option to show a second tool bar from Preferences->Look & + Feel. Instead go to Preferences->Toolbars and add items to the second + toolbar to control exactly what is visible there. + o Add a tweak that can be used to have the calibre content server listen + for IPv6 connections. + o When clicking Next or Previous in the edit metadata dialog, then + active book in the main book list is also changed + o Remember the previously used setting for Match all/Match any under the + o Tag Browser when calibre restarts + o FB2 Output: Option to set the FB2 genre explicitly. + o Plugin developers: calibre now has a new plugin API, see + http://calibre-ebook.com/user_manual/creating_plugins.html Your + existing plugins should continue to work, but it would be good to test + them to make sure. + +- Bug Fixes + o Fix text color in the search bar set to black instead of the system + font color + o Workaround for Word bug where Word uses gb2312 as the encoding when + exporting CHinese docs to HTML istead of gbk + o Make sorting on the device view faster and more robust. + o E-book viewer: Fix viewer losing place in very long single file + documents when window resized. + o MOBI Output: Workaround for Amazon's MOBI renderer not rendering top + margins on ul and ol tags. + o EPUB Input: Workaround for invalid EPUBs produced by someone named + 'ibooks, Inc.'. + o RTF Input: Handle RTF files with too many levels of list nesting. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- calibre-0.7.52-nofonts.tar.bz2 New: ---- calibre-0.7.53-nofonts.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.sMv5gd/_old 2011-04-03 12:30:15.000000000 +0200 +++ /var/tmp/diff_new_pack.sMv5gd/_new 2011-04-03 12:30:15.000000000 +0200 @@ -19,7 +19,7 @@ Summary: EBook Management Application Name: calibre -Version: 0.7.52 +Version: 0.7.53 Release: 1 Url: http://calibre-ebook.com Group: Productivity/Other ++++++ calibre-0.7.52-nofonts.tar.bz2 -> calibre-0.7.53-nofonts.tar.bz2 ++++++ calibre/calibre-0.7.52-nofonts.tar.bz2 /mounts/work_src_done/STABLE/calibre/calibre-0.7.53-nofonts.tar.bz2 differ: char 11, line 1 ++++++ calibre-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.sMv5gd/_old 2011-04-03 12:30:15.000000000 +0200 +++ /var/tmp/diff_new_pack.sMv5gd/_new 2011-04-03 12:30:15.000000000 +0200 @@ -1,4 +1,4 @@ -# # Output filters +# # Output filters addFilter("non-executable-script") addFilter("no-manual-page-for-binary") addFilter("unstripped-binary-or-object") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Perl-Critic for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '11

03 Apr '11

Hello community, here is the log from the commit of package perl-Perl-Critic for openSUSE:Factory checked in at Sun Apr 3 12:23:53 CEST 2011. -------- --- perl-Perl-Critic/perl-Perl-Critic.changes 2010-12-01 14:52:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Perl-Critic/perl-Perl-Critic.changes 2011-04-02 19:06:37.000000000 +0200 @@ -1,0 +2,38 @@ +Sat Apr 2 07:48:54 UTC 2011 - coolo(a)novell.com + +- update to 1.115 + * Fatal error in RegularExpressions::ProhibitUnusedCapture here + document check. RT #67116. + * Internal POD error in Documentation::RequirePodLinksIncludeText. Patch + by Salvatore Bonaccorso. RT #67012 + +------------------------------------------------------------------- +Thu Mar 31 18:26:47 UTC 2011 - coolo(a)novell.com + +- update to 1.114 + Policy Changes: + * Documentation::RequirePodLinksIncludeText now handles nested POD + formatting. RT #65569 + * Clarified relation of severity numbers to names in Perl::Critic + POD. RT #66017 + * Removed caveats from Variables::RequireLocalizedPunctuationVars, + no longer necessary with PPI 1.208. RT #65514 + * Have InputOutput::RequireBriefOpen attempt to expand scope as + necessary to deal with the case where the open() and the + corresponding close() are not in the same scope. RT #64437 + * RegularExpressions::ProhibitUnusedCapture now looks inside + double-quotish things. RT #38942. + * RegularExpressions::ProhibitUnusedCapture now takes logical + alternation into account, so that (e.g.) + if ( /(a)/ || /(b)/ ) { + say $1; + } + is not a violation. RT #38942. + * ValuesAndExpressions::ProhibitCommaSeparatedStatements now + recognizes 'return { foo => 1, bar => 2 }' as containing a hash + constructor, not a block. This was fixed by PPI 1.215. RT #61301. + * ValuesAndExpressions::ProhibitCommaSeparatedStatements now + recognizes 'bless { foo => 1, bar => 2 }' as containing a hash + constructor, not a block. This was fixed by PPI 1.215. RT #64132. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Perl-Critic-1.109.tar.bz2 New: ---- Perl-Critic-1.115.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Perl-Critic.spec ++++++ --- /var/tmp/diff_new_pack.ckx41j/_old 2011-04-03 12:22:35.000000000 +0200 +++ /var/tmp/diff_new_pack.ckx41j/_new 2011-04-03 12:22:35.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-Perl-Critic (Version 1.109) +# spec file for package perl-Perl-Critic # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,37 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%bcond_with test Name: perl-Perl-Critic -%define cpan_name Perl-Critic -Summary: Critique Perl source code for best-practices -Version: 1.109 -Release: 2 +Version: 1.115 +Release: 1 License: GPL+ or Artistic -Group: Development/Libraries/Perl +%define cpan_name Perl-Critic +Summary: Critique Perl source code for best-practices. Url: http://search.cpan.org/dist/Perl-Critic/ -#Source: http://www.cpan.org/modules/by-module/Perl/Perl-Critic-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 +Group: Development/Libraries/Perl +#Source: http://www.cpan.org/authors/id/E/EL/ELLIOTJS/Perl-Critic-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl-macros -%if %{with test} -BuildRequires: perl(Test::Deep) -BuildRequires: perl(Test::Memory::Cycle) -%endif BuildRequires: perl(base) BuildRequires: perl(B::Keywords) >= 1.05 BuildRequires: perl(Carp) BuildRequires: perl(Config::Tiny) >= 2 BuildRequires: perl(Email::Address) >= 1.889 BuildRequires: perl(Exception::Class) >= 1.23 -BuildRequires: perl(Exporter) +BuildRequires: perl(Exporter) >= 5.63 BuildRequires: perl(File::Basename) BuildRequires: perl(File::Find) BuildRequires: perl(File::HomeDir) @@ -63,31 +56,32 @@ BuildRequires: perl(overload) BuildRequires: perl(Perl::Tidy) BuildRequires: perl(Pod::Spell) >= 1 -BuildRequires: perl(PPI) >= 1.208 -BuildRequires: perl(PPI::Document) >= 1.208 -BuildRequires: perl(PPI::Document::File) >= 1.208 -BuildRequires: perl(PPI::Node) >= 1.208 -BuildRequires: perl(PPI::Token::Quote::Single) >= 1.208 -BuildRequires: perl(PPI::Token::Whitespace) >= 1.208 -BuildRequires: perl(PPIx::Regexp) -BuildRequires: perl(PPIx::Utilities::Statement) >= 1.000 +BuildRequires: perl(PPI) >= 1.215 +BuildRequires: perl(PPI::Document) >= 1.215 +BuildRequires: perl(PPI::Document::File) >= 1.215 +BuildRequires: perl(PPI::Node) >= 1.215 +BuildRequires: perl(PPI::Token::Quote::Single) >= 1.215 +BuildRequires: perl(PPI::Token::Whitespace) >= 1.215 +BuildRequires: perl(PPIx::Regexp) >= 0.01 +BuildRequires: perl(PPIx::Utilities::Node) >= 1.001 +BuildRequires: perl(PPIx::Utilities::Statement) >= 1.001 BuildRequires: perl(Readonly) >= 1.03 BuildRequires: perl(Readonly::XS) BuildRequires: perl(Scalar::Util) BuildRequires: perl(strict) BuildRequires: perl(String::Format) >= 1.13 BuildRequires: perl(Task::Weaken) +BuildRequires: perl(Test::Deep) BuildRequires: perl(Text::ParseWords) >= 3 -BuildRequires: perl(version) +BuildRequires: perl(version) >= 0.77 BuildRequires: perl(warnings) -# Requires: perl(base) Requires: perl(B::Keywords) >= 1.05 Requires: perl(Carp) Requires: perl(Config::Tiny) >= 2 Requires: perl(Email::Address) >= 1.889 Requires: perl(Exception::Class) >= 1.23 -Requires: perl(Exporter) +Requires: perl(Exporter) >= 5.63 Requires: perl(File::Basename) Requires: perl(File::Find) Requires: perl(File::HomeDir) @@ -104,14 +98,15 @@ Requires: perl(overload) Requires: perl(Perl::Tidy) Requires: perl(Pod::Spell) >= 1 -Requires: perl(PPI) >= 1.208 -Requires: perl(PPI::Document) >= 1.208 -Requires: perl(PPI::Document::File) >= 1.208 -Requires: perl(PPI::Node) >= 1.208 -Requires: perl(PPI::Token::Quote::Single) >= 1.208 -Requires: perl(PPI::Token::Whitespace) >= 1.208 -Requires: perl(PPIx::Regexp) -Requires: perl(PPIx::Utilities::Statement) >= 1.000 +Requires: perl(PPI) >= 1.215 +Requires: perl(PPI::Document) >= 1.215 +Requires: perl(PPI::Document::File) >= 1.215 +Requires: perl(PPI::Node) >= 1.215 +Requires: perl(PPI::Token::Quote::Single) >= 1.215 +Requires: perl(PPI::Token::Whitespace) >= 1.215 +Requires: perl(PPIx::Regexp) >= 0.01 +Requires: perl(PPIx::Utilities::Node) >= 1.001 +Requires: perl(PPIx::Utilities::Statement) >= 1.001 Requires: perl(Readonly) >= 1.03 Requires: perl(Readonly::XS) Requires: perl(Scalar::Util) @@ -119,53 +114,70 @@ Requires: perl(String::Format) >= 1.13 Requires: perl(Task::Weaken) Requires: perl(Text::ParseWords) >= 3 -Requires: perl(version) +Requires: perl(version) >= 0.77 Requires: perl(warnings) +%{perl_requires} %description Perl::Critic is an extensible framework for creating and applying coding standards to Perl source code. Essentially, it is a static source code analysis engine. Perl::Critic is distributed with a number of Perl::Critic::Policy modules that attempt to enforce various coding -guidelines. Most Policy modules are based on Damian Conway's book Perl Best -Practices. However, Perl::Critic is not limited to PBP and will even -support Policies that contradict Conway. You can enable, disable, and +guidelines. Most Policy modules are based on Damian Conway's book *Perl +Best Practices*. However, Perl::Critic is *not* limited to PBP and will +even support Policies that contradict Conway. You can enable, disable, and customize those Polices through the Perl::Critic interface. You can also create new Policy modules that suit your own tastes. For a command-line interface to Perl::Critic, see the documentation for -perlcritic. If you want to integrate Perl::Critic with your build -process, Test::Perl::Critic provides an interface that is suitable for -test programs. Also, Test::Perl::Critic::Progressive is useful for -gradually applying coding standards to legacy code. For the ultimate -convenience (at the expense of some flexibility) see the criticism -pragma. - -Authors: --------- - Jeffrey Ryan Thalhammer <thaljef(a)cpan.org> +perlcritic. If you want to integrate Perl::Critic with your build process, +Test::Perl::Critic provides an interface that is suitable for test +programs. Also, Test::Perl::Critic::Progressive is useful for gradually +applying coding standards to legacy code. For the ultimate convenience (at +the expense of some flexibility) see the criticism pragma. + +Win32 and ActivePerl users can find PPM distributions of Perl::Critic at +the http://theoryx5.uwinnipeg.ca/ppms/ manpage and Alexandr Ciornii's +downloadable executable at the http://chorny.net/perl/perlcritic.html +manpage. + +If you'd like to try Perl::Critic without installing anything, there is a +web-service available at the http://perlcritic.com manpage. The web-service +does not yet support all the configuration features that are available in +the native Perl::Critic API, but it should give you a good idea of what it +does. You can also invoke the perlcritic web-service from the command-line +by doing an HTTP-post, such as one of these: + + $> POST http://perlcritic.com/perl/critic.pl < MyModule.pm + $> lwp-request -m POST http://perlcritic.com/perl/critic.pl < MyModule.pm + $> wget -q -O - --post-file=MyModule.pm http://perlcritic.com/perl/critic.pl + +Please note that the perlcritic web-service is still alpha code. The URL +and interface to the service are subject to change. + +Also, the Perl Development Kit (PDK 8.0) from ActiveState includes a very +slick graphical interface to Perl-Critic. For details, go to the +http://www.activestate.com/perl_dev_kit manpage %prep %setup -q -n %{cpan_name}-%{version} -# rpmlint: spurious-executable-perm -%{__chmod} 0644 tools/* %build %{__perl} Build.PL installdirs=vendor ./Build build flags=%{?_smp_mflags} %check -./Build test +# fails currently ./Build test %install -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +./Build install destdir=%{buildroot} create_packlist=0 %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(644,root,root,755) %doc Changes examples extras LICENSE README tools xt %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtg for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '11

03 Apr '11

Hello community, here is the log from the commit of package gtg for openSUSE:Factory checked in at Sun Apr 3 12:22:19 CEST 2011. -------- --- GNOME/gtg/gtg.changes 2011-02-12 20:25:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtg/gtg.changes 2011-04-01 17:13:54.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 30 14:43:17 UTC 2011 - malcolmlewis(a)opensuse.org + +- Add: gtg-hamster-plugin-not-starting-tracking-tasks.patch: After + activating the Hamster (Time Tracking) Plugin in GTG, nothing + happens (bnc#683748). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gtg-hamster-plugin-not-starting-tracking-tasks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtg.spec ++++++ --- /var/tmp/diff_new_pack.ndPZKI/_old 2011-04-03 12:20:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ndPZKI/_new 2011-04-03 12:20:27.000000000 +0200 @@ -19,12 +19,14 @@ Name: gtg Version: 0.2.4 -Release: 2 +Release: 7 License: GPLv3+ Summary: Personal Organizer for GNOME Url: https://gtg.fritalk.com Group: Productivity/Office/Organizers Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gtg-hamster-plugin-not-starting-tracking-tasks.patch lp#620313 bnc#683748 malcolmlewis(a)opensuse.org -- Fix After activiting the Hamster (Time Tracking) plugin in GTG nothing happens. +Patch0: gtg-hamster-plugin-not-starting-tracking-tasks.patch BuildRequires: dbus-1 # dbus-1 is only required for file ownerships BuildRequires: fdupes @@ -59,6 +61,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build ++++++ gtg-hamster-plugin-not-starting-tracking-tasks.patch ++++++ diff --git a/GTG/plugins/hamster/hamster.py b/GTG/plugins/hamster/hamster.py index b4e2208..09f003b 100755 --- a/GTG/plugins/hamster/hamster.py +++ b/GTG/plugins/hamster/hamster.py @@ -65,15 +65,18 @@ class hamsterPlugin: hamster_activities=dict([(unicode(x[0]), unicode(x[1])) for x in self.hamster.GetActivities()]) if (gtg_title in hamster_activities or gtg_title.replace(",", "") in hamster_activities): - category = "@%s" % hamster_activities[gtg_title] + category = "%s" % hamster_activities[gtg_title] if (self.preferences['category'] == 'tag' or (self.preferences['category'] == 'auto_tag' and not category)): # See if any of the tags match existing categories - categories = dict([(unicode(x).lower(), unicode(x)) for x in self.hamster.GetCategories()]) + categories = dict([(unicode(x[1]).lower(), unicode(x[1])) for x in self.hamster.GetCategories()]) intersection = set(categories.keys()).intersection(set([x.lower() for x in gtg_tags])) if len(intersection) > 0: - category = "@%s" % categories[intersection.pop()] + category = "%s" % categories[intersection.pop()] + else: + # Force category if not found + category = gtg_tags[0] description = "" if self.preferences['description'] == 'title': @@ -91,11 +94,10 @@ class hamsterPlugin: except dbus.exceptions.DBusException: # old hamster version, doesn't support tags pass - tag_str = "".join([" #" + x for x in tag_candidates]) - + tag_str = "".join([", " + x for x in tag_candidates]) #print '%s%s,%s%s'%(activity, category, description, tag_str) - hamster_id=self.hamster.AddFact('%s%s,%s%s'%(activity, category, description, tag_str), 0, 0) - + hamster_id=self.hamster.AddFact(activity, tag_str, 0, 0, category, description, False) + ids=self.get_hamster_ids(task) ids.append(str(hamster_id)) self.set_hamster_ids(task, ids) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit physfs for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '11

03 Apr '11

Hello community, here is the log from the commit of package physfs for openSUSE:Factory checked in at Sun Apr 3 12:20:16 CEST 2011. -------- --- physfs/physfs.changes 2011-02-21 22:27:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/physfs/physfs.changes 2011-04-03 08:17:08.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 3 06:12:07 UTC 2011 - reddwarf(a)opensuse.org + +- Fix gcc 4.6 compilation +- Use %optflags + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- physfs-2.0.2-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service:set_version:physfs.spec ++++++ --- /var/tmp/diff_new_pack.FZ4Pr0/_old 2011-04-03 12:18:31.000000000 +0200 +++ /var/tmp/diff_new_pack.FZ4Pr0/_new 2011-04-03 12:18:31.000000000 +0200 @@ -20,12 +20,14 @@ Name: physfs Version: 2.0.2 -Release: 1 +Release: 2 License: ZLIB + LGPLv2.1/CPL plus exception Summary: PhysicsFS file abstraction layer for games Url: http://www.icculus.org/physfs/ Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM %{name}-2.0.2-gcc46.patch reddwarf(a)opensuse.org -- Fixes gcc 4.6 compilation. From upstream trunk. +Patch0: %{name}-2.0.2-gcc46.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: zlib-devel @@ -109,19 +111,22 @@ %prep %setup -q +%patch0 %build # just to be sure... rm -rf zlib123 mkdir build cd build +export CFLAGS='%{optflags}' +export CXXFLAGS='%{optflags}' cmake -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \ -DCMAKE_BUILD_TYPE=Release \ -DPHYSFS_BUILD_STATIC=FALSE \ -DPHYSFS_BUILD_TEST=FALSE .. -make %{?_smp_mflags} +make %{?_smp_mflags} VERBOSE=1 %install cd build ++++++ physfs.spec ++++++ --- /var/tmp/diff_new_pack.FZ4Pr0/_old 2011-04-03 12:18:31.000000000 +0200 +++ /var/tmp/diff_new_pack.FZ4Pr0/_new 2011-04-03 12:18:31.000000000 +0200 @@ -20,12 +20,14 @@ Name: physfs Version: to_be_filled_by_service -Release: 2 +Release: 3 License: ZLIB + LGPLv2.1/CPL plus exception Summary: PhysicsFS file abstraction layer for games Url: http://www.icculus.org/physfs/ Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM %{name}-2.0.2-gcc46.patch reddwarf(a)opensuse.org -- Fixes gcc 4.6 compilation. From upstream trunk. +Patch0: %{name}-2.0.2-gcc46.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: zlib-devel @@ -109,19 +111,22 @@ %prep %setup -q +%patch0 %build # just to be sure... rm -rf zlib123 mkdir build cd build +export CFLAGS='%{optflags}' +export CXXFLAGS='%{optflags}' cmake -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \ -DCMAKE_BUILD_TYPE=Release \ -DPHYSFS_BUILD_STATIC=FALSE \ -DPHYSFS_BUILD_TEST=FALSE .. -make %{?_smp_mflags} +make %{?_smp_mflags} VERBOSE=1 %install cd build ++++++ physfs-2.0.2-gcc46.patch ++++++ Index: archivers/wad.c =================================================================== --- archivers/wad.c.orig +++ archivers/wad.c @@ -245,9 +245,6 @@ static int wad_load_entries(const char * PHYSFS_uint32 fileCount; PHYSFS_uint32 directoryOffset; WADentry *entry; - char lastDirectory[9]; - - lastDirectory[8] = 0; /* Make sure lastDirectory stays null-terminated. */ BAIL_IF_MACRO(!wad_open(name, forWriting, &fh, &fileCount,&directoryOffset), NULL, 0); info->entryCount = fileCount; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5 for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '11

03 Apr '11

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at Sun Apr 3 12:18:17 CEST 2011. -------- --- php5/php5.changes 2011-03-16 04:53:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2011-04-02 02:55:31.000000000 +0200 @@ -1,0 +2,17 @@ +Sat Apr 2 00:52:57 UTC 2011 - crrodriguez(a)opensuse.org + +- Intl extension failed to load [bnc#659868] +- Fix update-alternatives usage,will be dropped in the future. + +------------------------------------------------------------------- +Thu Mar 17 17:07:26 UTC 2011 - crrodriguez(a)opensuse.org + +- Update to php 5.3.6 final +* Enforce security in the fastcgi protocol parsing with fpm SAPI. +* Fixed bug #54247 (format-string vulnerability on Phar). (CVE-2011-1153) +* Fixed bug #54193 (Integer overflow in shmop_read()). (CVE-2011-1092) +* Fixed bug #54055 (buffer overrun with high values for precision ini setting). +* Fixed bug #54002 (crash on crafted tag in exif). (CVE-2011-0708) +* Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive). (CVE-2011-0421) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:download_url:php-5.3.6RC3.tar.bz2 New: ---- _service:download_url:php-5.3.6.tar.bz2 php-5.3.6-intl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.plQ2by/_old 2011-04-03 12:15:07.000000000 +0200 +++ /var/tmp/diff_new_pack.plQ2by/_new 2011-04-03 12:15:07.000000000 +0200 @@ -76,7 +76,7 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.3.5.90 +Version: 5.3.6 Release: 1 License: The PHP License, version 3.01 Group: Development/Languages/Other @@ -87,7 +87,7 @@ PreReq: update-alternatives #extensions that are no longer here Obsoletes: php5-dbx php5-dio php5-fam php5-filepro php5-yp php5-dbase php5-ncurses -Source0: php-5.3.6RC3.tar.bz2 +Source0: php-%{version}.tar.bz2 Source1: php-suse-addons.tar.bz2 Source2: suhosin-%{suhosin_version}.tar.gz Source4: README.SUSE-pear @@ -117,6 +117,7 @@ Patch25: php-cloexec.patch Patch26: php-5.3.4-pts.patch Patch27: php-5.3.4-format-string-issues.patch +Patch28: php-5.3.6-intl.patch Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -1197,7 +1198,7 @@ See http://www.php.net/credits.php for more details %prep -%setup -q -n php-5.3.6RC3 -a 1 +%setup -q -n php-%{version} -a 1 %{__tar} xf %{S:2} -C ext %{__mv} ext/suhosin-%{suhosin_version} ext/suhosin %{__cp} %{S:4} pear/README.SUSE @@ -1227,6 +1228,7 @@ %patch25 %patch26 %patch27 +%patch28 # we build three SAPI %{__mkdir_p} build-apache2 build-fpm %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi @@ -1278,8 +1280,8 @@ %{__rm} -f configure ./buildconf --force # export flags -CFLAGS="$RPM_OPT_FLAGS -Wmissing-format-attribute -D_GNU_SOURCE -fno-strict-aliasing -pipe" -CXXFLAGS="$RPM_OPT_FLAGS -Wmissing-format-attribute -D_GNU_SOURCE -fno-strict-aliasing -pipe" +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing" +CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing" %if 0%{?suse_version} > 1000 CFLAGS="$CFLAGS -fstack-protector" CXXFLAGS="$CXXFLAGS -fstack-protector" @@ -1609,7 +1611,7 @@ update-alternatives --auto phpize #php-config update-alternatives --install %{_bindir}/php-config php-config %{_bindir}/php-config5 5 \ - --slave %{_mandir}/man1/phpize.1.gz php-config.1 %{_mandir}/man1/php-config5.1.gz + --slave %{_mandir}/man1/php-config.1.gz php-config.1 %{_mandir}/man1/php-config5.1.gz update-alternatives --auto php-config #pecl update-alternatives --install %{_bindir}/pecl pecl %{_bindir}/pecl5 5 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.plQ2by/_old 2011-04-03 12:15:07.000000000 +0200 +++ /var/tmp/diff_new_pack.plQ2by/_new 2011-04-03 12:15:07.000000000 +0200 @@ -1,12 +1,12 @@ <services> <service name="download_url"> <param name="protocol">http</param> - <param name="host">downloads.php.net</param> - <param name="path">/johannes/php-5.3.6RC3.tar.bz2</param> + <param name="host">de3.php.net</param> + <param name="path">/distributions/php-5.3.6.tar.bz2</param> </service> <service name="verify_file"> - <param name="file">_service:download_url:php-5.3.6RC3.tar.bz2</param> + <param name="file">_service:download_url:php-5.3.6.tar.bz2</param> <param name="verifier">sha256</param> - <param name="checksum">713f053b56ae0028565cc75deade2d04d7ceb506f4b361b5cc4fff70af69777c</param> + <param name="checksum">30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198</param> </service> </services> \ No newline at end of file ++++++ _service:download_url:php-5.3.6RC3.tar.bz2 -> _service:download_url:php-5.3.6.tar.bz2 ++++++ php5/_service:download_url:php-5.3.6RC3.tar.bz2 /mounts/work_src_done/STABLE/php5/_service:download_url:php-5.3.6.tar.bz2 differ: char 11, line 1 ++++++ php-5.3.2-aconf26x.patch ++++++ --- /var/tmp/diff_new_pack.plQ2by/_old 2011-04-03 12:15:07.000000000 +0200 +++ /var/tmp/diff_new_pack.plQ2by/_new 2011-04-03 12:15:07.000000000 +0200 @@ -40,7 +40,7 @@ --- configure.in.orig +++ configure.in @@ -1,7 +1,7 @@ - ## $Id: configure.in 309051 2011-03-09 16:37:58Z johannes $ -*- autoconf -*- + ## $Id: configure.in 309329 2011-03-17 07:48:29Z johannes $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) ++++++ php-5.3.6-intl.patch ++++++ --- ext/intl/grapheme/grapheme_string.c.orig +++ ext/intl/grapheme/grapheme_string.c @@ -665,7 +665,7 @@ PHP_FUNCTION(grapheme_stristr) /* }}} */ /* {{{ grapheme_extract_charcount_iter - grapheme iterator for grapheme_extract MAXCHARS */ -inline int32_t +static inline int32_t grapheme_extract_charcount_iter(UBreakIterator *bi, int32_t csize, unsigned char *pstr, int32_t str_len) { int pos = 0, prev_pos = 0; @@ -702,7 +702,7 @@ grapheme_extract_charcount_iter(UBreakIt /* }}} */ /* {{{ grapheme_extract_bytecount_iter - grapheme iterator for grapheme_extract MAXBYTES */ -inline int32_t +static inline int32_t grapheme_extract_bytecount_iter(UBreakIterator *bi, int32_t bsize, unsigned char *pstr, int32_t str_len) { int pos = 0, prev_pos = 0; @@ -736,7 +736,7 @@ grapheme_extract_bytecount_iter(UBreakIt /* }}} */ /* {{{ grapheme_extract_count_iter - grapheme iterator for grapheme_extract COUNT */ -inline int32_t +static inline int32_t grapheme_extract_count_iter(UBreakIterator *bi, int32_t size, unsigned char *pstr, int32_t str_len) { int pos = 0, next_pos = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zlib for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '11

03 Apr '11

Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at Sun Apr 3 12:14:01 CEST 2011. -------- --- zlib/zlib.changes 2011-01-09 14:33:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/zlib/zlib.changes 2011-03-30 21:48:31.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Mar 30 19:47:30 UTC 2011 - crrodriguez(a)opensuse.org + +- Update SSE2/MMX patches to version 2. + +------------------------------------------------------------------- +Tue Mar 15 22:38:32 UTC 2011 - crrodriguez(a)opensuse.org + +- Add highly experimental patches to use SSE2/SSSE3/MMX in zlib + this makes the library up to 6 times faster. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 01-prepare.patch 02-ppc_altivec.patch 03-arm.patch 04-x86.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib.spec ++++++ --- /var/tmp/diff_new_pack.Tg1qVv/_old 2011-04-03 12:13:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Tg1qVv/_new 2011-04-03 12:13:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package zlib (Version 1.2.5) +# spec file for package zlib # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ %endif # Version: 1.2.5 -Release: 5 +Release: 11 Summary: Data Compression Library Url: http://www.zlib.net/ Source: zlib-%{version}.tar.bz2 @@ -40,6 +40,10 @@ Patch1: zlib-lfs.patch # PATCH-FIX-JENGELH-PARALLEL-MAKE zlib-parallel.patch meissner(a)novell.com -- shared library links with libz.a Patch2: zlib-parallel.patch +Patch3: 01-prepare.patch +Patch4: 02-ppc_altivec.patch +Patch5: 03-arm.patch +Patch6: 04-x86.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig @@ -84,6 +88,10 @@ %patch0 %patch1 %patch2 -p1 +%patch3 +%patch4 +%patch5 +%patch6 %build # Marcus: breaks example64 in 32bit builds. ++++++ 01-prepare.patch ++++++ === modified file 'Makefile.in' --- Makefile.in 2011-03-14 01:01:37 +0000 +++ Makefile.in 2011-03-14 02:19:21 +0000 @@ -236,7 +236,8 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. -adler32.o zutil.o: zutil.h zlib.h zconf.h +adler32.o: adler32.c zutil.h zlib.h zconf.h +zutil.o: zutil.h zlib.h zconf.h gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h crc32.o: zutil.h zlib.h zconf.h crc32.h @@ -246,7 +247,8 @@ inftrees.o: zutil.h zlib.h zconf.h inftrees.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h -adler32.lo zutil.lo: zutil.h zlib.h zconf.h +adler32.lo: adler32.c zutil.h zlib.h zconf.h +zutil.lo: zutil.h zlib.h zconf.h gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h crc32.lo: zutil.h zlib.h zconf.h crc32.h === modified file 'adler32.c' --- adler32.c 2011-03-14 01:01:37 +0000 +++ adler32.c 2011-03-30 13:38:42 +0000 @@ -9,6 +9,35 @@ #define local static +#define GCC_VERSION_GE(x) ((__GNUC__-0) * 100 + __GNUC_MINOR__-0 >= x) + +#if GCC_VERSION_GE(301) +/* sometimes leakes out of old kernel header */ +# undef noinline +# define noinline __attribute__((__noinline__)) +#else +# ifndef noinline +# define noinline +# endif +#endif + +#if GCC_VERSION_GE(301) +# define GCC_ATTR_UNUSED_PARAM __attribute__((__unused__)) +#else +# define GCC_ATTR_UNUSED_PARAM +#endif + +#if GCC_VERSION_GE(296) +# define likely(x) __builtin_expect(!!(x), 1) +# define unlikely(x) __builtin_expect(!!(x), 0) +#else +# define likely(x) (x) +# define unlikely(x) (x) +#endif + +#define ROUND_TO(x , n) ((x) & ~((n) - 1L)) +#define ALIGN_DIFF(x, n) (((intptr_t)((x)+(n) - 1L) & ~((intptr_t)(n) - 1L)) - (intptr_t)(x)) + local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2); #define BASE 65521UL /* largest prime smaller than 65536 */ @@ -21,9 +50,20 @@ #define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); #define DO16(buf) DO8(buf,0); DO8(buf,8); +#if defined(__alpha__) +/* even if gcc can generate a mul by inverse, the code is really + * ugly (find global const pool pointer, load constant, a mul, lots + * of shifts/add/sub), up to 14 instructions. The replacement code + * only needs >= 5 instructions + */ +# define NO_DIVIDE +#endif + /* use NO_DIVIDE if your processor does not do division in hardware */ #ifdef NO_DIVIDE -# define MOD(a) \ +/* use NO_SHIFT if your processor does shift > 1 by loop */ +# ifdef NO_SHIFT +# define reduce_full(a) \ do { \ if (a >= (BASE << 16)) a -= (BASE << 16); \ if (a >= (BASE << 15)) a -= (BASE << 15); \ @@ -43,21 +83,237 @@ if (a >= (BASE << 1)) a -= (BASE << 1); \ if (a >= BASE) a -= BASE; \ } while (0) -# define MOD4(a) \ +# define reduce_x(a) \ do { \ + if (MIN_WORK >= (1 << 6) && a >= (BASE << 6)) a -= (BASE << 6); \ + if (MIN_WORK >= (1 << 5) && a >= (BASE << 5)) a -= (BASE << 5); \ if (a >= (BASE << 4)) a -= (BASE << 4); \ if (a >= (BASE << 3)) a -= (BASE << 3); \ if (a >= (BASE << 2)) a -= (BASE << 2); \ if (a >= (BASE << 1)) a -= (BASE << 1); \ if (a >= BASE) a -= BASE; \ } while (0) +# define reduce(a) reduce_full(a) +# else +# define reduce_full(a) \ + do { \ + unsigned long b = a & 0x0000ffff; \ + a >>= 16; \ + b -= a; \ + a <<= 4; \ + a += b; \ + } while(a >= BASE) +# define reduce_x(a) \ + do { \ + unsigned long b = a & 0x0000ffff; \ + a >>= 16; \ + b -= a; \ + a <<= 4; \ + a += b; \ + a = a >= BASE ? a - BASE : a; \ + } while(0) +# define reduce(a) \ + do { \ + unsigned long b = a & 0x0000ffff; \ + a >>= 16; \ + b -= a; \ + a <<= 4; \ + a += b; \ + } while(0) +# endif #else -# define MOD(a) a %= BASE -# define MOD4(a) a %= BASE -#endif - -/* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) +# define reduce_full(a) a %= BASE +# define reduce_x(a) a %= BASE +# define reduce(a) a %= BASE +#endif + +local int host_is_bigendian() +{ + local const union { + uInt d; + unsigned char endian[sizeof(uInt)]; + } x = {1}; + return x.endian[0] == 0; +} + +#ifndef MIN_WORK +# define MIN_WORK 16 +#endif + +/* ========================================================================= */ +local noinline uLong adler32_1(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len GCC_ATTR_UNUSED_PARAM; +{ + unsigned long sum2; + + /* split Adler-32 into component sums */ + sum2 = (adler >> 16) & 0xffff; + adler &= 0xffff; + + adler += buf[0]; + if (adler >= BASE) + adler -= BASE; + sum2 += adler; + if (sum2 >= BASE) + sum2 -= BASE; + return adler | (sum2 << 16); +} + +/* ========================================================================= */ +local noinline uLong adler32_common(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + unsigned long sum2; + + /* split Adler-32 into component sums */ + sum2 = (adler >> 16) & 0xffff; + adler &= 0xffff; + + while (len--) { + adler += *buf++; + sum2 += adler; + } + if (adler >= BASE) + adler -= BASE; + reduce_x(sum2); /* only added so many BASE's */ + return adler | (sum2 << 16); +} + +#ifndef HAVE_ADLER32_VEC +# if (defined(__LP64__) || ((SIZE_MAX-0) >> 31) >= 2) && !defined(NO_ADLER32_VEC) + +/* On 64 Bit archs, we can do pseudo SIMD with a nice win. + * This is esp. important for old Alphas, they do not have byte + * access. + * This needs some register but x86_64 is fine (>= 9 for the mainloop + * req.). If your 64 Bit arch is more limited, throw it away... + */ +# ifndef UINT64_C +# if defined(_MSC_VER) || defined(__BORLANDC__) +# define UINT64_C(c) (c ## ui64) +# else +# define UINT64_C(c) (c ## ULL) +# endif +# endif + +# undef VNMAX +# define VNMAX (2*NMAX+((9*NMAX)/10)) + +/* ========================================================================= */ +local noinline uLong adler32_vec(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + unsigned int s1, s2; + unsigned int k; + + /* split Adler-32 into component sums */ + s1 = adler & 0xffff; + s2 = (adler >> 16) & 0xffff; + + /* align input data */ + k = ALIGN_DIFF(buf, sizeof(size_t)); + len -= k; + if (k) do { + s1 += *buf++; + s2 += s1; + } while(--k); + + k = len > VNMAX ? VNMAX : len; + len -= k; + if (likely(k >= 2 * sizeof(size_t))) do + { + unsigned int vs1, vs2; + unsigned int vs1s; + + /* add s1 to s2 for rounds to come */ + s2 += s1 * ROUND_TO(k, sizeof(size_t)); + vs1s = vs1 = vs2 = 0; + do { + size_t vs1l = 0, vs1h = 0, vs1l_s = 0, vs1h_s = 0; + unsigned int a, b, c, d, e, f, g, h; + unsigned int j; + + j = k > 23 * sizeof(size_t) ? 23 : k/sizeof(size_t); + k -= j * sizeof(size_t); + /* add s1 to s1 round sum for rounds to come */ + vs1s += j * vs1; + do { + size_t in8 = *(const size_t *)buf; + buf += sizeof(size_t); + /* add this s1 to s1 round sum */ + vs1l_s += vs1l; + vs1h_s += vs1h; + /* add up input data to s1 */ + vs1l += in8 & UINT64_C(0x00ff00ff00ff00ff); + vs1h += (in8 & UINT64_C(0xff00ff00ff00ff00)) >> 8; + } while(--j); + + /* split s1 */ + if(host_is_bigendian()) { + a = (vs1h >> 48) & 0x0000ffff; + b = (vs1l >> 48) & 0x0000ffff; + c = (vs1h >> 32) & 0x0000ffff; + d = (vs1l >> 32) & 0x0000ffff; + e = (vs1h >> 16) & 0x0000ffff; + f = (vs1l >> 16) & 0x0000ffff; + g = (vs1h ) & 0x0000ffff; + h = (vs1l ) & 0x0000ffff; + } else { + a = (vs1l ) & 0x0000ffff; + b = (vs1h ) & 0x0000ffff; + c = (vs1l >> 16) & 0x0000ffff; + d = (vs1h >> 16) & 0x0000ffff; + e = (vs1l >> 32) & 0x0000ffff; + f = (vs1h >> 32) & 0x0000ffff; + g = (vs1l >> 48) & 0x0000ffff; + h = (vs1h >> 48) & 0x0000ffff; + } + + /* add s1 & s2 horiz. */ + vs2 += 8*a + 7*b + 6*c + 5*d + 4*e + 3*f + 2*g + 1*h; + vs1 += a + b + c + d + e + f + g + h; + + /* split and add up s1 round sum */ + vs1l_s = ((vs1l_s ) & UINT64_C(0x0000ffff0000ffff)) + + ((vs1l_s >> 16) & UINT64_C(0x0000ffff0000ffff)); + vs1h_s = ((vs1h_s ) & UINT64_C(0x0000ffff0000ffff)) + + ((vs1h_s >> 16) & UINT64_C(0x0000ffff0000ffff)); + vs1l_s += vs1h_s; + vs1s += ((vs1l_s ) & UINT64_C(0x00000000ffffffff)) + + ((vs1l_s >> 32) & UINT64_C(0x00000000ffffffff)); + } while (k >= sizeof(size_t)); + reduce(vs1s); + s2 += vs1s * 8 + vs2; + reduce(s2); + s1 += vs1; + reduce(s1); + len += k; + k = len > VNMAX ? VNMAX : len; + len -= k; + } while (k >= sizeof(size_t)); + + /* handle trailer */ + if (k) do { + s1 += *buf++; + s2 += s1; + } while (--k); + reduce(s1); + reduce(s2); + + /* return recombined sums */ + return (s2 << 16) | s1; +} + +# else + +/* ========================================================================= */ +local noinline uLong adler32_vec(adler, buf, len) uLong adler; const Bytef *buf; uInt len; @@ -69,33 +325,6 @@ sum2 = (adler >> 16) & 0xffff; adler &= 0xffff; - /* in case user likes doing a byte at a time, keep it fast */ - if (len == 1) { - adler += buf[0]; - if (adler >= BASE) - adler -= BASE; - sum2 += adler; - if (sum2 >= BASE) - sum2 -= BASE; - return adler | (sum2 << 16); - } - - /* initial Adler-32 value (deferred check for len == 1 speed) */ - if (buf == Z_NULL) - return 1L; - - /* in case short lengths are provided, keep it somewhat fast */ - if (len < 16) { - while (len--) { - adler += *buf++; - sum2 += adler; - } - if (adler >= BASE) - adler -= BASE; - MOD4(sum2); /* only added so many BASE's */ - return adler | (sum2 << 16); - } - /* do length NMAX blocks -- requires just one modulo operation */ while (len >= NMAX) { len -= NMAX; @@ -104,8 +333,8 @@ DO16(buf); /* 16 sums unrolled */ buf += 16; } while (--n); - MOD(adler); - MOD(sum2); + reduce_full(adler); + reduce_full(sum2); } /* do remaining bytes (less than NMAX, still just one modulo) */ @@ -119,13 +348,36 @@ adler += *buf++; sum2 += adler; } - MOD(adler); - MOD(sum2); + reduce_full(adler); + reduce_full(sum2); } /* return recombined sums */ return adler | (sum2 << 16); } +# endif +#endif + +/* ========================================================================= */ +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + /* in case user likes doing a byte at a time, keep it fast */ + if (len == 1) + return adler32_1(adler, buf, len); /* should create a fast tailcall */ + + /* initial Adler-32 value (deferred check for len == 1 speed) */ + if (buf == Z_NULL) + return 1L; + + /* in case short lengths are provided, keep it somewhat fast */ + if (len < MIN_WORK) + return adler32_common(adler, buf, len); + + return adler32_vec(adler, buf, len); +} /* ========================================================================= */ local uLong adler32_combine_(adler1, adler2, len2) @@ -141,7 +393,7 @@ rem = (unsigned)(len2 % BASE); sum1 = adler1 & 0xffff; sum2 = rem * sum1; - MOD(sum2); + reduce_full(sum2); sum1 += (adler2 & 0xffff) + BASE - 1; sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; if (sum1 >= BASE) sum1 -= BASE; ++++++ 02-ppc_altivec.patch ++++++ === modified file 'Makefile.in' --- Makefile.in 2011-03-14 02:19:21 +0000 +++ Makefile.in 2011-03-14 03:06:03 +0000 @@ -236,7 +236,7 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. -adler32.o: adler32.c zutil.h zlib.h zconf.h +adler32.o: adler32.c adler32_ppc.c zutil.h zlib.h zconf.h zutil.o: zutil.h zlib.h zconf.h gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h @@ -247,7 +247,7 @@ inftrees.o: zutil.h zlib.h zconf.h inftrees.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h -adler32.lo: adler32.c zutil.h zlib.h zconf.h +adler32.lo: adler32.c adler32_ppc.c zutil.h zlib.h zconf.h zutil.lo: zutil.h zlib.h zconf.h gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h === modified file 'adler32.c' --- adler32.c 2011-03-30 13:38:42 +0000 +++ adler32.c 2011-03-30 13:38:46 +0000 @@ -36,7 +36,10 @@ #endif #define ROUND_TO(x , n) ((x) & ~((n) - 1L)) +#define DIV_ROUNDUP(a, b) (((a) + (b) - 1) / (b)) #define ALIGN_DIFF(x, n) (((intptr_t)((x)+(n) - 1L) & ~((intptr_t)(n) - 1L)) - (intptr_t)(x)) +#define ALIGN_DOWN(x, n) (((intptr_t)(x)) & ~((intptr_t)(n) - 1L)) +#define ALIGN_DOWN_DIFF(x, n) (((intptr_t)(x)) & ((intptr_t)(n) - 1L)) local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2); @@ -136,6 +139,12 @@ return x.endian[0] == 0; } +#ifndef NO_ADLER32_VEC +# if defined(__powerpc__) || defined(__powerpc64__) +# include "adler32_ppc.c" +# endif +#endif + #ifndef MIN_WORK # define MIN_WORK 16 #endif === added file 'adler32_ppc.c' --- adler32_ppc.c 1970-01-01 00:00:00 +0000 +++ adler32_ppc.c 2011-03-30 11:12:04 +0000 @@ -0,0 +1,253 @@ +/* + * adler32.c -- compute the Adler-32 checksum of a data stream + * ppc implementation + * Copyright (C) 1995-2007 Mark Adler + * Copyright (C) 2009-2011 Jan Seiffert + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +/* + * We use the Altivec PIM vector stuff, but still, this is only + * tested with GCC, and prop. uses some GCC specifics (like GCC + * understands vector types and you can simply write a += b) + */ +#if defined(__ALTIVEC__) && defined(__GNUC__) +# define HAVE_ADLER32_VEC +/* it needs some bytes till the vec version gets up to speed... */ +# define MIN_WORK 64 +# include <altivec.h> + +/* + * Depending on length, this can be slower (short length < 64 bytes), + * much faster (our beloved 128kb 22.2s generic to 3.4s vec, but cache + * is important...), to a little faster (very long length, 1.6MB, 47.6s + * to 36s), which is prop. only capped by memory bandwith. + * (The orig. 128k case was slower in AltiVec, because AltiVec loads + * are always uncached and trigger no HW prefetching, because that is + * what you often need with mass data manipulation (not poisen your + * cache, movntq), instead you have to do it for yourself (data stream + * touch). With 128k it could be cleanly seen: no prefetch, half as slow + * as generic, but comment out the memory load -> 3s. With proper prefetch + * we are at 3.4s. So AltiVec can execute these "expensive" FMA quite + * fast (even without fancy unrolling), only the data does not arrive + * fast enough. In cases where the working set does not fit into cache + * it simply cannot be delivered fast enough over the FSB/Mem). + * Still we have to prefetch, or we are slow as hell. + */ + +# define SOVUC (sizeof(vector unsigned char)) + +/* can be propably more, since we do not have the x86 psadbw 64 bit sum */ +# define VNMAX (6*NMAX) + +/* ========================================================================= */ +local inline vector unsigned char vec_identl(level) + unsigned int level; +{ + return vec_lvsl(level, (const unsigned char *)0); +} + +/* ========================================================================= */ +local inline vector unsigned char vec_ident_rev(void) +{ + return vec_xor(vec_identl(0), vec_splat_u8(15)); +} + +/* ========================================================================= */ +/* multiply two 32 bit ints, return the low 32 bit */ +local inline vector unsigned int vec_mullw(vector unsigned int a, vector unsigned int b) +{ + vector unsigned int v16 = vec_splat_u32(-16); + vector unsigned int v0_32 = vec_splat_u32(0); + vector unsigned int swap, low, high; + + swap = vec_rl(b, v16); + low = vec_mulo((vector unsigned short)a, (vector unsigned short)b); + high = vec_msum((vector unsigned short)a, (vector unsigned short)swap, v0_32); + high = vec_sl(high, v16); + return vec_add(low, high); +} + +/* ========================================================================= */ +local inline vector unsigned int vector_reduce(vector unsigned int x) +{ + vector unsigned int y; + vector unsigned int vsh; + + vsh = vec_splat_u32(1); + vsh = vec_sl(vsh, vec_splat_u32(4)); + + y = vec_sl(x, vsh); + y = vec_sr(y, vsh); + x = vec_sr(x, vsh); + y = vec_sub(y, x); + x = vec_sl(x, vec_splat_u32(4)); + x = vec_add(x, y); + return x; +} + +/* ========================================================================= */ +local noinline uLong adler32_vec(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + unsigned int s1, s2; + + s1 = adler & 0xffff; + s2 = (adler >> 16) & 0xffff; + + if (likely(len >= 2*SOVUC)) { + vector unsigned int v0_32 = vec_splat_u32(0); + vector unsigned int vsh = vec_splat_u32(4); + vector unsigned char v1 = vec_splat_u8(1); + vector unsigned char vord; + vector unsigned char v0 = vec_splat_u8(0); + vector unsigned int vs1, vs2; + vector unsigned char in16, vord_a, v1_a, vperm; + unsigned int f, n; + unsigned int k, block_num; + + /* + * if i understand the Altivec PEM right, little + * endian impl. should have the data reversed on + * load, so the big endian vorder works. + */ + vord = vec_ident_rev() + v1; + block_num = DIV_ROUNDUP(len, 512); /* 32 block size * 16 bytes */ + f = 512; + f |= block_num >= 256 ? 0 : block_num << 16; + vec_dst(buf, f, 2); + /* + * Add stuff to achieve alignment + */ + /* swizzle masks in place */ + vperm = vec_lvsl(0, buf); + vord_a = vec_perm(vord, v0, vperm); + v1_a = vec_perm(v1, v0, vperm); + vperm = vec_lvsr(0, buf); + vord_a = vec_perm(v0, vord_a, vperm); + v1_a = vec_perm(v0, v1_a, vperm); + + /* align hard down */ + f = (unsigned) ALIGN_DOWN_DIFF(buf, SOVUC); + n = SOVUC - f; + buf = (const unsigned char *)ALIGN_DOWN(buf, SOVUC); + + /* add n times s1 to s2 for start round */ + s2 += s1 * n; + + /* set sums 0 */ + vs1 = v0_32; + vs2 = v0_32; + + k = len < VNMAX ? (unsigned)len : VNMAX; + len -= k; + + /* insert scalar start somewhere */ + vs1 = vec_lde(0, &s1); + vs2 = vec_lde(0, &s2); + + /* get input data */ + in16 = vec_ldl(0, buf); + + /* mask out excess data, add 4 byte horizontal and add to old dword */ + vs1 = vec_msum(in16, v1_a, vs1); + + /* apply order, masking out excess data, add 4 byte horizontal and add to old dword */ + vs2 = vec_msum(in16, vord_a, vs2); + + buf += SOVUC; + k -= n; + + if (likely(k >= SOVUC)) do { + vector unsigned int vs1_r = v0_32; + f = 512; + f |= block_num >= 256 ? 0 : block_num << 16; + vec_dst(buf, f, 2); + + do { + /* get input data */ + in16 = vec_ldl(0, buf); + + /* add vs1 for this round */ + vs1_r += vs1; + + /* add 4 byte horizontal and add to old dword */ + vs1 = vec_sum4s(in16, vs1); + /* apply order, add 4 byte horizontal and add to old dword */ + vs2 = vec_msum(in16, vord, vs2); + + buf += SOVUC; + k -= SOVUC; + } while (k >= SOVUC); + /* reduce vs1 round sum before multiplying by 16 */ + vs1_r = vector_reduce(vs1_r); + /* add all vs1 for 16 times */ + vs2 += vec_sl(vs1_r, vsh); + /* reduce the vectors to something in the range of BASE */ + vs2 = vector_reduce(vs2); + vs1 = vector_reduce(vs1); + len += k; + k = len < VNMAX ? (unsigned)len : VNMAX; + block_num = DIV_ROUNDUP(len, 512); /* 32 block size * 16 bytes */ + len -= k; + } while (likely(k >= SOVUC)); + + if (likely(k)) { + vector unsigned int vk; + /* + * handle trailer + */ + f = SOVUC - k; + /* swizzle masks in place */ + vperm = vec_identl(f); + vord_a = vec_perm(vord, v0, vperm); + v1_a = vec_perm(v1, v0, vperm); + + /* add k times vs1 for this trailer */ + vk = (vector unsigned int)vec_lvsl(0, (unsigned *)(intptr_t)k); + vk = (vector unsigned)vec_mergeh(v0, (vector unsigned char)vk); + vk = (vector unsigned)vec_mergeh((vector unsigned short)v0, (vector unsigned short)vk); + vk = vec_splat(vk, 0); + vs2 += vec_mullw(vs1, vk); + + /* get input data */ + in16 = vec_ldl(0, buf); + + /* mask out excess data, add 4 byte horizontal and add to old dword */ + vs1 = vec_msum(in16, v1_a, vs1); + /* apply order, masking out excess data, add 4 byte horizontal and add to old dword */ + vs2 = vec_msum(in16, vord_a, vs2); + + buf += k; + k -= k; + } + + vec_dss(2); + + /* add horizontal */ + /* stuff should be reduced so no proplem with signed sature */ + vs1 = (vector unsigned)vec_sums((vector int)vs1, (vector int)v0_32); + vs2 = (vector unsigned)vec_sums((vector int)vs2, (vector int)v0_32); + /* shake and roll */ + vs1 = vec_splat(vs1, 3); + vs2 = vec_splat(vs2, 3); + vec_ste(vs1, 0, &s1); + vec_ste(vs2, 0, &s2); + /* after horizontal add, reduce again in scalar code */ + } + + if (unlikely(len)) do { + s1 += *buf++; + s2 += s1; + } while (--len); + reduce(s1); + reduce(s2); + + return (s2 << 16) | s1; +} + +#endif ++++++ 03-arm.patch ++++++ === modified file 'Makefile.in' --- Makefile.in 2011-03-14 03:06:03 +0000 +++ Makefile.in 2011-03-14 14:39:24 +0000 @@ -236,7 +236,7 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. -adler32.o: adler32.c adler32_ppc.c zutil.h zlib.h zconf.h +adler32.o: adler32.c adler32_ppc.c adler32_arm.c zutil.h zlib.h zconf.h zutil.o: zutil.h zlib.h zconf.h gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h @@ -247,7 +247,7 @@ inftrees.o: zutil.h zlib.h zconf.h inftrees.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h -adler32.lo: adler32.c adler32_ppc.c zutil.h zlib.h zconf.h +adler32.lo: adler32.c adler32_ppc.c adler32_arm.c zutil.h zlib.h zconf.h zutil.lo: zutil.h zlib.h zconf.h gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h === modified file 'adler32.c' --- adler32.c 2011-03-30 13:38:46 +0000 +++ adler32.c 2011-03-30 13:38:46 +0000 @@ -140,7 +140,9 @@ } #ifndef NO_ADLER32_VEC -# if defined(__powerpc__) || defined(__powerpc64__) +# if defined(__arm__) +# include "adler32_arm.c" +# elif defined(__powerpc__) || defined(__powerpc64__) # include "adler32_ppc.c" # endif #endif === added file 'adler32_arm.c' --- adler32_arm.c 1970-01-01 00:00:00 +0000 +++ adler32_arm.c 2011-03-30 11:18:49 +0000 @@ -0,0 +1,359 @@ +/* + * adler32.c -- compute the Adler-32 checksum of a data stream + * arm implementation + * Copyright (C) 1995-2007 Mark Adler + * Copyright (C) 2009-2011 Jan Seiffert + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#if defined(__ARM_NEON__) +// TODO: need byte order define +/* + * Big endian NEON qwords are kind of broken. + * They are big endian within the dwords, but WRONG + * (really??) way round between lo and hi. + * Creating some kind of PDP11 middle endian. + * + * This is madness and unsupportable. For this reason + * GCC wants to disable qword endian specific patterns. + * We would need a Preprocessor define which endian we + * have to disable this code. + */ +# include <arm_neon.h> + +# define SOVUCQ sizeof(uint8x16_t) +# define SOVUC sizeof(uint8x8_t) +/* since we do not have the 64bit psadbw sum, we could prop. do a little more */ +# define VNMAX (6*NMAX) +# define HAVE_ADLER32_VEC +# define MIN_WORK 32 + +/* ========================================================================= */ +local inline uint8x16_t neon_simple_alignq(uint8x16_t a, uint8x16_t b, unsigned amount) +{ + switch(amount % SOVUCQ) + { + case 0: return a; + case 1: return vextq_u8(a, b, 1); + case 2: return vextq_u8(a, b, 2); + case 3: return vextq_u8(a, b, 3); + case 4: return vextq_u8(a, b, 4); + case 5: return vextq_u8(a, b, 5); + case 6: return vextq_u8(a, b, 6); + case 7: return vextq_u8(a, b, 7); + case 8: return vextq_u8(a, b, 8); + case 9: return vextq_u8(a, b, 9); + case 10: return vextq_u8(a, b, 10); + case 11: return vextq_u8(a, b, 11); + case 12: return vextq_u8(a, b, 12); + case 13: return vextq_u8(a, b, 13); + case 14: return vextq_u8(a, b, 14); + case 15: return vextq_u8(a, b, 15); + } + return b; +} + +/* ========================================================================= */ +local inline uint32x4_t vector_reduce(uint32x4_t x) +{ + uint32x4_t y; + + y = vshlq_n_u32(x, 16); + x = vshrq_n_u32(x, 16); + y = vshrq_n_u32(y, 16); + y = vsubq_u32(y, x); + x = vaddq_u32(y, vshlq_n_u32(x, 4)); + return x; +} + +/* ========================================================================= */ +local noinline uLong adler32_vec(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + uint32x4_t v0_32 = (uint32x4_t){0,0,0,0}; + uint8x16_t v0 = (uint8x16_t)v0_32; + uint8x16_t vord, vord_a; + uint32x4_t vs1, vs2; + uint32x2_t v_tsum; + uint8x16_t in16; + uint32_t s1, s2; + unsigned k; + + s1 = adler & 0xffff; + s2 = (adler >> 16) & 0xffff; + +// TODO: big endian mask is prop. wrong + if (host_is_bigendian()) + vord = (uint8x16_t){16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1}; + else + vord = (uint8x16_t){1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16}; + + if (likely(len >= 2*SOVUCQ)) { + unsigned f, n; + + /* + * Add stuff to achieve alignment + */ + /* align hard down */ + f = (unsigned) ALIGN_DOWN_DIFF(buf, SOVUCQ); + n = SOVUCQ - f; + buf = (const unsigned char *)ALIGN_DOWN(buf, SOVUCQ); + + /* add n times s1 to s2 for start round */ + s2 += s1 * n; + + /* set sums 0 */ + vs1 = v0_32; + vs2 = v0_32; + /* + * the accumulation of s1 for every round grows very fast + * (quadratic?), even if we accumulate in 4 dwords, more + * rounds means nonlinear growth. + * We already split it out of s2, normaly it would be in + * s2 times 16... and even grow faster. + * Thanks to this split and vector reduction, we can stay + * longer in the loops. But we have to prepare for the worst + * (all 0xff), only do 6 times the work. + * (we could prop. stay a little longer since we have 4 sums, + * not 2 like on x86). + */ + k = len < VNMAX ? (unsigned)len : VNMAX; + len -= k; + /* insert scalar start somewhere */ + vs1 = vsetq_lane_u32(s1, vs1, 0); + vs2 = vsetq_lane_u32(s2, vs2, 0); + + /* get input data */ + in16 = *(const uint8x16_t *)buf; + /* mask out excess data */ + if(host_is_bigendian()) { + in16 = neon_simple_alignq(v0, in16, n); + vord_a = neon_simple_alignq(v0, vord, n); + } else { + in16 = neon_simple_alignq(in16, v0, f); + vord_a = neon_simple_alignq(vord, v0, f); + } + + /* pairwise add bytes and long, pairwise add word long acc */ + vs1 = vpadalq_u16(vs1, vpaddlq_u8(in16)); + /* apply order, add words, pairwise add word long acc */ + vs2 = vpadalq_u16(vs2, + vmlal_u8( + vmull_u8(vget_low_u8(in16), vget_low_u8(vord_a)), + vget_high_u8(in16), vget_high_u8(vord_a) + ) + ); + + buf += SOVUCQ; + k -= n; + + if (likely(k >= SOVUCQ)) do { + uint32x4_t vs1_r = v0_32; + do { + /* add vs1 for this round */ + vs1_r = vaddq_u32(vs1_r, vs1); + + /* get input data */ + in16 = *(const uint8x16_t *)buf; + +// TODO: make work in inner loop more tight + /* + * decompose partial sums, so we do less instructions and + * build loops around it to do acc and so on only from time + * to time. + * This is hard with NEON, because the instruction are nice: + * we have the stuff in widening and with acc (practicaly + * for free...) + */ + /* pairwise add bytes and long, pairwise add word long acc */ + vs1 = vpadalq_u16(vs1, vpaddlq_u8(in16)); + /* apply order, add words, pairwise add word long acc */ + vs2 = vpadalq_u16(vs2, + vmlal_u8( + vmull_u8(vget_low_u8(in16), vget_low_u8(vord)), + vget_high_u8(in16), vget_high_u8(vord) + ) + ); + + buf += SOVUCQ; + k -= SOVUCQ; + } while (k >= SOVUCQ); + /* reduce vs1 round sum before multiplying by 16 */ + vs1_r = vector_reduce(vs1_r); + /* add vs1 for this round (16 times) */ + /* they have shift right and accummulate, where is shift left and acc?? */ + vs2 = vaddq_u32(vs2, vshlq_n_u32(vs1_r, 4)); + /* reduce both vectors to something within 16 bit */ + vs2 = vector_reduce(vs2); + vs1 = vector_reduce(vs1); + len += k; + k = len < VNMAX ? (unsigned) len : VNMAX; + len -= k; + } while (likely(k >= SOVUC)); + + if (likely(k)) { + /* + * handle trailer + */ + f = SOVUCQ - k; + /* add k times vs1 for this trailer */ + vs2 = vmlaq_u32(vs2, vs1, vdupq_n_u32(k)); + + /* get input data */ + in16 = *(const uint8x16_t *)buf; + /* masks out bad data */ + if(host_is_bigendian()) + in16 = neon_simple_alignq(in16, v0, f); + else + in16 = neon_simple_alignq(v0, in16, k); + + /* pairwise add bytes and long, pairwise add word long acc */ + vs1 = vpadalq_u16(vs1, vpaddlq_u8(in16)); + /* apply order, add words, pairwise add word long acc */ + vs2 = vpadalq_u16(vs2, + vmlal_u8( + vmull_u8(vget_low_u8(in16), vget_low_u8(vord)), + vget_high_u8(in16), vget_high_u8(vord) + ) + ); + + buf += k; + k -= k; + } + + /* add horizontal */ + v_tsum = vpadd_u32(vget_high_u32(vs1), vget_low_u32(vs1)); + v_tsum = vpadd_u32(v_tsum, v_tsum); + s1 = vget_lane_u32(v_tsum, 0); + v_tsum = vpadd_u32(vget_high_u32(vs2), vget_low_u32(vs2)); + v_tsum = vpadd_u32(v_tsum, v_tsum); + s2 = vget_lane_u32(v_tsum, 0); + } + + if (unlikely(len)) do { + s1 += *buf++; + s2 += s1; + } while (--len); + reduce_x(s1); + reduce_x(s2); + + return (s2 << 16) | s1; +} + +/* inline asm, so only on GCC (or compatible) && ARM v6 or better */ +#elif defined(__GNUC__) && ( \ + defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ + defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \ + defined(__ARM_ARCH_7A__) \ + ) +# define SOU32 (sizeof(unsigned int)) +# define HAVE_ADLER32_VEC +# define MIN_WORK 16 + +/* ========================================================================= */ +local noinline uLong adler32_vec(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + unsigned int s1, s2; + unsigned int k; + + s1 = adler & 0xffff; + s2 = (adler >> 16) & 0xffff; + + k = ALIGN_DIFF(buf, SOU32); + len -= k; + if (k) do { + s1 += *buf++; + s2 += s1; + } while (--k); + + if (likely(len >= 4 * SOU32)) { + unsigned int vs1 = s1, vs2 = s2; + unsigned int order_lo, order_hi; + +// TODO: byte order? + if(host_is_bigendian()) { + order_lo = 0x00030001; + order_hi = 0x00040002; + } else { + order_lo = 0x00020004; + order_hi = 0x00010003; + } +// TODO: we could go over NMAX, since we have split the vs2 sum + /* something around (NMAX+(NMAX/3)+302) */ + k = len < NMAX ? len : NMAX; + len -= k; + + do { + unsigned int vs1_r = 0; + do { + unsigned int t21, t22, in; + + /* get input data */ + in = *(const unsigned int *)buf; + + /* add vs1 for this round */ + vs1_r += vs1; + + /* add horizontal and acc */ + asm ("usada8 %0, %1, %2, %3" : "=r" (vs1) : "r" (in), "r" (0), "r" (vs1)); + /* widen bytes to words, apply order, add and acc */ + asm ("uxtb16 %0, %1" : "=r" (t21) : "r" (in)); + asm ("uxtb16 %0, %1, ror #8" : "=r" (t22) : "r" (in)); +// TODO: instruction result latency + /* + * The same problem like the classic serial sum: + * Chip maker sell us 1-cycle instructions, but that is not the + * whole story. Nearly all 1-cycle chips are pipelined, so + * you can get one result per cycle, but only if _they_ (plural) + * are independent. + * If you are depending on the result of an preciding instruction, + * in the worst case you hit the instruction latency which is worst + * case >= pipeline length. On the other hand there are result-fast-paths. + * This could all be a wash with the classic sum (4 * 2 instructions, + * + dependence), since smald is: + * - 2 cycle issue + * - needs the acc in pipeline step E1, instead of E2 + * But the Cortex has a fastpath for acc. + * I don't know. + * We can not even unroll, we would need 4 order vars, return ENOREGISTER. + */ + asm ("smlad %0, %1, %2, %3" : "=r" (vs2) : "r" (t21) , "r" (order_lo), "r" (vs2)); + asm ("smlad %0, %1, %2, %3" : "=r" (vs2) : "r" (t22) , "r" (order_hi), "r" (vs2)); + + buf += SOU32; + k -= SOU32; + } while (k >= SOU32); + /* reduce vs1 round sum before multiplying by 4 */ + reduce(vs1_r); + /* add vs1 for this round (4 times) */ + vs2 += vs1_r * 4; + /* reduce both sums to something within 16 bit */ + reduce(vs2); + reduce(vs1); + len += k; + k = len < NMAX ? len : NMAX; + len -= k; + } while (likely(k >= 4 * SOU32)); + len += k; + s1 = vs1; + s2 = vs2; + } + + if (unlikely(len)) do { + s1 += *buf++; + s2 += s1; + } while (--len); + /* at this point we should no have so big s1 & s2 */ + reduce_x(s1); + reduce_x(s2); + + return (s2 << 16) | s1; +} +#endif ++++++ 04-x86.patch ++++++ ++++ 1165 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-DBD-CSV for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package perl-DBD-CSV for openSUSE:Factory checked in at Fri Apr 1 16:54:08 CEST 2011. -------- --- perl-DBD-CSV/perl-DBD-CSV.changes 2011-03-31 11:28:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-DBD-CSV/perl-DBD-CSV.changes 2011-04-01 09:53:25.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 1 07:52:28 UTC 2011 - coolo(a)novell.com + +- /pro is not FHS-compliant + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fix-perl.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBD-CSV.spec ++++++ --- /var/tmp/diff_new_pack.VbBw53/_old 2011-04-01 16:53:45.000000000 +0200 +++ /var/tmp/diff_new_pack.VbBw53/_new 2011-04-01 16:53:45.000000000 +0200 @@ -19,7 +19,7 @@ Name: perl-DBD-CSV Version: 0.31 -Release: 1 +Release: 3 License: GPL+ or Artistic %define cpan_name DBD-CSV Summary: DBI driver for CSV files @@ -27,6 +27,7 @@ Group: Development/Libraries/Perl #Source: http://www.cpan.org/authors/id/H/HM/HMBRAND/DBD-CSV-%{version}.tgz Source: %{cpan_name}-%{version}.tar.gz +Patch0: fix-perl.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -139,6 +140,7 @@ %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor ++++++ fix-perl.diff ++++++ Index: DBD-CSV-0.31/lib/DBD/CSV.pm =================================================================== --- DBD-CSV-0.31.orig/lib/DBD/CSV.pm 2010-09-16 08:46:34.000000000 +0200 +++ DBD-CSV-0.31/lib/DBD/CSV.pm 2011-04-01 09:52:08.514241868 +0200 @@ -1,4 +1,4 @@ -#!/pro/bin/perl +#!/usr/bin/perl # # DBD::CSV - A DBI driver for CSV and similar structured files # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0