openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
January 2012
- 1 participants
- 1314 discussions
Hello community,
here is the log from the commit of package gawk for openSUSE:Factory checked in at 2012-01-31 10:19:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gawk (Old)
and /work/SRC/openSUSE:Factory/.gawk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gawk", Maintainer is "jsmeix(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gawk/gawk.changes 2012-01-06 11:43:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gawk.new/gawk.changes 2012-01-31 10:20:40.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Jan 30 16:16:45 CET 2012 - pth(a)suse.de
+
+- Compress message catalog.
+
+-------------------------------------------------------------------
+Mon Jan 30 13:32:32 CET 2012 - pth(a)suse.de
+
+- Use latest german message catalog.
+- Call update-po as part of package build.
+
+-------------------------------------------------------------------
New:
----
gawk-4.0.0h.de.po.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gawk.spec ++++++
--- /var/tmp/diff_new_pack.KQXdMf/_old 2012-01-31 10:20:42.000000000 +0100
+++ /var/tmp/diff_new_pack.KQXdMf/_new 2012-01-31 10:20:42.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gawk
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,6 @@
Name: gawk
Url: http://www.gnu.org/software/gawk/
-License: GPL-3.0+
-Group: Productivity/Text/Utilities
Provides: awk
BuildRequires: automake
BuildRequires: update-alternatives
@@ -26,7 +24,10 @@
Version: 4.0.0
Release: 0
Summary: GNU awk
+License: GPL-3.0+
+Group: Productivity/Text/Utilities
Source: gawk-%{version}.tar.bz2
+Source1: gawk-4.0.0h.de.po.bz2
Patch1: gawk-3.1.8.diff
Patch2: gawk-revert-gsub-gawk3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -51,7 +52,7 @@
%setup -q
%patch1
%patch2 -p1
-
+bunzip2 -c %{S:1} > po/de.po
rm -f regex.[ch]
chmod -x COPYING
# force rebuild with non-broken makeinfo
@@ -68,6 +69,7 @@
%else
make %{?_smp_mflags}
%endif
+make -C po update-po
%check
make check
--
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 flac for openSUSE:Factory checked in at 2012-01-31 10:19:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/flac (Old)
and /work/SRC/openSUSE:Factory/.flac.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flac", Maintainer is "tiwai(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/flac/flac.changes 2012-01-25 11:07:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.flac.new/flac.changes 2012-01-31 10:20:38.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Jan 27 18:06:28 UTC 2012 - crrodriguez(a)opensuse.org
+
+- Fix some memory and resources leak.
+- Link shared libraries with -Bsymbolic-functions
+- annotate relevant functions with proper attributes to
+ allow the compiler generate better code (attribute hot. alloc_size)
+
+-------------------------------------------------------------------
New:
----
flac-leaks.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ flac.spec ++++++
--- /var/tmp/diff_new_pack.5cK8vW/_old 2012-01-31 10:20:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5cK8vW/_new 2012-01-31 10:20:40.000000000 +0100
@@ -51,6 +51,7 @@
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch5: flac-ocloexec.patch
Patch6: flac-visibility.patch
+Patch7: flac-leaks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -98,10 +99,11 @@
%patch4
%patch5
%patch6
+%patch7
%build
autoreconf --force --install
-%define warn_flags -W -Wall -Wstrict-prototypes -Wformat-security
+%define warn_flags -O3 -W -Wall -Wstrict-prototypes -Wformat-security
export CFLAGS="%{optflags} %{warn_flags}"
export CXXFLAGS="$CFLAGS"
%configure --disable-thorough-tests --disable-exhaustive-tests\
++++++ flac-leaks.patch ++++++
--- src/libFLAC/metadata_iterators.c.orig
+++ src/libFLAC/metadata_iterators.c
@@ -1217,6 +1217,7 @@ static FLAC__bool chain_read_cb_(FLAC__M
}
if(!read_metadata_block_header_cb_(handle, read_cb, &is_last, &type, &length)) {
+ node_delete_(node);
chain->status = FLAC__METADATA_CHAIN_STATUS_READ_ERROR;
return false;
}
@@ -1412,11 +1413,13 @@ static FLAC__bool chain_rewrite_file_(FL
if(!open_tempfile_(chain->filename, tempfile_path_prefix, &tempfile, &tempfilename, &status)) {
chain->status = get_equivalent_status_(status);
cleanup_tempfile_(&tempfile, &tempfilename);
+ fclose(f);
return false;
}
if(!copy_n_bytes_from_file_(f, tempfile, chain->first_offset, &status)) {
chain->status = get_equivalent_status_(status);
cleanup_tempfile_(&tempfile, &tempfilename);
+ fclose(f);
return false;
}
@@ -1424,10 +1427,14 @@ static FLAC__bool chain_rewrite_file_(FL
for(node = chain->head; node; node = node->next) {
if(!write_metadata_block_header_(tempfile, &status, node->data)) {
chain->status = get_equivalent_status_(status);
+ cleanup_tempfile_(&tempfile, &tempfilename);
+ fclose(f);
return false;
}
if(!write_metadata_block_data_(tempfile, &status, node->data)) {
chain->status = get_equivalent_status_(status);
+ cleanup_tempfile_(&tempfile, &tempfilename);
+ fclose(f);
return false;
}
}
@@ -1437,10 +1444,12 @@ static FLAC__bool chain_rewrite_file_(FL
if(0 != fseeko(f, chain->last_offset, SEEK_SET)) {
cleanup_tempfile_(&tempfile, &tempfilename);
chain->status = FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR;
+ fclose(f);
return false;
}
if(!copy_remaining_bytes_from_file_(f, tempfile, &status)) {
cleanup_tempfile_(&tempfile, &tempfilename);
+ fclose(f);
chain->status = get_equivalent_status_(status);
return false;
}
--- src/libFLAC/stream_encoder.c.orig
+++ src/libFLAC/stream_encoder.c
@@ -1004,10 +1004,12 @@ static FLAC__StreamEncoderInitStatus ini
/*
* Now set up a stream decoder for verification
*/
- encoder->private_->verify.decoder = FLAC__stream_decoder_new();
if(0 == encoder->private_->verify.decoder) {
- encoder->protected_->state = FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR;
- return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR;
+ encoder->private_->verify.decoder = FLAC__stream_decoder_new();
+ if(0 == encoder->private_->verify.decoder) {
+ encoder->protected_->state = FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR;
+ return FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR;
+ }
}
if(FLAC__stream_decoder_init_stream(encoder->private_->verify.decoder, verify_read_callback_, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, /*eof_callback=*/0, verify_write_callback_, verify_metadata_callback_, verify_error_callback_, /*client_data=*/encoder) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++++++ flac-visibility.patch ++++++
--- /var/tmp/diff_new_pack.5cK8vW/_old 2012-01-31 10:20:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5cK8vW/_new 2012-01-31 10:20:40.000000000 +0100
@@ -36,7 +36,7 @@
endif
# see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS)
-+libFLAC_la_LDFLAGS = -no-undefined -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS)
++libFLAC_la_LDFLAGS = -Wl,-Bsymbolic-functions -no-undefined -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS)
libFLAC_la_SOURCES = \
bitmath.c \
bitreader.c \
@@ -49,13 +49,23 @@
+libFLAC___la_CXXFLAGS= -fvisibility=hidden -fvisibility-inlines-hidden
# see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention
-libFLAC___la_LDFLAGS = -version-info 8:0:2
-+libFLAC___la_LDFLAGS = -no-undefined -version-info 8:0:2
++libFLAC___la_LDFLAGS = -Wl,-Bsymbolic-functions -no-undefined -version-info 8:0:2
libFLAC___la_LIBADD = ../libFLAC/libFLAC.la
libFLAC___la_SOURCES = \
--- configure.in.orig
+++ configure.in
-@@ -28,19 +28,20 @@ AM_MAINTAINER_MODE
+@@ -18,7 +18,8 @@
+ # NOTE that for many of the AM_CONDITIONALs we use the prefix FLaC__
+ # instead of FLAC__ since autoconf triggers off 'AC_' in strings
+
+-AC_INIT(src/flac/main.c)
++AC_INIT
++AC_CONFIG_SRCDIR([src/flac/main.c])
+ AM_INIT_AUTOMAKE(flac, 1.2.1)
+
+ # Don't automagically regenerate autoconf/automake generated files unless
+@@ -28,23 +29,24 @@ AM_MAINTAINER_MODE
# We need two libtools, one that builds both shared and static, and
# one that builds only static. This is because the resulting libtool
# does not allow us to choose which to build at runtime.
@@ -81,6 +91,138 @@
AC_CHECK_SIZEOF(void*,0)
#@@@ new name is AC_CONFIG_HEADERS
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+
+ AC_C_BIGENDIAN
+
+@@ -110,7 +112,7 @@ AC_DEFINE(FLAC__ALIGN_MALLOC_DATA)
+ AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define to align allocated memory on 32-byte boundaries])
+ fi
+
+-AC_ARG_ENABLE(asm-optimizations, AC_HELP_STRING([--disable-asm-optimizations], [Don't use any assembly optimization routines]), asm_opt=no, asm_opt=yes)
++AC_ARG_ENABLE(asm-optimizations, AS_HELP_STRING([--disable-asm-optimizations],[Don't use any assembly optimization routines]), asm_opt=no, asm_opt=yes)
+ AM_CONDITIONAL(FLaC__NO_ASM, test "x$asm_opt" = xno)
+ if test "x$asm_opt" = xno ; then
+ AC_DEFINE(FLAC__NO_ASM)
+@@ -118,7 +120,7 @@ AH_TEMPLATE(FLAC__NO_ASM, [define to dis
+ fi
+
+ AC_ARG_ENABLE(debug,
+-AC_HELP_STRING([--enable-debug], [Turn on debugging]),
++AS_HELP_STRING([--enable-debug],[Turn on debugging]),
+ [case "${enableval}" in
+ yes) debug=true ;;
+ no) debug=false ;;
+@@ -127,7 +129,7 @@ esac],[debug=false])
+ AM_CONDITIONAL(DEBUG, test "x$debug" = xtrue)
+
+ AC_ARG_ENABLE(sse,
+-AC_HELP_STRING([--enable-sse], [Enable SSE support by asserting that the OS supports SSE instructions]),
++AS_HELP_STRING([--enable-sse],[Enable SSE support by asserting that the OS supports SSE instructions]),
+ [case "${enableval}" in
+ yes) sse_os=true ;;
+ no) sse_os=false ;;
+@@ -140,7 +142,7 @@ AH_TEMPLATE(FLAC__SSE_OS, [define if you
+ fi
+
+ AC_ARG_ENABLE(3dnow,
+-AC_HELP_STRING([--disable-3dnow], [Disable 3DNOW! optimizations]),
++AS_HELP_STRING([--disable-3dnow],[Disable 3DNOW! optimizations]),
+ [case "${enableval}" in
+ yes) use_3dnow=true ;;
+ no) use_3dnow=false ;;
+@@ -153,7 +155,7 @@ AH_TEMPLATE(FLAC__USE_3DNOW, [define to
+ fi
+
+ AC_ARG_ENABLE(altivec,
+-AC_HELP_STRING([--disable-altivec], [Disable Altivec optimizations]),
++AS_HELP_STRING([--disable-altivec],[Disable Altivec optimizations]),
+ [case "${enableval}" in
+ yes) use_altivec=true ;;
+ no) use_altivec=false ;;
+@@ -166,14 +168,14 @@ AH_TEMPLATE(FLAC__USE_ALTIVEC, [define t
+ fi
+
+ AC_ARG_ENABLE(thorough-tests,
+-AC_HELP_STRING([--disable-thorough-tests], [Disable thorough (long) testing, do only basic tests]),
++AS_HELP_STRING([--disable-thorough-tests],[Disable thorough (long) testing, do only basic tests]),
+ [case "${enableval}" in
+ yes) thorough_tests=true ;;
+ no) thorough_tests=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-thorough-tests) ;;
+ esac],[thorough_tests=true])
+ AC_ARG_ENABLE(exhaustive-tests,
+-AC_HELP_STRING([--enable-exhaustive-tests], [Enable exhaustive testing (VERY long)]),
++AS_HELP_STRING([--enable-exhaustive-tests],[Enable exhaustive testing (VERY long)]),
+ [case "${enableval}" in
+ yes) exhaustive_tests=true ;;
+ no) exhaustive_tests=false ;;
+@@ -189,7 +191,7 @@ fi
+ AC_SUBST(FLAC__TEST_LEVEL)
+
+ AC_ARG_ENABLE(valgrind-testing,
+-AC_HELP_STRING([--enable-valgrind-testing], [Run all tests inside Valgrind]),
++AS_HELP_STRING([--enable-valgrind-testing],[Run all tests inside Valgrind]),
+ [case "${enableval}" in
+ yes) FLAC__TEST_WITH_VALGRIND=yes ;;
+ no) FLAC__TEST_WITH_VALGRIND=no ;;
+@@ -198,7 +200,7 @@ esac],[FLAC__TEST_WITH_VALGRIND=no])
+ AC_SUBST(FLAC__TEST_WITH_VALGRIND)
+
+ AC_ARG_ENABLE(doxygen-docs,
+-AC_HELP_STRING([--disable-doxygen-docs], [Disable API documentation building via Doxygen]),
++AS_HELP_STRING([--disable-doxygen-docs],[Disable API documentation building via Doxygen]),
+ [case "${enableval}" in
+ yes) enable_doxygen_docs=true ;;
+ no) enable_doxygen_docs=false ;;
+@@ -210,7 +212,7 @@ fi
+ AM_CONDITIONAL(FLaC__HAS_DOXYGEN, test -n "$DOXYGEN")
+
+ AC_ARG_ENABLE(local-xmms-plugin,
+-AC_HELP_STRING([--enable-local-xmms-plugin], [Install XMMS plugin to ~/.xmms/Plugins instead of system location]),
++AS_HELP_STRING([--enable-local-xmms-plugin],[Install XMMS plugin to ~/.xmms/Plugins instead of system location]),
+ [case "${enableval}" in
+ yes) install_xmms_plugin_locally=true ;;
+ no) install_xmms_plugin_locally=false ;;
+@@ -219,7 +221,7 @@ esac],[install_xmms_plugin_locally=false
+ AM_CONDITIONAL(FLaC__INSTALL_XMMS_PLUGIN_LOCALLY, test "x$install_xmms_plugin_locally" = xtrue)
+
+ AC_ARG_ENABLE(xmms-plugin,
+-AC_HELP_STRING([--disable-xmms-plugin], [Do not build XMMS plugin]),
++AS_HELP_STRING([--disable-xmms-plugin],[Do not build XMMS plugin]),
+ [case "${enableval}" in
+ yes) enable_xmms_plugin=true ;;
+ no) enable_xmms_plugin=false ;;
+@@ -232,7 +234,7 @@ AM_CONDITIONAL(FLaC__HAS_XMMS, test -n "
+
+ dnl build FLAC++ or not
+ AC_ARG_ENABLE([cpplibs],
+-AC_HELP_STRING([--disable-cpplibs], [Do not build libFLAC++]),
++AS_HELP_STRING([--disable-cpplibs],[Do not build libFLAC++]),
+ [case "${enableval}" in
+ yes) disable_cpplibs=false ;;
+ no) disable_cpplibs=true ;;
+@@ -242,7 +244,7 @@ AM_CONDITIONAL(FLaC__WITH_CPPLIBS, [test
+
+ dnl check for ogg library
+ AC_ARG_ENABLE([ogg],
+- AC_HELP_STRING([--disable-ogg], [Disable ogg support (default: test for libogg)]),
++ AS_HELP_STRING([--disable-ogg],[Disable ogg support (default: test for libogg)]),
+ [ want_ogg=$enableval ], [ want_ogg=yes ] )
+
+ if test "x$want_ogg" != "xno"; then
+@@ -300,8 +302,8 @@ if test "x$debug" = xtrue; then
+ else
+ CPPFLAGS="-DNDEBUG $CPPFLAGS"
+ if test "x$GCC" = xyes; then
+- CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
+- CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
++ CPPFLAGS="-DFLaC__INLINE=__always_inline $CPPFLAGS"
++ CFLAGS="$CFLAGS"
+ fi
+ fi
+
--- Makefile.am.orig
+++ Makefile.am
@@ -30,7 +30,7 @@
@@ -115,3 +257,72 @@
$(CPPLIBS_DIRS)
EXTRA_DIST = \
+--- include/share/alloc.h.orig
++++ include/share/alloc.h
+@@ -48,10 +48,14 @@
+ #define FLaC__INLINE
+ #endif
+
++#define FLAC_ATTR_MALLOC __attribute__((__malloc__))
++#define FLAC_ATTR_ALLOC_SIZE(n) __attribute__((alloc_size(n)))
++#define FLAC_ATTR_ALLOC_SIZE2(x,y) __attribute__((alloc_size(x,y)))
++
+ /* avoid malloc()ing 0 bytes, see:
+ * https://www.securecoding.cert.org/confluence/display/seccode/MEM04-A.+Do+no…
+ */
+-static FLaC__INLINE void *safe_malloc_(size_t size)
++static FLAC_ATTR_MALLOC FLAC_ATTR_ALLOC_SIZE(1) FLaC__INLINE void *safe_malloc_(size_t size)
+ {
+ /* malloc(0) is undefined; FLAC src convention is to always allocate */
+ if(!size)
+@@ -59,7 +63,7 @@ static FLaC__INLINE void *safe_malloc_(s
+ return malloc(size);
+ }
+
+-static FLaC__INLINE void *safe_calloc_(size_t nmemb, size_t size)
++static FLAC_ATTR_MALLOC FLAC_ATTR_ALLOC_SIZE2(1,2) FLaC__INLINE void *safe_calloc_(size_t nmemb, size_t size)
+ {
+ if(!nmemb || !size)
+ return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
+--- src/libFLAC/include/private/bitreader.h.orig
++++ src/libFLAC/include/private/bitreader.h
+@@ -80,11 +80,11 @@ FLAC__bool FLAC__bitreader_skip_byte_blo
+ FLAC__bool FLAC__bitreader_read_byte_block_aligned_no_crc(FLAC__BitReader *br, FLAC__byte *val, unsigned nvals); /* WATCHOUT: does not CRC the read data! */
+ FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, unsigned *val);
+ FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter);
+-FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter);
++FLAC__bool __attribute__((__hot__)) FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter);
+ #ifndef FLAC__NO_ASM
+ # ifdef FLAC__CPU_IA32
+ # ifdef FLAC__HAS_NASM
+-FLAC__bool FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter);
++FLAC__bool __attribute__((__hot__)) FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter);
+ # endif
+ # endif
+ #endif
+--- src/libFLAC/include/private/lpc.h.orig
++++ src/libFLAC/include/private/lpc.h
+@@ -165,17 +165,17 @@ void FLAC__lpc_compute_residual_from_qlp
+ * IN data[-order,-1] previously-reconstructed historical samples
+ * OUT data[0,data_len-1] original signal
+ */
+-void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
+-void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
++void __attribute__((__hot__)) FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
++void __attribute__((__hot__)) FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
+ #ifndef FLAC__NO_ASM
+ # ifdef FLAC__CPU_IA32
+ # ifdef FLAC__HAS_NASM
+-void FLAC__lpc_restore_signal_asm_ia32(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
+-void FLAC__lpc_restore_signal_asm_ia32_mmx(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
++void __attribute__((__hot__)) FLAC__lpc_restore_signal_asm_ia32(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
++void __attribute__((__hot__)) FLAC__lpc_restore_signal_asm_ia32_mmx(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
+ # endif /* FLAC__HAS_NASM */
+ # elif defined FLAC__CPU_PPC
+-void FLAC__lpc_restore_signal_asm_ppc_altivec_16(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
+-void FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
++void __attribute__((__hot__)) FLAC__lpc_restore_signal_asm_ppc_altivec_16(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
++void __attribute__((__hot__)) FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
+ # endif/* FLAC__CPU_IA32 || FLAC__CPU_PPC */
+ #endif /* FLAC__NO_ASM */
+
--
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 deb for openSUSE:Factory checked in at 2012-01-31 10:19:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deb (Old)
and /work/SRC/openSUSE:Factory/.deb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deb", Maintainer is "PUzel(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/deb/deb.changes 2012-01-04 07:23:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.deb.new/deb.changes 2012-01-31 10:20:31.000000000 +0100
@@ -1,0 +2,13 @@
+Sun Jan 29 20:54:50 UTC 2012 - frank.lichtenheld(a)sophos.com
+
+- update to dpkg-1.15.8.12
+* Do not fail to unpack shared directories missing on the file system
+ from packages being replaced by other packages. Debian Bug #631808
+* Defer hardlink renames so that there's never a point were the new
+ file contents are accessible from the final path before they have
+ been fsync()ed and cannot be executed causing ETXTBSY when trying
+ to open the to be installed paths for writing. Debian Bug #635683
+* Add armhf support to ostable and triplettable.
+ Debian Bugs #594179, #639674
+
+-------------------------------------------------------------------
@@ -4,0 +18,12 @@
+
+-------------------------------------------------------------------
+Sat Nov 26 00:18:57 UTC 2011 - frank.lichtenheld(a)sophos.com
+
+- update to dpkg-1.15.8.11
+* Do not segfault on "dpkg -i --no-act".
+* Fix typo in "dpkg-name --overwrite" argument parsing so that it actually
+ works at all. Ubuntu Bug #728708
+* Fix dpkg-split to not corrupt binary part metadata when generating the
+ split packages on 32-bit systems.
+* Fix a regression in dpkg-divert where using --rename led to a failure when
+ the rename implies crossing file systems.
--- /work/SRC/openSUSE:Factory/deb/update-alternatives.changes 2011-09-23 01:54:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.deb.new/update-alternatives.changes 2012-01-31 10:20:31.000000000 +0100
@@ -1,0 +2,12 @@
+Sun Jan 29 21:29:58 UTC 2012 - frank.lichtenheld(a)sophos.com
+
+- update to 1.15.8.12
+* no changes, just keep in sync with deb
+
+-------------------------------------------------------------------
+Sat Nov 26 00:24:49 UTC 2011 - frank.lichtenheld(a)sophos.com
+
+- update to 1.15.8.11
+- remove unused tarballs and patches
+
+-------------------------------------------------------------------
Old:
----
dpkg-1.15.8.10-archtable-suse.patch
dpkg_1.15.8.10.tar.bz2
update-alternatives-1.15.8.10-suse.patch
New:
----
dpkg-1.15.8.12-archtable-suse.patch
dpkg_1.15.8.12.tar.bz2
update-alternatives-1.15.8.12-suse.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deb.spec ++++++
--- /var/tmp/diff_new_pack.JXPA4i/_old 2012-01-31 10:20:35.000000000 +0100
+++ /var/tmp/diff_new_pack.JXPA4i/_new 2012-01-31 10:20:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package deb
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,12 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define admindir %{_localstatedir}/lib/rpm/
%define debhelper_ver 8.1.2
%define devscripts_ver 2.10.71
Name: deb
-Version: 1.15.8.10
+Version: 1.15.8.12
Release: 0
Url: http://www.debian.org
Provides: dpkg dpkg-dev debhelper dselect dpkg-doc devscripts
@@ -37,8 +38,8 @@
Patch1: devscripts-2.10.71-buildfix.patch
Patch2: debhelper-pod2man-no-utf8.patch
Patch3: devscripts-2.10.71-debcommit-hg16.patch
-Patch4: update-alternatives-1.15.8.10-suse.patch
-Patch5: dpkg-1.15.8.10-archtable-suse.patch
+Patch4: update-alternatives-%{version}-suse.patch
+Patch5: dpkg-%{version}-archtable-suse.patch
Patch6: dpkg-pod2man-no-utf8.patch
Patch7: devscripts-pod2man-no-utf8.patch
BuildRequires: gcc-c++
++++++ update-alternatives.spec ++++++
--- /var/tmp/diff_new_pack.JXPA4i/_old 2012-01-31 10:20:35.000000000 +0100
+++ /var/tmp/diff_new_pack.JXPA4i/_new 2012-01-31 10:20:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package update-alternatives
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,27 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define admindir %{_localstatedir}/lib/rpm/
-%define debhelper_ver 8.1.2
-%define devscripts_ver 2.10.71
Name: update-alternatives
-Version: 1.15.8.10
+Version: 1.15.8.12
Release: 0
Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/
Summary: Maintain symbolic links determining default commands
License: GPL-2.0+
Group: System/Management
Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.bz2
-Source1: http://ftp.de.debian.org/debian/pool/main/d/debhelper/debhelper_%{debhelper…
-Source2: http://ftp.de.debian.org/debian/pool/main/d/devscripts/devscripts_%{devscri…
Source3: sensible-editor
-Patch0: debhelper-no-localized-manpages.patch
-Patch1: devscripts-2.10.71-buildfix.patch
-Patch2: debhelper-pod2man-no-utf8.patch
-Patch3: devscripts-2.10.71-debcommit-hg16.patch
-Patch4: update-alternatives-1.15.8.10-suse.patch
-Patch5: dpkg-1.15.8.10-archtable-suse.patch
+Patch0: update-alternatives-%{version}-suse.patch
+Patch1: dpkg-%{version}-archtable-suse.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -50,19 +43,12 @@
particular preference.
%prep
-%setup -q -n dpkg-%{version} -b 1 -b 2
+%setup -q -n dpkg-%{version}
# do not unpack anything, just cd to source dir
#%setup -q -D -T -n %{_builddir}
-cd ..
-%patch0
-%patch1
-%if %suse_version < 1130
-%patch2
-%endif
-%patch3
-%patch4
-%patch5
+%patch0 -p1
+%patch1 -p1
%build
%{configure} \
++++++ dpkg-1.15.8.10-archtable-suse.patch -> dpkg-1.15.8.12-archtable-suse.patch ++++++
--- /work/SRC/openSUSE:Factory/deb/dpkg-1.15.8.10-archtable-suse.patch 2011-09-23 01:54:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.deb.new/dpkg-1.15.8.12-archtable-suse.patch 2012-01-31 10:20:31.000000000 +0100
@@ -1,8 +1,8 @@
-Index: dpkg-1.15.8.10/debian/archtable
+Index: dpkg-1.15.8.12/debian/archtable
===================================================================
---- dpkg-1.15.8.10/debian/archtable 2011-01-30 20:37:43.000000000 +0100
-+++ dpkg-1.15.8.10/debian/archtable 2011-03-16 09:52:42.196488262 +0100
-@@ -27,3 +27,15 @@
+--- dpkg-1.15.8.12.orig/debian/archtable
++++ dpkg-1.15.8.12/debian/archtable
+@@ -27,3 +27,15 @@ sparc-linux-gnu sparc
i486-gnu hurd-i386
i486-kfreebsd-gnu kfreebsd-i386
x86_64-kfreebsd-gnu kfreebsd-amd64
++++++ dpkg-pod2man-no-utf8.patch ++++++
--- /var/tmp/diff_new_pack.JXPA4i/_old 2012-01-31 10:20:35.000000000 +0100
+++ /var/tmp/diff_new_pack.JXPA4i/_new 2012-01-31 10:20:35.000000000 +0100
@@ -1,7 +1,8 @@
-diff -ur dpkg-1.15.8.10.orig/scripts/Makefile.am dpkg-1.15.8.10/scripts/Makefile.am
---- dpkg-1.15.8.10.orig/scripts/Makefile.am 2011-01-30 20:37:44.000000000 +0100
-+++ dpkg-1.15.8.10/scripts/Makefile.am 2011-03-31 15:08:28.765764914 +0200
-@@ -136,7 +136,7 @@
+Index: dpkg-1.15.8.12/scripts/Makefile.am
+===================================================================
+--- dpkg-1.15.8.12.orig/scripts/Makefile.am
++++ dpkg-1.15.8.12/scripts/Makefile.am
+@@ -136,7 +136,7 @@ if BUILD_POD_DOC
$(mkdir_p) $(DESTDIR)$(man3dir)
for module in $(nobase_dist_perllib_DATA); do \
name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \
@@ -10,10 +11,11 @@
--name="$$name" --section=3 $(srcdir)/$$module \
>$(DESTDIR)$(man3dir)/$$name.3; \
test -s $(DESTDIR)$(man3dir)/$$name.3 || \
-diff -ur dpkg-1.15.8.10.orig/scripts/Makefile.in dpkg-1.15.8.10/scripts/Makefile.in
---- dpkg-1.15.8.10.orig/scripts/Makefile.in 2011-01-30 20:38:03.000000000 +0100
-+++ dpkg-1.15.8.10/scripts/Makefile.in 2011-03-31 15:23:22.273853964 +0200
-@@ -986,7 +986,7 @@
+Index: dpkg-1.15.8.12/scripts/Makefile.in
+===================================================================
+--- dpkg-1.15.8.12.orig/scripts/Makefile.in
++++ dpkg-1.15.8.12/scripts/Makefile.in
+@@ -986,7 +986,7 @@ install-data-local:
@BUILD_POD_DOC_TRUE@ $(mkdir_p) $(DESTDIR)$(man3dir)
@BUILD_POD_DOC_TRUE@ for module in $(nobase_dist_perllib_DATA); do \
@BUILD_POD_DOC_TRUE@ name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \
++++++ dpkg_1.15.8.10.tar.bz2 -> dpkg_1.15.8.12.tar.bz2 ++++++
++++ 31217 lines of diff (skipped)
++++++ update-alternatives-1.15.8.10-suse.patch -> update-alternatives-1.15.8.12-suse.patch ++++++
--- /work/SRC/openSUSE:Factory/deb/update-alternatives-1.15.8.10-suse.patch 2011-09-23 01:54:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.deb.new/update-alternatives-1.15.8.12-suse.patch 2012-01-31 10:20:31.000000000 +0100
@@ -1,7 +1,7 @@
-Index: dpkg-1.15.8.10/man/update-alternatives.8
+Index: dpkg-1.15.8.12/man/update-alternatives.8
===================================================================
---- dpkg-1.15.8.10/man/update-alternatives.8.orig 2011-01-30 20:37:44.000000000 +0100
-+++ dpkg-1.15.8.10/man/update-alternatives.8 2011-03-16 14:16:14.086966915 +0100
+--- dpkg-1.15.8.12.orig/man/update-alternatives.8
++++ dpkg-1.15.8.12/man/update-alternatives.8
@@ -4,7 +4,7 @@
.\" it under the terms of the GNU General Public License as published
.\" by the Free Software Foundation; either version 2 of the License, or
@@ -11,7 +11,7 @@
.TH update\-alternatives 8 "2009-04-13" "Debian Project" "dpkg utilities"
.SH NAME
update\-alternatives \- maintain symbolic links determining default commands
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ update\-alternatives \- maintain symboli
.SH DESCRIPTION
.B update\-alternatives
creates, removes, maintains and displays information about the symbolic
@@ -20,7 +20,7 @@
.PP
It is possible for several programs fulfilling the same or similar
functions to be installed on a single system at the same time.
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ different editor, if desired, but makes
to make a good choice for an editor to invoke if the
user has not specified a particular preference.
.PP
@@ -29,7 +29,7 @@
A generic name in the filesystem is
shared by all files providing interchangeable functionality.
The alternatives system and the system administrator
-@@ -66,10 +66,10 @@
+@@ -66,10 +66,10 @@ installed, changed or removed,
is called to update information about that file in the alternatives system.
.B update\-alternatives
is usually called from the
@@ -43,7 +43,7 @@
.PP
It is often useful for a number of alternatives to be synchronised,
so that they are changed as a group; for example, when several versions
-@@ -173,7 +173,7 @@
+@@ -173,7 +173,7 @@ containing the symlinks.
.TP
administrative directory
A directory, by default
@@ -52,7 +52,7 @@
containing
.BR update\-alternatives '
state information.
-@@ -477,7 +477,7 @@
+@@ -477,7 +477,7 @@ this as root:
.RE
.
.SH BUGS
@@ -61,10 +61,10 @@
.PP
If you find any discrepancy between the operation of
.B update\-alternatives
-Index: dpkg-1.15.8.10/utils/update-alternatives.c
+Index: dpkg-1.15.8.12/utils/update-alternatives.c
===================================================================
---- dpkg-1.15.8.10/utils/update-alternatives.c.orig 2011-01-30 20:37:44.000000000 +0100
-+++ dpkg-1.15.8.10/utils/update-alternatives.c 2011-03-16 14:17:29.269860473 +0100
+--- dpkg-1.15.8.12.orig/utils/update-alternatives.c
++++ dpkg-1.15.8.12/utils/update-alternatives.c
@@ -51,7 +51,7 @@
#define PROGNAME "update-alternatives"
@@ -74,7 +74,7 @@
static const char *prog_path = "update-alternatives";
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ static int opt_force = 0;
static char *pass_opts[MAX_OPTS];
static int nb_opts = 0;
@@ -83,7 +83,7 @@
/*
* Functions.
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ static int nb_opts = 0;
static void
version(void)
{
@@ -92,7 +92,7 @@
printf("\n");
printf(_(
-@@ -1984,8 +1984,8 @@
+@@ -1984,8 +1984,8 @@ main(int argc, char **argv)
int i = 0, count;
setlocale(LC_ALL, "");
--
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 chromium for openSUSE:Factory checked in at 2012-01-31 10:19:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium", Maintainer is "PRusnak(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2011-12-21 09:59:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2012-01-31 10:20:14.000000000 +0100
@@ -1,0 +2,56 @@
+Sun Jan 29 21:11:37 UTC 2012 - tittiatcoke(a)gmail.com
+
+- Update to 18.0.1022
+ * Security fixes (bnc#743319)
+ + CVE-2011-3924 Use-after-free vulnerability
+ + CVE-2011-3925 Use-after-free vulnerability
+ + CVE-2011-3926 Heap-based buffer overflow in the tree builder
+ + CVE-2011-3927 Skia does not perform all required
+ initialization of values
+ + CVE-2011-3928 Use-after-free vulnerability
+ * Compile the chrome_sandbox binary with -fPIE flags
+
+-------------------------------------------------------------------
+Mon Jan 23 09:44:42 UTC 2012 - tittiatcoke(a)gmail.com
+
+- Update to 18.0.1017
+ * Security Issues fixed (bnc#740493)
+ + CVE-2011-3921 Use-after-free in animation frames
+ + CVE-2011-3919 Heap-buffer-overflow in libxml
+ + CVE-2011-3922 Stack-buffer-overflow in glyph handling
+
+-------------------------------------------------------------------
+Sat Dec 31 22:29:20 UTC 2011 - tittiatcoke(a)gmail.com
+
+- Update to 18.0.992
+ * Delay some extension startup until after first run import.
+ (issue 108286)
+ * Add function support for Sleep with TimeDelta input.
+ (issue 108171)
+ * Make webstore installs work when the Downloads folder is missing.
+ (issue 108812)
+ * Disable GL_EXT_texture_storage support in Linux. (issue 107782)
+
+-------------------------------------------------------------------
+Wed Dec 28 12:00:11 UTC 2011 - tittiatcoke(a)gmail.com
+
+- Update to 18.0.985
+ + Webkit layout:
+ * Suppress a leak in http/tests/appcache/reload.html
+ (issue 108621)
+ * Suppress a leak in xmlhttprequest/workers/referer.html
+ (issue 108622)
+ * Extend the suppression for uninit value in
+ fast/forms/input-text-paste-maxlength.html (issue 106183)
+ * Suppress memory leaks in
+ fast/files/workers/worker-read-blob-async.html
+ (issue 108624)
+ * Suppress a leak in
+ websocket/tests/hybi/workers/receive-arraybuffer.html
+ (issue 108627)
+ * Suppress a leak in
+ http/tests/xmlhttprequest/workers/methods-async.html
+ (issue 108628)
+ + Set opaque on the WebMediaPlayerClient based on the decoder
+
+-------------------------------------------------------------------
Old:
----
chromium-no-sqlite-debug.patch
chromium.18.0.975.0.svn.tar.lzma
New:
----
chromium-new-glib.patch
chromium-sandbox-pie.patch
chromium.18.0.1022.0.svn119632.tar.lzma
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.AiTElP/_old 2012-01-31 10:20:31.000000000 +0100
+++ /var/tmp/diff_new_pack.AiTElP/_new 2012-01-31 10:20:31.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package chromium
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%define v8_ver 3.7.12.6
+%define v8_ver 3.8.9.0
+%define svn_revision 119632
Name: chromium
-Version: 18.0.975.0
+Version: 18.0.1022.0
Release: 0
Summary: Google's opens source browser project
License: BSD-3-Clause and LGPL-2.1+
Group: Productivity/Networking/Web/Browsers
Url: http://code.google.com/p/chromium/
-Source0: %{name}.%{version}.svn.tar.lzma
+Source0: %{name}.%{version}.svn%{svn_revision}.tar.lzma
%if 0%{?suse_version} <= 1140
Source1: %{name}.easy
Source2: %{name}-rpmlintrc
@@ -46,8 +47,6 @@
# Many changes to the gyp systems so we can use system libraries
# PATCH-FIX-OPENSUSE Fix build with GCC 4.6
Patch1: chromium-gcc46.patch
-# PATCH-FIX-OPENSUSE disable debug for sqlite
-Patch4: chromium-no-sqlite-debug.patch
# PATCH-FIX-OPENSUSE patches in system zlib library
Patch8: chromium-codechanges-zlib.patch
# PATCH-FIX-OPENSUSE removes build part for courgette
@@ -74,6 +73,12 @@
Patch63: chromium-6.0.406.0-system-gyp-v8.patch
# PATCH-FIX-UPSTREAM Add more charset aliases
Patch64: chromium-more-codec-aliases.patch
+%if 0%{?suse_version} > 1210
+# PATCH-FIX-UPSTREAM Only include glib.h
+Patch65: chromium-new-glib.patch
+%endif
+# PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings
+Patch66: chromium-sandbox-pie.patch
%if 0%{?suse_version} > 1210
BuildRequires: libjpeg8-devel
@@ -94,7 +99,6 @@
BuildRequires: libevent
BuildRequires: libexpat-devel
BuildRequires: libgnutls-devel
-#BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: libvpx-devel
@@ -103,18 +107,15 @@
BuildRequires: lzma
BuildRequires: mozilla-nspr-devel
BuildRequires: mozilla-nss-devel
+BuildRequires: krb5-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: pkg-config
-BuildRequires: perl(Switch)
-%if 0%{?suse_version} <= 1120
-BuildRequires: cairo-devel
-BuildRequires: dbus-1-devel
-BuildRequires: gconf2-devel
-BuildRequires: glib2-devel
-BuildRequires: gtk2-devel
-BuildRequires: libxml-devel
+%if 0%{?suse_version} > 1210
+BuildRequires: perl-Switch
%else
+BuildRequires: perl(Switch)
+%endif
BuildRequires: pkgconfig(cairo) >= 1.6
BuildRequires: pkgconfig(dbus-1)
BuildRequires: dbus-1-glib-devel
@@ -122,7 +123,6 @@
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libxml-2.0)
-%endif
BuildRequires: dbus-1-glib-devel
BuildRequires: python
BuildRequires: python-xml
@@ -133,21 +133,15 @@
BuildRequires: zlib-devel
BuildRequires: libpulse-devel
BuildRequires: libelf-devel
-%if 0%{?suse_version} > 1120
BuildRequires: libgnome-keyring-devel
-%else
-BuildRequires: gnome-keyring-devel
-%endif
-%if 0%{?suse_version} > 1130
BuildRequires: python-devel
-%endif
-
-%if 0%{?suse_version} >= 1110
BuildRequires: libevent-devel
BuildRequires: libicu-devel >= 4.0
-%endif
BuildRequires: speex-devel
BuildRequires: hicolor-icon-theme
+%if 0%{?suse_version} < 1210
+BuildRequires: libudev-devel
+%endif
# For NaCl
%ifarch x86_64
BuildRequires: glibc-32bit
@@ -160,7 +154,6 @@
Requires: libv8-3 = %{v8_ver}
Requires: hicolor-icon-theme
Requires: update-alternatives
-Requires: libudev0
Requires(pre): permissions
@@ -180,6 +173,7 @@
%package desktop-kde
Summary: Update to chromium to use KDE's kwallet to store passwords
+Group: Productivity/Networking/Web/Browsers
Supplements: packageand(chromium:kdebase4-session)
Conflicts: chromium-desktop-gnome
Provides: Chromium-password = %{version}
@@ -193,6 +187,7 @@
%package desktop-gnome
Summary: Update to chromium to use Gnome keyring to store passwords
+Group: Productivity/Networking/Web/Browsers
Supplements: packageand(chromium:gnome-session)
Conflicts: chromium-desktop-kde
Provides: Chromium-password = %{version}
@@ -206,6 +201,7 @@
%package suid-helper
Summary: A suid helper to let a process willingly drop privileges on Linux
+Group: Productivity/Networking/Web/Browsers
Url: http://code.google.com/p/setuid-sandbox/
Requires(pre): permissions
@@ -227,6 +223,9 @@
%patch62 -p1
%patch63 -p1
%patch64
+%if 0%{?suse_version} > 1210
+%patch65 -p1
+%endif
%patch8 -p1
%patch13 -p1
%patch14 -p1
@@ -239,7 +238,9 @@
%patch26 -p1
%patch28 -p1
%patch32 -p1
-%patch4 -p1
+%patch66 -p1
+
+echo "%{svn_revision}" > src/build/LASTCHANGE.in
pushd src/third_party/ffmpeg/
tar xf %{SOURCE8}
@@ -285,7 +286,7 @@
-Duse_system_bzip2=1 \
-Duse_system_libbz2=1 \
%if 0%{?suse_version} > 1210
--Duse_system_libjpeg=1 \
+-Duse_system_libjpeg=0 \
%else
-Duse_system_libjpeg=0 \
%endif
++++++ chromium-6.0.406.0-system-gyp-v8.patch ++++++
--- /var/tmp/diff_new_pack.AiTElP/_old 2012-01-31 10:20:31.000000000 +0100
+++ /var/tmp/diff_new_pack.AiTElP/_new 2012-01-31 10:20:31.000000000 +0100
@@ -1,17 +1,21 @@
---- chromium/src/build/all.gyp 2010-11-25 19:17:16.000000000 +0100
-+++ new/src/build/all.gyp 2010-11-25 21:05:09.413000018 +0100
-@@ -51,7 +51,7 @@
+Index: chromium/src/build/all.gyp
+===================================================================
+--- chromium.orig/src/build/all.gyp
++++ chromium/src/build/all.gyp
+@@ -50,7 +50,7 @@
'../third_party/sqlite/sqlite.gyp:*',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:*',
+ '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
'../third_party/zlib/zlib.gyp:*',
- '../v8/tools/gyp/v8.gyp:*',
+ 'linux/system.gyp:v8',
'../webkit/support/webkit_support.gyp:*',
'../webkit/webkit.gyp:*',
'util/build_util.gyp:*',
---- chromium/src/build/linux/system.gyp 2010-11-20 23:07:46.000000000 +0100
-+++ new/src/build/linux/system.gyp 2010-11-25 21:05:09.418000018 +0100
-@@ -359,6 +359,19 @@
+Index: chromium/src/build/linux/system.gyp
+===================================================================
+--- chromium.orig/src/build/linux/system.gyp
++++ chromium/src/build/linux/system.gyp
+@@ -380,6 +380,19 @@
],
},
{
@@ -31,9 +35,11 @@
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
---- chromium/src/net/net.gyp 2010-11-25 19:17:15.000000000 +0100
-+++ new/src/net/net.gyp 2010-11-25 21:05:09.427000018 +0100
-@@ -717,7 +717,7 @@
+Index: chromium/src/net/net.gyp
+===================================================================
+--- chromium.orig/src/net/net.gyp
++++ chromium/src/net/net.gyp
+@@ -35,7 +35,7 @@
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/zlib/zlib.gyp:zlib',
@@ -42,9 +48,11 @@
'net_resources',
'ssl_false_start_blacklist_process#host',
],
---- chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp 2010-11-20 23:09:21.000000000 +0100
-+++ new/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp 2010-11-25 21:05:09.435000018 +0100
-@@ -960,7 +960,7 @@
+Index: chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
+===================================================================
+--- chromium.orig/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
++++ chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
+@@ -1070,7 +1070,7 @@
'<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
'<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
@@ -53,7 +61,7 @@
'<(libjpeg_gyp_path):libjpeg',
],
'include_dirs': [
-@@ -1078,7 +1078,7 @@
+@@ -1189,7 +1189,7 @@
'<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
'<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
'<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
@@ -62,7 +70,7 @@
'<(libjpeg_gyp_path):libjpeg',
],
'export_dependent_settings': [
-@@ -1095,7 +1095,7 @@
+@@ -1207,7 +1207,7 @@
'<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
'<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
'<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
@@ -71,7 +79,7 @@
'<(libjpeg_gyp_path):libjpeg',
],
# This is needed for mac because of webkit_system_interface. It'd be nice
-@@ -1820,7 +1820,7 @@
+@@ -1967,7 +1967,7 @@
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
@@ -80,7 +88,7 @@
],
'export_dependent_settings': [
'webcore_bindings',
-@@ -1828,7 +1828,7 @@
+@@ -1976,7 +1976,7 @@
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
++++++ chromium-browser.sh ++++++
--- /var/tmp/diff_new_pack.AiTElP/_old 2012-01-31 10:20:31.000000000 +0100
+++ /var/tmp/diff_new_pack.AiTElP/_new 2012-01-31 10:20:31.000000000 +0100
@@ -74,7 +74,7 @@
"use_system": true
}
},
- "homepage": "http://meego.com/",
+ "homepage": "http://www.opensuse.org/",
"homepage_is_newtabpage": false,
"session": {
"restore_on_startup": 1
@@ -111,6 +111,6 @@
$GDB "$LIBDIR/$APPNAME" -x $tmpfile
exit $?
else
- exec $LIBDIR/$APPNAME $SANDBOX "--password-store=detect" "--enable-experimental-extension-apis" "--enable-plugins" "--enable-extensions" "--enable-user-scripts" "--enable-printing" "--enable-sync" "--auto-ssl-client-auth" "$@"
+ exec $LIBDIR/$APPNAME $SANDBOX "--password-store=detect" "$@"
fi
++++++ chromium-gcc46.patch ++++++
--- /var/tmp/diff_new_pack.AiTElP/_old 2012-01-31 10:20:31.000000000 +0100
+++ /var/tmp/diff_new_pack.AiTElP/_new 2012-01-31 10:20:31.000000000 +0100
@@ -8,16 +8,6 @@
#include "ui/base/ui_export.h"
---- chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2011-03-31 14:48:03.000000000 +0400
-+++ chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2011-03-31 14:49:52.000000000 +0400
-@@ -9,6 +9,7 @@
- #include <stddef.h>
- #include <string>
- #include <vector>
-+#include <cstddef>
-
- class GURL;
- class PrefService;
--- chromium/src/third_party/tcmalloc/chromium/src/common.cc~ 2011-03-29 20:46:14.000000000 +0400
+++ chromium/src/third_party/tcmalloc/chromium/src/common.cc 2011-03-29 20:47:02.000000000 +0400
@@ -30,6 +30,7 @@
@@ -88,13 +78,3 @@
#include <stddef.h> // for size_t
class SysAllocator;
---- chromium/src/ppapi/cpp/paint_aggregator.h 2010-12-23 18:10:27.000000000 -0600
-+++ chromium/src/ppapi/cpp/paint_aggregator.h 2011-04-19 05:34:56.085582885 -0500
-@@ -5,6 +5,7 @@
- #ifndef PPAPI_CPP_PAINT_AGGREGATOR_H_
- #define PPAPI_CPP_PAINT_AGGREGATOR_H_
-
-+#include <cstddef>
- #include <stddef.h>
- #include <vector>
-
++++++ chromium-master-prefs-path.patch ++++++
--- /var/tmp/diff_new_pack.AiTElP/_old 2012-01-31 10:20:31.000000000 +0100
+++ /var/tmp/diff_new_pack.AiTElP/_new 2012-01-31 10:20:31.000000000 +0100
@@ -1,8 +1,9 @@
-diff -dupr a/src/chrome/browser/first_run.cc b/src/chrome/browser/first_run.cc
---- a/src/chrome/browser/first_run/first_run_gtk.cc 2010-03-10 10:21:33.000000000 -0700
-+++ b/src/chrome/browser/first_run/first_run_gtk.cc 2010-03-10 13:08:12.000000000 -0700
-@@ -63,7 +63,6 @@
- FilePath FirstRun::MasterPrefsPath() {
+Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
+===================================================================
+--- chromium.orig/src/chrome/browser/first_run/first_run_linux.cc
++++ chromium/src/chrome/browser/first_run/first_run_linux.cc
+@@ -100,8 +100,7 @@ void AutoImport(
+ FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
@@ -10,3 +11,4 @@
+ master_prefs = FilePath("/etc/chromium");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
+
++++++ chromium-new-glib.patch ++++++
Index: chromium/src/ui/base/l10n/l10n_util.cc
===================================================================
--- chromium.orig/src/ui/base/l10n/l10n_util.cc
+++ chromium/src/ui/base/l10n/l10n_util.cc
@@ -5,7 +5,7 @@
#include "ui/base/l10n/l10n_util.h"
#if defined(USE_X11)
-#include <glib/gutils.h>
+#include <glib.h>
#endif
#include <algorithm>
++++++ chromium-sandbox-pie.patch ++++++
--- chromium/src/sandbox/sandbox.gyp 2011-11-15 19:35:11.119851877 +0100
+++ chromium/src/sandbox/sandbox.gyp 2012-01-25 23:24:53.914568688 +0100
@@ -163,7 +163,10 @@
],
'cflags': [
# For ULLONG_MAX
- '-std=gnu99',
+ '-std=gnu99 -fPIE',
+ ],
+ 'ldflags': [
+ '-pie',
],
'include_dirs': [
'..',
--
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 cantor for openSUSE:Factory checked in at 2012-01-31 10:19:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cantor (Old)
and /work/SRC/openSUSE:Factory/.cantor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2011-12-08 11:56:17.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2012-01-31 10:19:38.000000000 +0100
@@ -1,0 +2,16 @@
+Wed Jan 18 20:55:58 CET 2012 - dmueller(a)suse.de
+
+- update to 4.8.0
+ * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
+Tue Jan 10 16:31:48 CET 2012 - dmueller(a)suse.de
+
+- update to 4.7.98
+ * RC2+ milestone release of KDE 4.8
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
Old:
----
cantor-4.7.4.tar.bz2
New:
----
cantor-4.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cantor.spec ++++++
--- /var/tmp/diff_new_pack.MedkST/_old 2012-01-31 10:19:40.000000000 +0100
+++ /var/tmp/diff_new_pack.MedkST/_new 2012-01-31 10:19:40.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cantor
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
BuildRequires: ocaml
BuildRequires: ocaml-facile
%endif
-Version: 4.7.4
+Version: 4.8.0
Release: 0
Summary: Worksheet GUI for mathematical software
License: GPL-2.0+
++++++ cantor-4.7.4.tar.bz2 -> cantor-4.8.0.tar.bz2 ++++++
++++ 14515 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 bluez for openSUSE:Factory checked in at 2012-01-31 10:19:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bluez (Old)
and /work/SRC/openSUSE:Factory/.bluez.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez", Maintainer is "ACho(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bluez/bluez-gstreamer.changes 2011-12-31 17:19:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bluez.new/bluez-gstreamer.changes 2012-01-31 10:19:24.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Jan 23 15:23:43 UTC 2012 - seife+obs(a)b1-systems.com
+
+- update to bluez-4.98:
+ - Fix issue with adapter list upon initialization failure.
+ - Fix issue with missing legacy property for Low Energy.
+ - Fix issue with missing EIR information handling.
+ - Fix issue with device address type tracking.
+ - Fix issue with alert level characteristic.
+ - Fix issue with headset shutdown handling.
+ - Fix issue with Wiimote address handling.
+ - Add support for advanced l2test options.
+ - Add support for attribute protocol and multiple adapters.
+
+-------------------------------------------------------------------
bluez.changes: same change
Old:
----
bluez-4.97.tar.bz2
New:
----
bluez-4.98.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-gstreamer.spec ++++++
--- /var/tmp/diff_new_pack.ntYR0e/_old 2012-01-31 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.ntYR0e/_new 2012-01-31 10:19:26.000000000 +0100
@@ -1,7 +1,8 @@
#
# spec file for package bluez-gstreamer
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010-2012 B1 Systems GmbH, Vohburg, Germany
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +16,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: bluez-gstreamer
BuildRequires: dbus-1-devel
BuildRequires: flex
@@ -38,7 +40,7 @@
BuildRequires: readline-devel
BuildRequires: libudev-devel
Url: http://www.bluez.org
-Version: 4.97
+Version: 4.98
Release: 0
Summary: Bluetooth Sound Support
License: GPL-2.0+
++++++ bluez.spec ++++++
--- /var/tmp/diff_new_pack.ntYR0e/_old 2012-01-31 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.ntYR0e/_new 2012-01-31 10:19:26.000000000 +0100
@@ -1,8 +1,8 @@
#
# spec file for package bluez
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2010-2011 B1 Systems GmbH, Vohburg, Germany
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010-2012 B1 Systems GmbH, Vohburg, Germany
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: bluez
BuildRequires: dbus-1-devel
BuildRequires: flex
@@ -41,7 +42,7 @@
BuildRequires: libtool
BuildRequires: automake
Url: http://www.bluez.org
-Version: 4.97
+Version: 4.98
Release: 0
Summary: Bluetooth Stack for Linux
License: GPL-2.0+
@@ -355,7 +356,7 @@
%files -n libbluetooth3
%defattr(-, root, root)
%{_libdir}/libbluetooth.so.*
-%doc AUTHORS COPYING INSTALL ChangeLog README
+%doc AUTHORS COPYING ChangeLog README
%files cups
%defattr(-,root,root)
++++++ bluez-4.97.tar.bz2 -> bluez-4.98.tar.bz2 ++++++
++++ 6040 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 blinken for openSUSE:Factory checked in at 2012-01-31 10:19:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blinken (Old)
and /work/SRC/openSUSE:Factory/.blinken.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blinken", Maintainer is "kde-maintainers(a)suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/blinken/blinken.changes 2011-12-08 11:56:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.blinken.new/blinken.changes 2012-01-31 10:19:23.000000000 +0100
@@ -1,0 +2,16 @@
+Wed Jan 18 20:55:53 CET 2012 - dmueller(a)suse.de
+
+- update to 4.8.0
+ * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
+Tue Jan 10 16:31:37 CET 2012 - dmueller(a)suse.de
+
+- update to 4.7.98
+ * RC2+ milestone release of KDE 4.8
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
Old:
----
blinken-4.7.4.tar.bz2
New:
----
blinken-4.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blinken.spec ++++++
--- /var/tmp/diff_new_pack.nmGmvL/_old 2012-01-31 10:19:24.000000000 +0100
+++ /var/tmp/diff_new_pack.nmGmvL/_new 2012-01-31 10:19:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package blinken
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
BuildRequires: ocaml
BuildRequires: ocaml-facile
%endif
-Version: 4.7.4
+Version: 4.8.0
Release: 0
Summary: Simon Says Game
License: GPL-2.0+
++++++ blinken-4.7.4.tar.bz2 -> blinken-4.8.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/CMakeLists.txt new/blinken-4.8.0/CMakeLists.txt
--- old/blinken-4.7.4/CMakeLists.txt 2011-10-02 15:23:35.000000000 +0200
+++ new/blinken-4.8.0/CMakeLists.txt 2011-07-27 20:37:45.000000000 +0200
@@ -5,6 +5,7 @@
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
set(CMAKE_MODULE_PATH ${blinken_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_subdirectory( doc )
add_subdirectory( src )
Files old/blinken-4.7.4/doc/index.cache.bz2 and new/blinken-4.8.0/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/src/blinken.cpp new/blinken-4.8.0/src/blinken.cpp
--- old/blinken-4.7.4/src/blinken.cpp 2011-10-02 15:23:35.000000000 +0200
+++ new/blinken-4.8.0/src/blinken.cpp 2011-11-04 15:33:48.000000000 +0100
@@ -42,7 +42,7 @@
static const double nonButtonRibbonX = 150.0;
static const double nonButtonRibbonY = 125.0;
-blinken::blinken() : KMainWindow(), m_overHighscore(false), m_overQuit(false), m_overCentralText(false), m_overMenu(false), m_overAboutKDE(false), m_overAboutBlinken(false), m_overSettings(false), m_overManual(false), m_overCentralLetters(false), m_overCounter(false), m_overFont(false), m_overSound(false), m_showPreferences(false), m_updateButtonHighlighting(false), m_highlighted(blinkenGame::none)
+blinken::blinken() : m_overHighscore(false), m_overQuit(false), m_overCentralText(false), m_overMenu(false), m_overAboutKDE(false), m_overAboutBlinken(false), m_overSettings(false), m_overManual(false), m_overCentralLetters(false), m_overCounter(false), m_overFont(false), m_overSound(false), m_showPreferences(false), m_updateButtonHighlighting(false), m_highlighted(blinkenGame::none)
{
m_renderer = new QSvgRenderer(KStandardDirs::locate("appdata", "images/blinken.svg"));
@@ -393,7 +393,7 @@
blinkenSettings::self()->writeConfig();
update();
}
- else if (m_overQuit) close();
+ else if (m_overQuit) qApp->quit();
else if (m_overAboutBlinken || m_overCentralLetters) m_helpMenu -> aboutApplication();
else if (m_overAboutKDE) m_helpMenu -> aboutKDE();
else if (m_overSettings) togglePreferences();
@@ -440,16 +440,17 @@
void blinken::checkHS()
{
- highScoreDialog *hsd = new highScoreDialog(this, m_renderer);
- if (hsd->scoreGoodEnough(m_game.level(), m_game.score()))
+ highScoreManager hsm;
+ if (hsm.scoreGoodEnough(m_game.level(), m_game.score()))
{
bool ok;
QString name = KInputDialog::getText(i18n("Enter Your Name"), i18nc("@label:textbox refers to the user's name", "Name:"), m_lastName, &ok);
if (!name.isNull() && ok)
{
m_lastName = name;
- hsd->addScore(m_game.level(), m_game.score(), name);
+ hsm.addScore(m_game.level(), m_game.score(), name);
}
+ highScoreDialog *hsd = new highScoreDialog(this, m_renderer);
hsd->showLevel(m_game.level());
}
}
@@ -612,8 +613,14 @@
p.resetMatrix();
p.translate( (double)width() / 50.875, (double)height() / 30);
p.scale(xScaleSquareButtons, yScaleSquareButtons);
- if (m_overHighscore) m_renderer->render(&p, "highscore_hover");
- else m_renderer->render(&p, "highscore_normal");
+ if (m_overHighscore)
+ {
+ m_renderer->render(&p, "highscore_hover");
+ }
+ else
+ {
+ m_renderer->render(&p, "highscore_normal");
+ }
m_highscoreRect = QRect(qRound((double)width() / 50.875),
qRound((double)height() / 30.0),
qRound((double)width() * xScaleSquareButtons),
@@ -623,8 +630,14 @@
p.resetMatrix();
p.translate( (double)width() / 1.15, (double)height() / 30.0);
p.scale(xScaleSquareButtons, yScaleSquareButtons);
- if (m_overQuit) m_renderer->render(&p, "quit_hover");
- else m_renderer->render(&p, "quit_normal");
+ if (m_overQuit)
+ {
+ m_renderer->render(&p, "quit_hover");
+ }
+ else
+ {
+ m_renderer->render(&p, "quit_normal");
+ }
m_quitRect = QRect(qRound((double)width() / 1.15),
qRound((double)height() / 30.0),
qRound((double)width() * xScaleSquareButtons),
@@ -764,30 +777,72 @@
break;
case blinkenGame::waiting3:
- if (m_overCentralText) text = restartText;
- else text = i18n("Next sequence in 3...");
+ if (m_overCentralText)
+ {
+ text = restartText;
+ }
+ else
+ {
+ text = i18n("Next sequence in 3...");
+ }
break;
case blinkenGame::waiting2:
- if (m_overCentralText) text = restartText;
- else if (m_game.level() == 1) text = i18n("Next sequence in 3, 2...");
- else text = i18n("Next sequence in 2...");
+ if (m_overCentralText)
+ {
+ text = restartText;
+ }
+ else
+ {
+ if (m_game.level() == 1)
+ {
+ text = i18n("Next sequence in 3, 2...");
+ }
+ else
+ {
+ text = i18n("Next sequence in 2...");
+ }
+ }
break;
case blinkenGame::waiting1:
- if (m_overCentralText) text = restartText;
- else if (m_game.level() == 1) text = i18n("Next sequence in 3, 2, 1...");
- else text = i18n("Next sequence in 2, 1...");
+ if (m_overCentralText)
+ {
+ text = restartText;
+ }
+ else
+ {
+ if (m_game.level() == 1)
+ {
+ text = i18n("Next sequence in 3, 2, 1...");
+ }
+ else
+ {
+ text = i18n("Next sequence in 2, 1...");
+ }
+ }
break;
case blinkenGame::learningTheSequence:
- if (m_overCentralText) text = restartText;
- else text = i18n("Remember this sequence...");
+ if (m_overCentralText)
+ {
+ text = restartText;
+ }
+ else
+ {
+ text = i18n("Remember this sequence...");
+ }
break;
case blinkenGame::typingTheSequence:
- if (m_overCentralText) text = restartText;
- else text = i18n("Repeat the sequence");
+ if (m_overCentralText)
+ {
+ text = restartText;
+ }
+ else
+ {
+ text = i18n("Repeat the sequence");
+ }
break;
}
}
@@ -847,8 +902,14 @@
p.drawRoundRect(r, 15, 15);
}
- if (!highlight) p.setPen(m_fontColor);
- else p.setPen(m_fontHighlightColor);
+ if (highlight)
+ {
+ p.setPen(m_fontHighlightColor);
+ }
+ else
+ {
+ p.setPen(m_fontColor);
+ }
p.drawText(r, Qt::AlignCenter, text);
if (rect) *rect = p.worldMatrix().mapRect(r);
@@ -1081,4 +1142,3 @@
return it.value();
}
-#include "blinken.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/src/blinken.desktop new/blinken-4.8.0/src/blinken.desktop
--- old/blinken-4.7.4/src/blinken.desktop 2011-10-28 09:43:02.000000000 +0200
+++ new/blinken-4.8.0/src/blinken.desktop 2011-11-04 15:33:48.000000000 +0100
@@ -1,6 +1,7 @@
[Desktop Entry]
Name=Blinken
Name[ast]=Blinken
+Name[bg]=Blinken
Name[bs]=Blinken
Name[ca]=Blinken
Name[ca@valencia]=Blinken
@@ -54,6 +55,7 @@
Name[zh_TW]=記憶_BlinKen
GenericName=Memory Enhancement Game
GenericName[ast]=Xuegu p'ameyorar la memoria
+GenericName[bg]=Игра за упражнение на паметта
GenericName[bs]=Igra za poboljšanje pamćenja
GenericName[ca]=Un Joc per Millorar la Memòria
GenericName[ca@valencia]=Un Joc per Millorar la Memòria
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/src/blinkengame.cpp new/blinken-4.8.0/src/blinkengame.cpp
--- old/blinken-4.7.4/src/blinkengame.cpp 2011-10-02 15:23:35.000000000 +0200
+++ new/blinken-4.8.0/src/blinkengame.cpp 2011-11-04 15:33:48.000000000 +0100
@@ -179,4 +179,3 @@
return c;
}
-#include "blinkengame.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/src/highscoredialog.cpp new/blinken-4.8.0/src/highscoredialog.cpp
--- old/blinken-4.7.4/src/highscoredialog.cpp 2011-10-02 15:23:35.000000000 +0200
+++ new/blinken-4.8.0/src/highscoredialog.cpp 2011-11-04 15:33:48.000000000 +0100
@@ -26,6 +26,8 @@
static const int smallMargin = 5;
static const int namesFontSize = 25;
+static QSet<highScoreManager *> s_allHSM;
+
/* scoresWidget */
class scoresWidget : public QWidget
@@ -38,7 +40,7 @@
void paintEvent(QPaintEvent *);
private:
- const QList< QPair<int, QString> > &m_scores;
+ const QList< QPair<int, QString> > m_scores;
QSvgRenderer *m_renderer;
};
@@ -140,21 +142,43 @@
m_tw = new myTabWidget(this);
setMainWidget(m_tw);
- for (int i = 1; i <= 3; i++)
+ highScoreManager hsm;
+
+ m_tw -> addTab(new scoresWidget(0, hsm.scores(0), renderer), i18nc("@title:group High scores Level 1 tab title", "Level 1"));
+ m_tw -> addTab(new scoresWidget(0, hsm.scores(1), renderer), i18nc("@title:group High scores Level 2 tab title", "Level 2"));
+ m_tw -> addTab(new scoresWidget(0, hsm.scores(2), renderer), i18nc("@title:group High scores Level ? tab tible", "Level ?"));
+}
+
+void highScoreDialog::showLevel(int level)
+{
+ QSize max, aux;
+ m_tw -> setCurrentIndex(level -1);
+
+ for (int i = 0; i < 3; i++)
{
- KConfigGroup cfg(KGlobal::config(), QString("Level%1").arg(i));
- for (int j = 1; j <= 5; j++)
- {
- m_scores[i-1].append(qMakePair(cfg.readEntry(QString("Score%1").arg(j),QVariant(0)).toInt(),cfg.readEntry(QString("Name%1").arg(j),QString())));
- }
+ aux = static_cast<scoresWidget*>(m_tw -> widget(i)) -> calcSize();
+ max = max.expandedTo(aux);
}
+ if (max.width() < m_tw -> tabBarSizeHint().width() + 5) m_tw -> setMinimumSize(m_tw -> tabBarSizeHint().width() + 5, max.height() + m_tw -> tabBarSizeHint().height() + 5);
- m_tw -> addTab(new scoresWidget(0, m_scores[0], renderer), i18nc("@title:group High scores Level 1 tab title", "Level 1"));
- m_tw -> addTab(new scoresWidget(0, m_scores[1], renderer), i18nc("@title:group High scores Level 2 tab title", "Level 2"));
- m_tw -> addTab(new scoresWidget(0, m_scores[2], renderer), i18nc("@title:group High scores Level ? tab tible", "Level ?"));
+ exec();
+ delete this;
+}
+
+/* highScoreManager */
+
+highScoreManager::highScoreManager()
+{
+ s_allHSM << this;
+ update();
}
-bool highScoreDialog::scoreGoodEnough(int level, int score)
+highScoreManager::~highScoreManager()
+{
+ s_allHSM.remove(this);
+}
+
+bool highScoreManager::scoreGoodEnough(int level, int score)
{
level--;
QList< QPair<int, QString> >::iterator it, itEnd;
@@ -165,7 +189,7 @@
return (it != itEnd);
}
-void highScoreDialog::addScore(int level, int score, const QString &name)
+void highScoreManager::addScore(int level, int score, const QString &name)
{
level--;
QList< QPair<int, QString> >::iterator it, itEnd;
@@ -186,21 +210,44 @@
cfg.writeEntry(QString("Name%1").arg(j), (*it).second);
}
cfg.sync();
+
+ foreach(highScoreManager *hsm, s_allHSM)
+ {
+ if (hsm != this)
+ {
+ hsm->update();
+ }
+ }
}
}
-void highScoreDialog::showLevel(int level)
+void highScoreManager::update()
{
- QSize max, aux;
- m_tw -> setCurrentIndex(level -1);
-
- for (int i = 0; i < 3; i++)
+ for (int i = 0; i < 3; ++i)
{
- aux = static_cast<scoresWidget*>(m_tw -> widget(i)) -> calcSize();
- max = max.expandedTo(aux);
+ m_scores[i].clear();
}
- if (max.width() < m_tw -> tabBarSizeHint().width() + 5) m_tw -> setMinimumSize(m_tw -> tabBarSizeHint().width() + 5, max.height() + m_tw -> tabBarSizeHint().height() + 5);
-
- exec();
- delete this;
+ for (int i = 1; i <= 3; i++)
+ {
+ KConfigGroup cfg(KGlobal::config(), QString("Level%1").arg(i));
+ for (int j = 1; j <= 5; j++)
+ {
+ m_scores[i-1].append(qMakePair(cfg.readEntry(QString("Score%1").arg(j),QVariant(0)).toInt(),cfg.readEntry(QString("Name%1").arg(j),QString())));
+ }
+ }
+}
+
+QList< QPair<int, QString> > highScoreManager::scores(int level) const
+{
+ return m_scores[level];
+}
+
+int highScoreManager::score(int level, int position) const
+{
+ return m_scores[level][position].first;
+}
+
+QString highScoreManager::name(int level, int position) const
+{
+ return m_scores[level][position].second;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/src/highscoredialog.h new/blinken-4.8.0/src/highscoredialog.h
--- old/blinken-4.7.4/src/highscoredialog.h 2011-10-02 15:23:35.000000000 +0200
+++ new/blinken-4.8.0/src/highscoredialog.h 2011-11-04 15:33:48.000000000 +0100
@@ -24,12 +24,30 @@
public:
highScoreDialog(QWidget *parent, QSvgRenderer *renderer);
- bool scoreGoodEnough(int level, int score);
- void addScore(int level, int score, const QString &name);
void showLevel(int level);
- QList< QPair<int, QString> > m_scores[3];
myTabWidget *m_tw;
};
+class highScoreManager : public QObject
+{
+Q_OBJECT
+ public:
+ highScoreManager();
+ ~highScoreManager();
+
+ bool scoreGoodEnough(int level, int score);
+ void addScore(int level, int score, const QString &name);
+
+ QList< QPair<int, QString> > scores(int level) const;
+
+ Q_INVOKABLE int score(int level, int position) const;
+ Q_INVOKABLE QString name(int level, int position) const;
+
+ private:
+ void update();
+
+ QList< QPair<int, QString> > m_scores[3];
+};
+
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/src/main.cpp new/blinken-4.8.0/src/main.cpp
--- old/blinken-4.7.4/src/main.cpp 2011-10-02 15:23:35.000000000 +0200
+++ new/blinken-4.8.0/src/main.cpp 2012-01-18 19:49:06.000000000 +0100
@@ -12,7 +12,6 @@
#include <kaboutdata.h>
#include <kcmdlineargs.h>
#include <klocale.h>
-#include <kprocess.h>
#include <kstandarddirs.h>
#include <kapplication.h>
@@ -21,7 +20,7 @@
int main(int argc, char *argv[])
{
- KAboutData about("blinken", 0, ki18n("Blinken"), "0.2", ki18n("A memory enhancement game"), KAboutData::License_GPL, ki18n("© 2005-2007 Albert Astals Cid\n© 2005-2007 Danny Allen"));
+ KAboutData about("blinken", 0, ki18n("Blinken"), "0.3", ki18n("A memory enhancement game"), KAboutData::License_GPL, ki18n("© 2005-2007 Albert Astals Cid\n© 2005-2007 Danny Allen"));
about.addAuthor(ki18n("Albert Astals Cid"), ki18n("Coding"), "tsdgeos(a)terra.es");
about.addAuthor(ki18n("Danny Allen"), ki18n("Design, Graphics and Sounds"), "danny(a)dannyallen.co.uk");
about.addCredit(ki18n("Steve Jordi"), ki18n("GPL'ed his 'Steve' font so that we could use it"), "steve(a)sjordi.com");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/src/soundsplayer.cpp new/blinken-4.8.0/src/soundsplayer.cpp
--- old/blinken-4.7.4/src/soundsplayer.cpp 2011-10-02 15:23:35.000000000 +0200
+++ new/blinken-4.8.0/src/soundsplayer.cpp 2011-11-04 15:33:48.000000000 +0100
@@ -13,7 +13,7 @@
#include <kstandarddirs.h>
#include <kurl.h>
-#include <Phonon/Path>
+#include <phonon/Path>
#include "settings.h"
@@ -88,4 +88,3 @@
}
}
-#include "soundsplayer.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blinken-4.7.4/src/soundsplayer.h new/blinken-4.8.0/src/soundsplayer.h
--- old/blinken-4.7.4/src/soundsplayer.h 2011-10-02 15:23:35.000000000 +0200
+++ new/blinken-4.8.0/src/soundsplayer.h 2011-11-04 15:33:48.000000000 +0100
@@ -10,7 +10,7 @@
#ifndef SOUNDSPLAYER_H
#define SOUNDSPLAYER_H
-#include <Phonon/MediaObject>
+#include <phonon/MediaObject>
#include <phonon/audiooutput.h>
#include <QList>
--
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 arpwatch-ethercodes for openSUSE:Factory checked in at 2012-01-31 10:19:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old)
and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2012-01-30 12:23:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2012-01-31 10:19:20.000000000 +0100
@@ -2 +2 @@
-Sat Jan 28 07:40:04 CET 2012 - autobuild(a)suse.de
+Tue Jan 31 07:40:07 CET 2012 - autobuild(a)suse.de
@@ -4 +4 @@
-- automated update on 2012-01-28
+- automated update on 2012-01-31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arpwatch-ethercodes.spec ++++++
--- /var/tmp/diff_new_pack.AY0HVk/_old 2012-01-31 10:19:22.000000000 +0100
+++ /var/tmp/diff_new_pack.AY0HVk/_new 2012-01-31 10:19:22.000000000 +0100
@@ -23,7 +23,7 @@
License: BSD-3-Clause
Group: Productivity/Networking/Diagnostic
Summary: Ethercodes Data for arpwatch
-Version: 2012.1.28
+Version: 2012.1.31
Release: 1
Source0: http://standards.ieee.org/regauth/oui/oui.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ oui.txt ++++++
--- /var/tmp/diff_new_pack.AY0HVk/_old 2012-01-31 10:19:22.000000000 +0100
+++ /var/tmp/diff_new_pack.AY0HVk/_new 2012-01-31 10:19:22.000000000 +0100
@@ -60259,8 +60259,8 @@
00-25-27 (hex) Bitrode Corp.
002527 (base 16) Bitrode Corp.
- 1642 Manufacturers Dr.
- Fenton MO 63026
+ 9787 Green Park Industrial Drive
+ St. Louis MO 63123
UNITED STATES
00-25-28 (hex) Daido Signal Co., Ltd.
@@ -85746,6 +85746,12 @@
Shenzhen Guangdong 518057
CHINA
+3C-A3-15 (hex) Bless Information & Communication Co., Ltd.
+3CA315 (base 16) Bless Information & Communication Co., Ltd.
+ #64-1, Wonhyoro 3-ga, Yongsan-gu,
+ Seoul 140-848
+ KOREA, REPUBLIC OF
+
3C-A7-2B (hex) MRV Communications (Networks) LTD
3CA72B (base 16) MRV Communications (Networks) LTD
P.O Box 614
--
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 lighttpd for openSUSE:11.4
checked in at Mon Jan 30 23:59:53 CET 2012.
--------
--- old-versions/11.4/all/lighttpd/lighttpd.changes 2010-04-22 13:55:48.000000000 +0200
+++ 11.4/lighttpd/lighttpd.changes 2012-01-27 12:19:47.000000000 +0100
@@ -1,0 +2,13 @@
+Fri Jan 27 11:18:04 UTC 2012 - mrueckert(a)suse.de
+
+- added lighttpd-1.4.26_honor_cipher_order.patch:
+ [ssl] add option to honor server cipher order, true by default
+ (fixes lighttpd#2364)
+
+-------------------------------------------------------------------
+Wed Dec 21 17:54:06 UTC 2011 - mrueckert(a)suse.de
+
+- added lighttpd-1.4.x_mod_auth_signedness_error.patch:
+ Fix a small signedness error in mod_auth CVE-2011-4362 (bnc#733607)
+
+-------------------------------------------------------------------
Package does not exist at destination yet. Using Fallback old-versions/11.4/all/lighttpd
Destination is old-versions/11.4/UPDATES/all/lighttpd
calling whatdependson for 11.4-i586
New:
----
lighttpd-1.4.26_honor_cipher_order.patch
lighttpd-1.4.x_mod_auth_signedness_error.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lighttpd.spec ++++++
--- /var/tmp/diff_new_pack.gEQPoC/_old 2012-01-30 23:59:12.000000000 +0100
+++ /var/tmp/diff_new_pack.gEQPoC/_new 2012-01-30 23:59:12.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package lighttpd (Version 1.4.26)
+# spec file for package lighttpd
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: lighttpd
Version: 1.4.26
-Release: 2
+Release: 6.<RELEASE7>
#
%define pkg_name lighttpd
%define pkg_user lighttpd
@@ -92,6 +92,8 @@
Source7: lighttpd.logrotate
Patch: lighttpd-1.4.13_geoip.patch
Patch1: lighttpd-ssl-retval-fix.patch
+Patch2: lighttpd-1.4.x_mod_auth_signedness_error.patch
+Patch3: lighttpd-1.4.26_honor_cipher_order.patch
#
Summary: A Secure, Fast, Compliant, and Very Flexible Web Server
@@ -284,6 +286,8 @@
%patch
%endif
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%if 0%{?with_geoip}
++++++ lighttpd-1.4.26_honor_cipher_order.patch ++++++
commit 687b52298d7d87a5ce0919f34a1666724a709c88
Author: Stefan Bühler <stbuehler(a)web.de>
Date: Wed Nov 30 19:59:24 2011 +0000
[ssl] add option to honor server cipher order, true by default (fixes #2364)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2810 152afb58-edef-0310-8abb-c4023f1b3aa9
Conflicts:
NEWS
doc/config/lighttpd.conf
src/base.h
src/configfile.c
diff --git a/src/base.h b/src/base.h
index 4243bd2..9d4efa0 100644
--- a/src/base.h
+++ b/src/base.h
@@ -275,6 +275,7 @@ typedef struct {
buffer *ssl_pemfile;
buffer *ssl_ca_file;
buffer *ssl_cipher_list;
+ unsigned short ssl_honor_cipher_order; /* determine SSL cipher in server-preferred order, not client-order */
unsigned short ssl_use_sslv2;
unsigned short ssl_verifyclient;
unsigned short ssl_verifyclient_enforce;
diff --git a/src/configfile.c b/src/configfile.c
index 3037185..1137825 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -100,6 +100,7 @@ static int config_insert(server *srv) {
{ "ssl.verifyclient.depth", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_SERVER }, /* 58 */
{ "ssl.verifyclient.username", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 59 */
{ "ssl.verifyclient.exportcert", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 60 */
+ { "ssl.honor-cipher-order", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 61 */
{ "server.host", "use server.bind instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
{ "server.docroot", "use server.document-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
{ "server.virtual-root", "load mod_simple_vhost and use simple-vhost.server-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
@@ -168,6 +169,7 @@ static int config_insert(server *srv) {
s->max_write_idle = 360;
s->use_xattr = 0;
s->is_ssl = 0;
+ s->ssl_honor_cipher_order = 1;
s->ssl_use_sslv2 = 0;
s->use_ipv6 = 0;
s->defer_accept = 0;
@@ -231,6 +233,7 @@ static int config_insert(server *srv) {
cv[47].destination = s->ssl_cipher_list;
cv[48].destination = &(s->ssl_use_sslv2);
+ cv[61].destination = &(s->ssl_honor_cipher_order);
cv[49].destination = &(s->etag_use_inode);
cv[50].destination = &(s->etag_use_mtime);
cv[51].destination = &(s->etag_use_size);
@@ -319,6 +322,7 @@ int config_setup_connection(server *srv, connection *con) {
#endif
PATCH(ssl_ca_file);
PATCH(ssl_cipher_list);
+ PATCH(ssl_honor_cipher_order);
PATCH(ssl_use_sslv2);
PATCH(etag_use_inode);
PATCH(etag_use_mtime);
@@ -383,6 +387,8 @@ int config_patch_connection(server *srv, connection *con, comp_key_t comp) {
#endif
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.ca-file"))) {
PATCH(ssl_ca_file);
+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.honor-cipher-order"))) {
+ PATCH(ssl_honor_cipher_order);
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.use-sslv2"))) {
PATCH(ssl_use_sslv2);
} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.cipher-list"))) {
diff --git a/src/network.c b/src/network.c
index b362129..be452a6 100644
--- a/src/network.c
+++ b/src/network.c
@@ -539,6 +539,10 @@ int network_init(server *srv) {
ERR_error_string(ERR_get_error(), NULL));
return -1;
}
+
+ if (s->ssl_honor_cipher_order) {
+ SSL_CTX_set_options(s->ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
+ }
}
if (!buffer_is_empty(s->ssl_ca_file)) {
++++++ lighttpd-1.4.x_mod_auth_signedness_error.patch ++++++
commit 1adaac589ced706e1badd751f54390086b1d0767
Author: Marcus Rückert <mrueckert(a)suse.de>
Date: Tue Dec 20 13:08:51 2011 +0100
- merge 6c9dff7cda6593d9a566413347dd5adfe80c86a8
[mod_auth] Fix signedness error in http_auth (fixes #2370,
CVE-2011-4362)
diff --git a/src/http_auth.c b/src/http_auth.c
index 0c0c4a5..6609dc7 100644
--- a/src/http_auth.c
+++ b/src/http_auth.c
@@ -89,7 +89,7 @@ static unsigned char * base64_decode(buffer *out, const char *in) {
ch = in[0];
/* run through the whole string, converting as we go */
for (i = 0; i < in_len; i++) {
- ch = in[i];
+ ch = (unsigned char) in[i];
if (ch == '\0') break;
diff --git a/tests/mod-auth.t b/tests/mod-auth.t
index 475a5f6..89ead9d 100755
--- a/tests/mod-auth.t
+++ b/tests/mod-auth.t
@@ -8,7 +8,7 @@ BEGIN {
use strict;
use IO::Socket;
-use Test::More tests => 14;
+use Test::More tests => 15;
use LightyTest;
my $tf = LightyTest->new();
@@ -25,6 +25,14 @@ ok($tf->handle_http($t) == 0, 'Missing Auth-token');
$t->{REQUEST} = ( <<EOF
GET /server-status HTTP/1.0
+Authorization: Basic \x80mFuOmphb
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ];
+ok($tf->handle_http($t) == 0, 'Basic-Auth: Invalid base64 Auth-token');
+
+$t->{REQUEST} = ( <<EOF
+GET /server-status HTTP/1.0
Authorization: Basic amFuOmphb
EOF
);
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package sudo for openSUSE:12.1:Update:Test checked in at 2012-01-30 20:46:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/sudo (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.sudo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sudo", Maintainer is "VCizek(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/sudo/sudo.changes 2012-01-05 17:57:34.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.sudo.new/sudo.changes 2012-01-30 20:46:13.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Jan 30 11:43:47 UTC 2012 - vcizek(a)suse.com
+
+- fix for CVE-2012-0809 (bnc#743300)
+
+-------------------------------------------------------------------
New:
----
sudo-1.8.2-CVE-2012-0809.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sudo.spec ++++++
--- /var/tmp/diff_new_pack.TCzaiZ/_old 2012-01-30 20:46:13.000000000 +0100
+++ /var/tmp/diff_new_pack.TCzaiZ/_new 2012-01-30 20:46:13.000000000 +0100
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: sudo
Version: 1.8.2
Release: 0
@@ -29,6 +30,7 @@
Patch1: sudo-sudoers.patch
Patch2: sudo-grp-include.patch
Patch3: sudo-1.8.2-ldap_search_escape.patch
+Patch4: sudo-1.8.2-CVE-2012-0809.patch
BuildRequires: audit-devel
BuildRequires: libselinux-devel
BuildRequires: openldap2-devel
@@ -59,6 +61,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%ifarch s390 s390x %sparc
++++++ sudo-1.8.2-CVE-2012-0809.patch ++++++
Index: sudo-1.8.2/src/sudo.c
===================================================================
--- sudo-1.8.2.orig/src/sudo.c 2011-07-29 16:50:45.000000000 +0200
+++ sudo-1.8.2/src/sudo.c 2012-01-25 12:07:07.609611322 +0100
@@ -1206,15 +1206,15 @@
sudo_debug(int level, const char *fmt, ...)
{
va_list ap;
- char *fmt2;
+ char *buf;
if (level > debug_level)
return;
- /* Backet fmt with program name and a newline to make it a single write */
- easprintf(&fmt2, "%s: %s\n", getprogname(), fmt);
+ /* Bracket fmt with program name and a newline to make it a single write */
va_start(ap, fmt);
- vfprintf(stderr, fmt2, ap);
+ evasprintf(&buf, fmt, ap);
va_end(ap);
- efree(fmt2);
+ fprintf(stderr, "%s: %s\n", getprogname(), buf);
+ efree(buf);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0