openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2014
- 1 participants
- 1539 discussions
Hello community,
here is the log from the commit of package seamonkey for openSUSE:Factory checked in at 2014-05-01 07:52:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/seamonkey (Old)
and /work/SRC/openSUSE:Factory/.seamonkey.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seamonkey"
Changes:
--------
--- /work/SRC/openSUSE:Factory/seamonkey/seamonkey.changes 2014-03-21 13:51:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey.changes 2014-05-01 07:52:32.000000000 +0200
@@ -1,0 +2,39 @@
+Tue Apr 29 06:43:16 UTC 2014 - wr(a)rosenauer.org
+
+- update to SeaMonkey 2.26 (bnc#875378)
+ * MFSA 2014-34/CVE-2014-1518/CVE-2014-1519
+ Miscellaneous memory safety hazards
+ * MFSA 2014-36/CVE-2014-1522 (bmo#995289)
+ Web Audio memory corruption issues
+ * MFSA 2014-37/CVE-2014-1523 (bmo#969226)
+ Out of bounds read while decoding JPG images
+ * MFSA 2014-38/CVE-2014-1524 (bmo#989183)
+ Buffer overflow when using non-XBL object as XBL
+ * MFSA 2014-39/CVE-2014-1525 (bmo#989210)
+ Use-after-free in the Text Track Manager for HTML video
+ * MFSA 2014-41/CVE-2014-1528 (bmo#963962)
+ Out-of-bounds write in Cairo
+ * MFSA 2014-42/CVE-2014-1529 (bmo#987003)
+ Privilege escalation through Web Notification API
+ * MFSA 2014-43/CVE-2014-1530 (bmo#895557)
+ Cross-site scripting (XSS) using history navigations
+ * MFSA 2014-44/CVE-2014-1531 (bmo#987140)
+ Use-after-free in imgLoader while resizing images
+ * MFSA 2014-45/CVE-2014-1492 (bmo#903885)
+ Incorrect IDNA domain name matching for wildcard certificates
+ (fixed by NSS 3.16)
+ * MFSA 2014-46/CVE-2014-1532 (bmo#966006)
+ Use-after-free in nsHostResolver
+ * MFSA 2014-47/CVE-2014-1526 (bmo#988106)
+ Debugger can bypass XrayWrappers with JavaScript
+- rebased patches
+- added aarch64 porting patches
+ * mozilla-aarch64-bmo-810631.patch
+ * mozilla-aarch64-bmo-962488.patch
+ * mozilla-aarch64-bmo-963023.patch
+ * mozilla-aarch64-bmo-963024.patch
+ * mozilla-aarch64-bmo-963027.patch
+- requires NSPR 4.10.3 and NSS 3.16
+- added mozilla-icu-strncat.patch to fix post build checks
+
+-------------------------------------------------------------------
Old:
----
l10n-2.25.tar.bz2
seamonkey-2.25-source.tar.bz2
New:
----
l10n-2.26.tar.bz2
mozilla-aarch64-bmo-810631.patch
mozilla-aarch64-bmo-962488.patch
mozilla-aarch64-bmo-963023.patch
mozilla-aarch64-bmo-963024.patch
mozilla-aarch64-bmo-963027.patch
mozilla-icu-strncat.patch
seamonkey-2.26-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.YRgqjk/_old 2014-05-01 07:52:38.000000000 +0200
+++ /var/tmp/diff_new_pack.YRgqjk/_new 2014-05-01 07:52:38.000000000 +0200
@@ -55,9 +55,9 @@
%endif
Provides: web_browser
Provides: browser(npapi)
-Version: 2.25
+Version: 2.26
Release: 0
-%define releasedate 2014031800
+%define releasedate 2014042800
Summary: The successor of the Mozilla Application Suite
License: MPL-2.0
Group: Productivity/Networking/Web/Browsers
@@ -81,6 +81,7 @@
Patch7: mozilla-ntlm-full-path.patch
Patch8: mozilla-ua-locale.patch
Patch9: mozilla-ppc.patch
+Patch11: mozilla-icu-strncat.patch
Patch12: mozilla-libproxy-compat.patch
Patch13: mozilla-ppc64le-build.patch
Patch14: mozilla-ppc64le-javascript.patch
@@ -88,7 +89,13 @@
Patch16: mozilla-ppc64le-mfbt.patch
Patch17: mozilla-ppc64le-webrtc.patch
Patch18: mozilla-ppc64le-xpcom.patch
-Patch20: seamonkey-ua-locale.patch
+# Gecko/Toolkit AArch64 Porting
+Patch30: mozilla-aarch64-bmo-810631.patch
+Patch31: mozilla-aarch64-bmo-962488.patch
+Patch32: mozilla-aarch64-bmo-963027.patch
+Patch33: mozilla-aarch64-bmo-963023.patch
+Patch34: mozilla-aarch64-bmo-963024.patch
+Patch100: seamonkey-ua-locale.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /bin/sh coreutils
Provides: seamonkey-mail = %{version}
@@ -111,9 +118,9 @@
%global __find_provides %provfind
# the following conditions are always met in Factory by definition
# so using %opensuse_bs is secure for now
-BuildRequires: mozilla-nspr-devel >= 4.10.2
+BuildRequires: mozilla-nspr-devel >= 4.10.3
PreReq: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
-BuildRequires: mozilla-nss-devel >= 3.15.5
+BuildRequires: mozilla-nss-devel >= 3.16
PreReq: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
%description
@@ -193,6 +200,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
@@ -200,9 +208,14 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
popd
# comm patches
-%patch20 -p1
+%patch100 -p1
%build
# no need to add build time to binaries
@@ -227,7 +240,7 @@
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZ_MILESTONE_RELEASE=1
mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs}
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
ac_add_options --enable-application=suite
ac_add_options --libdir=%{progdir}
ac_add_options --prefix=%{prefix}
@@ -266,11 +279,11 @@
#
%install
-cd ../obj
+cd obj*
make -C suite/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
# copy tree into RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{progdir}
-cp -rf $RPM_BUILD_DIR/obj/mozilla/dist/seamonkey/* $RPM_BUILD_ROOT%{progdir}
+cp -rf $RPM_BUILD_DIR/seamonkey/obj*/mozilla/dist/seamonkey/* $RPM_BUILD_ROOT%{progdir}
# remove some executable permissions
find $RPM_BUILD_ROOT%{progdir} \
-name "*.js" -o \
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.YRgqjk/_old 2014-05-01 07:52:38.000000000 +0200
+++ /var/tmp/diff_new_pack.YRgqjk/_new 2014-05-01 07:52:38.000000000 +0200
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="SEAMONKEY_2_25_RELEASE"
-VERSION="2.25"
+RELEASE_TAG="SEAMONKEY_2_26_RELEASE"
+VERSION="2.26"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH seamonkey
++++++ l10n-2.25.tar.bz2 -> l10n-2.26.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/seamonkey/l10n-2.25.tar.bz2 /work/SRC/openSUSE:Factory/.seamonkey.new/l10n-2.26.tar.bz2 differ: char 11, line 1
++++++ mozilla-aarch64-bmo-810631.patch ++++++
++++ 100372 lines (skipped)
++++++ mozilla-aarch64-bmo-962488.patch ++++++
# HG changeset patch
# User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
# Date 1393440196 18000
# Node ID 6a46f53ad944b44385398822d7bcf7621a785d91
# Parent 0aa56e2a5f816a30da48701f73d03060ee9692b2
Bug 962488 - Update double-conversion for proper AArch64 support. r=froydnj
Fix imported from upstream repository:
https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6…
diff --git a/mfbt/double-conversion/fix-aarch64-macro.patch b/mfbt/double-conversion/fix-aarch64-macro.patch
new file mode 100644
--- /dev/null
+++ b/mfbt/double-conversion/fix-aarch64-macro.patch
@@ -0,0 +1,23 @@
+Backport from upstream.
+
+https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6d218f3056b4c24a109d367561
+
+---
+ mfbt/double-conversion/utils.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mfbt/double-conversion/utils.h
++++ b/mfbt/double-conversion/utils.h
+@@ -58,11 +58,11 @@
+ defined(__mips__) || \
+ defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
+ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+ defined(__SH4__) || defined(__alpha__) || \
+ defined(_MIPS_ARCH_MIPS32R2) || \
+- defined(_AARCH64EL_)
++ defined(__AARCH64EL__)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
+ #if defined(_WIN32)
+ // Windows uses a 64bit wide floating point stack.
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
diff --git a/mfbt/double-conversion/update.sh b/mfbt/double-conversion/update.sh
--- a/mfbt/double-conversion/update.sh
+++ b/mfbt/double-conversion/update.sh
@@ -15,9 +15,12 @@ cp $1/src/*.h ./
# Source
cp $1/src/*.cc ./
patch -p3 < add-mfbt-api-markers.patch
patch -p3 < use-StandardInteger.patch
patch -p3 < use-mozilla-assertions.patch
patch -p3 < use-static_assert.patch
-patch -p3 < ToPrecision-exponential.patch
\ No newline at end of file
+patch -p3 < ToPrecision-exponential.patch
+
+# Merged upstream, part of 2.0.1 version
+patch -p3 < fix-aarch64-macro.patch
diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
--- a/mfbt/double-conversion/utils.h
+++ b/mfbt/double-conversion/utils.h
@@ -55,17 +55,17 @@
#if defined(_M_X64) || defined(__x86_64__) || \
defined(__ARMEL__) || defined(__avr32__) || \
defined(__hppa__) || defined(__ia64__) || \
defined(__mips__) || \
defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
defined(__SH4__) || defined(__alpha__) || \
defined(_MIPS_ARCH_MIPS32R2) || \
- defined(_AARCH64EL_)
+ defined(__AARCH64EL__)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
#if defined(_WIN32)
// Windows uses a 64bit wide floating point stack.
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#else
#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
#endif // _WIN32
++++++ mozilla-aarch64-bmo-963023.patch ++++++
# HG changeset patch
# User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
# Date 1392217668 18000
# Node ID 4e9b713f435ade266a68a8d7ba08aad65c3fa6c5
# Parent 282b6e88f9d4c2367a72836f6f9efeab2aadaa58
Bug 963023 - AArch64 support for libevent. r=froydnj
diff --git a/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch b/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch
new file mode 100644
--- /dev/null
+++ b/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch
@@ -0,0 +1,43 @@
+---
+ ipc/chromium/src/third_party/libevent/epoll_sub.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- mozilla-central.orig/ipc/chromium/src/third_party/libevent/epoll_sub.c
++++ mozilla-central/ipc/chromium/src/third_party/libevent/epoll_sub.c
+@@ -29,15 +29,24 @@
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/syscall.h>
+ #include <sys/epoll.h>
+ #include <unistd.h>
++#include <errno.h>
+
+ int
+ epoll_create(int size)
+ {
++#if !defined(__NR_epoll_create) && defined(__NR_epoll_create1)
++ if (size <= 0) {
++ errno = EINVAL;
++ return -1;
++ }
++ return (syscall(__NR_epoll_create1, 0));
++#else
+ return (syscall(__NR_epoll_create, size));
++#endif
+ }
+
+ int
+ epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
+ {
+@@ -46,7 +55,11 @@ epoll_ctl(int epfd, int op, int fd, stru
+ }
+
+ int
+ epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
+ {
++#if !defined(__NR_epoll_wait) && defined(__NR_epoll_pwait)
++ return (syscall(__NR_epoll_pwait, epfd, events, maxevents, timeout, NULL, 0));
++#else
+ return (syscall(__NR_epoll_wait, epfd, events, maxevents, timeout));
++#endif
+ }
diff --git a/ipc/chromium/src/third_party/libevent/README.mozilla b/ipc/chromium/src/third_party/libevent/README.mozilla
--- a/ipc/chromium/src/third_party/libevent/README.mozilla
+++ b/ipc/chromium/src/third_party/libevent/README.mozilla
@@ -8,8 +8,10 @@ android/event2/event-config.h
These files are taken from libevent-2.0.21-stable built on the development environment indicated by the first path component. You have to run "./configure" and "make" to get all of the pre-processing done. The file can then be found in "include/event2/".
2. This is ugly, prepare yourself. OS X has a weird problem with how the "TAILQ_END(head)" is used, causing a linking error. Just replace all use of the "TAILQ_END(head)" macro with "NULL".
3. Apply "add mac-arc4random-buf.patch", which removes some bad OS X compatibility code. This will allow libevent to compile on all supported versions of OS X.
4. Apply "openbsd-no-arc4random_addrandom.patch", which fixes the build on OpenBSD (which doesnt provide arc4random_addrandom anymore, see #931354)
+
+5. Apply "libevent-use-non-deprecated-syscalls.patch", which fixes the build on AArch64 architecture (which does not provide deprecated syscalls)
diff --git a/ipc/chromium/src/third_party/libevent/epoll_sub.c b/ipc/chromium/src/third_party/libevent/epoll_sub.c
--- a/ipc/chromium/src/third_party/libevent/epoll_sub.c
+++ b/ipc/chromium/src/third_party/libevent/epoll_sub.c
@@ -26,27 +26,40 @@
*/
#include <stdint.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/epoll.h>
#include <unistd.h>
+#include <errno.h>
int
epoll_create(int size)
{
+#if !defined(__NR_epoll_create) && defined(__NR_epoll_create1)
+ if (size <= 0) {
+ errno = EINVAL;
+ return -1;
+ }
+ return (syscall(__NR_epoll_create1, 0));
+#else
return (syscall(__NR_epoll_create, size));
+#endif
}
int
epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
{
return (syscall(__NR_epoll_ctl, epfd, op, fd, event));
}
int
epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
{
+#if !defined(__NR_epoll_wait) && defined(__NR_epoll_pwait)
+ return (syscall(__NR_epoll_pwait, epfd, events, maxevents, timeout, NULL, 0));
+#else
return (syscall(__NR_epoll_wait, epfd, events, maxevents, timeout));
+#endif
}
++++++ mozilla-aarch64-bmo-963024.patch ++++++
# HG changeset patch
# User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
# Date 1393440196 18000
# Node ID d56b5c1a557348d4ac14a4d1ea7a5b5d240e3647
# Parent 6a46f53ad944b44385398822d7bcf7621a785d91
Bug 963024 - AArch64 support for XPCOM. r=froydnj
diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -144,16 +144,23 @@ if CONFIG['OS_ARCH'] == 'NetBSD':
if CONFIG['OS_TEST'] in ('amiga', 'atari', 'hp300', 'mac68k', 'mvme68k',
'next68k', 'sun3', 'sun3x', 'x68k'):
SOURCES += [
'xptcinvoke_netbsd_m68k.cpp',
'xptcstubs_netbsd_m68k.cpp'
]
if CONFIG['OS_ARCH'] == 'Linux':
+ if CONFIG['OS_TEST'] == 'aarch64':
+ SOURCES += [
+ 'xptcinvoke_aarch64.cpp',
+ 'xptcinvoke_asm_aarch64.s',
+ 'xptcstubs_aarch64.cpp',
+ 'xptcstubs_asm_aarch64.s',
+ ]
if CONFIG['OS_TEST'] == 'm68k':
SOURCES += [
'xptcinvoke_linux_m68k.cpp',
'xptcstubs_linux_m68k.cpp',
]
if CONFIG['OS_TEST'].find('mips') != -1:
if CONFIG['OS_TEST'].find('mips64') != -1:
SOURCES += [
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp
new file mode 100644
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp
@@ -0,0 +1,136 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
+
+/* Platform specific code to invoke XPCOM methods on native objects */
+
+#include "xptcprivate.h"
+
+#if !defined(__aarch64__)
+#error "This code is for Linux AArch64 only."
+#endif
+
+
+/* "Procedure Call Standard for the ARM 64-bit Architecture" document, sections
+ * "5.4 Parameter Passing" and "6.1.2 Procedure Calling" contain all the
+ * needed information.
+ *
+ * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf
+ */
+
+#ifndef __AARCH64EL__
+#error "Only little endian compatibility was tested"
+#endif
+
+/*
+ * Allocation of integer function arguments initially to registers r1-r7
+ * and then to stack. Handling of 'that' argument which goes to register r0
+ * is handled separately and does not belong here.
+ *
+ * 'ireg_args' - pointer to the current position in the buffer,
+ * corresponding to the register arguments
+ * 'stack_args' - pointer to the current position in the buffer,
+ * corresponding to the arguments on stack
+ * 'end' - pointer to the end of the registers argument
+ * buffer.
+ */
+static inline void alloc_word(uint64_t* &ireg_args,
+ uint64_t* &stack_args,
+ uint64_t* end,
+ uint64_t data)
+{
+ if (ireg_args < end) {
+ *ireg_args = data;
+ ireg_args++;
+ } else {
+ *stack_args = data;
+ stack_args++;
+ }
+}
+
+static inline void alloc_double(double* &freg_args,
+ uint64_t* &stack_args,
+ double* end,
+ double data)
+{
+ if (freg_args < end) {
+ *freg_args = data;
+ freg_args++;
+ } else {
+ memcpy(stack_args, &data, sizeof(data));
+ stack_args++;
+ }
+}
+
+static inline void alloc_float(double* &freg_args,
+ uint64_t* &stack_args,
+ double* end,
+ float data)
+{
+ if (freg_args < end) {
+ memcpy(freg_args, &data, sizeof(data));
+ freg_args++;
+ } else {
+ memcpy(stack_args, &data, sizeof(data));
+ stack_args++;
+ }
+}
+
+
+extern "C" void
+invoke_copy_to_stack(uint64_t* stk, uint64_t *end,
+ uint32_t paramCount, nsXPTCVariant* s)
+{
+ uint64_t *ireg_args = stk;
+ uint64_t *ireg_end = ireg_args + 8;
+ double *freg_args = (double *)ireg_end;
+ double *freg_end = freg_args + 8;
+ uint64_t *stack_args = (uint64_t *)freg_end;
+
+ // leave room for 'that' argument in x0
+ ++ireg_args;
+
+ for (uint32_t i = 0; i < paramCount; i++, s++) {
+ if (s->IsPtrData()) {
+ alloc_word(ireg_args, stack_args, ireg_end, (uint64_t)s->ptr);
+ continue;
+ }
+ // According to the ABI, integral types that are smaller than 8 bytes
+ // are to be passed in 8-byte registers or 8-byte stack slots.
+ switch (s->type) {
+ case nsXPTType::T_FLOAT:
+ alloc_float(freg_args, stack_args, freg_end, s->val.f);
+ break;
+ case nsXPTType::T_DOUBLE:
+ alloc_double(freg_args, stack_args, freg_end, s->val.d);
+ break;
+ case nsXPTType::T_I8: alloc_word(ireg_args, stk, end, s->val.i8); break;
+ case nsXPTType::T_I16: alloc_word(ireg_args, stk, end, s->val.i16); break;
+ case nsXPTType::T_I32: alloc_word(ireg_args, stk, end, s->val.i32); break;
+ case nsXPTType::T_I64: alloc_word(ireg_args, stk, end, s->val.i64); break;
+ case nsXPTType::T_U8: alloc_word(ireg_args, stk, end, s->val.u8); break;
+ case nsXPTType::T_U16: alloc_word(ireg_args, stk, end, s->val.u16); break;
+ case nsXPTType::T_U32: alloc_word(ireg_args, stk, end, s->val.u32); break;
+ case nsXPTType::T_U64: alloc_word(ireg_args, stk, end, s->val.u64); break;
+ case nsXPTType::T_BOOL: alloc_word(ireg_args, stk, end, s->val.b); break;
+ case nsXPTType::T_CHAR: alloc_word(ireg_args, stk, end, s->val.c); break;
+ case nsXPTType::T_WCHAR: alloc_word(ireg_args, stk, end, s->val.wc); break;
+ default:
+ // all the others are plain pointer types
+ alloc_word(ireg_args, stack_args, ireg_end,
+ reinterpret_cast<uint64_t>(s->val.p));
+ break;
+ }
+ }
+}
+
+extern "C" nsresult _NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
+ uint32_t paramCount, nsXPTCVariant* params);
+
+EXPORT_XPCOM_API(nsresult)
+NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
+ uint32_t paramCount, nsXPTCVariant* params)
+{
+ return _NS_InvokeByIndex(that, methodIndex, paramCount, params);
+}
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s
new file mode 100644
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s
@@ -0,0 +1,67 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
+
+ .section ".text"
+ .globl _NS_InvokeByIndex
+ .type _NS_InvokeByIndex,@function
+
+/*
+ * _NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
+ * uint32_t paramCount, nsXPTCVariant* params)
+ */
+
+_NS_InvokeByIndex:
+ # set up frame
+ stp x29, x30, [sp,#-32]!
+ mov x29, sp
+ stp x19, x20, [sp,#16]
+
+ # save methodIndex across function calls
+ mov w20, w1
+
+ # end of stack area passed to invoke_copy_to_stack
+ mov x1, sp
+
+ # assume 8 bytes of stack for each argument with 16-byte alignment
+ add w19, w2, #1
+ and w19, w19, #0xfffffffe
+ sub sp, sp, w19, uxth #3
+
+ # temporary place to store args passed in r0-r7,v0-v7
+ sub sp, sp, #128
+
+ # save 'that' on stack
+ str x0, [sp]
+
+ # start of stack area passed to invoke_copy_to_stack
+ mov x0, sp
+ bl invoke_copy_to_stack
+
+ # load arguments passed in r0-r7
+ ldp x6, x7, [sp, #48]
+ ldp x4, x5, [sp, #32]
+ ldp x2, x3, [sp, #16]
+ ldp x0, x1, [sp],#64
+
+ # load arguments passed in v0-v7
+ ldp d6, d7, [sp, #48]
+ ldp d4, d5, [sp, #32]
+ ldp d2, d3, [sp, #16]
+ ldp d0, d1, [sp],#64
+
+ # call the method
+ ldr x16, [x0]
+ add x16, x16, w20, uxth #3
+ ldr x16, [x16]
+ blr x16
+
+ add sp, sp, w19, uxth #3
+ ldp x19, x20, [sp,#16]
+ ldp x29, x30, [sp],#32
+ ret
+
+ .size _NS_InvokeByIndex, . - _NS_InvokeByIndex
+
+
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp
new file mode 100644
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp
@@ -0,0 +1,219 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
+
+#include "xptcprivate.h"
+#include "xptiprivate.h"
+
+#ifndef __AARCH64EL__
+#error "Only little endian compatibility was tested"
+#endif
+
+/*
+ * This is for AArch64 ABI
+ *
+ * When we're called, the "gp" registers are stored in gprData and
+ * the "fp" registers are stored in fprData. Each array has 8 regs
+ * but first reg in gprData is a placeholder for 'self'.
+ */
+extern "C" nsresult
+PrepareAndDispatch(nsXPTCStubBase* self, uint32_t methodIndex, uint64_t* args,
+ uint64_t *gprData, double *fprData)
+{
+#define PARAM_BUFFER_COUNT 16
+#define PARAM_GPR_COUNT 8
+#define PARAM_FPR_COUNT 8
+
+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+ nsXPTCMiniVariant* dispatchParams = NULL;
+ const nsXPTMethodInfo* info;
+ nsresult result = NS_ERROR_FAILURE;
+
+ NS_ASSERTION(self,"no self");
+
+ self->mEntry->GetMethodInfo(uint16_t(methodIndex), &info);
+ NS_ASSERTION(info,"no method info");
+
+ uint32_t paramCount = info->GetParamCount();
+
+ // setup variant array pointer
+ if (paramCount > PARAM_BUFFER_COUNT) {
+ dispatchParams = new nsXPTCMiniVariant[paramCount];
+ } else {
+ dispatchParams = paramBuffer;
+ }
+ NS_ASSERTION(dispatchParams,"no place for params");
+
+ uint64_t* ap = args;
+ uint32_t next_gpr = 1; // skip first arg which is 'self'
+ uint32_t next_fpr = 0;
+ for (uint32_t i = 0; i < paramCount; i++) {
+ const nsXPTParamInfo& param = info->GetParam(i);
+ const nsXPTType& type = param.GetType();
+ nsXPTCMiniVariant* dp = &dispatchParams[i];
+
+ if (param.IsOut() || !type.IsArithmetic()) {
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.p = (void*)gprData[next_gpr++];
+ } else {
+ dp->val.p = (void*)*ap++;
+ }
+ continue;
+ }
+
+ switch (type) {
+ case nsXPTType::T_I8:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.i8 = (int8_t)gprData[next_gpr++];
+ } else {
+ dp->val.i8 = (int8_t)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_I16:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.i16 = (int16_t)gprData[next_gpr++];
+ } else {
+ dp->val.i16 = (int16_t)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_I32:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.i32 = (int32_t)gprData[next_gpr++];
+ } else {
+ dp->val.i32 = (int32_t)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_I64:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.i64 = (int64_t)gprData[next_gpr++];
+ } else {
+ dp->val.i64 = (int64_t)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_U8:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.u8 = (uint8_t)gprData[next_gpr++];
+ } else {
+ dp->val.u8 = (uint8_t)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_U16:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.u16 = (uint16_t)gprData[next_gpr++];
+ } else {
+ dp->val.u16 = (uint16_t)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_U32:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.u32 = (uint32_t)gprData[next_gpr++];
+ } else {
+ dp->val.u32 = (uint32_t)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_U64:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.u64 = (uint64_t)gprData[next_gpr++];
+ } else {
+ dp->val.u64 = (uint64_t)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_FLOAT:
+ if (next_fpr < PARAM_FPR_COUNT) {
+ memcpy(&dp->val.f, &fprData[next_fpr++], sizeof(dp->val.f));
+ } else {
+ memcpy(&dp->val.f, ap++, sizeof(dp->val.f));
+ }
+ break;
+
+ case nsXPTType::T_DOUBLE:
+ if (next_fpr < PARAM_FPR_COUNT) {
+ memcpy(&dp->val.d, &fprData[next_fpr++], sizeof(dp->val.d));
+ } else {
+ memcpy(&dp->val.d, ap++, sizeof(dp->val.d));
+ }
+ break;
+
+ case nsXPTType::T_BOOL:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.b = (bool)gprData[next_gpr++];
+ } else {
+ dp->val.b = (bool)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_CHAR:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.c = (char)gprData[next_gpr++];
+ } else {
+ dp->val.c = (char)*ap++;
+ }
+ break;
+
+ case nsXPTType::T_WCHAR:
+ if (next_gpr < PARAM_GPR_COUNT) {
+ dp->val.wc = (wchar_t)gprData[next_gpr++];
+ } else {
+ dp->val.wc = (wchar_t)*ap++;
+ }
+ break;
+
+ default:
+ NS_ASSERTION(0, "bad type");
+ break;
+ }
+ }
+
+ result = self->mOuter->CallMethod((uint16_t)methodIndex, info, dispatchParams);
+
+ if (dispatchParams != paramBuffer) {
+ delete [] dispatchParams;
+ }
+
+ return result;
+}
+
+// Load w17 with the constant 'n' and branch to SharedStub().
+# define STUB_ENTRY(n) \
+ __asm__ ( \
+ ".section \".text\" \n\t" \
+ ".align 2\n\t" \
+ ".if "#n" < 10 \n\t" \
+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
+ ".hidden _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \
+ "_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \
+ ".elseif "#n" < 100 \n\t" \
+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
+ ".hidden _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \
+ "_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \
+ ".elseif "#n" < 1000 \n\t" \
+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
+ ".hidden _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \
+ "_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \
+ ".else \n\t" \
+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \
+ ".endif \n\t" \
+ "mov w17,#"#n" \n\t" \
+ "b SharedStub \n" \
+);
+
+#define SENTINEL_ENTRY(n) \
+ nsresult nsXPTCStubBase::Sentinel##n() \
+{ \
+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
+ return NS_ERROR_NOT_IMPLEMENTED; \
+}
+
+#include "xptcstubsdef.inc"
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s
new file mode 100644
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s
@@ -0,0 +1,39 @@
+# 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/.
+
+ .set NGPREGS,8
+ .set NFPREGS,8
+
+ .section ".text"
+ .globl SharedStub
+ .hidden SharedStub
+ .type SharedStub,@function
+SharedStub:
+ stp x29, x30, [sp,#-16]!
+ mov x29, sp
+
+ sub sp, sp, #8*(NGPREGS+NFPREGS)
+ stp x0, x1, [sp, #64+(0*8)]
+ stp x2, x3, [sp, #64+(2*8)]
+ stp x4, x5, [sp, #64+(4*8)]
+ stp x6, x7, [sp, #64+(6*8)]
+ stp d0, d1, [sp, #(0*8)]
+ stp d2, d3, [sp, #(2*8)]
+ stp d4, d5, [sp, #(4*8)]
+ stp d6, d7, [sp, #(6*8)]
+
+ # methodIndex passed from stub
+ mov w1, w17
+
+ add x2, sp, #16+(8*(NGPREGS+NFPREGS))
+ add x3, sp, #8*NFPREGS
+ add x4, sp, #0
+
+ bl PrepareAndDispatch
+
+ add sp, sp, #8*(NGPREGS+NFPREGS)
+ ldp x29, x30, [sp],#16
+ ret
+
+ .size SharedStub, . - SharedStub
++++++ mozilla-aarch64-bmo-963027.patch ++++++
# HG changeset patch
# User Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
# Date 1392218661 18000
# Node ID 38fca44b6b86e2f12535900e2084f0378217570f
# Parent 8858624d813a6200b059590c146cf774fc16ff38
Bug 963027 - AArch64 support for WebRTC. r=derf
Index: mozilla/media/webrtc/trunk/webrtc/typedefs.h
===================================================================
--- mozilla.orig/media/webrtc/trunk/webrtc/typedefs.h
+++ mozilla/media/webrtc/trunk/webrtc/typedefs.h
@@ -113,6 +113,16 @@
#define WEBRTC_ARCH_32_BITS 1
#define WEBRTC_ARCH_BIG_ENDIAN
#define WEBRTC_BIG_ENDIAN
+#elif defined(__aarch64__)
+#define WEBRTC_ARCH_AARCH64 1
+#define WEBRTC_ARCH_64_BITS 1
+#if defined(__AARCH64EL__)
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#define WEBRTC_LITTLE_ENDIAN
+#elif defined(__AARCH64EB__)
+#define WEBRTC_ARCH_BIG_ENDIAN
+#define WEBRTC_BIG_ENDIAN
+#endif
#elif defined(__alpha__)
#define WEBRTC_ARCH_ALPHA 1
#define WEBRTC_ARCH_64_BITS 1
++++++ mozilla-icu-strncat.patch ++++++
# HG changeset patch
# Parent 29be2a4daa0f512d22bde85b97b5460839026571
# User Wolfgang Rosenauer <wr(a)rosenauer.org>
From: Jan Engelhardt <jengelh(a)inai.de>
Reference: http://bugs.icu-project.org/trac/ticket/7808
diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp
--- a/intl/icu/source/tools/pkgdata/pkgdata.cpp
+++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp
@@ -1975,22 +1975,22 @@ static void loadLists(UPKGOptions *o, UE
FILE *p = NULL;
size_t n;
static char buf[512] = "";
char cmdBuf[1024];
UErrorCode status = U_ZERO_ERROR;
const char cmd[] = "icu-config --incpkgdatafile";
/* #1 try the same path where pkgdata was called from. */
- findDirname(progname, cmdBuf, 1024, &status);
+ findDirname(progname, cmdBuf, sizeof(cmdBuf), &status);
if(U_SUCCESS(status)) {
if (cmdBuf[0] != 0) {
- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
+ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf));
}
- uprv_strncat(cmdBuf, cmd, 1024);
+ uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf));
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
}
p = popen(cmdBuf, "r");
}
if(p == NULL || (n = fread(buf, 1, 511, p)) <= 0) {
++++++ mozilla-ppc64le-build.patch ++++++
++++ 2554 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/seamonkey/mozilla-ppc64le-build.patch
++++ and /work/SRC/openSUSE:Factory/.seamonkey.new/mozilla-ppc64le-build.patch
++++++ mozilla-ppc64le-mfbt.patch ++++++
--- /var/tmp/diff_new_pack.YRgqjk/_old 2014-05-01 07:52:38.000000000 +0200
+++ /var/tmp/diff_new_pack.YRgqjk/_new 2014-05-01 07:52:38.000000000 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 147a75fe8f8e4a43b66f9716659e1209d7f5a950
+# Parent 46508a61b834f02575c116a508aa37b66d50bd20
# User Ulrich Weigand <uweigand(a)de.ibm.com>
Bug 976648 - powerpc64le-linux support - mfbt endian config
@@ -38,7 +38,7 @@
- defined(__ppc__) || defined(__hppa) || \
+ defined(_POWER) || defined(__hppa) || \
defined(_MIPSEB) || defined(__ARMEB__) || \
- defined(__s390__) || \
+ defined(__s390__) || defined(__AARCH64EB__) || \
(defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
(defined(__ia64) && defined(__BIG_ENDIAN__))
# define MOZ_BIG_ENDIAN 1
++++++ mozilla-ppc64le-xpcom.patch ++++++
--- /var/tmp/diff_new_pack.YRgqjk/_old 2014-05-01 07:52:38.000000000 +0200
+++ /var/tmp/diff_new_pack.YRgqjk/_new 2014-05-01 07:52:38.000000000 +0200
@@ -3,42 +3,32 @@
# User Ulrich Weigand <uweigand(a)de.ibm.com>
Bug 976648 - powerpc64le-linux support - xptcall port
-diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build
---- a/xpcom/reflect/xptcall/src/md/unix/moz.build
-+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
-@@ -228,16 +228,23 @@ if CONFIG['OS_TEST'] == 'powerpc64':
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/moz.build
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
+@@ -224,12 +224,12 @@ if CONFIG['OS_TEST'] == 'powerpc':
+ 'xptcstubs_ppc_linux.cpp',
+ ]
+
+-if CONFIG['OS_TEST'] == 'powerpc64':
++if CONFIG['OS_TEST'] in ('powerpc64', 'powerpc64le'):
if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
SOURCES += [
- 'xptcinvoke_asm_ppc64_linux.s',
+- 'xptcinvoke_asm_ppc64_linux.s',
++ 'xptcinvoke_asm_ppc64_linux.S',
'xptcinvoke_ppc64_linux.cpp',
- 'xptcstubs_asm_ppc64_linux.s',
+- 'xptcstubs_asm_ppc64_linux.s',
++ 'xptcstubs_asm_ppc64_linux.S',
'xptcstubs_ppc64_linux.cpp',
]
-+if CONFIG['OS_TEST'] == 'powerpc64le':
-+ if CONFIG['OS_ARCH'] == 'Linux':
-+ CPP_SOURCES += [
-+ 'xptcinvoke_ppc64_linux.cpp',
-+ 'xptcstubs_ppc64_linux.cpp',
-+ ]
-+
- if CONFIG['OS_TEST'] in ('macppc', 'bebox', 'ofppc', 'prep', 'amigappc'):
- if CONFIG['OS_ARCH'] == 'NetBSD':
- SOURCES += [
- 'xptcinvoke_asm_ppc_netbsd.s',
- 'xptcinvoke_ppc_netbsd.cpp',
- 'xptcstubs_asm_ppc_netbsd.s',
- 'xptcstubs_ppc_netbsd.cpp',
- ]
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
+rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+rename to xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
-@@ -12,90 +12,121 @@
- .set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
- .set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
- .set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
- .set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
- .set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
++++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
+@@ -17,12 +17,38 @@
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
.set f30,30; .set f31,31
@@ -77,11 +67,7 @@
.section ".toc","aw"
.section ".text"
.align 2
- .globl NS_InvokeByIndex
- .section ".opd","aw"
- .align 3
- NS_InvokeByIndex:
- .quad .NS_InvokeByIndex,.TOC.@tocbase
+@@ -34,6 +60,7 @@ NS_InvokeByIndex:
.previous
.type NS_InvokeByIndex,@function
.NS_InvokeByIndex:
@@ -89,16 +75,7 @@
mflr 0
std 0,16(r1)
- std r29,-24(r1)
- std r30,-16(r1)
- std r31,-8(r1)
-
- mr r29,r3 # Save 'that' in r29
- mr r30,r4 # Save 'methodIndex' in r30
- mr r31,r1 # Save old frame
-
- # Allocate stack frame with space for params. Since at least the
- # first 7 parameters (not including 'that') will be in registers,
+@@ -50,13 +77,12 @@ NS_InvokeByIndex:
# we don't actually need stack space for those. We must ensure
# that the stack remains 16-byte aligned.
#
@@ -116,10 +93,7 @@
rldicr r7,r7,3,59 # multiply by 8 and mask with ~15
neg r7,r7
stdux r1,r1,r7
-
-
- # Call invoke_copy_to_stack(uint64_t* gpregs, double* fpregs,
- # uint32_t paramCount, nsXPTCVariant* s,
+@@ -67,12 +93,13 @@ NS_InvokeByIndex:
# uint64_t* d))
# r5, r6 are passed through intact (paramCount, params)
@@ -135,10 +109,7 @@
bl invoke_copy_to_stack
nop
- # Set up to invoke function
-
- ld r9,0(r29) # vtable (r29 is 'that')
- mr r3,r29 # self is first arg, obviously
+@@ -83,14 +110,18 @@ NS_InvokeByIndex:
sldi r30,r30,3 # Find function descriptor
add r9,r9,r30
@@ -162,17 +133,7 @@
# Load FP and GP registers as required
ld r4, -(23*8)(r31)
- ld r5, -(22*8)(r31)
- ld r6, -(21*8)(r31)
- ld r7, -(20*8)(r31)
- ld r8, -(19*8)(r31)
- ld r9, -(18*8)(r31)
-@@ -112,21 +143,25 @@ NS_InvokeByIndex:
- lfd f9, -(8*8)(r31)
- lfd f10, -(7*8)(r31)
- lfd f11, -(6*8)(r31)
- lfd f12, -(5*8)(r31)
- lfd f13, -(4*8)(r31)
+@@ -117,7 +148,7 @@ NS_InvokeByIndex:
bctrl # Do it
@@ -181,8 +142,7 @@
ld r1,0(r1) # Revert stack frame
ld 0,16(r1) # Reload lr
ld 29,-24(r1) # Restore NVGPRS
- ld 30,-16(r1)
- ld 31,-8(r1)
+@@ -126,7 +157,11 @@ NS_InvokeByIndex:
mtlr 0
blr
@@ -194,15 +154,11 @@
# Magic indicating no need for an executable stack
.section .note.GNU-stack, "", @progbits ; .previous
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
---- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
-@@ -69,17 +69,19 @@ invoke_copy_to_stack(uint64_t* gpregs,
- else
- *(double *)d = s->val.d;
- }
- else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
- if (i < FPR_COUNT) {
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
+@@ -74,7 +74,9 @@ invoke_copy_to_stack(uint64_t* gpregs,
fpregs[i] = s->val.f; // if passed in registers, floats are promoted to doubles
} else {
float *p = (float *)d;
@@ -212,20 +168,12 @@
*p = s->val.f;
}
}
- else {
- if (i < GPR_COUNT)
- gpregs[i] = tempu64;
- else
- *d = tempu64;
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
+diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
+rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
+rename to xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-@@ -12,28 +12,50 @@
- .set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
- .set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
- .set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
- .set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
- .set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
++++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
+@@ -17,6 +17,27 @@
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
.set f30,30; .set f31,31
@@ -253,12 +201,7 @@
.section ".text"
.align 2
.globl SharedStub
- .section ".opd","aw"
- .align 3
-
- SharedStub:
- .quad .SharedStub,.TOC.@tocbase
- .previous
+@@ -29,6 +50,7 @@ SharedStub:
.type SharedStub,@function
.SharedStub:
@@ -266,17 +209,7 @@
mflr r0
std r4, -56(r1) # Save all GPRS
- std r5, -48(r1)
- std r6, -40(r1)
- std r7, -32(r1)
- std r8, -24(r1)
- std r9, -16(r1)
-@@ -50,17 +72,17 @@ SharedStub:
- stfd f5, -128(r1)
- stfd f4, -136(r1)
- stfd f3, -144(r1)
- stfd f2, -152(r1)
- stfd f1, -160(r1)
+@@ -55,7 +77,7 @@ SharedStub:
subi r6,r1,56 # r6 --> gprData
subi r7,r1,160 # r7 --> fprData
@@ -285,17 +218,7 @@
std r0, 16(r1)
- stdu r1,-288(r1)
- # r3 has the 'self' pointer
- # already
-
- mr r4,r11 # r4 is methodIndex selector,
-@@ -70,12 +92,16 @@ SharedStub:
- bl PrepareAndDispatch
- nop
-
- ld 1,0(r1) # restore stack
- ld r0,16(r1) # restore LR
+@@ -75,7 +97,11 @@ SharedStub:
mtlr r0
blr
@@ -307,15 +230,11 @@
# Magic indicating no need for an executable stack
.section .note.GNU-stack, "", @progbits ; .previous
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
---- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
-@@ -78,17 +78,19 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- dp->val.d = fprData[i];
- else
- dp->val.d = *(double*) ap;
- } else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
- if (i < FPR_COUNT)
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
+@@ -83,7 +83,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
else {
float *p = (float *)ap;
@@ -325,17 +244,7 @@
dp->val.f = *p;
}
} else { /* integer type or pointer */
- if (i < GPR_COUNT)
- tempu64 = gprData[i];
- else
- tempu64 = *ap;
-
-@@ -148,16 +150,53 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- // Create names would be like:
- // _ZN14nsXPTCStubBase5Stub1Ev
- // _ZN14nsXPTCStubBase6Stub12Ev
- // _ZN14nsXPTCStubBase7Stub123Ev
- // _ZN14nsXPTCStubBase8Stub1234Ev
+@@ -153,6 +155,43 @@ PrepareAndDispatch(nsXPTCStubBase* self,
// etc.
// Use assembler directives to get the names right...
@@ -379,17 +288,7 @@
# define STUB_ENTRY(n) \
__asm__ ( \
".section \".toc\",\"aw\" \n\t" \
- ".section \".text\" \n\t" \
- ".align 2 \n\t" \
- ".if "#n" < 10 \n\t" \
- ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
- ".section \".opd\",\"aw\" \n\t" \
-@@ -190,16 +229,17 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- \
- ".else \n\t" \
- ".err \"stub number "#n" >= 1000 not yet supported\"\n" \
- ".endif \n\t" \
- \
+@@ -195,6 +234,7 @@ __asm__ (
"li 11,"#n" \n\t" \
"b SharedStub \n" \
);
@@ -397,8 +296,3 @@
#define SENTINEL_ENTRY(n) \
nsresult nsXPTCStubBase::Sentinel##n() \
- { \
- NS_ERROR("nsXPTCStubBase::Sentinel called"); \
- return NS_ERROR_NOT_IMPLEMENTED; \
- }
-
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.YRgqjk/_old 2014-05-01 07:52:38.000000000 +0200
+++ /var/tmp/diff_new_pack.YRgqjk/_new 2014-05-01 07:52:38.000000000 +0200
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8042,16 +8042,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8113,16 +8113,31 @@ if test "$MOZ_ENABLE_SKIA"; then
MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -73,54 +73,49 @@
+
#include "nsNSSComponent.h"
- #include "CertVerifier.h"
+ #include "ExtendedValidation.h"
+ #include "NSSCertDBTrustDomain.h"
#include "mozilla/Telemetry.h"
#include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsComponentManagerUtils.h"
- #include "nsDirectoryServiceDefs.h"
-@@ -1207,18 +1214,35 @@ nsNSSComponent::InitializeNSS()
- ConfigureInternalPKCS11Token();
-
- // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
- // module by NSS_Initialize because we will load it in InstallLoadableRoots
- // later. It also allows us to work around a bug in the system NSS in
- // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as
- // "/usr/lib/nss/libnssckbi.so".
- uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
-- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-- SECMOD_DB, init_flags);
-+
-+ SECStatus init_rv = SECFailure;
+@@ -1117,17 +1124,31 @@ nsNSSComponent::InitializeNSS()
+ if (NS_FAILED(rv)) {
+ nsPSMInitPanic::SetPanic();
+ return NS_ERROR_NOT_AVAILABLE;
+ }
+
+ SECStatus init_rv = SECFailure;
+ if (!profileStr.IsEmpty()) {
+ // First try to initialize the NSS DB in read/write mode.
+- SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+#ifdef MOZ_ENABLE_NSSHELPER
+ if (PR_GetEnv("MOZ_SM_NO_NSSHELPER")) {
-+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ } else {
-+ init_rv = ::nsshelp_open_db ("Seamonkey", profileStr.get(), init_flags);
++ uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
++ init_rv = ::nsshelp_open_db ("Seamonkey", profileStr.get(), flags);
+
+ if (init_rv != SECSuccess) {
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));
-+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ }
+ }
+#else
-+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+#endif
-
+ // If that fails, attempt read-only mode.
if (init_rv != SECSuccess) {
- PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get()));
-
- // try to init r/o
- init_flags |= NSS_INIT_READONLY;
- init_rv = ::NSS_Initialize(profileStr.get(), "", "",
- SECMOD_DB, init_flags);
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get()));
+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true);
+ }
+ if (init_rv != SECSuccess) {
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
+ }
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -245,17 +245,17 @@ endif
+@@ -223,17 +223,17 @@ endif
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
SDK_LIBRARY = $(IMPORT_LIBRARY)
else
++++++ seamonkey-2.25-source.tar.bz2 -> seamonkey-2.26-source.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/seamonkey/seamonkey-2.25-source.tar.bz2 /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey-2.26-source.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
Hello community,
here is the log from the commit of package rubygem-mixlib-cli for openSUSE:Factory checked in at 2014-05-01 07:52:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-mixlib-cli (Old)
and /work/SRC/openSUSE:Factory/.rubygem-mixlib-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-mixlib-cli"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-mixlib-cli/rubygem-mixlib-cli.changes 2013-12-12 11:26:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-mixlib-cli.new/rubygem-mixlib-cli.changes 2014-05-01 07:52:19.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Apr 29 07:57:14 UTC 2014 - tboerger(a)suse.com
+
+- Fixed license, valid spdx.org license
+
+-------------------------------------------------------------------
+Mon Apr 28 12:21:53 UTC 2014 - tboerger(a)suse.com
+
+- Updated to version 1.5.0
+ - Add API to access option parser without parsing options
+- Updated spec file with current gem2rpm
+- Changed license to Apache-2 instead of Apache-2.0
+
+-------------------------------------------------------------------
Old:
----
mixlib-cli-1.4.0.gem
New:
----
mixlib-cli-1.5.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-mixlib-cli.spec ++++++
--- /var/tmp/diff_new_pack.N1SobM/_old 2014-05-01 07:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.N1SobM/_new 2014-05-01 07:52:19.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-mixlib-cli
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,13 +17,13 @@
Name: rubygem-mixlib-cli
-Version: 1.4.0
+Version: 1.5.0
Release: 0
%define mod_name mixlib-cli
%define mod_full_name %{mod_name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: ruby-macros >= 1
+BuildRequires: ruby-macros >= 3
Url: http://www.opscode.com
Source: http://rubygems.org/gems/%{mod_full_name}.gem
Summary: A simple mixin for CLI interfaces, including option parsing
@@ -60,23 +60,23 @@
%install
%gem_install -f
mkdir -p %{buildroot}%{_docdir}/%{name}
-ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/LICENSE %buildroot/%{_docdir}/%{name}/LICENSE
-ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/README.rdoc %buildroot/%{_docdir}/%{name}/README.rdoc
+ln -s %{gem_base}/gems/%{mod_full_name}/LICENSE %buildroot/%{_docdir}/%{name}/LICENSE
+ln -s %{gem_base}/gems/%{mod_full_name}/README.rdoc %buildroot/%{_docdir}/%{name}/README.rdoc
%files
%defattr(-,root,root,-)
%{_docdir}/%{name}
-%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem
-%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/
-%exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/spec
-%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec
+%{gem_base}/cache/%{mod_full_name}.gem
+%{gem_base}/gems/%{mod_full_name}/
+%exclude %{gem_base}/gems/%{mod_full_name}/spec
+%{gem_base}/specifications/%{mod_full_name}.gemspec
%files doc
%defattr(-,root,root,-)
-%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/
+%doc %{gem_base}/doc
%files testsuite
%defattr(-,root,root,-)
-%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/spec
+%{gem_base}/gems/%{mod_full_name}/spec
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-imaging for openSUSE:Factory checked in at 2014-05-01 07:51:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-imaging (Old)
and /work/SRC/openSUSE:Factory/.python-imaging.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-imaging"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-imaging/python-imaging.changes 2013-12-12 11:23:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-imaging.new/python-imaging.changes 2014-05-01 07:51:54.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 17 15:53:13 CEST 2014 - jmatejek(a)suse.com
+
+- added CVE-2014-1932-mktemp.patch: insecure temporary file creation
+ CVE-2014-1932, bnc#863541
+
+-------------------------------------------------------------------
New:
----
CVE-2014-1932-mktemp.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-imaging.spec ++++++
--- /var/tmp/diff_new_pack.ocb1h1/_old 2014-05-01 07:51:55.000000000 +0200
+++ /var/tmp/diff_new_pack.ocb1h1/_new 2014-05-01 07:51:55.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-imaging
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -61,6 +61,8 @@
# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
Patch4: use-recommended-freetype-include.patch
+# CVE-2014-1932 - insecure use of `mktemp`
+Patch5: CVE-2014-1932-mktemp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -96,6 +98,7 @@
%patch2
%patch3
%patch4 -p1
+%patch5 -p1
cp %{S:1} .
%build
++++++ CVE-2014-1932-mktemp.patch ++++++
>From 4e9f367dfd3f04c8f5d23f7f759ec12782e10ee7 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github(a)soroos.net>
Date: Fri, 14 Mar 2014 15:56:41 -0700
Subject: [PATCH] Removed tempfile.mktemp, fixes CVE-2014-1932 CVE-2014-1933,
debian bug #737059
---
PIL/EpsImagePlugin.py | 3 ++-
PIL/Image.py | 9 ++++++---
PIL/IptcImagePlugin.py | 4 ++--
PIL/JpegImagePlugin.py | 12 ++++++++----
4 files changed, 18 insertions(+), 10 deletions(-)
Index: Imaging-1.1.7/PIL/EpsImagePlugin.py
===================================================================
--- Imaging-1.1.7.orig/PIL/EpsImagePlugin.py 2009-11-01 01:44:11.000000000 +0100
+++ Imaging-1.1.7/PIL/EpsImagePlugin.py 2014-04-18 15:47:47.125694292 +0200
@@ -44,7 +44,8 @@
import tempfile, os
- file = tempfile.mktemp()
+ out_fd, file = tempfile.mkstemp()
+ os.close(out_fd)
# Build ghostscript command
command = ["gs",
Index: Imaging-1.1.7/PIL/Image.py
===================================================================
--- Imaging-1.1.7.orig/PIL/Image.py 2009-11-15 16:51:25.000000000 +0100
+++ Imaging-1.1.7/PIL/Image.py 2014-04-18 15:57:25.748089006 +0200
@@ -482,14 +482,22 @@
self.readonly = 0
def _dump(self, file=None, format=None):
- import tempfile
- if not file:
- file = tempfile.mktemp()
+ import tempfile, os
+
self.load()
+
+ suffix = ''
+ if format: suffix = '.' + format
+
+ if not file:
+ f, file = tempfile.mkstemp(suffix)
+ os.close(f)
+
if not format or format == "PPM":
self.im.save_ppm(file)
else:
- file = file + "." + format
+ if not file.endswith(format):
+ file = file + "." + format
self.save(file, format)
return file
Index: Imaging-1.1.7/PIL/IptcImagePlugin.py
===================================================================
--- Imaging-1.1.7.orig/PIL/IptcImagePlugin.py 2009-11-01 01:44:12.000000000 +0100
+++ Imaging-1.1.7/PIL/IptcImagePlugin.py 2014-04-18 15:47:47.125694292 +0200
@@ -173,8 +173,8 @@
self.fp.seek(offset)
# Copy image data to temporary file
- outfile = tempfile.mktemp()
- o = open(outfile, "wb")
+ o_fd, outfile = tempfile.mkstemp(text=False)
+ o = os.fdopen(o_fd)
if encoding == "raw":
# To simplify access to the extracted file,
# prepend a PPM header
Index: Imaging-1.1.7/PIL/JpegImagePlugin.py
===================================================================
--- Imaging-1.1.7.orig/PIL/JpegImagePlugin.py 2009-11-01 01:44:12.000000000 +0100
+++ Imaging-1.1.7/PIL/JpegImagePlugin.py 2014-04-18 16:03:18.452141478 +0200
@@ -343,15 +343,18 @@
# ALTERNATIVE: handle JPEGs via the IJG command line utilities
+ if not os.path.exists(self.filename):
+ raise ValueError("Invalid Filename")
+
import tempfile, os
- file = tempfile.mktemp()
- os.system("djpeg %s >%s" % (self.filename, file))
+ f, path = tempfile.mkstemp()
+ os.close(f)
try:
- self.im = Image.core.open_ppm(file)
+ os.system("djpeg '%s' >'%s'" % (self.filename, path))
+ self.im = Image.core.open_ppm(path)
finally:
- try: os.unlink(file)
- except: pass
+ os.unlink(path)
self.mode = self.im.mode
self.size = self.im.size
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2014-05-01 07:51:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old)
and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaThunderbird"
Changes:
--------
--- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2014-03-20 07:33:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2014-05-01 07:51:42.000000000 +0200
@@ -1,0 +2,21 @@
+Fri Apr 25 09:41:14 UTC 2014 - wr(a)rosenauer.org
+
+- update to Thunderbird 24.5.0 (bnc#875378)
+ * MFSA 2014-34/CVE-2014-1518
+ Miscellaneous memory safety hazards
+ * MFSA 2014-37/CVE-2014-1523 (bmo#969226)
+ Out of bounds read while decoding JPG images
+ * MFSA 2014-38/CVE-2014-1524 (bmo#989183)
+ Buffer overflow when using non-XBL object as XBL
+ * MFSA 2014-42/CVE-2014-1529 (bmo#987003)
+ Privilege escalation through Web Notification API
+ * MFSA 2014-43/CVE-2014-1530 (bmo#895557)
+ Cross-site scripting (XSS) using history navigations
+ * MFSA 2014-44/CVE-2014-1531 (bmo#987140)
+ Use-after-free in imgLoader while resizing images
+ * MFSA 2014-46/CVE-2014-1532 (bmo#966006)
+ Use-after-free in nsHostResolver
+- use shipped-locales as the authoritative source for supported
+ locales (some unsupported locales disappear from -other package)
+
+-------------------------------------------------------------------
Old:
----
l10n-24.4.0.tar.bz2
thunderbird-24.4.0-source.tar.bz2
New:
----
l10n-24.5.0.tar.bz2
thunderbird-24.5.0-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaThunderbird.spec ++++++
--- /var/tmp/diff_new_pack.F4OdkM/_old 2014-05-01 07:51:53.000000000 +0200
+++ /var/tmp/diff_new_pack.F4OdkM/_new 2014-05-01 07:51:53.000000000 +0200
@@ -17,7 +17,7 @@
#
-%define mainversion 24.4.0
+%define mainversion 24.5.0
%define update_channel release
%define gstreamer_ver 0.10
%define with_kde 1
@@ -50,7 +50,7 @@
%endif
Version: %{mainversion}
Release: 0
-%define releasedate 2014031500
+%define releasedate 2014042400
Provides: thunderbird = %{version}
%if %{with_kde}
# this is needed to match this package with the kde4 helper package without the main package
@@ -340,7 +340,7 @@
%endif
rm -f %{_tmppath}/translations.*
touch %{_tmppath}/translations.{common,other}
-for locale in $(awk '{ print $1; }' ../thunderbird/mail/locales/all-locales); do
+for locale in $(awk '{ print $1; }' ../thunderbird/mail/locales/shipped-locales); do
case $locale in
ja-JP-mac|en-US)
# locales not to be included in translations package
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.F4OdkM/_old 2014-05-01 07:51:53.000000000 +0200
+++ /var/tmp/diff_new_pack.F4OdkM/_new 2014-05-01 07:51:53.000000000 +0200
@@ -2,8 +2,8 @@
CHANNEL="esr24"
BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_24_4_0_RELEASE"
-VERSION="24.4.0"
+RELEASE_TAG="THUNDERBIRD_24_5_0_RELEASE"
+VERSION="24.5.0"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH thunderbird
@@ -24,7 +24,7 @@
if [ -e shipped-locales ]; then
SHIPPED_LOCALES=shipped-locales
else
- SHIPPED_LOCALES=thunderbird/mail/locales/all-locales
+ SHIPPED_LOCALES=thunderbird/mail/locales/shipped-locales
fi
test ! -d l10n && mkdir l10n
for locale in $(awk '{ print $1; }' $SHIPPED_LOCALES); do
++++++ l10n-24.4.0.tar.bz2 -> l10n-24.5.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/MozillaThunderbird/l10n-24.4.0.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/l10n-24.5.0.tar.bz2 differ: char 11, line 1
++++++ thunderbird-24.4.0-source.tar.bz2 -> thunderbird-24.5.0-source.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/MozillaThunderbird/thunderbird-24.4.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/thunderbird-24.5.0-source.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
Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2014-05-01 07:51:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lightdm (Old)
and /work/SRC/openSUSE:Factory/.lightdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2014-04-11 13:39:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2014-05-01 07:51:35.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Apr 28 12:34:37 UTC 2014 - gber(a)opensuse.org
+
+- update to version 1.10.1
+ - When switching to an existing session refresh PAM credentials
+ and end session cleanly so no resources leak
+ - Update apparmor rules to allow oxide based browsers and Google
+ Chrome to run in the guest session
+
+-------------------------------------------------------------------
Old:
----
lightdm-1.10.0.tar.xz
New:
----
lightdm-1.10.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.j4cBaH/_old 2014-05-01 07:51:36.000000000 +0200
+++ /var/tmp/diff_new_pack.j4cBaH/_new 2014-05-01 07:51:36.000000000 +0200
@@ -26,7 +26,7 @@
%define rundir /run
Name: lightdm
-Version: 1.10.0
+Version: 1.10.1
Release: 0
Summary: Lightweight, Cross-desktop Display Manager
License: GPL-3.0+
++++++ lightdm-1.10.0.tar.xz -> lightdm-1.10.1.tar.xz ++++++
++++ 6494 lines of diff (skipped)
++++++ lightdm-disable-utmp-handling.patch ++++++
--- /var/tmp/diff_new_pack.j4cBaH/_old 2014-05-01 07:51:37.000000000 +0200
+++ /var/tmp/diff_new_pack.j4cBaH/_new 2014-05-01 07:51:37.000000000 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 8b5df1d6d8353e534cc8fbe113f33b4716c38034
+# Parent 6b8575b98c63d50bd0f8346222143586245430e0
disable utmp handling since this is handled in the Xstartup/Xreset scripts
diff --git a/src/session-child.c b/src/session-child.c
@@ -32,7 +32,7 @@
int
session_child_run (int argc, char **argv)
-@@ -360,6 +364,7 @@ session_child_run (int argc, char **argv
+@@ -363,6 +367,7 @@ session_child_run (int argc, char **argv
/* Write record to btmp database */
if (authentication_result == PAM_AUTH_ERR)
{
@@ -40,7 +40,7 @@
struct utmpx ut;
struct timeval tv;
-@@ -383,6 +388,7 @@ session_child_run (int argc, char **argv
+@@ -386,6 +391,7 @@ session_child_run (int argc, char **argv
ut.ut_tv.tv_usec = tv.tv_usec;
updwtmpx ("/var/log/btmp", &ut);
@@ -48,7 +48,7 @@
}
/* Check account is valid */
-@@ -646,6 +652,7 @@ session_child_run (int argc, char **argv
+@@ -669,6 +675,7 @@ session_child_run (int argc, char **argv
/* Wait for the command to complete (blocks) */
if (child_pid > 0)
{
@@ -56,7 +56,7 @@
/* Log to utmp */
if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
{
-@@ -678,10 +685,10 @@ session_child_run (int argc, char **argv
+@@ -701,10 +708,10 @@ session_child_run (int argc, char **argv
endutxent ();
updwtmpx ("/var/log/wtmp", &ut);
}
@@ -69,7 +69,7 @@
/* Log to utmp */
if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
{
-@@ -714,6 +721,7 @@ session_child_run (int argc, char **argv
+@@ -737,6 +744,7 @@ session_child_run (int argc, char **argv
endutxent ();
updwtmpx ("/var/log/wtmp", &ut);
}
++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++
--- /var/tmp/diff_new_pack.j4cBaH/_old 2014-05-01 07:51:37.000000000 +0200
+++ /var/tmp/diff_new_pack.j4cBaH/_new 2014-05-01 07:51:37.000000000 +0200
@@ -14,7 +14,7 @@
diff --git a/src/session-child.c b/src/session-child.c
--- a/src/session-child.c
+++ b/src/session-child.c
-@@ -587,6 +587,8 @@ session_child_run (int argc, char **argv
+@@ -610,6 +610,8 @@ session_child_run (int argc, char **argv
g_free (value);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kget for openSUSE:Factory checked in at 2014-05-01 07:51:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kget (Old)
and /work/SRC/openSUSE:Factory/.kget.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kget"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kget/kget.changes 2014-04-18 12:26:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kget.new/kget.changes 2014-05-01 07:51:30.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 28 08:19:25 UTC 2014 - tittiatcoke(a)gmail.com
+
+- Remove some leftover nepomuk buildrequire. This is no longer
+ needed.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kget.spec ++++++
--- /var/tmp/diff_new_pack.t7zrg5/_old 2014-05-01 07:51:31.000000000 +0200
+++ /var/tmp/diff_new_pack.t7zrg5/_new 2014-05-01 07:51:31.000000000 +0200
@@ -29,7 +29,6 @@
BuildRequires: libkdepimlibs4-devel
BuildRequires: libkonq-devel
BuildRequires: libktorrent-devel
-BuildRequires: libnepomukwidgets-devel
BuildRequires: libqca2-devel
BuildRequires: sqlite-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2014-05-01 07:51:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old)
and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4-runtime"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2014-04-18 12:37:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2014-05-01 07:51:24.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 28 08:08:09 UTC 2014 - tittiatcoke(a)gmail.com
+
+- Add upstream patch use_existing_notes.diff to resolve the issue
+ that after migration the old notes were not visible (bko#333640)
+
+-------------------------------------------------------------------
New:
----
use_existing_notes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.bC6O5e/_old 2014-05-01 07:51:25.000000000 +0200
+++ /var/tmp/diff_new_pack.bC6O5e/_new 2014-05-01 07:51:25.000000000 +0200
@@ -25,6 +25,8 @@
Url: http://www.kde.org
Source0: kdepim-runtime-%{version}.tar.xz
Source1: akonadi.png
+# PATCH-FIX-UPSTREAM After migration also start using the already existing notes
+Patch1: use_existing_notes.diff
BuildRequires: fdupes
BuildRequires: libkdepimlibs4-devel >= %{version}
BuildRequires: libkfbapi-devel
@@ -48,6 +50,7 @@
%prep
%setup -q -n kdepim-runtime-%{version}
+%patch1 -p1
%build
%ifarch ppc64
++++++ use_existing_notes.diff ++++++
commit 69321dd246202d572ccba35ab36f9dd7d5a18925
Author: Montel Laurent <montel(a)kde.org>
Date: Mon Apr 28 07:56:23 2014 +0200
Fix Bug 333640 - Knotes version 4.13 don't inherit previous notes
FIXED-IN: 4.13.1
BUG: 333640
diff --git a/migration/knotes/knotesmigrator.cpp b/migration/knotes/knotesmigrator.cpp
index 42ae784..3e5516b 100644
--- a/migration/knotes/knotesmigrator.cpp
+++ b/migration/knotes/knotesmigrator.cpp
@@ -39,6 +39,7 @@
#include <KMime/Message>
#include <KDebug>
+#include <KStandardDirs>
#include "maildirsettings.h"
#include <krandom.h>
@@ -46,53 +47,76 @@
using namespace Akonadi;
KNotesMigrator::KNotesMigrator() :
- KResMigrator<KRES::Resource>( QLatin1String("notes"), QString() ), m_notesResource( 0 )
+ KMigratorBase(), mIndexResource(-1), m_notesResource( 0 )
{
Akonadi::AttributeFactory::registerAttribute<NoteLockAttribute>();
Akonadi::AttributeFactory::registerAttribute<NoteAlarmAttribute>();
Akonadi::AttributeFactory::registerAttribute<NoteDisplayAttribute>();
Akonadi::AttributeFactory::registerAttribute<ShowFolderNotesAttribute>();
+ const QString kresCfgFile = KStandardDirs::locateLocal( "config", QLatin1String( "kresources/notes/stdrc" ) );
+ mConfig = new KConfig( kresCfgFile );
+ const KConfigGroup generalGroup( mConfig, QLatin1String( "General" ) );
+ mUnknownTypeResources = generalGroup.readEntry( QLatin1String( "ResourceKeys" ), QStringList() );
+ m_notesResource = new KCal::CalendarLocal( QString() );
}
KNotesMigrator::~KNotesMigrator()
{
delete m_notesResource;
+ delete mConfig;
+}
+
+void KNotesMigrator::migrate()
+{
+ emit message( Info, i18n( "Beginning KNotes migration..." ) );
+ migrateNext();
}
-bool KNotesMigrator::migrateResource( KRES::Resource* res)
+void KNotesMigrator::migrateNext()
{
- if ( res->type() == QLatin1String("file") )
+ ++mIndexResource;
+
+ if (mUnknownTypeResources.isEmpty() || mIndexResource >= mUnknownTypeResources.count()) {
+ emit message( Info, i18n( "KNotes migration finished" ) );
+ deleteLater();
+ return;
+ }
+
+ const KConfigGroup kresCfgGroup( mConfig, QString::fromLatin1( "Resource_%1" ).arg( mUnknownTypeResources.at(mIndexResource) ) );
+ const QString resourceType = kresCfgGroup.readEntry( QLatin1String( "ResourceType" ), QString() );
+ if (resourceType == QLatin1String("file")) {
createAgentInstance( QLatin1String("akonadi_akonotes_resource"), this, SLOT(notesResourceCreated(KJob*)) );
- else
- return false;
- return true;
+ } else {
+ migrateNext();
+ }
}
void KNotesMigrator::notesResourceCreated(KJob * job)
{
if ( job->error() ) {
migrationFailed( i18n( "Failed to create resource: %1", job->errorText() ) );
+ migrateNext();
return;
}
- KRES::Resource *res = currentResource();
+ const KConfigGroup kresCfgGroup( mConfig, QString::fromLatin1( "Resource_%1" ).arg( mUnknownTypeResources.at(mIndexResource) ) );
+
m_agentInstance = static_cast<AgentInstanceCreateJob*>( job )->instance();
- const KConfigGroup kresCfg = kresConfig( res );
- m_agentInstance.setName( kresCfg.readEntry( "ResourceName", "Migrated Notes" ) );
+ m_agentInstance.setName( kresCfgGroup.readEntry( "ResourceName", "Migrated Notes" ) );
- QString resourcePath = kresCfg.readEntry( "NotesURL" );
+ const QString resourcePath = kresCfgGroup.readEntry( "NotesURL" );
KUrl url( resourcePath );
if ( !QFile::exists( url.toLocalFile() ) ) {
- migrationCompleted( m_agentInstance );
+ migrateNext();
return;
}
- m_notesResource = new KCal::CalendarLocal( QString() );
bool success = m_notesResource->load( url.toLocalFile() );
if ( !success ) {
migrationFailed( i18n( "Failed to open file for reading: %1" , resourcePath ) );
+ migrateNext();
return;
}
@@ -103,9 +127,11 @@ void KNotesMigrator::notesResourceCreated(KJob * job)
if ( !iface->isValid() ) {
migrationFailed( i18n( "Failed to obtain D-Bus interface for remote configuration." ), m_agentInstance );
delete iface;
+ migrateNext();
return;
}
- iface->setReadOnly( res->readOnly() );
+ bool isReadOnly = kresCfgGroup.readEntry("ResourceIsReadOnly", false);
+ iface->setReadOnly( isReadOnly );
QDBusPendingReply<void> response = iface->setPath( KGlobal::dirs()->localxdgdatadir() + QLatin1String("/notes/") + KRandom::randomString( 10 ) );
@@ -149,6 +175,7 @@ void KNotesMigrator::rootCollectionsRecieved( const Akonadi::Collection::List &l
}
}
emit message( Error, i18n( "Could not find root collection for resource \"%1\"" ,m_agentInstance.identifier() ) );
+ migrateNext();
}
void KNotesMigrator::startMigration()
@@ -236,5 +263,12 @@ void KNotesMigrator::showDefaultCollection()
void KNotesMigrator::slotCollectionModify(KJob* job)
{
Q_UNUSED( job );
- migrationCompleted( m_agentInstance );
+ migrateNext();
}
+
+void KNotesMigrator::migrationFailed( const QString& errorMsg, const Akonadi::AgentInstance& instance )
+{
+ Q_UNUSED( instance )
+ emit message( Error, i18n( "Migration failed: %1" ,errorMsg ) );
+}
+
diff --git a/migration/knotes/knotesmigrator.h b/migration/knotes/knotesmigrator.h
index 75ec992..117f732 100644
--- a/migration/knotes/knotesmigrator.h
+++ b/migration/knotes/knotesmigrator.h
@@ -22,8 +22,7 @@
#ifndef KNOTESMIGRATOR_H
#define KNOTESMIGRATOR_H
-#include "kresmigrator.h"
-
+#include "kmigratorbase.h"
#include <kcal/resourcecalendar.h>
#include <kcal/calendarlocal.h>
#include <akonadi/collection.h>
@@ -37,13 +36,17 @@ class KJob;
/**
* Migrate KNotes resources to Akonadi
*/
-class KNotesMigrator : public KResMigrator<KRES::Resource>
+class KNotesMigrator : public KMigratorBase
{
Q_OBJECT
public:
KNotesMigrator();
~KNotesMigrator();
- bool migrateResource( KRES::Resource *res );
+
+ /* reimp */ void migrate();
+ /* reimp */ void migrateNext();
+protected:
+ /* reimp */ void migrationFailed( const QString& errorMsg, const Akonadi::AgentInstance& instance = Akonadi::AgentInstance() );
private slots:
void notesResourceCreated( KJob* job );
@@ -58,10 +61,13 @@ private:
void showDefaultCollection();
private:
+ int mIndexResource;
+ QStringList mUnknownTypeResources;
Akonadi::Collection m_resourceCollection;
- AgentInstance m_agentInstance;
+ Akonadi::AgentInstance m_agentInstance;
KCal::CalendarLocal *m_notesResource;
+ KConfig *mConfig;
};
#endif
diff --git a/migration/knotes/main.cpp b/migration/knotes/main.cpp
index df5254e..aa480d2 100644
--- a/migration/knotes/main.cpp
+++ b/migration/knotes/main.cpp
@@ -64,8 +64,6 @@ int main( int argc, char **argv )
args->clear();
KNotesMigrator *migrator = new KNotesMigrator;
- migrator->setBridgingOnly(false);
- migrator->setOmitClientBridge(false);
if ( infoDialog && migrator ) {
infoDialog->migratorAdded();
QObject::connect( migrator, SIGNAL(message(KMigratorBase::MessageType,QString)),
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package igerman98 for openSUSE:Factory checked in at 2014-05-01 07:51:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/igerman98 (Old)
and /work/SRC/openSUSE:Factory/.igerman98.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "igerman98"
Changes:
--------
--- /work/SRC/openSUSE:Factory/igerman98/igerman98.changes 2013-12-09 16:54:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.igerman98.new/igerman98.changes 2014-05-01 07:51:14.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 28 13:06:12 UTC 2014 - pgajdos(a)suse.com
+
+- myspell-* is now provided by myspell-de (subpackage of
+ myspell-dictionaries)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ igerman98.spec ++++++
--- /var/tmp/diff_new_pack.R6P1mz/_old 2014-05-01 07:51:15.000000000 +0200
+++ /var/tmp/diff_new_pack.R6P1mz/_new 2014-05-01 07:51:15.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package igerman98
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -121,63 +121,6 @@
description is given in /usr/share/doc/packages/ispell/README of the
package ispell.
-%package -n myspell-nswiss
-Summary: Swiss Dictionary for MySpell
-License: GPL-2.0+
-Group: Productivity/Text/Spell
-Provides: myspell-dictionary
-Provides: ooo-dictionaries:/usr/lib/ooo-1.1/share/dict/ooo/de_CH.dic
-Provides: locale(OpenOffice_org:de_CH)
-Provides: locale(libreoffice:de_CH)
-Provides: locale(seamonkey-spellchecker:de_CH)
-%if 0%{?suse_version} >= 1120
-BuildArch: noarch
-%endif
-
-%description -n myspell-nswiss
-MySpell dictionaries are compatible with MySpell and Hunspell spell-checker.
-They are used by various desktop applications, for example, LibreOffice,
-Mozilla Thunderbird, and Mozilla Firefox.
-
-%package -n myspell-german
-Summary: German Dictionary for MySpell
-License: GPL-2.0+
-Group: Productivity/Text/Spell
-Provides: myspell-dictionary
-Provides: myspell-german-dictionary
-Provides: ooo-dictionaries:/usr/lib/ooo-1.1/share/dict/ooo/de_DE.dic
-Conflicts: myspell-german-old
-Provides: locale(OpenOffice_org:de)
-Provides: locale(libreoffice:de)
-Provides: locale(seamonkey-spellchecker:de)
-%if 0%{?suse_version} >= 1120
-BuildArch: noarch
-%endif
-
-%description -n myspell-german
-MySpell dictionaries are compatible with MySpell and Hunspell spell-checker.
-They are used by various desktop applications, for example, LibreOffice,
-Mozilla Thunderbird, and Mozilla Firefox.
-
-%package -n myspell-austrian
-Summary: Austrian Dictionary for MySpell
-License: GPL-2.0+
-Group: Productivity/Text/Spell
-Provides: myspell-dictionary
-Provides: ooo:/usr/lib/ooo-1.1/share/dict/ooo/de_AT.dic
-Provides: locale(OpenOffice_org:de_AT)
-Provides: locale(libreoffice:de_AT)
-Provides: locale(seamonkey-spellchecker:de_AT)
-%if 0%{?suse_version} >= 1120
-BuildArch: noarch
-%endif
-
-%description -n myspell-austrian
-MySpell dictionaries are compatible with MySpell and Hunspell spell-checker.
-They are used by various desktop applications, for example, LibreOffice,
-Mozilla Thunderbird, and Mozilla Firefox.
-
-
%prep
%setup -q -a1
%patch0 -p1
@@ -194,7 +137,6 @@
make ispell/de_$l.{aff,hash}
make aspell/de_$l.rws
make hunspell/de_$l.{dic,aff}
- make myspell/de_$l.{dic,aff}
done
make ligature/rmligs
@@ -204,15 +146,6 @@
/usr/bin/word-list-compress d < Nwordlist.cwl | aspell --lang=de_DE --local-data-dir=./aspell/ create master ./deNovellwords
for i in aspell/*.multi; do echo "add deNovellwords" >> $i; done
-# hunspell -- add the Novell jargon into all dictionaries bnc#306333
-pushd hunspell
-for l in DE AT CH; do
- cat ../Nwordlist >> de_$l.dic
- # delete empty lines if they were created in some cases
- grep -v "^$" de_$l.dic > de_$l.no_space && mv de_$l.no_space de_$l.dic
-done
-popd
-
%install
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -240,10 +173,6 @@
ln -s %{ispell_dict_dir}/de_AT.$ext $RPM_BUILD_ROOT%{ispell_dict_dir}/austrian.$ext
done
-# myspell
-mkdir -p $RPM_BUILD_ROOT%{hunspell_dict_dir}
-install -m 644 hunspell/de_??.{aff,dic} $RPM_BUILD_ROOT%{hunspell_dict_dir}
-
%files doc
%defattr(-,root,root)
%doc Documentation/*
@@ -282,22 +211,4 @@
%{ispell_dict_dir}/austrian.hash
%{ispell_emacs_lib_dir}/austrian.el
-%files -n myspell-german
-%defattr(-,root,root)
-%dir %{hunspell_dict_dir}
-%{hunspell_dict_dir}/de_DE.aff
-%{hunspell_dict_dir}/de_DE.dic
-
-%files -n myspell-nswiss
-%defattr(-,root,root)
-%dir %{hunspell_dict_dir}
-%{hunspell_dict_dir}/de_CH.aff
-%{hunspell_dict_dir}/de_CH.dic
-
-%files -n myspell-austrian
-%defattr(-,root,root)
-%dir %{hunspell_dict_dir}
-%{hunspell_dict_dir}/de_AT.aff
-%{hunspell_dict_dir}/de_AT.dic
-
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gavl for openSUSE:Factory checked in at 2014-05-01 07:51:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gavl (Old)
and /work/SRC/openSUSE:Factory/.gavl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gavl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gavl/gavl.changes 2012-07-30 17:12:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gavl.new/gavl.changes 2014-05-01 07:51:09.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Apr 23 12:49:11 CEST 2014 - ohering(a)suse.de
+
+- Run autogen.sh instead of autoconf to fix build in packman 11.4
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gavl.spec ++++++
--- /var/tmp/diff_new_pack.ZDgFN1/_old 2014-05-01 07:51:10.000000000 +0200
+++ /var/tmp/diff_new_pack.ZDgFN1/_new 2014-05-01 07:51:10.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gavl
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -28,7 +28,9 @@
Source0: http://sourceforge.net/projects/gmerlin/files/gavl/%{version}/gavl-%{versio…
Patch0: gavl-autoconf.patch
BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: doxygen
+BuildRequires: libtool
BuildRequires: pkg-config
%description
@@ -77,7 +79,7 @@
%patch0 -p1
%build
-autoconf
+./autogen.sh
%configure --docdir=%{_docdir}/%{name} --without-cpuflags
make %{?_smp_mflags}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0