July 2012 - openSUSE Commits - openSUSE Mailing Lists

commit lyx for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package lyx for openSUSE:Factory checked in at 2012-07-01 15:13:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lyx (Old) and /work/SRC/openSUSE:Factory/.lyx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lyx", Maintainer is "bg(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lyx/lyx.changes 2012-03-20 11:30:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lyx.new/lyx.changes 2012-07-02 10:31:07.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 25 14:27:12 UTC 2012 - cornelis(a)solcon.nl + +- Update to version 2.0.4: + * Bugfix release, for details see included ANNOUNCE file +- Swtiched to xz sources + +------------------------------------------------------------------- Old: ---- lyx-2.0.3.tar.gz New: ---- lyx-2.0.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lyx.spec ++++++ --- /var/tmp/diff_new_pack.83wPHe/_old 2012-07-02 10:31:10.000000000 +0200 +++ /var/tmp/diff_new_pack.83wPHe/_new 2012-07-02 10:31:10.000000000 +0200 @@ -25,13 +25,14 @@ BuildRequires: libqt4-devel BuildRequires: python BuildRequires: update-desktop-files -Version: 2.0.3 +BuildRequires: xz +Version: 2.0.4 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0+ Group: Productivity/Publishing/TeX/Frontends Url: http://www.lyx.org/ -Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-%{version}.tar.gz +Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-%{version}.tar.xz Source1: lyx.desktop Source2: lyx.png Source3: lyxrc.dist -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdrm for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2012-07-01 21:00:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdrm", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2012-05-08 11:59:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdrm.new/libdrm.changes 2012-07-02 10:29:34.000000000 +0200 @@ -1,0 +2,27 @@ +Fri Jun 29 09:27:32 UTC 2012 - sndirsch(a)suse.com + +- U_intel-add-Ivy-Bridge-GT2-server-variant.patch + * intel: add Ivy Bridge GT2 server variant (bnc#769209) + +------------------------------------------------------------------- +Wed Jun 27 20:04:08 UTC 2012 - guillaume(a)opensuse.org + +- enable omapdrm support + +------------------------------------------------------------------- +Tue May 29 09:47:00 UTC 2012 - sndirsch(a)suse.com + +- back to libdrm 2.4.33, since 2.4.34 currentlz requires Mesa git + master changes for nouveau Mesa driver build + +------------------------------------------------------------------- +Sat May 26 22:25:01 UTC 2012 - crrodriguez(a)opensuse.org + +- update to version 2.4.34, see NEWS for detail, here follows + packaging changes only. + + nouveau.h was moved out from its subdirectory (upstream change) + + lidrm_nouveau version bumped to 2. + + remove obsolete configure options. + + Fix many more "implicit declarations" and "undefined references" + +------------------------------------------------------------------- New: ---- U_intel-add-Ivy-Bridge-GT2-server-variant.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.1277Fc/_old 2012-07-02 10:29:36.000000000 +0200 +++ /var/tmp/diff_new_pack.1277Fc/_new 2012-07-02 10:29:36.000000000 +0200 @@ -38,6 +38,7 @@ Source2: baselibs.conf # PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c Patch1: libdrm-implicit-defs.diff +Patch2: U_intel-add-Ivy-Bridge-GT2-server-variant.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.63, automake >= 1.10 BuildRequires: libtool >= 2.2 @@ -66,6 +67,9 @@ Requires: libdrm2 = %version Requires: libdrm_nouveau1 = %version Requires: libdrm_radeon1 = %version +%ifarch %arm +Requires: libdrm_omap1 = %version +%endif %ifarch %ix86 x86_64 Requires: libdrm_intel1 = %version %endif @@ -136,13 +140,22 @@ %description -n libkms1 The KMS Memory Management abstraction library. +%package -n libdrm_omap1 +Summary: Userspace interface to kernel DRM services for omap chips +Group: System/Libraries + +%description -n libdrm_omap1 +(Upstream has not provided a description) + + %prep %setup -q %patch -P 1 -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev +%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev --enable-omap-experimental-api make %{?_smp_mflags} make %{?_smp_mflags} -C tests dristat drmstat @@ -181,6 +194,10 @@ %postun -n libkms1 -p /sbin/ldconfig +%post -n libdrm_omap1 -p /sbin/ldconfig + +%postun -n libdrm_omap1 -p /sbin/ldconfig + %files tools %defattr(-,root,root) %_bindir/dristat @@ -192,6 +209,7 @@ %defattr(-,root,root) %_includedir/libdrm %_includedir/nouveau +%_includedir/omap %_includedir/xf86drm.h %_includedir/xf86drmMode.h %_libdir/libdrm*.so @@ -226,4 +244,8 @@ %_libdir/libkms.so %_libdir/pkgconfig/libkms.pc +%files -n libdrm_omap1 +%defattr(-,root,root) +%_libdir/libdrm_omap.so.1* + %changelog ++++++ U_intel-add-Ivy-Bridge-GT2-server-variant.patch ++++++ >From e057a56448e2e785f74bc13dbd6ead8572ebed91 Mon Sep 17 00:00:00 2001 From: Eugeni Dodonov <eugeni(a)dodonov.net> Date: Thu, 29 Mar 2012 21:03:29 -0300 Subject: [PATCH] intel: add Ivy Bridge GT2 server variant We were missing this one and it is being used by Bromolow. Signed-off-by: Eugeni Dodonov <eugeni.dodonov(a)intel.com> --- intel/intel_chipset.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h index 435d01a..9c1abc8 100644 --- a/intel/intel_chipset.h +++ b/intel/intel_chipset.h @@ -44,6 +44,7 @@ #define PCI_CHIP_IVYBRIDGE_M_GT1 0x0156 /* mobile */ #define PCI_CHIP_IVYBRIDGE_M_GT2 0x0166 #define PCI_CHIP_IVYBRIDGE_S 0x015a /* server */ +#define PCI_CHIP_IVYBRIDGE_S_GT2 0x016a /* server */ #define PCI_CHIP_HASWELL_GT1 0x0402 /* Desktop */ #define PCI_CHIP_HASWELL_GT2 0x0412 @@ -128,7 +129,8 @@ dev == PCI_CHIP_IVYBRIDGE_GT2 || \ dev == PCI_CHIP_IVYBRIDGE_M_GT1 || \ dev == PCI_CHIP_IVYBRIDGE_M_GT2 || \ - dev == PCI_CHIP_IVYBRIDGE_S) + dev == PCI_CHIP_IVYBRIDGE_S || \ + dev == PCI_CHIP_IVYBRIDGE_S_GT2) #define IS_HSW_GT1(devid) (devid == PCI_CHIP_HASWELL_GT1 || \ devid == PCI_CHIP_HASWELL_M_GT1) -- 1.7.3.4 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.1277Fc/_old 2012-07-02 10:29:36.000000000 +0200 +++ /var/tmp/diff_new_pack.1277Fc/_new 2012-07-02 10:29:36.000000000 +0200 @@ -1,12 +1,14 @@ libdrm2 libdrm_intel1 libdrm_nouveau1 +libdrm_omap1 libdrm_radeon1 libdrm-devel requires -libdrm-<targettype> requires "libdrm2-<targettype> = <version>" requires "libdrm_intel1-<targettype> = <version>" requires "libdrm_nouveau1-<targettype> = <version>" + requires "libdrm_omap1-<targettype> = <version>" requires "libdrm_radeon1-<targettype> = <version>" libkms1 libkms-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kvm for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at 2012-07-01 15:07:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvm (Old) and /work/SRC/openSUSE:Factory/.kvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kvm", Maintainer is "BROGERS(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kvm/kvm.changes 2012-05-29 10:33:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kvm.new/kvm.changes 2012-07-02 10:28:58.000000000 +0200 @@ -1,0 +2,24 @@ +Wed Jun 27 22:05:42 UTC 2012 - brogers(a)suse.com + +- fix qemu-kvm crash with "-usbdevice tablet". (bnc#766310) +- fix CVE-2012-2652, where a tmpdir symlink attack is possible + when using snapshots (bnc#764526) +- drop qemu-img-kvm, which is a rename of the qemu-img file and + delivers no additional value +- drop qemu-ga. This file is now provided by the qemu-guest-agent + package. + +------------------------------------------------------------------- +Wed Jun 13 22:33:20 UTC 2012 - brogers(a)suse.com + +- update to most recent ipxe code +- avoid array bounds error building ipxe +- include more "standard" doc files +- misc spec file cleanups + +------------------------------------------------------------------- +Sun Jun 10 19:35:58 UTC 2012 - brogers(a)suse.com + +- rely on newly created qemu-tools package for bridge helper + +------------------------------------------------------------------- Old: ---- qemu-img-vmdk-scsi.patch New: ---- ipxe-avoid-bad-array-reference.patch kvm-qemu-preXX-block-prevent-snapshot-mode-TMPDIR-symlink-attack.patch kvm-qemu-preXX-uhci-fix-uhci_async_cancel_all.patch kvm-qemu-preXX-use--libexecdir-instead-of-ignoring.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.UahdKQ/_old 2012-07-02 10:29:02.000000000 +0200 +++ /var/tmp/diff_new_pack.UahdKQ/_new 2012-07-02 10:29:02.000000000 +0200 @@ -22,6 +22,7 @@ %define package_true_version 1.1.rc3 %define package_base_version 1.1 %define bios_id seabios-1.7.0 +# ipxe is through git commit id: addf699c86ae18edd7de13433da78be926c22504 %define pxe_rom_id ipxe-1.0.0 %define vgabios_id vgabios-0.6c # sgabios comes from: http://sgabios.googlecode.com/svn/trunk, Rev 8 @@ -94,10 +95,11 @@ BuildRequires: pwdutils Requires: pwdutils Requires: python-curses -Requires: virt-utils %if 0%{?suse_version} < 1110 Requires: kvm-kmp %endif +Recommends: qemu-tools +Recommends: virt-utils Summary: Kernel-based Virtual Machine License: BSD-3-Clause ; GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Kernel @@ -118,6 +120,7 @@ # ipxe patches Patch01: ipxe-rom-settings.patch +Patch02: ipxe-avoid-bad-array-reference.patch # seabios patches Patch20: seabios-sanitize-version.patch @@ -139,10 +142,12 @@ Patch103: kvm-qemu-preXX-console.patch Patch104: kvm-qemu-madvise-hugepages.patch Patch105: kvm-qemu-preXX-dictzip3.patch +Patch106: kvm-qemu-preXX-use--libexecdir-instead-of-ignoring.patch +Patch107: kvm-qemu-preXX-block-prevent-snapshot-mode-TMPDIR-symlink-attack.patch +Patch108: kvm-qemu-preXX-uhci-fix-uhci_async_cancel_all.patch -Patch200: qemu-img-vmdk-scsi.patch -Patch201: kvm-studio-slirp-nooutgoing.patch -Patch202: kvm-studio-vnc.patch +Patch200: kvm-studio-slirp-nooutgoing.patch +Patch201: kvm-studio-vnc.patch # for IA64 Source500: ia64-fix-pagesize.pl @@ -159,8 +164,9 @@ Patch706: S390-hp-0004-Expose-drive_add-on-all-architectures.patch # For upstream patches: + BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: /usr/sbin/groupadd +Requires(pre): /usr/sbin/groupadd %description KVM (Kernel-based Virtual Machine) is virtualization software for @@ -187,7 +193,6 @@ libvirt, virt-manager and vm-install. - Authors: -------- Avi Kivity <avi(a)qumranet.com> @@ -202,6 +207,7 @@ %setup -q -T -D -n %{pxe_rom_id} -b 7 # ipxe patches %patch01 -p1 +%patch02 -p1 %endif %setup -q -n qemu-%{name}-%{package_true_version} -a 6 -a 9 -a 10 %if %{build_fw_from_source} @@ -230,11 +236,13 @@ %patch103 -p1 %patch104 -p1 %patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 # Studio addons %patch200 -p1 %patch201 -p1 -%patch202 -p1 # IA64 support %ifarch ia64 @@ -261,6 +269,7 @@ ./configure \ --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ + --libexecdir=%{_libexecdir} \ --with-confsuffix=/qemu-kvm \ --extra-cflags="%{optflags}" \ --disable-debug-tcg \ @@ -320,41 +329,41 @@ sed -i 's/CFLAGS =/CFLAGS +=/' roms/vgabios/Makefile # userspace: -make %{?jobs:-j%jobs} +make %{?_smp_mflags} # Firmware %ifarch %ix86 x86_64 %if %{build_fw_from_source} echo "%{bios_id}" > roms/seabios/.version -make -C roms/seabios %{?jobs:-j%jobs} +make -C roms/seabios %{?_smp_mflags} cp roms/seabios/out/bios.bin pc-bios/bios.bin make -C roms/sgabios -#make -C roms/sgabios %{?jobs:-j%jobs} cp roms/sgabios/sgabios.bin pc-bios/sgabios.bin -make -C roms/vgabios %{?jobs:-j%jobs} +make -C roms/vgabios %{?_smp_mflags} cp roms/vgabios/VGABIOS-lgpl-latest.bin pc-bios/vgabios.bin cp roms/vgabios/VGABIOS-lgpl-latest.cirrus.bin pc-bios/vgabios-cirrus.bin cp roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin pc-bios/vgabios-stdvga.bin cp roms/vgabios/VGABIOS-lgpl-latest.vmware.bin pc-bios/vgabios-vmware.bin cp roms/vgabios/VGABIOS-lgpl-latest.qxl.bin pc-bios/vgabios-qxl.bin cd ../%{pxe_rom_id}/src -make NO_WERROR=1 bin/blib.a %{?jobs:-j%jobs} -make bin/8086100e.rom %{?jobs:-j%jobs} -make bin/10222000.rom %{?jobs:-j%jobs} -make bin/10500940.rom %{?jobs:-j%jobs} -make bin/10ec8139.rom %{?jobs:-j%jobs} -make bin/80861209.rom %{?jobs:-j%jobs} -make bin/1af41000.rom %{?jobs:-j%jobs} +make NO_WERROR=1 bin/blib.a %{?_smp_mflags} +make bin/8086100e.rom %{?_smp_mflags} +make bin/10222000.rom %{?_smp_mflags} +make bin/10500940.rom %{?_smp_mflags} +make bin/10ec8139.rom %{?_smp_mflags} +make bin/80861209.rom %{?_smp_mflags} +make bin/1af41000.rom %{?_smp_mflags} %endif %endif %install -make DESTDIR=%{buildroot} install %{?jobs:-j%jobs} libexecdir=%_libexecdir +make install DESTDIR=%{buildroot} %{?_smp_mflags} mkdir -p %{buildroot}%{_docdir}/kvm cp qemu-doc.html qemu-kvm.html cp qemu-tech.html qemu-kvm-tech.html +cp QMP/qmp-commands.txt qmp-commands.txt install -m 755 scripts/kvm/kvm_stat %{buildroot}%{_bindir}/ %if %{build_fw_from_source} for i in %firmware_files @@ -373,18 +382,18 @@ install_rom 1af41000 pxe-virtio %endif cd %{buildroot} -rm -r .{%_bindir/qemu-io,%_bindir/qemu-nbd,%_datadir/doc/qemu} -mv .%_bindir/qemu-img{,-kvm} +rm .%_bindir/{qemu-img,qemu-io,qemu-ga,qemu-nbd} +rm -r .{%_libexecdir/qemu-bridge-helper,%_datadir/doc/qemu} %if !%{build_fw_from_source} -rm -r .%_datadir/qemu-kvm/{openbios-sparc32,openbios-sparc64,ppc_rom.bin,openbios-ppc,bamboo.dtb,petalogix-ml605.dtb,petalogix-s3adsp1800.dtb} +rm .%_datadir/qemu-kvm/{openbios-sparc32,openbios-sparc64,ppc_rom.bin,openbios-ppc,bamboo.dtb,petalogix-ml605.dtb,petalogix-s3adsp1800.dtb} %endif %ifarch ia64 s390x rm .%_datadir/qemu-kvm/bios.bin %endif +rm -r .%_mandir/man1/qemu-img.1 rm -r .%_mandir/man8/qemu-nbd.8 mv .%_bindir/{qemu-system*,qemu-kvm} mv .%_mandir/man1/{qemu.1,qemu-kvm.1} -mv .%_mandir/man1/{qemu-img.1,qemu-img-kvm.1} chmod 644 .%_mandir/man1/* install -D -m 644 %{SOURCE1} %{buildroot}/etc/udev/rules.d/60-kvm.rules install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu-kvm/qemu-ifup @@ -405,17 +414,15 @@ %files %defattr(-,root,root) -%doc qemu-kvm.html qemu-kvm-tech.html kvm-supported.txt +# qmp-commands.txt needs to be included as doc, we well as qemu-nbd.8? (we delete this above!!!!, also virtfs-proxy-helper.1 if building virtfs +# Also see what qemu has doc'd/ Do we want to NOT include kvm-supported.txt for oS? +%doc COPYING COPYING.LIB Changelog README qemu-kvm.html qemu-kvm-tech.html kvm-supported.txt qmp-commands.txt %attr(755,root,kvm) %{_bindir}/qemu-kvm -%attr(755,root,kvm) %{_bindir}/qemu-img-kvm -%attr(755,root,kvm) %{_bindir}/qemu-ga %attr(755,root,kvm) %{_bindir}/kvm_stat %{_datadir}/qemu-kvm -%_libexecdir/qemu-bridge-helper -%dir %attr(0755, root, kvm) %{_sysconfdir}/qemu-kvm/ +%dir %attr(0755,root,kvm) %{_sysconfdir}/qemu-kvm/ %config %attr(644,root,kvm) %{_sysconfdir}/qemu-kvm/target-x86_64.conf %config %{_sysconfdir}/udev/rules.d/60-kvm.rules %_mandir/man1/qemu-kvm.1.gz -%_mandir/man1/qemu-img-kvm.1.gz %changelog ++++++ ipxe-1.0.0.tar.bz2 ++++++ ++++ 368278 lines of diff (skipped) ++++++ ipxe-avoid-bad-array-reference.patch ++++++ Subject: Avoid overrunning array by conditional compilation I haven't analyzed the best way to fix this, but this code error has been there 'forever', so for now use a simple approach to avoid the issue. Signed-off-by: Bruce Rogers <brogers(a)suse.com> Index: ipxe-1.0.0/src/util/nrv2b.c =================================================================== --- ipxe-1.0.0.orig/src/util/nrv2b.c +++ ipxe-1.0.0/src/util/nrv2b.c @@ -629,7 +629,7 @@ static int swd_search2(struct ucl_swd *s s->b[s->bp], s->b[s->bp+1], s->b[key], s->b[key+1]); #endif assert(memcmp(&s->b[s->bp],&s->b[key],2) == 0); -#if defined(SWD_BEST_OFF) +#if defined(SWD_BEST_OFF) && (SWD_BEST_OFF > 2) if (s->best_pos[2] == 0) s->best_pos[2] = key + 1; #endif ++++++ ipxe-rom-settings.patch ++++++ --- /var/tmp/diff_new_pack.UahdKQ/_old 2012-07-02 10:29:02.000000000 +0200 +++ /var/tmp/diff_new_pack.UahdKQ/_new 2012-07-02 10:29:02.000000000 +0200 @@ -1,7 +1,7 @@ -Index: ipxe-git-3fc139362c75eb69e02989241755ec894533f675/src/config/general.h +Index: ipxe-1.0.0/src/config/general.h =================================================================== ---- ipxe-git-3fc139362c75eb69e02989241755ec894533f675.orig/src/config/general.h -+++ ipxe-git-3fc139362c75eb69e02989241755ec894533f675/src/config/general.h +--- ipxe-1.0.0.orig/src/config/general.h ++++ ipxe-1.0.0/src/config/general.h @@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); * Timer configuration * @@ -11,12 +11,12 @@ banner should appear */ /* -@@ -93,7 +93,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); +@@ -92,7 +92,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); * you want to use. * */ -//#define IMAGE_NBI /* NBI image support */ +#define IMAGE_NBI /* NBI image support */ //#define IMAGE_ELF /* ELF image support */ - //#define IMAGE_FREEBSD /* FreeBSD kernel image support */ //#define IMAGE_MULTIBOOT /* MultiBoot image support */ + //#define IMAGE_PXE /* PXE image support */ ++++++ kvm-qemu-preXX-block-prevent-snapshot-mode-TMPDIR-symlink-attack.patch ++++++ >From eba25057b9a5e19d10ace2bc7716667a31297169 Mon Sep 17 00:00:00 2001 From: Jim Meyering <jim(a)meyering.net> Date: Mon, 28 May 2012 09:27:54 +0200 Subject: [PATCH] block: prevent snapshot mode $TMPDIR symlink attack Reference: bnc#764526 In snapshot mode, bdrv_open creates an empty temporary file without checking for mkstemp or close failure, and ignoring the possibility of a buffer overrun given a surprisingly long $TMPDIR. Change the get_tmp_filename function to return int (not void), so that it can inform its two callers of those failures. Also avoid the risk of buffer overrun and do not ignore mkstemp or close failure. Update both callers (in block.c and vvfat.c) to propagate temp-file-creation failure to their callers. get_tmp_filename creates and closes an empty file, while its callers later open that presumed-existing file with O_CREAT. The problem was that a malicious user could provoke mkstemp failure and race to create a symlink with the selected temporary file name, thus causing the qemu process (usually root owned) to open through the symlink, overwriting an attacker-chosen file. This addresses CVE-2012-2652. http://bugzilla.redhat.com/CVE-2012-2652 Reviewed-by: Stefan Hajnoczi <stefanha(a)linux.vnet.ibm.com> Signed-off-by: Jim Meyering <meyering(a)redhat.com> Signed-off-by: Anthony Liguori <aliguori(a)us.ibm.com> Acked-by: Bruce Rogers <brogers(a)suse.com> --- block.c | 37 ++++++++++++++++++++++++------------- block/vvfat.c | 7 ++++++- block_int.h | 2 +- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/block.c b/block.c index af2ab4f..7547051 100644 --- a/block.c +++ b/block.c @@ -409,28 +409,36 @@ int bdrv_create_file(const char* filename, QEMUOptionParameter *options) return bdrv_create(drv, filename, options); } -#ifdef _WIN32 -void get_tmp_filename(char *filename, int size) +/* + * Create a uniquely-named empty temporary file. + * Return 0 upon success, otherwise a negative errno value. + */ +int get_tmp_filename(char *filename, int size) { +#ifdef _WIN32 char temp_dir[MAX_PATH]; - - GetTempPath(MAX_PATH, temp_dir); - GetTempFileName(temp_dir, "qem", 0, filename); -} + /* GetTempFileName requires that its output buffer (4th param) + have length MAX_PATH or greater. */ + assert(size >= MAX_PATH); + return (GetTempPath(MAX_PATH, temp_dir) + && GetTempFileName(temp_dir, "qem", 0, filename) + ? 0 : -GetLastError()); #else -void get_tmp_filename(char *filename, int size) -{ int fd; const char *tmpdir; - /* XXX: race condition possible */ tmpdir = getenv("TMPDIR"); if (!tmpdir) tmpdir = "/tmp"; - snprintf(filename, size, "%s/vl.XXXXXX", tmpdir); + if (snprintf(filename, size, "%s/vl.XXXXXX", tmpdir) >= size) { + return -EOVERFLOW; + } fd = mkstemp(filename); - close(fd); -} + if (fd < 0 || close(fd)) { + return -errno; + } + return 0; #endif +} /* * Detect host devices. By convention, /dev/cdrom[N] is always @@ -753,7 +761,10 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, bdrv_delete(bs1); - get_tmp_filename(tmp_filename, sizeof(tmp_filename)); + ret = get_tmp_filename(tmp_filename, sizeof(tmp_filename)); + if (ret < 0) { + return ret; + } /* Real path is meaningless for protocols */ if (is_protocol) diff --git a/block/vvfat.c b/block/vvfat.c index 2dc9d50..0fd3367 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2808,7 +2808,12 @@ static int enable_write_target(BDRVVVFATState *s) array_init(&(s->commits), sizeof(commit_t)); s->qcow_filename = g_malloc(1024); - get_tmp_filename(s->qcow_filename, 1024); + ret = get_tmp_filename(s->qcow_filename, 1024); + if (ret < 0) { + g_free(s->qcow_filename); + s->qcow_filename = NULL; + return ret; + } bdrv_qcow = bdrv_find_format("qcow"); options = parse_option_parameters("", bdrv_qcow->create_options, NULL); diff --git a/block_int.h b/block_int.h index b80e66d..3d4abc6 100644 --- a/block_int.h +++ b/block_int.h @@ -335,7 +335,7 @@ struct BlockDriverState { BlockJob *job; }; -void get_tmp_filename(char *filename, int size); +int get_tmp_filename(char *filename, int size); void bdrv_set_io_limits(BlockDriverState *bs, BlockIOLimit *io_limits); -- 1.7.7 ++++++ kvm-qemu-preXX-uhci-fix-uhci_async_cancel_all.patch ++++++ From: Gerd Hoffmann <kraxel(a)redhat.com> Date: Fri, 15 Jun 2012 09:39:50 +0200 Subject: [PATCH] uhci: fix uhci_async_cancel_all Reference: bnc#766310 We update the QTAILQ in the loop, thus we must use the SAFE version to make sure we don't touch the queue struct after freeing it. https://bugzilla.novell.com/show_bug.cgi?id=766310 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> Acked-by: Bruce Rogers <brogers(a)suse.com> --- hw/usb/hcd-uhci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 9871e24..2ebce04 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -292,10 +292,10 @@ static void uhci_async_cancel_device(UHCIState *s, USBDevice *dev) static void uhci_async_cancel_all(UHCIState *s) { - UHCIQueue *queue; + UHCIQueue *queue, *nq; UHCIAsync *curr, *n; - QTAILQ_FOREACH(queue, &s->queues, next) { + QTAILQ_FOREACH_SAFE(queue, &s->queues, next, nq) { QTAILQ_FOREACH_SAFE(curr, &queue->asyncs, next, n) { uhci_async_unlink(curr); uhci_async_cancel(curr); -- 1.7.7 ++++++ kvm-qemu-preXX-use--libexecdir-instead-of-ignoring.patch ++++++ Commit 7b93fadf3a38d1ed65ea5536a52efc2772c6e3b8 "Add basic version of bridge helper" put the bridge helper executable into a fixed ${prefix}/libexec/ location, instead of using ${libexecdir} for this. At the same time, --libexecdir is being happily ignored by ./configure. Even more, the same patch sets unused $libexecdir variable in the generated config-host.mak, and uses fixed string (\${prefix}/libexecdir) for the bridge helper binary. Fix this braindamage by introducing $libexecdir variable, using it for the bridge helper binary, and recognizing --libexecdir. This patch is applicable to stable-1.1. Signed-off-by: Michael Tokarev <mjt(a)tls.msk.ru> Cc: Corey Bryant <coreyb(a)linux.vnet.ibm.com> Cc: Richa Marwaha <rmarwah(a)linux.vnet.ibm.com> Cc: qemu-stable(a)nongnu.org --- configure | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 38dafec..fc86803 100755 --- a/configure +++ b/configure @@ -169,6 +169,7 @@ datadir="\${prefix}/share" qemu_docdir="\${prefix}/share/doc/qemu" bindir="\${prefix}/bin" libdir="\${prefix}/lib" +libexecdir="\${prefix}/libexec" includedir="\${prefix}/include" sysconfdir="\${prefix}/etc" confsuffix="/qemu" @@ -598,6 +599,8 @@ for opt do ;; --libdir=*) libdir="$optarg" ;; + --libexecdir=*) libexecdir="$optarg" + ;; --includedir=*) includedir="$optarg" ;; --datadir=*) datadir="$optarg" @@ -608,7 +611,7 @@ for opt do ;; --sysconfdir=*) sysconfdir="$optarg" ;; - --sbindir=*|--libexecdir=*|--sharedstatedir=*|--localstatedir=*|\ + --sbindir=*|--sharedstatedir=*|--localstatedir=*|\ --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\ --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*) # These switches are silently ignored, for compatibility with @@ -2960,6 +2963,7 @@ echo "Install prefix $prefix" echo "BIOS directory `eval echo $qemu_datadir`" echo "binary directory `eval echo $bindir`" echo "library directory `eval echo $libdir`" +echo "libexec directory `eval echo $libexecdir`" echo "include directory `eval echo $includedir`" echo "config directory `eval echo $sysconfdir`" if test "$mingw32" = "no" ; then @@ -3064,14 +3068,14 @@ echo all: >> $config_host_mak echo "prefix=$prefix" >> $config_host_mak echo "bindir=$bindir" >> $config_host_mak echo "libdir=$libdir" >> $config_host_mak +echo "libexecdir=$libexecdir" >> $config_host_mak echo "includedir=$includedir" >> $config_host_mak echo "mandir=$mandir" >> $config_host_mak echo "sysconfdir=$sysconfdir" >> $config_host_mak echo "qemu_confdir=$qemu_confdir" >> $config_host_mak echo "qemu_datadir=$qemu_datadir" >> $config_host_mak echo "qemu_docdir=$qemu_docdir" >> $config_host_mak -echo "libexecdir=\${prefix}/libexec" >> $config_host_mak -echo "CONFIG_QEMU_HELPERDIR=\"$prefix/libexec\"" >> $config_host_mak +echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak echo "ARCH=$ARCH" >> $config_host_mak if test "$debug_tcg" = "yes" ; then -- 1.7.10 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-07-01 15:07:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-06-28 15:31:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-07-02 10:28:36.000000000 +0200 @@ -1,0 +2,30 @@ +Fri Jun 29 21:57:08 CEST 2012 - ms(a)suse.de + +- v5.03.27 released + +------------------------------------------------------------------- +Fri Jun 29 21:53:27 CEST 2012 - ms(a)suse.de + +- fixed hybrid persistent writing with kernel 3.x (bnc #769086) + +------------------------------------------------------------------- +Thu Jun 28 14:11:31 CEST 2012 - ms(a)suse.de + +- netboot: dhcpcd works with timeout 20s, kiwi used 40s, so one half + of the time it waited with no reason. This patch runs 'dhcpcd -T' + again after 22s, so the time is used effectively. It also helps in + situatios when the link needs more time to start, e.g with + wpa_supplicant and the first dhcp packets are lost. + +------------------------------------------------------------------- +Thu Jun 28 10:19:57 CEST 2012 - rjschwei(a)suse.de + +- fix the getPXEDeployConfiguration unit test on ppc and ppc64 + +------------------------------------------------------------------- +Wed Jun 27 15:37:22 CEST 2012 - ms(a)suse.de + +- zypper in 12.2 has been fixed now, so we can change back the + JeOS image template to the type="image" installation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.6NYs7L/_old 2012-07-02 10:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.6NYs7L/_new 2012-07-02 10:28:40.000000000 +0200 @@ -21,7 +21,7 @@ Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.03.26 +Version: 5.03.27 Release: 0 # requirements to build packages BuildRequires: gcc-c++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/.revision 2012-06-27 14:36:32.000000000 +0200 @@ -1 +1 @@ -405fa428579c5ceaa954a420241f393263fde6e2 +de89ef19625bf365555c3b70e5da39972bda5354 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2012-06-29 21:57:48.000000000 +0200 @@ -50,7 +50,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.03.26"; + $data{Version} = "5.03.27"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2012-06-29 21:57:48.000000000 +0200 @@ -3266,7 +3266,17 @@ #====================================== # store hybrid write partition device #-------------------------------------- - export HYBRID_RW=$(ddn $biosBootDevice $HYBRID_PERSISTENT_PART) + # /.../ + # use a loop device here because kernel 3.x refuses + # to mount a partition if the disk itself was already + # mounted. In case of a hybrid iso the disk device + # e.g /dev/sda represents the iso and is therefore + # mounted in any case. The same trick is used in + # createHybridPersistent when creating the filesystem + # ---- + HYBRID_RW=$(ddn $biosBootDevice $HYBRID_PERSISTENT_PART) + HYBRID_RW=$(losetup -f --show $HYBRID_RW) + export HYBRID_RW } #====================================== # CDUmount @@ -3768,13 +3778,24 @@ #====================================== # wait for any preferred interface(s) #-------------------------------------- - for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20;do - for try_iface in $prefer_iface ; do - if [ -s /var/lib/dhcpcd/dhcpcd-$try_iface.info ] && - grep -q "^IPADDR=" /var/lib/dhcpcd/dhcpcd-$try_iface.info - then - break 2 - fi + for j in 1 2 ;do + for i in 1 2 3 4 5 6 7 8 9 10 11;do + for try_iface in $prefer_iface ; do + if [ -s /var/lib/dhcpcd/dhcpcd-$try_iface.info ] && + grep -q "^IPADDR=" /var/lib/dhcpcd/dhcpcd-$try_iface.info + then + break 3 + fi + done + sleep 2 + done + # /.../ + # we are behind the dhcpcd timeout 20s so the only thing + # we can do now is to try again + # ---- + for try_iface in $DHCPCD_STARTED; do + dhcpcd $opts -T $try_iface \ + > /var/lib/dhcpcd/dhcpcd-$try_iface.info & done sleep 2 done @@ -6650,11 +6671,13 @@ #====================================== # create filesystem on write partition #-------------------------------------- - if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $(ddn $device $disknr);then + local loop_dev=$(losetup -f --show $(ddn $device $disknr)) + if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $loop_dev;then Echo "Failed to create hybrid persistent filesystem" Echo "Persistent writing deactivated" unset kiwi_hybridpersistent fi + losetup -d $loop_dev } #====================================== # callPartitioner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-12.2-JeOS/config.xml new/kiwi/template/ix86/suse-12.2-JeOS/config.xml --- old/kiwi/template/ix86/suse-12.2-JeOS/config.xml 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/template/ix86/suse-12.2-JeOS/config.xml 2012-06-29 21:57:48.000000000 +0200 @@ -60,25 +60,19 @@ <repository type="yast2"> <source path="obs://12.2/repo/oss"/> </repository> - <packages type="bootstrap"> + <packages type="image"> <opensusePattern name="base"/> <opensuseProduct name="openSUSE"/> <package name="plymouth-branding-openSUSE" bootinclude="true"/> <package name="ifplugd"/> <package name="iputils"/> <package name="vim"/> - <package name="grub"/> <package name="grub2"/> <package name="syslinux"/> <package name="lvm2"/> <package name="plymouth"/> <package name="fontconfig"/> <package name="fonts-config"/> - <package name="zypper"/> - <package name="cracklib-dict-full"/> - <package name="ca-certificates"/> - <package name="timezone"/> - <package name="glibc-locale"/> </packages> <packages type="iso"> <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> @@ -89,14 +83,20 @@ <packages type="oem"> <package name="grub2-branding-openSUSE" bootinclude="true"/> </packages> - <packages type="bootstrap" profiles="xenFlavour"> + <packages type="image" profiles="xenFlavour"> <package name="kernel-xen" replaces="kernel-default"/> <package name="xen-tools" arch="x86_64" replaces=""/> <package name="xen" arch="x86_64" replaces=""/> </packages> - <packages type="bootstrap" profiles="vmxFlavour"> + <packages type="image" profiles="vmxFlavour"> <package name="kernel-default" replaces="kernel-xen"/> <package name="kernel-default" replaces="xen-tools"/> <package name="kernel-default" replaces="xen"/> </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + <package name="cracklib-dict-full"/> + <package name="ca-certificates"/> + </packages> </image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml new/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml --- old/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml 2012-06-27 14:36:17.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml 2012-06-29 21:57:48.000000000 +0200 @@ -8,7 +8,7 @@ <preferences> <type image="pxe" filesystem="clicfs" boot="netboot/suse-12.1" installiso="true"> <pxedeploy server="192.168.100.2" blocksize="4096"> - <configuration arch="x86_64,i686,i586,armv7l,armv7hl,armv5te" dest="target" source="installSource"/> + <configuration arch="x86_64,i686,i586,armv7l,armv7hl,armv5te,ppc64,ppc" dest="target" source="installSource"/> <initrd>/pxeSetup/specialInitrd</initrd> <kernel>/pxeSetup/specialKernel</kernel> <partitions device="/dev/sda"> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gummi for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package gummi for openSUSE:Factory checked in at 2012-07-01 15:00:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gummi (Old) and /work/SRC/openSUSE:Factory/.gummi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gummi", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gummi/gummi.changes 2012-04-12 09:26:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gummi.new/gummi.changes 2012-07-02 10:26:27.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Jun 25 03:51:37 UTC 2012 - badshah400(a)gmail.com + +- Update to version 0.6.4: + + Bugs fixed: + - Replaced faulty importer implementation with a toolbar + variant + - Fixed an issue where the previewer would not display + correctly + - dvi script uses exit status to signal compilation status + - Improved the reported messages for some errors. + - Better TeXLive version detection + - Fixed a reference problem that could lead to a crash + - Search window is correctly centered in GNOME 3 + - Tab markup not enabled when project loading fails + - Minor UI tweaks to the project & bibliography panels + - Minor UI tweaks to the snippet configuration interface + + Minor rebase of patch gummi-deprecated-g_thread_init.patch. + +------------------------------------------------------------------- Old: ---- gummi-0.6.3.tar.gz New: ---- gummi-0.6.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gummi.spec ++++++ --- /var/tmp/diff_new_pack.Fhbp69/_old 2012-07-02 10:26:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Fhbp69/_new 2012-07-02 10:26:30.000000000 +0200 @@ -17,13 +17,13 @@ Name: gummi -Version: 0.6.3 +Version: 0.6.4 Release: 0 Summary: Simple LaTeX editor License: MIT Group: Productivity/Publishing/TeX/Frontends Url: http://gummi.midnightcoding.org/ -Source0: %{name}-%{version}.tar.gz +Source0: http://dev.midnightcoding.org/attachments/download/298/%{name}-%{version}.t… %if 0%{?suse_version} > 1210 # PATCH-FIX-UPSTREAM gummi-deprecated-g_thread_init.patch badshah400(a)gmail.com -- Remove usage of deprecated g_thread_init(). Patch0: gummi-deprecated-g_thread_init.patch ++++++ gummi-0.6.3.tar.gz -> gummi-0.6.4.tar.gz ++++++ ++++ 13675 lines of diff (skipped) ++++++ gummi-deprecated-g_thread_init.patch ++++++ --- /var/tmp/diff_new_pack.Fhbp69/_old 2012-07-02 10:26:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Fhbp69/_new 2012-07-02 10:26:30.000000000 +0200 @@ -1,9 +1,9 @@ -Index: gummi-0.6.1/src/main.c +Index: gummi-0.6.4/src/main.c =================================================================== ---- gummi-0.6.1.orig/src/main.c -+++ gummi-0.6.1/src/main.c -@@ -75,7 +75,13 @@ int main (int argc, char *argv[]) { - g_option_context_parse (context, &argc, &argv, &error); +--- gummi-0.6.4.orig/src/main.c ++++ gummi-0.6.4/src/main.c +@@ -76,7 +76,13 @@ int main (int argc, char *argv[]) { + if (error) g_error("%s\n", error->message); /* initialize GTK */ - g_thread_init (NULL); @@ -16,4 +16,4 @@ + gdk_threads_init (); gtk_init (&argc, &argv); - GtkBuilder* builder = gtk_builder_new (); + GError* ui_error = NULL; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc47 for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package gcc47 for openSUSE:Factory checked in at 2012-07-01 20:59:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc47 (Old) and /work/SRC/openSUSE:Factory/.gcc47.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc47", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gcc47/cross-armv5el-gcc47-icecream-backend.changes 2012-06-26 15:37:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcc47.new/cross-armv5el-gcc47-icecream-backend.changes 2012-07-02 10:19:35.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 29 08:42:19 UTC 2012 - rguenther(a)suse.com + +- Adjust arm icecream cross for continued change of the canonical + target used in binutils. + +------------------------------------------------------------------- New Changes file: --- /dev/null 2012-06-28 07:48:42.835576985 +0200 +++ /work/SRC/openSUSE:Factory/.gcc47.new/cross-armv7hl-gcc47-icecream-backend.changes 2012-07-02 10:19:35.000000000 +0200 @@ -0,0 +1,172 @@ +------------------------------------------------------------------- +Fri Jun 29 08:42:19 UTC 2012 - rguenther(a)suse.com + +- Adjust arm icecream cross for continued change of the canonical + target used in binutils. + +------------------------------------------------------------------- +Tue Jun 26 08:03:03 UTC 2012 - rguenther(a)suse.com + +- Require a version of libquadmath0 at least as new as the + libgfortran3 library from the latter. [bnc#768785] + +------------------------------------------------------------------- +Fri Jun 22 11:03:09 UTC 2012 - adrian(a)suse.de + +- complete armv7hl switch + +------------------------------------------------------------------- +Wed Jun 20 15:13:58 UTC 2012 - aj(a)suse.de + +- Use new dynamic linker path /lib/ld-linux-armhf.so.3 for ARM v7. + +------------------------------------------------------------------- +Tue Jun 19 08:08:02 UTC 2012 - coolo(a)suse.com + +- do not build cross environments on architectures that + are not native + +------------------------------------------------------------------- +Thu Jun 15 13:08:54 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r188649). + * Includes GCC 4.7.1 release. + +------------------------------------------------------------------- +Wed Jun 6 08:54:04 UTC 2012 - rguenther(a)suse.com + +- Explicitely specify target tools used for building. + +------------------------------------------------------------------- +Mon Jun 4 11:10:00 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r188177). + +------------------------------------------------------------------- +Fri Jun 1 09:01:40 UTC 2012 - rguenther(a)suse.com + +- Fix typo in cross-icecream.spec.in. +- Also dump test-summary to the build log. + +------------------------------------------------------------------- +Wed May 30 14:13:54 UTC 2012 - rguenther(a)suse.com + +- Update patch for PR52080. + +------------------------------------------------------------------- +Mon May 7 09:35:56 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r187228). +- Add patch for PR52841. + +------------------------------------------------------------------- +Thu Apr 19 11:32:05 UTC 2012 - rguenther(a)suse.com + +- Fix canonicalized target names for crosses. +- Enable icecream backends, make their package name version specific. + +------------------------------------------------------------------- +Fri Apr 13 12:47:22 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r186417). +- Fix libstdc++.so-gdb.py autoload script. [bnc#750960] +- Drop to release checking. +- Fix build of cross targets with canonicalized name. + +------------------------------------------------------------------- +Thu Mar 22 12:06:49 UTC 2012 - rguenther(a)suse.com + +- Update to GCC 4.7.0 release. +- Update to gcc-4_7-branch head (r185687). + +------------------------------------------------------------------- +Tue Mar 20 11:53:04 UTC 2012 - rguenther(a)suse.com + +- Package the gdb python scripts. [bnc#750960] + +------------------------------------------------------------------- +Mon Mar 19 12:13:21 UTC 2012 - rguenther(a)suse.com + +- Change armv5 to use soft floating-point. + +------------------------------------------------------------------- +Tue Mar 13 12:59:26 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r185330). + +------------------------------------------------------------------- +Fri Mar 2 13:50:22 UTC 2012 - rguenther(a)suse.com + +- Update to GCC 4.7.0 release candidate. +- Fixup libstdc++v3 symbol baselines on powerpc. + +------------------------------------------------------------------- +Wed Feb 29 09:03:10 UTC 2012 - rguenther(a)suse.com + +- Fixup more SPDX license issues. + +------------------------------------------------------------------- +Tue Feb 28 13:10:03 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184624). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Fri Feb 24 09:35:29 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184541). + +------------------------------------------------------------------- +Tue Feb 21 13:05:10 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184435). +- Merge changes from GCC 4.6 package. +- Add patches for PR49484 and PR52080. + +------------------------------------------------------------------- +Wed Feb 8 11:14:05 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184004). + +------------------------------------------------------------------- +Tue Jan 31 10:35:44 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183753). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Tue Jan 24 14:46:07 UTC 2012 - rguenther(a)suse.com + +- Drop AWT support from libgcj. [bnc#742935] + +------------------------------------------------------------------- +Wed Jan 18 14:48:06 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183273). + +------------------------------------------------------------------- +Wed Jan 11 11:51:29 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183092). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Wed Jan 4 13:36:37 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r182872). + +------------------------------------------------------------------- +Tue Dec 20 10:48:33 UTC 2011 - rguenther(a)suse.com + +- Update to SVN trunk head (r182525). + +------------------------------------------------------------------- +Sun Dec 18 11:10:32 UTC 2011 - adrian(a)suse.de + +- fix file list for arm architecture + +------------------------------------------------------------------- +Thu Nov 3 15:23:33 UTC 2011 - rguenther(a)suse.com + +- New package. + --- /work/SRC/openSUSE:Factory/gcc47/cross-hppa-gcc47-icecream-backend.changes 2012-06-26 15:37:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcc47.new/cross-hppa-gcc47-icecream-backend.changes 2012-07-02 10:19:35.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 29 08:42:19 UTC 2012 - rguenther(a)suse.com + +- Adjust arm icecream cross for continued change of the canonical + target used in binutils. + +------------------------------------------------------------------- cross-i386-gcc47-icecream-backend.changes: same change cross-ia64-gcc47-icecream-backend.changes: same change cross-ppc-gcc47-icecream-backend.changes: same change cross-ppc64-gcc47-icecream-backend.changes: same change cross-s390-gcc47-icecream-backend.changes: same change cross-s390x-gcc47-icecream-backend.changes: same change cross-x86_64-gcc47-icecream-backend.changes: same change gcc47-testresults.changes: same change gcc47.changes: same change libffi47.changes: same change libgcj47.changes: same change Old: ---- cross-armv7l-gcc47-icecream-backend.changes cross-armv7l-gcc47-icecream-backend.spec New: ---- cross-armv7hl-gcc47-icecream-backend.changes cross-armv7hl-gcc47-icecream-backend.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-armv5el-gcc47-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.m6uGLK/_old 2012-07-02 10:19:43.000000000 +0200 +++ /var/tmp/diff_new_pack.m6uGLK/_new 2012-07-02 10:19:43.000000000 +0200 @@ -36,6 +36,9 @@ %define binutils_target arm %endif %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") +%if %{binutils_target} == "arm" +%define canonical_target_abi gnueabi- +%endif Name: cross-armv5el-gcc47-icecream-backend BuildRequires: bison @@ -461,7 +464,7 @@ # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-as \ +install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-%{?canonical_target_abi:%canonical_target_abi}as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ ++++++ cross-armv7hl-gcc47-icecream-backend.spec ++++++ # # spec file for package cross-armv7hl-gcc47-icecream-backend # # Copyright (c) 2012 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 build_cp 1 %define build_ada 0 %define build_libjava 0 %define build_java 0 %define build_fortran 0 %define build_objc 0 %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 %define gcc_target_arch armv7hl-suse-linux %define gcc_icecream 1 %define binutils_target armv7hl %if %{binutils_target} == "armv7l" || %{binutils_target} == "armv7hl" %define binutils_target arm %endif %if %{binutils_target} == "armv5el" %define binutils_target arm %endif %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if %{binutils_target} == "arm" %define canonical_target_abi gnueabi- %endif Name: cross-armv7hl-gcc47-icecream-backend BuildRequires: bison BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit BuildRequires: mpc-devel BuildRequires: mpfr-devel BuildRequires: perl BuildRequires: texinfo BuildRequires: zlib-devel %ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc BuildRequires: cloog-devel BuildRequires: libelf-devel BuildRequires: ppl-devel %endif %ifarch ia64 BuildRequires: libunwind-devel %endif ExclusiveArch: ppc ppc64 %ix86 x86_64 ia64 %define _binary_payload w.ufdio # COMMON-BEGIN # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ Version: 4.7.1_20120615 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.7 # COMMON-END # COMMON-BEGIN BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2 Source1: change_spec Source2: libgcj47-rpmlintrc Source3: gcc47-rpmlintrc Source4: ecj.jar Source5: README.First-for.SuSE.packagers Source6: baselibs.conf Patch1: gcc-dir-version.patch Patch2: gcc-sles-version.patch Patch3: gcc-noalias-warn.diff Patch6: suse-record-gcc-opts.diff Patch7: gcc-add-defaultsspec.diff Patch8: Wunprototyped-calls.diff Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch28: pr33763.diff Patch30: gcc43-no-unwind-tables.diff Patch32: pr49484.diff Patch33: gcc-arm-linker.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch Patch57: gcc41-ppc32-retaddr.patch # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch # Patches for SAP features Patch130: sap303956-uchar.diff # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN # LIBJAVA-DELETE-BEGIN Summary: The GNU C Compiler and Support Files License: GPL-3.0+ Group: Development/Languages/C and C++ %description Core package for the GNU Compiler Collection, including the C language frontend. Language frontends other than C are split to different sub-packages, namely gcc-ada, gcc-c++, gcc-fortran, gcc-java, gcc-objc and gcc-obj-c++. # COMMON-END # COMMON-BEGIN # Define the canonical target and host architecture # %gcc_target_arch is supposed to be the full target triple # %TARGET_ARCH is the canonicalized CPU part # %CONFIGURE_TARGET is the target triple used for --target= %if 0%{?gcc_target_arch:1} %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" %define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" %define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" %define CONFIGURE_TARGET i586-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" %define CONFIGURE_TARGET armv7l-suse-linux-gnueabi %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7hl" %define CONFIGURE_TARGET armv7hl-suse-linux-gnueabi %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" %define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %endif %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac) %ifarch ppc %define GCCDIST powerpc64-suse-linux %else %ifarch %sparc %define GCCDIST sparc64-suse-linux %else %ifarch %arm %define GCCDIST %{HOST_ARCH}-suse-linux-gnueabi %else %define GCCDIST %{HOST_ARCH}-suse-linux %endif %endif %endif %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version} %define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version} # COMMON-END # COMMON-BEGIN %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} %patch1 %patch2 %patch3 %patch6 %patch7 %patch8 %patch10 %if !%{build_nof} %patch12 %endif %patch23 %patch24 %patch28 %patch30 %patch32 %patch33 -p1 %patch51 %patch55 %patch57 %patch60 %patch61 %patch130 # We are configuring ppc as ppc64 but with switched multilibs. Adjust # the libstdc++ abi testsuite baseline files accordingly %ifarch ppc if [ -d libstdc++-v3/config/abi/post/powerpc64-linux-gnu ]; then mkdir -p libstdc++-v3/config/abi/post/powerpc64-linux-gnu/64 mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt \ libstdc++-v3/config/abi/post/powerpc64-linux-gnu/64/ mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/32/baseline_symbols.txt \ libstdc++-v3/config/abi/post/powerpc64-linux-gnu/ fi %endif %build # Avoid rebuilding of generated files contrib/gcc_update --touch # Avoid fucking up testsuite results with Java and indirect dispatch export SUSE_ASNEEDED=0 # Split version file into version used for directories (X.Y) and # version to report with --version (X.Y.Z). # See also gcc-dir-version.patch. # Also decrement the patchlevel version by one if test `cat gcc/DEV-PHASE` == "prerelease"; then ( cat gcc/BASE-VER | cut -d '.' -f 1-2 | tr -d '\n'; echo -n .; cat gcc/BASE-VER | cut -d '.' -f 3 | tr '0123456789' '0012345678' ) > gcc/FULL-VER else mv gcc/BASE-VER gcc/FULL-VER fi cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER rm -rf obj-%{GCCDIST} mkdir obj-%{GCCDIST} cd obj-%{GCCDIST} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE" RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g' -e 's/-Wmissing-format-attribute//g' -e 's/-fstack-protector//g' -e 's/-ffortify=.//g' -e 's/-Wall//g' -e 's/-m32//g' -e 's/-m64//g'` %ifarch %ix86 # -mcpu is superceded by -mtune but -mtune is not supported by # our bootstrap compiler. -mcpu gives a warning that stops # the build process, so remove it for now. Also remove all other # -march and -mtune flags. They are superseeded by proper # default compiler settings now. RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-mcpu=i.86//g' -e 's/-march=i.86//g' -e 's/-mtune=i.86//g'` %endif %ifarch s390 s390x RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fsigned-char//g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-O1/-O2/g'` %endif %if 0%{?gcc_target_arch:1} && 0%{!?gcc_icecream:1} # Kill all -march/tune/cpu because that screws building the target libs RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m$arch\|tune\|cpu$=[^ ]*//g'` %endif # Replace 2 spaces by one finally RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/ / /g'` languages=c %if %{build_cp} languages=$languages,c++ %endif %if %{build_objc} languages=$languages,objc %endif %if %{build_fortran} languages=$languages,fortran %endif %if %{build_objcp} languages=$languages,obj-c++ %endif %if %{build_java} languages=$languages,java %endif %if %{build_ada} languages=$languages,ada %endif J=%{?jobs:%jobs} if test -z "$J"; then J=$(getconf _NPROCESSORS_CONF) JL=$(($J * 2)) else test 1 -gt "$J" && J=1 JL=$(($(getconf _NPROCESSORS_CONF)*2)) fi if test "$J" == "0"; then J=1 fi if test "$JL" == "0"; then JL=1 fi PARALLEL="-j$J -l$JL" # we don't want some miscompiles in the testsuite, or some fault in # the compiler to kill the machine. Hence we limit the amount of memory # by the physical RAM plus half of swap #MEM=$(free -m | awk '/^Mem:/ {print $2}') #SWAP=$(free -m | awk '/^Swap:/ {print $2}') #ulimit -v $(((MEM + SWAP/2)*1024)) # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. #ENABLE_CHECKING="--enable-checking=yes" ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 # configure tries to parse include/features.h to detect # if glibc supports SSP. When cross compiling we would need # to install a cross glibc, which we don't, or make the whole # thing point to the native glibc, which is in /, hence the # --with-sysroot=/ %if %{build_ada} # Using the host gnatmake like # CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}" # GNATMAKE="gnatmake%{hostsuffix}" # doesn't work due to PR33857, so an un-suffixed gnatmake has to be # available mkdir -p host-tools/bin cp -a /usr/bin/gnatmake%{hostsuffix} host-tools/bin/gnatmake cp -a /usr/bin/gnatlink%{hostsuffix} host-tools/bin/gnatlink cp -a /usr/bin/gnatbind%{hostsuffix} host-tools/bin/gnatbind cp -a /usr/bin/gcc%{hostsuffix} host-tools/bin/gcc ln -sf /usr/%{_lib} host-tools/%{_lib} export PATH="`pwd`/host-tools/bin:$PATH" %endif #%if 0%{?gcc_target_arch:1} && 0%{!?gcc_icecream:1} #%else # --enable-threads=posix \ #%endif # --enable-shared \ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \ ../configure \ --prefix=%{_prefix} \ --infodir=%{_infodir} \ --mandir=%{_mandir} \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ --disable-libssp \ --disable-libitm \ --disable-plugin \ --with-bugurl="http://bugs.opensuse.org/" \ --with-pkgversion="SUSE Linux" \ %if !%{build_libjava} --disable-libgcj \ %else --with-java-home=%{_libdir}/jvm/java-1.5.0-gcj%{binsuffix}-1.5.0.0/jre \ --with-ecj-jar=%{libsubdir}/ecj.jar \ --disable-java-awt \ %if !%{biarch_libjava} --disable-libjava-multilib \ %endif %endif %if !%{build_with_mudflap} --disable-libmudflap \ %endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ --enable-libstdcxx-allocator=new \ --disable-libstdcxx-pch \ --enable-version-specific-runtime-libs \ %if 0%{suse_version} > 1100 --enable-linker-build-id \ %endif %if 0%{?gcc_target_arch:1} %if 0%{?gcc_icecream:1} --with-sysroot=/ \ --enable-linux-futex \ %endif %if 0%{?canonical_target:1} --with-build-time-tools=/usr/%{canonical_target}-suse-linux/bin \ %endif %if 0%{?build_static:1} --disable-shared \ %endif %if "%{TARGET_ARCH}" == "spu" --with-sysroot=/usr/spu \ --with-gxx-include-dir=%{_prefix}/spu/include/c++/%{gcc_dir_version} \ --with-newlib \ %endif --disable-nls \ --target=%{CONFIGURE_TARGET} \ %else --program-suffix=%{binsuffix} \ --enable-linux-futex \ %ifarch ia64 --with-system-libunwind \ %else --without-system-libunwind \ %endif %endif %if "%{TARGET_ARCH}" == "armv5tel" --with-arch=armv5te \ --with-float=soft \ --with-mode=arm \ --with-abi=aapcs-linux \ --disable-sjlj-exceptions \ %endif %if "%{TARGET_ARCH}" == "armv7l" || "%{TARGET_ARCH}" == "armv7hl" --with-arch=armv7-a \ --with-tune=cortex-a9 \ --with-float=hard \ --with-mode=thumb \ --with-abi=aapcs-linux \ --with-fpu=vfpv3-d16 \ --disable-sjlj-exceptions \ %endif %if "%{TARGET_ARCH}" == "powerpc" --with-cpu=default32 \ --enable-secureplt \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" --with-cpu=power4 \ --enable-secureplt \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "sparc64" --with-cpu=ultrasparc \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "sparc" --with-cpu=v8 \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "i586" --with-arch-32=i586 \ --with-tune=generic \ %endif %if "%{TARGET_ARCH}" == "x86_64" --with-arch-32=i586 \ --with-tune=generic \ %endif %if "%{TARGET_ARCH}" == "s390" --with-tune=z196 --with-arch=z10 \ --with-long-double-128 \ --enable-decimal-float \ %endif %if "%{TARGET_ARCH}" == "s390x" --with-tune=z196 --with-arch=z10 \ --with-long-double-128 \ --enable-decimal-float \ %endif --build=%{GCCDIST} # COMMON-END # COMMON-END make %{?jobs:-j%jobs} all-gcc TARGET-gcc="cc1 cc1plus gcc-cross g++ native" %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-%{?canonical_target_abi:%canonical_target_abi}as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ $RPM_BUILD_ROOT/env/usr/bin/gcc %define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do # Check wether the same library also exists in the parent directory, # and prefer that on the assumption that it is a more generic one. baselib=`echo "$lib" | sed 's,/[^/]*$/[^/]*$$,\1,'` test -f "$baselib" && lib=$baselib install -s -D $lib $RPM_BUILD_ROOT/env$lib done rm -rf $RPM_BUILD_ROOT/inst cd $RPM_BUILD_ROOT/env tar cvzf ../%{name}_%{_arch}.tar.gz * cd .. mkdir -p usr/share/icecream-envs mv %{name}_%{_arch}.tar.gz usr/share/icecream-envs rpm -q --changelog glibc > usr/share/icecream-envs/%{name}_%{_arch}.glibc rpm -q --changelog binutils > usr/share/icecream-envs/%{name}_%{_arch}.binutils rm -r env %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/share/icecream-envs %changelog ++++++ cross-hppa-gcc47-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.m6uGLK/_old 2012-07-02 10:19:43.000000000 +0200 +++ /var/tmp/diff_new_pack.m6uGLK/_new 2012-07-02 10:19:43.000000000 +0200 @@ -36,6 +36,9 @@ %define binutils_target arm %endif %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") +%if %{binutils_target} == "arm" +%define canonical_target_abi gnueabi- +%endif Name: cross-hppa-gcc47-icecream-backend BuildRequires: bison @@ -461,7 +464,7 @@ # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-as \ +install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-%{?canonical_target_abi:%canonical_target_abi}as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ cross-i386-gcc47-icecream-backend.spec: same change cross-ia64-gcc47-icecream-backend.spec: same change cross-ppc-gcc47-icecream-backend.spec: same change cross-ppc64-gcc47-icecream-backend.spec: same change cross-s390-gcc47-icecream-backend.spec: same change cross-s390x-gcc47-icecream-backend.spec: same change cross-x86_64-gcc47-icecream-backend.spec: same change gcc47.spec: same change libffi47.spec: same change libgcj47.spec: same change ++++++ change_spec ++++++ --- /var/tmp/diff_new_pack.m6uGLK/_old 2012-07-02 10:19:43.000000000 +0200 +++ /var/tmp/diff_new_pack.m6uGLK/_new 2012-07-02 10:19:43.000000000 +0200 @@ -113,7 +113,7 @@ # disabled: mips, sparc, alpha if test "$do_icecream" = 1 ; then - for arch in hppa i386 x86_64 s390 s390x ppc ppc64 ia64 armv7l armv5el; do + for arch in hppa i386 x86_64 s390 s390x ppc ppc64 ia64 armv7hl armv5el; do exclarch=`echo $arch | sed -e 's/i.86/%ix86/'` { sed -n -e '1,/COMMON-BEGIN/p' cross-icecream.spec.in sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' $outfile ++++++ cross-icecream.spec.in ++++++ --- /var/tmp/diff_new_pack.m6uGLK/_old 2012-07-02 10:19:43.000000000 +0200 +++ /var/tmp/diff_new_pack.m6uGLK/_new 2012-07-02 10:19:43.000000000 +0200 @@ -28,6 +28,9 @@ %define binutils_target arm %endif %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") +%if %{binutils_target} == "arm" +%define canonical_target_abi gnueabi- +%endif Name: cross-@cross_arch@-gcc@base_ver@-icecream-backend BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel mpc-devel @@ -54,7 +57,7 @@ # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-as \ +install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-%{?canonical_target_abi:%canonical_target_abi}as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2012-07-01 14:59:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium", Maintainer is "PRusnak(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2012-06-01 22:30:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2012-07-02 10:16:48.000000000 +0200 @@ -1,0 +2,45 @@ +Fri Jun 29 08:52:58 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 22.0.1190 + * Security Fixes: + * CVE-2012-2815: Leak of iframe fragment id + * CVE-2012-2816: Prevent sandboxed processes interfering with + each other + * CVE-2012-2817: Use-after-free in table section handling + * CVE-2012-2818: Use-after-free in counter layout + * CVE-2012-2819: Crash in texture handling + * CVE-2012-2820: Out-of-bounds read in SVG filter handling + * CVE-2012-2821: Autofill display problem + * CVE-2012-2823: Use-after-free in SVG resource handling + * CVE-2012-2826: Out-of-bounds read in texture conversion + * CVE-2012-2829: Use-after-free in first-letter handling + * CVE-2012-2830: Wild pointer in array value setting + * CVE-2012-2831: Use-after-free in SVG reference handling + * CVE-2012-2834: Integer overflow in Matroska container + * CVE-2012-2825: Wild read in XSL handling + * CVE-2012-2807: Integer overflows in libxml + * Fix update-alternatives within the spec-file + +------------------------------------------------------------------- +Thu Jun 21 12:20:28 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 22.0.1183 + * Content settings for Cookies now also show protected storage + granted to hosted apps + * Chromoting client plugin correctly up-scales on when page-zoom + is >100%. + +------------------------------------------------------------------- +Tue Jun 19 13:06:52 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 21.0.1181 + * Bugfixes. + * Remove obsolete patch + * Do not execute update-alternatives when building + +------------------------------------------------------------------- +Fri Jun 15 12:19:24 UTC 2012 - coolo(a)suse.com + +- fix update-alternative usage to fix build + +------------------------------------------------------------------- Old: ---- chromium.21.0.1158.0.svn139751.tar.bz2 sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch New: ---- chromium.22.0.1190.0.svn144885.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.Q64guH/_old 2012-07-02 10:17:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Q64guH/_new 2012-07-02 10:17:28.000000000 +0200 @@ -16,11 +16,11 @@ # -%define v8_ver 3.11.7.0 -%define svn_revision 139751 +%define v8_ver 3.12.5.0 +%define svn_revision 144885 Name: chromium -Version: 21.0.1158.0 +Version: 22.0.1190.0 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ @@ -80,8 +80,6 @@ Patch67: chromium_use_gold.patch # PATCH-FIX-OPENSUSE Fix build with GCC 4.7 Patch68: chromium-gcc47.patch -# Upstream Patches -Patch500: sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch %if 0%{?suse_version} > 1210 BuildRequires: libjpeg8-devel @@ -262,7 +260,6 @@ %patch66 -p1 %patch67 -p1 %patch68 -p1 -%patch500 -p1 echo "svn%{svn_revision}" > src/build/LASTCHANGE.in @@ -276,10 +273,6 @@ ## create make files -%if 0%{?suse_version} == 1140 -export LDFLAGS="-Wl,--reduce-memory-overheads" -%endif - PARSED_OPT_FLAGS=`echo \'%{optflags} -DUSE_SYSTEM_LIBEVENT -fPIC -fno-ipa-cp -fno-strict-aliasing \' | sed "s/ /',/g" | sed "s/',/', '/g"` for i in src/build/common.gypi; do sed -i "s|'-march=pentium4',||g" $i @@ -325,12 +318,17 @@ -Dtarget_arch=x64 \ %endif %if 0%{?suse_version} == 1140 +%ifnarch x86_64 -Dlinux_use_gold_flags=0 \ -Dlinux_use_gold_binary=0 \ %else -Dlinux_use_gold_flags=1 \ -Dlinux_use_gold_binary=1 \ %endif +%else +-Dlinux_use_gold_flags=1 \ +-Dlinux_use_gold_binary=1 \ +%endif -Djavascript_engine=v8 make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release ++++++ chromium-6.0.406.0-system-gyp-v8.patch ++++++ --- /var/tmp/diff_new_pack.Q64guH/_old 2012-07-02 10:17:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Q64guH/_new 2012-07-02 10:17:28.000000000 +0200 @@ -10,7 +10,7 @@ + 'linux/system.gyp:v8', '../webkit/support/webkit_support.gyp:*', '../webkit/webkit.gyp:*', - 'util/build_util.gyp:*', + 'temp_gyp/googleurl.gyp:*', Index: chromium/src/build/linux/system.gyp =================================================================== --- chromium.orig/src/build/linux/system.gyp @@ -52,16 +52,16 @@ =================================================================== --- chromium.orig/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp +++ chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp -@@ -1066,7 +1066,7 @@ - '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', +@@ -1114,7 +1114,7 @@ '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', + '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms', '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', '<(libjpeg_gyp_path):libjpeg', ], 'include_dirs': [ -@@ -1189,7 +1189,7 @@ +@@ -1245,7 +1245,7 @@ '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', @@ -70,7 +70,7 @@ '<(libjpeg_gyp_path):libjpeg', ], 'export_dependent_settings': [ -@@ -1207,7 +1207,7 @@ +@@ -1265,7 +1265,7 @@ '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', @@ -79,19 +79,19 @@ '<(libjpeg_gyp_path):libjpeg', ], # This is needed for mac because of webkit_system_interface. It'd be nice -@@ -1939,7 +1939,7 @@ - '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', +@@ -2015,7 +2015,7 @@ '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', + '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', ], 'export_dependent_settings': [ 'webcore_bindings', -@@ -1947,7 +1947,7 @@ - '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', +@@ -2024,7 +2024,7 @@ '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', + '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', ], ++++++ chromium-7.0.500.0-system-speex.patch ++++++ --- /var/tmp/diff_new_pack.Q64guH/_old 2012-07-02 10:17:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Q64guH/_new 2012-07-02 10:17:28.000000000 +0200 @@ -46,12 +46,12 @@ =================================================================== --- chromium.orig/src/content/content_browser.gypi +++ chromium/src/content/content_browser.gypi -@@ -13,7 +13,7 @@ - '../ppapi/ppapi_internal.gyp:ppapi_proxy', - '../skia/skia.gyp:skia', - '../third_party/flac/flac.gyp:libflac', -- '../third_party/speex/speex.gyp:libspeex', -+ '../build/linux/system.gyp:speex', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - '../third_party/zlib/zlib.gyp:zlib', - '../ui/surface/surface.gyp:surface', +@@ -873,7 +873,7 @@ + }, { # OS!="android" + 'dependencies': [ + '../third_party/flac/flac.gyp:libflac', +- '../third_party/speex/speex.gyp:libspeex', ++ '../build/linux/system.gyp:speex', + ], + }], + ['OS=="mac"', { ++++++ chromium-gcc47.patch ++++++ --- /var/tmp/diff_new_pack.Q64guH/_old 2012-07-02 10:17:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Q64guH/_new 2012-07-02 10:17:28.000000000 +0200 @@ -1,45 +1,10 @@ ---- chromium-17.0.963.46/src/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500 -+++ chromium-17.0.963.46/src/chrome/browser/policy/policy_path_parser_linux.cc 2012-02-17 15:26:53.039544290 -0500 -@@ -3,6 +3,7 @@ - // found in the LICENSE file. +--- chromium/src/chrome/browser/memory_details_linux.cc 2012-06-07 08:28:54.414707511 +0200 ++++ chromium/src/chrome/browser/memory_details_linux.cc 2012-06-07 08:28:54.414707511 +0200 +@@ -6,6 +6,7 @@ - #include <pwd.h> + #include <map> + #include <set> +#include <unistd.h> - #include "chrome/browser/policy/policy_path_parser.h" - ---- chromium-17.0.963.46/src/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500 -+++ chromium-17.0.963.46/src/ipc/ipc_channel.h 2012-02-17 14:46:31.821010460 -0500 -@@ -9,6 +9,7 @@ - #include "base/process.h" - #include "ipc/ipc_channel_handle.h" - #include "ipc/ipc_message.h" -+#include <sys/types.h> - - namespace IPC { - ---- chromium-17.0.963.46/src/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500 -+++ chromium-17.0.963.46/src/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500 -@@ -3,10 +3,7 @@ - // found in the LICENSE file. - - #include "ipc/ipc_platform_file.h" -- --#if defined(OS_ANDROID) - #include <unistd.h> --#endif - - namespace IPC { - ---- chromium/src/content/public/common/sandbox_init.cc 2012-05-13 21:49:38.095114828 +0200 -+++ chromium/src/content/public/common/sandbox_init.cc 2012-05-13 21:49:38.095114828 +0200 -@@ -4,9 +4,7 @@ - - #include "content/public/common/sandbox_init.h" - --#if defined(OS_ANDROID) - #include <unistd.h> --#endif - - namespace content { - + #include "base/bind.h" + #include "base/process_util.h" ++++++ chromium-sandbox-pie.patch ++++++ --- /var/tmp/diff_new_pack.Q64guH/_old 2012-07-02 10:17:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Q64guH/_new 2012-07-02 10:17:28.000000000 +0200 @@ -1,14 +1,14 @@ ---- chromium/src/sandbox/sandbox.gyp 2011-11-15 19:35:11.119851877 +0100 -+++ chromium/src/sandbox/sandbox.gyp 2012-01-25 23:24:53.914568688 +0100 -@@ -163,7 +163,10 @@ - ], - 'cflags': [ - # For ULLONG_MAX -- '-std=gnu99', -+ '-std=gnu99 -fPIE', -+ ], -+ 'ldflags': [ -+ '-pie', - ], - 'include_dirs': [ - '..', +--- chromium/src/sandbox/sandbox_linux.gypi 2011-11-15 19:35:11.119851877 +0100 ++++ chromium/src/sandbox/sandbox_linux.gypi 2012-01-25 23:24:53.914568688 +0100 +@@ -80,7 +80,10 @@ + ], + 'cflags': [ + # For ULLONG_MAX +- '-std=gnu99', ++ '-std=gnu99 -fPIE', ++ ], ++ 'ldflags': [ ++ '-pie', + ], + 'include_dirs': [ + '..', ++++++ chromium-system-expat.patch ++++++ --- /var/tmp/diff_new_pack.Q64guH/_old 2012-07-02 10:17:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Q64guH/_new 2012-07-02 10:17:28.000000000 +0200 @@ -1,16 +1,3 @@ -Index: chromium/src/chrome/browser/autofill/autofill_xml_parser.h -=================================================================== ---- chromium.orig/src/chrome/browser/autofill/autofill_xml_parser.h -+++ chromium/src/chrome/browser/autofill/autofill_xml_parser.h -@@ -13,7 +13,7 @@ - #include "base/compiler_specific.h" - #include "chrome/browser/autofill/field_types.h" - #include "chrome/browser/autofill/form_structure.h" --#include "third_party/expat/files/lib/expat.h" -+#include <expat.h> - #include "third_party/libjingle/source/talk/xmllite/xmlparser.h" - - // The base class that contains common functionality between Index: chromium/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h =================================================================== --- chromium.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h ++++++ chromium.21.0.1158.0.svn139751.tar.bz2 -> chromium.22.0.1190.0.svn144885.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/chromium/chromium.21.0.1158.0.svn139751.tar.bz2 /work/SRC/openSUSE:Factory/.chromium.new/chromium.22.0.1190.0.svn144885.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit brp-check-suse for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package brp-check-suse for openSUSE:Factory checked in at 2012-07-02 09:35:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-check-suse (Old) and /work/SRC/openSUSE:Factory/.brp-check-suse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brp-check-suse", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/brp-check-suse/brp-check-suse.changes 2012-03-16 13:09:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brp-check-suse.new/brp-check-suse.changes 2012-07-02 10:15:32.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jul 1 19:37:50 UTC 2012 - coolo(a)suse.com + +- do not allow symlinks to point to itself (not existant as result) + +------------------------------------------------------------------- New: ---- check-broken-symlinks.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brp-check-suse.spec ++++++ --- /var/tmp/diff_new_pack.Bqcn7I/_old 2012-07-02 10:15:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Bqcn7I/_new 2012-07-02 10:15:37.000000000 +0200 @@ -33,6 +33,7 @@ # make package # Source0: %{name}-%{version}.tar.bz2 +Patch0: check-broken-symlinks.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides" %global __find_provides %provfind @@ -47,6 +48,7 @@ %ifnarch x86_64 s390x ppc64 rm brp-65-lib64-linux %endif +%patch0 -p1 %build # nothing to do ++++++ check-broken-symlinks.diff ++++++ Index: brp-check-suse-1.0/brp-25-symlink =================================================================== --- brp-check-suse-1.0.orig/brp-25-symlink 2012-03-13 13:52:11.000000000 +0100 +++ brp-check-suse-1.0/brp-25-symlink 2012-07-01 21:37:11.698384089 +0200 @@ -79,6 +79,11 @@ do fi done + if test "$link" = "$link_dest"; then + echo "ERROR: $link points to itself (as $orig_link_dest)" + exit 1 + fi + # black list case "$link,$link_dest" in *,/var/lib/named*) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at 2012-06-30 11:43:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old) and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2012-06-29 10:38:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2012-07-02 10:13:57.000000000 +0200 @@ -2 +2 @@ -Fri Jun 29 08:40:05 CEST 2012 - autobuild(a)suse.de +Sat Jun 30 07:40:04 CEST 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-06-29 +- automated update on 2012-06-30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.L9215B/_old 2012-07-02 10:14:00.000000000 +0200 +++ /var/tmp/diff_new_pack.L9215B/_new 2012-07-02 10:14:00.000000000 +0200 @@ -23,7 +23,7 @@ License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Summary: Ethercodes Data for arpwatch -Version: 2012.6.29 +Version: 2012.6.30 Release: 1 Source0: http://standards.ieee.org/regauth/oui/oui.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt ++++++ --- /var/tmp/diff_new_pack.L9215B/_old 2012-07-02 10:14:00.000000000 +0200 +++ /var/tmp/diff_new_pack.L9215B/_new 2012-07-02 10:14:00.000000000 +0200 @@ -78731,6 +78731,12 @@ Lisburn Co Antrim BT28 2RE UNITED KINGDOM +00-DB-1E (hex) Albedo Telecom SL +00DB1E (base 16) Albedo Telecom SL + Joan d'Austria 112 + Barcelona 08018 + SPAIN + 00-DB-45 (hex) THAMWAY CO.,LTD. 00DB45 (base 16) THAMWAY CO.,LTD. 3-9-2 @@ -98315,6 +98321,12 @@ New Taipei 231 TAIWAN, REPUBLIC OF CHINA +B8-98-B0 (hex) Atlona Inc. +B898B0 (base 16) Atlona Inc. + 1293 Mountain View Alviso Rd # A + Sunnyvale CA 94089 + UNITED STATES + B8-9A-ED (hex) OceanServer Technology, Inc B89AED (base 16) OceanServer Technology, Inc 151 Martine St -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit armadillo for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2012-07-01 14:59:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "armadillo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2012-06-26 15:13:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2012-07-02 10:13:48.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 29 06:41:42 UTC 2012 - badshah400(a)gmail.com + +- Update to version 3.2.3: + + Minor correction for declaration of fixed size vectors and + matrices. + +------------------------------------------------------------------- Old: ---- armadillo-3.2.2.tar.gz New: ---- armadillo-3.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.EB1vpU/_old 2012-07-02 10:13:51.000000000 +0200 +++ /var/tmp/diff_new_pack.EB1vpU/_new 2012-07-02 10:13:51.000000000 +0200 @@ -17,13 +17,13 @@ Name: armadillo -Version: 3.2.2 +Version: 3.2.3 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: LGPL-3.0+ Group: Development/Libraries/C and C++ Url: http://arma.sourceforge.net/ -Source: http://sourceforge.net/projects/arma/files/%{name}-%{version}.tar.gz +Source: http://download.sourceforge.net/arma/%{name}-%{version}.tar.gz Source2: baselibs.conf BuildRequires: blas-devel BuildRequires: boost-devel ++++++ armadillo-3.2.2.tar.gz -> armadillo-3.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/CMakeLists.txt new/armadillo-3.2.3/CMakeLists.txt --- old/armadillo-3.2.2/CMakeLists.txt 2012-06-01 08:20:52.000000000 +0200 +++ new/armadillo-3.2.3/CMakeLists.txt 2012-06-29 05:06:03.000000000 +0200 @@ -16,7 +16,7 @@ set(ARMA_MAJOR 3) set(ARMA_MINOR 2) -set(ARMA_PATCH 2) +set(ARMA_PATCH 3) message(STATUS "Configuring Armadillo ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/build_aux/cmake/Modules/ARMA_FindMKL.cmake new/armadillo-3.2.3/build_aux/cmake/Modules/ARMA_FindMKL.cmake --- old/armadillo-3.2.2/build_aux/cmake/Modules/ARMA_FindMKL.cmake 2011-02-10 07:59:06.000000000 +0100 +++ new/armadillo-3.2.3/build_aux/cmake/Modules/ARMA_FindMKL.cmake 2012-06-04 16:10:34.000000000 +0200 @@ -18,7 +18,7 @@ FOREACH (MKL_NAME ${MKL_NAMES}) FIND_LIBRARY(${MKL_NAME}_LIBRARY NAMES ${MKL_NAME} - PATHS /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /opt/intel/mkl/lib/lib64 /opt/intel/mkl/lib/ia32 /opt/intel/mkl/lib /opt/intel/*/mkl/lib/intel64 /opt/intel/*/mkl/lib/ia32/ /opt/mkl/*/lib/em64t /opt/mkl/*/lib/32 /opt/intel/mkl/*/lib/em64t /opt/intel/mkl/*/lib/32 + PATHS /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /opt/intel/mkl/lib/lib64 /opt/intel/mkl/lib/intel64 /opt/intel/mkl/lib/ia32 /opt/intel/mkl/lib /opt/intel/*/mkl/lib/intel64 /opt/intel/*/mkl/lib/ia32/ /opt/mkl/*/lib/em64t /opt/mkl/*/lib/32 /opt/intel/mkl/*/lib/em64t /opt/intel/mkl/*/lib/32 ) SET(TMP_LIBRARY ${${MKL_NAME}_LIBRARY}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/include/armadillo_bits/Col_bones.hpp new/armadillo-3.2.3/include/armadillo_bits/Col_bones.hpp --- old/armadillo-3.2.2/include/armadillo_bits/Col_bones.hpp 2012-05-08 06:03:25.000000000 +0200 +++ new/armadillo-3.2.3/include/armadillo_bits/Col_bones.hpp 2012-06-29 05:04:33.000000000 +0200 @@ -109,77 +109,7 @@ inline const_row_iterator end_row (const uword row_num) const; - template<uword fixed_n_elem> - class fixed : public Col<eT> - { - private: - - static const bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); - - arma_aligned eT mem_local_extra[ (use_extra) ? fixed_n_elem : 1 ]; - - arma_inline void change_to_row(); - - - public: - - typedef fixed<fixed_n_elem> Col_fixed_type; - - typedef eT elem_type; - typedef typename get_pod_type<eT>::result pod_type; - - static const bool is_col = true; - static const bool is_row = false; - - static const uword n_rows = fixed_n_elem; - static const uword n_cols = 1; - static const uword n_elem = fixed_n_elem; - - arma_inline fixed(); - arma_inline fixed(const fixed<fixed_n_elem>& X); - inline fixed(const subview_cube<eT>& X); - - template<typename T1> inline fixed(const Base<eT,T1>& A); - template<typename T1, typename T2> inline fixed(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B); - - inline fixed(const eT* aux_mem); - - inline fixed(const char* text); - inline fixed(const std::string& text); - - template<typename T1> inline const Col& operator=(const Base<eT,T1>& A); - - inline const Col& operator=(const eT val); - inline const Col& operator=(const char* text); - inline const Col& operator=(const std::string& text); - inline const Col& operator=(const subview_cube<eT>& X); - - using Col<eT>::operator(); - - #if defined(ARMA_USE_CXX11) - inline fixed(const std::initializer_list<eT>& list); - inline const Col& operator=(const std::initializer_list<eT>& list); - #endif - - arma_inline arma_warn_unused eT& operator[] (const uword i); - arma_inline arma_warn_unused eT operator[] (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword i); - arma_inline arma_warn_unused eT at (const uword i) const; - arma_inline arma_warn_unused eT& operator() (const uword i); - arma_inline arma_warn_unused eT operator() (const uword i) const; - - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT at (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT operator() (const uword in_row, const uword in_col) const; - - arma_inline arma_warn_unused eT* memptr(); - arma_inline arma_warn_unused const eT* memptr() const; - - arma_hot inline const Col<eT>& fill(const eT val); - arma_hot inline const Col<eT>& zeros(); - arma_hot inline const Col<eT>& ones(); - }; + template<uword fixed_n_elem> class fixed; protected: @@ -195,5 +125,80 @@ }; + +template<typename eT> +template<uword fixed_n_elem> +class Col<eT>::fixed : public Col<eT> + { + private: + + static const bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); + + arma_aligned eT mem_local_extra[ (use_extra) ? fixed_n_elem : 1 ]; + + arma_inline void change_to_row(); + + + public: + + typedef fixed<fixed_n_elem> Col_fixed_type; + + typedef eT elem_type; + typedef typename get_pod_type<eT>::result pod_type; + + static const bool is_col = true; + static const bool is_row = false; + + static const uword n_rows = fixed_n_elem; + static const uword n_cols = 1; + static const uword n_elem = fixed_n_elem; + + arma_inline fixed(); + arma_inline fixed(const fixed<fixed_n_elem>& X); + inline fixed(const subview_cube<eT>& X); + + template<typename T1> inline fixed(const Base<eT,T1>& A); + template<typename T1, typename T2> inline fixed(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B); + + inline fixed(const eT* aux_mem); + + inline fixed(const char* text); + inline fixed(const std::string& text); + + template<typename T1> inline const Col& operator=(const Base<eT,T1>& A); + + inline const Col& operator=(const eT val); + inline const Col& operator=(const char* text); + inline const Col& operator=(const std::string& text); + inline const Col& operator=(const subview_cube<eT>& X); + + using Col<eT>::operator(); + + #if defined(ARMA_USE_CXX11) + inline fixed(const std::initializer_list<eT>& list); + inline const Col& operator=(const std::initializer_list<eT>& list); + #endif + + arma_inline arma_warn_unused eT& operator[] (const uword i); + arma_inline arma_warn_unused eT operator[] (const uword i) const; + arma_inline arma_warn_unused eT& at (const uword i); + arma_inline arma_warn_unused eT at (const uword i) const; + arma_inline arma_warn_unused eT& operator() (const uword i); + arma_inline arma_warn_unused eT operator() (const uword i) const; + + arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); + arma_inline arma_warn_unused eT at (const uword in_row, const uword in_col) const; + arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); + arma_inline arma_warn_unused eT operator() (const uword in_row, const uword in_col) const; + + arma_inline arma_warn_unused eT* memptr(); + arma_inline arma_warn_unused const eT* memptr() const; + + arma_hot inline const Col<eT>& fill(const eT val); + arma_hot inline const Col<eT>& zeros(); + arma_hot inline const Col<eT>& ones(); + }; + + //! @} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/include/armadillo_bits/Cube_bones.hpp new/armadillo-3.2.3/include/armadillo_bits/Cube_bones.hpp --- old/armadillo-3.2.2/include/armadillo_bits/Cube_bones.hpp 2012-05-01 07:43:40.000000000 +0200 +++ new/armadillo-3.2.3/include/armadillo_bits/Cube_bones.hpp 2012-06-29 05:04:33.000000000 +0200 @@ -280,38 +280,7 @@ inline const_slice_iterator end_slice(const uword slice_num) const; - template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices> - class fixed : public Cube<eT> - { - private: - - static const uword fixed_n_elem = fixed_n_rows * fixed_n_cols * fixed_n_slices; - - arma_aligned Mat<eT>* mat_ptrs_local_extra[ (fixed_n_slices > Cube_prealloc::mat_ptrs_size) ? fixed_n_slices : 1 ]; - arma_aligned eT mem_local_extra [ (fixed_n_elem > Cube_prealloc::mem_n_elem) ? fixed_n_elem : 1 ]; - - arma_inline void mem_setup(); - - - public: - - inline fixed() { mem_setup(); } - - inline const Cube& operator=(const eT val) { mem_setup(); Cube<eT>::operator=(val); return *this; } - - template<typename T1> - inline fixed(const BaseCube<eT,T1>& A) { mem_setup(); Cube<eT>::operator=(A.get_ref()); } - - template<typename T1> - inline const Cube& operator=(const BaseCube<eT,T1>& A) { Cube<eT>::operator=(A.get_ref()); return *this; } - - template<typename T1, typename T2> - inline explicit fixed(const BaseCube<pod_type,T1>& A, const BaseCube<pod_type,T2>& B) { mem_setup(); Cube<eT>::init(A,B); } - - - // using Cube<eT>::operator(); - // TODO: overload operator(), operator[] and .at() to allow faster element access - }; + template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices> class fixed; protected: @@ -340,6 +309,42 @@ }; + +template<typename eT> +template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices> +class Cube<eT>::fixed : public Cube<eT> + { + private: + + static const uword fixed_n_elem = fixed_n_rows * fixed_n_cols * fixed_n_slices; + + arma_aligned Mat<eT>* mat_ptrs_local_extra[ (fixed_n_slices > Cube_prealloc::mat_ptrs_size) ? fixed_n_slices : 1 ]; + arma_aligned eT mem_local_extra [ (fixed_n_elem > Cube_prealloc::mem_n_elem) ? fixed_n_elem : 1 ]; + + arma_inline void mem_setup(); + + + public: + + inline fixed() { mem_setup(); } + + inline const Cube& operator=(const eT val) { mem_setup(); Cube<eT>::operator=(val); return *this; } + + template<typename T1> + inline fixed(const BaseCube<eT,T1>& A) { mem_setup(); Cube<eT>::operator=(A.get_ref()); } + + template<typename T1> + inline const Cube& operator=(const BaseCube<eT,T1>& A) { Cube<eT>::operator=(A.get_ref()); return *this; } + + template<typename T1, typename T2> + inline explicit fixed(const BaseCube<pod_type,T1>& A, const BaseCube<pod_type,T2>& B) { mem_setup(); Cube<eT>::init(A,B); } + + + // using Cube<eT>::operator(); + // TODO: overload operator(), operator[] and .at() to allow faster element access + }; + + class Cube_aux { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/include/armadillo_bits/Mat_bones.hpp new/armadillo-3.2.3/include/armadillo_bits/Mat_bones.hpp --- old/armadillo-3.2.2/include/armadillo_bits/Mat_bones.hpp 2012-05-08 06:03:25.000000000 +0200 +++ new/armadillo-3.2.3/include/armadillo_bits/Mat_bones.hpp 2012-06-29 05:04:33.000000000 +0200 @@ -463,75 +463,10 @@ inline bool empty() const; inline uword size() const; - template<uword fixed_n_rows, uword fixed_n_cols> - class fixed : public Mat<eT> - { - private: - - static const uword fixed_n_elem = fixed_n_rows * fixed_n_cols; - static const bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); - - arma_aligned eT mem_local_extra[ (use_extra) ? fixed_n_elem : 1 ]; - - - public: - - typedef fixed<fixed_n_rows, fixed_n_cols> Mat_fixed_type; - - typedef eT elem_type; - typedef typename get_pod_type<eT>::result pod_type; - - static const bool is_col = (fixed_n_cols == 1) ? true : false; - static const bool is_row = (fixed_n_rows == 1) ? true : false; - - static const uword n_rows = fixed_n_rows; - static const uword n_cols = fixed_n_cols; - static const uword n_elem = fixed_n_elem; - - arma_inline fixed(); - arma_inline fixed(const fixed<fixed_n_rows, fixed_n_cols>& X); - - template<typename T1> inline fixed(const Base<eT,T1>& A); - template<typename T1, typename T2> inline fixed(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B); - - inline fixed(const eT* aux_mem); - - inline fixed(const char* text); - inline fixed(const std::string& text); - - using Mat<eT>::operator=; - using Mat<eT>::operator(); - - #if defined(ARMA_USE_CXX11) - inline fixed(const std::initializer_list<eT>& list); - inline const Mat& operator=(const std::initializer_list<eT>& list); - #endif - - - arma_inline arma_warn_unused eT& operator[] (const uword i); - arma_inline arma_warn_unused eT operator[] (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword i); - arma_inline arma_warn_unused eT at (const uword i) const; - arma_inline arma_warn_unused eT& operator() (const uword i); - arma_inline arma_warn_unused eT operator() (const uword i) const; - - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT at (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT operator() (const uword in_row, const uword in_col) const; - - arma_inline arma_warn_unused eT* memptr(); - arma_inline arma_warn_unused const eT* memptr() const; - - arma_hot inline const Mat<eT>& fill(const eT val); - arma_hot inline const Mat<eT>& zeros(); - arma_hot inline const Mat<eT>& ones(); - }; - - - inline void steal_mem(Mat& X); //!< don't use this unless you're writing code internal to Armadillo + template<uword fixed_n_rows, uword fixed_n_cols> class fixed; + protected: @@ -569,6 +504,74 @@ }; + +template<typename eT> +template<uword fixed_n_rows, uword fixed_n_cols> +class Mat<eT>::fixed : public Mat<eT> + { + private: + + static const uword fixed_n_elem = fixed_n_rows * fixed_n_cols; + static const bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); + + arma_aligned eT mem_local_extra[ (use_extra) ? fixed_n_elem : 1 ]; + + + public: + + typedef fixed<fixed_n_rows, fixed_n_cols> Mat_fixed_type; + + typedef eT elem_type; + typedef typename get_pod_type<eT>::result pod_type; + + static const bool is_col = (fixed_n_cols == 1) ? true : false; + static const bool is_row = (fixed_n_rows == 1) ? true : false; + + static const uword n_rows = fixed_n_rows; + static const uword n_cols = fixed_n_cols; + static const uword n_elem = fixed_n_elem; + + arma_inline fixed(); + arma_inline fixed(const fixed<fixed_n_rows, fixed_n_cols>& X); + + template<typename T1> inline fixed(const Base<eT,T1>& A); + template<typename T1, typename T2> inline fixed(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B); + + inline fixed(const eT* aux_mem); + + inline fixed(const char* text); + inline fixed(const std::string& text); + + using Mat<eT>::operator=; + using Mat<eT>::operator(); + + #if defined(ARMA_USE_CXX11) + inline fixed(const std::initializer_list<eT>& list); + inline const Mat& operator=(const std::initializer_list<eT>& list); + #endif + + + arma_inline arma_warn_unused eT& operator[] (const uword i); + arma_inline arma_warn_unused eT operator[] (const uword i) const; + arma_inline arma_warn_unused eT& at (const uword i); + arma_inline arma_warn_unused eT at (const uword i) const; + arma_inline arma_warn_unused eT& operator() (const uword i); + arma_inline arma_warn_unused eT operator() (const uword i) const; + + arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); + arma_inline arma_warn_unused eT at (const uword in_row, const uword in_col) const; + arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); + arma_inline arma_warn_unused eT operator() (const uword in_row, const uword in_col) const; + + arma_inline arma_warn_unused eT* memptr(); + arma_inline arma_warn_unused const eT* memptr() const; + + arma_hot inline const Mat<eT>& fill(const eT val); + arma_hot inline const Mat<eT>& zeros(); + arma_hot inline const Mat<eT>& ones(); + }; + + class Mat_aux { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/include/armadillo_bits/Row_bones.hpp new/armadillo-3.2.3/include/armadillo_bits/Row_bones.hpp --- old/armadillo-3.2.2/include/armadillo_bits/Row_bones.hpp 2012-05-08 06:03:25.000000000 +0200 +++ new/armadillo-3.2.3/include/armadillo_bits/Row_bones.hpp 2012-06-29 05:04:33.000000000 +0200 @@ -109,75 +109,7 @@ inline const_row_iterator end_row (const uword row_num) const; - template<uword fixed_n_elem> - class fixed : public Row<eT> - { - private: - - static const bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); - - arma_aligned eT mem_local_extra[ (use_extra) ? fixed_n_elem : 1 ]; - - - public: - - typedef fixed<fixed_n_elem> Row_fixed_type; - - typedef eT elem_type; - typedef typename get_pod_type<eT>::result pod_type; - - static const bool is_col = false; - static const bool is_row = true; - - static const uword n_rows = 1; - static const uword n_cols = fixed_n_elem; - static const uword n_elem = fixed_n_elem; - - arma_inline fixed(); - arma_inline fixed(const fixed<fixed_n_elem>& X); - inline fixed(const subview_cube<eT>& X); - - template<typename T1> inline fixed(const Base<eT,T1>& A); - template<typename T1, typename T2> inline fixed(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B); - - inline fixed(const eT* aux_mem); - - inline fixed(const char* text); - inline fixed(const std::string& text); - - template<typename T1> inline const Row& operator=(const Base<eT,T1>& A); - - inline const Row& operator=(const eT val); - inline const Row& operator=(const char* text); - inline const Row& operator=(const std::string& text); - inline const Row& operator=(const subview_cube<eT>& X); - - using Row<eT>::operator(); - - #if defined(ARMA_USE_CXX11) - inline fixed(const std::initializer_list<eT>& list); - inline const Row& operator=(const std::initializer_list<eT>& list); - #endif - - arma_inline arma_warn_unused eT& operator[] (const uword i); - arma_inline arma_warn_unused eT operator[] (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword i); - arma_inline arma_warn_unused eT at (const uword i) const; - arma_inline arma_warn_unused eT& operator() (const uword i); - arma_inline arma_warn_unused eT operator() (const uword i) const; - - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT at (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT operator() (const uword in_row, const uword in_col) const; - - arma_inline arma_warn_unused eT* memptr(); - arma_inline arma_warn_unused const eT* memptr() const; - - arma_hot inline const Row<eT>& fill(const eT val); - arma_hot inline const Row<eT>& zeros(); - arma_hot inline const Row<eT>& ones(); - }; + template<uword fixed_n_elem> class fixed; protected: @@ -193,5 +125,78 @@ }; + +template<typename eT> +template<uword fixed_n_elem> +class Row<eT>::fixed : public Row<eT> + { + private: + + static const bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); + + arma_aligned eT mem_local_extra[ (use_extra) ? fixed_n_elem : 1 ]; + + + public: + + typedef fixed<fixed_n_elem> Row_fixed_type; + + typedef eT elem_type; + typedef typename get_pod_type<eT>::result pod_type; + + static const bool is_col = false; + static const bool is_row = true; + + static const uword n_rows = 1; + static const uword n_cols = fixed_n_elem; + static const uword n_elem = fixed_n_elem; + + arma_inline fixed(); + arma_inline fixed(const fixed<fixed_n_elem>& X); + inline fixed(const subview_cube<eT>& X); + + template<typename T1> inline fixed(const Base<eT,T1>& A); + template<typename T1, typename T2> inline fixed(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B); + + inline fixed(const eT* aux_mem); + + inline fixed(const char* text); + inline fixed(const std::string& text); + + template<typename T1> inline const Row& operator=(const Base<eT,T1>& A); + + inline const Row& operator=(const eT val); + inline const Row& operator=(const char* text); + inline const Row& operator=(const std::string& text); + inline const Row& operator=(const subview_cube<eT>& X); + + using Row<eT>::operator(); + + #if defined(ARMA_USE_CXX11) + inline fixed(const std::initializer_list<eT>& list); + inline const Row& operator=(const std::initializer_list<eT>& list); + #endif + + arma_inline arma_warn_unused eT& operator[] (const uword i); + arma_inline arma_warn_unused eT operator[] (const uword i) const; + arma_inline arma_warn_unused eT& at (const uword i); + arma_inline arma_warn_unused eT at (const uword i) const; + arma_inline arma_warn_unused eT& operator() (const uword i); + arma_inline arma_warn_unused eT operator() (const uword i) const; + + arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); + arma_inline arma_warn_unused eT at (const uword in_row, const uword in_col) const; + arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); + arma_inline arma_warn_unused eT operator() (const uword in_row, const uword in_col) const; + + arma_inline arma_warn_unused eT* memptr(); + arma_inline arma_warn_unused const eT* memptr() const; + + arma_hot inline const Row<eT>& fill(const eT val); + arma_hot inline const Row<eT>& zeros(); + arma_hot inline const Row<eT>& ones(); + }; + + //! @} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/include/armadillo_bits/arma_version.hpp new/armadillo-3.2.3/include/armadillo_bits/arma_version.hpp --- old/armadillo-3.2.2/include/armadillo_bits/arma_version.hpp 2012-06-01 08:20:52.000000000 +0200 +++ new/armadillo-3.2.3/include/armadillo_bits/arma_version.hpp 2012-06-29 05:06:03.000000000 +0200 @@ -18,7 +18,7 @@ #define ARMA_VERSION_MAJOR 3 #define ARMA_VERSION_MINOR 2 -#define ARMA_VERSION_PATCH 2 +#define ARMA_VERSION_PATCH 3 #define ARMA_VERSION_NAME "Creamfields" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/include/armadillo_bits/glue_cor_meat.hpp new/armadillo-3.2.3/include/armadillo_bits/glue_cor_meat.hpp --- old/armadillo-3.2.2/include/armadillo_bits/glue_cor_meat.hpp 2011-11-01 16:23:38.000000000 +0100 +++ new/armadillo-3.2.3/include/armadillo_bits/glue_cor_meat.hpp 2012-06-29 05:04:33.000000000 +0200 @@ -1,5 +1,5 @@ -// Copyright (C) 2009-2011 NICTA (www.nicta.com.au) -// Copyright (C) 2009-2011 Conrad Sanderson +// Copyright (C) 2009-2012 NICTA (www.nicta.com.au) +// Copyright (C) 2009-2012 Conrad Sanderson // Copyright (C) 2009-2010 Dimitrios Bouzas // // This file is part of the Armadillo C++ library. @@ -68,7 +68,7 @@ } else { - arma_debug_assert_same_size(A, B, "cor()"); + arma_debug_assert_mul_size(A, B, true, false, "cor()"); const uword N = A.n_rows; const eT norm_val = (norm_type == 0) ? ( (N > 1) ? eT(N-1) : eT(1) ) : eT(N); @@ -135,7 +135,7 @@ } else { - arma_debug_assert_same_size(A, B, "cor()"); + arma_debug_assert_mul_size(A, B, true, false, "cor()"); const uword N = A.n_rows; const eT norm_val = (norm_type == 0) ? ( (N > 1) ? eT(N-1) : eT(1) ) : eT(N); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.2/include/armadillo_bits/glue_cov_meat.hpp new/armadillo-3.2.3/include/armadillo_bits/glue_cov_meat.hpp --- old/armadillo-3.2.2/include/armadillo_bits/glue_cov_meat.hpp 2011-11-01 16:23:38.000000000 +0100 +++ new/armadillo-3.2.3/include/armadillo_bits/glue_cov_meat.hpp 2012-06-29 05:04:33.000000000 +0200 @@ -1,5 +1,5 @@ -// Copyright (C) 2009-2011 NICTA (www.nicta.com.au) -// Copyright (C) 2009-2011 Conrad Sanderson +// Copyright (C) 2009-2012 NICTA (www.nicta.com.au) +// Copyright (C) 2009-2012 Conrad Sanderson // Copyright (C) 2009-2010 Dimitrios Bouzas // // This file is part of the Armadillo C++ library. @@ -57,11 +57,11 @@ } else { - arma_debug_assert_same_size(A, B, "cov()"); - + arma_debug_assert_mul_size(A, B, true, false, "cov()"); + const uword N = A.n_rows; const eT norm_val = (norm_type == 0) ? ( (N > 1) ? eT(N-1) : eT(1) ) : eT(N); - + out = trans(A) * B; out -= (trans(sum(A)) * sum(B))/eT(N); out /= norm_val; @@ -112,8 +112,8 @@ } else { - arma_debug_assert_same_size(A, B, "cov()"); - + arma_debug_assert_mul_size(A, B, true, false, "cov()"); + const uword N = A.n_rows; const eT norm_val = (norm_type == 0) ? ( (N > 1) ? eT(N-1) : eT(1) ) : eT(N); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0