August 2014 - openSUSE Commits - openSUSE Mailing Lists

commit mupdf for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package mupdf for openSUSE:Factory checked in at 2014-08-27 22:18:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mupdf (Old) and /work/SRC/openSUSE:Factory/.mupdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mupdf" Changes: -------- --- /work/SRC/openSUSE:Factory/mupdf/mupdf.changes 2014-06-16 21:55:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mupdf.new/mupdf.changes 2014-08-27 22:18:21.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Aug 26 07:03:44 UTC 2014 - gber(a)opensuse.org + +- update to version 1.5 + * This is a bugfix release: dozens of bugs have been found and + exterminated! + * A typo resulting in a potential stack overflow that could + corrupt files when saving edits to a PDF has been fixed. + Another bug which caused a significant slowdown has also been + fixed. + +------------------------------------------------------------------- Old: ---- mupdf-1.4-source.tar.gz New: ---- mupdf-1.5-source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mupdf.spec ++++++ --- /var/tmp/diff_new_pack.li70Y8/_old 2014-08-27 22:18:23.000000000 +0200 +++ /var/tmp/diff_new_pack.li70Y8/_new 2014-08-27 22:18:23.000000000 +0200 @@ -18,7 +18,7 @@ Name: mupdf -Version: 1.4 +Version: 1.5 Release: 0 Summary: Lightweight PDF and XPS Viewer and Parser and Rendering Library License: AGPL-3.0+ @@ -114,6 +114,7 @@ %doc CHANGES COPYING README docs/naming.txt docs/overview.txt %doc docs/progressive.txt docs/refcount.txt docs/examples/ %{_bindir}/mupdf +%{_bindir}/mupdf-x11-curl %{_bindir}/mudraw %{_bindir}/mutool %{_bindir}/mujstest ++++++ mupdf-1.4-source.tar.gz -> mupdf-1.5-source.tar.gz ++++++ /work/SRC/openSUSE:Factory/mupdf/mupdf-1.4-source.tar.gz /work/SRC/openSUSE:Factory/.mupdf.new/mupdf-1.5-source.tar.gz differ: char 5, line 1 ++++++ mupdf-fix-openjpeg2.patch ++++++ --- /var/tmp/diff_new_pack.li70Y8/_old 2014-08-27 22:18:23.000000000 +0200 +++ /var/tmp/diff_new_pack.li70Y8/_new 2014-08-27 22:18:23.000000000 +0200 @@ -1,23 +1,8 @@ -Index: mupdf-1.4-source/Makerules +Index: mupdf-1.5-source/source/fitz/load-jpx.c =================================================================== ---- mupdf-1.4-source.orig/Makerules -+++ mupdf-1.4-source/Makerules -@@ -71,8 +71,8 @@ SYS_X11_LIBS = $(shell pkg-config --libs - - SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) - SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) --SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1) --SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1) -+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2) -+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2) - SYS_JBIG2DEC_LIBS = -ljbig2dec - SYS_JPEG_LIBS = -ljpeg - SYS_ZLIB_LIBS = -lz -Index: mupdf-1.4-source/source/fitz/load-jpx.c -=================================================================== ---- mupdf-1.4-source.orig/source/fitz/load-jpx.c -+++ mupdf-1.4-source/source/fitz/load-jpx.c -@@ -117,7 +117,7 @@ fz_load_jpx(fz_context *ctx, unsigned ch +--- mupdf-1.5-source.orig/source/fitz/load-jpx.c ++++ mupdf-1.5-source/source/fitz/load-jpx.c +@@ -116,7 +116,7 @@ fz_load_jpx(fz_context *ctx, unsigned ch opj_stream_set_read_function(stream, fz_opj_stream_read); opj_stream_set_skip_function(stream, fz_opj_stream_skip); opj_stream_set_seek_function(stream, fz_opj_stream_seek); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmtp for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package libmtp for openSUSE:Factory checked in at 2014-08-27 22:18:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmtp (Old) and /work/SRC/openSUSE:Factory/.libmtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmtp" Changes: -------- --- /work/SRC/openSUSE:Factory/libmtp/libmtp.changes 2014-05-29 08:43:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmtp.new/libmtp.changes 2014-08-27 22:18:17.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Aug 26 06:31:36 UTC 2014 - meissner(a)suse.com + +- updated to 1.1.7 + - Soname libmtp.so.9.2.0 - binary compatible, new interfaces + have been added. + - Compilation fixes for older GCC and non-GCC compilers. + - Finalize >4GB file transfer changes so this works now. + - A new API to check for device capabilities has been added. + - Sync in latest upstream ptp2 changes. + - Support for USB 3.0! (A patch adding async buffering was + reverted after deemed instable by Debian.) + - Some migration toward the new API in the examples. + - Use parent storage if available as default storage media. + - Force reset on close for Android devices. + - Handle integrated USB hubs in mtp-probe. + - Devices, devices, devices... +- mtpz-use-LIBMTP_ERROR-instead-of-LIBMTP_INFO.patch: is upstream +- music-players.h: use up to date 1.1.7 version again. + +------------------------------------------------------------------- Old: ---- libmtp-1.1.6.tar.gz mtpz-use-LIBMTP_ERROR-instead-of-LIBMTP_INFO.patch music-players.h New: ---- libmtp-1.1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmtp.spec ++++++ --- /var/tmp/diff_new_pack.wHb8b2/_old 2014-08-27 22:18:18.000000000 +0200 +++ /var/tmp/diff_new_pack.wHb8b2/_new 2014-08-27 22:18:18.000000000 +0200 @@ -26,13 +26,11 @@ Summary: Commandline utilities for access to MTP Players License: LGPL-2.1+ Group: Productivity/Multimedia/Sound/Players -Version: 1.1.6 +Version: 1.1.7 Release: 0 %define sonum 9 Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}… # from git 1a2669c6df6c093aec38c0c99a21438d74ccdf33 -Source1: music-players.h -Patch0: mtpz-use-LIBMTP_ERROR-instead-of-LIBMTP_INFO.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d } %{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev) } @@ -79,8 +77,6 @@ %prep %setup -q -%patch0 -p1 -cp %{SOURCE1} src/music-players.h %build echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in ++++++ libmtp-1.1.6.tar.gz -> libmtp-1.1.7.tar.gz ++++++ ++++ 12148 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

commit php5 for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2014-08-27 22:18:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2014-07-30 07:34:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2014-08-27 22:18:14.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Aug 26 06:50:40 UTC 2014 - pgajdos(a)suse.com + +- This release fixes several bugs against PHP 5.5.15 and resolves + CVE-2014-3538, CVE-2014-3587, CVE-2014-2497, CVE-2014-5120 and + CVE-2014-3597. +- removed patches: + * php-CVE-2014-2497.patch + +------------------------------------------------------------------- Old: ---- php-5.5.15.tar.bz2 php-CVE-2014-2497.patch New: ---- php-5.5.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.gN0Dhv/_old 2014-08-27 22:18:16.000000000 +0200 +++ /var/tmp/diff_new_pack.gN0Dhv/_new 2014-08-27 22:18:16.000000000 +0200 @@ -104,7 +104,7 @@ %define apache2_includedir %(%{apxs2} -q INCLUDEDIR) %define apache2_serverroot %(%{apxs2} -q PREFIX) %define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo 0; fi; else echo 0; fi) -Version: 5.5.15 +Version: 5.5.16 Release: 0 Provides: php Provides: php-api = %{apiver} @@ -176,7 +176,6 @@ Patch19: php5-big-file-upload.patch Patch20: php5-per-mod-log.patch Patch21: php5-apache24-updates.patch -Patch22: php-CVE-2014-2497.patch Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -1327,7 +1326,6 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 -%patch22 # Safety check for API version change. vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` if test "x${vapi}" != "x%{apiver}"; then ++++++ php-5.5.15.tar.bz2 -> php-5.5.16.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/php5/php-5.5.15.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.5.16.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcamgm for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package libcamgm for openSUSE:Factory checked in at 2014-08-27 22:18:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcamgm (Old) and /work/SRC/openSUSE:Factory/.libcamgm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcamgm" Changes: -------- --- /work/SRC/openSUSE:Factory/libcamgm/libcamgm.changes 2014-06-25 06:58:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcamgm.new/libcamgm.changes 2014-08-27 22:18:11.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 25 11:41:32 CEST 2014 - mc(a)suse.de + +- version 1.0.6 +- convert certificate policies to OID only (bnc#889356) +- add test for X509v3 Any Policy +- update translation files + +------------------------------------------------------------------- Old: ---- libcamgm-1.0.5.tar.bz2 New: ---- libcamgm-1.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcamgm.spec ++++++ --- /var/tmp/diff_new_pack.XDPGN2/_old 2014-08-27 22:18:12.000000000 +0200 +++ /var/tmp/diff_new_pack.XDPGN2/_new 2014-08-27 22:18:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: libcamgm -Version: 1.0.5 +Version: 1.0.6 Release: 0 Summary: CA Management Library License: LGPL-2.1 ++++++ libcamgm-1.0.5.tar.bz2 -> libcamgm-1.0.6.tar.bz2 ++++++ ++++ 1768 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

commit cryptsetup for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at 2014-08-27 22:18:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cryptsetup (Old) and /work/SRC/openSUSE:Factory/.cryptsetup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cryptsetup" Changes: -------- --- /work/SRC/openSUSE:Factory/cryptsetup/cryptsetup.changes 2014-08-15 09:55:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cryptsetup.new/cryptsetup.changes 2014-08-27 22:18:09.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 22 12:02:56 UTC 2014 - meissner(a)suse.com + +- Use --enable-gcrypt-pbkdf2 to use the PBKDFv2 method from libgcrypt. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.qkgyV9/_old 2014-08-27 22:18:10.000000000 +0200 +++ /var/tmp/diff_new_pack.qkgyV9/_new 2014-08-27 22:18:10.000000000 +0200 @@ -92,7 +92,8 @@ %configure --enable-cryptsetup-reencrypt \ --enable-selinux \ --enable-fips \ - --enable-pwquality + --enable-pwquality \ + --enable-gcrypt-pbkdf2 make %{?_smp_mflags} %install -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libapr1 for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2014-08-27 22:18:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libapr1" Changes: -------- --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2014-06-25 15:24:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2014-08-27 22:18:06.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 19 23:28:46 UTC 2014 - crrodriguez(a)opensuse.org + +- 0004-Backport-r1593600-from-1.6.patch memory leak apr_pvsprintf() +- 0005-Backport-r1593612-from-1.6.patch Missing error codes in apr_error_string() +- 0007-backport-r1604596-1604598-from-trunk.patch memory corruption in apr_skiplist +- 0009-Merge-r1610854-from-trunk.patch posix semaphore must handle EINTR. + +------------------------------------------------------------------- New: ---- 0004-Backport-r1593600-from-1.6.patch 0005-Backport-r1593612-from-1.6.patch 0007-backport-r1604596-1604598-from-trunk.patch 0009-Merge-r1610854-from-trunk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libapr1.spec ++++++ --- /var/tmp/diff_new_pack.ovqwXa/_old 2014-08-27 22:18:08.000000000 +0200 +++ /var/tmp/diff_new_pack.ovqwXa/_new 2014-08-27 22:18:08.000000000 +0200 @@ -31,6 +31,10 @@ Patch1: string-compare.diff Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch +Patch6: 0004-Backport-r1593600-from-1.6.patch +Patch7: 0005-Backport-r1593612-from-1.6.patch +Patch8: 0007-backport-r1604596-1604598-from-trunk.patch +Patch9: 0009-Merge-r1610854-from-trunk.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: libtool @@ -79,7 +83,10 @@ %patch1 %patch4 %patch5 -p1 - +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 # Do not put date to doxy content sed -i \ -e '4 iHTML_TIMESTAMP=NO' \ ++++++ 0004-Backport-r1593600-from-1.6.patch ++++++ >From dc099b699dc673f61a7a130d83e63a2c8c06f5bb Mon Sep 17 00:00:00 2001 From: Stefan Fritsch <sf(a)apache.org> Date: Fri, 9 May 2014 19:55:08 +0000 Subject: [PATCH 04/13] Backport r1593600 from 1.6: Backport r1438940 from trunk: Don't leak memnodes in apr_pvsprintf() if out of memory and no pool abort function is set git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1593610 13f79535-47bb-0310-9956-ffa450edef68 --- memory/unix/apr_pools.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index 5c1a1ff..20e4254 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -1135,21 +1135,12 @@ APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap) * room to hold the NUL terminator. */ if (ps.node->first_avail == ps.node->endp) { - if (psprintf_flush(&ps.vbuff) == -1) { - if (pool->abort_fn) { - pool->abort_fn(APR_ENOMEM); - } - - return NULL; - } + if (psprintf_flush(&ps.vbuff) == -1) + goto error; } - if (apr_vformatter(psprintf_flush, &ps.vbuff, fmt, ap) == -1) { - if (pool->abort_fn) - pool->abort_fn(APR_ENOMEM); - - return NULL; - } + if (apr_vformatter(psprintf_flush, &ps.vbuff, fmt, ap) == -1) + goto error; strp = ps.vbuff.curpos; *strp++ = '\0'; @@ -1195,6 +1186,15 @@ APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap) list_insert(active, node); return strp; + +error: + if (pool->abort_fn) + pool->abort_fn(APR_ENOMEM); + if (ps.got_a_new_node) { + ps.node->next = ps.free; + allocator_free(pool->allocator, ps.node); + } + return NULL; } -- 2.0.4 ++++++ 0005-Backport-r1593612-from-1.6.patch ++++++ >From 5a7aa108394a9a59079c73a0ff875907b8992cf0 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch <sf(a)apache.org> Date: Fri, 9 May 2014 20:01:43 +0000 Subject: [PATCH 05/13] Backport r1593612 from 1.6: Backport r1593611 from trunk: Add some missing error messages to apr_error_string git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1593613 13f79535-47bb-0310-9956-ffa450edef68 --- misc/unix/errorcodes.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/misc/unix/errorcodes.c b/misc/unix/errorcodes.c index 75567c2..f553a37 100644 --- a/misc/unix/errorcodes.c +++ b/misc/unix/errorcodes.c @@ -39,6 +39,8 @@ static char *stuffbuffer(char *buf, apr_size_t bufsize, const char *s) static char *apr_error_string(apr_status_t statcode) { switch (statcode) { + case APR_ENOSTAT: + return "Could not perform a stat on the file."; case APR_ENOPOOL: return "A new pool could not be created."; case APR_EBADDATE: @@ -73,7 +75,10 @@ static char *apr_error_string(apr_status_t statcode) return "The specified IP address is invalid."; case APR_EBADMASK: return "The specified network mask is invalid."; - + case APR_ESYMNOTFOUND: + return "Could not find the requested symbol."; + case APR_ENOTENOUGHENTROPY: + return "Not enough entropy to continue."; case APR_INCHILD: return "Your code just forked, and you are currently executing in the " @@ -128,10 +133,12 @@ static char *apr_error_string(apr_status_t statcode) return "The given path is misformatted or contained invalid characters"; case APR_EPATHWILD: return "The given path contained wildcard characters"; + case APR_EBUSY: + return "The given lock was busy."; case APR_EPROC_UNKNOWN: return "The process is not recognized."; case APR_EGENERAL: - return "Internal error"; + return "Internal error (specific information not available)"; default: return "Error string not specified yet"; } -- 2.0.4 ++++++ 0007-backport-r1604596-1604598-from-trunk.patch ++++++ >From 05ec343f6afde074e4106573ac279895aa77f450 Mon Sep 17 00:00:00 2001 From: Eric Covener <covener(a)apache.org> Date: Thu, 26 Jun 2014 12:47:31 +0000 Subject: [PATCH 07/13] backport r1604596,1604598 from trunk: Add a basic skiplist test. Based on test program posted to PR 56654 by Takashi Sato. Submitted By: Takashi Sato, covener Committed By: covener apr_skiplist becomes corrupt when nodes are reused. Submitted By: Takashi Sato <takashi tks st>, covener committed By: covener git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1605769 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 +- tables/apr_skiplist.c | 2 - test/Makefile.in | 2 +- test/abts_tests.h | 3 +- test/testskiplist.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ test/testutil.h | 1 + 6 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 test/testskiplist.c diff --git a/tables/apr_skiplist.c b/tables/apr_skiplist.c index effcf60..07e9ccc 100644 --- a/tables/apr_skiplist.c +++ b/tables/apr_skiplist.c @@ -387,11 +387,9 @@ APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert_compare(apr_skiplist *sl, vo (apr_skiplistnode *)apr_skiplist_alloc(sl, sizeof(apr_skiplistnode)); sl->top->up->down = sl->top; sl->top = sl->topend = sl->top->up; -#if 0 sl->top->prev = sl->top->next = sl->top->nextindex = sl->top->previndex = sl->top->up = NULL; sl->top->data = NULL; -#endif sl->top->sl = sl; } ch = sl->height; -- 2.0.4 ++++++ 0009-Merge-r1610854-from-trunk.patch ++++++ >From eb5e8e0dd4c6295905e8c4fe4f1cfec42d8ad761 Mon Sep 17 00:00:00 2001 From: Jeff Trawick <trawick(a)apache.org> Date: Wed, 16 Jul 2014 13:26:17 +0000 Subject: [PATCH 09/13] Merge r1610854 from trunk: Resolve failures with the POSIX sem implementation of APR process mutexes (and thus global mutexes) in environments which receive signals. EINTR is now handled on the sem_* calls that are documented as exposing EINTR in the Linux, FreeBSD, and/or Solaris docs. There are a few other calls that haven't been updated: sem_unlink(), sem_post(), and sem_close(). git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1611000 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ locks/unix/proc_mutex.c | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c index fa8a872..32012a7 100644 --- a/locks/unix/proc_mutex.c +++ b/locks/unix/proc_mutex.c @@ -114,7 +114,9 @@ static apr_status_t proc_mutex_posix_create(apr_proc_mutex_t *new_mutex, usec = apr_time_usec(now); apr_snprintf(semname, sizeof(semname), "/ApR.%lxZ%lx", sec, usec); } - psem = sem_open(semname, O_CREAT | O_EXCL, 0644, 1); + do { + psem = sem_open(semname, O_CREAT | O_EXCL, 0644, 1); + } while (psem == (sem_t *)SEM_FAILED && errno == EINTR); if (psem == (sem_t *)SEM_FAILED) { if (errno == ENAMETOOLONG) { /* Oh well, good try */ @@ -122,7 +124,9 @@ static apr_status_t proc_mutex_posix_create(apr_proc_mutex_t *new_mutex, } else { return errno; } - psem = sem_open(semname, O_CREAT | O_EXCL, 0644, 1); + do { + psem = sem_open(semname, O_CREAT | O_EXCL, 0644, 1); + } while (psem == (sem_t *)SEM_FAILED && errno == EINTR); } if (psem == (sem_t *)SEM_FAILED) { @@ -140,7 +144,12 @@ static apr_status_t proc_mutex_posix_create(apr_proc_mutex_t *new_mutex, static apr_status_t proc_mutex_posix_acquire(apr_proc_mutex_t *mutex) { - if (sem_wait(mutex->psem_interproc) < 0) { + int rc; + + do { + rc = sem_wait(mutex->psem_interproc); + } while (rc < 0 && errno == EINTR); + if (rc < 0) { return errno; } mutex->curr_locked = 1; @@ -149,7 +158,12 @@ static apr_status_t proc_mutex_posix_acquire(apr_proc_mutex_t *mutex) static apr_status_t proc_mutex_posix_tryacquire(apr_proc_mutex_t *mutex) { - if (sem_trywait(mutex->psem_interproc) < 0) { + int rc; + + do { + rc = sem_trywait(mutex->psem_interproc); + } while (rc < 0 && errno == EINTR); + if (rc < 0) { if (errno == EAGAIN) { return APR_EBUSY; } -- 2.0.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfce4-power-manager for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package xfce4-power-manager for openSUSE:Factory checked in at 2014-08-27 16:53:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old) and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-power-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes 2014-08-25 11:03:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 2014-08-27 16:53:30.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 25 21:25:35 UTC 2014 - gber(a)opensuse.org + +- disable lxpanel-plugin-power-manager which does not build due to + API changes lxpanel >= 0.7.0 (bxo#11108) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.pTQN9D/_old 2014-08-27 16:53:32.000000000 +0200 +++ /var/tmp/diff_new_pack.pTQN9D/_new 2014-08-27 16:53:32.000000000 +0200 @@ -43,7 +43,9 @@ BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfconf-0) +%if 0 BuildRequires: pkgconfig(lxpanel) +%endif BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100 BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) @@ -82,6 +84,7 @@ This package provides a plugin for the Xfce panel for monitoring battery and device charge levels and to regulate display brightness. +%if 0 %package -n lxpanel-plugin-power-manager Summary: LXPanel Plugin for Monitoring Batteries and Changing the Display Brightness Group: System/GUI/LXDE @@ -93,6 +96,7 @@ %description -n lxpanel-plugin-power-manager This package provides a plugin for the LXDE panel for monitoring battery and device charge levels and to regulate display brightness. +%endif %package branding-upstream Summary: Upstream Branding of xfce4-power-manager @@ -145,8 +149,10 @@ %suse_update_desktop_file xfce4-power-manager-settings %suse_update_desktop_file xfce4-power-manager -rm %{buildroot}%{_libdir}/xfce4/panel/plugins/libxfce4powermanager.la \ - %{buildroot}%{_libdir}/lxpanel/plugins/lxde_power_manager.la +rm %{buildroot}%{_libdir}/xfce4/panel/plugins/libxfce4powermanager.la +%if 0 +rm %{buildroot}%{_libdir}/lxpanel/plugins/lxde_power_manager.la +%endif # xfce4-pm-helper is only needed on non-systemd systems rm %{buildroot}%{_sbindir}/xfce4-pm-helper @@ -186,9 +192,11 @@ %{_libdir}/xfce4/panel/plugins/libxfce4powermanager.so %{_datadir}/xfce4/panel-plugins/power-manager-plugin.desktop +%if 0 %files -n lxpanel-plugin-power-manager %defattr(-,root,root) %{_libdir}/lxpanel/plugins/lxde_power_manager.so +%endif %files branding-upstream %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-binplist for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package python-binplist for openSUSE:Factory checked in at 2014-08-27 16:53:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-binplist (Old) and /work/SRC/openSUSE:Factory/.python-binplist.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-binplist" Changes: -------- --- /work/SRC/openSUSE:Factory/python-binplist/python-binplist.changes 2013-09-11 13:07:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-binplist.new/python-binplist.changes 2014-08-27 16:53:29.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 13 18:57:50 UTC 2014 - Greg.Freemyer(a)gmail.com + +- update to v0.1.4 + * Per GIT log replaced JSON parser with internal code + * other minor changes +- change /usr/bin/binplist to /usr/bin/plist.py in %files section + +------------------------------------------------------------------- Old: ---- binplist-0.1.3.tar.gz New: ---- binplist-0.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-binplist.spec ++++++ --- /var/tmp/diff_new_pack.CmbxCL/_old 2014-08-27 16:53:30.000000000 +0200 +++ /var/tmp/diff_new_pack.CmbxCL/_new 2014-08-27 16:53:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-binplist # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-binplist -Version: 0.1.3 +Version: 0.1.4 Release: 0 -License: Apache-2.0 Summary: Binary property list (plist) parser module written in python -Url: https://code.google.com/p/binplist/ +License: Apache-2.0 Group: Development/Libraries/Python -Source: https://binplist.googlecode.com/files/binplist-0.1.3.tar.gz +Url: https://code.google.com/p/binplist/ +Source: https://binplist.googlecode.com/files/binplist-0.1.4.tar.gz BuildRequires: python-devel BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,7 +51,7 @@ %files %defattr(-,root,root) %doc COPYING -%{_bindir}/binplist +%{_bindir}/plist.py %{python_sitelib}/binplist-%{version}-py%{py_ver}.egg-info %{python_sitelib}/binplist ++++++ binplist-0.1.3.tar.gz -> binplist-0.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/PKG-INFO new/binplist-0.1.4/PKG-INFO --- old/binplist-0.1.3/PKG-INFO 2013-07-31 00:08:30.000000000 +0200 +++ new/binplist-0.1.4/PKG-INFO 2013-08-22 20:13:22.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: binplist -Version: 0.1.3 +Version: 0.1.4 Summary: A binary plist parser Home-page: http://code.google.com/p/binplist Author: Jordi Sanchez diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/binplist/__init__.py new/binplist-0.1.4/binplist/__init__.py --- old/binplist-0.1.3/binplist/__init__.py 2013-07-30 23:39:47.000000000 +0200 +++ new/binplist-0.1.4/binplist/__init__.py 2013-07-31 21:19:02.000000000 +0200 @@ -1,2 +1,2 @@ -__version__ = "0.1.3" +__version__ = "0.1.4" __feedback_email__ = "binplist.feedback(a)gmail.com" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/binplist/binplist.py new/binplist-0.1.4/binplist/binplist.py --- old/binplist-0.1.3/binplist/binplist.py 2013-07-30 00:58:43.000000000 +0200 +++ new/binplist-0.1.4/binplist/binplist.py 2013-08-22 17:41:57.000000000 +0200 @@ -1,4 +1,5 @@ #!/bin/env python +# -*- coding: utf-8 -*- # # Copyright 2013 Google Inc. All Rights Reserved. # @@ -31,7 +32,7 @@ BinaryPlist class and then call the Parse() method on it, with a file-like object as an argument. - with open("myfile.plist") as fd: + with open("myfile.plist", "rb") as fd: bplist = BinaryPlist(fd) top_level_object = bplist.Parse(fd) @@ -56,12 +57,12 @@ from . import __version__ from . import __feedback_email__ -import cStringIO import datetime import logging import math import os import plistlib +import string import struct import xml.parsers.expat @@ -82,7 +83,7 @@ self.value = value def __str__(self): - return str(self.value) + return self.value def __repr__(self): return repr(self.value) @@ -90,6 +91,9 @@ def __eq__(self, other): return self.value == other + def __unicode__(self): + return u"'%s'" % ''.join([u"\\x%s" % c.encode('hex') for c in self.value]) + class CorruptReference(object): """Marks references to objects that are corrupt.""" @@ -141,7 +145,8 @@ # Length of the preview we show for each object when DEBUG logging debug_object_preview_length = 48 - def __init__(self, file_obj=None, discovery_mode=False, ultra_verbosity=True): + def __init__(self, file_obj=None, discovery_mode=False, + ultra_verbosity=False): """Constructor. Args: @@ -185,14 +190,14 @@ def Open(self, file_obj): try: - start_offset = file_obj.tell() - file_obj.seek(0, os.SEEK_END) - self._file_size = file_obj.tell() - start_offset - file_obj.seek(start_offset, os.SEEK_SET) - self._bplist_start_offset = start_offset - self.fd = file_obj + start_offset = file_obj.tell() + file_obj.seek(0, os.SEEK_END) + self._file_size = file_obj.tell() - start_offset + file_obj.seek(start_offset, os.SEEK_SET) + self._bplist_start_offset = start_offset + self.fd = file_obj except AttributeError: - raise Error("This file object doesn't support seek().") + raise Error("This file object doesn't support seek().") def Parse(self): """Parses the file descriptor at file_obj.""" @@ -371,12 +376,11 @@ finally: # Remove the index from the list of traversed objects self.objects_traversed.remove(index) - if (self.debug_object_preview_length > 0 - and len(str(obj)) > self.debug_object_preview_length): + output_string = ToDebugString(obj) + fmt = "Object %d = %s" + if len(output_string) > self.debug_object_preview_length: fmt = "Object %%d ~= %%.%ds ..." % self.debug_object_preview_length - self._LogUltraVerbose(fmt, index, obj) - else: - self._LogUltraVerbose("Object %d = %s", index, obj) + self._LogUltraVerbose(fmt, index, output_string) return obj def _ParseObject(self): @@ -587,10 +591,10 @@ return self.fd.read(strlen*char_size) def _ReadStructFromFd(self, file_obj, structure): - """Reads the given structucture from file_obj and returns the unpacked data. + """Reads the given structure from file_obj and returns the unpacked data. Raises: - IOError: When there wasn't enough data in file_obj to acommodate the + IOError: When there wasn't enough data in file_obj to accommodate the requested structure. Args: @@ -673,6 +677,7 @@ try: return utf16.decode("utf-16-be") except UnicodeDecodeError: + self._LogWarn("Invalid UTF-16 data") return RawValue(utf16) def _ParseUid(self, marker_lo): @@ -879,7 +884,7 @@ file_obj = pathOrFile except AttributeError: # Must be a path then - file_obj = open(pathOrFile) + file_obj = open(pathOrFile, "rb") bplist_start_offset = file_obj.tell() magicversion = file_obj.read(8) @@ -898,3 +903,74 @@ return plistlib.readPlist(file_obj) except xml.parsers.expat.ExpatError: raise FormatError("Invalid plist file.") + + +def ToDebugString(string): + try: + return str(string) + except UnicodeEncodeError: + return unicode(string).encode('unicode_escape') + + + +def PlistToUnicode(o, string_encoding='safeascii', encoding_options="strict", + indent=4, previous_indent=0): + """Returns the Unicode representation of a plist object. + + This is mostly just to handle displaying unicode keys or values in + dictionaries as the default dict implementation escapes them, and to try to + represent byte strings in a more human-readable form. + + Not very proud of the implementation but it is what it is. + """ + if isinstance(o, dict): + indentation = u' '*(previous_indent+indent) + indentation_join = u',\n%s' % indentation + opening_bracket = u"{\n%s" % indentation + closing_bracket = u"\n%s}" % (u' '*previous_indent) + pieces = [] + for k, v in o.iteritems(): + key = PlistToUnicode(k, string_encoding=string_encoding, + encoding_options=encoding_options, indent=indent, + previous_indent=previous_indent+indent) + value = PlistToUnicode(v, string_encoding=string_encoding, + encoding_options=encoding_options, indent=indent, + previous_indent=previous_indent+indent) + pieces.append(u"%s: %s" % (key, value)) + if not pieces: + return '{}' + return ''.join([opening_bracket, + indentation_join.join(pieces), + closing_bracket]) + elif isinstance(o, str): + try: + if string_encoding == "safeascii": + safeascii = [] + for c in o: + if c in string.printable: + safeascii.append(c) + else: + safeascii.append("\\x" + c.encode("hex")) + return u"'%s'" % (''.join(safeascii)).decode("ascii", "strict") + return u"'%s'" % o.decode(string_encoding, encoding_options) + except (UnicodeEncodeError, UnicodeDecodeError): + return u"'%s'" % ''.join([u"\\x%s" % c.encode('hex') for c in o]) + elif isinstance(o, unicode): + # Return a quote-enclosed string + return u"'%s'" % o + elif o is NullValue: + return u"NULL" + elif o is CorruptReference: + return u"##CORRUPT_REFERENCE##" + elif o is UnknownObject: + return u"##UNKNOWN_OBJECT##" + else: + try: + return u'[%s]' % u', '.join([PlistToUnicode(piece, + string_encoding, + encoding_options, + indent, + previous_indent) + for piece in o]) + except TypeError: + return unicode(o) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/binplist.egg-info/PKG-INFO new/binplist-0.1.4/binplist.egg-info/PKG-INFO --- old/binplist-0.1.3/binplist.egg-info/PKG-INFO 2013-07-31 00:08:30.000000000 +0200 +++ new/binplist-0.1.4/binplist.egg-info/PKG-INFO 2013-08-22 20:13:21.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: binplist -Version: 0.1.3 +Version: 0.1.4 Summary: A binary plist parser Home-page: http://code.google.com/p/binplist Author: Jordi Sanchez diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/binplist.egg-info/SOURCES.txt new/binplist-0.1.4/binplist.egg-info/SOURCES.txt --- old/binplist-0.1.3/binplist.egg-info/SOURCES.txt 2013-07-31 00:08:30.000000000 +0200 +++ new/binplist-0.1.4/binplist.egg-info/SOURCES.txt 2013-08-22 20:13:22.000000000 +0200 @@ -14,6 +14,6 @@ dpkg/control dpkg/copyright dpkg/rules -scripts/binplist +scripts/plist.py tests/__init__.py tests/binplist_test.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/dpkg/changelog new/binplist-0.1.4/dpkg/changelog --- old/binplist-0.1.3/dpkg/changelog 2013-07-30 23:51:35.000000000 +0200 +++ new/binplist-0.1.4/dpkg/changelog 2013-08-21 23:03:14.000000000 +0200 @@ -1,3 +1,10 @@ +binplist (0.1.4-0) unstable; urgency=low + + * Added command line options to the binplist command. + * Fixed a Unicode bug when dealing with UTF16 objects. + + -- Jordi Sanchez <binplist.feedback(a)gmail.com> Wed, 21 Aug 2013 22:54:00 +0200 + binplist (0.1-3) unstable; urgency=low * Initial release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/scripts/binplist new/binplist-0.1.4/scripts/binplist --- old/binplist-0.1.3/scripts/binplist 2013-07-30 00:22:21.000000000 +0200 +++ new/binplist-0.1.4/scripts/binplist 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -#!/bin/env python -# Copyright 2013 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import logging -import plistlib -import pprint -import sys - -from binplist import binplist - - -if __name__ == "__main__": - if len(sys.argv) <= 1: - print "Usage: %s <file>" % sys.argv[0] - sys.exit(-1) - - with open(sys.argv[1]) as fd: - plist = binplist.BinaryPlist(file_obj=fd) - try: - res = plist.Parse() - if plist.is_corrupt: - logging.warn("%s LOOKS CORRUPTED. You might not obtain all data!\n", - sys.argv[1]) - pprint.PrettyPrinter().pprint(res) - except binplist.FormatError, e: - pprint.PrettyPrinter().pprint(plistlib.readPlist(sys.argv[1])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/scripts/plist.py new/binplist-0.1.4/scripts/plist.py --- old/binplist-0.1.3/scripts/plist.py 1970-01-01 01:00:00.000000000 +0100 +++ new/binplist-0.1.4/scripts/plist.py 2013-08-22 17:42:00.000000000 +0200 @@ -0,0 +1,82 @@ +#!/bin/env python +# Copyright 2013 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import argparse +import logging +import plistlib +import sys + +from binplist import binplist + + +parser = argparse.ArgumentParser(description="A forensic plist parser.") +parser.add_argument( + "plist", default=None, action="store", + help="plist file to be parsed") +parser.add_argument( + "-V", "--version", action="version", version=binplist.__version__) +parser.add_argument("-v", "--verbose", action="append_const", const=True, + help="Turn verbose logging on. Use twice for ultra " + "verbosity.") +parser.add_argument("-e", "--string-encoding", default="safeascii", + help="Encoding of binplist strings.") +parser.add_argument("-eo", "--string-encoding-option", default="strict", + choices=['strict', 'ignore', 'replace'], + help=("What to do when encoding strings of a binary plist " + "and some characters cannot be converted.")) +parser.add_argument("-E", "--output-encoding", default="utf-8", + help="Output encoding of binplist.") +parser.add_argument("-EO", "--output-encoding-option", default="strict", + choices=['strict', 'ignore', 'replace', + 'xmlcharrefreplace', 'backslashreplace'], + help=("What to do when encoding the output of binplist " + "and some characters cannot be converted.")) +parser.add_argument("-d", "--discovery-mode", action="store_true", + help=("Will inform you when a UID or a SET is found so " + "that you can help me improve the parser.")) + + +if __name__ == "__main__": + options = parser.parse_args() + if not options.plist: + parser.print_help() + sys.exit(-1) + + ultra_verbosity = False + if options.verbose: + if len(options.verbose) == 1: + logging.basicConfig(level=logging.DEBUG) + else: + ultra_verbosity = True + logging.basicConfig(level=binplist.LOG_ULTRA_VERBOSE) + + with open(options.plist, "rb") as fd: + plist = binplist.BinaryPlist(file_obj=fd, + ultra_verbosity=ultra_verbosity, + discovery_mode=options.discovery_mode) + try: + parsed_plist = plist.Parse() + if plist.is_corrupt: + logging.warn("%s LOOKS CORRUPTED. You might not obtain all data!\n", + options.plist) + except binplist.FormatError, e: + parsed_plist = plistlib.readPlist(options.plist) + + print binplist.PlistToUnicode( + parsed_plist, + string_encoding=options.string_encoding, + encoding_options=options.string_encoding_option).encode( + options.output_encoding, + options.output_encoding_option) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/setup.py new/binplist-0.1.4/setup.py --- old/binplist-0.1.3/setup.py 2013-07-31 00:05:28.000000000 +0200 +++ new/binplist-0.1.4/setup.py 2013-08-08 00:42:03.000000000 +0200 @@ -27,6 +27,6 @@ license="Apache Software License", packages=["binplist"], test_suite = "tests", - scripts=['scripts/binplist'], + scripts=['scripts/plist.py'], install_requires=["pytz"], ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binplist-0.1.3/tests/binplist_test.py new/binplist-0.1.4/tests/binplist_test.py --- old/binplist-0.1.3/tests/binplist_test.py 2013-07-30 00:22:21.000000000 +0200 +++ new/binplist-0.1.4/tests/binplist_test.py 2013-08-22 19:22:48.000000000 +0200 @@ -1,4 +1,6 @@ #!/bin/env python +# -*- coding: utf-8 -*- +# # Copyright 2013 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,7 +30,7 @@ class BinplistTest(unittest.TestCase): def setUp(self): - notrailer = ("bplist00") # header + notrailer = "bplist00" # header self.notrailer = StringIO.StringIO(notrailer) # A bplist of size 32, which lacks a full trailer @@ -112,7 +114,7 @@ '<plist></plist>') def testReadHeader(self): - blank_header = StringIO.StringIO("") + blank_header = StringIO.StringIO() plist = binplist.BinaryPlist(blank_header) self.assertRaises(binplist.FormatError, plist._ReadHeader) wrong_header = StringIO.StringIO("bla") @@ -128,7 +130,7 @@ self.assertEqual(plist.version, "00") def testReadTrailer(self): - blank_trailer = StringIO.StringIO("") + blank_trailer = StringIO.StringIO() plist = binplist.BinaryPlist(blank_trailer) self.assertRaises(IOError, plist._ReadTrailer) plist = binplist.BinaryPlist(self.minimal) @@ -157,7 +159,7 @@ self.assertRaises(binplist.FormatError, plist._ReadOffsetTable) def testReadPlist(self): - blank_file = StringIO.StringIO("") + blank_file = StringIO.StringIO() self.assertRaises(binplist.FormatError, binplist.readPlist, blank_file) bplist15 = StringIO.StringIO("bplist15") self.assertRaises(binplist.FormatError, binplist.readPlist, bplist15) @@ -500,14 +502,14 @@ plist = binplist.BinaryPlist(fd) # Fill objects_traversed with the current value as if we had been called # by a normal _Parse - plist.objects_traversed = set([0]) + plist.objects_traversed = {0} plist.object_ref_size = ref_size plist.object_offsets = object_offsets plist.object_count = len(object_offsets) result = plist._ParseObject() self.assertListEqual(expected_result, result) # Test that the circular reference detection helper is cleaned properly - self.assertSetEqual(plist.objects_traversed, set([0])) + self.assertSetEqual(plist.objects_traversed, {0}) def testParseDict(self): values = [ @@ -604,14 +606,131 @@ plist = binplist.BinaryPlist(fd) # Fill objects_traversed with the current value as if we had been called # by a normal _Parse - plist.objects_traversed = set([0]) + plist.objects_traversed = {0} plist.object_ref_size = ref_size plist.object_offsets = object_offsets plist.object_count = len(object_offsets) result = plist._ParseObject() self.assertEqual(expected_result, result) # Test that the circular reference detection helper is cleaned properly - self.assertSetEqual(plist.objects_traversed, set([0])) + self.assertSetEqual(plist.objects_traversed, {0}) + + + def test_ParseObjectByIndex(self): + unicode_string = ("\x6F\x00\x11\x65\xaf\x8b\xfa\x76\x7b\x90\x7f\x96\xbe" + "\x75\x33\x8b\xf7\x7e\xc8\x88\xab\x90\x1a\x8f\xc7\x00" + "\x20\x00\x2d\x00\x20\x00\x68\x00\x65\x00\x68") + actual_string = u"斯诺登避难申请终被通过 - heh" + fd = StringIO.StringIO(unicode_string) + plist = binplist.BinaryPlist(file_obj=fd) + # Make an external offset_list + offset_list = [0] + resulting_object = plist._ParseObjectByIndex(0, offset_list) + self.assertEqual(resulting_object, actual_string) + + # Second test + second_resulting_object = plist._ParseObjectByIndex(0, offset_list) + # Test that the UTF16 object was in the cache + self.assert_(second_resulting_object is resulting_object) + self.assertEqual(resulting_object, actual_string) + + # Now test for something more complex. An array that has both unicode and + # str strings. + two_element_array = ( + "\xA2" # Array of 2 objects + "\x01" # Reference to object unicode string + "\x02" # Reference to object str string + "\x61\x65\xaf" # Unicode object + "\x52\x99\xcd" # Str object + ) + fd = StringIO.StringIO(two_element_array) + plist = binplist.BinaryPlist(fd) + # Parsing with _ParseObjectByIndex requires setting up some bplist + # properties. + offset_list = [0, 3, 6] + plist.object_count = len(offset_list) + plist.object_offsets = offset_list + plist.object_ref_size = 1 + plist._file_size = len(two_element_array) + resulting_object = plist._ParseObjectByIndex(0, offset_list) + self.assertEqual(resulting_object, [u"斯", "\x99\xcd"]) + + + def test_PlistToUnicode(self): + tests = [ + # Integer tests + (3, + u'3', + u'3'), + + (-9239132913921, + u'-9239132913921', + u'-9239132913921'), + + # String tests + ('abc', # plist + u"'abc'", # with default smartascii + u"'abc'"), # with utf-8 encoding + + ('\xff\x34\x55', + u"'\\xff4U'", # smartascii handles this case "visually gracefully" + u"'\\xff\\x34\\x55'"), # invalid utf-8, so it's fully escaped + + ('\x00\x00\x00', + u"'\\x00\\x00\\x00'", # smartascii escapes non-printable characters + u"'\x00\x00\x00'"), # utf-8 actually encodes these + + # Unicode string tests + (u"斯", + u"'斯'", + u"'斯'",), + + # Array tests + ([1,2,3], + u'[1, 2, 3]', + u'[1, 2, 3]'), + + # Dictionary tests + ({'a': 3}, + u"{\n 'a': 3\n}", + u"{\n 'a': 3\n}"), + + ({'a': {'b': 3}}, + u"{\n 'a': {\n 'b': 3\n }\n}", # default indent + u"{\n 'a': {\n 'b': 3\n }\n}"), # default indent + + ({u"斯": '\xff\x61'}, + u"{\n '斯': '\\xffa'\n}", # smartascii handles a gracefully + u"{\n '斯': '\\xff\\x61'\n}"), # utf-8 fails decoding, full-escape + + # Misc values + (binplist.RawValue('abc'), + u"'\\x61\\x62\\x63'", + u"'\\x61\\x62\\x63'"), + + (binplist.CorruptReference, + u'##CORRUPT_REFERENCE##', + u'##CORRUPT_REFERENCE##'), + + (binplist.NullValue, + u'NULL', + u'NULL'), + + (binplist.UnknownObject, + u'##UNKNOWN_OBJECT##', + u'##UNKNOWN_OBJECT##'), + ] + for (plist, expected_outcome, expected_outcome_utf8) in tests: + self.assertEqual(expected_outcome, binplist.PlistToUnicode(plist)) + if expected_outcome_utf8 == UnicodeDecodeError: + self.assertRaises(UnicodeDecodeError, + binplist.PlistToUnicode, + plist, + string_encoding='utf-8') + else: + self.assertEqual(expected_outcome_utf8, + binplist.PlistToUnicode(plist, + string_encoding='utf-8')) if __name__ == "__main__": -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdbi for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package libdbi for openSUSE:Factory checked in at 2014-08-27 16:53:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbi (Old) and /work/SRC/openSUSE:Factory/.libdbi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdbi" Changes: -------- --- /work/SRC/openSUSE:Factory/libdbi/libdbi.changes 2014-07-08 13:02:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdbi.new/libdbi.changes 2014-08-27 16:53:28.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 27 10:34:10 UTC 2014 - jengelh(a)inai.de + +- Update to git snapshot 0.9.0+git32 +* dbi: an unintialized variable (rightfully flagged by valgrind) + was fixed + +------------------------------------------------------------------- Old: ---- libdbi-0.9.0.g30.tar.xz New: ---- libdbi-0.9.0.g32.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbi.spec ++++++ --- /var/tmp/diff_new_pack.tkHzQv/_old 2014-08-27 16:53:29.000000000 +0200 +++ /var/tmp/diff_new_pack.tkHzQv/_new 2014-08-27 16:53:29.000000000 +0200 @@ -18,14 +18,15 @@ Name: libdbi %define lname libdbi3 -Version: 0.9.0.g30 -#Snapshot: libdbi-0.9.0-30-g812a059 +Version: 0.9.0.g32 +#Snapshot: libdbi-0.9.0-32-g06e738a Release: 0 Summary: Database Independent Abstraction Layer for C License: LGPL-2.1+ Group: Development/Libraries/C and C++ URL: http://libdbi.sf.net/ +#Git-Clone: git://git.code.sf.net/p/libdbi/libdbi #Source: http://downloads.sf.net/libdbi/%name-%version.tar.gz Source: %name-%version.tar.xz Source2: baselibs.conf @@ -75,7 +76,7 @@ %build autoreconf -fi -sed -i s,\-O20,\-O3,g configure +sed -i s,\-O20,\-O2,g configure %configure \ %if !%build_doc --disable-docs \ ++++++ libdbi-0.9.0.g30.tar.xz -> libdbi-0.9.0.g32.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbi/src/dbd_helper.c new/libdbi/src/dbd_helper.c --- old/libdbi/src/dbd_helper.c 2014-06-11 09:01:26.000000000 +0200 +++ new/libdbi/src/dbd_helper.c 2014-08-27 12:33:45.000000000 +0200 @@ -81,6 +81,7 @@ /* result->rows[0] is intentionally unused; rows are in [1..n] */ result->rows = calloc(numrows_matched+1, sizeof(dbi_row_t *)); result->currowidx = 0; + result->dbd_currowidx = 0; if (!_dbd_result_add_to_conn(result)) { dbi_result_free((dbi_result)result); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nmap for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '14

27 Aug '14

Hello community, here is the log from the commit of package nmap for openSUSE:Factory checked in at 2014-08-27 16:53:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nmap (Old) and /work/SRC/openSUSE:Factory/.nmap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nmap" Changes: -------- --- /work/SRC/openSUSE:Factory/nmap/nmap.changes 2014-04-30 15:09:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nmap.new/nmap.changes 2014-08-27 16:53:26.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Aug 26 23:28:28 UTC 2014 - andreas.stieger(a)gmx.de + +- Nmap 6.47: + * updated IPv4 OS fingerprints + * Removed the External Entity Declaration from the DOCTYPE in + Nmap's XML. The doctype is now: <!DOCTYPE nmaprun> + * Ncat: Fixed SOCKS5 username/password authentication + * Avoid formatting NULL as "%s" when running nmap --iflist + * Zenmap, Ndiff: Avoid crashing with old PyXML package + * Handle ICMP admin-prohibited messages when doing service version + detection. + * NSE: Fix a bug causing http.head to not honor redirects. + * Zenmap: Fix a bug in DiffViewer causing a crash +- fix self-obsoletion of zenmap (nmap-gtk) + +------------------------------------------------------------------- Old: ---- nmap-6.46.tar.bz2 nmap-6.46.tar.bz2.asc New: ---- nmap-6.47.tar.bz2 nmap-6.47.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nmap.spec ++++++ --- /var/tmp/diff_new_pack.cq1W25/_old 2014-08-27 16:53:28.000000000 +0200 +++ /var/tmp/diff_new_pack.cq1W25/_new 2014-08-27 16:53:28.000000000 +0200 @@ -38,7 +38,7 @@ BuildRequires: gpg-offline %endif Url: http://nmap.org/ -Version: 6.46 +Version: 6.47 Release: 0 Summary: Portscanner License: GPL-2.0+ @@ -72,9 +72,9 @@ %package -n zenmap Summary: A Graphical Front-End for Nmap Group: Productivity/Networking/Diagnostic -Requires: %name = %version -Obsoletes: %name-gtk -Provides: %name-gtk = %{version}-%{release} +Requires: %{name} = %{version} +Obsoletes: %{name}-gtk < %{version} +Provides: %{name}-gtk = %{version}-%{release} %py_requires Requires: python-gtk ++++++ nmap-6.46.tar.bz2 -> nmap-6.47.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/nmap/nmap-6.46.tar.bz2 /work/SRC/openSUSE:Factory/.nmap.new/nmap-6.47.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0