September 2017 - openSUSE Commits - openSUSE Mailing Lists

commit the_silver_searcher for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package the_silver_searcher for openSUSE:Factory checked in at 2017-09-28 12:35:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/the_silver_searcher (Old) and /work/SRC/openSUSE:Factory/.the_silver_searcher.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "the_silver_searcher" Thu Sep 28 12:35:14 2017 rev:12 rq:528988 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/the_silver_searcher/the_silver_searcher.changes 2017-07-24 12:33:21.781553486 +0200 +++ /work/SRC/openSUSE:Factory/.the_silver_searcher.new/the_silver_searcher.changes 2017-09-28 12:35:38.781352392 +0200 @@ -1,0 +2,7 @@ +Wed Sep 27 15:35:34 UTC 2017 - astieger(a)suse.com + +- update to 2.1.0: + * Make '-A n -B n' act like '-C n' by printing blank lines + * Stream decompress zipped files + +------------------------------------------------------------------- Old: ---- the_silver_searcher-2.0.0.tar.gz the_silver_searcher-2.0.0.tar.gz.asc New: ---- the_silver_searcher-2.1.0.tar.gz the_silver_searcher-2.1.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ the_silver_searcher.spec ++++++ --- /var/tmp/diff_new_pack.Nb1GIb/_old 2017-09-28 12:35:39.493252288 +0200 +++ /var/tmp/diff_new_pack.Nb1GIb/_new 2017-09-28 12:35:39.497251726 +0200 @@ -17,7 +17,7 @@ Name: the_silver_searcher -Version: 2.0.0 +Version: 2.1.0 Release: 0 Summary: A code-searching tool similar to ack, but faster License: Apache-2.0 ++++++ the_silver_searcher-2.0.0.tar.gz -> the_silver_searcher-2.1.0.tar.gz ++++++ ++++ 2776 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/Makefile.am new/the_silver_searcher-2.1.0/Makefile.am --- old/the_silver_searcher-2.0.0/Makefile.am 2017-06-03 06:25:51.000000000 +0200 +++ new/the_silver_searcher-2.1.0/Makefile.am 2017-06-28 07:10:58.000000000 +0200 @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} bin_PROGRAMS = ag -ag_SOURCES = src/ignore.c src/ignore.h src/log.c src/log.h src/options.c src/options.h src/print.c src/print_w32.c src/print.h src/scandir.c src/scandir.h src/search.c src/search.h src/lang.c src/lang.h src/util.c src/util.h src/decompress.c src/decompress.h src/uthash.h src/main.c +ag_SOURCES = src/ignore.c src/ignore.h src/log.c src/log.h src/options.c src/options.h src/print.c src/print_w32.c src/print.h src/scandir.c src/scandir.h src/search.c src/search.h src/lang.c src/lang.h src/util.c src/util.h src/decompress.c src/decompress.h src/uthash.h src/main.c src/zfile.c ag_LDADD = ${PCRE_LIBS} ${LZMA_LIBS} ${ZLIB_LIBS} $(PTHREAD_LIBS) dist_man_MANS = doc/ag.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/README.md new/the_silver_searcher-2.1.0/README.md --- old/the_silver_searcher-2.0.0/README.md 2017-06-03 06:25:51.000000000 +0200 +++ new/the_silver_searcher-2.1.0/README.md 2017-08-25 07:45:20.000000000 +0200 @@ -6,7 +6,7 @@ [![Floobits Status](https://floobits.com/ggreer/ag.svg)](https://floobits.com/ggreer/ag… -[![#ag on Freenode](http://img.shields.io/Freenode/%23ag.png)](https://webchat.freeno… +[![#ag on Freenode](https://img.shields.io/badge/Freenode-%23ag-brightgreen.svg)](htt… Do you know C? Want to improve ag? [I invite you to pair with me](http://geoff.greer.fm/2014/10/13/help-me-get-to-ag-10/). @@ -67,7 +67,7 @@ yum install epel-release.noarch the_silver_searcher * Gentoo - emerge the_silver_searcher + emerge -a sys-apps/the_silver_searcher * Arch pacman -S the_silver_searcher @@ -96,9 +96,17 @@ pkg_add the_silver_searcher -### Cygwin +### Windows -Run the relevant [`setup-*.exe`](https://cygwin.com/install.html), and select "the\_silver\_searcher" in the "Utils" category. +* Win32/64 + + Unofficial daily builds are [available](https://github.com/k-takata/the_silver_searcher-win32). +* MSYS2 + + pacman -S mingw-w64-{i686,x86_64}-ag +* Cygwin + + Run the relevant [`setup-*.exe`](https://cygwin.com/install.html), and select "the\_silver\_searcher" in the "Utils" category. ## Building from source @@ -130,7 +138,7 @@ ./build.sh - On Windows (inside an msys/MinGW shell): + On Windows (inside an msys/MinGW shell): make -f Makefile.w32 3. Make install: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/configure.ac new/the_silver_searcher-2.1.0/configure.ac --- old/the_silver_searcher-2.0.0/configure.ac 2017-06-04 23:25:51.000000000 +0200 +++ new/the_silver_searcher-2.1.0/configure.ac 2017-08-25 08:16:37.000000000 +0200 @@ -1,6 +1,6 @@ AC_INIT( [the_silver_searcher], - [2.0.0], + [2.1.0], [https://github.com/ggreer/the_silver_searcher/issues] [the_silver_searcher], [https://github.com/ggreer/the_silver_searcher] @@ -25,7 +25,7 @@ ) # Run CFLAGS="-pg" ./configure if you want debug symbols -if test "`$GREP -c '\b-O' >/dev/null ; echo $?`" = "0" ; then +if ! echo "$CFLAGS" | "$GREP" '$^\|[[[:space:]]]$-O' > /dev/null; then CFLAGS="$CFLAGS -O2" fi @@ -59,11 +59,12 @@ AC_CHECK_DECL([PCRE_CONFIG_JIT], [AC_DEFINE([USE_PCRE_JIT], [], [Use PCRE JIT])], [], [#include <pcre.h>]) AC_CHECK_DECL([CPU_ZERO, CPU_SET], [AC_DEFINE([USE_CPU_SET], [], [Use CPU_SET macros])] , [], [#include <sched.h>]) +AC_CHECK_HEADERS([sys/cpuset.h err.h]) AC_CHECK_MEMBER([struct dirent.d_type], [AC_DEFINE([HAVE_DIRENT_DTYPE], [], [Have dirent struct member d_type])], [], [[#include <dirent.h>]]) AC_CHECK_MEMBER([struct dirent.d_namlen], [AC_DEFINE([HAVE_DIRENT_DNAMLEN], [], [Have dirent struct member d_namlen])], [], [[#include <dirent.h>]]) -AC_CHECK_FUNCS(fgetln getline realpath strlcpy strndup vasprintf madvise posix_fadvise pthread_setaffinity_np pledge) +AC_CHECK_FUNCS(fgetln fopencookie getline realpath strlcpy strndup vasprintf madvise posix_fadvise pthread_setaffinity_np pledge) AC_CONFIG_FILES([Makefile the_silver_searcher.spec]) AC_CONFIG_HEADERS([src/config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/src/config.h.in new/the_silver_searcher-2.1.0/src/config.h.in --- old/the_silver_searcher-2.0.0/src/config.h.in 2017-06-04 23:26:18.000000000 +0200 +++ new/the_silver_searcher-2.1.0/src/config.h.in 2017-08-25 08:16:44.000000000 +0200 @@ -6,9 +6,15 @@ /* Have dirent struct member d_type */ #undef HAVE_DIRENT_DTYPE +/* Define to 1 if you have the <err.h> header file. */ +#undef HAVE_ERR_H + /* Define to 1 if you have the `fgetln' function. */ #undef HAVE_FGETLN +/* Define to 1 if you have the `fopencookie' function. */ +#undef HAVE_FOPENCOOKIE + /* Define to 1 if you have the `getline' function. */ #undef HAVE_GETLINE @@ -63,6 +69,9 @@ /* Define to 1 if you have the `strndup' function. */ #undef HAVE_STRNDUP +/* Define to 1 if you have the <sys/cpuset.h> header file. */ +#undef HAVE_SYS_CPUSET_H + /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/src/decompress.h new/the_silver_searcher-2.1.0/src/decompress.h --- old/the_silver_searcher-2.0.0/src/decompress.h 2017-01-12 18:55:40.000000000 +0100 +++ new/the_silver_searcher-2.1.0/src/decompress.h 2017-06-28 07:10:58.000000000 +0200 @@ -1,6 +1,8 @@ #ifndef DECOMPRESS_H #define DECOMPRESS_H +#include <stdio.h> + #include "config.h" #include "log.h" #include "options.h" @@ -16,4 +18,9 @@ ag_compression_type is_zipped(const void *buf, const int buf_len); void *decompress(const ag_compression_type zip_type, const void *buf, const int buf_len, const char *dir_full_path, int *new_buf_len); + +#if HAVE_FOPENCOOKIE +FILE *decompress_open(int fd, const char *mode, ag_compression_type ctype); +#endif + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/src/lang.c new/the_silver_searcher-2.1.0/src/lang.c --- old/the_silver_searcher-2.0.0/src/lang.c 2017-06-03 06:25:51.000000000 +0200 +++ new/the_silver_searcher-2.1.0/src/lang.c 2017-08-25 07:47:19.000000000 +0200 @@ -7,6 +7,7 @@ lang_spec_t langs[] = { { "actionscript", { "as", "mxml" } }, { "ada", { "ada", "adb", "ads" } }, + { "asciidoc", { "adoc", "ad", "asc", "asciidoc" } }, { "asm", { "asm", "s" } }, { "batch", { "bat", "cmd" } }, { "bitbake", { "bb", "bbappend", "bbclass", "inc" } }, @@ -22,6 +23,7 @@ { "css", { "css" } }, { "cython", { "pyx", "pxd", "pxi" } }, { "delphi", { "pas", "int", "dfm", "nfm", "dof", "dpk", "dpr", "dproj", "groupproj", "bdsgroup", "bdsproj" } }, + { "dot", { "dot", "gv" } }, { "ebuild", { "ebuild", "eclass" } }, { "elisp", { "el" } }, { "elixir", { "ex", "eex", "exs" } }, @@ -35,11 +37,13 @@ { "go", { "go" } }, { "groovy", { "groovy", "gtmpl", "gpp", "grunit", "gradle" } }, { "haml", { "haml" } }, + { "handlebars", { "hbs" } }, { "haskell", { "hs", "lhs" } }, { "haxe", { "hx" } }, { "hh", { "h" } }, { "html", { "htm", "html", "shtml", "xhtml" } }, { "ini", { "ini" } }, + { "ipython", { "ipynb" } }, { "jade", { "jade" } }, { "java", { "java", "properties" } }, { "js", { "es6", "js", "jsx", "vue" } }, @@ -59,16 +63,20 @@ { "mason", { "mas", "mhtml", "mpl", "mtxt" } }, { "matlab", { "m" } }, { "mathematica", { "m", "wl" } }, + { "md", { "markdown", "mdown", "mdwn", "mkdn", "mkd", "md" } }, { "mercury", { "m", "moo" } }, { "nim", { "nim" } }, + { "nix", { "nix" } }, { "objc", { "m", "h" } }, { "objcpp", { "mm", "h" } }, { "ocaml", { "ml", "mli", "mll", "mly" } }, { "octave", { "m" } }, + { "org", { "org" } }, { "parrot", { "pir", "pasm", "pmc", "ops", "pod", "pg", "tg" } }, { "perl", { "pl", "pm", "pm6", "pod", "t" } }, { "php", { "php", "phpt", "php3", "php4", "php5", "phtml" } }, { "pike", { "pike", "pmod" } }, + { "plist", { "plist" } }, { "plone", { "pt", "cpt", "metadata", "cpy", "py", "xml", "zcml" } }, { "proto", { "proto" } }, { "puppet", { "pp" } }, @@ -107,7 +115,7 @@ { "wix", { "wxi", "wxs" } }, { "wsdl", { "wsdl" } }, { "wadl", { "wadl" } }, - { "xml", { "xml", "dtd", "xsl", "xslt", "ent", "tld" } }, + { "xml", { "xml", "dtd", "xsl", "xslt", "ent", "tld", "plist" } }, { "yaml", { "yaml", "yml" } } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/src/main.c new/the_silver_searcher-2.1.0/src/main.c --- old/the_silver_searcher-2.0.0/src/main.c 2017-01-12 18:55:42.000000000 +0100 +++ new/the_silver_searcher-2.1.0/src/main.c 2017-06-27 05:33:25.000000000 +0200 @@ -11,10 +11,18 @@ #include "config.h" +#ifdef HAVE_SYS_CPUSET_H +#include <sys/cpuset.h> +#endif + #ifdef HAVE_PTHREAD_H #include <pthread.h> #endif +#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(__FreeBSD__) +#include <pthread_np.h> +#endif + #include "log.h" #include "options.h" #include "search.h" @@ -144,9 +152,13 @@ if (rv != 0) { die("Error in pthread_create(): %s", strerror(rv)); } -#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(USE_CPU_SET) +#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && (defined(USE_CPU_SET) || defined(HAVE_SYS_CPUSET_H)) if (opts.use_thread_affinity) { +#ifdef __linux__ cpu_set_t cpu_set; +#elif __FreeBSD__ + cpuset_t cpu_set; +#endif CPU_ZERO(&cpu_set); CPU_SET(i % num_cores, &cpu_set); rv = pthread_setaffinity_np(workers[i].thread, sizeof(cpu_set), &cpu_set); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/src/print.c new/the_silver_searcher-2.1.0/src/print.c --- old/the_silver_searcher-2.0.0/src/print.c 2017-05-28 08:07:40.000000000 +0200 +++ new/the_silver_searcher-2.1.0/src/print.c 2017-08-25 07:51:57.000000000 +0200 @@ -150,6 +150,7 @@ ssize_t lines_to_print = 0; char sep = '-'; size_t i, j; + int blanks_between_matches = opts.context || opts.after || opts.before; if (opts.ackmate || opts.vimgrep) { sep = ':'; @@ -175,7 +176,7 @@ if (cur_match < matches_len && i == matches[cur_match].start) { print_context.in_a_match = TRUE; /* We found the start of a match */ - if (cur_match > 0 && opts.context && print_context.lines_since_last_match > (opts.before + opts.after + 1)) { + if (cur_match > 0 && blanks_between_matches && print_context.lines_since_last_match > (opts.before + opts.after + 1)) { fprintf(out_fd, "--\n"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/src/search.c new/the_silver_searcher-2.1.0/src/search.c --- old/the_silver_searcher-2.0.0/src/search.c 2017-06-04 23:06:19.000000000 +0200 +++ new/the_silver_searcher-2.1.0/src/search.c 2017-06-28 07:10:58.000000000 +0200 @@ -357,6 +357,12 @@ if (opts.search_zip_files) { ag_compression_type zip_type = is_zipped(buf, f_len); if (zip_type != AG_NO_COMPRESSION) { +#if HAVE_FOPENCOOKIE + log_debug("%s is a compressed file. stream searching", file_full_path); + fp = decompress_open(fd, "r", zip_type); + search_stream(fp, file_full_path); + fclose(fp); +#else int _buf_len = (int)f_len; char *_buf = decompress(zip_type, buf, f_len, file_full_path, &_buf_len); if (_buf == NULL || _buf_len == 0) { @@ -365,6 +371,7 @@ } search_buf(_buf, _buf_len, file_full_path); free(_buf); +#endif goto cleanup; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/src/zfile.c new/the_silver_searcher-2.1.0/src/zfile.c --- old/the_silver_searcher-2.0.0/src/zfile.c 1970-01-01 01:00:00.000000000 +0100 +++ new/the_silver_searcher-2.1.0/src/zfile.c 2017-08-25 07:45:20.000000000 +0200 @@ -0,0 +1,403 @@ +#ifdef __FreeBSD__ +#include <sys/endian.h> +#endif +#include <sys/types.h> + +#ifdef __CYGWIN__ +typedef _off64_t off64_t; +#endif + +#include <assert.h> +#include <errno.h> +#include <inttypes.h> +#include <limits.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "config.h" + +#ifdef HAVE_ERR_H +#include <err.h> +#endif +#ifdef HAVE_ZLIB_H +#include <zlib.h> +#endif +#ifdef HAVE_LZMA_H +#include <lzma.h> +#endif + +#include "decompress.h" + +#if HAVE_FOPENCOOKIE + +#define min(a, b) ({ \ + __typeof (a) _a = (a); \ + __typeof (b) _b = (b); \ + _a < _b ? _a : _b; }) + +static cookie_read_function_t zfile_read; +static cookie_seek_function_t zfile_seek; +static cookie_close_function_t zfile_close; + +static const cookie_io_functions_t zfile_io = { + .read = zfile_read, + .write = NULL, + .seek = zfile_seek, + .close = zfile_close, +}; + +#define KB (1024) +struct zfile { + FILE *in; // Source FILE stream + uint64_t logic_offset, // Logical offset in output (forward seeks) + decode_offset, // Where we've decoded to + actual_len; + uint32_t outbuf_start; + + ag_compression_type ctype; + + union { + z_stream gz; + lzma_stream lzma; + } stream; + + uint8_t inbuf[32 * KB]; + uint8_t outbuf[256 * KB]; + bool eof; +}; + +#define CAVAIL_IN(c) ((c)->ctype == AG_GZIP ? (c)->stream.gz.avail_in : (c)->stream.lzma.avail_in) +#define CNEXT_OUT(c) ((c)->ctype == AG_GZIP ? (c)->stream.gz.next_out : (c)->stream.lzma.next_out) + +static int +zfile_cookie_init(struct zfile *cookie) { +#ifdef HAVE_LZMA_H + lzma_ret lzrc; +#endif + int rc; + + assert(cookie->logic_offset == 0); + assert(cookie->decode_offset == 0); + + cookie->actual_len = 0; + + switch (cookie->ctype) { +#ifdef HAVE_ZLIB_H + case AG_GZIP: + memset(&cookie->stream.gz, 0, sizeof cookie->stream.gz); + rc = inflateInit2(&cookie->stream.gz, 32 + 15); + if (rc != Z_OK) { + log_err("Unable to initialize zlib: %s", zError(rc)); + return EIO; + } + cookie->stream.gz.next_in = NULL; + cookie->stream.gz.avail_in = 0; + cookie->stream.gz.next_out = cookie->outbuf; + cookie->stream.gz.avail_out = sizeof cookie->outbuf; + break; +#endif +#ifdef HAVE_LZMA_H + case AG_XZ: + cookie->stream.lzma = (lzma_stream)LZMA_STREAM_INIT; + lzrc = lzma_auto_decoder(&cookie->stream.lzma, -1, 0); + if (lzrc != LZMA_OK) { + log_err("Unable to initialize lzma_auto_decoder: %d", lzrc); + return EIO; + } + cookie->stream.lzma.next_in = NULL; + cookie->stream.lzma.avail_in = 0; + cookie->stream.lzma.next_out = cookie->outbuf; + cookie->stream.lzma.avail_out = sizeof cookie->outbuf; + break; +#endif + default: + log_err("Unsupported compression type: %d", cookie->ctype); + return EINVAL; + } + + + cookie->outbuf_start = 0; + cookie->eof = false; + return 0; +} + +static void +zfile_cookie_cleanup(struct zfile *cookie) { + switch (cookie->ctype) { +#ifdef HAVE_ZLIB_H + case AG_GZIP: + inflateEnd(&cookie->stream.gz); + break; +#endif +#ifdef HAVE_LZMA_H + case AG_XZ: + lzma_end(&cookie->stream.lzma); + break; +#endif + default: + /* Compiler false positive - unreachable. */ + break; + } +} + +/* + * Open compressed file 'path' as a (forward-)seekable (and rewindable), + * read-only stream. + */ +FILE * +decompress_open(int fd, const char *mode, ag_compression_type ctype) { + struct zfile *cookie; + FILE *res, *in; + int error; + + cookie = NULL; + in = res = NULL; + if (strstr(mode, "w") || strstr(mode, "a")) { + errno = EINVAL; + goto out; + } + + in = fdopen(fd, mode); + if (in == NULL) + goto out; + + /* + * No validation of compression type is done -- file is assumed to + * match input. In Ag, the compression type is already detected, so + * that's ok. + */ + cookie = malloc(sizeof *cookie); + if (cookie == NULL) { + errno = ENOMEM; + goto out; + } + + cookie->in = in; + cookie->logic_offset = 0; + cookie->decode_offset = 0; + cookie->ctype = ctype; + + error = zfile_cookie_init(cookie); + if (error != 0) { + errno = error; + goto out; + } + + res = fopencookie(cookie, mode, zfile_io); + +out: + if (res == NULL) { + if (in != NULL) + fclose(in); + if (cookie != NULL) + free(cookie); + } + return res; +} + +/* + * Return number of bytes into buf, 0 on EOF, -1 on error. Update stream + * offset. + */ +static ssize_t +zfile_read(void *cookie_, char *buf, size_t size) { + struct zfile *cookie = cookie_; + size_t nb, ignorebytes; + ssize_t total = 0; + lzma_ret lzret; + int ret; + + assert(size <= SSIZE_MAX); + + if (size == 0) + return 0; + + if (cookie->eof) + return 0; + + ret = Z_OK; + lzret = LZMA_OK; + + ignorebytes = cookie->logic_offset - cookie->decode_offset; + assert(ignorebytes == 0); + + do { + size_t inflated; + + /* Drain output buffer first */ + while (CNEXT_OUT(cookie) > + &cookie->outbuf[cookie->outbuf_start]) { + size_t left = CNEXT_OUT(cookie) - + &cookie->outbuf[cookie->outbuf_start]; + size_t ignoreskip = min(ignorebytes, left); + size_t toread; + + if (ignoreskip > 0) { + ignorebytes -= ignoreskip; + left -= ignoreskip; + cookie->outbuf_start += ignoreskip; + cookie->decode_offset += ignoreskip; + } + + // Ran out of output before we seek()ed up. + if (ignorebytes > 0) + break; + + toread = min(left, size); + memcpy(buf, &cookie->outbuf[cookie->outbuf_start], + toread); + + buf += toread; + size -= toread; + left -= toread; + cookie->outbuf_start += toread; + cookie->decode_offset += toread; + cookie->logic_offset += toread; + total += toread; + + if (size == 0) + break; + } + + if (size == 0) + break; + + /* + * If we have not satisfied read, the output buffer must be + * empty. + */ + assert(cookie->stream.gz.next_out == + &cookie->outbuf[cookie->outbuf_start]); + + if ((cookie->ctype == AG_XZ && lzret == LZMA_STREAM_END) || + (cookie->ctype == AG_GZIP && ret == Z_STREAM_END)) { + cookie->eof = true; + break; + } + + /* Read more input if empty */ + if (CAVAIL_IN(cookie) == 0) { + nb = fread(cookie->inbuf, 1, sizeof cookie->inbuf, + cookie->in); + if (ferror(cookie->in)) { + warn("error read core"); + exit(1); + } + if (nb == 0 && feof(cookie->in)) { + warn("truncated file"); + exit(1); + } + if (cookie->ctype == AG_XZ) { + cookie->stream.lzma.avail_in = nb; + cookie->stream.lzma.next_in = cookie->inbuf; + } else { + cookie->stream.gz.avail_in = nb; + cookie->stream.gz.next_in = cookie->inbuf; + } + } + + /* Reset stream state to beginning of output buffer */ + if (cookie->ctype == AG_XZ) { + cookie->stream.lzma.next_out = cookie->outbuf; + cookie->stream.lzma.avail_out = sizeof cookie->outbuf; + } else { + cookie->stream.gz.next_out = cookie->outbuf; + cookie->stream.gz.avail_out = sizeof cookie->outbuf; + } + cookie->outbuf_start = 0; + + if (cookie->ctype == AG_GZIP) { + ret = inflate(&cookie->stream.gz, Z_NO_FLUSH); + if (ret != Z_OK && ret != Z_STREAM_END) { + log_err("Found mem/data error while decompressing zlib stream: %s", zError(ret)); + return -1; + } + } else { + lzret = lzma_code(&cookie->stream.lzma, LZMA_RUN); + if (lzret != LZMA_OK && lzret != LZMA_STREAM_END) { + log_err("Found mem/data error while decompressing xz/lzma stream: %d", lzret); + return -1; + } + } + inflated = CNEXT_OUT(cookie) - &cookie->outbuf[0]; + cookie->actual_len += inflated; + } while (!ferror(cookie->in) && size > 0); + + assert(total <= SSIZE_MAX); + return total; +} + +static int +zfile_seek(void *cookie_, off64_t *offset_, int whence) { + struct zfile *cookie = cookie_; + off64_t new_offset = 0, offset = *offset_; + + if (whence == SEEK_SET) { + new_offset = offset; + } else if (whence == SEEK_CUR) { + new_offset = (off64_t)cookie->logic_offset + offset; + } else { + /* SEEK_END not ok */ + return -1; + } + + if (new_offset < 0) + return -1; + + /* Backward seeks to anywhere but 0 are not ok */ + if (new_offset < (off64_t)cookie->logic_offset && new_offset != 0) { + return -1; + } + + if (new_offset == 0) { + /* rewind(3) */ + cookie->decode_offset = 0; + cookie->logic_offset = 0; + zfile_cookie_cleanup(cookie); + zfile_cookie_init(cookie); + } else if ((uint64_t)new_offset > cookie->logic_offset) { + /* Emulate forward seek by skipping ... */ + char *buf; + const size_t bsz = 32 * 1024; + + buf = malloc(bsz); + while ((uint64_t)new_offset > cookie->logic_offset) { + size_t diff = min(bsz, + (uint64_t)new_offset - cookie->logic_offset); + ssize_t err = zfile_read(cookie_, buf, diff); + if (err < 0) { + free(buf); + return -1; + } + + /* Seek past EOF gets positioned at EOF */ + if (err == 0) { + assert(cookie->eof); + new_offset = cookie->logic_offset; + break; + } + } + free(buf); + } + + assert(cookie->logic_offset == (uint64_t)new_offset); + + *offset_ = new_offset; + return 0; +} + +static int +zfile_close(void *cookie_) { + struct zfile *cookie = cookie_; + + zfile_cookie_cleanup(cookie); + fclose(cookie->in); + free(cookie); + + return 0; +} + +#endif /* HAVE_FOPENCOOKIE */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/the_silver_searcher-2.0.0/the_silver_searcher.spec new/the_silver_searcher-2.1.0/the_silver_searcher.spec --- old/the_silver_searcher-2.0.0/the_silver_searcher.spec 2017-06-04 23:29:05.000000000 +0200 +++ new/the_silver_searcher-2.1.0/the_silver_searcher.spec 2017-08-25 08:18:09.000000000 +0200 @@ -2,7 +2,7 @@ Name: the_silver_searcher -Version: 2.0.0 +Version: 2.1.0 Release: 1%{?dist} Summary: A code-searching tool similar to ack, but faster

1 0

commit yate for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package yate for openSUSE:Factory checked in at 2017-09-28 12:35:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yate (Old) and /work/SRC/openSUSE:Factory/.yate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yate" Thu Sep 28 12:35:12 2017 rev:27 rq:528983 version:5.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yate/yate.changes 2017-04-06 11:02:02.036569538 +0200 +++ /work/SRC/openSUSE:Factory/.yate.new/yate.changes 2017-09-28 12:35:36.373690947 +0200 @@ -1,0 +2,5 @@ +Wed Sep 27 15:14:11 UTC 2017 - olaf(a)aepfle.de + +- Remove dropped php5 from Requires in scripts subpkg + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yate.spec ++++++ --- /var/tmp/diff_new_pack.vhvpXr/_old 2017-09-28 12:35:37.649511546 +0200 +++ /var/tmp/diff_new_pack.vhvpXr/_new 2017-09-28 12:35:37.649511546 +0200 @@ -89,7 +89,6 @@ License: GPL-2.0 Group: Productivity/Telephony/Clients Requires: %{name} -Requires: php5 %description scripts The yate-scripts package includes libraries for using external scripts with Yate.

1 0

commit mate-menu for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package mate-menu for openSUSE:Factory checked in at 2017-09-28 12:35:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-menu (Old) and /work/SRC/openSUSE:Factory/.mate-menu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-menu" Thu Sep 28 12:35:07 2017 rev:17 rq:528967 version:17.10.8 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-menu/mate-menu.changes 2017-06-29 15:19:51.432834957 +0200 +++ /work/SRC/openSUSE:Factory/.mate-menu.new/mate-menu.changes 2017-09-28 12:35:32.622218462 +0200 @@ -1,0 +2,6 @@ +Wed Sep 27 14:10:08 UTC 2017 - sor.alexei(a)meowr.ru + +- Update to version 17.10.8: + * No changelog available. + +------------------------------------------------------------------- Old: ---- mate-menu_17.10.6.orig.tar.gz New: ---- mate-menu-17.10.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-menu.spec ++++++ --- /var/tmp/diff_new_pack.3jrLwl/_old 2017-09-28 12:35:33.318120607 +0200 +++ /var/tmp/diff_new_pack.3jrLwl/_new 2017-09-28 12:35:33.318120607 +0200 @@ -17,15 +17,14 @@ %define _name mate_menu -%define _rev f42342bc3b49 Name: mate-menu -Version: 17.10.6 +Version: 17.10.8 Release: 0 Summary: Advanced MATE menu License: GPL-2.0+ Group: System/GUI/Other -Url: https://bitbucket.org/ubuntu-mate/mate-menu -Source: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{version}.ori… +Url: https://github.com/ubuntu-mate/mate-menu +Source: https://github.com/ubuntu-mate/mate-menu/archive/%{version}.tar.gz#/%{name}… # PATCH-FEATURE-OPENSUSE mate-menu-yast2-software.patch sor.alexei(a)meowr.ru -- Use YaST2 and GNOME PackageKit package managers. Patch0: %{name}-yast2-software.patch BuildRequires: gobject-introspection-devel @@ -64,7 +63,7 @@ %lang_package %prep -%setup -q -n ubuntu-mate-%{name}-%{_rev} +%setup -q %patch0 -p1 sed -i 's/su-to-root/xdg-su/g' %{_name}/execute.py

1 0

commit gsmartcontrol for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package gsmartcontrol for openSUSE:Factory checked in at 2017-09-28 12:35:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gsmartcontrol (Old) and /work/SRC/openSUSE:Factory/.gsmartcontrol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gsmartcontrol" Thu Sep 28 12:35:05 2017 rev:5 rq:528907 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gsmartcontrol/gsmartcontrol.changes 2017-09-17 22:38:34.854527627 +0200 +++ /work/SRC/openSUSE:Factory/.gsmartcontrol.new/gsmartcontrol.changes 2017-09-28 12:35:30.274548580 +0200 @@ -1,0 +2,11 @@ +Wed Sep 27 08:18:53 UTC 2017 - joerg.lorenzen(a)ki.tng.de + +- Update to version 1.1.1 + + Windows: Use Adwaita GTK+ theme for systems which support + Classic Windows theme, since the default win32 GTK+ theme is + broken in it; this includes Windows 7 and Windows Server. + + Statistics entry values are formatted with commas for + readability. + + Moved help information to website. + +------------------------------------------------------------------- Old: ---- gsmartcontrol-1.1.0.tar.bz2 New: ---- gsmartcontrol-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gsmartcontrol.spec ++++++ --- /var/tmp/diff_new_pack.YE4D7w/_old 2017-09-28 12:35:31.910318567 +0200 +++ /var/tmp/diff_new_pack.YE4D7w/_new 2017-09-28 12:35:31.914318004 +0200 @@ -17,7 +17,7 @@ Name: gsmartcontrol -Version: 1.1.0 +Version: 1.1.1 Release: 0 License: GPL-2.0 or GPL-3.0 Summary: Hard Disk Health Inspection Tool ++++++ gsmartcontrol-1.1.0.tar.bz2 -> gsmartcontrol-1.1.1.tar.bz2 ++++++ ++++ 24543 lines of diff (skipped)

1 0

commit xclass for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package xclass for openSUSE:Factory checked in at 2017-09-28 12:35:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xclass (Old) and /work/SRC/openSUSE:Factory/.xclass.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xclass" Thu Sep 28 12:35:02 2017 rev:20 rq:528904 version:0.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xclass/xclass.changes 2016-07-03 12:27:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xclass.new/xclass.changes 2017-09-28 12:35:23.799459077 +0200 @@ -1,0 +2,7 @@ +Mon Sep 25 15:35:26 UTC 2017 - adam.majer(a)suse.de + +- update xclass-0.9.2-gcc6.patch + * Use signed arithmetic when doing a "distance" calculation + (boo#1041255) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xclass.spec ++++++ --- /var/tmp/diff_new_pack.CIBJeR/_old 2017-09-28 12:35:25.667196445 +0200 +++ /var/tmp/diff_new_pack.CIBJeR/_new 2017-09-28 12:35:25.667196445 +0200 @@ -1,7 +1,7 @@ # # spec file for package xclass # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ xclass-0.9.2-gcc6.patch ++++++ --- /var/tmp/diff_new_pack.CIBJeR/_old 2017-09-28 12:35:25.707190821 +0200 +++ /var/tmp/diff_new_pack.CIBJeR/_new 2017-09-28 12:35:25.711190258 +0200 @@ -1,30 +1,34 @@ -Index: b/lib/libxclass/OXFrame.cc -=================================================================== ---- a/lib/libxclass/OXFrame.cc -+++ b/lib/libxclass/OXFrame.cc -@@ -23,6 +23,7 @@ - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <sys/time.h> -+#include <cmath> - - #include <xclass/utils.h> - #include <xclass/OXClient.h> -@@ -345,8 +346,8 @@ int OXFrame::HandleEvent(XEvent *event) +bts: #1041255 +Author: i@marguerite +Summary: fix narrowing conversion from int to char inside {} + +Author: Adam Majer <amajer(a)suse.de> +Summary: use signed calculations when calling abs(x) + +Use signed variables when doing a "distance" calculation. +Callng abs(x) on unsinged is pointless, since all values +are always >0. But since the code actually assumes signed +arithmetic, but uses unsigned - fix the code. + +Index: xclass-0.9.2/lib/libxclass/OXFrame.cc +=================================================================== +--- xclass-0.9.2.orig/lib/libxclass/OXFrame.cc ++++ xclass-0.9.2/lib/libxclass/OXFrame.cc +@@ -345,8 +345,8 @@ int OXFrame::HandleEvent(XEvent *event) case ButtonPress: if ((event->xbutton.time - _lastclick < 350) && (event->xbutton.button == _lastbutton) && - (abs(event->xbutton.x_root - _dbx) < 3) && - (abs(event->xbutton.y_root - _dby) < 3) && -+ (std::abs(event->xbutton.x_root - _dbx) < 3) && -+ (std::abs(event->xbutton.y_root - _dby) < 3) && ++ abs(event->xbutton.x_root - (signed)_dbx) < 3 && ++ abs(event->xbutton.y_root - (signed)_dby) < 3 && (event->xbutton.window == _dbw)) ++_clickcount; else -Index: b/lib/libxclass/icons/VResizer.xbm +Index: xclass-0.9.2/lib/libxclass/icons/VResizer.xbm =================================================================== ---- a/lib/libxclass/icons/VResizer.xbm -+++ b/lib/libxclass/icons/VResizer.xbm +--- xclass-0.9.2.orig/lib/libxclass/icons/VResizer.xbm ++++ xclass-0.9.2/lib/libxclass/icons/VResizer.xbm @@ -1,6 +1,6 @@ #define VResizer_width 32 #define VResizer_height 32 @@ -33,10 +37,10 @@ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0x7f,0xfd,0xff,0xff,0x7f,0xfd,0xff,0xff,0x7f,0xfd,0xff,0xff, -Index: b/lib/libxclass/icons/VmaskResizer.xbm +Index: xclass-0.9.2/lib/libxclass/icons/VmaskResizer.xbm =================================================================== ---- a/lib/libxclass/icons/VmaskResizer.xbm -+++ b/lib/libxclass/icons/VmaskResizer.xbm +--- xclass-0.9.2.orig/lib/libxclass/icons/VmaskResizer.xbm ++++ xclass-0.9.2/lib/libxclass/icons/VmaskResizer.xbm @@ -1,6 +1,6 @@ #define VmaskResizer_width 32 #define VmaskResizer_height 32 @@ -45,11 +49,11 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x03,0x00,0x00, -Index: b/lib/libxclass/OXResizer.cc +Index: xclass-0.9.2/lib/libxclass/OXResizer.cc =================================================================== ---- a/lib/libxclass/OXResizer.cc -+++ b/lib/libxclass/OXResizer.cc -@@ -55,9 +55,9 @@ OXHorizontalResizer::OXHorizontalResizer +--- xclass-0.9.2.orig/lib/libxclass/OXResizer.cc ++++ xclass-0.9.2/lib/libxclass/OXResizer.cc +@@ -56,9 +56,9 @@ OXHorizontalResizer::OXHorizontalResizer int hspotx = 16, hspoty = 16; @@ -61,7 +65,7 @@ HmaskResizer_width, HmaskResizer_height); XColor black, white; -@@ -305,9 +305,9 @@ OXVerticalResizer::OXVerticalResizer(con +@@ -306,9 +306,9 @@ OXVerticalResizer::OXVerticalResizer(con int hspotx = 16, hspoty = 16; @@ -73,10 +77,10 @@ VmaskResizer_width, VmaskResizer_height); XColor black, white; -Index: b/lib/libxclass/icons/HResizer.xbm +Index: xclass-0.9.2/lib/libxclass/icons/HResizer.xbm =================================================================== ---- a/lib/libxclass/icons/HResizer.xbm -+++ b/lib/libxclass/icons/HResizer.xbm +--- xclass-0.9.2.orig/lib/libxclass/icons/HResizer.xbm ++++ xclass-0.9.2/lib/libxclass/icons/HResizer.xbm @@ -1,6 +1,6 @@ #define HResizer_width 32 #define HResizer_height 32 @@ -85,10 +89,10 @@ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xff,0xff,0xff,0xbf, 0xfe,0xff,0xff,0xdf,0xfd,0xff,0xff,0xef,0xfb,0xff,0xff,0xf7,0xf7,0xff,0xff, -Index: b/lib/libxclass/icons/HmaskResizer.xbm +Index: xclass-0.9.2/lib/libxclass/icons/HmaskResizer.xbm =================================================================== ---- a/lib/libxclass/icons/HmaskResizer.xbm -+++ b/lib/libxclass/icons/HmaskResizer.xbm +--- xclass-0.9.2.orig/lib/libxclass/icons/HmaskResizer.xbm ++++ xclass-0.9.2/lib/libxclass/icons/HmaskResizer.xbm @@ -1,6 +1,6 @@ #define HmaskResizer_width 32 #define HmaskResizer_height 32 @@ -97,3 +101,20 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xc0, 0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00, +Index: xclass-0.9.2/lib/libxclass/OGifImage.cc +=================================================================== +--- xclass-0.9.2.orig/lib/libxclass/OGifImage.cc ++++ xclass-0.9.2/lib/libxclass/OGifImage.cc +@@ -973,9 +973,9 @@ void OGifImage::AllocClosestColor(int Co + + for (j = 0; j < XNumOfColors; j++) { + // Find the closest color in 3D RGB space using L1 norm. +- if ((D = abs(Red - XOldColorTable[j].red) + +- abs(Green - XOldColorTable[j].green) + +- abs(Blue - XOldColorTable[j].blue)) < Distance) { ++ if ((D = abs((long)Red - XOldColorTable[j].red) + ++ abs((long)Green - XOldColorTable[j].green) + ++ abs((long)Blue - XOldColorTable[j].blue)) < Distance) { + Distance = D; + Index = j; + }

1 0

commit praat for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package praat for openSUSE:Factory checked in at 2017-09-28 12:34:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/praat (Old) and /work/SRC/openSUSE:Factory/.praat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "praat" Thu Sep 28 12:34:58 2017 rev:7 rq:528885 version:6.0.33 Changes: -------- --- /work/SRC/openSUSE:Factory/praat/praat.changes 2017-08-22 11:11:45.402396147 +0200 +++ /work/SRC/openSUSE:Factory/.praat.new/praat.changes 2017-09-28 12:35:19.672039454 +0200 @@ -1,0 +2,29 @@ +Tue Sep 26 21:25:29 UTC 2017 - aloisio(a)gmx.com + +- Update to version 6.0.33 + * Pitch: Subtract linear fit...: correct a bug that prevented + computation in the ERB domain. + * Scripting: made object[xx].xmin work again. + * Removed a bug in Polynomial: Evaluate... introduced in 6.0.32. + +- Dropped praat-fix_return_nonvoid.patch (merged upstream) + +------------------------------------------------------------------- +Sun Sep 17 15:58:34 UTC 2017 - aloisio(a)gmx.com + +- Update to version 6.0.32 + * Table: allow spaces in column names. + * Settings windows no longer replace your visible expressions + with their resulting values. + * Scripting: formulas using the tilde. + * Optimality Theory learning: corrected a bug introduced in + 6.0.30 that could cause the editor to crash on the Mac. + * EEG: corrected a bug that could cause an infinite loop when + doing principal component analysis. + * Scripting: faster interpreter. + +- Refreshed praat-use_system_libs.patch + +- Added praat-fix_return_nonvoid.patch + +------------------------------------------------------------------- Old: ---- praat-6.0.31.tar.gz New: ---- praat-6.0.33.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ praat.spec ++++++ --- /var/tmp/diff_new_pack.337gbz/_old 2017-09-28 12:35:20.951859491 +0200 +++ /var/tmp/diff_new_pack.337gbz/_new 2017-09-28 12:35:20.955858929 +0200 @@ -17,7 +17,7 @@ Name: praat -Version: 6.0.31 +Version: 6.0.33 Release: 0 Summary: Phonetics by computer License: GPL-3.0+ ++++++ praat-6.0.31.tar.gz -> praat-6.0.33.tar.gz ++++++ /work/SRC/openSUSE:Factory/praat/praat-6.0.31.tar.gz /work/SRC/openSUSE:Factory/.praat.new/praat-6.0.33.tar.gz differ: char 15, line 1 ++++++ praat-use_system_libs.patch ++++++ --- /var/tmp/diff_new_pack.337gbz/_old 2017-09-28 12:35:21.003852181 +0200 +++ /var/tmp/diff_new_pack.337gbz/_new 2017-09-28 12:35:21.007851619 +0200 @@ -8,23 +8,10 @@ other like espeak and FLAC are too heavily patched for the program to be compatible with upstream ones. -Index: praat-6.0.31/dwtools/VowelEditor.cpp +Index: praat-6.0.32/fon/SoundRecorder.h =================================================================== ---- praat-6.0.31.orig/dwtools/VowelEditor.cpp -+++ praat-6.0.31/dwtools/VowelEditor.cpp -@@ -55,7 +55,7 @@ trajectory --> path ???? - - #include "FormantGrid.h" - #include "KlattGrid.h" --#include "../external/portaudio/portaudio.h" -+#include <portaudio.h> - #include "praat.h" - #include "PitchTier_to_PointProcess.h" - #include "PitchTier_to_Sound.h" -Index: praat-6.0.31/fon/SoundRecorder.h -=================================================================== ---- praat-6.0.31.orig/fon/SoundRecorder.h -+++ praat-6.0.31/fon/SoundRecorder.h +--- praat-6.0.32.orig/fon/SoundRecorder.h ++++ praat-6.0.32/fon/SoundRecorder.h @@ -25,7 +25,7 @@ #include "SoundRecorder_enums.h" @@ -34,10 +21,10 @@ #if defined (_WIN32) #elif defined (macintosh) #elif defined (linux) -Index: praat-6.0.31/fon/Sound_audio.cpp +Index: praat-6.0.32/fon/Sound_audio.cpp =================================================================== ---- praat-6.0.31.orig/fon/Sound_audio.cpp -+++ praat-6.0.31/fon/Sound_audio.cpp +--- praat-6.0.32.orig/fon/Sound_audio.cpp ++++ praat-6.0.32/fon/Sound_audio.cpp @@ -28,7 +28,7 @@ #include "Preferences.h" @@ -47,10 +34,10 @@ #if defined (macintosh) #include "macport_on.h" -Index: praat-6.0.31/num/NUMlinprog.cpp +Index: praat-6.0.32/num/NUMlinprog.cpp =================================================================== ---- praat-6.0.31.orig/num/NUMlinprog.cpp -+++ praat-6.0.31/num/NUMlinprog.cpp +--- praat-6.0.32.orig/num/NUMlinprog.cpp ++++ praat-6.0.32/num/NUMlinprog.cpp @@ -17,7 +17,7 @@ */ @@ -60,10 +47,10 @@ struct structNUMlinprog { glp_prob *linearProgram; -Index: praat-6.0.31/sys/melder_audio.cpp +Index: praat-6.0.32/sys/melder_audio.cpp =================================================================== ---- praat-6.0.31.orig/sys/melder_audio.cpp -+++ praat-6.0.31/sys/melder_audio.cpp +--- praat-6.0.32.orig/sys/melder_audio.cpp ++++ praat-6.0.32/sys/melder_audio.cpp @@ -46,7 +46,7 @@ #include "melder.h" #include <time.h> @@ -73,10 +60,10 @@ #ifdef HAVE_PULSEAUDIO void pulseAudio_initialize (); -Index: praat-6.0.31/dwsys/Makefile +Index: praat-6.0.32/dwsys/Makefile =================================================================== ---- praat-6.0.31.orig/dwsys/Makefile -+++ praat-6.0.31/dwsys/Makefile +--- praat-6.0.32.orig/dwsys/Makefile ++++ praat-6.0.32/dwsys/Makefile @@ -4,7 +4,7 @@ include ../makefile.defs @@ -93,10 +80,10 @@ -$(OBJECTS): *.h ../stat/*.h ../sys/*.h ../external/gsl/*.h ../dwsys/*.h ../kar/*.h +$(OBJECTS): *.h ../stat/*.h ../sys/*.h /usr/include/gsl/*.h ../dwsys/*.h ../kar/*.h -Index: praat-6.0.31/makefile +Index: praat-6.0.32/makefile =================================================================== ---- praat-6.0.31.orig/makefile -+++ praat-6.0.31/makefile +--- praat-6.0.32.orig/makefile ++++ praat-6.0.32/makefile @@ -13,11 +13,8 @@ include makefile.defs # Makes the Praat executable in the source directory. @@ -122,10 +109,10 @@ $(LIBS) clean: -Index: praat-6.0.31/contrib/ola/Makefile +Index: praat-6.0.32/contrib/ola/Makefile =================================================================== ---- praat-6.0.31.orig/contrib/ola/Makefile -+++ praat-6.0.31/contrib/ola/Makefile +--- praat-6.0.32.orig/contrib/ola/Makefile ++++ praat-6.0.32/contrib/ola/Makefile @@ -4,7 +4,7 @@ include ../../makefile.defs @@ -141,3 +128,16 @@ -$(OBJECTS): *.h ../../kar/*.h ../../sys/*.h ../../FFNet/*.h ../../dwtools/*.h ../../fon/*.h ../../dwsys/*.h ../../stat/*.h ../../external/gsl/*.h +$(OBJECTS): *.h ../../kar/*.h ../../sys/*.h ../../FFNet/*.h ../../dwtools/*.h ../../fon/*.h ../../dwsys/*.h ../../stat/*.h /usr/include/gsl/*.h +Index: praat-6.0.32/dwtools/VowelEditor.cpp +=================================================================== +--- praat-6.0.32.orig/dwtools/VowelEditor.cpp ++++ praat-6.0.32/dwtools/VowelEditor.cpp +@@ -55,7 +55,7 @@ trajectory --> path ???? + + #include "FormantGrid.h" + #include "KlattGrid.h" +-#include "../external/portaudio/portaudio.h" ++#include <portaudio.h> + #include "PitchTier_to_PointProcess.h" + #include "PitchTier_to_Sound.h" + #include "PointProcess_and_Sound.h"

1 0

commit nut for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-09-28 12:34:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nut" Thu Sep 28 12:34:54 2017 rev:58 rq:528832 version:2.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-08-18 15:07:00.312173250 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-09-28 12:35:18.272236287 +0200 @@ -1,0 +2,7 @@ +Tue Sep 26 09:13:30 UTC 2017 - tchvatal(a)suse.com + +- Drop the aspell dependency, it is only used for verification + of the mans and it is more for devs to do than during the build + wrt fate#323578 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.nJ8QaW/_old 2017-09-28 12:35:19.212104127 +0200 +++ /var/tmp/diff_new_pack.nJ8QaW/_new 2017-09-28 12:35:19.212104127 +0200 @@ -132,7 +132,6 @@ %endif %if %with_doc BuildRequires: asciidoc -BuildRequires: aspell BuildRequires: dblatex BuildRequires: libxml2-tools BuildRequires: libxslt-tools

1 0

commit python-numexpr for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package python-numexpr for openSUSE:Factory checked in at 2017-09-28 12:34:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-numexpr (Old) and /work/SRC/openSUSE:Factory/.python-numexpr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-numexpr" Thu Sep 28 12:34:50 2017 rev:6 rq:528801 version:2.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-numexpr/python-numexpr.changes 2017-05-03 15:55:03.722251867 +0200 +++ /work/SRC/openSUSE:Factory/.python-numexpr.new/python-numexpr.changes 2017-09-28 12:35:17.128397127 +0200 @@ -1,0 +2,21 @@ +Sun Sep 24 21:29:49 UTC 2017 - arun(a)gmx.de + +- update to version 2.6.4: + * Christoph Gohkle noticed a lack of coverage for the 2.6.3 floor + and ceil functions for MKL that caused seg-faults in + +- changes from version 2.6.2: + * Documentation now available at readthedocs.io. + * Support for floor() and ceil() functions added by Caleb P. Burns. + * NumPy requirement increased from 1.6 to 1.7 due to changes in + iterator flags (#245). + * Sphinx autodocs support added for documentation on + readthedocs.org. + * Fixed a bug where complex constants would return an error, fixing + problems with sympy when using NumExpr as a backend. + * Fix for #277 whereby arrays of shape (1,...) would be reduced as + if they were full reduction. Behavoir now matches that of NumPy. + * String literals are automatically encoded into 'ascii' bytes for + convience (see #281). + +------------------------------------------------------------------- Old: ---- numexpr-2.6.2.tar.gz New: ---- numexpr-2.6.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-numexpr.spec ++++++ --- /var/tmp/diff_new_pack.8k6pE8/_old 2017-09-28 12:35:17.860294212 +0200 +++ /var/tmp/diff_new_pack.8k6pE8/_new 2017-09-28 12:35:17.864293650 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-numexpr -Version: 2.6.2 +Version: 2.6.4 Release: 0 Url: https://github.com/pydata/numexpr/ Summary: Fast numerical expression evaluator for NumPy @@ -26,12 +26,12 @@ Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/n/numexpr/numexpr-%{version}… BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ -BuildRequires: fdupes -BuildRequires: python-rpm-macros BuildRequires: %{python_module devel} -BuildRequires: %{python_module setuptools} BuildRequires: %{python_module numpy-devel >= 1.6} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: python-rpm-macros Requires: python-numpy >= 1.6 %python_subpackages ++++++ numexpr-2.6.2.tar.gz -> numexpr-2.6.4.tar.gz ++++++ ++++ 21381 lines of diff (skipped)

1 0

commit stellarium for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package stellarium for openSUSE:Factory checked in at 2017-09-28 12:34:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stellarium (Old) and /work/SRC/openSUSE:Factory/.stellarium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stellarium" Thu Sep 28 12:34:46 2017 rev:28 rq:528777 version:0.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/stellarium/stellarium.changes 2017-09-20 17:06:38.948585503 +0200 +++ /work/SRC/openSUSE:Factory/.stellarium.new/stellarium.changes 2017-09-28 12:35:07.945688351 +0200 @@ -1,0 +2,14 @@ +Tue Sep 26 09:33:17 UTC 2017 - badshah400(a)gmail.com + +- Update to version 0.16.1: + * Added moons of Saturn, Uranus and Pluto. + * Added improvements for AstroCalc tool. + * DSO catalog was updated to version 3.2: + - Added support 'The Strasbourg-ESO Catalogue of Galactic + Planetary Nebulae'. + - Added support 'A catalogue of Galactic supernova remnants'. + - Added support 'A Catalog of Rich Clusters of Galaxies'. + * Added support asterisms and outlines for DSO. + * Added improvements for the GUI. + +------------------------------------------------------------------- Old: ---- stellarium-0.16.0.tar.gz New: ---- stellarium-0.16.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stellarium.spec ++++++ --- /var/tmp/diff_new_pack.6G81ol/_old 2017-09-28 12:35:15.792584962 +0200 +++ /var/tmp/diff_new_pack.6G81ol/_new 2017-09-28 12:35:15.796584400 +0200 @@ -17,7 +17,7 @@ Name: stellarium -Version: 0.16.0 +Version: 0.16.1 Release: 0 Summary: Astronomical Sky Simulator License: GPL-2.0+ ++++++ stellarium-0.16.0.tar.gz -> stellarium-0.16.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/stellarium/stellarium-0.16.0.tar.gz /work/SRC/openSUSE:Factory/.stellarium.new/stellarium-0.16.1.tar.gz differ: char 5, line 1

1 0

commit recidivm for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '17

28 Sep '17

Hello community, here is the log from the commit of package recidivm for openSUSE:Factory checked in at 2017-09-28 12:34:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/recidivm (Old) and /work/SRC/openSUSE:Factory/.recidivm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "recidivm" Thu Sep 28 12:34:31 2017 rev:1 rq:528766 version:0.1.2 Changes: -------- New Changes file: --- /dev/null 2017-07-20 07:30:00.335470106 +0200 +++ /work/SRC/openSUSE:Factory/.recidivm.new/recidivm.changes 2017-09-28 12:34:46.660681323 +0200 @@ -0,0 +1,25 @@ +------------------------------------------------------------------- +Tue Sep 26 10:11:15 UTC 2017 - sebix+novell.com(a)sebix.at + +- remove source verification with gpg-offline + +------------------------------------------------------------------- +Sun Sep 24 09:24:56 UTC 2017 - sebix+novell.com(a)sebix.at + +- update to 0.1.2 + * In the first step, set virtual memory limit to 32 TiB (slightly above the + typical usage for 64-bit ASan-ed programs). + On x86, this should reduce the number of execs by 2 for virtually all + target programs. + * Round virtual memory limit to (at least) page size. + On x86, this could reduce the number of execs by 12 (for “-u B”) + or by 2 (for “-u K”). + * Put license into a separate file. + https://github.com/jwilk/recidivm/issues/1 + * Use LFS_LDFLAGS and LFS_LIBS in addition to LFS_CFLAGS. + * Fix GCC 7 compiler warnings. + +------------------------------------------------------------------- +Sat Sep 23 22:14:09 UTC 2017 - sebix+novell.com(a)sebix.at + +- initial package for version 0.1.1 New: ---- recidivm-0.1.2.tar.gz recidivm-0.1.2.tar.gz.asc recidivm.changes recidivm.keyring recidivm.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ recidivm.spec ++++++ # # spec file for package recidivm # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: recidivm Version: 0.1.2 Release: 0 Summary: Tool for estimating peak virtual memory use License: MIT Group: Development/Tools/Other Url: http://jwilk.net/software/recidivm Source: https://github.com/jwilk/recidivm/releases/download/%{version}/recidivm-%{v… Source1: https://github.com/jwilk/recidivm/releases/download/%{version}/recidivm-%{v… Source2: %{name}.keyring BuildRequires: gcc %description recidivm estimates the target program's peak virtual memory use by running it multiple times with different memory limits. %prep %setup -q %build make %{?_smp_mflags} %install install -Dm 755 %{name} -t %{buildroot}%{_bindir} install -Dm 644 doc/%{name}.1 -t %{buildroot}%{_mandir}/man1/ %files %doc doc/changelog %license doc/LICENSE %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{?ext_man} %changelog ++++++ recidivm.keyring ++++++ pub rsa4096/0x2D4EB3A6015475F5 2009-10-23 [SC] [expires: 2018-01-01] CDB5A1243ACDB63009AD07212D4EB3A6015475F5 uid [ unknown] Jakub Wilk <jwilk(a)jwilk.net> uid [ unknown] Jakub Wilk <jwilk(a)debian.org> uid [ unknown] Jakub Wilk <ubanus(a)users.sf.net> sub rsa4096/0x49A526BFE5874F63 2009-10-23 [E] -----BEGIN PGP PUBLIC KEY BLOCK----- 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 i0i3KQXs09FW/+n9DTw= =R8Zy -----END PGP PUBLIC KEY BLOCK-----

1 0