March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit kernel-source for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package kernel-source for openSUSE:12.3 checked in at 2013-03-01 11:24:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kernel-source (Old) and /work/SRC/openSUSE:12.3/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source", Maintainer is "kernel-maintainers(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:12.3/kernel-source/kernel-cubox.changes 2013-02-23 08:58:21.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kernel-source.new/kernel-cubox.changes 2013-03-01 11:24:46.000000000 +0100 @@ -1,0 +2,75 @@ +Thu Feb 28 16:06:29 CET 2013 - mmarek(a)suse.cz + +- Add missing symtypes files +- commit 82d3f21 + +------------------------------------------------------------------- +Wed Feb 27 20:44:57 CET 2013 - jslaby(a)suse.cz + +- Linux 3.7.10 (CVE-2013-0231 CVE-2013-1763 bnc#792500 bnc#801178 + bnc#802347 bnc#805633 XSA-43). +- Refresh patches.xen/xen3-patch-2.6.31. +- Refresh patches.xen/xen3-patch-3.1. +- Delete + patches.fixes/drm-nouveau-vm-fix-memory-corruption-when-pgt-alloca.patch. +- Delete + patches.fixes/sock_diag-fix-out-of-bounds-access-to-sock_diag_handlers. +- Delete + patches.suse/suse-hv-register-clocksource-only-if-its-adverti.patch. +- Delete patches.xen/xen-pciback-ratelimit. +- commit 331049f + +------------------------------------------------------------------- +Wed Feb 27 14:48:19 CET 2013 - jeffm(a)suse.de + +- Added kABI references for openSUSE 12.3 release. +- commit 5b76602 + +------------------------------------------------------------------- +Tue Feb 26 04:27:14 CET 2013 - jeffm(a)suse.com + +- ext4: release sysfs kobject when failing to enable quotas + on mount. +- commit 5aa1b40 + +------------------------------------------------------------------- +Tue Feb 26 04:23:24 CET 2013 - jeffm(a)suse.com + +- sock_diag: Simplify sock_diag_handlers handling in + __sock_diag_rcv_msg (bnc#805633 CVE-2013-1763). +- sock_diag: Fix out-of-bounds access to sock_diag_handlers + (bnc#805633 CVE-2013-1763). +- commit 0fe692b + +------------------------------------------------------------------- +Mon Feb 25 21:22:24 CET 2013 - jeffm(a)suse.com + +- doc/README.SUSE: Updated versions to reflect 3.x kernels. +- commit e77fcee + +------------------------------------------------------------------- +Mon Feb 25 20:57:27 CET 2013 - jeffm(a)suse.com + +- Fix build breakage due to out-of-order patch refresh. +- commit 1aa4b69 + +------------------------------------------------------------------- +Mon Feb 25 20:40:38 CET 2013 - jeffm(a)suse.com + +- ext4: fix error handling in ext4_fill_super(). +- commit 63c52e2 + +------------------------------------------------------------------- +Mon Feb 25 11:25:49 CET 2013 - jslaby(a)suse.cz + +- TTY: do not update atime/mtime on read/write (bnc#797175 + CVE-2013-0160). +- commit 7d04bee + +------------------------------------------------------------------- +Fri Feb 22 12:41:08 CET 2013 - dsterba(a)suse.cz + +- Btrfs: fix hash overflow handling (FATE#312888). +- commit b26c055 + +------------------------------------------------------------------- @@ -72,0 +148,6 @@ + +------------------------------------------------------------------- +Wed Feb 6 20:46:30 CET 2013 - jeffm(a)suse.com + +- Fix whitespace in several patches to make series2git happy. +- commit dc7f072 kernel-debug.changes: same change kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-exynos.changes: same change kernel-highbank.changes: same change kernel-imx51.changes: same change kernel-omap2plus.changes: same change kernel-pae.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-u8500.changes: same change kernel-vanilla.changes: same change kernel-versatile.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-cubox.spec ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:53.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.7 -%define patchversion 3.7.9 +%define patchversion 3.7.10 %define variant %{nil} %define vanilla_only 0 @@ -59,7 +59,7 @@ Name: kernel-cubox Summary: Kernel for SolidRun Cubox -Version: 3.7.9 +Version: 3.7.10 Release: 0 License: GPL-2.0 Group: System/Kernel kernel-debug.spec: same change kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:53.000000000 +0100 @@ -17,14 +17,14 @@ # norootforbuild -%define patchversion 3.7.9 +%define patchversion 3.7.10 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.7.9 +Version: 3.7.10 Release: 0 BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:53.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.7 -%define patchversion 3.7.9 +%define patchversion 3.7.10 %define variant %{nil} %define vanilla_only 0 @@ -59,7 +59,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.7.9 +Version: 3.7.10 Release: 0 License: GPL-2.0 Group: System/Kernel kernel-exynos.spec: same change kernel-highbank.spec: same change kernel-imx51.spec: same change kernel-omap2plus.spec: same change kernel-pae.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:53.000000000 +0100 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 3.7 -%define patchversion 3.7.9 +%define patchversion 3.7.10 %define variant %{nil} %define vanilla_only 0 @@ -29,7 +29,7 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.7.9 +Version: 3.7.10 Release: 0 License: GPL-2.0 Group: Development/Sources ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:53.000000000 +0100 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.7.9 +Version: 3.7.10 %if %using_buildservice Release: 0 %else ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:53.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.7 -%define patchversion 3.7.9 +%define patchversion 3.7.10 %define variant %{nil} %define vanilla_only 0 @@ -59,7 +59,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.7.9 +Version: 3.7.10 Release: 0 License: GPL-2.0 Group: System/Kernel kernel-u8500.spec: same change kernel-vanilla.spec: same change kernel-versatile.spec: same change kernel-xen.spec: same change ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:53.000000000 +0100 @@ -1,4 +1,4 @@ -WORKING WITH THE SUSE 2.6.x KERNEL SOURCES +WORKING WITH THE SUSE KERNEL SOURCES Andreas Gruenbacher <agruen(a)suse.de>, SUSE Labs, 2003, 2004, 2005, 2006 Michal Marek <mmarek(a)suse.de>, SUSE Labs, 2010 @@ -308,12 +308,12 @@ $ for f in patches.*.tar.bz2; do \ tar -xjf "$f" || break; \ done - $ tar -xjf linux-2.6.5.tar.bz2 + $ tar -xjf linux-3.7.tar.bz2 # Apply the patches $ for p in $(./guards < series.conf); do - patch -d linux-2.6.5 -p1 < $p || break + patch -d linux-3.7 -p1 < $p || break done The configuration script config.conf which is similar to series.conf is @@ -334,7 +334,7 @@ The kernel-$FLAVOR packages are based on config/$ARCH/$FLAVOR. (kernel-default is based on config/$ARCH/default, for example). The kernel-$FLAVOR packages install their configuration files as -/boot/config-$VER_STR (for example, /boot/config-2.6.5-99-default). The +/boot/config-$VER_STR (for example, /boot/config-3.7.6-99-default). The config is also packaged in the kernel-$FLAVOR-devel package as /usr/src/linux-obj/$ARCH/$FLAVOR/.config. @@ -422,21 +422,21 @@ MODULE LOAD PATHS Modules that belong to a specific kernel release are installed in -/lib/modules/2.6.5-99-smp and similar. Note that this path contains the +/lib/modules/3.7.6-99-smp and similar. Note that this path contains the kernel package release number. Modules from KMPs must be installed -below /lib/modules/2.6.5-99-smp/updates/ and similar: modules below +below /lib/modules/3.7.6-99-smp/updates/ and similar: modules below updates/ have priority over other modules. When KMPs contain modules that are compatible between multiple installed kernels, symlinks are used to make those modules available to those compatible kernels like this: - /lib/modules/2.6.16-100-smp/weak-updates/foo.ko -> - /lib/modules/2.6.16-99-smp/updates/foo.ko + /lib/modules/3.7.6-100-smp/weak-updates/foo.ko -> + /lib/modules/3.7.6-99-smp/updates/foo.ko Modules in the weak-updates directory have lower priority than modules -in /lib/modules/2.6.16-100-smp/updates/, and higher priority than other -modules in /lib/modules/2.6.16-100-smp. +in /lib/modules/3.7.6-100-smp/updates/, and higher priority than other +modules in /lib/modules/3.7.6-100-smp. REFERENCES ++++++ kabi.tar.bz2 ++++++ ++++ 1176037 lines of diff (skipped) ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-origen-regulator.patch new/patches.arch/arm-origen-regulator.patch --- old/patches.arch/arm-origen-regulator.patch 2012-10-22 18:06:28.000000000 +0200 +++ new/patches.arch/arm-origen-regulator.patch 2013-02-25 19:05:12.000000000 +0100 @@ -28,11 +28,11 @@ @@ -121,6 +121,7 @@ static struct regulator_consumer_supply __initdata ldo14_consumer[] = { }; static struct regulator_consumer_supply __initdata ldo17_consumer[] = { - REGULATOR_SUPPLY("vdd33", "swb-a31"), /* AR6003 WLAN & CSR 8810 BT */ + REGULATOR_SUPPLY("vdd33", "swb-a31"), /* AR6003 WLAN & CSR 8810 BT */ + REGULATOR_SUPPLY("vmmc", NULL), }; static struct regulator_consumer_supply __initdata buck1_consumer[] = { - REGULATOR_SUPPLY("vdd_arm", NULL), /* CPUFREQ */ + REGULATOR_SUPPLY("vdd_arm", NULL), /* CPUFREQ */ --- linus.orig/arch/arm/mach-exynos/mach-smdkv310.c +++ linus/arch/arm/mach-exynos/mach-smdkv310.c @@ -14,6 +14,8 @@ @@ -45,7 +45,7 @@ #include <linux/io.h> #include <linux/i2c.h> @@ -380,6 +382,14 @@ static void __init smdkv310_reserve(void - s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20); + s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20); } +static struct regulator_consumer_supply vddmmc_consumers[] __devinitdata = { @@ -58,15 +58,15 @@ + static void __init smdkv310_machine_init(void) { - s3c_i2c1_set_platdata(NULL); + s3c_i2c1_set_platdata(NULL); @@ -387,6 +397,9 @@ static void __init smdkv310_machine_init - smdkv310_smsc911x_init(); + smdkv310_smsc911x_init(); + regulator_register_always_on(0, "fixed-3.3V", vddmmc_consumers, + ARRAY_SIZE(vddmmc_consumers), 3300000); + - s3c_sdhci0_set_platdata(&smdkv310_hsmmc0_pdata); - s3c_sdhci1_set_platdata(&smdkv310_hsmmc1_pdata); - s3c_sdhci2_set_platdata(&smdkv310_hsmmc2_pdata); + s3c_sdhci0_set_platdata(&smdkv310_hsmmc0_pdata); + s3c_sdhci1_set_platdata(&smdkv310_hsmmc1_pdata); + s3c_sdhci2_set_platdata(&smdkv310_hsmmc2_pdata); ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/TTY-do-not-update-atime-mtime-on-read-write.patch new/patches.fixes/TTY-do-not-update-atime-mtime-on-read-write.patch --- old/patches.fixes/TTY-do-not-update-atime-mtime-on-read-write.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/TTY-do-not-update-atime-mtime-on-read-write.patch 2013-02-26 04:27:14.000000000 +0100 @@ -0,0 +1,55 @@ +From: Jiri Slaby <jslaby(a)suse.cz> +Subject: TTY: do not update atime/mtime on read/write +Patch-mainline: 3.9-rc1 +References: bnc#797175 CVE-2013-0160 + +On http://vladz.devzero.fr/013_ptmx-timing.php, we can see how to find +out length of a password using timestamps of /dev/ptmx. It is +documented in "Timing Analysis of Keystrokes and Timing Attacks on +SSH". To avoid that problem, do not update time when reading +from/writing to a TTY. + +I am afraid of regressions as this is a behavior we have since 0.97 +and apps may expect the time to be current, e.g. for monitoring +whether there was a change on the TTY. Now, there is no change. So +this would better have a lot of testing before it goes upstream. + +References: CVE-2013-0160 + +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +Cc: stable <stable(a)vger.kernel.org> # after 3.9 is out +Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> +--- + drivers/tty/tty_io.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c +index 54a254a..8f44d62 100644 +--- a/drivers/tty/tty_io.c ++++ b/drivers/tty/tty_io.c +@@ -977,8 +977,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count, + else + i = -EIO; + tty_ldisc_deref(ld); +- if (i > 0) +- inode->i_atime = current_fs_time(inode->i_sb); ++ + return i; + } + +@@ -1079,11 +1078,8 @@ static inline ssize_t do_tty_write( + break; + cond_resched(); + } +- if (written) { +- struct inode *inode = file->f_path.dentry->d_inode; +- inode->i_mtime = current_fs_time(inode->i_sb); ++ if (written) + ret = written; +- } + out: + tty_write_unlock(tty); + return ret; +-- +1.8.1.4 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/drm-nouveau-vm-fix-memory-corruption-when-pgt-alloca.patch new/patches.fixes/drm-nouveau-vm-fix-memory-corruption-when-pgt-alloca.patch --- old/patches.fixes/drm-nouveau-vm-fix-memory-corruption-when-pgt-alloca.patch 2013-02-19 09:08:52.000000000 +0100 +++ new/patches.fixes/drm-nouveau-vm-fix-memory-corruption-when-pgt-alloca.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -From: Marcin Slusarz <marcin.slusarz(a)gmail.com> -Date: Mon, 10 Dec 2012 21:30:51 +0100 -Subject: drm/nouveau/vm: fix memory corruption when pgt allocation fails -Git-commit: cfd376b6bfccf33782a0748a9c70f7f752f8b869 -Patch-mainline: v3.8-rc6 -References: bnc#802347 - -If we return freed vm, nouveau_drm_open will happily call nouveau_cli_destroy, -which will try to free it again. - -Reported-by: Peter Hurley <peter(a)hurleysoftware.com> -Signed-off-by: Marcin Slusarz <marcin.slusarz(a)gmail.com> -Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> ---- - drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/nouveau/core/subdev/vm/base.c b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c -index 082c11b..77c67fc 100644 ---- a/drivers/gpu/drm/nouveau/core/subdev/vm/base.c -+++ b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c -@@ -352,7 +352,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length, - u64 mm_length = (offset + length) - mm_offset; - int ret; - -- vm = *pvm = kzalloc(sizeof(*vm), GFP_KERNEL); -+ vm = kzalloc(sizeof(*vm), GFP_KERNEL); - if (!vm) - return -ENOMEM; - -@@ -376,6 +376,8 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length, - return ret; - } - -+ *pvm = vm; -+ - return 0; - } - --- -1.8.1.2 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/ext4-fix-error-handling-in-ext4_fill_super new/patches.fixes/ext4-fix-error-handling-in-ext4_fill_super --- old/patches.fixes/ext4-fix-error-handling-in-ext4_fill_super 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/ext4-fix-error-handling-in-ext4_fill_super 2013-02-26 04:27:14.000000000 +0100 @@ -0,0 +1,110 @@ +From 07aa2ea13814ea60d12f7330b6d5ccfdb0c3ba4d Mon Sep 17 00:00:00 2001 +From: Lukas Czerner <lczerner(a)redhat.com> +Date: Thu, 8 Nov 2012 15:16:54 -0500 +Subject: ext4: fix error handling in ext4_fill_super() +Git-commit: 07aa2ea13814ea60d12f7330b6d5ccfdb0c3ba4d +Patch-mainline: v3.8-rc2 + +Commit 07aa2ea13814ea60d12f7330b6d5ccfdb0c3ba4d upstream. + +There are some places in ext4_fill_super() where we would not return +proper error code if something fails. The confusion is caused probably +due to the fact that we have two "kind-of" return variables 'ret'and +'err'. + +'ret' is used to return error code from ext4_fill_super() where err is +used to store return values from other functions within ext4_fill_super(). +However some places were missing the obligatory 'ret = err'. We could +put the assignment where it is missing, but we can have better "future +proof" solution. Or we could convert the code to use just one, but it +would require more rewrites. + +This commit fixes the problem by returning value from 'err' variable if +it is set and 'ret' otherwise in error handling branch of the +ext4_fill_super(). The reasoning is that 'ret' value is often set to +default "-EINVAL" or explicit value, where 'err' is used to store +return value from other functions and should be otherwise zero. + +https://bugzilla.kernel.org/show_bug.cgi?id=48431 + +Signed-off-by: Lukas Czerner <lczerner(a)redhat.com> +Signed-off-by: "Theodore Ts'o" <tytso(a)mit.edu> +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + fs/ext4/super.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -3266,7 +3266,7 @@ static int ext4_fill_super(struct super_ + unsigned int i; + int needs_recovery, has_huge_files, has_bigalloc; + __u64 blocks_count; +- int err; ++ int err = 0; + unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO; + ext4_group_t first_not_zeroed; + +@@ -3295,6 +3295,7 @@ static int ext4_fill_super(struct super_ + for (cp = sb->s_id; (cp = strchr(cp, '/'));) + *cp = '!'; + ++ /* -EINVAL is default */ + ret = -EINVAL; + blocksize = sb_min_blocksize(sb, EXT4_MIN_BLOCK_SIZE); + if (!blocksize) { +@@ -3664,7 +3665,6 @@ static int ext4_fill_super(struct super_ + " too large to mount safely on this system"); + if (sizeof(sector_t) < 8) + ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled"); +- ret = err; + goto failed_mount; + } + +@@ -3772,7 +3772,6 @@ static int ext4_fill_super(struct super_ + } + if (err) { + ext4_msg(sb, KERN_ERR, "insufficient memory"); +- ret = err; + goto failed_mount3; + } + +@@ -3899,8 +3898,8 @@ no_journal: + if (es->s_overhead_clusters) + sbi->s_overhead = le32_to_cpu(es->s_overhead_clusters); + else { +- ret = ext4_calculate_overhead(sb); +- if (ret) ++ err = ext4_calculate_overhead(sb); ++ if (err) + goto failed_mount_wq; + } + +@@ -3912,6 +3911,7 @@ no_journal: + alloc_workqueue("ext4-dio-unwritten", WQ_MEM_RECLAIM | WQ_UNBOUND, 1); + if (!EXT4_SB(sb)->dio_unwritten_wq) { + printk(KERN_ERR "EXT4-fs: failed to create DIO workqueue\n"); ++ ret = -ENOMEM; + goto failed_mount_wq; + } + +@@ -4014,8 +4014,8 @@ no_journal: + /* Enable quota usage during mount. */ + if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) && + !(sb->s_flags & MS_RDONLY)) { +- ret = ext4_enable_quotas(sb); +- if (ret) ++ err = ext4_enable_quotas(sb); ++ if (err) + goto failed_mount7; + } + #endif /* CONFIG_QUOTA */ +@@ -4086,7 +4086,7 @@ out_fail: + kfree(sbi); + out_free_orig: + kfree(orig_data); +- return ret; ++ return err ? err : ret; + } + + /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/ext4-release-sysfs-kobject-when-failing-to-enable-quotas-on-mount new/patches.fixes/ext4-release-sysfs-kobject-when-failing-to-enable-quotas-on-mount --- old/patches.fixes/ext4-release-sysfs-kobject-when-failing-to-enable-quotas-on-mount 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/ext4-release-sysfs-kobject-when-failing-to-enable-quotas-on-mount 2013-02-26 04:27:14.000000000 +0100 @@ -0,0 +1,58 @@ +From: Theodore Ts'o <tytso(a)mit.edu> +Date: Fri, 25 Jan 2013 04:24:54 +0000 (-0500) +Subject: ext4: release sysfs kobject when failing to enable quotas on mount +Git-commit: 72ba74508b2857e71d65fc93f0d6b684492fc740 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git +Patch-mainline: Queued in subsystem maintainer repo + +ext4: release sysfs kobject when failing to enable quotas on mount + +In addition, print the error returned from ext4_enable_quotas() + +Signed-off-by: "Theodore Ts'o" <tytso(a)mit.edu> +Reviewed-by: Carlos Maiolino <cmaiolino(a)redhat.com> +Cc: stable(a)vger.kernel.org +Acked-by: Jeff Mahoney <jeffm(a)suse.com> +--- + + fs/ext4/super.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index c014edd..3ac3060 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -4009,7 +4009,7 @@ no_journal: + !(sb->s_flags & MS_RDONLY)) { + err = ext4_enable_quotas(sb); + if (err) +- goto failed_mount7; ++ goto failed_mount8; + } + #endif /* CONFIG_QUOTA */ + +@@ -4036,6 +4036,10 @@ cantfind_ext4: + ext4_msg(sb, KERN_ERR, "VFS: Can't find ext4 filesystem"); + goto failed_mount; + ++#ifdef CONFIG_QUOTA ++failed_mount8: ++ kobject_del(&sbi->s_kobj); ++#endif + failed_mount7: + ext4_unregister_li_request(sb); + failed_mount6: +@@ -5006,9 +5010,9 @@ static int ext4_enable_quotas(struct super_block *sb) + DQUOT_USAGE_ENABLED); + if (err) { + ext4_warning(sb, +- "Failed to enable quota (type=%d) " +- "tracking. Please run e2fsck to fix.", +- type); ++ "Failed to enable quota tracking " ++ "(type=%d, err=%d). Please run " ++ "e2fsck to fix.", type, err); + return err; + } + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/kvm-ioapic.patch new/patches.fixes/kvm-ioapic.patch --- old/patches.fixes/kvm-ioapic.patch 2013-02-19 09:08:52.000000000 +0100 +++ new/patches.fixes/kvm-ioapic.patch 2013-02-26 04:27:14.000000000 +0100 @@ -10,8 +10,8 @@ --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -205,7 +205,8 @@ int kvm_ioapic_set_irq(struct kvm_ioapic - irq_level = __kvm_irq_line_state(&ioapic->irq_states[irq], - irq_source_id, level); + irq_level = __kvm_irq_line_state(&ioapic->irq_states[irq], + irq_source_id, level); entry = ioapic->redirtbl[irq]; - irq_level ^= entry.fields.polarity; +// polarity is always active high in qemu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/kvm-macos.patch new/patches.fixes/kvm-macos.patch --- old/patches.fixes/kvm-macos.patch 2013-02-19 09:08:52.000000000 +0100 +++ new/patches.fixes/kvm-macos.patch 2013-02-26 04:27:14.000000000 +0100 @@ -61,7 +61,7 @@ + case MSR_NHM_SNB_PKG_CST_CFG_CTL: /* 0xe2 */ data = 0; break; - case MSR_P6_PERFCTR0: + case MSR_P6_PERFCTR0: --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -1985,7 +1987,7 @@ static void do_cpuid_ent(struct kvm_cpui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/nfs-connect-timeout new/patches.fixes/nfs-connect-timeout --- old/patches.fixes/nfs-connect-timeout 2013-02-19 09:08:52.000000000 +0100 +++ new/patches.fixes/nfs-connect-timeout 2013-02-26 04:27:14.000000000 +0100 @@ -38,8 +38,8 @@ --- a/include/linux/sunrpc/sched.h +++ b/include/linux/sunrpc/sched.h @@ -236,6 +236,7 @@ void rpc_wake_up_queued_task(struct rpc_wait_queue *, - bool (*)(struct rpc_task *, void *), - void *); + bool (*)(struct rpc_task *, void *), + void *); void rpc_wake_up_status(struct rpc_wait_queue *, int); +void rpc_wake_up_softconn_status(struct rpc_wait_queue *, int); int rpc_queue_empty(struct rpc_wait_queue *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/remount-no-shrink-dcache new/patches.fixes/remount-no-shrink-dcache --- old/patches.fixes/remount-no-shrink-dcache 2013-02-19 09:08:52.000000000 +0100 +++ new/patches.fixes/remount-no-shrink-dcache 2013-02-26 04:27:14.000000000 +0100 @@ -53,7 +53,7 @@ if (remount_ro) { - if (force) { + if (rflags & REMOUNT_FORCE) { - mark_files_ro(sb); + mark_files_ro(sb); } else { retval = sb_prepare_remount_readonly(sb); @@ -728,7 +723,7 @@ int do_remount_sb(struct super_block *sb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-dh-queuedata-accessors new/patches.fixes/scsi-dh-queuedata-accessors --- old/patches.fixes/scsi-dh-queuedata-accessors 2013-02-19 09:08:52.000000000 +0100 +++ new/patches.fixes/scsi-dh-queuedata-accessors 2013-02-26 04:27:14.000000000 +0100 @@ -28,8 +28,8 @@ - sdev = q->queuedata; + sdev = scsi_device_from_queue(q); if (!sdev) { - spin_unlock_irqrestore(q->queue_lock, flags); - err = SCSI_DH_NOSYS; + spin_unlock_irqrestore(q->queue_lock, flags); + err = SCSI_DH_NOSYS; @@ -484,7 +484,7 @@ int scsi_dh_attach(struct request_queue return -EINVAL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/sock_diag-simplify-sock_diag_handlers-handling-in-_sock_diag_rcv_msg new/patches.fixes/sock_diag-simplify-sock_diag_handlers-handling-in-_sock_diag_rcv_msg --- old/patches.fixes/sock_diag-simplify-sock_diag_handlers-handling-in-_sock_diag_rcv_msg 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sock_diag-simplify-sock_diag_handlers-handling-in-_sock_diag_rcv_msg 2013-02-26 04:27:14.000000000 +0100 @@ -0,0 +1,67 @@ +From 8e904550d0fffcda2b18d7ab12750b0c75757e89 Mon Sep 17 00:00:00 2001 +From: Mathias Krause <minipli(a)googlemail.com> +Date: Sat, 23 Feb 2013 01:13:48 +0000 +Subject: sock_diag: Simplify sock_diag_handlers[] handling in __sock_diag_rcv_msg +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git +Git-commit: 8e904550d0fffcda2b18d7ab12750b0c75757e89 +Patch-mainline: Queued in subsystem maintainer repo +References: bnc#805633 CVE-2013-1763 + +The sock_diag_lock_handler() and sock_diag_unlock_handler() actually +make the code less readable. Get rid of them and make the lock usage +and access to sock_diag_handlers[] clear on the first sight. + +Signed-off-by: Mathias Krause <minipli(a)googlemail.com> +Signed-off-by: David S. Miller <davem(a)davemloft.net> +Acked-by: Jeff Mahoney <jeffm(a)suse.com> +--- + net/core/sock_diag.c | 24 +++++++----------------- + 1 files changed, 7 insertions(+), 17 deletions(-) + +diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c +index 750f44f..a29e90c 100644 +--- a/net/core/sock_diag.c ++++ b/net/core/sock_diag.c +@@ -97,21 +97,6 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld) + } + EXPORT_SYMBOL_GPL(sock_diag_unregister); + +-static const inline struct sock_diag_handler *sock_diag_lock_handler(int family) +-{ +- if (sock_diag_handlers[family] == NULL) +- request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK, +- NETLINK_SOCK_DIAG, family); +- +- mutex_lock(&sock_diag_table_mutex); +- return sock_diag_handlers[family]; +-} +- +-static inline void sock_diag_unlock_handler(const struct sock_diag_handler *h) +-{ +- mutex_unlock(&sock_diag_table_mutex); +-} +- + static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) + { + int err; +@@ -124,12 +109,17 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) + if (req->sdiag_family >= AF_MAX) + return -EINVAL; + +- hndl = sock_diag_lock_handler(req->sdiag_family); ++ if (sock_diag_handlers[req->sdiag_family] == NULL) ++ request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK, ++ NETLINK_SOCK_DIAG, req->sdiag_family); ++ ++ mutex_lock(&sock_diag_table_mutex); ++ hndl = sock_diag_handlers[req->sdiag_family]; + if (hndl == NULL) + err = -ENOENT; + else + err = hndl->dump(skb, nlh); +- sock_diag_unlock_handler(hndl); ++ mutex_unlock(&sock_diag_table_mutex); + + return err; + } + ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 2478 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch new/patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch --- old/patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch 2013-02-11 15:18:11.000000000 +0100 +++ new/patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch 2013-02-25 20:57:27.000000000 +0100 @@ -27,7 +27,7 @@ --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig -@@ -83,3 +83,13 @@ config EXT4_DEBUG +@@ -85,3 +85,13 @@ config EXT4_DEBUG If you select Y here, then you will be able to turn on debugging with a command such as "echo 1 > /sys/kernel/debug/ext4/mballoc-debug" @@ -50,7 +50,7 @@ +ext4-$(CONFIG_EXT4_FS_RICHACL) += richacl.o --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h -@@ -908,6 +908,10 @@ struct ext4_inode_info { +@@ -924,6 +924,10 @@ struct ext4_inode_info { /* Precomputed uuid+inum+igen checksum for seeding inode checksums */ __u32 i_csum_seed; @@ -71,7 +71,7 @@ /* * Called when an inode is released. Note that this is different -@@ -258,5 +259,8 @@ const struct inode_operations ext4_file_ +@@ -334,5 +335,8 @@ const struct inode_operations ext4_file_ #endif .get_acl = ext4_get_acl, .fiemap = ext4_fiemap, @@ -90,7 +90,7 @@ #include <trace/events/ext4.h> -@@ -861,7 +862,11 @@ got: +@@ -908,7 +909,11 @@ got: if (err) goto fail_drop; @@ -113,7 +113,7 @@ #include <trace/events/ext4.h> -@@ -3654,6 +3655,9 @@ struct inode *ext4_iget(struct super_blo +@@ -3828,6 +3829,9 @@ struct inode *ext4_iget(struct super_blo set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ @@ -123,7 +123,7 @@ ei->i_dir_start_lookup = 0; ei->i_dtime = le32_to_cpu(raw_inode->i_dtime); /* We now have enough fields to check if the inode was active or not. -@@ -4078,7 +4082,11 @@ int ext4_setattr(struct dentry *dentry, +@@ -4253,7 +4257,11 @@ int ext4_setattr(struct dentry *dentry, int orphan = 0; const unsigned int ia_valid = attr->ia_valid; @@ -136,7 +136,7 @@ if (error) return error; -@@ -4178,9 +4186,12 @@ int ext4_setattr(struct dentry *dentry, +@@ -4361,9 +4369,12 @@ int ext4_setattr(struct dentry *dentry, if (orphan && inode->i_nlink) ext4_orphan_del(NULL, inode); @@ -162,7 +162,7 @@ #include <trace/events/ext4.h> /* -@@ -2587,6 +2588,9 @@ const struct inode_operations ext4_dir_i +@@ -3052,6 +3053,9 @@ const struct inode_operations ext4_dir_i #endif .get_acl = ext4_get_acl, .fiemap = ext4_fiemap, @@ -172,7 +172,7 @@ }; const struct inode_operations ext4_special_inode_operations = { -@@ -2598,4 +2602,7 @@ const struct inode_operations ext4_speci +@@ -3063,4 +3067,7 @@ const struct inode_operations ext4_speci .removexattr = generic_removexattr, #endif .get_acl = ext4_get_acl, @@ -545,7 +545,7 @@ #define CREATE_TRACE_POINTS #include <trace/events/ext4.h> -@@ -921,7 +922,9 @@ static struct inode *ext4_alloc_inode(st +@@ -937,7 +938,9 @@ static struct inode *ext4_alloc_inode(st ei = kmem_cache_alloc(ext4_inode_cachep, GFP_NOFS); if (!ei) return NULL; @@ -556,7 +556,7 @@ ei->vfs_inode.i_version = 1; ei->vfs_inode.i_data.writeback_index = 0; memset(&ei->i_cached_extent, 0, sizeof(struct ext4_ext_cache)); -@@ -1009,6 +1012,13 @@ void ext4_clear_inode(struct inode *inod +@@ -1030,6 +1033,13 @@ void ext4_clear_inode(struct inode *inod invalidate_inode_buffers(inode); clear_inode(inode); dquot_drop(inode); @@ -570,7 +570,7 @@ ext4_discard_preallocations(inode); if (EXT4_I(inode)->jinode) { jbd2_journal_release_jbd_inode(EXT4_JOURNAL(inode), -@@ -1171,7 +1181,7 @@ enum { +@@ -1207,7 +1217,7 @@ enum { Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid, Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro, Opt_nouid32, Opt_debug, Opt_removed, @@ -579,7 +579,7 @@ Opt_auto_da_alloc, Opt_noauto_da_alloc, Opt_noload, Opt_commit, Opt_min_batch_time, Opt_max_batch_time, Opt_journal_dev, Opt_journal_checksum, Opt_journal_async_commit, -@@ -1208,6 +1218,7 @@ static const match_table_t tokens = { +@@ -1245,6 +1255,7 @@ static const match_table_t tokens = { {Opt_user_xattr, "user_xattr"}, {Opt_nouser_xattr, "nouser_xattr"}, {Opt_acl, "acl"}, @@ -587,7 +587,7 @@ {Opt_noacl, "noacl"}, {Opt_noload, "norecovery"}, {Opt_noload, "noload"}, -@@ -1457,6 +1468,9 @@ static int handle_mount_opt(struct super +@@ -1508,6 +1519,9 @@ static int handle_mount_opt(struct super case Opt_nouser_xattr: ext4_msg(sb, KERN_WARNING, deprecated_msg, opt, "3.5"); break; @@ -597,7 +597,7 @@ case Opt_sb: return 1; /* handled by get_sb_block() */ case Opt_removed: -@@ -1648,6 +1662,10 @@ static int parse_options(char *options, +@@ -1709,6 +1723,10 @@ static int parse_options(char *options, return 0; } } @@ -608,9 +608,9 @@ return 1; } -@@ -1772,6 +1790,9 @@ static int _ext4_show_options(struct seq - if (nodefs || sbi->s_max_dir_size_kb) - SEQ_OPTS_PRINT("max_dir_size_kb=%u", sbi->s_max_dir_size_kb); +@@ -1837,6 +1855,9 @@ static int _ext4_show_options(struct seq + if (nodefs || sbi->s_max_dir_size_kb) + SEQ_OPTS_PRINT("max_dir_size_kb=%u", sbi->s_max_dir_size_kb); + if (sb->s_flags & MS_RICHACL) + SEQ_OPTS_PUTS("richacl"); @@ -618,15 +618,15 @@ ext4_show_quota_options(seq, sb); return 0; } -@@ -2983,6 +3004,7 @@ static int ext4_fill_super(struct super_ - int err; +@@ -3269,6 +3290,7 @@ static int ext4_fill_super(struct super_ + int err = 0; unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO; ext4_group_t first_not_zeroed; + unsigned long acl_flags = 0; sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) -@@ -3054,7 +3076,7 @@ static int ext4_fill_super(struct super_ +@@ -3383,7 +3405,7 @@ static int ext4_fill_super(struct super_ #ifdef CONFIG_EXT4_FS_XATTR set_opt(sb, XATTR_USER); #endif @@ -635,7 +635,7 @@ set_opt(sb, POSIX_ACL); #endif set_opt(sb, MBLK_IO_SUBMIT); -@@ -3137,8 +3159,12 @@ static int ext4_fill_super(struct super_ +@@ -3457,8 +3479,12 @@ static int ext4_fill_super(struct super_ clear_opt(sb, DELALLOC); } @@ -650,7 +650,7 @@ if (le32_to_cpu(es->s_rev_level) == EXT4_GOOD_OLD_REV && (EXT4_HAS_COMPAT_FEATURE(sb, ~0U) || -@@ -4249,6 +4275,7 @@ static int ext4_remount(struct super_blo +@@ -4587,6 +4613,7 @@ static int ext4_remount(struct super_blo ext4_group_t g; unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO; int err = 0; @@ -658,7 +658,7 @@ #ifdef CONFIG_QUOTA int i; #endif -@@ -4283,8 +4310,12 @@ static int ext4_remount(struct super_blo +@@ -4620,8 +4647,12 @@ static int ext4_remount(struct super_blo if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) ext4_abort(sb, "Abort forced by user"); @@ -705,7 +705,7 @@ struct ext4_xattr_header { __le32 h_magic; /* magic number for identification */ -@@ -70,6 +71,10 @@ extern const struct xattr_handler ext4_x +@@ -72,6 +73,10 @@ extern const struct xattr_handler ext4_x extern const struct xattr_handler ext4_xattr_acl_access_handler; extern const struct xattr_handler ext4_xattr_acl_default_handler; extern const struct xattr_handler ext4_xattr_security_handler; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-0955-fix-hash-overflow-handling.patch new/patches.suse/btrfs-0955-fix-hash-overflow-handling.patch --- old/patches.suse/btrfs-0955-fix-hash-overflow-handling.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/btrfs-0955-fix-hash-overflow-handling.patch 2013-02-25 20:57:27.000000000 +0100 @@ -0,0 +1,192 @@ +From: Chris Mason <chris.mason(a)fusionio.com> +Date: Mon, 17 Dec 2012 14:26:57 -0500 +Patch-mainline: 3.8 +Git-commit: 9c52057c698fb96f8f07e7a4bcf4801a092bda89 +References: bnc#804738 +Subject: [PATCH] Btrfs: fix hash overflow handling + +The handling for directory crc hash overflows was fairly obscure, +split_leaf returns EOVERFLOW when we try to extend the item and that is +supposed to bubble up to userland. For a while it did so, but along the +way we added better handling of errors and forced the FS readonly if we +hit IO errors during the directory insertion. + +Along the way, we started testing only for EEXIST and the EOVERFLOW case +was dropped. The end result is that we may force the FS readonly if we +catch a directory hash bucket overflow. + +This fixes a few problem spots. First I add tests for EOVERFLOW in the +places where we can safely just return the error up the chain. + +btrfs_rename is harder though, because it tries to insert the new +directory item only after it has already unlinked anything the rename +was going to overwrite. Rather than adding very complex logic, I added +a helper to test for the hash overflow case early while it is still safe +to bail out. + +Snapshot and subvolume creation had a similar problem, so they are using +the new helper now too. + +Signed-off-by: Chris Mason <chris.mason(a)fusionio.com> +Reported-by: Pascal Junod <pascal(a)junod.info> +Signed-off-by: David Sterba <dsterba(a)suse.cz> +--- + fs/btrfs/ctree.h | 2 + + fs/btrfs/dir-item.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ + fs/btrfs/inode.c | 26 +++++++++++++++++++-- + fs/btrfs/ioctl.c | 10 ++++++++ + fs/btrfs/transaction.c | 2 - + 5 files changed, 96 insertions(+), 3 deletions(-) + +--- a/fs/btrfs/ctree.h ++++ b/fs/btrfs/ctree.h +@@ -3157,6 +3157,8 @@ void btrfs_update_root_times(struct btrf + struct btrfs_root *root); + + /* dir-item.c */ ++int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, ++ const char *name, int name_len); + int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, + struct btrfs_root *root, const char *name, + int name_len, struct inode *dir, +--- a/fs/btrfs/dir-item.c ++++ b/fs/btrfs/dir-item.c +@@ -213,6 +213,65 @@ struct btrfs_dir_item *btrfs_lookup_dir_ + return btrfs_match_dir_item_name(root, path, name, name_len); + } + ++int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, ++ const char *name, int name_len) ++{ ++ int ret; ++ struct btrfs_key key; ++ struct btrfs_dir_item *di; ++ int data_size; ++ struct extent_buffer *leaf; ++ int slot; ++ struct btrfs_path *path; ++ ++ ++ path = btrfs_alloc_path(); ++ if (!path) ++ return -ENOMEM; ++ ++ key.objectid = dir; ++ btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); ++ key.offset = btrfs_name_hash(name, name_len); ++ ++ ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); ++ ++ /* return back any errors */ ++ if (ret < 0) ++ goto out; ++ ++ /* nothing found, we're safe */ ++ if (ret > 0) { ++ ret = 0; ++ goto out; ++ } ++ ++ /* we found an item, look for our name in the item */ ++ di = btrfs_match_dir_item_name(root, path, name, name_len); ++ if (di) { ++ /* our exact name was found */ ++ ret = -EEXIST; ++ goto out; ++ } ++ ++ /* ++ * see if there is room in the item to insert this ++ * name ++ */ ++ data_size = sizeof(*di) + name_len + sizeof(struct btrfs_item); ++ leaf = path->nodes[0]; ++ slot = path->slots[0]; ++ if (data_size + btrfs_item_size_nr(leaf, slot) + ++ sizeof(struct btrfs_item) > BTRFS_LEAF_DATA_SIZE(root)) { ++ ret = -EOVERFLOW; ++ } else { ++ /* plenty of insertion room */ ++ ret = 0; ++ } ++out: ++ btrfs_free_path(path); ++ return ret; ++} ++ + /* + * lookup a directory item based on index. 'dir' is the objectid + * we're searching in, and 'mod' tells us if you plan on deleting the +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -4842,9 +4842,9 @@ int btrfs_add_link(struct btrfs_trans_ha + ret = btrfs_insert_dir_item(trans, root, name, name_len, + parent_inode, &key, + btrfs_inode_type(inode), index); +- if (ret == -EEXIST) ++ if (ret == -EEXIST || ret == -EOVERFLOW) { + goto fail_dir_item; +- else if (ret) { ++ } else if (ret) { + btrfs_abort_transaction(trans, root, ret); + return ret; + } +@@ -7308,6 +7308,28 @@ static int btrfs_rename(struct inode *ol + if (S_ISDIR(old_inode->i_mode) && new_inode && + new_inode->i_size > BTRFS_EMPTY_DIR_SIZE) + return -ENOTEMPTY; ++ ++ ++ /* check for collisions, even if the name isn't there */ ++ ret = btrfs_check_dir_item_collision(root, new_dir->i_ino, ++ new_dentry->d_name.name, ++ new_dentry->d_name.len); ++ ++ if (ret) { ++ if (ret == -EEXIST) { ++ /* we shouldn't get ++ * eexist without a new_inode */ ++ if (!new_inode) { ++ WARN_ON(1); ++ return ret; ++ } ++ } else { ++ /* maybe -EOVERFLOW */ ++ return ret; ++ } ++ } ++ ret = 0; ++ + /* + * we're using rename to replace one file with another. + * and the replacement file is large. Start IO on it now so +--- a/fs/btrfs/ioctl.c ++++ b/fs/btrfs/ioctl.c +@@ -705,6 +705,16 @@ static noinline int btrfs_mksubvol(struc + if (error) + goto out_dput; + ++ /* ++ * even if this name doesn't exist, we may get hash collisions. ++ * check for them now when we can safely fail ++ */ ++ error = btrfs_check_dir_item_collision(BTRFS_I(dir)->root, ++ dir->i_ino, name, ++ namelen); ++ if (error) ++ goto out_dput; ++ + down_read(&BTRFS_I(dir)->root->fs_info->subvol_sem); + + if (btrfs_root_refs(&BTRFS_I(dir)->root->root_item) == 0) +--- a/fs/btrfs/transaction.c ++++ b/fs/btrfs/transaction.c +@@ -1191,7 +1191,7 @@ static noinline int create_pending_snaps + parent_inode, &key, + BTRFS_FT_DIR, index); + /* We have check then name at the beginning, so it is impossible. */ +- BUG_ON(ret == -EEXIST); ++ BUG_ON(ret == -EEXIST || ret == -EOVERFLOW); + if (ret) { + btrfs_abort_transaction(trans, root, ret); + goto fail; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/suse-hv-register-clocksource-only-if-its-adverti.patch new/patches.suse/suse-hv-register-clocksource-only-if-its-adverti.patch --- old/patches.suse/suse-hv-register-clocksource-only-if-its-adverti.patch 2013-02-11 15:18:11.000000000 +0100 +++ new/patches.suse/suse-hv-register-clocksource-only-if-its-adverti.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -From b2cd0a665f7d14d48a64459d22ee8342515fc7cb Mon Sep 17 00:00:00 2001 -From: Olaf Hering <olaf(a)aepfle.de> -Date: Tue, 15 Jan 2013 14:19:55 +0100 -Subject: [PATCH] x86: Hyper-V: register clocksource only if its advertised -References: bnc#792500 -Patch-mainline: submitted - -Enable hyperv_clocksource only if its advertised as a feature. -XenServer 6 returns the signature which is checked in -ms_hyperv_platform(), but it does not offer all features. Currently the -clocksource is enabled unconditionally in ms_hyperv_init_platform(), and -the result is a hanging guest. - -Hyper-V spec Bit 1 indicates the availability of Partition Reference -Counter. Register the clocksource only if this bit is set. - -The guest in question prints this in dmesg: - [ 0.000000] Hypervisor detected: Microsoft HyperV - [ 0.000000] HyperV: features 0x70, hints 0x0 - -Signed-off-by: Olaf Hering <olaf(a)aepfle.de> -Cc: stable(a)kernel.org -Cc: KY Srinivasan <kys(a)microsoft.com> -cc: Greg KH <gregkh(a)linuxfoundation.org> -Acked-by: <ohering(a)suse.de> ---- - arch/x86/kernel/cpu/mshyperv.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c -index 0a630dd..646d192 100644 ---- a/arch/x86/kernel/cpu/mshyperv.c -+++ b/arch/x86/kernel/cpu/mshyperv.c -@@ -68,7 +68,8 @@ static void __init ms_hyperv_init_platform(void) - printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n", - ms_hyperv.features, ms_hyperv.hints); - -- clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100); -+ if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE) -+ clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100); - } - - const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = { --- -1.8.0.1 - ++++++ patches.xen.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen-pciback-ratelimit new/patches.xen/xen-pciback-ratelimit --- old/patches.xen/xen-pciback-ratelimit 2013-02-21 17:15:10.000000000 +0100 +++ new/patches.xen/xen-pciback-ratelimit 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -From: jbeulich(a)suse.com -Subject: xen-pciback: rate limit error messages from xen_pcibk_enable_msi{,x}() -References: CVE-2013-0231 XSA-43 bnc#801178 -Patch-mainline: n/a - -... as being guest triggerable (e.g. by invoking -XEN_PCI_OP_enable_msi{,x} on a device not being MSI/MSI-X capable). - -This is CVE-2013-0231 / XSA-43. - -Also make the two messages uniform in both their wording and severity. - -Signed-off-by: Jan Beulich <jbeulich(a)suse.com> - ---- head.orig/drivers/xen/xen-pciback/pciback_ops.c 2012-04-10 17:21:35.000000000 +0200 -+++ head/drivers/xen/xen-pciback/pciback_ops.c 2013-01-28 16:17:29.000000000 +0100 -@@ -148,7 +148,6 @@ int xen_pcibk_enable_msi(struct xen_pcib - #ifndef CONFIG_XEN - struct xen_pcibk_dev_data *dev_data; - #endif -- int otherend = pdev->xdev->otherend_id; - int status; - - if (unlikely(verbose_request)) -@@ -157,8 +156,9 @@ int xen_pcibk_enable_msi(struct xen_pcib - status = pci_enable_msi(dev); - - if (status) { -- printk(KERN_ERR "error enable msi for guest %x status %x\n", -- otherend, status); -+ pr_warn_ratelimited(DRV_NAME ": %s: error enabling MSI for guest %u: err %d\n", -+ pci_name(dev), pdev->xdev->otherend_id, -+ status); - op->value = 0; - return XEN_PCI_ERR_op_failed; - } -@@ -256,10 +256,10 @@ int xen_pcibk_enable_msix(struct xen_pci - pci_name(dev), i, - op->msix_entries[i].vector); - } -- } else { -- printk(KERN_WARNING DRV_NAME ": %s: failed to enable MSI-X: err %d!\n", -- pci_name(dev), result); -- } -+ } else -+ pr_warn_ratelimited(DRV_NAME ": %s: error enabling MSI-X for guest %u: err %d!\n", -+ pci_name(dev), pdev->xdev->otherend_id, -+ result); - kfree(entries); - - op->value = result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-patch-2.6.31 new/patches.xen/xen3-patch-2.6.31 --- old/patches.xen/xen3-patch-2.6.31 2013-02-21 17:15:10.000000000 +0100 +++ new/patches.xen/xen3-patch-2.6.31 2013-02-27 20:44:57.000000000 +0100 @@ -6184,7 +6184,7 @@ struct per_user_data { struct mutex bind_mutex; /* serialize bind/unbind operations */ @@ -278,6 +285,9 @@ static void evtchn_unbind_from_user(stru - int irq = irq_from_evtchn(port); + BUG_ON(irq < 0); unbind_from_irqhandler(irq, (void *)(unsigned long)port); +#ifdef CONFIG_XEN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-patch-3.1 new/patches.xen/xen3-patch-3.1 --- old/patches.xen/xen3-patch-3.1 2013-02-21 17:15:10.000000000 +0100 +++ new/patches.xen/xen3-patch-3.1 2013-02-27 20:44:57.000000000 +0100 @@ -2813,9 +2813,9 @@ +#ifndef CONFIG_XEN struct xen_pcibk_dev_data *dev_data; +#endif - int otherend = pdev->xdev->otherend_id; int status; + if (unlikely(verbose_request)) @@ -153,14 +166,20 @@ int xen_pcibk_enable_msi(struct xen_pcib /* The value the guest needs is actually the IDT vector, not the * the local domain's IRQ number. */ ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:58.000000000 +0100 @@ -36,6 +36,7 @@ patches.kernel.org/patch-3.7.6-7 patches.kernel.org/patch-3.7.7-8 patches.kernel.org/patch-3.7.8-9 + patches.kernel.org/patch-3.7.9-10 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -232,12 +233,10 @@ ######################################################## # AGP, graphics related stuff ######################################################## - patches.fixes/drm-nouveau-vm-fix-memory-corruption-when-pgt-alloca.patch ######################################################## # Suse specific stuff ######################################################## - patches.suse/suse-hv-register-clocksource-only-if-its-adverti.patch patches.suse/suse-hv-fate314663-0001-mm-Export-a-function-to-get-vm-committed-memory.patch patches.suse/suse-hv-fate314663-0002-Drivers-hv-Add-Hyper-V-balloon-driver.patch patches.suse/suse-hv-fate314663-0003-Drivers-hv-balloon-Fix-a-bug-in-the-definition-of-st.patch @@ -308,11 +307,14 @@ ######################################################## # ext4 ######################################################## + patches.fixes/ext4-fix-error-handling-in-ext4_fill_super + patches.fixes/ext4-release-sysfs-kobject-when-failing-to-enable-quotas-on-mount ######################################################## # btrfs ######################################################## patches.suse/btrfs-use-correct-device-for-maps.patch + patches.suse/btrfs-0955-fix-hash-overflow-handling.patch ######################################################## # Reiserfs Patches @@ -437,6 +439,7 @@ ######################################################## patches.fixes/tulip-quad-NIC-ifdown patches.drivers/ehea-modinfo.patch + patches.fixes/sock_diag-simplify-sock_diag_handlers-handling-in-_sock_diag_rcv_msg ######################################################## # Wireless Networking @@ -483,6 +486,7 @@ ######################################################## # Char / serial ######################################################## + patches.fixes/TTY-do-not-update-atime-mtime-on-read-write.patch ######################################################## # Other driver fixes @@ -713,7 +717,6 @@ patches.xen/xen-netback-generalize patches.xen/xen-netback-multiple-tasklets patches.xen/xen-netback-kernel-threads - patches.xen/xen-pciback-ratelimit patches.xen/xen-cxgb3 patches.xen/xen-dcdbas patches.xen/xen-x86-panic-no-reboot ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.tWPnny/_old 2013-03-01 11:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.tWPnny/_new 2013-03-01 11:24:58.000000000 +0100 @@ -1,3 +1,3 @@ -2013-02-21 17:15:10 +0100 -GIT Revision: 8dec9689de608ccde8b8c596455fc596be0bff90 +2013-02-28 16:06:29 +0100 +GIT Revision: 82d3f2183acfef1671c853eff4ba201fe0702e18 GIT Branch: openSUSE-12.3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit polkit-kde-kcmmodules-1 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package polkit-kde-kcmmodules-1 for openSUSE:Factory checked in at 2013-03-01 11:20:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polkit-kde-kcmmodules-1 (Old) and /work/SRC/openSUSE:Factory/.polkit-kde-kcmmodules-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "polkit-kde-kcmmodules-1", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/polkit-kde-kcmmodules-1/polkit-kde-kcmmodules-1.changes 2011-10-21 16:34:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.polkit-kde-kcmmodules-1.new/polkit-kde-kcmmodules-1.changes 2013-03-01 11:20:03.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 1 06:20:14 UTC 2013 - coolo(a)suse.com + +- update license to new format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit-kde-kcmmodules-1.spec ++++++ --- /var/tmp/diff_new_pack.tGcqtT/_old 2013-03-01 11:20:11.000000000 +0100 +++ /var/tmp/diff_new_pack.tGcqtT/_new 2013-03-01 11:20:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package polkit-kde-kcmmodules-1 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -20,11 +20,11 @@ Name: polkit-kde-kcmmodules-1 Version: 0.98.1+git20110929 -Release: 1 -License: GPL-2.0 ; LGPL-2.1+ +Release: 0 Summary: PolicyKit authentication systemsettings modules for KDE -Url: https://projects.kde.org/projects/extragear/base/polkit-kde-kcmodules-1 +License: GPL-2.0 and LGPL-2.1+ Group: Development/Libraries/KDE +Url: https://projects.kde.org/projects/extragear/base/polkit-kde-kcmodules-1 # ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/ Source0: %{name}-%{version}.tar.bz2 Source1: rpmlintrc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit polkit-kde-agent-1 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package polkit-kde-agent-1 for openSUSE:Factory checked in at 2013-03-01 11:19:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polkit-kde-agent-1 (Old) and /work/SRC/openSUSE:Factory/.polkit-kde-agent-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "polkit-kde-agent-1", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/polkit-kde-agent-1/polkit-kde-agent-1.changes 2011-09-23 12:41:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.polkit-kde-agent-1.new/polkit-kde-agent-1.changes 2013-03-01 11:19:56.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 1 06:19:20 UTC 2013 - coolo(a)suse.com + +- update license to new format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit-kde-agent-1.spec ++++++ --- /var/tmp/diff_new_pack.wbEBre/_old 2013-03-01 11:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.wbEBre/_new 2013-03-01 11:20:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package polkit-kde-agent-1 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: polkit-kde-agent-1 Version: 0.99.0 -Release: 8 -License: GPL-2.0 ; LGPL-2.1+ +Release: 0 Summary: PolicyKit authentication agent for KDE -Url: https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1 +License: GPL-2.0 and LGPL-2.1+ Group: Development/Libraries/KDE +Url: https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1 # ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/ Source0: %{name}-%{version}.tar.bz2 BuildRequires: libkde4-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 opensuse-manuals_en for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package opensuse-manuals_en for openSUSE:12.3 checked in at 2013-03-01 11:18:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/opensuse-manuals_en (Old) and /work/SRC/openSUSE:12.3/.opensuse-manuals_en.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opensuse-manuals_en", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/opensuse-manuals_en/opensuse-manuals_en.changes 2013-02-14 21:12:17.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.opensuse-manuals_en.new/opensuse-manuals_en.changes 2013-03-01 11:18:13.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Feb 28 15:00:33 UTC 2013 - kpetsch(a)suse.com + +- Update text and image files (Last Changed Rev.: 1579:10458). + +------------------------------------------------------------------- +Thu Feb 28 14:59:20 UTC 2013 - kpetsch(a)suse.com + +- Update text and image files (Last Changed Rev.: 1579:10458). + +------------------------------------------------------------------- +Thu Feb 28 14:54:57 UTC 2013 - kpetsch(a)suse.com + +- Update text and image files (Last Changed Rev.: 1579:10458). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_en.spec ++++++ --- /var/tmp/diff_new_pack.nv9dhj/_old 2013-03-01 11:18:14.000000000 +0100 +++ /var/tmp/diff_new_pack.nv9dhj/_new 2013-03-01 11:18:14.000000000 +0100 @@ -32,7 +32,7 @@ Source903: attributes BuildRequires: daps BuildRequires: fdupes -BuildRequires: suse-xsl-stylesheets +BuildRequires: suse-xsl-stylesheets >= 1.9.18 # Also buildrequire tools that susedoc does not pull in automatically ATM # BuildRequires: python-xml # BuildRequires: python-lxml ++++++ opensuse-html_en_src_set.tar.bz2 ++++++ /work/SRC/openSUSE:12.3/opensuse-manuals_en/opensuse-html_en_src_set.tar.bz2 /work/SRC/openSUSE:12.3/.opensuse-manuals_en.new/opensuse-html_en_src_set.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 opensuse-manuals_en for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package opensuse-manuals_en for openSUSE:Factory checked in at 2013-03-01 11:18:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opensuse-manuals_en (Old) and /work/SRC/openSUSE:Factory/.opensuse-manuals_en.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opensuse-manuals_en", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/opensuse-manuals_en/opensuse-manuals_en.changes 2013-02-14 21:12:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opensuse-manuals_en.new/opensuse-manuals_en.changes 2013-03-01 11:18:09.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Feb 28 15:00:33 UTC 2013 - kpetsch(a)suse.com + +- Update text and image files (Last Changed Rev.: 1579:10458). + +------------------------------------------------------------------- +Thu Feb 28 14:59:20 UTC 2013 - kpetsch(a)suse.com + +- Update text and image files (Last Changed Rev.: 1579:10458). + +------------------------------------------------------------------- +Thu Feb 28 14:54:57 UTC 2013 - kpetsch(a)suse.com + +- Update text and image files (Last Changed Rev.: 1579:10458). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_en.spec ++++++ --- /var/tmp/diff_new_pack.767UKJ/_old 2013-03-01 11:18:11.000000000 +0100 +++ /var/tmp/diff_new_pack.767UKJ/_new 2013-03-01 11:18:11.000000000 +0100 @@ -32,7 +32,7 @@ Source903: attributes BuildRequires: daps BuildRequires: fdupes -BuildRequires: suse-xsl-stylesheets +BuildRequires: suse-xsl-stylesheets >= 1.9.18 # Also buildrequire tools that susedoc does not pull in automatically ATM # BuildRequires: python-xml # BuildRequires: python-lxml ++++++ opensuse-html_en_src_set.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/opensuse-manuals_en/opensuse-html_en_src_set.tar.bz2 /work/SRC/openSUSE:Factory/.opensuse-manuals_en.new/opensuse-html_en_src_set.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 mozilla-nspr for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:12.3 checked in at 2013-03-01 11:16:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/mozilla-nspr (Old) and /work/SRC/openSUSE:12.3/.mozilla-nspr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nspr", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/mozilla-nspr/mozilla-nspr.changes 2013-01-31 01:27:30.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.mozilla-nspr.new/mozilla-nspr.changes 2013-03-01 11:16:42.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Feb 28 22:56:59 UTC 2013 - wr(a)rosenauer.org + +- update to version 4.9.5 + * bmo#634793: define NSPR's exact-width integer types PRInt{N} and + PRUint{N} types to match the <stdint.h> exact-width integer types + int{N}_t and uint{N}_t. + * bmo#782815: passing 'int *' to parameter of type 'unsigned int *' + in setsockopt(). + * bmo#822932: Port bmo#802527 (NDK r8b support for x86) to NSPR. + * bmo#824742: NSPR shouldn't require librt on Android. + * bmo#831793: data race on lib->refCount in PR_UnloadLibrary. + +------------------------------------------------------------------- +Thu Feb 28 21:26:07 UTC 2013 - dmueller(a)suse.com + +- Add config-guess-sub-update.diff: + * update config.guess/sub for aarch64 support +- Add aarch64-support.patch: + * add support for aarch64 + +------------------------------------------------------------------- Old: ---- nspr-4.9.4.tar.bz2 New: ---- aarch64-support.patch config-guess-sub-update.diff nspr-4.9.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.GUM3Zf/_old 2013-03-01 11:16:42.000000000 +0100 +++ /var/tmp/diff_new_pack.GUM3Zf/_new 2013-03-01 11:16:42.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package mozilla-nspr # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2012 Wolfgang Rosenauer +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2013 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: mozilla-nspr -Version: 4.9.4 +Version: 4.9.5 Release: 0 Summary: Netscape Portable Runtime License: MPL-2.0 @@ -33,6 +33,8 @@ # Source: ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar… Source1: baselibs.conf +Patch0: config-guess-sub-update.diff +Patch1: aarch64-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +63,10 @@ %prep %setup -n nspr-%{version} -q +%patch0 +cd mozilla/nsprpub +%patch1 -p1 +cd - cd mozilla %build ++++++ aarch64-support.patch ++++++ --- a/pr/include/md/_linux.cfg +++ b/pr/include/md/_linux.cfg @@ -861,6 +861,59 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 +#elif defined(__aarch64__) + +#ifdef __AARCH64EB__ +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 +#elif defined(__AARCH64EL__) +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#else +#error "Unknown Aarch64 endianness." +#endif +#define IS_64 + +#define PR_BYTES_PER_BYTE 1 +#define PR_BYTES_PER_SHORT 2 +#define PR_BYTES_PER_INT 4 +#define PR_BYTES_PER_INT64 8 +#define PR_BYTES_PER_LONG 8 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 8 +#define PR_BYTES_PER_DWORD 8 + +#define PR_BITS_PER_BYTE 8 +#define PR_BITS_PER_SHORT 16 +#define PR_BITS_PER_INT 32 +#define PR_BITS_PER_INT64 64 +#define PR_BITS_PER_LONG 64 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 64 + +#define PR_BITS_PER_BYTE_LOG2 3 +#define PR_BITS_PER_SHORT_LOG2 4 +#define PR_BITS_PER_INT_LOG2 5 +#define PR_BITS_PER_INT64_LOG2 6 +#define PR_BITS_PER_LONG_LOG2 6 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 6 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 8 +#define PR_ALIGN_OF_INT64 8 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 8 +#define PR_ALIGN_OF_POINTER 8 +#define PR_ALIGN_OF_WORD 8 + +#define PR_BYTES_PER_WORD_LOG2 3 +#define PR_BYTES_PER_DWORD_LOG2 3 + #else #error "Unknown CPU architecture" --- a/pr/include/md/_linux.h +++ b/pr/include/md/_linux.h @@ -53,6 +53,8 @@ #define _PR_SI_ARCHITECTURE "avr32" #elif defined(__m32r__) #define _PR_SI_ARCHITECTURE "m32r" +#elif defined(__aarch64__) +#define _PR_SI_ARCHITECTURE "aarch64" #else #error "Unknown CPU architecture" #endif @@ -186,7 +188,7 @@ }) #endif -#if defined(__arm__) +#if defined(__arm__) || defined(__aarch64__) #if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) /* Use GCC built-in functions */ #define _PR_HAVE_ATOMIC_OPS @@ -242,6 +244,10 @@ #endif #endif /* __arm__ */ +#if defined(__aarch64__) +#define _MD_MINIMUM_STACK_SIZE 0x20000 +#endif + #define USE_SETJMP #if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID) #define _PR_POLL_AVAILABLE ++++++ config-guess-sub-update.diff ++++++ ++++ 1615 lines (skipped) ++++++ nspr-4.9.4.tar.bz2 -> nspr-4.9.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/admin/repackage.sh new/nspr-4.9.5/mozilla/nsprpub/admin/repackage.sh --- old/nspr-4.9.4/mozilla/nsprpub/admin/repackage.sh 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/admin/repackage.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,179 +0,0 @@ -#! /bin/sh -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# ------------------------------------------------------------------ -# repackage.sh -- Repackage NSPR from /s/b/c to mozilla.org format -# -# syntax: repackage.sh -# -# Description: -# repackage.sh creates NSPR binary distributions for mozilla.org from -# the internal binary distributions in /share/builds/components/nspr20. -# There are reasons why we can't just push the internal binary distributions -# to mozilla.org. External developers prefer to use the common archive -# file format for their platforms, rather than the jar files we use internally. -# -# On Unix, we create a tar.gz file. On Windows, we create a zip file. -# For example: NSPR 4.1.1, these would be nspr-4.1.1.tar.gz and nspr-4.1.1.zip. -# -# When unpacked, nspr-4.1.1.tar.gz or nspr-4.1.1.zip should expand to a -# nspr-4.1.1 directory that contains three subdirectories: include, lib, -# and bin. The header files, with the correct line endings for the -# platform, are in nspr-4.1.1/include. The libraries are in nspr-4.1.1/lib. -# The executable programs are in nspr-4.1.1/bin. -# -# Note! Files written with Gnu tar are not readable by some non-Gnu -# versions. Sun, in particular. -# -# -# -# -# ------------------------------------------------------------------ - -FROMTOP=/share/builds/components/nspr20/v4.9.4 -TOTOP=./v4.9.4 -NSPRDIR=nspr-4.9.4 -SOURCETAG=NSPR_4_9_4_RTM - -# -# enumerate Unix object directories on /s/b/c -UNIX_OBJDIRS=" -HP-UXB.11.11_64_DBG.OBJ -HP-UXB.11.11_64_OPT.OBJ -HP-UXB.11.11_DBG.OBJ -HP-UXB.11.11_OPT.OBJ -HP-UXB.11.23_ia64_32_DBG.OBJ -HP-UXB.11.23_ia64_32_OPT.OBJ -HP-UXB.11.23_ia64_64_DBG.OBJ -HP-UXB.11.23_ia64_64_OPT.OBJ -Linux2.4_x86_glibc_PTH_DBG.OBJ -Linux2.4_x86_glibc_PTH_OPT.OBJ -Linux2.6_x86_64_glibc_PTH_DBG.OBJ -Linux2.6_x86_64_glibc_PTH_OPT.OBJ -Linux2.6_x86_glibc_PTH_DBG.OBJ -Linux2.6_x86_glibc_PTH_OPT.OBJ -SunOS5.9_64_DBG.OBJ -SunOS5.9_64_OPT.OBJ -SunOS5.9_DBG.OBJ -SunOS5.9_OPT.OBJ -" -# -# enumerate Windows object directories on /s/b/c -WIN_OBJDIRS=" -WIN954.0_DBG.OBJ -WIN954.0_DBG.OBJD -WIN954.0_OPT.OBJ -WINNT5.0_DBG.OBJ -WINNT5.0_DBG.OBJD -WINNT5.0_OPT.OBJ -" - -# -# Create the destination directory. -# -echo "removing directory $TOTOP" -rm -rf $TOTOP -echo "creating directory $TOTOP" -mkdir -p $TOTOP - -# -# Generate the tar.gz files for Unix platforms. -# -for OBJDIR in $UNIX_OBJDIRS; do - echo "removing directory $NSPRDIR" - rm -rf $NSPRDIR - echo "creating directory $NSPRDIR" - mkdir $NSPRDIR - - echo "creating directory $NSPRDIR/include" - mkdir $NSPRDIR/include - echo "copying $FROMTOP/$OBJDIR/include" - cp -r $FROMTOP/$OBJDIR/include $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/lib" - cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/bin" - cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR - - echo "creating directory $TOTOP/$OBJDIR" - mkdir $TOTOP/$OBJDIR - echo "creating $TOTOP/$OBJDIR/$NSPRDIR.tar" - tar cvf $TOTOP/$OBJDIR/$NSPRDIR.tar $NSPRDIR - echo "gzipping $TOTOP/$OBJDIR/$NSPRDIR.tar" - gzip $TOTOP/$OBJDIR/$NSPRDIR.tar -done - -# -# Generate the zip files for Windows platforms. -# -for OBJDIR in $WIN_OBJDIRS; do - echo "removing directory $NSPRDIR" - rm -rf $NSPRDIR - echo "creating directory $NSPRDIR" - mkdir $NSPRDIR - - echo "creating directory $NSPRDIR/include" - mkdir $NSPRDIR/include - echo "creating directory $NSPRDIR/include/private" - mkdir $NSPRDIR/include/private - echo "creating directory $NSPRDIR/include/obsolete" - mkdir $NSPRDIR/include/obsolete - - # copy headers and adjust unix line-end to Windows line-end - # Note: Watch out for the "sed" command line. - # when editing the command, take care to preserve the "^M" as the literal - # cntl-M character! in vi, use "cntl-v cntl-m" to enter it! - # - headers=`ls $FROMTOP/$OBJDIR/include/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/`basename $header` - done - headers=`ls $FROMTOP/$OBJDIR/include/obsolete/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/obsolete/`basename $header` - done - headers=`ls $FROMTOP/$OBJDIR/include/private/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/private/`basename $header` - done - - echo "copying $FROMTOP/$OBJDIR/lib" - cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/bin" - cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR - - echo "creating directory $TOTOP/$OBJDIR" - mkdir -p $TOTOP/$OBJDIR - echo "creating $TOTOP/$OBJDIR/$NSPRDIR.zip" - zip -r $TOTOP/$OBJDIR/$NSPRDIR.zip $NSPRDIR -done - -# -# package the source from CVS -# -echo "Packaging source" -echo "removing directory $NSPRDIR" -rm -rf $NSPRDIR -echo "creating directory $NSPRDIR" -mkdir $NSPRDIR -myWD=`pwd` -cd $NSPRDIR -echo "Pulling source from CVS with tag $SOURCETAG" -cvs co -r $SOURCETAG mozilla/nsprpub -cd $myWD -mkdir $TOTOP/src -echo "Creating source tar file: $TOTOP/src/$NSPRDIR.tar" -tar cvf $TOTOP/src/$NSPRDIR.tar $NSPRDIR -echo "gzip $TOTOP/src/$NSPRDIR.tar" -gzip $TOTOP/src/$NSPRDIR.tar - -# -# Remove the working directory. -# -echo "removing directory $NSPRDIR" -rm -rf $NSPRDIR -# --- end repackage.sh --------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/config/prdepend.h new/nspr-4.9.5/mozilla/nsprpub/config/prdepend.h --- old/nspr-4.9.4/mozilla/nsprpub/config/prdepend.h 2012-07-24 10:48:27.000000000 +0200 +++ new/nspr-4.9.5/mozilla/nsprpub/config/prdepend.h 2013-02-02 16:53:23.000000000 +0100 @@ -10,3 +10,4 @@ */ #error "Do not include this header file." + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/configure new/nspr-4.9.5/mozilla/nsprpub/configure --- old/nspr-4.9.4/mozilla/nsprpub/configure 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/configure 2013-02-02 16:53:23.000000000 +0100 @@ -736,7 +736,7 @@ MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=4 +MOD_PATCH_VERSION=5 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -878,7 +878,7 @@ android_tool_prefix="arm-linux-androideabi" ;; i?86-*android*) - android_tool_prefix="i686-android-linux" + android_tool_prefix="i686-linux-android" ;; mipsel-*android*) android_tool_prefix="mipsel-linux-android" @@ -973,6 +973,14 @@ fi fi + case "$target_cpu" in + i?86) + if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then + android_tool_prefix="i686-android-linux" + fi + ;; + esac + AS="$android_toolchain"/bin/"$android_tool_prefix"-as CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++ @@ -1304,7 +1312,7 @@ # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. set dummy $WHOAMI whoami; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1308: checking for $ac_word" >&5 +echo "configure:1316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1376,13 +1384,13 @@ _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 -echo "configure:1380: checking for $host compiler" >&5 +echo "configure:1388: checking for $host compiler" >&5 for ac_prog in $HOST_CC gcc cc /usr/ucb/cc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1386: checking for $ac_word" >&5 +echo "configure:1394: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1428,16 +1436,16 @@ LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1432: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1440: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <<EOF -#line 1434 "configure" +#line 1442 "configure" #include "confdefs.h" int main() { return(0); ; return 0; } EOF -if { (eval echo configure:1441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 else @@ -1472,7 +1480,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1476: checking for $ac_word" >&5 +echo "configure:1484: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1506,7 +1514,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1510: checking for $ac_word" >&5 +echo "configure:1518: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1536,7 +1544,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1540: checking for $ac_word" >&5 +echo "configure:1548: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1587,7 +1595,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1591: checking for $ac_word" >&5 +echo "configure:1599: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1619,7 +1627,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1623: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1631: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1630,12 +1638,12 @@ cat > conftest.$ac_ext << EOF -#line 1634 "configure" +#line 1642 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1661,12 +1669,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1665: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1673: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1670: checking whether we are using GNU C" >&5 +echo "configure:1678: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1675,7 +1683,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1694,7 +1702,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1698: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1706: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1731,7 +1739,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1735: checking for $ac_word" >&5 +echo "configure:1743: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1767,7 +1775,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1771: checking for $ac_word" >&5 +echo "configure:1779: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1799,7 +1807,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1803: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1811: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1810,12 +1818,12 @@ cat > conftest.$ac_ext << EOF -#line 1814 "configure" +#line 1822 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1841,12 +1849,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1845: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1853: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1850: checking whether we are using GNU C++" >&5 +echo "configure:1858: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1855,7 +1863,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1874,7 +1882,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1878: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1886: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1919,7 +1927,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1923: checking for $ac_word" >&5 +echo "configure:1931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1954,7 +1962,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1958: checking for $ac_word" >&5 +echo "configure:1966: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1989,7 +1997,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1993: checking for $ac_word" >&5 +echo "configure:2001: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2024,7 +2032,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2028: checking for $ac_word" >&5 +echo "configure:2036: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2059,7 +2067,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2063: checking for $ac_word" >&5 +echo "configure:2071: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2094,7 +2102,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2098: checking for $ac_word" >&5 +echo "configure:2106: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2129,7 +2137,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2133: checking for $ac_word" >&5 +echo "configure:2141: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2159,7 +2167,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2163: checking for $ac_word" >&5 +echo "configure:2171: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2210,7 +2218,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2214: checking for $ac_word" >&5 +echo "configure:2222: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2242,7 +2250,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2254: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2253,12 +2261,12 @@ cat > conftest.$ac_ext << EOF -#line 2257 "configure" +#line 2265 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2284,12 +2292,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2296: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2293: checking whether we are using GNU C" >&5 +echo "configure:2301: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2298,7 +2306,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2317,7 +2325,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2321: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2329: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2357,7 +2365,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2361: checking for $ac_word" >&5 +echo "configure:2369: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2389,7 +2397,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2393: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2401: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2400,12 +2408,12 @@ cat > conftest.$ac_ext << EOF -#line 2404 "configure" +#line 2412 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2431,12 +2439,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2435: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2443: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2440: checking whether we are using GNU C++" >&5 +echo "configure:2448: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2453,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -2464,7 +2472,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:2468: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2476: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2498,7 +2506,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2502: checking how to run the C preprocessor" >&5 +echo "configure:2510: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2513,13 +2521,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2517 "configure" +#line 2525 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2530,13 +2538,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2534 "configure" +#line 2542 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2547,13 +2555,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2551 "configure" +#line 2559 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2580,7 +2588,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2584: checking for $ac_word" >&5 +echo "configure:2592: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2612,7 +2620,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2616: checking for $ac_word" >&5 +echo "configure:2624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2653,7 +2661,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2657: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2694,7 +2702,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2698: checking for $ac_word" >&5 +echo "configure:2706: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2735,7 +2743,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2739: checking for $ac_word" >&5 +echo "configure:2747: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2776,7 +2784,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2780: checking for $ac_word" >&5 +echo "configure:2788: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2844,7 +2852,7 @@ fi echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:2848: checking for gcc -pipe support" >&5 +echo "configure:2856: checking for gcc -pipe support" >&5 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then echo '#include <stdio.h>' > dummy-hello.c echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c @@ -2859,14 +2867,14 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext <<EOF -#line 2863 "configure" +#line 2871 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -2896,16 +2904,16 @@ CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:2900: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:2908: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <<EOF -#line 2902 "configure" +#line 2910 "configure" #include "confdefs.h" int main() { return 0; ; return 0; } EOF -if { (eval echo configure:2909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -2928,7 +2936,7 @@ if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:2932: checking for visibility(hidden) attribute" >&5 +echo "configure:2940: checking for visibility(hidden) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2952,7 +2960,7 @@ EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:2956: checking for visibility pragma support" >&5 +echo "configure:2964: checking for visibility pragma support" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3005,7 +3013,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3009: checking for $ac_word" >&5 +echo "configure:3017: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3327,14 +3335,14 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$arch_flag" cat > conftest.$ac_ext <<EOF -#line 3331 "configure" +#line 3339 "configure" #include "confdefs.h" int main() { return sizeof(__thumb2__); ; return 0; } EOF -if { (eval echo configure:3338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* MOZ_THUMB2=1 else @@ -3396,16 +3404,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$all_flags" echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 -echo "configure:3400: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 +echo "configure:3408: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 cat > conftest.$ac_ext <<EOF -#line 3402 "configure" +#line 3410 "configure" #include "confdefs.h" int main() { return 0; ; return 0; } EOF -if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3462,17 +3470,17 @@ DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 -echo "configure:3466: checking for sys/atomic_op.h" >&5 +echo "configure:3474: checking for sys/atomic_op.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3471 "configure" +#line 3479 "configure" #include "confdefs.h" #include <sys/atomic_op.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3629,7 +3637,7 @@ _DEBUG_FLAGS='-gdwarf-2 -O0' MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 -echo "configure:3633: checking for gethostbyaddr in -lbind" >&5 +echo "configure:3641: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3637,7 +3645,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 3641 "configure" +#line 3649 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3648,7 +3656,7 @@ gethostbyaddr() ; return 0; } EOF -if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3857,17 +3865,17 @@ fi ac_safe=`echo "crt_externs.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for crt_externs.h""... $ac_c" 1>&6 -echo "configure:3861: checking for crt_externs.h" >&5 +echo "configure:3869: checking for crt_externs.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3866 "configure" +#line 3874 "configure" #include "confdefs.h" #include <crt_externs.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4911,17 +4919,17 @@ _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 -echo "configure:4915: checking for machine/builtins.h" >&5 +echo "configure:4923: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4920 "configure" +#line 4928 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5480,7 +5488,7 @@ ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5484: checking for dlopen in -ldl" >&5 +echo "configure:5492: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5488,7 +5496,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5492 "configure" +#line 5500 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5499,7 +5507,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:5503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5516,17 +5524,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:5520: checking for dlfcn.h" >&5 +echo "configure:5528: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5525 "configure" +#line 5533 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5559,13 +5567,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:5563: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:5571: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 5569 "configure" +#line 5577 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -5583,7 +5591,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 5587 "configure" +#line 5595 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -5609,12 +5617,12 @@ for ac_func in lchown strerror dladdr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5613: checking for $ac_func" >&5 +echo "configure:5621: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5618 "configure" +#line 5626 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5637,7 +5645,7 @@ ; return 0; } EOF -if { (eval echo configure:5641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5689,7 +5697,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5693: checking for $ac_word" >&5 +echo "configure:5701: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5748,7 +5756,7 @@ if test -z "$GNU_CC"; then echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 -echo "configure:5752: checking for +Olit support" >&5 +echo "configure:5760: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5790,7 +5798,7 @@ *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:5794: checking for pthread_create in -lpthreads" >&5 +echo "configure:5802: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5812,7 +5820,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:5816: checking for pthread_create in -lpthread" >&5 +echo "configure:5824: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5834,7 +5842,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:5838: checking for pthread_create in -lc_r" >&5 +echo "configure:5846: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5856,7 +5864,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:5860: checking for pthread_create in -lc" >&5 +echo "configure:5868: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5974,7 +5982,7 @@ rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:5978: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5986: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5997,7 +6005,7 @@ ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:6001: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:6009: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -6582,7 +6590,7 @@ s%\]%\\&%g s%\$%$$%g EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '` # Manually modified for MKS support. +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` rm -f conftest.defs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/configure.in new/nspr-4.9.5/mozilla/nsprpub/configure.in --- old/nspr-4.9.4/mozilla/nsprpub/configure.in 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/configure.in 2013-02-02 16:53:23.000000000 +0100 @@ -15,7 +15,7 @@ dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=4 +MOD_PATCH_VERSION=5 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -127,7 +127,7 @@ android_tool_prefix="arm-linux-androideabi" ;; i?86-*android*) - android_tool_prefix="i686-android-linux" + android_tool_prefix="i686-linux-android" ;; mipsel-*android*) android_tool_prefix="mipsel-linux-android" @@ -221,6 +221,17 @@ fi fi + dnl Old NDK support. If minimum requirement is changed to NDK r8b, + dnl please remove this. + case "$target_cpu" in + i?86) + if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then + dnl Old NDK toolchain name + android_tool_prefix="i686-android-linux" + fi + ;; + esac + dnl set up compilers AS="$android_toolchain"/bin/"$android_tool_prefix"-as CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/include/prinit.h new/nspr-4.9.5/mozilla/nsprpub/pr/include/prinit.h --- old/nspr-4.9.4/mozilla/nsprpub/pr/include/prinit.h 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/include/prinit.h 2013-02-02 16:53:23.000000000 +0100 @@ -31,10 +31,10 @@ ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.9.4" +#define PR_VERSION "4.9.5" #define PR_VMAJOR 4 #define PR_VMINOR 9 -#define PR_VPATCH 4 +#define PR_VPATCH 5 #define PR_BETA PR_FALSE /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/include/prlong.h new/nspr-4.9.5/mozilla/nsprpub/pr/include/prlong.h --- old/nspr-4.9.4/mozilla/nsprpub/pr/include/prlong.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/include/prlong.h 2013-02-02 16:53:23.000000000 +0100 @@ -35,7 +35,7 @@ #if defined(HAVE_LONG_LONG) /* Keep this in sync with prtypes.h. */ -#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) +#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF) #define LL_MAXINT 9223372036854775807L #define LL_MININT (-LL_MAXINT - 1L) #define LL_ZERO 0L diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/include/prtypes.h new/nspr-4.9.5/mozilla/nsprpub/pr/include/prtypes.h --- old/nspr-4.9.4/mozilla/nsprpub/pr/include/prtypes.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/include/prtypes.h 2013-02-02 16:53:23.000000000 +0100 @@ -205,6 +205,36 @@ PR_BEGIN_EXTERN_C +/* +** Starting in NSPR 4.9.5, NSPR's exact-width integer types should match +** the exact-width integer types defined in <stdint.h>. This allows sloppy +** code to use PRInt{N} and int{N}_t interchangeably. +** +** The 8-bit and 16-bit integer types can only be defined using char and +** short. All platforms define the 32-bit integer types using int. So only +** the 64-bit integer types could be defined differently. +** +** NSPR's original strategy was to use the "shortest" 64-bit integer type: +** if long is 64-bit, then prefer it over long long. This strategy is also +** used by Linux/glibc, FreeBSD, and NetBSD. +** +** Other platforms use a different strategy: simply define the 64-bit +** integer types using long long. We define the PR_ALTERNATE_INT64_TYPEDEF +** macro on these platforms. Note that PR_ALTERNATE_INT64_TYPEDEF is for +** internal use by NSPR headers only. Do not define or test this macro in +** your code. +** +** NOTE: NSPR can't use <stdint.h> because C99 requires C++ code to define +** __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS to make all the macros +** defined in <stdint.h> available. This strange requirement is gone in +** C11. When most platforms ignore this C99 requirement, NSPR will be able +** to use <stdint.h>. A patch to do that is in NSPR bug 634793. +*/ + +#if defined(__APPLE__) || defined(__ANDROID__) || defined(__OpenBSD__) +#define PR_ALTERNATE_INT64_TYPEDEF +#endif + /************************************************************************ ** TYPES: PRUint8 ** PRInt8 @@ -331,12 +361,7 @@ ************************************************************************/ #ifdef HAVE_LONG_LONG /* Keep this in sync with prlong.h. */ -/* - * On 64-bit Mac OS X, uint64 needs to be defined as unsigned long long to - * match uint64_t, otherwise our uint64 typedef conflicts with the uint64 - * typedef in cssmconfig.h, which CoreServices.h includes indirectly. - */ -#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) +#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF) typedef long PRInt64; typedef unsigned long PRUint64; #define PR_INT64(x) x ## L diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/src/Makefile.in new/nspr-4.9.5/mozilla/nsprpub/pr/src/Makefile.in --- old/nspr-4.9.4/mozilla/nsprpub/pr/src/Makefile.in 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/src/Makefile.in 2013-02-02 16:53:23.000000000 +0100 @@ -118,7 +118,8 @@ endif endif -ifeq ($(OS_ARCH),Linux) +# Linux, GNU/Hurd, and GNU/kFreeBSD systems +ifneq (,$(filter Linux GNU%,$(OS_ARCH))) ifeq ($(USE_PTHREADS), 1) ifeq ($(OS_TARGET),Android) # Android has no libpthread.so in NDK @@ -129,8 +130,11 @@ else OS_LIBS = -ldl endif +ifneq ($(OS_TARGET),Android) +# Android has no librt - realtime functions are in libc OS_LIBS += -lrt endif +endif ifeq ($(OS_ARCH),HP-UX) ifeq ($(USE_PTHREADS), 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/src/linking/prlink.c new/nspr-4.9.5/mozilla/nsprpub/pr/src/linking/prlink.c --- old/nspr-4.9.4/mozilla/nsprpub/pr/src/linking/prlink.c 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/src/linking/prlink.c 2013-02-02 16:53:23.000000000 +0100 @@ -959,12 +959,19 @@ int result = 0; PRStatus status = PR_SUCCESS; - if ((lib == 0) || (lib->refCount <= 0)) { + if (lib == 0) { PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); return PR_FAILURE; } PR_EnterMonitor(pr_linker_lock); + + if (lib->refCount <= 0) { + PR_ExitMonitor(pr_linker_lock); + PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); + return PR_FAILURE; + } + if (--lib->refCount > 0) { PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("%s decr => %d", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/src/pthreads/ptio.c new/nspr-4.9.5/mozilla/nsprpub/pr/src/pthreads/ptio.c --- old/nspr-4.9.4/mozilla/nsprpub/pr/src/pthreads/ptio.c 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/src/pthreads/ptio.c 2013-02-02 16:53:23.000000000 +0100 @@ -1150,7 +1150,7 @@ osfd = socket(AF_INET6, SOCK_STREAM, 0); if (osfd != -1) { int on; - int optlen = sizeof(on); + socklen_t optlen = sizeof(on); if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, &on, &optlen) == 0) { _pr_ipv6_v6only_on_by_default = on; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/tests/vercheck.c new/nspr-4.9.5/mozilla/nsprpub/pr/tests/vercheck.c --- old/nspr-4.9.4/mozilla/nsprpub/pr/tests/vercheck.c 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/tests/vercheck.c 2013-02-02 16:53:23.000000000 +0100 @@ -20,10 +20,10 @@ #include <stdlib.h> /* - * This release (4.9.4) is backward compatible with the + * This release (4.9.5) is backward compatible with the * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x, - * 4.8.x, 4.9, 4.9.1, 4.9.2, and 4.9.3 releases. It, of course, - * is compatible with itself. + * 4.8.x, 4.9, 4.9.1, 4.9.2, 4.9.3, and 4.9.4 releases. + * It, of course, is compatible with itself. */ static char *compatible_version[] = { "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", @@ -35,7 +35,7 @@ "4.7.6", "4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5", "4.8.6", "4.8.7", "4.8.8", "4.8.9", - "4.9", "4.9.1", "4.9.2", "4.9.3", PR_VERSION + "4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", PR_VERSION }; /* @@ -50,7 +50,7 @@ "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.9.5", + "4.9.6", "4.10", "4.10.1", "10.0", "11.1", "12.14.20" }; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package snapper for openSUSE:12.3 checked in at 2013-03-01 10:56:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/snapper (Old) and /work/SRC/openSUSE:12.3/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/snapper/snapper.changes 2013-02-25 20:44:45.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.snapper.new/snapper.changes 2013-03-01 10:57:03.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 18:39:19 CET 2013 - aschnell(a)suse.de + +- added filters for lvm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper-0.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/data/Makefile.am new/snapper-0.1.2/data/Makefile.am --- old/snapper-0.1.2/data/Makefile.am 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/data/Makefile.am 2013-02-28 18:41:32.000000000 +0100 @@ -2,8 +2,8 @@ # Makefile.am for snapper/data # -EXTRA_DIST = sysconfig.snapper base.txt x11.txt snapper.logrotate default-config \ - org.opensuse.Snapper.conf org.opensuse.Snapper.service +EXTRA_DIST = sysconfig.snapper base.txt lvm.txt x11.txt snapper.logrotate \ + default-config org.opensuse.Snapper.conf org.opensuse.Snapper.service install-data-local: install -D -m 644 snapper.logrotate $(DESTDIR)/etc/logrotate.d/snapper @@ -11,6 +11,7 @@ install -D -m 644 default-config $(DESTDIR)/etc/snapper/config-templates/default install -d -m 755 $(DESTDIR)/etc/snapper/filters install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt + install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/data/Makefile.in new/snapper-0.1.2/data/Makefile.in --- old/snapper-0.1.2/data/Makefile.in 2013-02-25 10:56:58.000000000 +0100 +++ new/snapper-0.1.2/data/Makefile.in 2013-02-28 18:41:53.000000000 +0100 @@ -213,8 +213,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = sysconfig.snapper base.txt x11.txt snapper.logrotate default-config \ - org.opensuse.Snapper.conf org.opensuse.Snapper.service +EXTRA_DIST = sysconfig.snapper base.txt lvm.txt x11.txt snapper.logrotate \ + default-config org.opensuse.Snapper.conf org.opensuse.Snapper.service all: all-am @@ -415,6 +415,7 @@ install -D -m 644 default-config $(DESTDIR)/etc/snapper/config-templates/default install -d -m 755 $(DESTDIR)/etc/snapper/filters install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt + install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/data/lvm.txt new/snapper-0.1.2/data/lvm.txt --- old/snapper-0.1.2/data/lvm.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/snapper-0.1.2/data/lvm.txt 2013-02-28 18:41:32.000000000 +0100 @@ -0,0 +1,2 @@ +/etc/lvm/archive/* +/etc/lvm/backup/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2013-03-01 10:56:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2013-02-25 20:44:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2013-03-01 10:56:55.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 18:39:19 CET 2013 - aschnell(a)suse.de + +- added filters for lvm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper-0.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/data/Makefile.am new/snapper-0.1.2/data/Makefile.am --- old/snapper-0.1.2/data/Makefile.am 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/data/Makefile.am 2013-02-28 18:41:32.000000000 +0100 @@ -2,8 +2,8 @@ # Makefile.am for snapper/data # -EXTRA_DIST = sysconfig.snapper base.txt x11.txt snapper.logrotate default-config \ - org.opensuse.Snapper.conf org.opensuse.Snapper.service +EXTRA_DIST = sysconfig.snapper base.txt lvm.txt x11.txt snapper.logrotate \ + default-config org.opensuse.Snapper.conf org.opensuse.Snapper.service install-data-local: install -D -m 644 snapper.logrotate $(DESTDIR)/etc/logrotate.d/snapper @@ -11,6 +11,7 @@ install -D -m 644 default-config $(DESTDIR)/etc/snapper/config-templates/default install -d -m 755 $(DESTDIR)/etc/snapper/filters install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt + install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/data/Makefile.in new/snapper-0.1.2/data/Makefile.in --- old/snapper-0.1.2/data/Makefile.in 2013-02-25 10:56:58.000000000 +0100 +++ new/snapper-0.1.2/data/Makefile.in 2013-02-28 18:41:53.000000000 +0100 @@ -213,8 +213,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = sysconfig.snapper base.txt x11.txt snapper.logrotate default-config \ - org.opensuse.Snapper.conf org.opensuse.Snapper.service +EXTRA_DIST = sysconfig.snapper base.txt lvm.txt x11.txt snapper.logrotate \ + default-config org.opensuse.Snapper.conf org.opensuse.Snapper.service all: all-am @@ -415,6 +415,7 @@ install -D -m 644 default-config $(DESTDIR)/etc/snapper/config-templates/default install -d -m 755 $(DESTDIR)/etc/snapper/filters install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt + install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/data/lvm.txt new/snapper-0.1.2/data/lvm.txt --- old/snapper-0.1.2/data/lvm.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/snapper-0.1.2/data/lvm.txt 2013-02-28 18:41:32.000000000 +0100 @@ -0,0 +1,2 @@ +/etc/lvm/archive/* +/etc/lvm/backup/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shim for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package shim for openSUSE:12.3 checked in at 2013-03-01 10:55:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/shim (Old) and /work/SRC/openSUSE:12.3/.shim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shim", Maintainer is "GLin(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/shim/shim.changes 2013-02-11 14:55:01.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.shim.new/shim.changes 2013-03-01 10:55:12.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Feb 28 08:57:48 UTC 2013 - lnussel(a)suse.de + +- sign shim also with openSUSE certificate + +------------------------------------------------------------------- +Wed Feb 27 15:52:53 CET 2013 - mls(a)suse.de + +- identify project, export certificate as DER file +- don't create an unused extra keypair + +------------------------------------------------------------------- +Thu Feb 21 10:08:12 UTC 2013 - glin(a)suse.com + +- Add shim-bnc804631-fix-broken-bootpath.patch to fix the broken + bootpath generated in generate_path(). (bnc#804631) + +------------------------------------------------------------------- New: ---- SLES-UEFI-CA-Certificate.crt shim-bnc804631-fix-broken-bootpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim.spec ++++++ --- /var/tmp/diff_new_pack.cSzEcs/_old 2013-03-01 10:55:12.000000000 +0100 +++ /var/tmp/diff_new_pack.cSzEcs/_new 2013-03-01 10:55:12.000000000 +0100 @@ -32,6 +32,7 @@ Source1: shim-signed.efi Source2: openSUSE-UEFI-CA-Certificate.crt Source3: shim-install +Source4: SLES-UEFI-CA-Certificate.crt # PATCH-FIX-SUSE shim-suse-build.patch glin(a)suse.com -- Adjust Makefile for the build service Patch0: shim-suse-build.patch # PATCH-FIX-UPSTREAM shim-local-key-sign-mokmanager.patch glin(a)suse.com -- Sign MokManager.efi with the local generated certificate @@ -52,6 +53,8 @@ Patch9: shim-mokmanager-support-crypt-hash-method.patch # PATCH-FIX-OPENSUSE shim-keep-unsigned-mokmanager.patch glin(a)suse.com -- Keep MokManager.efi and sign it with the openSUSE key later Patch10: shim-keep-unsigned-mokmanager.patch +# PATCH-FIX-UPSTREAM shim-bnc804631-fix-broken-bootpath.patch bnc#804631 glin(a)suse.com -- Fix the broken bootpath generated in generate_path() +Patch11: shim-bnc804631-fix-broken-bootpath.patch BuildRequires: gnu-efi >= 3.0q BuildRequires: mozilla-nss-tools BuildRequires: openssl >= 0.9.8 @@ -83,19 +86,50 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build chmod +x "make-certs" -openssl x509 -in %{S:2} -outform DER -out openSUSE-UEFI-CA-Certificate.der + +if test -e %{_sourcedir}/_projectcert.crt ; then + prjsubject=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout -subject_hash) + prjissuer=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout -issuer_hash) + opensusesubject=$(openssl x509 -in %{SOURCE2} -noout -subject_hash) + slessubject=$(openssl x509 -in %{SOURCE4} -noout -subject_hash) + if test "$prjissuer" = "$opensusesubject" ; then + suffix=opensuse + cert=%{SOURCE2} + fi + if test "$prjissuer" = "$slessubject" ; then + suffix=sles + cert=%{SOURCE4} + fi + if test "$prjsubject" = "$prjissuer" ; then + suffix=local + cert=%{_sourcedir}/_projectcert.crt + fi +fi +if test -z "$suffix" ; then + echo "cannot identify project, assuming openSUSE signing" + suffix=opensuse + cert=%{SOURCE2} +fi + +openssl x509 -in $cert -outform DER -out shim-$suffix.der +# create empty local cert file, we don't need a local key pair as we +# sign the mokmanager with our vendor key +touch shim.crt +touch shim.cer # make sure cast warnings don't trigger post build check -make VENDOR_CERT_FILE=openSUSE-UEFI-CA-Certificate.der 2>/dev/null +make VENDOR_CERT_FILE=shim-$suffix.der shim.efi MokManager.efi 2>/dev/null # make VENDOR_CERT_FILE=cert.der VENDOR_DBX_FILE=dbx -mv shim.efi shim-opensuse.efi +mv shim.efi shim-$suffix.efi %install -export BRP_PESIGN_FILES='%{_libdir}/efi/shim-opensuse.efi %{_libdir}/efi/MokManager.efi' +export BRP_PESIGN_FILES='%{_libdir}/efi/shim*.efi %{_libdir}/efi/MokManager.efi' install -d %{buildroot}/%{_libdir}/efi -install -m 444 shim-opensuse.efi %{buildroot}/%{_libdir}/efi +install -m 444 shim-*.efi %{buildroot}/%{_libdir}/efi +install -m 444 shim-*.der %{buildroot}/%{_libdir}/efi # FIXME: install signed shim here install -m 444 %{SOURCE1} %{buildroot}/%{_libdir}/efi/shim.efi install -m 444 MokManager.efi %{buildroot}/%{_libdir}/efi/MokManager.efi @@ -110,7 +144,8 @@ %doc COPYRIGHT %dir %{_libdir}/efi %{_libdir}/efi/shim.efi -%{_libdir}/efi/shim-opensuse.efi +%{_libdir}/efi/shim-*.efi +%{_libdir}/efi/shim-*.der %{_libdir}/efi/MokManager.efi %{_sbindir}/shim-install ++++++ SLES-UEFI-CA-Certificate.crt ++++++ -----BEGIN CERTIFICATE----- MIIG5TCCBM2gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBpjEtMCsGA1UEAwwkU1VT RSBMaW51eCBFbnRlcnByaXNlIFNlY3VyZSBCb290IENBMQswCQYDVQQGEwJERTES MBAGA1UEBwwJTnVyZW1iZXJnMSEwHwYDVQQKDBhTVVNFIExpbnV4IFByb2R1Y3Rz IEdtYkgxEzARBgNVBAsMCkJ1aWxkIFRlYW0xHDAaBgkqhkiG9w0BCQEWDWJ1aWxk QHN1c2UuZGUwHhcNMTMwMTIyMTQyMDA4WhcNMzQxMjE4MTQyMDA4WjCBpjEtMCsG A1UEAwwkU1VTRSBMaW51eCBFbnRlcnByaXNlIFNlY3VyZSBCb290IENBMQswCQYD VQQGEwJERTESMBAGA1UEBwwJTnVyZW1iZXJnMSEwHwYDVQQKDBhTVVNFIExpbnV4 IFByb2R1Y3RzIEdtYkgxEzARBgNVBAsMCkJ1aWxkIFRlYW0xHDAaBgkqhkiG9w0B CQEWDWJ1aWxkQHN1c2UuZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC AQCrLYL1Uq02iIgro6x6PFESFDtUKU7xO/bJanI7+AQAroowFuLBI67BBSmoq3hR QnH3OtQusGV8y+wvjaaunppvWMfjViZ88zssj5fKXrDr5U6BB566DJgHreWaEs2d FD13XpKRr3Nk9zdjAJu5YsR7hI1NMXsnj1X8w71OY9HLjv+Kq9917PJwZQjOGnAJ BQTi0ogHuLiwDqMKgg5rrYD4cJDPzoLEmEXnwHDIOSiWdD0bCzhN6GQDKldIxQ2O d/mjUgzB+dWslIb+bUKaoJgDtyPV20W74t7Y2uwoaEVr9QkPoM3tOPttf4qsWo8B J1TgeoF01ZeKcvSyvOXCKbfAN9sqURK2ZUTNThqZ//VPQmJP6fByrMJsbvTOSsQt HI+fFPrg1DC2KT8SzuGtWDRscHZ7MofvUKEQolVgkGwp8u68t/RAAwDpUdqIajzi yfp9qSDD+9uMeyiLa4rrAr2ATGohNBa0qha95slgvSepXbYKuHG5b4fWMsG7z4Uc dqE2vK8cQma1nsAeQBaq2/89294TOHEzKyspesfCBCnKQ3q+l9xelYRdvapj1CH/ cfUZf2/6X3VHN1P88RfRrPubswmrcOCEBT41upa2WKRDJ1GS6YhL6LJnrZSTjfe+ KsfNVS1D+KqSKiK0hfk6YK6O88mMGeAKQs3Ap8WthBLf0QIDAQABo4IBGjCCARYw DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPU1Az5OFOQJLHPxaEt7f6LF+dV8w gdMGA1UdIwSByzCByIAUPU1Az5OFOQJLHPxaEt7f6LF+dV+hgaykgakwgaYxLTAr BgNVBAMMJFNVU0UgTGludXggRW50ZXJwcmlzZSBTZWN1cmUgQm9vdCBDQTELMAkG A1UEBhMCREUxEjAQBgNVBAcMCU51cmVtYmVyZzEhMB8GA1UECgwYU1VTRSBMaW51 eCBQcm9kdWN0cyBHbWJIMRMwEQYDVQQLDApCdWlsZCBUZWFtMRwwGgYJKoZIhvcN AQkBFg1idWlsZEBzdXNlLmRlggEBMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0B AQsFAAOCAgEANtdMT47CjQtuERYa5jfygIO5F+urB4fl8pYcQQ/hTPE0KtAnAtrS 1strtMrVQ1t7Wu3fVbWYA6MZMXXkcwyyNbaWfj6roaSC6G5ZqCJ69oSyzaCbyaTI eOgzIIiVGOAj7tiM6T88Xp9qx4Xa3F6UQHF6xfwBT3nNKerGKOG01p7mBfBewwO5 Hxp7OAZmennUxV1uuT5/AsArxw9lMlawXhIAS7tRYHW+32D4tjHPDycldOw1hBjt z5JdehBiTmxhJ6onl0HSpsX84IMSbkeFIxLfxIF0TNas1pGnSGmh8FcV+ck9js3P yamJcNkgCstIwo3QZ2D5YdtQjOusyEuGjCIpDIQx36OMzeOo0SayOdzb2dSmcrHv 4DIkXDUELyIzu79A2R2KR7OQaGL6HGAVy6+yXHHygTbbUrb6ck2+aOG8913ChABc ZAiSFFRKVZzzj7FeIxZNA8GBUbhd20eQB2fUXDypeAnTG6P3dtTs84xNb1qGm3VC OAKjkWYQijLWmAOs9Q4NM/AXOeDTgXxA7iX7kWHRNeDbACirp7zM2ZOIP5ObIS6z yMqcG9DecSVbXiH3MJDTBoB1idQTTyreqpM/l6N8xNNVjEiLJGMEM1SeYq6S1lFV a+GcdOaLYkh7ya3I42l/tDOqH2OLIf7FEtocnc1xU6jTz8au1tZxec8= -----END CERTIFICATE----- ++++++ shim-bnc804631-fix-broken-bootpath.patch ++++++ >From 6b70850baa958b196ec332cf0224ffa9d5a81f5f Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin <glin(a)suse.com> Date: Thu, 21 Feb 2013 17:49:29 +0800 Subject: [PATCH] Fix the broken bootpath - The file path from DevicePathToStr may use slash as the file seperator. Change all slashes to backslashes to avoid the strange bootpath. - Remove the redundant backslashes. - ImagePath no longer requires the leading backslash. - Fix a memory leak Based on the patch from Michal Marek <mmarek(a)suse.com> --- shim.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/shim.c b/shim.c index 37a5898..690d064 100644 --- a/shim.c +++ b/shim.c @@ -919,15 +919,25 @@ static EFI_STATUS generate_path(EFI_LOADED_IMAGE *li, CHAR16 *ImagePath, pathlen = StrLen(bootpath); + /* + * DevicePathToStr() concatenates two nodes with '/'. + * Convert '/' to '\\'. + */ + for (i = 0; i < pathlen; i++) { + if (bootpath[i] == '/') + bootpath[i] = '\\'; + } for (i=pathlen; i>0; i--) { - if (bootpath[i] == '\\') + if (bootpath[i] == '\\' && bootpath[i-1] != '\\') break; } + if (bootpath[i] == '\\') + bootpath[i+1] = '\0'; + else + bootpath[0] = '\0'; - bootpath[i+1] = '\0'; - - if (i == 0 || bootpath[i-i] == '\\') - bootpath[i] = '\0'; + while (*ImagePath == '\\') + ImagePath++; *PathName = AllocatePool(StrSize(bootpath) + StrSize(ImagePath)); @@ -944,6 +954,8 @@ static EFI_STATUS generate_path(EFI_LOADED_IMAGE *li, CHAR16 *ImagePath, *grubpath = FileDevicePath(device, *PathName); error: + FreePool(bootpath); + return efi_status; } -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shim for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package shim for openSUSE:Factory checked in at 2013-03-01 10:55:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shim (Old) and /work/SRC/openSUSE:Factory/.shim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shim", Maintainer is "GLin(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/shim/shim.changes 2013-02-23 16:45:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shim.new/shim.changes 2013-03-01 10:55:10.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 28 08:57:48 UTC 2013 - lnussel(a)suse.de + +- sign shim also with openSUSE certificate + +------------------------------------------------------------------- +Wed Feb 27 15:52:53 CET 2013 - mls(a)suse.de + +- identify project, export certificate as DER file +- don't create an unused extra keypair + +------------------------------------------------------------------- New: ---- SLES-UEFI-CA-Certificate.crt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim.spec ++++++ --- /var/tmp/diff_new_pack.jeFSgE/_old 2013-03-01 10:55:11.000000000 +0100 +++ /var/tmp/diff_new_pack.jeFSgE/_new 2013-03-01 10:55:11.000000000 +0100 @@ -32,6 +32,7 @@ Source1: shim-signed.efi Source2: openSUSE-UEFI-CA-Certificate.crt Source3: shim-install +Source4: SLES-UEFI-CA-Certificate.crt # PATCH-FIX-SUSE shim-suse-build.patch glin(a)suse.com -- Adjust Makefile for the build service Patch0: shim-suse-build.patch # PATCH-FIX-UPSTREAM shim-local-key-sign-mokmanager.patch glin(a)suse.com -- Sign MokManager.efi with the local generated certificate @@ -89,16 +90,46 @@ %build chmod +x "make-certs" -openssl x509 -in %{S:2} -outform DER -out openSUSE-UEFI-CA-Certificate.der + +if test -e %{_sourcedir}/_projectcert.crt ; then + prjsubject=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout -subject_hash) + prjissuer=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout -issuer_hash) + opensusesubject=$(openssl x509 -in %{SOURCE2} -noout -subject_hash) + slessubject=$(openssl x509 -in %{SOURCE4} -noout -subject_hash) + if test "$prjissuer" = "$opensusesubject" ; then + suffix=opensuse + cert=%{SOURCE2} + fi + if test "$prjissuer" = "$slessubject" ; then + suffix=sles + cert=%{SOURCE4} + fi + if test "$prjsubject" = "$prjissuer" ; then + suffix=local + cert=%{_sourcedir}/_projectcert.crt + fi +fi +if test -z "$suffix" ; then + echo "cannot identify project, assuming openSUSE signing" + suffix=opensuse + cert=%{SOURCE2} +fi + +openssl x509 -in $cert -outform DER -out shim-$suffix.der +# create empty local cert file, we don't need a local key pair as we +# sign the mokmanager with our vendor key +touch shim.crt +touch shim.cer # make sure cast warnings don't trigger post build check -make VENDOR_CERT_FILE=openSUSE-UEFI-CA-Certificate.der 2>/dev/null +make VENDOR_CERT_FILE=shim-$suffix.der shim.efi MokManager.efi 2>/dev/null # make VENDOR_CERT_FILE=cert.der VENDOR_DBX_FILE=dbx -mv shim.efi shim-opensuse.efi +mv shim.efi shim-$suffix.efi %install -export BRP_PESIGN_FILES='%{_libdir}/efi/shim-opensuse.efi %{_libdir}/efi/MokManager.efi' +export BRP_PESIGN_FILES='%{_libdir}/efi/shim*.efi %{_libdir}/efi/MokManager.efi' install -d %{buildroot}/%{_libdir}/efi -install -m 444 shim-opensuse.efi %{buildroot}/%{_libdir}/efi +install -m 444 shim-*.efi %{buildroot}/%{_libdir}/efi +install -m 444 shim-*.der %{buildroot}/%{_libdir}/efi # FIXME: install signed shim here install -m 444 %{SOURCE1} %{buildroot}/%{_libdir}/efi/shim.efi install -m 444 MokManager.efi %{buildroot}/%{_libdir}/efi/MokManager.efi @@ -113,7 +144,8 @@ %doc COPYRIGHT %dir %{_libdir}/efi %{_libdir}/efi/shim.efi -%{_libdir}/efi/shim-opensuse.efi +%{_libdir}/efi/shim-*.efi +%{_libdir}/efi/shim-*.der %{_libdir}/efi/MokManager.efi %{_sbindir}/shim-install ++++++ SLES-UEFI-CA-Certificate.crt ++++++ -----BEGIN CERTIFICATE----- MIIG5TCCBM2gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBpjEtMCsGA1UEAwwkU1VT RSBMaW51eCBFbnRlcnByaXNlIFNlY3VyZSBCb290IENBMQswCQYDVQQGEwJERTES MBAGA1UEBwwJTnVyZW1iZXJnMSEwHwYDVQQKDBhTVVNFIExpbnV4IFByb2R1Y3Rz IEdtYkgxEzARBgNVBAsMCkJ1aWxkIFRlYW0xHDAaBgkqhkiG9w0BCQEWDWJ1aWxk QHN1c2UuZGUwHhcNMTMwMTIyMTQyMDA4WhcNMzQxMjE4MTQyMDA4WjCBpjEtMCsG A1UEAwwkU1VTRSBMaW51eCBFbnRlcnByaXNlIFNlY3VyZSBCb290IENBMQswCQYD VQQGEwJERTESMBAGA1UEBwwJTnVyZW1iZXJnMSEwHwYDVQQKDBhTVVNFIExpbnV4 IFByb2R1Y3RzIEdtYkgxEzARBgNVBAsMCkJ1aWxkIFRlYW0xHDAaBgkqhkiG9w0B CQEWDWJ1aWxkQHN1c2UuZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC AQCrLYL1Uq02iIgro6x6PFESFDtUKU7xO/bJanI7+AQAroowFuLBI67BBSmoq3hR QnH3OtQusGV8y+wvjaaunppvWMfjViZ88zssj5fKXrDr5U6BB566DJgHreWaEs2d FD13XpKRr3Nk9zdjAJu5YsR7hI1NMXsnj1X8w71OY9HLjv+Kq9917PJwZQjOGnAJ BQTi0ogHuLiwDqMKgg5rrYD4cJDPzoLEmEXnwHDIOSiWdD0bCzhN6GQDKldIxQ2O d/mjUgzB+dWslIb+bUKaoJgDtyPV20W74t7Y2uwoaEVr9QkPoM3tOPttf4qsWo8B J1TgeoF01ZeKcvSyvOXCKbfAN9sqURK2ZUTNThqZ//VPQmJP6fByrMJsbvTOSsQt HI+fFPrg1DC2KT8SzuGtWDRscHZ7MofvUKEQolVgkGwp8u68t/RAAwDpUdqIajzi yfp9qSDD+9uMeyiLa4rrAr2ATGohNBa0qha95slgvSepXbYKuHG5b4fWMsG7z4Uc dqE2vK8cQma1nsAeQBaq2/89294TOHEzKyspesfCBCnKQ3q+l9xelYRdvapj1CH/ cfUZf2/6X3VHN1P88RfRrPubswmrcOCEBT41upa2WKRDJ1GS6YhL6LJnrZSTjfe+ KsfNVS1D+KqSKiK0hfk6YK6O88mMGeAKQs3Ap8WthBLf0QIDAQABo4IBGjCCARYw DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPU1Az5OFOQJLHPxaEt7f6LF+dV8w gdMGA1UdIwSByzCByIAUPU1Az5OFOQJLHPxaEt7f6LF+dV+hgaykgakwgaYxLTAr BgNVBAMMJFNVU0UgTGludXggRW50ZXJwcmlzZSBTZWN1cmUgQm9vdCBDQTELMAkG A1UEBhMCREUxEjAQBgNVBAcMCU51cmVtYmVyZzEhMB8GA1UECgwYU1VTRSBMaW51 eCBQcm9kdWN0cyBHbWJIMRMwEQYDVQQLDApCdWlsZCBUZWFtMRwwGgYJKoZIhvcN AQkBFg1idWlsZEBzdXNlLmRlggEBMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0B AQsFAAOCAgEANtdMT47CjQtuERYa5jfygIO5F+urB4fl8pYcQQ/hTPE0KtAnAtrS 1strtMrVQ1t7Wu3fVbWYA6MZMXXkcwyyNbaWfj6roaSC6G5ZqCJ69oSyzaCbyaTI eOgzIIiVGOAj7tiM6T88Xp9qx4Xa3F6UQHF6xfwBT3nNKerGKOG01p7mBfBewwO5 Hxp7OAZmennUxV1uuT5/AsArxw9lMlawXhIAS7tRYHW+32D4tjHPDycldOw1hBjt z5JdehBiTmxhJ6onl0HSpsX84IMSbkeFIxLfxIF0TNas1pGnSGmh8FcV+ck9js3P yamJcNkgCstIwo3QZ2D5YdtQjOusyEuGjCIpDIQx36OMzeOo0SayOdzb2dSmcrHv 4DIkXDUELyIzu79A2R2KR7OQaGL6HGAVy6+yXHHygTbbUrb6ck2+aOG8913ChABc ZAiSFFRKVZzzj7FeIxZNA8GBUbhd20eQB2fUXDypeAnTG6P3dtTs84xNb1qGm3VC OAKjkWYQijLWmAOs9Q4NM/AXOeDTgXxA7iX7kWHRNeDbACirp7zM2ZOIP5ObIS6z yMqcG9DecSVbXiH3MJDTBoB1idQTTyreqpM/l6N8xNNVjEiLJGMEM1SeYq6S1lFV a+GcdOaLYkh7ya3I42l/tDOqH2OLIf7FEtocnc1xU6jTz8au1tZxec8= -----END CERTIFICATE----- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0