openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
February 2015
- 1 participants
- 1390 discussions
Hello community,
here is the log from the commit of package glibc for openSUSE:Factory checked in at 2015-02-22 17:19:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glibc (Old)
and /work/SRC/openSUSE:Factory/.glibc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/glibc/glibc-testsuite.changes 2014-11-04 17:27:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-testsuite.changes 2015-02-22 17:19:36.000000000 +0100
@@ -1,0 +2,24 @@
+Thu Feb 12 13:10:20 UTC 2015 - schwab(a)suse.de
+
+- htm-tabort.patch: Fix TABORT encoding for little endian
+
+-------------------------------------------------------------------
+Mon Feb 9 09:26:01 UTC 2015 - schwab(a)suse.de
+
+- Update to glibc 2.21 release.
+ * A new semaphore algorithm has been implemented in generic C code for all
+ machines
+ * Added support for TSX lock elision of pthread mutexes on powerpc32,
+ powerpc64 and powerpc64le
+ * Optimized strcpy, stpcpy, strchrnul and strrchr implementations for
+ AArch64
+ * i386 memcpy functions optimized with SSE2 unaligned load/store
+ * New locales: tu_IN, bh_IN, raj_IN, ce_RU
+ * The obsolete sigvec function has been removed
+- Patches from upstream removed
+ * ifunc-x86-slow-sse4.patch
+ * pthread-mutex-trylock-elision.patch
+- o-tmpfile.patch: Fix value of O_TMPFILE for architectures with
+ non-default O_DIRECTORY (BZ #17912)
+
+-------------------------------------------------------------------
glibc-utils.changes: same change
glibc.changes: same change
Old:
----
glibc-2.20.tar.xz
ifunc-x86-slow-sse4.patch
pthread-mutex-trylock-elision.patch
New:
----
glibc-2.21.tar.xz
htm-tabort.patch
o-tmpfile.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:38.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:38.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package glibc-testsuite
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -100,10 +100,9 @@
# 3.1 is the openSUSE 12.1 kernel
%define enablekernel 3.0
-Version: 2.20
+Version: 2.21
Release: 0
-%define glibc_major_version 2.20
-%define git_id b8079dd0d360
+%define git_id 4e42b5b8f89f
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Source: glibc-%{version}-%{git_id}.tar.xz
@@ -232,8 +231,8 @@
###
# Patches from upstream
###
-# PATCH-FIX-UPSTREAM Fix misdetected Slow_SSE4_2 cpu feature bit (BZ #17501)
-Patch1000: ifunc-x86-slow-sse4.patch
+# PATCH-FIX-UPSTREAM powerpc: Fix TABORT encoding for little endian
+Patch1000: htm-tabort.patch
###
# Patches awaiting upstream approval
@@ -244,14 +243,14 @@
Patch2002: ldd-system-interp.patch
# PATCH-FIX-UPSTREAM Don't close or flush stdio streams on abort (BZ #15436)
Patch2003: abort-no-flush.patch
-# PATCH-FIX-UPSTREAM Properly handle forced elision in pthread_mutex_trylock (BZ #16657)
-Patch2004: pthread-mutex-trylock-elision.patch
# PATCH-FIX-UPSTREAM Speedup memset on x86-64 for large block sizes (BZ #16830)
Patch2005: glibc-memset-nontemporal.diff
# PATCH-FIX-UPSTREAM Avoid redundant shift character in iconv output at block boundary (BZ #17197)
Patch2006: ibm93x-redundant-shift-si.patch
# PATCH-FIX-UPSTREAM Filter out PTHREAD_MUTEX_NO_ELISION_NP bit in pthread_mutexattr_gettype (BZ #15790)
Patch2007: pthread-mutexattr-gettype-kind.patch
+# PATCH-FIX-UPSTREAM Fix value of O_TMPFILE for architectures with non-default O_DIRECTORY (BZ #17912)
+Patch2008: o-tmpfile.patch
# Non-glibc patches
# PATCH-FIX-OPENSUSE Remove debianisms from manpages
@@ -457,10 +456,10 @@
%patch2000 -p1
%patch2002 -p1
%patch2003 -p1
-%patch2004 -p1
%patch2005 -p1
%patch2006 -p1
%patch2007 -p1
+%patch2008 -p1
%patch3000
@@ -827,7 +826,7 @@
cd cc-noelision
destdir=$RPM_BUILD_ROOT/%{_lib}/noelision
mkdir -p $destdir
-install -m 755 nptl/libpthread.so $destdir/libpthread-%{glibc_major_version}.so
+install -m 755 nptl/libpthread.so $destdir/libpthread-%{version}.so
cd ..
cc-base/elf/ldconfig -vn $destdir
%endif
@@ -950,7 +949,7 @@
%ifarch armv6hl armv7hl
# Provide compatibility link
-ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3
+ln -s ld-%{version}.so %{buildroot}/lib/ld-linux.so.3
%endif
# Move getconf to %{_libexecdir}/getconf/ to avoid cross device link
@@ -1065,7 +1064,7 @@
%doc %{_mandir}/man1/gencat.1.gz
%doc %{_mandir}/man1/getconf.1.gz
%doc %{_mandir}/man5/*
-/%{_lib}/ld-%{glibc_major_version}.so
+/%{_lib}/ld-%{version}.so
# Each architecture has a different name for the dynamic linker:
%ifarch %arm
@@ -1104,58 +1103,58 @@
/%{_lib}/ld-linux-aarch64.so.1
%endif
-/%{_lib}/libBrokenLocale-%{glibc_major_version}.so
+/%{_lib}/libBrokenLocale-%{version}.so
/%{_lib}/libBrokenLocale.so.1
/%{_lib}/libSegFault.so
-/%{_lib}/libanl-%{glibc_major_version}.so
+/%{_lib}/libanl-%{version}.so
/%{_lib}/libanl.so.1
-/%{_lib}/libc-%{glibc_major_version}.so
+/%{_lib}/libc-%{version}.so
/%{_lib}/libc.so.6*
-/%{_lib}/libcidn-%{glibc_major_version}.so
+/%{_lib}/libcidn-%{version}.so
/%{_lib}/libcidn.so.1
-/%{_lib}/libcrypt-%{glibc_major_version}.so
+/%{_lib}/libcrypt-%{version}.so
/%{_lib}/libcrypt.so.1
-/%{_lib}/libowcrypt-%{glibc_major_version}.so
+/%{_lib}/libowcrypt-%{version}.so
/%{_lib}/libowcrypt.so.1
-/%{_lib}/libdl-%{glibc_major_version}.so
+/%{_lib}/libdl-%{version}.so
/%{_lib}/libdl.so.2*
-/%{_lib}/libm-%{glibc_major_version}.so
+/%{_lib}/libm-%{version}.so
/%{_lib}/libm.so.6*
-/%{_lib}/libnsl-%{glibc_major_version}.so
+/%{_lib}/libnsl-%{version}.so
/%{_lib}/libnsl.so.1
-/%{_lib}/libnss_compat-%{glibc_major_version}.so
+/%{_lib}/libnss_compat-%{version}.so
/%{_lib}/libnss_compat.so.2
-/%{_lib}/libnss_db-%{glibc_major_version}.so
+/%{_lib}/libnss_db-%{version}.so
/%{_lib}/libnss_db.so.2
-/%{_lib}/libnss_dns-%{glibc_major_version}.so
+/%{_lib}/libnss_dns-%{version}.so
/%{_lib}/libnss_dns.so.2
-/%{_lib}/libnss_files-%{glibc_major_version}.so
+/%{_lib}/libnss_files-%{version}.so
/%{_lib}/libnss_files.so.2
-/%{_lib}/libnss_hesiod-%{glibc_major_version}.so
+/%{_lib}/libnss_hesiod-%{version}.so
/%{_lib}/libnss_hesiod.so.2
-/%{_lib}/libnss_nis-%{glibc_major_version}.so
+/%{_lib}/libnss_nis-%{version}.so
/%{_lib}/libnss_nis.so.2
-/%{_lib}/libnss_nisplus-%{glibc_major_version}.so
+/%{_lib}/libnss_nisplus-%{version}.so
/%{_lib}/libnss_nisplus.so.2
-/%{_lib}/libpthread-%{glibc_major_version}.so
+/%{_lib}/libpthread-%{version}.so
/%{_lib}/libpthread.so.0
-/%{_lib}/libresolv-%{glibc_major_version}.so
+/%{_lib}/libresolv-%{version}.so
/%{_lib}/libresolv.so.2
-/%{_lib}/librt-%{glibc_major_version}.so
+/%{_lib}/librt-%{version}.so
/%{_lib}/librt.so.1
/%{_lib}/libthread_db-1.0.so
/%{_lib}/libthread_db.so.1
-/%{_lib}/libutil-%{glibc_major_version}.so
+/%{_lib}/libutil-%{version}.so
/%{_lib}/libutil.so.1
%define optimized_libs() \
%dir %attr(0755,root,root) /%{_lib}/%1\
- /%{_lib}/%1/libc-%{glibc_major_version}.so\
+ /%{_lib}/%1/libc-%{version}.so\
/%{_lib}/%1/libc.so.6*\
- /%{_lib}/%1/libm-%{glibc_major_version}.so\
+ /%{_lib}/%1/libm-%{version}.so\
/%{_lib}/%1/libm.so.6*\
- /%{_lib}/%1/libpthread-%{glibc_major_version}.so\
+ /%{_lib}/%1/libpthread-%{version}.so\
/%{_lib}/%1/libpthread.so.0\
- /%{_lib}/%1/librt-%{glibc_major_version}.so\
+ /%{_lib}/%1/librt-%{version}.so\
/%{_lib}/%1/librt.so.1\
/%{_lib}/%1/libthread_db-1.0.so\
/%{_lib}/%1/libthread_db.so.1
glibc-utils.spec: same change
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package glibc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -100,10 +100,9 @@
# 3.1 is the openSUSE 12.1 kernel
%define enablekernel 3.0
-Version: 2.20
+Version: 2.21
Release: 0
-%define glibc_major_version 2.20
-%define git_id b8079dd0d360
+%define git_id 4e42b5b8f89f
Url: http://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Source: glibc-%{version}-%{git_id}.tar.xz
@@ -232,8 +231,8 @@
###
# Patches from upstream
###
-# PATCH-FIX-UPSTREAM Fix misdetected Slow_SSE4_2 cpu feature bit (BZ #17501)
-Patch1000: ifunc-x86-slow-sse4.patch
+# PATCH-FIX-UPSTREAM powerpc: Fix TABORT encoding for little endian
+Patch1000: htm-tabort.patch
###
# Patches awaiting upstream approval
@@ -244,14 +243,14 @@
Patch2002: ldd-system-interp.patch
# PATCH-FIX-UPSTREAM Don't close or flush stdio streams on abort (BZ #15436)
Patch2003: abort-no-flush.patch
-# PATCH-FIX-UPSTREAM Properly handle forced elision in pthread_mutex_trylock (BZ #16657)
-Patch2004: pthread-mutex-trylock-elision.patch
# PATCH-FIX-UPSTREAM Speedup memset on x86-64 for large block sizes (BZ #16830)
Patch2005: glibc-memset-nontemporal.diff
# PATCH-FIX-UPSTREAM Avoid redundant shift character in iconv output at block boundary (BZ #17197)
Patch2006: ibm93x-redundant-shift-si.patch
# PATCH-FIX-UPSTREAM Filter out PTHREAD_MUTEX_NO_ELISION_NP bit in pthread_mutexattr_gettype (BZ #15790)
Patch2007: pthread-mutexattr-gettype-kind.patch
+# PATCH-FIX-UPSTREAM Fix value of O_TMPFILE for architectures with non-default O_DIRECTORY (BZ #17912)
+Patch2008: o-tmpfile.patch
# Non-glibc patches
# PATCH-FIX-OPENSUSE Remove debianisms from manpages
@@ -457,10 +456,10 @@
%patch2000 -p1
%patch2002 -p1
%patch2003 -p1
-%patch2004 -p1
%patch2005 -p1
%patch2006 -p1
%patch2007 -p1
+%patch2008 -p1
%patch3000
@@ -827,7 +826,7 @@
cd cc-noelision
destdir=$RPM_BUILD_ROOT/%{_lib}/noelision
mkdir -p $destdir
-install -m 755 nptl/libpthread.so $destdir/libpthread-%{glibc_major_version}.so
+install -m 755 nptl/libpthread.so $destdir/libpthread-%{version}.so
cd ..
cc-base/elf/ldconfig -vn $destdir
%endif
@@ -950,7 +949,7 @@
%ifarch armv6hl armv7hl
# Provide compatibility link
-ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3
+ln -s ld-%{version}.so %{buildroot}/lib/ld-linux.so.3
%endif
# Move getconf to %{_libexecdir}/getconf/ to avoid cross device link
@@ -1065,7 +1064,7 @@
%doc %{_mandir}/man1/gencat.1.gz
%doc %{_mandir}/man1/getconf.1.gz
%doc %{_mandir}/man5/*
-/%{_lib}/ld-%{glibc_major_version}.so
+/%{_lib}/ld-%{version}.so
# Each architecture has a different name for the dynamic linker:
%ifarch %arm
@@ -1104,58 +1103,58 @@
/%{_lib}/ld-linux-aarch64.so.1
%endif
-/%{_lib}/libBrokenLocale-%{glibc_major_version}.so
+/%{_lib}/libBrokenLocale-%{version}.so
/%{_lib}/libBrokenLocale.so.1
/%{_lib}/libSegFault.so
-/%{_lib}/libanl-%{glibc_major_version}.so
+/%{_lib}/libanl-%{version}.so
/%{_lib}/libanl.so.1
-/%{_lib}/libc-%{glibc_major_version}.so
+/%{_lib}/libc-%{version}.so
/%{_lib}/libc.so.6*
-/%{_lib}/libcidn-%{glibc_major_version}.so
+/%{_lib}/libcidn-%{version}.so
/%{_lib}/libcidn.so.1
-/%{_lib}/libcrypt-%{glibc_major_version}.so
+/%{_lib}/libcrypt-%{version}.so
/%{_lib}/libcrypt.so.1
-/%{_lib}/libowcrypt-%{glibc_major_version}.so
+/%{_lib}/libowcrypt-%{version}.so
/%{_lib}/libowcrypt.so.1
-/%{_lib}/libdl-%{glibc_major_version}.so
+/%{_lib}/libdl-%{version}.so
/%{_lib}/libdl.so.2*
-/%{_lib}/libm-%{glibc_major_version}.so
+/%{_lib}/libm-%{version}.so
/%{_lib}/libm.so.6*
-/%{_lib}/libnsl-%{glibc_major_version}.so
+/%{_lib}/libnsl-%{version}.so
/%{_lib}/libnsl.so.1
-/%{_lib}/libnss_compat-%{glibc_major_version}.so
+/%{_lib}/libnss_compat-%{version}.so
/%{_lib}/libnss_compat.so.2
-/%{_lib}/libnss_db-%{glibc_major_version}.so
+/%{_lib}/libnss_db-%{version}.so
/%{_lib}/libnss_db.so.2
-/%{_lib}/libnss_dns-%{glibc_major_version}.so
+/%{_lib}/libnss_dns-%{version}.so
/%{_lib}/libnss_dns.so.2
-/%{_lib}/libnss_files-%{glibc_major_version}.so
+/%{_lib}/libnss_files-%{version}.so
/%{_lib}/libnss_files.so.2
-/%{_lib}/libnss_hesiod-%{glibc_major_version}.so
+/%{_lib}/libnss_hesiod-%{version}.so
/%{_lib}/libnss_hesiod.so.2
-/%{_lib}/libnss_nis-%{glibc_major_version}.so
+/%{_lib}/libnss_nis-%{version}.so
/%{_lib}/libnss_nis.so.2
-/%{_lib}/libnss_nisplus-%{glibc_major_version}.so
+/%{_lib}/libnss_nisplus-%{version}.so
/%{_lib}/libnss_nisplus.so.2
-/%{_lib}/libpthread-%{glibc_major_version}.so
+/%{_lib}/libpthread-%{version}.so
/%{_lib}/libpthread.so.0
-/%{_lib}/libresolv-%{glibc_major_version}.so
+/%{_lib}/libresolv-%{version}.so
/%{_lib}/libresolv.so.2
-/%{_lib}/librt-%{glibc_major_version}.so
+/%{_lib}/librt-%{version}.so
/%{_lib}/librt.so.1
/%{_lib}/libthread_db-1.0.so
/%{_lib}/libthread_db.so.1
-/%{_lib}/libutil-%{glibc_major_version}.so
+/%{_lib}/libutil-%{version}.so
/%{_lib}/libutil.so.1
%define optimized_libs() \
%dir %attr(0755,root,root) /%{_lib}/%1\
- /%{_lib}/%1/libc-%{glibc_major_version}.so\
+ /%{_lib}/%1/libc-%{version}.so\
/%{_lib}/%1/libc.so.6*\
- /%{_lib}/%1/libm-%{glibc_major_version}.so\
+ /%{_lib}/%1/libm-%{version}.so\
/%{_lib}/%1/libm.so.6*\
- /%{_lib}/%1/libpthread-%{glibc_major_version}.so\
+ /%{_lib}/%1/libpthread-%{version}.so\
/%{_lib}/%1/libpthread.so.0\
- /%{_lib}/%1/librt-%{glibc_major_version}.so\
+ /%{_lib}/%1/librt-%{version}.so\
/%{_lib}/%1/librt.so.1\
/%{_lib}/%1/libthread_db-1.0.so\
/%{_lib}/%1/libthread_db.so.1
++++++ glibc-2.14-crypt.diff ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:39.000000000 +0100
@@ -1,7 +1,7 @@
-Index: glibc-2.19.90/crypt/Makefile
+Index: glibc-2.20/crypt/Makefile
===================================================================
---- glibc-2.19.90.orig/crypt/Makefile
-+++ glibc-2.19.90/crypt/Makefile
+--- glibc-2.20.orig/crypt/Makefile
++++ glibc-2.20/crypt/Makefile
@@ -23,14 +23,18 @@ subdir := crypt
include ../Makeconfig
@@ -23,10 +23,10 @@
ifeq ($(crypt-in-libc),yes)
routines += $(libcrypt-routines)
-Index: glibc-2.19.90/crypt/Versions
+Index: glibc-2.20/crypt/Versions
===================================================================
---- glibc-2.19.90.orig/crypt/Versions
-+++ glibc-2.19.90/crypt/Versions
+--- glibc-2.20.orig/crypt/Versions
++++ glibc-2.20/crypt/Versions
@@ -3,3 +3,8 @@ libcrypt {
crypt; crypt_r; encrypt; encrypt_r; fcrypt; setkey; setkey_r;
}
@@ -36,11 +36,11 @@
+ crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
+ }
+}
-Index: glibc-2.19.90/crypt/crypt-entry.c
+Index: glibc-2.20/crypt/crypt-entry.c
===================================================================
---- glibc-2.19.90.orig/crypt/crypt-entry.c
-+++ glibc-2.19.90/crypt/crypt-entry.c
-@@ -81,7 +81,7 @@ extern struct crypt_data _ufc_foobar;
+--- glibc-2.20.orig/crypt/crypt-entry.c
++++ glibc-2.20/crypt/crypt-entry.c
+@@ -71,7 +71,7 @@ extern struct crypt_data _ufc_foobar;
*/
char *
@@ -49,7 +49,7 @@
const char *key;
const char *salt;
struct crypt_data * __restrict data;
-@@ -155,6 +155,7 @@ __crypt_r (key, salt, data)
+@@ -145,6 +145,7 @@ __crypt_r (key, salt, data)
_ufc_output_conversion_r (res[0], res[1], salt, data);
return data->crypt_3_buf;
}
@@ -57,287 +57,300 @@
weak_alias (__crypt_r, crypt_r)
char *
-@@ -197,3 +198,4 @@ __fcrypt (key, salt)
+@@ -187,3 +188,4 @@ __fcrypt (key, salt)
return crypt (key, salt);
}
#endif
+#endif
-Index: glibc-2.19.90/shlib-versions
+Index: glibc-2.20/crypt/crypt-private.h
===================================================================
---- glibc-2.19.90.orig/shlib-versions
-+++ glibc-2.19.90/shlib-versions
-@@ -93,6 +93,7 @@ sh.*-.*-linux.* ld=ld-linux.so.2 GLIBC_
+--- glibc-2.20.orig/crypt/crypt-private.h
++++ glibc-2.20/crypt/crypt-private.h
+@@ -65,7 +65,7 @@ extern void __encrypt_r (char * __restri
+ struct crypt_data * __restrict __data);
+
+ /* crypt-entry.c */
+-extern char *__crypt_r (const char *__key, const char *__salt,
++extern char *__des_crypt_r (const char *__key, const char *__salt,
+ struct crypt_data * __restrict __data);
+ extern char *fcrypt (const char *key, const char *salt);
+
+Index: glibc-2.20/shlib-versions
+===================================================================
+--- glibc-2.20.orig/shlib-versions
++++ glibc-2.20/shlib-versions
+@@ -88,6 +88,7 @@ sh.*-.*-linux.* ld=ld-linux.so.2 GLIBC_
# This defines the shared library version numbers we will install.
- .*-.*-.* libcrypt=1
-+.*-.*-.* libowcrypt=1
+ libcrypt=1
++libowcrypt=1
# The gross patch for programs assuming broken locale implementations.
- sh.*-.*-.* libBrokenLocale=1 GLIBC_2.2
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/aarch64/libowcrypt.abilist
+ libBrokenLocale=1
+Index: glibc-2.20/sysdeps/unix/sysv/linux/aarch64/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/aarch64/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/aarch64/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/alpha/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/alpha/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/alpha/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/alpha/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/arm/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/arm/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/arm/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/arm/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/hppa/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/hppa/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/hppa/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/hppa/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/i386/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/i386/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/i386/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/i386/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/ia64/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/ia64/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/ia64/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/ia64/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/m68k/coldfire/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/m68k/coldfire/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/m68k/coldfire/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/m68k/coldfire/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/m68k/m680x0/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/m68k/m680x0/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/m68k/m680x0/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/m68k/m680x0/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/microblaze/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/microblaze/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/microblaze/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/microblaze/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/mips/mips32/fpu/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/mips/mips32/fpu/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/mips/mips32/fpu/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/mips/mips32/fpu/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/mips/mips64/n32/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/n32/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/mips/mips64/n32/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/n32/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/mips/mips64/n64/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/n64/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/mips/mips64/n64/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/n64/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt-le.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt-le.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt-le.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt-le.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/s390/s390-32/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-32/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/s390/s390-32/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-32/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/s390/s390-64/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-64/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/s390/s390-64/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-64/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/sh/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/sh/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/sh/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/sh/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/sparc/sparc32/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc32/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/sparc/sparc32/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc32/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/sparc/sparc64/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc64/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/sparc/sparc64/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc64/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/tile/tilepro/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/tile/tilepro/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/tile/tilepro/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/tile/tilepro/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/x86_64/64/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/x86_64/64/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/x86_64/64/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/64/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
+ crypt_gensalt F
+ crypt_gensalt_ra F
+ crypt_gensalt_rn F
-Index: glibc-2.19.90/sysdeps/unix/sysv/linux/x86_64/x32/libowcrypt.abilist
+Index: glibc-2.20/sysdeps/unix/sysv/linux/x86_64/x32/libowcrypt.abilist
===================================================================
--- /dev/null
-+++ glibc-2.19.90/sysdeps/unix/sysv/linux/x86_64/x32/libowcrypt.abilist
++++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/x32/libowcrypt.abilist
@@ -0,0 +1,5 @@
+OW_CRYPT_1.0
+ OW_CRYPT_1.0 A
++++++ glibc-2.2-sunrpc.diff ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:39.000000000 +0100
@@ -2,10 +2,10 @@
http://sourceware.org/bugzilla/show_bug.cgi?id=5379
-Index: glibc-2.17.90/sunrpc/clnt_udp.c
+Index: glibc-2.20/sunrpc/clnt_udp.c
===================================================================
---- glibc-2.17.90.orig/sunrpc/clnt_udp.c
-+++ glibc-2.17.90/sunrpc/clnt_udp.c
+--- glibc-2.20.orig/sunrpc/clnt_udp.c
++++ glibc-2.20/sunrpc/clnt_udp.c
@@ -308,6 +308,7 @@ clntudp_call (cl, proc, xargs, argsp, xr
XDR *xdrs;
int outlen = 0;
@@ -14,7 +14,7 @@
socklen_t fromlen;
struct pollfd fd;
int milliseconds = (cu->cu_wait.tv_sec * 1000) +
-@@ -378,37 +379,36 @@ send_again:
+@@ -378,37 +379,39 @@ send_again:
anyup = 0;
for (;;)
{
@@ -24,12 +24,38 @@
-
case 0:
- if (anyup == 0)
-- {
++ case -1:
++ if (pollresult == 0 || errno == EINTR)
+ {
- anyup = is_network_up (cu->cu_sock);
- if (!anyup)
- return (cu->cu_error.re_status = RPC_CANTRECV);
-- }
--
++ if (anyup == 0)
++ {
++ anyup = is_network_up (cu->cu_sock);
++ if (!anyup)
++ return (cu->cu_error.re_status = RPC_CANTRECV);
++ }
++
++ time_waited.tv_sec += cu->cu_wait.tv_sec;
++ time_waited.tv_usec += cu->cu_wait.tv_usec;
++ while (time_waited.tv_usec >= 1000000)
++ {
++ time_waited.tv_sec++;
++ time_waited.tv_usec -= 1000000;
++ }
++ if ((time_waited.tv_sec < timeout.tv_sec) ||
++ ((time_waited.tv_sec == timeout.tv_sec) &&
++ (time_waited.tv_usec < timeout.tv_usec)))
++ {
++ if (pollresult == 0)
++ goto send_again;
++ else
++ continue;
++ }
++ return (cu->cu_error.re_status = RPC_TIMEDOUT);
+ }
+
- time_waited.tv_sec += cu->cu_wait.tv_sec;
- time_waited.tv_usec += cu->cu_wait.tv_usec;
- while (time_waited.tv_usec >= 1000000)
@@ -47,34 +73,9 @@
- * buggy in other cases because time_waited is not being
- * updated.
- */
- case -1:
+- case -1:
- if (errno == EINTR)
- continue;
-+ if (pollresult == 0 || errno == EINTR) {
-+ if (anyup == 0)
-+ {
-+ anyup = is_network_up (cu->cu_sock);
-+ if (!anyup)
-+ return (cu->cu_error.re_status = RPC_CANTRECV);
-+ }
-+
-+ time_waited.tv_sec += cu->cu_wait.tv_sec;
-+ time_waited.tv_usec += cu->cu_wait.tv_usec;
-+ while (time_waited.tv_usec >= 1000000)
-+ {
-+ time_waited.tv_sec++;
-+ time_waited.tv_usec -= 1000000;
-+ }
-+ if ((time_waited.tv_sec < timeout.tv_sec) ||
-+ ((time_waited.tv_sec == timeout.tv_sec) &&
-+ (time_waited.tv_usec < timeout.tv_usec)))
-+ if (pollresult == 0)
-+ goto send_again;
-+ else
-+ continue;
-+ return (cu->cu_error.re_status = RPC_TIMEDOUT);
-+ }
-+
+ /* errno != EINTR */
cu->cu_error.re_errno = errno;
return (cu->cu_error.re_status = RPC_CANTRECV);
++++++ glibc-2.20.tar.xz -> glibc-2.21.tar.xz ++++++
/work/SRC/openSUSE:Factory/glibc/glibc-2.20.tar.xz /work/SRC/openSUSE:Factory/.glibc.new/glibc-2.21.tar.xz differ: char 25, line 1
++++++ glibc-2.3.90-noversion.diff ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:39.000000000 +0100
@@ -1,8 +1,8 @@
-Index: glibc-2.19.90/elf/rtld.c
+Index: glibc-2.20/elf/rtld.c
===================================================================
---- glibc-2.19.90.orig/elf/rtld.c
-+++ glibc-2.19.90/elf/rtld.c
-@@ -1740,6 +1740,52 @@ ERROR: ld.so: object '%s' cannot be load
+--- glibc-2.20.orig/elf/rtld.c
++++ glibc-2.20/elf/rtld.c
+@@ -1591,6 +1591,52 @@ ERROR: ld.so: object '%s' cannot be load
}
}
++++++ glibc-nodate.patch ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:39.000000000 +0100
@@ -1,7 +1,7 @@
-Index: glibc-2.17.90/nscd/nscd_stat.c
+Index: glibc-2.20.90/nscd/nscd_stat.c
===================================================================
---- glibc-2.17.90.orig/nscd/nscd_stat.c
-+++ glibc-2.17.90/nscd/nscd_stat.c
+--- glibc-2.20.90.orig/nscd/nscd_stat.c
++++ glibc-2.20.90/nscd/nscd_stat.c
@@ -36,8 +36,13 @@
#endif /* HAVE_SELINUX */
@@ -9,11 +9,24 @@
-/* We use this to make sure the receiver is the same. */
+/* We use this to make sure the receiver is the same. Capture mtime
+ of this file if possible. */
-+#if defined(__TIMESTAMP__)
-+static const char compilation[21] = __TIMESTAMP__;
++#ifdef __TIMESTAMP__
++static const char compilation[21];
+#else
static const char compilation[21] = __DATE__ " " __TIME__;
+#endif
/* Statistic data for one database. */
struct dbstat
+@@ -96,7 +101,12 @@ send_stats (int fd, struct database_dyn
+
+ memset (&data, 0, sizeof (data));
+
++#ifdef __TIMESTAMP__
++ /* Skip day of the week. */
++ memcpy (data.version, __TIMESTAMP__ + 4, sizeof (compilation));
++#else
+ memcpy (data.version, compilation, sizeof (compilation));
++#endif
+ data.debug_level = debug_level;
+ data.runtime = time (NULL) - start_time;
+ data.client_queued = client_queued;
++++++ glibc-resolv-mdnshint.diff ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:39.000000000 +0100
@@ -1,12 +1,12 @@
-Index: glibc-2.17.90/resolv/res_hconf.c
+Index: glibc-2.20/resolv/res_hconf.c
===================================================================
---- glibc-2.17.90.orig/resolv/res_hconf.c
-+++ glibc-2.17.90/resolv/res_hconf.c
+--- glibc-2.20.orig/resolv/res_hconf.c
++++ glibc-2.20/resolv/res_hconf.c
@@ -240,9 +240,12 @@ parse_line (const char *fname, int line_
if (c == NULL)
{
char *buf;
-+ char *hint = "";
++ const char *hint = "";
- if (__asprintf (&buf, _("%s: line %d: bad command `%s'\n"),
- fname, line_num, start) < 0)
++++++ glibc-version.diff ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:39.000000000 +0100
@@ -8,7 +8,7 @@
static const char banner[] =
-"GNU C Library "PKGVERSION RELEASE" release version "VERSION", by Roland McGrath et al.\n\
+"GNU C Library "PKGVERSION RELEASE" release version "VERSION" (git "GITID"), by Roland McGrath et al.\n\
- Copyright (C) 2014 Free Software Foundation, Inc.\n\
+ Copyright (C) 2015 Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
PARTICULAR PURPOSE.\n\
++++++ htm-tabort.patch ++++++
2015-02-12 Adhemerval Zanella <azanella(a)linux.vnet.ibm.com>
* sysdeps/unix/sysv/linux/powerpc/htm.h [TABORT]: Fix encoding for
little endian.
Index: glibc-2.21/sysdeps/unix/sysv/linux/powerpc/htm.h
===================================================================
--- glibc-2.21.orig/sysdeps/unix/sysv/linux/powerpc/htm.h
+++ glibc-2.21/sysdeps/unix/sysv/linux/powerpc/htm.h
@@ -60,7 +60,7 @@
#define TBEGIN ".long 0x7c00051d"
#define TEND ".long 0x7c00055d"
#if __BYTE_ORDER == __LITTLE_ENDIAN
-# define TABORT ".byte 0x1d,0x07,%1,0x1d"
+# define TABORT ".byte 0x1d,0x07,%1,0x7c"
#else
# define TABORT ".byte 0x7c,%1,0x07,0x1d"
#endif
++++++ noversion.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/noversion/shlib-versions new/noversion/shlib-versions
--- old/noversion/shlib-versions 1999-05-06 16:30:55.000000000 +0200
+++ new/noversion/shlib-versions 2014-10-27 16:45:12.000000000 +0100
@@ -1,3 +1,2 @@
# The libNoVersion revision number
-.*-.*-.* libNoVersion=1
-
+libNoVersion=1
++++++ o-tmpfile.patch ++++++
>From 127ffc81a8565bebd134c0f43afba5ae7997bf97 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab(a)suse.de>
Date: Sun, 1 Feb 2015 14:04:15 +0100
Subject: [PATCH] Fix value of O_TMPFILE for architectures with non-default
O_DIRECTORY
[BZ #17912]
* sysdeps/unix/sysv/linux/bits/fcntl-linux.h (__O_TMPFILE): Define
in terms of __O_DIRECTORY.
---
sysdeps/unix/sysv/linux/bits/fcntl-linux.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
index 3d28c84..d2baeb3 100644
--- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
@@ -97,7 +97,7 @@
# define __O_DSYNC 010000
#endif
#ifndef __O_TMPFILE
-# define __O_TMPFILE 020200000
+# define __O_TMPFILE (020000000 | __O_DIRECTORY)
#endif
#ifndef F_GETLK
--
2.2.2
++++++ pthread-mutexattr-gettype-kind.patch ++++++
--- /var/tmp/diff_new_pack.dfpFAU/_old 2015-02-22 17:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.dfpFAU/_new 2015-02-22 17:19:39.000000000 +0100
@@ -24,7 +24,7 @@
@@ -253,7 +253,7 @@ tests = tst-typesizes \
tst-exit1 tst-exit2 tst-exit3 \
tst-stdio1 tst-stdio2 \
- tst-stack1 tst-stack2 tst-stack3 tst-pthread-getattr \
+ tst-stack1 tst-stack2 tst-stack3 tst-stack4 tst-pthread-getattr \
- tst-pthread-attr-affinity \
+ tst-pthread-attr-affinity tst-pthread-mutexattr \
tst-unload \
--
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 logwatch for openSUSE:Factory checked in at 2015-02-20 13:51:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/logwatch (Old)
and /work/SRC/openSUSE:Factory/.logwatch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "logwatch"
Changes:
--------
--- /work/SRC/openSUSE:Factory/logwatch/logwatch.changes 2013-12-11 11:29:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.logwatch.new/logwatch.changes 2015-02-20 13:51:03.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Feb 20 10:50:41 UTC 2015 - p.drouand(a)gmail.com
+
+- Update to version 7.4.1
+ * No changelog available
+- Remove logwatch-parse_rsyslog_timestamps.patch; merged on upstream
+ release
+- Spec file clean up
+ * Remove obsolete macros
+ * Remove redundant %clean section
+
+-------------------------------------------------------------------
Old:
----
logwatch-7.4.0.tar.bz2
logwatch-parse_rsyslog_timestamps.patch
New:
----
logwatch-7.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ logwatch.spec ++++++
--- /var/tmp/diff_new_pack.KuECc8/_old 2015-02-20 13:51:04.000000000 +0100
+++ /var/tmp/diff_new_pack.KuECc8/_new 2015-02-20 13:51:04.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package logwatch
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,29 +16,21 @@
#
-#package changed name with SLE11
-%if 0%{?suse_version} < 1100
-%define date_manip_pkg perl-DateManip
-%else
-%define date_manip_pkg perl-Date-Manip
-%endif
-
Name: logwatch
Summary: Analyzes and Reports on system logs
License: MIT
Group: System/Monitoring
-Version: 7.4.0
+Version: 7.4.1
Release: 0
Url: http://www.logwatch.org
BuildArch: noarch
-Source0: logwatch-%{version}.tar.bz2
+Source0: http://sourceforge.net/projects/logwatch/files/%{name}-%{version}/%{name}-%…
Source1: %{name}-rpmlintrc
Source2: Logwatch_Dmeventd_Setup_Files.tar.xz
Patch0: logwatch-firewall.patch
Patch2: logwatch-timestamp_in_var.patch
Patch3: logwatch-dmeventd-reduce_frequency.patch
-Patch4: logwatch-parse_rsyslog_timestamps.patch
-Requires: %date_manip_pkg
+Requires: perl-Date-Manip
Requires: cron
Requires: grep
Requires: mailx
@@ -61,7 +53,6 @@
%patch0
%patch2
%patch3
-%patch4
dos2unix scripts/services/courier
%build
@@ -114,9 +105,6 @@
rpm -qa --queryformat='%%{name}/%%{version}/%%{release}/%%{arch}\n'| sort | bzip2 -9 > USEDFORBUILD.bz2
#
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%doc README HOWTO-Customize-LogWatch
--
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-highline for openSUSE:Factory checked in at 2015-02-20 13:50:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-highline (Old)
and /work/SRC/openSUSE:Factory/.rubygem-highline.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-highline"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-highline/rubygem-highline.changes 2014-11-04 17:30:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-highline.new/rubygem-highline.changes 2015-02-20 13:51:01.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Feb 20 05:30:05 UTC 2015 - coolo(a)suse.com
+
+- updated to version 1.7.0
+
+-------------------------------------------------------------------
Old:
----
highline-1.6.21.gem
New:
----
highline-1.7.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-highline.spec ++++++
--- /var/tmp/diff_new_pack.Al8mvs/_old 2015-02-20 13:51:02.000000000 +0100
+++ /var/tmp/diff_new_pack.Al8mvs/_new 2015-02-20 13:51:02.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-highline
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-highline
-Version: 1.6.21
+Version: 1.7.0
Release: 0
%define mod_name highline
%define mod_full_name %{mod_name}-%{version}
@@ -33,7 +33,7 @@
BuildRequires: %{rubygem rdoc > 3.10}
BuildRequires: %{ruby}
BuildRequires: ruby-macros >= 5
-Url: http://highline.rubyforge.org
+Url: https://github.com/JEG2/highline
Source: http://rubygems.org/gems/%{mod_full_name}.gem
Source1: gem2rpm.yml
Summary: HighLine is a high-level command-line IO library
@@ -54,7 +54,7 @@
%install
%gem_install \
- --doc-files="CHANGELOG COPYING LICENSE README.rdoc" \
+ --doc-files="COPYING Changelog.md LICENSE README.rdoc" \
-f
# MANUAL
find %{buildroot}%{_libdir}/ruby/gems/*/gems/%{mod_name}-%{version} -name .gitignore -delete
++++++ highline-1.6.21.gem -> highline-1.7.0.gem ++++++
++++ 1623 lines of diff (skipped)
--
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 grub2 for openSUSE:Factory checked in at 2015-02-20 13:50:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2015-02-06 10:56:07.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-02-20 13:50:51.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Feb 16 16:25:50 UTC 2015 - arvidjaar(a)gmail.com
+
+- add luks, gcry_rijndael, gcry_sha1 to signed EFI image to support
+ LUKS partition in default setup (boo#917427)
+
+-------------------------------------------------------------------
+Thu Feb 5 09:37:46 UTC 2015 - mchang(a)suse.com
+
+- enable i386-xen (boo#891043)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.nMT5YR/_old 2015-02-20 13:50:53.000000000 +0100
+++ /var/tmp/diff_new_pack.nMT5YR/_new 2015-02-20 13:50:53.000000000 +0100
@@ -55,6 +55,8 @@
BuildRequires: openssl >= 0.9.8
BuildRequires: pesign-obs-integration
%endif
+%endif
+%ifarch %{ix86} x86_64
BuildRequires: xen-devel
%endif
@@ -107,6 +109,14 @@
%endif
%endif
+%ifarch %{ix86}
+%define grubxenarch i386-xen
+%endif
+
+%ifarch x86_64
+%define grubxenarch x86_64-xen
+%endif
+
%if 0%{?suse_version} == 1110
%define only_efi %{nil}
%define only_x86_64 %{nil}
@@ -306,16 +316,16 @@
%endif
-%ifarch x86_64
+%ifarch %{ix86} x86_64
-%package %{_target_cpu}-xen
+%package %{grubxenarch}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System/Boot
Provides: %{name}-xen = %{version}-%{release}
Obsoletes: %{name}-xen < %{version}-%{release}
-%description %{_target_cpu}-xen
+%description %{grubxenarch}
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
bootloader with modular architecture. It supports rich variety of kernel formats,
file systems, computer architectures and hardware devices. This subpackage
@@ -433,7 +443,7 @@
%ifarch %{efi}
mkdir build-efi
%endif
-%ifarch x86_64
+%ifarch %{ix86} x86_64
mkdir build-xen
%endif
@@ -452,7 +462,7 @@
export CFLAGS CXXFLAGS FFLAGS
export HOST_CFLAGS=$RPM_OPT_FLAGS
-%ifarch x86_64
+%ifarch %{ix86} x86_64
cd build-xen
../configure \
TARGET_LDFLAGS=-static \
@@ -478,7 +488,7 @@
legacy_configfile /boot/grub/menu.lst
fi
EOF
-./grub-mkstandalone --grub-mkimage=./grub-mkimage -o grub.xen -O %{_target_cpu}-xen -d grub-core/ "/boot/grub/grub.cfg=./grub.cfg"
+./grub-mkstandalone --grub-mkimage=./grub-mkimage -o grub.xen -O %{grubxenarch} -d grub-core/ "/boot/grub/grub.cfg=./grub.cfg"
cd ..
%endif
@@ -504,6 +514,7 @@
password_pbkdf2 png reboot search search_fs_uuid \
search_fs_file search_label sleep test video fat loadenv"
PXE_MODULES="efinet tftp"
+CRYPTO_MODULES="luks gcry_rijndael gcry_sha1"
%ifarch x86_64
CD_MODULES="${CD_MODULES} linuxefi"
@@ -511,7 +522,7 @@
CD_MODULES="${CD_MODULES} linux"
%endif
-GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} mdraid09 mdraid1x lvm"
+GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES} mdraid09 mdraid1x lvm"
./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \
-d grub-core ${GRUB_MODULES}
#./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \
@@ -576,10 +587,10 @@
%install
-%ifarch x86_64
+%ifarch %{ix86} x86_64
cd build-xen
make DESTDIR=$RPM_BUILD_ROOT install
-install -m 644 grub.xen $RPM_BUILD_ROOT%{_libdir}/%{name}/%{_target_cpu}-xen/.
+install -m 644 grub.xen $RPM_BUILD_ROOT%{_libdir}/%{name}/%{grubxenarch}/.
cd ..
%endif
@@ -943,10 +954,10 @@
%config %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
%{_libdir}/snapper/plugins/grub
-%ifarch x86_64
-%files %{_target_cpu}-xen
-%dir %{_libdir}/%{name}/%{_target_cpu}-xen
-%{_libdir}/%{name}/%{_target_cpu}-xen/*
+%ifarch %{ix86} x86_64
+%files %{grubxenarch}
+%dir %{_libdir}/%{name}/%{grubxenarch}
+%{_libdir}/%{name}/%{grubxenarch}/*
%endif
%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 openSUSE-EULAs for openSUSE:Factory checked in at 2015-02-20 13:50:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-EULAs (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-EULAs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-EULAs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-EULAs/openSUSE-EULAs.changes 2014-07-17 06:57:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openSUSE-EULAs.new/openSUSE-EULAs.changes 2015-02-20 13:50:50.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jul 28 21:00:03 CEST 2014 - sbrabec(a)suse.cz
+
+- openSUSE-EULAs-13.2.tar.bz2: Add AdobeICCProfiles.en required by
+ the license agreement (bnc#886454).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-EULAs-13.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-EULAs-13.2/AdobeICCProfiles.en new/openSUSE-EULAs-13.2/AdobeICCProfiles.en
--- old/openSUSE-EULAs-13.2/AdobeICCProfiles.en 1970-01-01 01:00:00.000000000 +0100
+++ new/openSUSE-EULAs-13.2/AdobeICCProfiles.en 2014-03-04 15:36:09.000000000 +0100
@@ -0,0 +1,325 @@
+ADOBE SYSTEMS INCORPORATED
+
+COLOR PROFILE LICENSE AGREEMENT NOTICE TO USER: PLEASE READ THIS CONTRACT
+CAREFULLY. BY USING ALL OR ANY PORTION OF THE SOFTWARE YOU ACCEPT ALL THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. YOU AGREE THAT THIS AGREEMENT IS
+ENFORCEABLE LIKE ANY WRITTEN NEGOTIATED AGREEMENT SIGNED BY YOU. IF YOU
+DO NOT AGREE WITH THE TERMS OF THIS AGREEMENT, DO NOT USE THE SOFTWARE.
+
+1. DEFINITIONS In this Agreement, "Adobe" means Adobe Systems
+Incorporated, a Delaware corporation, located at 345 Park Avenue, San
+Jose, California 95110. "Software" means the software and related items
+with which this Agreement is provided, as listed in Exhibit A.
+
+2. LICENSE Subject to the terms of this Agreement, Adobe hereby grants
+you the worldwide, non-exclusive, nontransferable, royalty-free license
+to use, reproduce and publicly display the Software. Adobe also grants
+you the rights to distribute the Software: (a) on a standalone basis, (b)
+as embedded within digital image files. (c) as embedded within hardware
+products that author digital images, where there is no End User access
+to the Software, and (d) as bundled with your own application software,
+provided that you comply with all the distribution requirements in
+Section 3 below. No other distribution of the Software is allowed. All
+individual profiles must be referenced by their ICC Profile description
+string. YOU MAY NOT MODIFY THE SOFTWARE. Adobe is under no obligation to
+provide any support under this Agreement, including upgrades or future
+versions of the Software or other items. No title to the intellectual
+property in the Software is transferred to you under the terms of this
+Agreement. You do not acquire any rights to the Software except as
+expressly set forth in this Agreement.
+
+Notwithstanding the above, if you are bundling with Linux or Unix software
+products, you may (a) add shortcut or menu items within your software
+that point to the Software, but may not change the name or iconography
+of the Software, (b) repackage the RPM or Gzip versions of the Software
+for distribution purposes, and (c) create a graphical user interface as
+otherwise specifically allowed by instructions found at www.adobe.com
+or http://partners.adobe.com (e.g., installation of additional plug-in
+and help files) but may not add, delete, or modify any components of
+the Software without the explicit written permission of Adobe.
+
+3. DISTRIBUTION If you choose to distribute the Software, you do so with
+the understanding that you agree to defend, indemnify and hold harmless
+Adobe against any losses, damages or costs arising from any claims,
+lawsuits or other legal actions arising out of such distribution,
+including, without limitation, product liability and other claims
+by consumers and your failure to comply with this Section 3. If you
+distribute the Software on a standalone or bundled basis, you will do
+so by first obtaining the agreement of the end user under the terms of
+either the Adobe End User License Agreement (?Adobe EULA?), attached as
+Exhibit B, or your own license agreement which (a) complies with the
+terms and conditions of this Agreement; (b) effectively disclaims all
+warranties and conditions, express or implied, on behalf of Adobe; (c)
+effectively excludes all liability for damages on behalf of Adobe; (d)
+substantially states that any provisions that differ from this Agreement
+are offered by you alone and not Adobe; and (e) substantially states that
+the Software is available from you or Adobe and informs licensees how to
+obtain it in a reasonable manner on or through a medium customarily used
+for software exchange. Any distributed Software will include the Adobe
+copyright notices as included in the Software provided to you by Adobe.
+
+4. DISCLAIMER OF WARRANTY Adobe licenses the Software to you on an "AS IS"
+basis. Adobe makes no representation as to the adequacy of the Software
+for any particular purpose or to produce any particular result. Adobe
+shall not be liable for loss or damage arising out of this Agreement or
+from the distribution or use of the Software or any other materials. ADOBE
+AND ITS SUPPLIERS DO NOT AND CANNOT WARRANT THE PERFORMANCE OR RESULTS
+YOU MAY OBTAIN BY USING THE SOFTWARE, EXCEPT FOR ANY WARRANTY, CONDITION,
+REPRESENTATION OR TERM TO THE EXTENT TO WHICH THE SAME CANNOT OR MAY NOT
+BE EXCLUDED OR LIMITED BY LAW APPLICABLE TO YOU IN YOUR JURISDICTION,
+ADOBE AND ITS SUPPLIERS MAKE NO WARRANTIES, CONDITIONS, REPRESENTATIONS
+OR TERMS, EXPRESS OR IMPLIED, WHETHER BY STATUTE, COMMON LAW, CUSTOM,
+USAGE OR OTHERWISE AS TO ANY OTHER MATTERS, INCLUDING BUT NOT LIMITED
+TO NON-INFRINGEMENT OF THIRD PARTY RIGHTS, INTEGRATION, SATISFACTORY
+QUALITY OR FITNESS FOR ANY PARTICULAR PURPOSE. YOU MAY HAVE ADDITIONAL
+RIGHTS WHICH VARY FROM JURISDICTION TO JURISDICTION. The provisions
+of Sections 4 and 5 shall survive the termination of this Agreement,
+howsoever caused, but this shall not imply or create any continued right
+to use the Software after termination of this Agreement.
+
+5. LIMITATION OF LIABILITY IN NO EVENT WILL ADOBE OR ITS SUPPLIERS
+BE LIABLE TO YOU FOR ANY DAMAGES, CLAIMS OR COSTS WHATSOEVER OR ANY
+CONSEQUENTIAL, INDIRECT, INCIDENTAL DAMAGES, OR ANY LOST PROFITS OR
+LOST SAVINGS, EVEN IF AN ADOBE REPRESENTATIVE HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS OR FOR ANY CLAIM BY
+ANY THIRD PARTY. THE FOREGOING LIMITATIONS AND EXCLUSIONS APPLY TO THE
+EXTENT PERMITTED BY APPLICABLE LAW IN YOUR JURISDICTION. ADOBE'S AGGREGATE
+LIABILITY AND THAT OF ITS SUPPLIERS UNDER OR IN CONNECTION WITH THIS
+AGREEMENT SHALL BE LIMITED TO THE AMOUNT PAID FOR THE SOFTWARE. Nothing
+contained in this Agreement limits Adobe's liability to you in the event
+of death or personal injury resulting from Adobe's negligence or for
+the tort of deceit (fraud). Adobe is acting on behalf of its suppliers
+for the purpose of disclaiming, excluding and/or limiting obligations,
+warranties and liability as provided in this Agreement, but in no other
+respects and for no other purpose.
+
+6. TRADEMARKS Adobe grants you a worldwide, nonexclusive, nontransferable,
+personal right to use the "Adobe" word trademark (the "Trademark")
+solely to identify Adobe as the source of the Adobe RGB (1998) product
+or Adobe RGB technology, so long as such use complies with the terms of
+this Agreement, the trademark guidelines available at the "Permissions
+and trademarks" pages of the Adobe web site (www.adobe.com) and the "Adobe
+Trademark Guidelines for third parties who license, use or refer to Adobe
+trademarks," also available from the Adobe web site. You acknowledge the
+validity of the Trademark and Adobe?s ownership of the Trademark. Nothing
+in this Agreement shall give you any right, title or interest in the
+Trademark, other than the license rights granted in this Agreement. You
+recognize the value of the goodwill associated with the Trademark and
+acknowledge that such goodwill exclusively inures to the benefit of
+and belongs to Adobe. Adobe and the Adobe logo are either registered
+trademarks or trademarks of Adobe in the United States and/or other
+countries. With the exception of referential use and the rights granted
+in this Agreement, you will not use such trademarks or any other Adobe
+trademark or logo without separate prior written permission from Adobe.
+
+7. TERM This Agreement is effective until terminated. Adobe has the right
+to terminate this Agreement immediately if you fail to comply with any
+term hereof. Upon any such termination, you must return to Adobe all
+full and partial copies of the Software in your possession or control.
+
+8. GOVERNMENT REGULATIONS If any part of the Software is identified as an
+export controlled item under the United States Export Administration Act
+or any other export law, restriction or regulation (the "Export Laws"),
+you represent and warrant that you are not a citizen, or otherwise
+located within, an embargoed nation (including without limitation Iran,
+Iraq, Syria, Sudan, Libya, Cuba, North Korea, and Serbia) and that you
+are not otherwise prohibited under the Export Laws from receiving the
+Software. All rights to use the Software are granted on condition that
+such rights are forfeited if you fail to comply with the terms of this
+Agreement.
+
+9. GOVERNING LAW This Agreement will be governed by and construed in
+accordance with the substantive laws in force in the State of California
+as such laws are applied to agreements entered into and to be performed
+entirely within California between California residents. This Agreement
+will not be governed by the conflict of law rules of any jurisdiction or
+the United Nations Convention on Contracts for the International Sale
+of Goods, the application of which is expressly excluded. All disputes
+arising out of, under or related to this Agreement will be brought
+exclusively in the state Santa Clara County, California, USA.
+
+10. GENERAL You may not assign your rights or obligations granted under
+this Agreement without the prior written consent of Adobe. None of the
+provisions of this Agreement shall be deemed to have been waived by
+any act or acquiescence on the part of Adobe, its agents, or employees,
+but only by an instrument in writing signed by an authorized signatory
+of Adobe. When conflicting language exists between this Agreement and
+any other agreement included in the Software, the terms of such included
+agreement shall apply. If either you or Adobe employs attorneys to enforce
+any rights arising out of or relating to this Agreement, the prevailing
+party shall be entitled to recover reasonable attorneys? fees. You
+acknowledge that you have read this Agreement, understand it, and that
+it is the complete and exclusive statement of your agreement with Adobe
+which supersedes any prior agreement, oral or written, between Adobe and
+you with respect to the licensing to you of the Software. No variation
+of the terms of this Agreement will be enforceable against Adobe unless
+Adobe gives its express consent, in writing, signed by an authorized
+signatory of Adobe.
+
+Exhibit A
+
+The "Software" for the purposes of this Agreement and which Licensee
+is permitted to distribute subject to the terms and conditions of this
+Agreement, shall consist of one or more of the following color profiles:
+
+3 RGB profiles
+
+Adobe RGB (1998) Apple RGB ColorMatch RGB
+
+12 CMYK profiles
+
+Coated FOGRA27 (ISO 12647-2:2004) Web Coated FOGRA28 (ISO 12647-2:2004)
+Uncoated FOGRA29 (ISO 12647-2:2004) Coated FOGRA39 (ISO 12647-2:2004)
+Japan Color 2001 Coated Japan color 2001 Uncoated Japan Color 2002
+Newspaper Japan Web Coated (Ad) U.S. Sheetfed Coated v2 U.S. Sheetfed
+Uncoated v2 U.S. Web Coated (SWOP) v2 U.S. Web Uncoated v2
+
+EXHIBIT B
+
+ADOBE SYSTEMS INCORPORATED
+
+COLOR PROFILE LICENSE AGREEMENT
+
+NOTICE TO USER: PLEASE READ THIS CONTRACT CAREFULLY. BY USING ALL OR
+ANY PORTION OF THE SOFTWARE YOU ACCEPT ALL THE TERMS AND CONDITIONS OF
+THIS AGREEMENT. YOU AGREE THAT THIS AGREEMENT IS ENFORCEABLE LIKE ANY
+WRITTEN NEGOTIATED AGREEMENT SIGNED BY YOU. IF YOU DO NOT AGREE WITH
+THE TERMS OF THIS AGREEMENT, DO NOT USE THE SOFTWARE.
+
+1. DEFINITIONS In this Agreement,"Adobe" means Adobe Systems Incorporated,
+a Delaware corporation, located at 345 Park Avenue, San Jose, California
+95110. "Software" means the software and related items with which this
+Agreement is provided.
+
+2. LICENSE Subject to the terms of this Agreement, Adobe hereby grants
+you the worldwide, non-exclusive, nontransferable, royalty-free license
+to use, reproduce and publicly display the Software. Adobe also grants
+you the rights to distribute the Software only (a) as embedded within
+digital image files and (b) on a standalone basis. No other distribution
+of the Software is allowed; including, without limitation, distribution
+of the Software when incorporated into or bundled with any application
+software. All individual profiles must be referenced by their ICC
+Profile description string. You may not modify the Software. Adobe
+is under no obligation to provide any support under this Agreement,
+including upgrades or future versions of the Software or other items. No
+title to the intellectual property in the Software is transferred to you
+under the terms of this Agreement. You do not acquire any rights to the
+Software except as expressly set forth in this Agreement.
+
+3. DISTRIBUTION If you choose to distribute the Software, you do so with
+the understanding that you agree to defend, indemnify and hold harmless
+Adobe against any losses, damages or costs arising from any claims,
+lawsuits or other legal actions arising out of such distribution,
+including without limitation, your failure to comply with this Section
+3. If you distribute the Software on a standalone basis, you will do
+so under the terms of this Agreement or your own license agreement
+which (a) complies with the terms and conditions of this Agreement; (b)
+effectively disclaims all warranties and conditions, express or implied,
+on behalf of Adobe; (c) effectively excludes all liability for damages
+on behalf of Adobe; (d) substantially states that any provisions that
+differ from this Agreement are offered by you alone and not Adobe and (e)
+substantially states that the Software is available from you or Adobe and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange. Any distributed Software
+will include the Adobe copyright notices as included in the Software
+provided to you by Adobe.
+
+4. DISCLAIMER OF WARRANTY Adobe licenses the Software to you on an "AS IS"
+basis. Adobe makes no representation as to the adequacy of the Software
+for any particular purpose or to produce any particular result. Adobe
+shall not be liable for loss or damage arising out of this Agreement or
+from the distribution or use of the Software or any other materials. ADOBE
+AND ITS SUPPLIERS DO NOT AND CANNOT WARRANT THE PERFORMANCE OR RESULTS
+YOU MAY OBTAIN BY USING THE SOFTWARE, EXCEPT FOR ANY WARRANTY, CONDITION,
+REPRESENTATION OR TERM TO THE EXTENT TO WHICH THE SAME CANNOT OR MAY NOT
+BE EXCLUDED OR LIMITED BY LAW APPLICABLE TO YOU IN YOUR JURISDICTION,
+ADOBE AND ITS SUPPLIERS MAKE NO WARRANTIES, CONDITIONS, REPRESENTATIONS
+OR TERMS, EXPRESS OR IMPLIED, WHETHER BY STATUTE, COMMON LAW, CUSTOM,
+USAGE OR OTHERWISE AS TO ANY OTHER MATTERS, INCLUDING BUT NOT LIMITED
+TO NON-INFRINGEMENT OF THIRD PARTY RIGHTS, INTEGRATION, SATISFACTORY
+QUALITY OR FITNESS FOR ANY PARTICULAR PURPOSE. YOU MAY HAVE ADDITIONAL
+RIGHTS WHICH VARY FROM JURISDICTION TO JURISDICTION. The provisions
+of Sections 4 and 5 shall survive the termination of this Agreement,
+howsoever caused, but this shall not imply or create any continued right
+to use the Software after termination of this Agreement.
+
+5. LIMITATION OF LIABILITY IN NO EVENT WILL ADOBE OR ITS SUPPLIERS
+BE LIABLE TO YOU FOR ANY DAMAGES, CLAIMS OR COSTS WHATSOEVER OR ANY
+CONSEQUENTIAL, INDIRECT, INCIDENTAL DAMAGES, OR ANY LOST PROFITS OR
+LOST SAVINGS, EVEN IF AN ADOBE REPRESENTATIVE HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS OR FOR ANY CLAIM BY
+ANY THIRD PARTY. THE FOREGOING LIMITATIONS AND EXCLUSIONS APPLY TO THE
+EXTENT PERMITTED BY APPLICABLE LAW IN YOUR JURISDICTION. ADOBE'S AGGREGATE
+LIABILITY AND THAT OF ITS SUPPLIERS UNDER OR IN CONNECTION WITH THIS
+AGREEMENT SHALL BE LIMITED TO THE AMOUNT PAID FOR THE SOFTWARE. Nothing
+contained in this Agreement limits Adobe's liability to you in the event
+of death or personal injury resulting from Adobe's negligence or for
+the tort of deceit (fraud). Adobe is acting on behalf of its suppliers
+for the purpose of disclaiming, excluding and/or limiting obligations,
+warranties and liability as provided in this Agreement, but in no other
+respects and for no other purpose.
+
+6. TRADEMARKS Adobe grants you a worldwide, nonexclusive, nontransferable,
+personal right to use the "Adobe" word trademark (the "Trademark")
+solely to identify Adobe as the source of the Adobe RGB (1998) product
+or Adobe RGB technology, so long as such use complies with the terms of
+this Agreement, the trademark guidelines available at the "Permissions
+and trademarks" pages of the Adobe web site (www.adobe.com) and the
+"Adobe Trademark Guidelines for third parties who license, use or
+refer to Adobe trademarks," also available from the Adobe web site. You
+acknowledge the validity of the Trademark and Adobe?s ownership of the
+Trademark. Nothing in this Agreement shall give you any right, title
+or interest in the Trademark, other than the license rights granted in
+this Agreement. You recognize the value of the goodwill associated with
+the Trademark and acknowledge that such goodwill exclusively inures to
+the benefit of and belongs to Adobe. Adobe and the Adobe logo are either
+registered trademarks or trademarks of Adobe in the United States and/or
+other countries. With the exception of referential use and the rights
+granted in this Agreement, you will not use such trademarks or any other
+Adobe trademark or logo without separate prior written permission granted
+by Adobe.
+
+7. TERM This Agreement is effective until terminated. Adobe has the right
+to terminate this Agreement immediately if you fail to comply with any
+term hereof. Upon any such termination, you must return to Adobe all
+full and partial copies of the Software in your possession or control.
+
+8. GOVERNMENT REGULATIONS If any part of the Software is identified as an
+export controlled item under the United States Export Administration Act
+or any other export law, restriction or regulation (the "Export Laws"),
+you represent and warrant that you are not a citizen, or otherwise
+located within, an embargoed nation (including without limitation Iran,
+Iraq, Syria, Sudan, Libya, Cuba, North Korea, and Serbia) and that you
+are not otherwise prohibited under the Export Laws from receiving the
+Software. All rights to use the Software are granted on condition that
+such rights are forfeited if you fail to comply with the terms of this
+Agreement.
+
+9. GOVERNING LAW This Agreement will be governed by and construed in
+accordance with the substantive laws in force in the State of California
+as such laws are applied to agreements entered into and to be performed
+entirely within California between California residents. This Agreement
+will not be governed by the conflict of law rules of any jurisdiction or
+the United Nations Convention on Contracts for the International Sale
+of Goods, the application of which is expressly excluded. All disputes
+arising out of, under or related to this Agreement will be brought
+exclusively in the state Santa Clara County, California, USA.
+
+10. GENERAL You may not assign your rights or obligations granted under
+this Agreement without the prior written consent of Adobe. None of the
+provisions of this Agreement shall be deemed to have been waived by
+any act or acquiescence on the part of Adobe, its agents, or employees,
+but only by an instrument in writing signed by an authorized signatory
+of Adobe. When conflicting language exists between this Agreement and
+any other agreement included in the Software, the terms of such included
+agreement shall apply. If either you or Adobe employs attorneys to enforce
+any rights arising out of or relating to this Agreement, the prevailing
+party shall be entitled to recover reasonable attorneys? fees. You
+acknowledge that you have read this Agreement, understand it, and that
+it is the complete and exclusive statement of your agreement with Adobe
+which supersedes any prior agreement, oral or written, between Adobe and
+you with respect to the licensing to you of the Software. No variation
+of the terms of this Agreement will be enforceable against Adobe unless
+Adobe gives its express consent, in writing, signed by an authorized
+signatory of Adobe.
+
--
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 caribou for openSUSE:Factory checked in at 2015-02-20 13:50:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caribou (Old)
and /work/SRC/openSUSE:Factory/.caribou.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caribou"
Changes:
--------
--- /work/SRC/openSUSE:Factory/caribou/caribou.changes 2014-11-29 08:39:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.caribou.new/caribou.changes 2015-02-20 13:50:49.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Feb 16 15:18:19 UTC 2015 - dimstar(a)opensuse.org
+
+- Update to version 0.4.17:
+ + Bundle tools to generate and manipulate keyboard layout files.
+ + bgo#691811: Add support for azerty layout as seen in french.
+ + bgo#743267: Caribou does 100-130 syscalls for each keypress.
+ + bgo#743880: String that is hard to understand.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
caribou-0.4.16.tar.xz
New:
----
caribou-0.4.17.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caribou.spec ++++++
--- /var/tmp/diff_new_pack.e97Y2y/_old 2015-02-20 13:50:50.000000000 +0100
+++ /var/tmp/diff_new_pack.e97Y2y/_new 2015-02-20 13:50:50.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package caribou
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX 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,7 +17,7 @@
Name: caribou
-Version: 0.4.16
+Version: 0.4.17
Release: 0
# FIXME: Stop hiding the .desktop file with %%suse_update_desktop_file -u if launching caribou finally works
Summary: On-screen Keyboard for GNOME
++++++ caribou-0.4.16.tar.xz -> caribou-0.4.17.tar.xz ++++++
++++ 23790 lines of diff (skipped)
--
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 librsvg for openSUSE:Factory checked in at 2015-02-20 13:50:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/librsvg (Old)
and /work/SRC/openSUSE:Factory/.librsvg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librsvg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/librsvg/librsvg.changes 2014-12-09 09:16:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.librsvg.new/librsvg.changes 2015-02-20 13:50:48.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Feb 16 15:41:43 UTC 2015 - dimstar(a)opensuse.org
+
+- Update to version 2.40.7:
+ + Fixed unfiled bug from fuzz testing, where the convolution
+ filter had an integer multiplication overflow.
+ + Fix build of rsvg-convert on Windows.
+ + Fix a bunch of compiler warnings.
+ + Bugs fixed from fuzz testing: bgo#703102, bgo#738050,
+ bgo#738169, bgo#744270, bgo#744299.
+
+-------------------------------------------------------------------
Old:
----
librsvg-2.40.6.tar.xz
New:
----
librsvg-2.40.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ librsvg.spec ++++++
--- /var/tmp/diff_new_pack.wTDN0n/_old 2015-02-20 13:50:49.000000000 +0100
+++ /var/tmp/diff_new_pack.wTDN0n/_new 2015-02-20 13:50:49.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package librsvg
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX 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,7 +17,7 @@
Name: librsvg
-Version: 2.40.6
+Version: 2.40.7
Release: 0
Summary: A Library for Rendering SVG Data
License: LGPL-2.0+ and GPL-2.0+
++++++ librsvg-2.40.6.tar.xz -> librsvg-2.40.7.tar.xz ++++++
++++ 10621 lines of diff (skipped)
--
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 cups for openSUSE:Factory checked in at 2015-02-20 13:50:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cups (Old)
and /work/SRC/openSUSE:Factory/.cups.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cups/cups.changes 2014-11-29 08:39:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2015-02-20 13:50:46.000000000 +0100
@@ -2 +2 @@
-Tue Nov 25 16:13:50 CET 2014 - jsmeix(a)suse.de
+Thu Feb 12 13:50:58 UTC 2015 - tchvatal(a)suse.com
@@ -4,15 +4 @@
-- Refresh and/or clean up the systemd units that belong to CUPS
- (cups.service cups.socket cups.path) via RPM posttrans scriplet
- in a generic way via "systemctl --force reenable" (bnc#904215).
- An enabled systemd unit may need a refresh via
- "systemctl --force reenable" after updating a package when
- the new package had installed a changed systemd unit file.
- A disabled systemd unit also may need a refresh via
- "systemctl --force reenable" but then it is again disabled.
- A systemd unit may become obsolete by updating a package when
- the new package does no longer provide a unit file. In this
- case "systemctl --force reenable" removes the unit.
- In any case currently running services are not stopped even
- when the new package does no longer provide the unit file
- because a RPM package update must not automatically disrupt
- (stop or restart) running services.
+- Add back the posttrans cleanup script as it is needed
@@ -21 +7 @@
-Tue Nov 4 13:26:04 CET 2014 - jsmeix(a)suse.de
+Thu Feb 12 09:22:30 UTC 2015 - tchvatal(a)suse.com
@@ -23,5 +9,2 @@
-- Also for SLE12 krb5-devel must be used for build
- (cf. the entry below dated "Wed Jun 26 10:39:30 CEST 2013")
- because in contrast to IBS where krb5-mini-devel is available
- for build in SUSE:SLE-12:GA in OBS it cannot build for SLE_12
- with "unresolvable: nothing provides krb5-mini-devel".
+- Add patch cups-systemd-socket.patch to fix socket activation
+ and to match socket approach Fedora has.
@@ -30 +13 @@
-Mon Oct 13 09:30:49 UTC 2014 - gber(a)opensuse.org
+Thu Feb 12 09:12:05 UTC 2015 - tchvatal(a)suse.com
@@ -32,2 +15,7 @@
-- use Settings;Printing;HardwareSettings desktop file category
- instead of System category in the desktop file
+- Version bump to 2.0.2:
+ * Security: cupsRasterReadPixels buffer overflow with invalid page header and
+ compressed raster data (STR #4551)
+ * Mapping of PPD keywords to IPP keywords did not work if the PPD keyword was
+ already an IPP keyword (<rdar://problem/19121005>)
+ * cupsGetPPD* sent bad requests (STR #4567)
+ * For detailed list see CHANGES.txt file
@@ -36 +24 @@
-Tue Sep 2 15:48:23 CEST 2014 - jsmeix(a)suse.de
+Thu Feb 12 09:10:09 UTC 2015 - tchvatal(a)suse.com
@@ -38,5 +26 @@
-- Let fdupes only create symlinks in /usr/share/cups/templates/ to
- avoid a symlink /usr/share/cups/webcontent/images/cups-icon.png
- because the cupsd web server does no longer follow symlinks
- to avoid the security issues mentioned in the previous entry
- below (fixes bnc#892587 a regression of bnc#887240).
+- Enable PIE for build
@@ -45 +29 @@
-Tue Sep 2 15:26:36 CEST 2014 - jsmeix(a)suse.de
+Fri Jan 30 10:44:47 UTC 2015 - tchvatal(a)suse.com
@@ -47,6 +31,2 @@
-- str4450.CVE-2014-3537.str4455.CVE-2014-5029.CVE-2014-5030.CVE-2014-5031.CUPS-1.5.4.patch
- fixes that the web interface incorrectly served symlinked files
- and files that were not world-readable, potentially leading to
- a disclosure of information (CVE-2014-3537 STR #4450 plus the
- subsequent CVE-2014-5029 CVE-2014-5030 CVE-2014-5031 STR #4455
- all in bnc#887240).
+- Remove legacy paralel-port support as it is not really needed
+ as most do not want it
@@ -55 +35 @@
-Thu May 22 10:16:17 UTC 2014 - werner(a)suse.de
+Fri Jan 30 10:39:41 UTC 2015 - tchvatal(a)suse.com
@@ -57,2 +37,6 @@
-- Add build require pkgconfig(libsystemd-daemon) to allow to move
- systemd.pc back to systemd package
+- Update descriptions to just state what changed and let user
+ find it out.
+- Add back comment about %fdupes
+- Remove exit 0 on scriptlets as it is provided by the %service bla
+ ones already
+- Fix the comment about openSUSE version on tmpfilesdir declaration
@@ -61 +45 @@
-Fri Apr 11 09:42:30 CEST 2014 - jsmeix(a)suse.de
+Fri Jan 16 16:00:20 UTC 2015 - tchvatal(a)suse.com
@@ -63,3 +47,33 @@
-- cups-1.5.4-strftime.patch fixes CUPS upstream STR #4388:
- no or malformed output from lpstat in charset other than utf-8
- (bnc#873030).
+- cups-2.0.1 update:
+ * lengthy list of changes see the upstream CHANGES.txt that is
+ distributed with the package
+ * Disabling of sslv3 to mitigate poodle
+- Use gnutls to provide SSLOPtions configuration directive
+ * openssl is no longer supported upstream
+ * Remove the with-openssl-exception from license
+- Remove cups.sysconfig as it is not used with systemd based distros
+- Purposely lose support for SLE11 as it doubles size of some of the
+ sections and keep suppor for openSUSE+SLE12
+ * even with the conditions we would have to go unencrypted only
+ as needs newer gnutls, so don't bother with keeping the compat
+- Use upstream service and socket files to allow more working tools
+- Removed patches:
+ * cups-0001-systemd-add-systemd-socket-activation-and-unit-files.patch
+ * cups-0002-systemd-listen-only-on-localhost-for-socket-activation.patch
+ * cups-0003-systemd-secure-cups.service-unit-file.patch
+ * cups-1.3.6-access_conf.patch
+ * cups-1.5-additional_policies.patch
+ * cups-1.5.4-CVE-2012-5519.patch
+ * cups-1.5.4-strftime.patch
+ * cups-move-everything-to-run.patch
+ * cups-polld_avoid_busy_loop.patch
+ * cups-provides-cupsd-service.patch
+ * str4190.patch
+ * str4351.patch
+ * str4450.CVE-2014-3537.str4455.CVE-2014-5029.CVE-2014-5030.CVE-2014-5031.CUPS-1.5.4.patch
+- Refreshed patches:
+ * cups-1.3.9-desktop_file.patch
+ * cups-config-libs.patch
+- Added patches:
+ * cups-1.7-additional_policies.patch
+ * cups-systemd-socket.patch
@@ -68 +82 @@
-Thu Feb 20 13:57:24 CET 2014 - jsmeix(a)suse.de
+Tue Sep 23 13:57:31 CEST 2014 - ro(a)suse.de
@@ -70,15 +84,96 @@
-- Cautious clean up of systemd units via RPM scriptlets
- (see the entry below dated "Wed Feb 19 15:05:44 CET 2014")
- does not work reliable because it would leave a messsed up
- systemd setup for cupsd when YaST was used before
- to start/stop/enable/disable the cupsd, see
- https://bugzilla.novell.com/show_bug.cgi?id=857372#c115
- so that now cups.socket and cups.path are stopped and disabled
- in any case to ensure starting/stopping/enabling/disabling
- of the cupsd also works with YaST, see
- https://bugzilla.novell.com/show_bug.cgi?id=857372#c120
- (bnc#857372).
-- str4351.patch from CUPS upstream fixes
- https://www.cups.org/str.php?L4351
- "STR #4351 cups-lpd hugh jobs (>2G) fail"
- (bnc#864782).
+- change BuildRequires for systemd to pkgconfig(systemd)
+ and pkgconfig(libsystemd-daemon) to avoid build-cycles
+
+-------------------------------------------------------------------
+Mon Aug 25 13:19:19 CEST 2014 - jsmeix(a)suse.de
+
+- Version upgrade to 1.7.5:
+ CUPS 1.7.5 addresses some minor issues and expands upon the
+ symlink security protection. Changes include (excerpt):
+ * Security: Addressed some more situations where symlinked
+ files would be served by the web interface (CVE-2014-5029
+ CVE-2014-5030 CVE-2014-5031 STR #4455 and bnc#887240).
+ * The LPD backend did not work with some versions
+ of glibc (STR #4452)
+ * CGI scripts did not work (STR #4454)
+- str4455-1.7.patch (see the previous entry below)
+ is obsolete because it is fixed upstream since CUPS 1.7.5.
+- Let fdupes only create symlinks in /usr/share/cups/templates/ to
+ avoid a symlink /usr/share/cups/webcontent/images/cups-icon.png
+ because since CUPS 1.7.4/1.7.5 the cupsd web server does
+ no longer follow symlinks to avoid the security issues
+ mentioned in the previous two entries below
+ (fixes bnc#892587 a regression of bnc#887240).
+
+-------------------------------------------------------------------
+Tue Jul 29 16:41:10 CEST 2014 - jsmeix(a)suse.de
+
+- str4455-1.7.patch complements the incomplete fix for
+ CVE-2014-3537 STR#445 in the CUPS 1.7.4 sources
+ to fix the subsequent CVE-2014-5029 CVE-2014-5030
+ CVE-2014-5031 STR#4455 (bnc#887240).
+
+-------------------------------------------------------------------
+Tue Jul 15 11:13:14 CEST 2014 - jsmeix(a)suse.de
+
+- Version upgrade to 1.7.4:
+ CUPS 1.7.4 fixes several networking and build issues,
+ and addresses a symlink security issue CVE-2014-3537.
+ Changes since 1.7.3 include (excerpt):
+ * Security: The web interface incorrectly served symlinked files
+ and files that were not world-readable, potentially leading to
+ a disclosure of information (CVE-2014-3537, STR #4450,
+ and bnc#887240).
+ * The "snmp" option did not work with the network backends
+ (STR #4422).
+ * The User directive in client.conf did not override the USER
+ environment variable (STR #4426).
+ * The web interface now properly shows a "Go" button for
+ all text-based browsers (STR #4425).
+ * The MaxJobTime directive now properly supports time
+ values (STR #4434).
+ * Fixed an "IPP read error" race condition issue (STR #4440).
+
+-------------------------------------------------------------------
+Mon Jun 2 13:21:31 CEST 2014 - jsmeix(a)suse.de
+
+- Version upgrade to 1.7.3:
+ CUPS 1.7.3 includes a number of general bug fixes.
+ Changes since 1.7.2 include (excerpt):
+ * Fixed mapping of OutputBin values such as "Tray1".
+ * Several ippGet* functions incorrectly returned -1
++++ 499 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/cups/cups.changes
++++ and /work/SRC/openSUSE:Factory/.cups.new/cups.changes
Old:
----
PSLEVEL1.PPD.bz2
PSLEVEL2.PPD.bz2
cups-0001-systemd-add-systemd-socket-activation-and-unit-files.patch
cups-0002-systemd-listen-only-on-localhost-for-socket-activation.patch
cups-0003-systemd-secure-cups.service-unit-file.patch
cups-1.3.6-access_conf.patch
cups-1.5-additional_policies.patch
cups-1.5.4-CVE-2012-5519.patch
cups-1.5.4-source.tar.bz2
cups-1.5.4-strftime.patch
cups-move-everything-to-run.patch
cups-polld_avoid_busy_loop.patch
cups-provides-cupsd-service.patch
cups.init
cups.sysconfig
cups.xinetd
postscript.ppd.bz2
str4190.patch
str4351.patch
str4450.CVE-2014-3537.str4455.CVE-2014-5029.CVE-2014-5030.CVE-2014-5031.CUPS-1.5.4.patch
New:
----
Postscript-level1.ppd.gz
Postscript-level2.ppd.gz
Postscript.ppd.gz
cups-1.7-additional_policies.patch
cups-2.0.2-source.tar.bz2
cups-systemd-socket.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
++++ 1097 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/cups/cups.spec
++++ and /work/SRC/openSUSE:Factory/.cups.new/cups.spec
++++++ cups-1.3.9-desktop_file.patch ++++++
--- /var/tmp/diff_new_pack.16NrQH/_old 2015-02-20 13:50:47.000000000 +0100
+++ /var/tmp/diff_new_pack.16NrQH/_new 2015-02-20 13:50:47.000000000 +0100
@@ -6,7 +6,7 @@
[Desktop Entry]
-Categories=System;Printing;HardwareSettings;X-Red-Hat-Base;
-Exec=@CUPS_HTMLVIEW@ http://localhost:631/
-+Categories=Settings;Printing;HardwareSettings;
++Categories=System;Printing;Settings;HardwareSettings;
+Exec=desktop-launch http://localhost:631/
+NotShowIn=GNOME;
Icon=cups
++++++ cups-1.5-additional_policies.patch -> cups-1.7-additional_policies.patch ++++++
--- /work/SRC/openSUSE:Factory/cups/cups-1.5-additional_policies.patch 2014-02-07 10:25:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cups.new/cups-1.7-additional_policies.patch 2015-02-20 13:50:46.000000000 +0100
@@ -1,9 +1,12 @@
---- conf/cupsd.conf.in.orig 2014-01-29 14:31:32.000000000 +0100
-+++ conf/cupsd.conf.in 2014-01-29 15:20:30.000000000 +0100
-@@ -136,6 +136,39 @@ WebInterface @CUPS_WEBIF@
+Index: conf/cupsd.conf.in
+===================================================================
+--- conf/cupsd.conf.in.orig
++++ conf/cupsd.conf.in
+@@ -127,3 +127,36 @@ WebInterface @CUPS_WEBIF@
+ Order deny,allow
</Limit>
</Policy>
-
++
+# The policy below is added by SUSE during build of our cups package.
+# The policy 'allowallforanybody' is totally open and insecure and therefore
+# it can only be used within an internal network where only trused users exist
@@ -14,7 +17,7 @@
+# print jobs from an internal network to any external destination, see
+# http://en.opensuse.org/SDB:CUPS_in_a_Nutshell
+# For documentation regarding 'Managing Operation Policies' see
-+# http://www.cups.org/documentation.php/doc-1.5/policies.html
++# http://www.cups.org/documentation.php/doc-1.7/policies.html
+<Policy allowallforanybody>
+ # Allow anybody to access job's private values:
+ JobPrivateAccess all
@@ -36,7 +39,3 @@
+</Policy>
+# Explicitly set the CUPS 'default' policy to be used by default:
+DefaultPolicy default
-+
- #
- # End of "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $".
- #
++++++ cups-1.5.4-source.tar.bz2 -> cups-2.0.2-source.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/cups/cups-1.5.4-source.tar.bz2 /work/SRC/openSUSE:Factory/.cups.new/cups-2.0.2-source.tar.bz2 differ: char 11, line 1
++++++ cups-client.conf ++++++
--- /var/tmp/diff_new_pack.16NrQH/_old 2015-02-20 13:50:47.000000000 +0100
+++ /var/tmp/diff_new_pack.16NrQH/_new 2015-02-20 13:50:47.000000000 +0100
@@ -1,77 +1,28 @@
-# Sample client configuration file for the Common UNIX Printing System
-# (CUPS).
-#
-# Copyright 1997-2005 by Easy Software Products, all rights reserved.
-# Klaus Singvogel <kssingvo(a)suse.de> modified it for SUSE distribution.
-#
-# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info(a)cups.org
-# WWW: http://www.cups.org
-#
+# CUPS client configuration file (optional).
-########################################################################
-# #
-# This is the CUPS client configuration file. This file is used to #
-# define client-specific parameters, such as the default server or #
-# default encryption settings. #
-# #
-# Put this file on /etc/cups/client.conf (system use) or #
-# ~/.cups/client.conf (personal use). #
-# #
-# more information in the manual page client.conf(5)
-########################################################################
+# You may use /etc/cups/client.conf (system wide)
+# or ~/.cups/client.conf (per user).
+# For more information see "man 5 client.conf".
-#
-# Encryption: directive specifies the default encryption settings for
-# the client.
-#
-# Possible values:
-#
-# IfRequested
-# Never
-# Required
-# Always
-#
-# The default value is "IfRequested".
-# This parameter can also be set # using the CUPS_ENCRYPTION environment
-# variable.
-#
+# The ServerName directive specifies the remote server
+# that is to be used for all client operations. That is, it
+# redirects all client requests directly to that remote server
+# so that a local running cupsd is not used in this case.
+# The default is to use the local server ("localhost") or domain socket.
+# Only one ServerName directive may appear.
+# If multiple names are present, only the last one is used.
+# The default port number is 631 but can be overridden by adding
+# a colon followed by the desired port number.
+# The default IPP version is 2.0 but can be overridden by adding
+# a slash followed by version=V where V is 1.0 or 1.1 or 2.0 or 2.1 or 2.2.
+# IPP version 2.0 does do not work with CUPS 1.3 or older servers.
+# If an CUPS 1.3 or older server is used, its older IPP version
+# must be specified as .../version=1.1 or .../version=1.0.
-#Encryption IfRequested
-#Encryption Never
-#Encryption Required
-#Encryption Always
+# Examples:
+# ServerName sever.example.com
+# ServerName 192.0.2.10
+# ServerName sever.example.com:8631
+# ServerName older.server.example.com/version=1.1
+# ServerName older.server.example.com:8631/version=1.1
-#
-# ServerName: directive specifies sets the remote server that is to be
-# used for all client operations. That is, it redirects all client
-# requests to the remote server.
-#
-# By default CUPS will use the domain socket /var/run/cups/cups.sock or
-# local server ("localhost"), if so configured. The value can be
-# overwritten by the CUPS_SERVER environment variable.
-#
-# The default port number is 631 but can be overridden by adding a colon
-# followed by the desired port number to the value.
-#
-# ONLY ONE SERVER NAME MAY BE SPECIFIED AT A TIME. To use more than one
-# server you must use a local scheduler with browsing and possibly
-# polling.
-#
-
-#ServerName /domain/socket
-#ServerName foo.bar.com
-#ServerName 11.22.33.444
-#ServerName foo.bar.com:8631
++++++ cups-config-libs.patch ++++++
--- /var/tmp/diff_new_pack.16NrQH/_old 2015-02-20 13:50:47.000000000 +0100
+++ /var/tmp/diff_new_pack.16NrQH/_new 2015-02-20 13:50:47.000000000 +0100
@@ -1,13 +1,11 @@
---- cups-config.in.orig
-+++ cups-config.in
-@@ -35,8 +35,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+--- cups-config.in.orig 2011-08-27 11:23:01.000000000 +0200
++++ cups-config.in 2012-11-27 15:47:27.000000000 +0100
+@@ -35,7 +35,7 @@ INSTALLSTATIC=@INSTALLSTATIC@
# flags for C++ compiler:
CFLAGS=""
LDFLAGS="@EXPORT_LDFLAGS@"
--LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@"
--IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@"
+-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBS=""
-+IMGLIBS=""
# Check for local invocation...
selfdir=`dirname $0`
++++++ cups-systemd-socket.patch ++++++
diff -up cups-2.0.2/cups/usersys.c.ustTJg cups-2.0.2/cups/usersys.c
--- cups-2.0.2/cups/usersys.c.ustTJg 2015-02-10 13:40:24.294545077 +0100
+++ cups-2.0.2/cups/usersys.c 2015-02-10 13:46:56.763989233 +0100
@@ -1017,7 +1017,7 @@ cups_finalize_client_conf(
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
- (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
+ (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET);
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
--- cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
+++ cups-2.0.2/scheduler/main.c 2015-02-10 13:40:24.295545063 +0100
@@ -658,8 +658,15 @@ main(int argc, /* I - Number of comm
#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
if (OnDemand)
+ {
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
- else
+# ifdef HAVE_SYSTEMD
+ sd_notifyf(0, "READY=1\n"
+ "STATUS=Scheduler is running...\n"
+ "MAINPID=%lu",
+ (unsigned long) getpid());
+# endif /* HAVE_SYSTEMD */
+ } else
#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
--- cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg 2014-03-21 15:50:24.000000000 +0100
+++ cups-2.0.2/scheduler/org.cups.cupsd.path.in 2015-02-10 13:40:24.295545063 +0100
@@ -2,7 +2,7 @@
Description=CUPS Scheduler
[Path]
-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+PathExistsGlob=@CUPS_REQUESTS@/d*
[Install]
WantedBy=multi-user.target
diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
--- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg 2014-10-21 13:55:01.000000000 +0200
+++ cups-2.0.2/scheduler/org.cups.cupsd.service.in 2015-02-10 13:40:24.296545049 +0100
@@ -1,10 +1,11 @@
[Unit]
Description=CUPS Scheduler
Documentation=man:cupsd(8)
+After=network.target
[Service]
ExecStart=@sbindir@/cupsd -l
-Type=simple
+Type=notify
[Install]
Also=org.cups.cupsd.socket org.cups.cupsd.path
--
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 gnome-control-center for openSUSE:Factory checked in at 2015-02-20 13:50:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old)
and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2015-01-29 09:55:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes 2015-02-20 13:50:43.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Feb 13 21:53:31 UTC 2015 - zaitor(a)opensuse.org
+
+- Add
+ gnome-control-center-power-fix-initial-state-of-Bluetooth.patch:
+ The initial state of the switch was never set, so if it happened
+ to be on, the switch didn't match reality (bgo#725654).
+
+-------------------------------------------------------------------
New:
----
gnome-control-center-power-fix-initial-state-of-Bluetooth.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.ynXYaf/_old 2015-02-20 13:50:44.000000000 +0100
+++ /var/tmp/diff_new_pack.ynXYaf/_new 2015-02-20 13:50:44.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-control-center
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -49,6 +49,8 @@
Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch
# PATCH-FIX-UPSTREAM gnome-control-center-NM-1.0.patch dimstar(a)opensuse.org -- Allow to operate with NetworkManager 1.0
Patch18: gnome-control-center-NM-1.0.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-power-fix-initial-state-of-Bluetooth.patch bgo#725654 zaitor(a)opensuse.org. -- Fix initial state of Bluetooth switch, taken from upstream git.
+Patch19: gnome-control-center-power-fix-initial-state-of-Bluetooth.patch
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -187,6 +189,7 @@
#NEEDS-REBASE
#patch14 -p1
%patch18 -p1
+%patch19 -p1
%build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
++++++ gnome-control-center-power-fix-initial-state-of-Bluetooth.patch ++++++
>From aa594a7f145a88b737b781375c0f5bf681a43c74 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess(a)hadess.net>
Date: Wed, 28 Jan 2015 16:20:23 +0100
Subject: power: Fix initial state of Bluetooth switch
The initial state of the switch was never set, so if it happened to be
on, the switch didn't match reality.
https://bugzilla.gnome.org/show_bug.cgi?id=725654
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 9b0449e..5df8049 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1663,6 +1663,8 @@ add_power_saving_section (CcPowerPanel *self)
G_CALLBACK (bt_powered_state_changed), self);
g_signal_connect (G_OBJECT (priv->bt_switch), "notify::active",
G_CALLBACK (bt_switch_changed), self);
+
+ bt_powered_state_changed (self);
}
#endif
--
cgit v0.10.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 yast2-country for openSUSE:Factory checked in at 2015-02-20 13:50:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2015-02-14 13:51:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2015-02-20 13:50:41.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Feb 13 14:40:53 UTC 2015 - lslezak(a)suse.cz
+
+- Propose local time when running in a VMware VM, do not display
+ a warning when local time is selected (bnc#773323)
+- 3.1.19
+
+-------------------------------------------------------------------
Old:
----
yast2-country-3.1.18.tar.bz2
New:
----
yast2-country-3.1.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.y5chA4/_old 2015-02-20 13:50:42.000000000 +0100
+++ /var/tmp/diff_new_pack.y5chA4/_new 2015-02-20 13:50:42.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.18
+Version: 3.1.19
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -33,6 +33,13 @@
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
+# For tests
+BuildRequires: rubygem(rspec)
+# Fix to bnc#891053 (proper reading of ".target.yast2" on chroots)
+BuildRequires: yast2-core >= 3.1.12
+# RSpec extensions for YaST
+BuildRequires: yast2-ruby-bindings >= 3.1.26
+
Requires: timezone
Requires: yast2-perl-bindings
Requires: yast2-trans-stats
@@ -47,6 +54,8 @@
Conflicts: yast2-ntp-client < 2.18.0
# wrapper_storage.ycp
Requires: yast2-packager >= 2.23.3
+# VMware detection (.probe.is_vmware)
+Requires: yast2-hardware-detection >= 3.1.6
Requires: yast2-country-data
++++++ yast2-country-3.1.18.tar.bz2 -> yast2-country-3.1.19.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/.coveralls.yml new/yast2-country-3.1.19/.coveralls.yml
--- old/yast2-country-3.1.18/.coveralls.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/.coveralls.yml 2015-02-16 13:59:13.000000000 +0100
@@ -0,0 +1 @@
+service_name: travis-ci
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/.travis.yml new/yast2-country-3.1.19/.travis.yml
--- old/yast2-country-3.1.18/.travis.yml 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/.travis.yml 2015-02-16 13:59:13.000000000 +0100
@@ -5,12 +5,14 @@
# disable rvm, use system Ruby
- rvm reset
- wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/tr…
- - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-ruby-bindings yast2-perl-bindings" -g "rspec:2.14.1 yast-rake gettext"
+ - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-ruby-bindings yast2-perl-bindings" -g "rspec:2.14.1 yast-rake gettext simplecov coveralls"
script:
- rake check:syntax
- rake check:pot
- - make -f Makefile.cvs
- - make
- - sudo make install
- - make check
+ - make -s -f Makefile.cvs
+ - make -s
+ - sudo make -s install
+ - make -s check
+ # evaluate code coverage for RSpec tests
+ - COVERAGE=1 rake test:unit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/README.markdown new/yast2-country-3.1.19/README.markdown
--- old/yast2-country-3.1.18/README.markdown 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/README.markdown 2015-02-16 13:59:13.000000000 +0100
@@ -2,6 +2,7 @@
[![Travis Build](https://travis-ci.org/yast/yast-country.svg?branch=master)](https://…
[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-country-m…
+[![Coverage Status](https://coveralls.io/repos/yast/yast-country/badge.svg)](https://coveralls.io/r/yast/yast-country)
Country specific data and configuration modules (language, keyboard,
timezone) for YaST2.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/keyboard/test/SCRStub.rb new/yast2-country-3.1.19/keyboard/test/SCRStub.rb
--- old/yast2-country-3.1.18/keyboard/test/SCRStub.rb 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/keyboard/test/SCRStub.rb 2015-02-16 13:59:13.000000000 +0100
@@ -15,13 +15,6 @@
# end
#
module SCRStub
- YAST2_PATH = Yast::Path.new(".target.yast2")
- YCP_PATH = Yast::Path.new(".target.ycp")
- SIZE_PATH = Yast::Path.new(".target.size")
- BASH_PATH = Yast::Path.new(".target.bash")
- STRING_PATH = Yast::Path.new(".target.string")
- REMOVE_PATH = Yast::Path.new(".target.remove")
-
# Ensures that non-stubbed SCR calls still works as expected after including
# the module in the testsuite
# different methods of the module
@@ -33,45 +26,13 @@
end
end
- # Encapsulates subsequent SCR calls into a chroot.
- #
- # Raises an exception if something goes wrong.
- #
- # @param [#to_s] directory to use as '/' for SCR calls
- def set_root_path(directory)
- check_version = false
- @scr_handle = Yast::WFM.SCROpen("chroot=#{directory}:scr", check_version)
- raise "Error creating the chrooted scr instance" if @scr_handle < 0
- Yast::WFM.SCRSetDefault(@scr_handle)
- # Temporary workaround for bug bnc#891053 in yast2-core
- # Stubs all calls to target.yast2 until the bug is fixed
- allow(Yast::SCR).to receive(:Read).with(YAST2_PATH, anything) do |*args|
- Yast::SCR.Read(YCP_PATH, File.join("/data", args[1]))
- end
- end
-
- # Resets the SCR calls to default behaviour, closing the SCR instance open by
- # #set_root_path.
- #
- # Raises an exception if #set_root_path has not been called before (or if the
- # corresponding instance has already been closed)
- #
- # @see #set_root_path
- def reset_root_path
- default_handle = Yast::WFM.SCRGetDefault
- if default_handle != @scr_handle
- raise "Error closing the chrooted scr instance, it's not the current default one"
- end
- @scr_handle = nil
- Yast::WFM.SCRClose(default_handle)
- end
-
# Stub calls to .target.size (used to check for the presence of a file)
#
# @param file to 'simulate'
def stub_presence_of(file)
# Returning any value > 0 will suffice
- allow(Yast::SCR).to receive(:Read).with(SIZE_PATH, file).and_return(256)
+ allow(Yast::SCR).to receive(:Read).with(path(".target.size"), file)
+ .and_return(256)
end
# Defines an expectation about executing commands using SCR.Execute and
@@ -80,7 +41,7 @@
# @return [MessageExpectation] an expectation (that can be further customized
# with usual RSpec methods)
def expect_to_execute(command)
- expect(Yast::SCR).to(receive(:Execute).with(BASH_PATH, command))
+ expect(Yast::SCR).to(receive(:Execute).with(path(".target.bash"), command))
end
# Stub all calls to SCR.Write storing the value for future comparison
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/keyboard/test/keyboard_test.rb new/yast2-country-3.1.19/keyboard/test/keyboard_test.rb
--- old/yast2-country-3.1.18/keyboard/test/keyboard_test.rb 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/keyboard/test/keyboard_test.rb 2015-02-16 13:59:13.000000000 +0100
@@ -12,7 +12,7 @@
import "AsciiFile"
import "XVersion"
- RSpec.configure do |c|
+ ::RSpec.configure do |c|
c.include SCRStub
end
@@ -36,7 +36,9 @@
# Stub the configuration writing...
stub_scr_write
# ...but allow the dump_xkbctrl helper to use SCR.Write
- allow(SCR).to receive(:Write).with(SCRStub::STRING_PATH, anything, anything).and_call_original
+ allow(SCR).to receive(:Write)
+ .with(path(".target.string"), anything, anything).and_call_original
+ allow(SCR).to receive(:Read).with(path(".probe.keyboard.manual")).and_return([])
end
context "during installation" do
@@ -165,9 +167,9 @@
rule = "# Generated by Yast to handle the layout of keyboards connected during installation\n"
rule += 'ENV{ID_INPUT_KEYBOARD}=="1", ENV{XKBLAYOUT}="es", ENV{XKBMODEL}="microsoftpro", ENV{XKBVARIANT}="basic"'
file = "/usr/lib/udev/rules.d/70-installation-keyboard.rules"
- expect(SCR).to receive(:Execute).with(SCRStub::REMOVE_PATH, file)
- expect(SCR).to receive(:Write).with(SCRStub::STRING_PATH, file, "#{rule}\n")
- expect(SCR).to receive(:Write).with(SCRStub::STRING_PATH, file, nil)
+ expect(SCR).to receive(:Execute).with(path(".target.remove"), file)
+ expect(SCR).to receive(:Write).with(path(".target.string"), file, "#{rule}\n")
+ expect(SCR).to receive(:Write).with(path(".target.string"), file, nil)
Keyboard.SetKeyboard("spanish")
Keyboard.SetX11("spanish")
@@ -186,8 +188,9 @@
end
expect_to_execute(/setxkbmap .*layout tr/)
- expect(SCR).to_not receive(:Execute).with(SCRStub::REMOVE_PATH, anything)
- expect(SCR).to_not receive(:Write).with(SCRStub::STRING_PATH,
+ expect(SCR).to_not receive(:Execute)
+ .with(path(".target.remove"), anything)
+ expect(SCR).to_not receive(:Write).with(path(".target.string"),
"/etc/udev/rules.d/70-keyboard.rules",
anything)
Keyboard.SetKeyboard("turkish")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/keyboard/test/test_helper.rb new/yast2-country-3.1.19/keyboard/test/test_helper.rb
--- old/yast2-country-3.1.18/keyboard/test/test_helper.rb 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/keyboard/test/test_helper.rb 2015-02-16 13:59:13.000000000 +0100
@@ -1,8 +1,8 @@
-require 'rspec'
+require_relative "../../test/test_helper.rb"
+require "fileutils"
+
SRC_PATH = File.expand_path("../../src", __FILE__)
DATA_PATH = File.join(File.expand_path(File.dirname(__FILE__)), "data")
-ENV["Y2DIR"] = SRC_PATH
-require "yast"
# Used to Emulate the behaviour of
# /usr/sbin/xkbctrl xx.map.gz > /tmp/yy/xkbctrl.out
@@ -37,13 +37,13 @@
]
END
end
- Yast::SCR.Execute(Yast::Path.new(".target.mkdir"), File.dirname(file))
- Yast::SCR.Write(Yast::Path.new(".target.string"), file, content)
+ Yast::SCR.Execute(path(".target.mkdir"), File.dirname(file))
+ Yast::SCR.Write(path(".target.string"), file, content)
end
# Closes the SCR instance open by set_root_path and cleans the chroot
def cleanup_root_path(directory)
- reset_root_path
+ reset_scr_root
FileUtils.rmtree(File.join(DATA_PATH, directory, "tmp"))
FileUtils.rmtree(File.join(DATA_PATH, directory, "data"))
end
@@ -55,7 +55,7 @@
FileUtils.cp_r(File.join(SRC_PATH, "data"), File.join(DATA_PATH, directory))
# chroot SCR
root = File.join(DATA_PATH, directory)
- set_root_path(root)
+ change_scr_root(root)
# In its current implementation import cannot be safelly loaded
# without the previous mocking and chrooting
import_keyboard
@@ -66,7 +66,8 @@
# In most situations, Yast.import "Keyboard" will call Keyboard:Restore(),
# which calls xkbctrl and Encoding.Restore, so we need to catch both
def import_keyboard
- allow(Yast::SCR).to receive(:Execute).with(SCRStub::BASH_PATH, /xkbctrl es\.map\.gz/)
+ allow(Yast::SCR).to receive(:Execute)
+ .with(path(".target.bash"), /xkbctrl es\.map\.gz/)
# Just to prevent a not relevant call to 'locale -k"
allow(Yast::Encoding).to receive(:Restore)
Yast.import "Keyboard"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/package/yast2-country.changes new/yast2-country-3.1.19/package/yast2-country.changes
--- old/yast2-country-3.1.18/package/yast2-country.changes 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/package/yast2-country.changes 2015-02-16 13:59:13.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Feb 13 14:40:53 UTC 2015 - lslezak(a)suse.cz
+
+- Propose local time when running in a VMware VM, do not display
+ a warning when local time is selected (bnc#773323)
+- 3.1.19
+
+-------------------------------------------------------------------
Wed Feb 11 13:49:10 UTC 2015 - ancor(a)suse.com
- Fixed a crash while setting locale. It attempted to update the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/package/yast2-country.spec new/yast2-country-3.1.19/package/yast2-country.spec
--- old/yast2-country-3.1.18/package/yast2-country.spec 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/package/yast2-country.spec 2015-02-16 13:59:13.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.18
+Version: 3.1.19
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -31,6 +31,13 @@
BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite yast2 yast2-perl-bindings
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: polkit-devel
+# For tests
+BuildRequires: rubygem(rspec)
+# Fix to bnc#891053 (proper reading of ".target.yast2" on chroots)
+BuildRequires: yast2-core >= 3.1.12
+# RSpec extensions for YaST
+BuildRequires: yast2-ruby-bindings >= 3.1.26
+
Requires: yast2-trans-stats yast2-perl-bindings timezone
# XVersion.ycp
# Message.updating_configuration, Message.takes_a_while
@@ -43,6 +50,8 @@
Conflicts: yast2-ntp-client < 2.18.0
# wrapper_storage.ycp
Requires: yast2-packager >= 2.23.3
+# VMware detection (.probe.is_vmware)
+Requires: yast2-hardware-detection >= 3.1.6
Requires: yast2-country-data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/test/test_helper.rb new/yast2-country-3.1.19/test/test_helper.rb
--- old/yast2-country-3.1.18/test/test_helper.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/test/test_helper.rb 2015-02-16 13:59:13.000000000 +0100
@@ -0,0 +1,24 @@
+root_location = File.expand_path("../../", __FILE__)
+inc_dirs = Dir.glob("#{root_location}/*/src")
+ENV["Y2DIR"] = inc_dirs.join(":")
+
+require "yast"
+require "rspec"
+require "yast/rspec"
+
+if ENV["COVERAGE"]
+ require "simplecov"
+ SimpleCov.start
+
+ # for correct coverage report we need to load all ruby files
+ Dir["#{root_location}/*/src/{module,include,lib}/**/*.rb"].each { |f| require_relative f }
+
+ # use coveralls for on-line code coverage reporting at Travis CI
+ if ENV["TRAVIS"]
+ require "coveralls"
+ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+ SimpleCov::Formatter::HTMLFormatter,
+ Coveralls::SimpleCov::Formatter
+ ]
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/Makefile.am new/yast2-country-3.1.19/timezone/Makefile.am
--- old/yast2-country-3.1.18/timezone/Makefile.am 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/Makefile.am 2015-02-16 13:59:13.000000000 +0100
@@ -1,4 +1,4 @@
#
# Makefile.am for country/timezone
-SUBDIRS = doc src testsuite
+SUBDIRS = doc src testsuite test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/src/clients/timezone_proposal.rb new/yast2-country-3.1.19/timezone/src/clients/timezone_proposal.rb
--- old/yast2-country-3.1.18/timezone/src/clients/timezone_proposal.rb 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/src/clients/timezone_proposal.rb 2015-02-16 13:59:13.000000000 +0100
@@ -1,8 +1,6 @@
# encoding: utf-8
-# File: timezone_proposal.ycp
-#
-# $Id$
+# File: timezone_proposal.rb
#
# Author: Klaus Kaempf <kkaempf(a)suse.de>
#
@@ -28,15 +26,7 @@
@force_reset = Ops.get_boolean(@param, "force_reset", false)
@language_changed = Ops.get_boolean(@param, "language_changed", false)
- @m = Convert.to_map(
- SCR.Execute(path(".target.bash_output"), "/bin/date +%Y")
- )
- Builtins.y2milestone("date call: %1", @m)
-
- if Ops.less_than(
- Builtins.tointeger(Ops.get_string(@m, "stdout", "0")),
- 2004
- )
+ if Time.now < File.stat(__FILE__).mtime
Ops.set(@ret, "raw_proposal", [])
@m2 = Convert.to_map(
SCR.Execute(path(".target.bash_output"), "/bin/date")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/src/include/timezone/dialogs.rb new/yast2-country-3.1.19/timezone/src/include/timezone/dialogs.rb
--- old/yast2-country-3.1.18/timezone/src/include/timezone/dialogs.rb 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/src/include/timezone/dialogs.rb 2015-02-16 13:59:13.000000000 +0100
@@ -859,7 +859,8 @@
if !utc_only
@hwclock_s = UI.QueryWidget(Id(:hwclock), :Value) ? :hwclock_utc : :hwclock_localtime
- if !Timezone.windows_partition && @hwclock_s == :hwclock_localtime
+ vmware = SCR.Read(path(".probe.is_vmware"))
+ if !Timezone.windows_partition && !vmware && @hwclock_s == :hwclock_localtime
if ! confirm_local_time
ret = :not_next
next
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/src/modules/Timezone.rb new/yast2-country-3.1.19/timezone/src/modules/Timezone.rb
--- old/yast2-country-3.1.18/timezone/src/modules/Timezone.rb 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/src/modules/Timezone.rb 2015-02-16 13:59:13.000000000 +0100
@@ -655,7 +655,8 @@
# Based on current hardware configuration:
# Win partitions present or 32bit Mac
def ProposeLocaltime
- @windows_partition || Arch.board_mac && Arch.ppc32
+ vmware = SCR.Read(path(".probe.is_vmware"))
+ @windows_partition || vmware || (Arch.board_mac && Arch.ppc32)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/test/Makefile.am new/yast2-country-3.1.19/timezone/test/Makefile.am
--- old/yast2-country-3.1.18/timezone/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/test/Makefile.am 2015-02-16 13:59:13.000000000 +0100
@@ -0,0 +1,6 @@
+TESTS = \
+ Timezone_test.rb
+TEST_EXTENSIONS = .rb
+RB_LOG_COMPILER = rspec
+VERBOSE = 1
+EXTRA_DIST = $(TESTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/test/Timezone_test.rb new/yast2-country-3.1.19/timezone/test/Timezone_test.rb
--- old/yast2-country-3.1.18/timezone/test/Timezone_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/test/Timezone_test.rb 2015-02-16 13:59:13.000000000 +0100
@@ -0,0 +1,47 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+Yast.import "Timezone"
+
+describe Yast::Timezone do
+
+ describe "#ProposeLocaltime" do
+ subject { Yast::Timezone.ProposeLocaltime }
+
+ it "returns true if a Windows partition is found" do
+ Yast::Timezone.windows_partition = true
+ allow(Yast::SCR).to receive(:Read)
+ .with(path(".probe.is_vmware")).and_return(false)
+
+ expect(subject).to eq(true)
+
+ Yast::Timezone.windows_partition = false
+ end
+
+ it "returns true if running in VMware VM" do
+ expect(Yast::SCR).to receive(:Read)
+ .with(path(".probe.is_vmware")).and_return(true)
+
+ expect(subject).to eq(true)
+ end
+
+ it "returns true if running in on a 32bit Mac" do
+ allow(Yast::SCR).to receive(:Read)
+ .with(path(".probe.is_vmware")).and_return(false)
+ expect(Yast::Arch).to receive(:ppc32).and_return(true)
+ expect(Yast::Arch).to receive(:board_mac).and_return(true)
+
+ expect(subject).to eq(true)
+ end
+
+ it "returns false otherwise" do
+ allow(Yast::SCR).to receive(:Read)
+ .with(path(".probe.is_vmware")).and_return(false)
+ expect(Yast::Arch).to receive(:board_mac).and_return(false)
+
+ expect(subject).to eq(false)
+ end
+
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/test/test_helper.rb new/yast2-country-3.1.19/timezone/test/test_helper.rb
--- old/yast2-country-3.1.18/timezone/test/test_helper.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/test/test_helper.rb 2015-02-16 13:59:13.000000000 +0100
@@ -0,0 +1 @@
+require_relative "../../test/test_helper.rb"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/testsuite/tests/MakeProposal.out new/yast2-country-3.1.19/timezone/testsuite/tests/MakeProposal.out
--- old/yast2-country-3.1.18/timezone/testsuite/tests/MakeProposal.out 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/testsuite/tests/MakeProposal.out 2015-02-16 13:59:13.000000000 +0100
@@ -1,4 +1,5 @@
Read .etc.adjtime ["0", "0", "UTC"]
+Read .probe.is_vmware false
Read .target.yast2 "timezone_raw.ycp" [$["entries":$["Europe/Berlin":"Germany", "Europe/Prague":"Czech Republic"], "name":"Europe"]]
Execute .target.bash_output "/usr/sbin/zic -l Europe/Prague" $[]
Execute .target.bash_output "/bin/systemctl try-restart systemd-timedated.service" $[]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.18/timezone/testsuite/tests/MakeProposal.rb new/yast2-country-3.1.19/timezone/testsuite/tests/MakeProposal.rb
--- old/yast2-country-3.1.18/timezone/testsuite/tests/MakeProposal.rb 2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/testsuite/tests/MakeProposal.rb 2015-02-16 13:59:13.000000000 +0100
@@ -28,7 +28,7 @@
Yast.import "Timezone"
@R = {
- "probe" => { "architecture" => "i386" },
+ "probe" => { "architecture" => "i386", "is_vmware" => false },
"target" => {
"yast2" => [
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0