April 2015 - openSUSE Commits - openSUSE Mailing Lists

commit cabextract for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package cabextract for openSUSE:Factory checked in at 2015-04-03 14:34:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cabextract (Old) and /work/SRC/openSUSE:Factory/.cabextract.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cabextract" Changes: -------- --- /work/SRC/openSUSE:Factory/cabextract/cabextract.changes 2015-02-22 17:26:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cabextract.new/cabextract.changes 2015-04-03 14:34:52.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 2 16:51:12 CEST 2015 - sbrabec(a)suse.cz + +- Update to version 1.6: + * further UTF-8 fixes + * sanitize file names +- Add -fno-strict-aliasing for md5.c: 114, 115. + +------------------------------------------------------------------- Old: ---- cabextract-1.5.tar.gz New: ---- cabextract-1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cabextract.spec ++++++ --- /var/tmp/diff_new_pack.XjPSG1/_old 2015-04-03 14:34:53.000000000 +0200 +++ /var/tmp/diff_new_pack.XjPSG1/_new 2015-04-03 14:34:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: cabextract -Version: 1.5 +Version: 1.6 Release: 0 Summary: A Program to Extract Microsoft Cabinet Files License: GPL-3.0+ @@ -36,7 +36,7 @@ %setup -q %build -CFLAGS="%{optflags} -fPIE" +CFLAGS="%{optflags} -fPIE -fno-strict-aliasing" %configure --with-external-libmspack make %{?_smp_mflags} LDFLAGS="-pie" ++++++ cabextract-1.5.tar.gz -> cabextract-1.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/ChangeLog new/cabextract-1.6/ChangeLog --- old/cabextract-1.5/ChangeLog 2015-01-18 16:58:40.000000000 +0100 +++ new/cabextract-1.6/ChangeLog 2015-02-26 11:51:11.000000000 +0100 @@ -1,3 +1,18 @@ +2015-02-25 Stuart Caie <kyzer(a)4u.net> + + * create_output_name(): Simplify code; do path checking only after + output name has been constructed. Use towlower to lowercase UTF-8 + characters. Remove both leading '/' and '\' from cab filenames and + change both "../" and "..\" to "xx", for Cygwin and other Cygwin-like + environments that use both '/' and '\' as path separators. Thanks to + Alexander Cherepanov and the MITRE team. + +2015-02-18 Stuart Caie <kyzer(a)4u.net> + + * create_output_name(): the check against leading slashes could be + evaded with malformed UTF-8. Thanks to Alexander Cherepanov for + reporting the issue. + 2015-01-18 Stuart Caie <kyzer(a)4u.net> * wince_rename: installed files now include their install directories. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/Makefile.in new/cabextract-1.6/Makefile.in --- old/cabextract-1.5/Makefile.in 2015-01-24 14:23:03.000000000 +0100 +++ new/cabextract-1.6/Makefile.in 2015-03-23 00:26:42.000000000 +0100 @@ -84,8 +84,8 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog COPYING \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/cabextract.spec.in getopt1.c \ - getopt.c mktime.c fnmatch.c TODO compile install-sh missing + $(srcdir)/config.h.in $(srcdir)/cabextract.spec.in mktime.c \ + getopt.c getopt1.c fnmatch.c TODO compile install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/NEWS new/cabextract-1.6/NEWS --- old/cabextract-1.5/NEWS 2015-01-24 13:55:29.000000000 +0100 +++ new/cabextract-1.6/NEWS 2015-02-26 11:28:44.000000000 +0100 @@ -1,3 +1,12 @@ +New in 1.6 +* cabextract now prevents archive files giving themselves absolute path access + using badly UTF-8 encoded slashes. +* Because Cygwin allows both '/' and '\' as path separators, cabextract now + removes both leading '/'s and '\'s and changes both "../" and "..\" in + CAB filenames to "xx". You can no longer have a CAB filename called e.g + "\/t" (file "t" in the directory "\"). If you need this, create a CAB file + where the filename is "./\/t" instead. + New in 1.5 * cabextract replaces bad Unicode characters in filenames with the standard Unicode replacement character diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/README new/cabextract-1.6/README --- old/cabextract-1.5/README 2015-01-24 13:56:18.000000000 +0100 +++ new/cabextract-1.6/README 2015-03-23 00:21:25.000000000 +0100 @@ -1,4 +1,4 @@ -cabextract 1.5 - a program to extract Microsoft Cabinet files. +cabextract 1.6 - a program to extract Microsoft Cabinet files. (C) 2000-2015 Stuart Caie <kyzer(a)4u.net> This is free software with ABSOLUTELY NO WARRANTY. @@ -42,4 +42,4 @@ Testing the integrity of a cabinet file, without extracting it: $ cabextract -t wibble.cab -Stuart Caie <kyzer(a)4u.net>, January 2015 +Stuart Caie <kyzer(a)4u.net>, March 2015 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/cabextract.spec new/cabextract-1.6/cabextract.spec --- old/cabextract-1.5/cabextract.spec 2015-01-24 14:23:09.000000000 +0100 +++ new/cabextract-1.6/cabextract.spec 2015-03-23 00:26:48.000000000 +0100 @@ -1,6 +1,6 @@ Summary: A program to extract Microsoft Cabinet files Name: cabextract -Version: 1.5 +Version: 1.6 Release: 1 License: GPL Group: Applications/Archiving diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/config.h.in new/cabextract-1.6/config.h.in --- old/cabextract-1.5/config.h.in 2015-01-24 14:23:02.000000000 +0100 +++ new/cabextract-1.6/config.h.in 2015-03-23 00:26:40.000000000 +0100 @@ -68,6 +68,9 @@ /* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -118,6 +121,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the `towlower' function. */ +#undef HAVE_TOWLOWER + /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/configure new/cabextract-1.6/configure --- old/cabextract-1.5/configure 2015-01-24 14:23:02.000000000 +0100 +++ new/cabextract-1.6/configure 2015-03-23 00:26:40.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for cabextract 1.5. +# Generated by GNU Autoconf 2.69 for cabextract 1.6. # # Report bugs to <kyzer(a)4u.net>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='cabextract' PACKAGE_TARNAME='cabextract' -PACKAGE_VERSION='1.5' -PACKAGE_STRING='cabextract 1.5' +PACKAGE_VERSION='1.6' +PACKAGE_STRING='cabextract 1.6' PACKAGE_BUGREPORT='kyzer(a)4u.net' PACKAGE_URL='' @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cabextract 1.5 to adapt to many kinds of systems. +\`configure' configures cabextract 1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1340,7 +1340,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cabextract 1.5:";; + short | recursive ) echo "Configuration of cabextract 1.6:";; esac cat <<\_ACEOF @@ -1438,7 +1438,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cabextract configure 1.5 +cabextract configure 1.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2090,7 +2090,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cabextract $as_me 1.5, which was +It was created by cabextract $as_me 1.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2956,7 +2956,7 @@ # Define the identity of the package. PACKAGE='cabextract' - VERSION='1.5' + VERSION='1.6' cat >>confdefs.h <<_ACEOF @@ -4781,7 +4781,7 @@ for ac_header in ctype.h errno.h fnmatch.h libintl.h limits.h stdlib.h \ string.h strings.h utime.h stdarg.h sys/stat.h sys/time.h sys/types.h \ - getopt.h wchar.h wctype.h + getopt.h wchar.h wctype.h inttypes.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -5618,7 +5618,7 @@ fi -for ac_func in memcpy strcasecmp strchr utime utimes +for ac_func in memcpy memmove strcasecmp strchr towlower utime utimes do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -6626,7 +6626,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cabextract $as_me 1.5, which was +This file was extended by cabextract $as_me 1.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6696,7 +6696,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cabextract config.status 1.5 +cabextract config.status 1.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/configure.ac new/cabextract-1.6/configure.ac --- old/cabextract-1.5/configure.ac 2015-01-24 13:56:31.000000000 +0100 +++ new/cabextract-1.6/configure.ac 2015-02-26 11:52:22.000000000 +0100 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(cabextract, 1.5, kyzer(a)4u.net) +AC_INIT(cabextract, 1.6, kyzer(a)4u.net) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/cabextract.c]) AC_CONFIG_HEADER([config.h]) @@ -18,7 +18,7 @@ AC_HEADER_DIRENT AC_CHECK_HEADERS([ctype.h errno.h fnmatch.h libintl.h limits.h stdlib.h \ string.h strings.h utime.h stdarg.h sys/stat.h sys/time.h sys/types.h \ - getopt.h wchar.h wctype.h]) + getopt.h wchar.h wctype.h inttypes.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -34,7 +34,7 @@ AC_FUNC_FSEEKO AX_FUNC_MKDIR AC_FUNC_MKTIME -AC_CHECK_FUNCS([memcpy strcasecmp strchr utime utimes]) +AC_CHECK_FUNCS([memcpy memmove strcasecmp strchr towlower utime utimes]) AC_CHECK_FUNCS([getopt_long],,[AC_CHECK_LIB([gnugetopt], [getopt_long], [AC_DEFINE([HAVE_GETOPT_LONG])],[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)])]) AC_REPLACE_FNMATCH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/mspack/ChangeLog new/cabextract-1.6/mspack/ChangeLog --- old/cabextract-1.5/mspack/ChangeLog 2015-01-19 00:11:15.000000000 +0100 +++ new/cabextract-1.6/mspack/ChangeLog 2015-01-30 01:00:05.000000000 +0100 @@ -1,3 +1,8 @@ +2015-01-29 Stuart Caie <kyzer(a)4u.net> + + * system.h: if C99 inttypes.h exists, use its PRI{d,u}{32,64} macros. + Thanks to Johnathan Kollasch for the suggestion. + 2015-01-18 Stuart Caie <kyzer(a)4u.net> * lzxd_decompress(): the byte-alignment code for reading uncompressed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/mspack/system.h new/cabextract-1.6/mspack/system.h --- old/cabextract-1.5/mspack/system.h 2011-04-26 19:15:21.000000000 +0200 +++ new/cabextract-1.6/mspack/system.h 2015-01-30 00:58:32.000000000 +0100 @@ -57,17 +57,26 @@ # include <limits.h> #endif +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +#else +# define PRId64 "lld" +# define PRIu64 "llu" +# define PRId32 "ld" +# define PRIu32 "lu" +#endif + #if ((defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS >= 64) || \ (defined(FILESIZEBITS) && FILESIZEBITS >= 64) || \ (defined(SIZEOF_OFF_T) && SIZEOF_OFF_T >= 8) || \ defined(_LARGEFILE_SOURCE) || defined(_LARGEFILE64_SOURCE)) # define LARGEFILE_SUPPORT -# define LD "lld" -# define LU "llu" +# define LD PRId64 +# define LU PRIu64 #else extern const char *largefile_msg; -# define LD "ld" -# define LU "lu" +# define LD PRId32 +# define LU PRIu32 #endif /* endian-neutral reading of little-endian data */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabextract-1.5/src/cabextract.c new/cabextract-1.6/src/cabextract.c --- old/cabextract-1.5/src/cabextract.c 2015-01-10 19:13:11.000000000 +0100 +++ new/cabextract-1.6/src/cabextract.c 2015-02-26 11:53:01.000000000 +0100 @@ -1,5 +1,5 @@ -/* cabextract 1.4 - a program to extract Microsoft Cabinet files - * (C) 2000-2011 Stuart Caie <kyzer(a)4u.net> +/* cabextract 1.6 - a program to extract Microsoft Cabinet files + * (C) 2000-2015 Stuart Caie <kyzer(a)4u.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,6 +35,10 @@ # include <ctype.h> #endif +#if HAVE_WCTYPE_H +# include <wctype.h> +#endif + #if HAVE_ERRNO_H # include <errno.h> #endif @@ -112,6 +116,9 @@ # if !HAVE_MEMCPY # define memcpy(d,s,n) bcopy((s),(d),(n)) # endif +# if !HAVE_MEMMOVE +# define memmove(d,s,n) bcopy((s),(d),(n)) +# endif #endif #if HAVE_MKDIR @@ -212,7 +219,7 @@ char *basename); static char *find_cabinet_file(char *origcab, char *cabname); static int unix_path_seperators(struct mscabd_file *files); -static char *create_output_name(unsigned char *fname, unsigned char *dir, +static char *create_output_name(const char *fname, const char *dir, int lower, int isunix, int unicode); static void set_date_and_perm(struct mscabd_file *file, char *filename); @@ -441,8 +448,7 @@ /* process all files */ for (file = cab->files; file; file = file->next) { /* create the full UNIX output filename */ - if (!(name = create_output_name( - (unsigned char *) file->filename, (unsigned char *) args.dir, + if (!(name = create_output_name(file->filename, args.dir, args.lower, isunix, file->attribs & MSCAB_ATTRIB_UTF_NAME))) { errors++; @@ -735,77 +741,62 @@ * not enough memory. * @see unix_path_seperators() */ -static char *create_output_name(unsigned char *fname, unsigned char *dir, - int lower, int isunix, int utf8) +static char *create_output_name(const char *fname, const char *dir, + int lower, int isunix, int utf8) { - unsigned char *p, *name, c, *fe, sep, slash; - int x; + char sep = (isunix) ? '/' : '\\'; /* the path-seperator */ + char slash = (isunix) ? '\\' : '/'; /* the other slash */ + + size_t dirlen = dir ? strlen(dir) + 1 : 0; /* length of dir + '/' */ + size_t filelen = strlen(fname); - sep = (isunix) ? '/' : '\\'; /* the path-seperator */ - slash = (isunix) ? '\\' : '/'; /* the other slash */ + /* worst case, UTF-8 processing expands all chars to 4 bytes */ + char *name = malloc(dirlen + (filelen * 4) + 2); - /* length of filename */ - x = strlen((char *) fname); - /* UTF-8 worst case scenario: tolower() expands all chars from 1 to 4 bytes */ - if (utf8) x *= 4; - /* length of output directory */ - if (dir) x += strlen((char *) dir); - x += 2; + unsigned char *i = (unsigned char *) &fname[0]; + unsigned char *iend = (unsigned char *) &fname[filelen]; + unsigned char *o = (unsigned char *) &name[dirlen], c; - if (!(name = malloc(x))) { - fprintf(stderr, "Can't allocate output filename (%u bytes)\n", x); + if (!name) { + fprintf(stderr, "Can't allocate output filename\n"); return NULL; } - - /* start with blank name */ - *name = '\0'; - /* add output directory if needed */ + /* copy directory prefix if needed */ if (dir) { - strcpy((char *) name, (char *) dir); - strcat((char *) name, "/"); + strcpy(name, dir); + name[dirlen - 1] = '/'; } - /* remove leading slashes */ - while (*fname == sep) fname++; - - /* copy from fi->filename to new name, converting MS-DOS slashes to UNIX - * slashes as we go. Also lowercases characters if needed. - */ - p = &name[strlen((char *)name)]; /* p = start of output filename */ - fe = &fname[strlen((char *)fname)]; /* fe = end of input filename */ - + /* copy cab filename to output name, converting MS-DOS slashes to UNIX + * slashes as we go. Also lowercases characters if needed. */ if (utf8) { /* handle UTF-8 encoded filenames (see RFC 3629). This doesn't reject bad - * UTF-8 with overlong encodings, but does re-encode it as valid UTF-8. - */ - while (fname < fe) { + * UTF-8 with overlong encodings, but does re-encode it as valid UTF-8. */ + while (i < iend) { /* get next UTF-8 character */ - if ((c = *fname++) < 0x80) { + int x; + if ((c = *i++) < 0x80) { x = c; } - else if (c >= 0xC2 && c < 0xE0 && fname <= fe && - (fname[0] & 0xC0) == 0x80) - { + else if (c >= 0xC2 && c < 0xE0 && i <= iend && (i[0] & 0xC0) == 0x80) { x = (c & 0x1F) << 6; - x |= *fname++ & 0x3F; + x |= *i++ & 0x3F; } - else if (c >= 0xE0 && c < 0xF0 && fname+1 <= fe && - (fname[0] & 0xC0) == 0x80 && (fname[1] & 0xC0) == 0x80) + else if (c >= 0xE0 && c < 0xF0 && i+1 <= iend && (i[0] & 0xC0) == 0x80 && + (i[1] & 0xC0) == 0x80) { x = (c & 0x0F) << 12; - x |= (*fname++ & 0x3F) << 6; - x |= *fname++ & 0x3F; + x |= (*i++ & 0x3F) << 6; + x |= *i++ & 0x3F; } - else if (c >= 0xF0 && c < 0xF5 && fname+2 <= fe && - (fname[0] & 0xC0) == 0x80 && - (fname[1] & 0xC0) == 0x80 && - (fname[2] & 0xC0) == 0x80) + else if (c >= 0xF0 && c < 0xF5 && i+2 <= iend && (i[0] & 0xC0) == 0x80 && + (i[1] & 0xC0) == 0x80 && (i[2] & 0xC0) == 0x80) { x = (c & 0x07) << 18; - x |= (*fname++ & 0x3F) << 12; - x |= (*fname++ & 0x3F) << 6; - x |= *fname++ & 0x3F; + x |= (*i++ & 0x3F) << 12; + x |= (*i++ & 0x3F) << 6; + x |= *i++ & 0x3F; } else { x = 0xFFFD; /* unicode replacement character */ @@ -815,60 +806,78 @@ x = 0xFFFD; /* invalid code point or cheeky null byte */ } - /* whatever is the path seperator -> '/' - * whatever is the other slash -> '\\' - * otherwise, if lower is set, the lowercase version */ - if (x == sep) x = '/'; - else if (x == slash) x = '\\'; - else if (lower) x = tolower(x); +#ifdef HAVE_TOWLOWER + if (lower) x = towlower(x); +#else + if (lower && x < 256) x = tolower(x); +#endif + + /* whatever is the path separator -> '/' + * whatever is the other slash -> '\' */ + if (x == sep) x = '/'; else if (x == slash) x = '\\'; /* convert unicode character back to UTF-8 */ if (x < 0x80) { - *p++ = (unsigned char) x; + *o++ = (unsigned char) x; } else if (x < 0x800) { - *p++ = 0xC0 | (x >> 6); - *p++ = 0x80 | (x & 0x3F); + *o++ = 0xC0 | (x >> 6); + *o++ = 0x80 | (x & 0x3F); } else if (x < 0x10000) { - *p++ = 0xE0 | (x >> 12); - *p++ = 0x80 | ((x >> 6) & 0x3F); - *p++ = 0x80 | (x & 0x3F); + *o++ = 0xE0 | (x >> 12); + *o++ = 0x80 | ((x >> 6) & 0x3F); + *o++ = 0x80 | (x & 0x3F); } else if (x <= 0x10FFFF) { - *p++ = 0xF0 | (x >> 18); - *p++ = 0x80 | ((x >> 12) & 0x3F); - *p++ = 0x80 | ((x >> 6) & 0x3F); - *p++ = 0x80 | (x & 0x3F); + *o++ = 0xF0 | (x >> 18); + *o++ = 0x80 | ((x >> 12) & 0x3F); + *o++ = 0x80 | ((x >> 6) & 0x3F); + *o++ = 0x80 | (x & 0x3F); } else { - *p++ = 0xEF; /* unicode replacement character in UTF-8 */ - *p++ = 0xBF; - *p++ = 0xBD; + *o++ = 0xEF; /* unicode replacement character in UTF-8 */ + *o++ = 0xBF; + *o++ = 0xBD; } } - *p++ = 0; } else { - /* regular non-utf8 version */ - do { - c = *fname++; - if (c == sep) c = '/'; - else if (c == slash) c = '\\'; - else if (lower) c = (unsigned char) tolower((int) c); - } while ((*p++ = c)); + /* non UTF-8 version */ + while (i < iend) { + c = *i++; + if (lower) c = (unsigned char) tolower((int) c); + if (c == sep) c = '/'; else if (c == slash) c = '\\'; + *o++ = c; + } + } + *o++ = '\0'; + + /* remove any leading slashes in the cab filename part. + * This prevents unintended absolute file path access. */ + o = (unsigned char *) &name[dirlen]; + for (i = o; *i == '/' || *i == '\\'; i++); + if (i != o) { + size_t len = strlen((char *) i); + if (len > 0) { + memmove(o, i, len + 1); + } + else { + /* change filename composed entirely of leading slashes to "x" */ + strcpy((char *) o, "x"); + } } - /* search for "../" in cab filename part and change to "xx/". This - * prevents any unintended directory traversal. */ - for (p = &name[dir ? strlen((char *) dir)+1 : 0]; *p; p++) { - if ((p[0] == '.') && (p[1] == '.') && (p[2] == '/')) { - p[0] = p[1] = 'x'; - p += 2; + /* search for "../" or "..\" in cab filename part and change to "xx" + * This prevents unintended directory traversal. */ + for (; *o; o++) { + if ((o[0] == '.') && (o[1] == '.') && (o[2] == '/' || o[2] == '\\')) { + o[0] = o[1] = 'x'; + o += 2; } } - return (char *) name; + return name; } /**

1 0

commit scap-workbench for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package scap-workbench for openSUSE:Factory checked in at 2015-04-03 14:34:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scap-workbench (Old) and /work/SRC/openSUSE:Factory/.scap-workbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scap-workbench" Changes: -------- --- /work/SRC/openSUSE:Factory/scap-workbench/scap-workbench.changes 2015-02-14 13:56:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scap-workbench.new/scap-workbench.changes 2015-04-03 14:34:51.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Mar 26 06:31:08 UTC 2015 - meissner(a)suse.com + +- updated to 1.1.0 + Shiny new major release of SCAP Workbench. A lot of UX improvements + and many new exciting features including a much better SCAP Security + Guide integration. Downstreams are now encouraged to depend on + scap-security-guide. + +------------------------------------------------------------------- Old: ---- scap-workbench-1.0.3.tar.bz2 New: ---- scap-workbench-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scap-workbench.spec ++++++ --- /var/tmp/diff_new_pack.uxClrK/_old 2015-04-03 14:34:51.000000000 +0200 +++ /var/tmp/diff_new_pack.uxClrK/_new 2015-04-03 14:34:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scap-workbench # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: scap-workbench -Version: 1.0.3 +Version: 1.1.0 Release: 0 Summary: A SCAP scanner and SCAP content editor License: GPL-3.0 @@ -89,7 +89,7 @@ %files %defattr(-,root,root,0755) -%doc README COPYING +%doc README.md COPYING %{_bindir}/%{name} %dir %{_datadir}/appdata/ %{_datadir}/appdata/%name.appdata.xml ++++++ scap-workbench-1.0.3.tar.bz2 -> scap-workbench-1.1.0.tar.bz2 ++++++ ++++ 8153 lines of diff (skipped)

1 0

commit hawk for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2015-04-03 14:34:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hawk" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2015-03-18 13:07:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-04-03 14:34:47.000000000 +0200 @@ -1,0 +2,54 @@ +Thu Apr 02 06:05:17 UTC 2015 - kgronlund(a)suse.com + +- Update to version 0.7.0+git.1427954675.b847dc9: + + GUI: Fix error display css + + GUI: Redirect to new after creating, add link to edit created resource (bsc#921762) + + Wizard: Add sbd_device as explicit parameter (bsc#924407) + + Wizard: Remove cmirrord from cLVM wizard (bsc#924414) + + Wizard: Fix check for CIB write access (bsc#924429) + +------------------------------------------------------------------- +Wed Mar 25 13:51:08 UTC 2015 - kgronlund(a)suse.com + +- Depend strictly on supported versions of rubygems + +------------------------------------------------------------------- +Wed Mar 25 10:19:31 UTC 2015 - kgronlund(a)suse.com + +- Depend on exact tilt version required (1.4) + +------------------------------------------------------------------- +Thu Mar 19 13:12:14 UTC 2015 - kgronlund(a)suse.com + +- Add build dependency on git + +------------------------------------------------------------------- +Thu Mar 19 09:02:38 UTC 2015 - kgronlund(a)suse.com + +- Update to version 0.7.0+git.1426755371.189d4a2: + + Rely on hawk to pull in production dependencies + + Reorder dependency install to avoid tilt trap + + Rails 4: Fix use of @errors hash vs. array + +------------------------------------------------------------------- +Wed Mar 18 12:58:59 UTC 2015 - kgronlund(a)suse.com + +- Update to version 0.7.0+git.1426677126.2ef8f08: + + Vagrant: Increase development worker:thread count to 2:2 + + Build: Update rpm/hawk.spec + +------------------------------------------------------------------- +Wed Mar 18 11:10:54 UTC 2015 - kgronlund(a)suse.com + +- Make dependency on tilt >= 1.4, < 2.0 + +------------------------------------------------------------------- +Tue Mar 17 15:26:48 UTC 2015 - kgronlund(a)suse.com + +- Update to version 0.7.0+git.1426603924.3cb835b: + + Vagrant: Reduce number of workers in dev mode + + Misc: Reduce number of server workers/threads + + Chef: Fix spelling + + Vagrant: retain insecure key + +------------------------------------------------------------------- Old: ---- hawk-0.7.0+git.1426595507.808c2cc.tar.bz2 New: ---- _servicedata hawk-0.7.0+git.1427954675.b847dc9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.lMAHda/_old 2015-04-03 14:34:48.000000000 +0200 +++ /var/tmp/diff_new_pack.lMAHda/_new 2015-04-03 14:34:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package hawk # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,7 +39,7 @@ Summary: HA Web Konsole License: GPL-2.0 Group: %{pkg_group} -Version: 0.7.0+git.1426595507.808c2cc +Version: 0.7.0+git.1427954675.b847dc9 Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 @@ -71,30 +71,31 @@ %endif BuildRequires: rubygem(%{rb_default_ruby_abi}:byebug) >= 3.5 -BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9 -BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext) >= 3.1 -BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails) >= 1.2 -BuildRequires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11 +BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext:0.9) +BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext:3.1) +BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1.2) +BuildRequires: rubygem(%{rb_default_ruby_abi}:puma:2.11) BuildRequires: rubygem(%{rb_default_ruby_abi}:quiet_assets) -BuildRequires: rubygem(%{rb_default_ruby_abi}:rails) >= 4.2 -BuildRequires: rubygem(%{rb_default_ruby_abi}:rake) >= 10.4 -BuildRequires: rubygem(%{rb_default_ruby_abi}:spring) >= 1.3 -BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 2.12 -BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt) >= 1.4 -BuildRequires: rubygem(%{rb_default_ruby_abi}:web-console) >= 2.0 +BuildRequires: rubygem(%{rb_default_ruby_abi}:rails:4.2) +BuildRequires: rubygem(%{rb_default_ruby_abi}:rake:10.4) +BuildRequires: rubygem(%{rb_default_ruby_abi}:spring:1.3) +BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets:2.12) +BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt:1.4) +BuildRequires: rubygem(%{rb_default_ruby_abi}:web-console:2.1) %if 0%{?bundle_gems} %else # SLES bundles all this stuff at build time, other distros just # use runtime dependencies. -Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9 -Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails) >= 1.2 -Requires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11 -Requires: rubygem(%{rb_default_ruby_abi}:rails) >= 4.2 -Requires: rubygem(%{rb_default_ruby_abi}:rake) >= 10.4 -Requires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 2.12 -Requires: rubygem(%{rb_default_ruby_abi}:tilt) >= 1.4 +Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext:0.9) +Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1.2) +Requires: rubygem(%{rb_default_ruby_abi}:puma:2.11) +Requires: rubygem(%{rb_default_ruby_abi}:rails:4.2) +Requires: rubygem(%{rb_default_ruby_abi}:rake:10.4) +Requires: rubygem(%{rb_default_ruby_abi}:sprockets:2.12) +Requires: rubygem(%{rb_default_ruby_abi}:tilt:1.4) %endif +BuildRequires: git BuildRequires: glib2-devel BuildRequires: libxml2-devel BuildRequires: pam-devel ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/hawk.git</param> <param name="changesrevision">b847dc9ce2dc2cefda9d9def081d3670ac67c3fd</param></service></servicedata>++++++ hawk-0.7.0+git.1426595507.808c2cc.tar.bz2 -> hawk-0.7.0+git.1427954675.b847dc9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/Vagrantfile new/hawk-0.7.0+git.1427954675.b847dc9/Vagrantfile --- old/hawk-0.7.0+git.1426595507.808c2cc/Vagrantfile 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/Vagrantfile 2015-04-02 08:05:08.000000000 +0200 @@ -4,6 +4,7 @@ Vagrant.configure("2") do |config| config.vm.box = "webhippie/opensuse-13.2" config.vm.box_check_update = true + config.ssh.insert_key = false config.vm.define "webui", default: true do |machine| machine.vm.hostname = "webui" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/attributes/webui.rb new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/attributes/webui.rb --- old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/attributes/webui.rb 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/attributes/webui.rb 2015-04-02 08:05:08.000000000 +0200 @@ -19,29 +19,31 @@ default["hawk"]["webui"]["packages"] = [ # Production dependencies - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-rails-4_2", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-puma", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-fast_gettext", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-gettext_i18n_rails", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-sprockets", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-tilt-1_4", - - # Development dependencies - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-gettext", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-byebug", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-web-console", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-spring", - "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-quiet_assets", + #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-rails-4_2", + #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-puma", + #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-fast_gettext", + #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-gettext_i18n_rails", + #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-sprockets", + #"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-tilt-1_4", "hawk", "hawk-templates", "ha-cluster-bootstrap", "w3m", + # Development dependencies + "glib2-devel", "libxml2-devel", "pam-devel", - "libpacemaker-devel" + "libpacemaker-devel", + + "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-gettext", + "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-byebug", + "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-web-console", + "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-spring", + "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-quiet_assets", + ] default["hawk"]["webui"]["targets"] = %w( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/recipes/node.rb new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/recipes/node.rb --- old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/recipes/node.rb 2015-03-17 14:02:47.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/recipes/node.rb 2015-04-02 08:05:08.000000000 +0200 @@ -42,7 +42,7 @@ end end rescue Errno::EHOSTUNREACH => e - Chef::Log.info "Waiting to become available webui..." + Chef::Log.info "Waiting for webui to become available..." end case diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/templates/default/systemd.service.erb new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/templates/default/systemd.service.erb --- old/hawk-0.7.0+git.1426595507.808c2cc/chef/cookbooks/hawk/templates/default/systemd.service.erb 2015-03-16 14:33:35.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/templates/default/systemd.service.erb 2015-04-02 08:05:08.000000000 +0200 @@ -13,8 +13,8 @@ WorkingDirectory=/vagrant/hawk Environment="HAWK_ENV=development" -Environment="HAWK_THREADS=16" -Environment="HAWK_WORKERS=3" +Environment="HAWK_THREADS=2" +Environment="HAWK_WORKERS=2" Environment="HAWK_LISTEN=0.0.0.0" Environment="HAWK_PORT=3000" Environment="HAWK_KEY=/vagrant/hawk/tmp/hawk.pem" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/assets/javascripts/status.js new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/assets/javascripts/status.js --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/assets/javascripts/status.js 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/assets/javascripts/status.js 2015-04-02 08:05:08.000000000 +0200 @@ -51,29 +51,32 @@ function update_errors(errors) { - $("#errorbar").html(""); if (errors.length) { - $("#errorbar").show(); + var html; + html = '<ul>'; for (var i = 0; i < errors.length; i++) { // have to use for loop instead of $.each, as the latter turns "this" // into an object even if it's a string :-/ - var html; if (typeof errors[i] == "object") { - html = '<div><span style="float: left;" class="ui-icon ui-icon-alert"></span>'; + html += '<li class="error-entry">'; if (errors[i].link) { html += '<a href="' + errors[i].link + '">'; } + html += '<span class="ui-icon ui-icon-alert"></span> '; html += errors[i].msg; if (errors[i].link) { html += '</a>'; } - html += '</div>'; + html += '</li>'; } else { - html = '<div>' + escape_html(errors[i]) + '</div>'; + html += '<li>' + escape_html(errors[i]) + '</li>'; } - $("#errorbar").append($(html)); } + html += '</ul>'; + $("#errorbar").html(html); + $("#errorbar").show(); } else { + $("#errorbar").html(""); $("#errorbar").hide(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/assets/stylesheets/base.css new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/assets/stylesheets/base.css --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/assets/stylesheets/base.css 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/assets/stylesheets/base.css 2015-04-02 08:05:08.000000000 +0200 @@ -97,6 +97,22 @@ margin-bottom: 1em; } +#errorbar ul +{ + padding-left: 1em; +} + +#errorbar li +{ + list-style: none; +} + +#errorbar .ui-icon +{ + display: inline-block; + vertical-align: middle; +} + #content p { margin-top: 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/controllers/primitives_controller.rb new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/primitives_controller.rb --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/controllers/primitives_controller.rb 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/primitives_controller.rb 2015-04-02 08:05:08.000000000 +0200 @@ -60,8 +60,10 @@ end @res = Primitive.new params[:primitive] # RORSCAN_ITL (mass ass. OK) if @res.save - flash[:highlight] = _('Resource created successfully') - redirect_to :action => 'edit', :id => @res.id + edit_url = url_for(:action => 'edit', :id => @res.id) + edit_link = "<a href=\"#{edit_url}\">#{(a)res.id}</a>" + flash[:highlight] = (_('Resource created successfully') + ': ' + edit_link).html_safe + redirect_to :action => 'new' else render :action => 'new' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/controllers/wizard_controller.rb new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/wizard_controller.rb --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/controllers/wizard_controller.rb 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/wizard_controller.rb 2015-04-02 08:05:08.000000000 +0200 @@ -310,7 +310,7 @@ # as it will in fact change the CIB if successful. def cib_writable begin - Invoker.instance.cibadmin("--modify", "--allow-create", "--scope", "--crm_config", "--xml-text", + Invoker.instance.cibadmin("--modify", "--allow-create", "--scope", "crm_config", "--xml-text", '<cluster_property_set id="hawk-rw-test"/>') Invoker.instance.cibadmin("--delete", "--xml-text", '<cluster_property_set id="hawk-rw-test"/>') rescue NotFoundError diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/models/cib.rb new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/cib.rb --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/models/cib.rb 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/cib.rb 2015-04-02 08:05:08.000000000 +0200 @@ -228,7 +228,7 @@ attr_reader :booth def initialize(id, user, use_file = false) - @errors = [] + @errors = {} if use_file cib_path = id @@ -481,7 +481,8 @@ end failed_ops << { :node => node[:uname], :call_id => op.attributes['call-id'], :op => operation, :rc_code => rc_code, :exit_reason => exit_reason } - @errors << { + @errors[:base] ||= [] + @errors[:base] << { :msg => _('Failed op: node=%{node}, resource=%{resource}, call-id=%{call_id}, operation=%{op}, rc-code=%{rc_code}, exit-reason=%{exit_reason}') % { :node => node[:uname], :resource => id, :call_id => op.attributes['call-id'], :op => operation, :rc_code => rc_code, :exit_reason => exit_reason }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/explorer/_pe_list.html.erb new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/views/explorer/_pe_list.html.erb --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/app/views/explorer/_pe_list.html.erb 2015-03-17 14:02:47.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/views/explorer/_pe_list.html.erb 2015-04-02 08:05:08.000000000 +0200 @@ -1,5 +1,5 @@ <% if @errors.any? %> -<div class="ui-state-error ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><% @errors.values.flatten.each {|e| %><%=h e %><br /><% } %></div> +<div class="ui-state-error ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><% @errors.each {|e| %><%=h e %><br /><% } %></div> <% end %> <% if @peinputs %> <% if @peinputs.empty? %> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/puma.rb new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/puma.rb --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/puma.rb 2015-03-16 14:33:35.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/puma.rb 2015-04-02 08:05:08.000000000 +0200 @@ -32,8 +32,8 @@ ROOT = File.expand_path("../../", __FILE__) ENVIRONMENT = ENV["HAWK_ENV"] || "production" -THREADS = ENV["HAWK_THREADS"] || 16 -WORKERS = ENV["HAWK_WORKERS"] || 3 +THREADS = ENV["HAWK_THREADS"] || 5 +WORKERS = ENV["HAWK_WORKERS"] || 2 LISTEN = ENV["HAWK_LISTEN"] || "0.0.0.0" PORT = ENV["HAWK_PORT"] || "7630" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/wizard/templates/sbd.xml new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/templates/sbd.xml --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/wizard/templates/sbd.xml 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/templates/sbd.xml 2015-04-02 08:05:08.000000000 +0200 @@ -20,12 +20,25 @@ <content type="string" default="sbd-stonith"/> </parameter> +<parameter name="sbd_device"> +<shortdesc lang="en">SBD Device(s)</shortdesc> +<longdesc lang="en"> +The block device used for the SBD partition. Up to three +can be specified if separated by a semicolon. (Please check +the documentation if specifying two.) + +If not specified, will default to the value from /etc/sysconfig/sbd. +</longdesc> +<content type="string" default=""/> +</parameter> + </parameters> <crm_script> primitive <insert param="id"/> stonith:external/sbd - op start timeout="60" - op monitor interval="15" timeout="15" + <if set="sbd_device">params sbd_device="<insert param="sbd_device"/>"</if> + op start timeout="60" + op monitor interval="15" timeout="15" </crm_script> </template> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/wizard/workflows/clvm.xml new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/clvm.xml --- old/hawk-0.7.0+git.1426595507.808c2cc/hawk/config/wizard/workflows/clvm.xml 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/clvm.xml 2015-04-02 08:05:08.000000000 +0200 @@ -54,12 +54,7 @@ op start timeout=90s op stop timeout=100s -primitive cmirror ocf:lvm2:cmirrord - params daemon_timeout="30" - op start timeout=90s - op stop timeout=100s - -group g-<insert param="id"/> dlm clvm cmirror <insert param="id"/> +group g-<insert param="id"/> dlm clvm <insert param="id"/> clone c-<insert param="id"/> g-<insert param="id"/> meta interleave="true" ordered="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/rpm/hawk.spec new/hawk-0.7.0+git.1427954675.b847dc9/rpm/hawk.spec --- old/hawk-0.7.0+git.1426595507.808c2cc/rpm/hawk.spec 2015-03-16 14:31:04.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/rpm/hawk.spec 2015-04-02 08:05:08.000000000 +0200 @@ -16,14 +16,6 @@ # -%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1310 || 0%{?suse_version} == 1315 -%define hawk_ruby_bin ruby.ruby2.1 -%define hawk_ruby_abi ruby:2.1.0 -%else -%define hawk_ruby_bin ruby -%define hawk_ruby_abi %{rb_default_ruby_abi} -%endif - %if 0%{?suse_version} %define www_base /srv/www %define vendor_ruby vendor_ruby @@ -47,15 +39,10 @@ Summary: HA Web Konsole License: GPL-2.0 Group: %{pkg_group} -Version: 0.7.0+git.1424349779.eb17098 +Version: 0.7.0+git.1426603924.3cb835b Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 -%if 0%{?suse_version} -Source1: filter-requires.sh -%define _use_internal_dependency_generator 0 -%define __find_requires /bin/sh %{SOURCE1} -%endif Source100: hawk-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: crmsh @@ -67,7 +54,7 @@ Requires: rubypick BuildRequires: rubypick %endif -Requires: rubygem(%{hawk_ruby_abi}:bundler) +Requires: rubygem(%{rb_default_ruby_abi}:bundler) %if 0%{?suse_version} Recommends: graphviz-gnome Requires: iproute2 @@ -83,29 +70,31 @@ BuildRequires: pacemaker-libs-devel %endif -BuildRequires: rubygem(%{hawk_ruby_abi}:byebug) >= 3.5 -BuildRequires: rubygem(%{hawk_ruby_abi}:fast_gettext) >= 0.9 -BuildRequires: rubygem(%{hawk_ruby_abi}:gettext) >= 3.1 -BuildRequires: rubygem(%{hawk_ruby_abi}:gettext_i18n_rails) >= 1.2 -BuildRequires: rubygem(%{hawk_ruby_abi}:puma) >= 2.11 -BuildRequires: rubygem(%{hawk_ruby_abi}:quiet_assets) -BuildRequires: rubygem(%{hawk_ruby_abi}:rails) >= 4.2 -BuildRequires: rubygem(%{hawk_ruby_abi}:rake) >= 10.4 -BuildRequires: rubygem(%{hawk_ruby_abi}:spring) >= 1.3 -BuildRequires: rubygem(%{hawk_ruby_abi}:sprockets) >= 2.12 -BuildRequires: rubygem(%{hawk_ruby_abi}:tilt) >= 1.4 -BuildRequires: rubygem(%{hawk_ruby_abi}:web-console) >= 2.0 +BuildRequires: rubygem(%{rb_default_ruby_abi}:byebug) >= 3.5 +BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9 +BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext) >= 3.1 +BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails) >= 1.2 +BuildRequires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11 +BuildRequires: rubygem(%{rb_default_ruby_abi}:quiet_assets) +BuildRequires: rubygem(%{rb_default_ruby_abi}:rails) >= 4.2 +BuildRequires: rubygem(%{rb_default_ruby_abi}:rake) >= 10.4 +BuildRequires: rubygem(%{rb_default_ruby_abi}:spring) >= 1.3 +BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 2.12 +BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt) < 2.0 +BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt) >= 1.4 +BuildRequires: rubygem(%{rb_default_ruby_abi}:web-console) >= 2.0 %if 0%{?bundle_gems} %else # SLES bundles all this stuff at build time, other distros just # use runtime dependencies. -Requires: rubygem(%{hawk_ruby_abi}:fast_gettext) >= 0.9 -Requires: rubygem(%{hawk_ruby_abi}:gettext_i18n_rails) >= 1.2 -Requires: rubygem(%{hawk_ruby_abi}:puma) >= 2.11 -Requires: rubygem(%{hawk_ruby_abi}:rails) >= 4.2 -Requires: rubygem(%{hawk_ruby_abi}:rake) >= 10.4 -Requires: rubygem(%{hawk_ruby_abi}:sprockets) >= 2.12 -Requires: rubygem(%{hawk_ruby_abi}:tilt) >= 1.4 +Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9 +Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails) >= 1.2 +Requires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11 +Requires: rubygem(%{rb_default_ruby_abi}:rails) >= 4.2 +Requires: rubygem(%{rb_default_ruby_abi}:rake) >= 10.4 +Requires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 2.12 +Requires: rubygem(%{rb_default_ruby_abi}:tilt) < 2.0 +Requires: rubygem(%{rb_default_ruby_abi}:tilt) >= 1.4 %endif BuildRequires: glib2-devel @@ -178,6 +167,8 @@ %{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rchawk %endif +install -p -d -m 755 %{buildroot}%{_sysconfdir}/hawk + %clean rm -rf %{buildroot} @@ -215,8 +206,8 @@ %{www_base}/hawk/config # Packaged in hawk-templates %exclude %{www_base}/hawk/config/wizard -%{www_base}/hawk/db %{www_base}/hawk/lib +%attr(0750, %{uname},%{gname})%{_sysconfdir}/hawk %attr(0750, %{uname},%{gname})%{www_base}/hawk/log %dir %attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp %attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp/cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/rpm/sysconfig.hawk new/hawk-0.7.0+git.1427954675.b847dc9/rpm/sysconfig.hawk --- old/hawk-0.7.0+git.1426595507.808c2cc/rpm/sysconfig.hawk 2015-03-16 14:33:35.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/rpm/sysconfig.hawk 2015-04-02 08:05:08.000000000 +0200 @@ -11,19 +11,19 @@ ## Path: Cluster/Hawk ## Description: Maximum number of threads ## Type: integer -## Default: 16 +## Default: 5 ## ServiceRestart: hawk # Sets the maximum number of threads used by the web server. -HAWK_THREADS="16" +HAWK_THREADS="5" ## Path: Cluster/Hawk ## Description: Maximum number of worker processes ## Type: integer -## Default: 3 +## Default: 2 ## ServiceRestart: hawk # Sets the maximum number of separate worker processes spawned by the # web server. -HAWK_WORKERS="3" +HAWK_WORKERS="2" ## Path: Cluster/Hawk ## Description: Listen address diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1426595507.808c2cc/scripts/hawk.service.in new/hawk-0.7.0+git.1427954675.b847dc9/scripts/hawk.service.in --- old/hawk-0.7.0+git.1426595507.808c2cc/scripts/hawk.service.in 2015-03-16 14:33:35.000000000 +0100 +++ new/hawk-0.7.0+git.1427954675.b847dc9/scripts/hawk.service.in 2015-04-02 08:05:08.000000000 +0200 @@ -13,8 +13,8 @@ WorkingDirectory=@WWW_BASE@/hawk Environment="HAWK_ENV=production" -Environment="HAWK_THREADS=16" -Environment="HAWK_WORKERS=3" +Environment="HAWK_THREADS=5" +Environment="HAWK_WORKERS=2" Environment="HAWK_LISTEN=0.0.0.0" Environment="HAWK_PORT=7630" Environment="HAWK_KEY=/etc/hawk/hawk.pem"

1 0

commit xapian-bindings for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package xapian-bindings for openSUSE:Factory checked in at 2015-04-03 14:34:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xapian-bindings (Old) and /work/SRC/openSUSE:Factory/.xapian-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xapian-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/xapian-bindings/xapian-bindings.changes 2015-03-12 16:39:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xapian-bindings.new/xapian-bindings.changes 2015-04-03 14:34:49.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 2 10:41:05 UTC 2015 - dmueller(a)suse.com + +- make building of csharp bindings optional for architectures + that do not provide mono + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xapian-bindings.spec ++++++ --- /var/tmp/diff_new_pack.ahXozw/_old 2015-04-03 14:34:49.000000000 +0200 +++ /var/tmp/diff_new_pack.ahXozw/_new 2015-04-03 14:34:49.000000000 +0200 @@ -17,6 +17,7 @@ %define php_extension_dir %(php-config --extension-dir) +%bcond_with mono Name: xapian-bindings Version: 1.2.20 @@ -32,7 +33,9 @@ BuildRequires: java-devel BuildRequires: libuuid-devel BuildRequires: libxapian-devel = %{version} +%if %{with mono} BuildRequires: mono-devel +%endif BuildRequires: php5-devel BuildRequires: pkg-config BuildRequires: python-devel @@ -91,6 +94,7 @@ indexing and search facilities to applications. This package provides the files needed for developing TCL scripts which use Xapian. +%if %{with mono} %package -n xapian-csharp Summary: Files needed for developing C# applications which use Xapian Group: Development/Languages/Mono @@ -101,7 +105,7 @@ offers a highly adaptable toolkit that allows developers to easily add advanced indexing and search facilities to applications. This package provides the files needed for developing C# applications which use Xapian. - +%endif %prep %setup -q @@ -113,7 +117,11 @@ --with-php \ --with-ruby \ --with-tcl \ +%if %{without mono} + --without-csharp \ +%else --with-csharp \ +%endif --docdir=%{_docdir}/%{name} make %{?_smp_mflags} @@ -156,6 +164,7 @@ %doc %{_defaultdocdir}/%{name}/tcl8/ %{_libdir}/tcl/xapian%{version}/ +%if %{with mono} %files -n xapian-csharp %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog HACKING NEWS README TODO @@ -166,5 +175,6 @@ %{_libdir}/mono/XapianSharp/ %dir %{_libdir}/mono/gac/ %{_libdir}/mono/gac/XapianSharp/ +%endif %changelog

1 0

commit redis for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package redis for openSUSE:Factory checked in at 2015-04-03 14:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/redis (Old) and /work/SRC/openSUSE:Factory/.redis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "redis" Changes: -------- --- /work/SRC/openSUSE:Factory/redis/redis.changes 2015-02-13 08:35:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.redis.new/redis.changes 2015-04-03 14:34:46.000000000 +0200 @@ -1,0 +2,81 @@ +Thu Apr 2 11:07:42 UTC 2015 - mrueckert(a)suse.de + +- update to 3.0.0 + >> What's new in Redis 3.0 compared to Redis 2.8? + + * Redis Cluster: a distributed implementation of a subset of Redis. + * New "embedded string" object encoding resulting in less cache + misses. Big speed gain under certain work loads. + * AOF child -> parent final data transmission to minimize latency + due to "last write" during AOF rewrites. + * Much improved LRU approximation algorithm for keys eviction. + * WAIT command to block waiting for a write to be transmitted + to the specified number of slaves. + * MIGRATE connection caching. Much faster keys migraitons. + * MIGARTE new options COPY and REPLACE. + * CLIENT PAUSE command: stop processing client requests for a + specified amount of time. + * BITCOUNT performance improvements. + * CONFIG SET accepts memory values in different units (for + example you can use "CONFIG SET maxmemory 1gb"). + * Redis log format slightly changed reporting in each line the + role of the instance (master/slave) or if it's a saving child + log. + * INCR performance improvements. + + >> Refactoring changes (no new features nor bug fixes) + + * Blocking operations full refactoring (blocked.c) + * Client output buffer memory tracking refactored. + + for all the details see + /usr/share/doc/packages/redis/00-RELEASENOTES +- refreshed redis-enable-bactrace-on-x86-and-ia64-only.patch to + apply cleanly + +------------------------------------------------------------------- +Wed Apr 1 16:31:16 UTC 2015 - mrueckert(a)suse.de + +- make sure we do not daemonize + +------------------------------------------------------------------- +Wed Apr 1 15:57:59 UTC 2015 - mrueckert(a)suse.de + +- finished systemd support + +------------------------------------------------------------------- +Mon Mar 30 19:16:52 UTC 2015 - mrueckert(a)suse.de + +- update to 2.8.19 + - Don't log admin commands in MONITOR. (antirez) + - List of commands flagged as admin commands modified. (antirez) + - Lua cmsgpack lib updated to latest version. (antirez) + - Add symlink to redis-sentinel during make install (Rhommel + Lamas) + - SORT: Don't sort Set elements if not needed. (antirez) + - Fix zero-ordering SORT when called against lists (Matt + Stancliff) + - Update redis_init_script.tpl (Ben Dowling) + - FIXED redis-benchmark's idle mode.With idle mode shouldn't + create write event (zhanghailei) + - zipmap.c: update comments above (Sun He) + - replaced // comments #2150 (Deepak Verma) + - redis-benchmark AUTH command to be discarded after the first + send #2150 (azure provisioned user) + - sds.c: Correct two spelling mistakes in comments (Sun He) + - sds.c/sdscatvprintf: set va_end to finish va_list cpy (Sun He) + - sds.c: Correct some comments (Sun He) + - Update whatisdoing.sh (Serghei Iakovlev) + - Include stropts only if __sun is defined. (antirez) + - Fix implicit declaration of ioctl on Solaris (Jan-Erik Rediger) + - Silence _BSD_SOURCE warnings in glibc 2.20 and forward (Johan + Bergström) + - Mark whatisdoing.sh as deprecated in top-comment. (antirez) + - getting pid fixes (Serghei Iakovlev) + - sparkline.c: AddSample skip Empty label (Sun He) + - sparkline.c: mov label-ini into the AddSample Function (Sun He) + - Only ignore sigpipe in interactive mode (Jan-Erik Rediger) + - Simplify lua_cmsgpack macro and fix build on old Linux distros. + (antirez) + +------------------------------------------------------------------- Old: ---- redis-2.8.18.tar.gz redis.sysconfig New: ---- README.SUSE redis-3.0.0.tar.gz redis.target redis.tmpfiles.d redis@.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ redis.spec ++++++ --- /var/tmp/diff_new_pack.mqlPZC/_old 2015-04-03 14:34:47.000000000 +0200 +++ /var/tmp/diff_new_pack.mqlPZC/_new 2015-04-03 14:34:47.000000000 +0200 @@ -15,13 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} > 1230 +%bcond_without systemd +%else +%bcond_with systemd +%endif %define _data_dir %{_localstatedir}/lib/%{name} %define _log_dir %{_localstatedir}/log/%{name} %define _conf_dir %{_sysconfdir}/%{name} Name: redis -Version: 2.8.18 +Version: 3.0.0 Release: 0 Summary: Persistent key-value database License: BSD-3-Clause @@ -29,7 +34,10 @@ Url: http://redis.io/ Source: http://download.redis.io/releases/redis-%{version}.tar.gz Source1: %{name}.logrotate -Source4: redis.sysconfig +Source2: redis.target +Source3: redis@.service +Source4: redis.tmpfiles.d +Source5: README.SUSE # PATCH-FIX-OPENSUSE -- openSUSE-style init script Patch0: %{name}-initscript.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -37,6 +45,12 @@ Patch2: redis-enable-bactrace-on-x86-and-ia64-only.patch BuildRequires: procps BuildRequires: tcl +%if %{with systemd} +BuildRequires: pkgconfig(systemd) +%{?systemd_requires} +%else +PreReq: %{insserv_prereq} %{fillup_prereq} +%endif Requires: logrotate Requires: sudo BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,8 +73,12 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" V=1 %install -install -d %{buildroot}%{_log_dir} %{buildroot}%{_data_dir} %{buildroot}%{_conf_dir} -install -d %{buildroot}%{_log_dir}/default %{buildroot}%{_data_dir}/default +install -m 0750 -d \ + %{buildroot}%{_log_dir} \ + %{buildroot}%{_data_dir} \ + %{buildroot}%{_conf_dir} \ + %{buildroot}%{_log_dir}/default \ + %{buildroot}%{_data_dir}/default install -D -m 0755 src/redis-benchmark %{buildroot}%{_bindir}/redis-benchmark install -m 0755 src/redis-cli %{buildroot}%{_bindir}/redis-cli @@ -68,13 +86,24 @@ install -m 0755 src/redis-check-aof %{buildroot}%{_bindir}/redis-check-aof install -D -m 0755 src/redis-server %{buildroot}%{_sbindir}/redis-server +%if %{with systemd} +perl -p -i -e 's|daemonize yes|daemonize no|g' redis.conf +%endif install -D -m 0640 redis.conf %{buildroot}%{_conf_dir}/default.conf.example # # init # +%if %{with systemd} +install -D -m 0644 %{S:2} %{buildroot}%{_unitdir}/redis.target +install -D -m 0644 %{S:3} %{buildroot}%{_unitdir}/redis@.service +install -D -m 0644 %{S:4} %{buildroot}/usr/lib/tmpfiles.d/%{name}.conf +%{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +cp %{S:5} README.SUSE +%else install -D -m 0755 utils/redis_init_script %{buildroot}%{_sysconfdir}/init.d/redis ln -s %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +%endif # # logrotate @@ -95,21 +124,36 @@ %pre /usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || : /usr/sbin/useradd -g %{name} -s /bin/false -r -c "User for Redis key-value store" -d %{_data_dir} %{name} >/dev/null 2>&1 || : +%if %{with systemd} +%service_add_pre %{name}.target +%endif %post -%fillup_and_insserv %{name} -%restart_on_update %{name} +%if %{with systemd} +systemd-tmpfiles --create /usr/lib/tmpfiles.d/%{name}.conf || true +%service_add_post %{name}.target +echo "See /usr/share/doc/packages/redis/README.SUSE to continue" +%else echo "To start the database server, create your configuration" echo "starting from /etc/redis/default.conf.example, place it" echo "in /etc/redis and do: " echo " sudo rcredis start; sudo chkconfig redis on" +%endif %preun +%if %{with systemd} +%service_del_preun %{name}.target +%else %stop_on_removal %{name} +%endif %postun -%restart_on_update +%if %{with systemd} +%service_del_postun %{name}.target +%else +%restart_on_update %{name} %insserv_cleanup +%endif %files %defattr(-,root,root,-) @@ -118,11 +162,18 @@ %{_bindir}/redis-* %{_sbindir}/redis-* %{_sbindir}/rc%{name} -%config(noreplace) %{_sysconfdir}/init.d/redis -%config(noreplace) %attr(0640, %{name}, %{name}) %{_conf_dir}/default.conf.example +%if %{with systemd} +/usr/lib/tmpfiles.d/%{name}.conf +%{_unitdir}/%{name}@.service +%{_unitdir}/%{name}.target +%doc README.SUSE +%else +%config(noreplace) %{_sysconfdir}/init.d/%{name} +%endif +%config(noreplace) %attr(-, root, %{name}) %{_conf_dir}/ +# %dir %attr(0750, %{name}, %{name}) %{_data_dir} %dir %attr(0750, %{name}, %{name}) %{_data_dir}/default %dir %attr(0750, %{name}, %{name}) %{_log_dir} -%dir %attr(0750, %{name}, %{name}) %{_conf_dir} %changelog ++++++ README.SUSE ++++++ README.SUSE ------------- 1. copy /etc/redis/default.conf.example to /etc/redis/default.conf (or /etc/redis/otherapp.conf and so on) For the example we will use otherapp.conf 2. change at least pidfile, logfile and dir setting # the pid file *has* to match your config filename without the ".conf" pidfile /var/run/redis/otherapp.pid logfile /var/log/redis/otherapp.log dir /var/lib/redis/otherapp/ If you want to run more than one instance you also have to change the socket path and/or the ip:port combination. Also make sure if you copy configurations from somewhere, that "daemonize" should be set to "no". 3. create the database dir: $ install -d -m redis -g redis -m 0750 /var/lib/redis/otherapp/ 4. systemctl start redis@otherapp 5. systemctl enable redis@otherapp 6. to interact with all instances at the same time use: systemctl restart redis.target systemctl stop redis.target ++++++ redis-2.8.18.tar.gz -> redis-3.0.0.tar.gz ++++++ ++++ 16777 lines of diff (skipped) ++++++ redis-enable-bactrace-on-x86-and-ia64-only.patch ++++++ --- /var/tmp/diff_new_pack.mqlPZC/_old 2015-04-03 14:34:47.000000000 +0200 +++ /var/tmp/diff_new_pack.mqlPZC/_new 2015-04-03 14:34:47.000000000 +0200 @@ -2,12 +2,11 @@ =================================================================== --- src/config.h.orig +++ src/config.h -@@ -57,9 +57,11 @@ - #endif +@@ -63,8 +63,10 @@ /* Test for backtrace() */ + #if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) +#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) - #if defined(__APPLE__) || defined(__linux__) #define HAVE_BACKTRACE 1 #endif +#endif ++++++ redis.target ++++++ [Unit] Description=Redis target allowing to start/stop all redis@.service instances at once ++++++ redis.tmpfiles.d ++++++ # Type Path Mode UID GID Age Argument d /var/run/redis/ 0755 redis redis - - ++++++ redis@.service ++++++ [Unit] Description=Redis After=network.target PartOf=redis.target [Service] Type=simple User=redis Group=redis PrivateTmp=true PIDFile=/var/run/redis/%i.pid ExecStart=/usr/sbin/redis-server /etc/redis/%i.conf Restart=on-failure #ExecStart=/usr/sbin/openvpn --daemon --suppress-timestamps --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf #ExecReload=/sbin/killproc -p /var/run/openvpn/%i.pid -HUP /usr/sbin/openvpn [Install] WantedBy=multi-user.target redis.target

1 0

commit sqlitebrowser for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package sqlitebrowser for openSUSE:Factory checked in at 2015-04-03 14:34:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sqlitebrowser (Old) and /work/SRC/openSUSE:Factory/.sqlitebrowser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sqlitebrowser" Changes: -------- --- /work/SRC/openSUSE:Factory/sqlitebrowser/sqlitebrowser.changes 2014-03-04 13:59:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sqlitebrowser.new/sqlitebrowser.changes 2015-04-03 14:34:43.000000000 +0200 @@ -1,0 +2,78 @@ +Thu Apr 2 07:09:42 UTC 2015 - mpluskal(a)suse.com + +- Update licensing information + +------------------------------------------------------------------- +Thu Mar 26 14:04:19 UTC 2015 - stephan.barth(a)suse.com + +- Update to version 3.5.1 from 3.4.0 + Upstream changes for 3.5.1: + + Bug fixes + + - Default Location field can't be changed in v3.5.0 on OSX - #197 + - Crash when a table name is empty - #194 + - CSV Import bug - final row being missed - #193 + - Attach database when main is encrypted - #174 + - Failure to delete some SQLite entries (.s3db) - #172 + + Important upstream changes for 3.5.0: + One of the major improvements in this release, is support for encrypted + databases. This is done using the SQLCipher encryption library. + + Enhancements + + - I18N - Simplified Chinese language support - #138 + - Add tooltip for all table items - #139 + - Remember CSV export options - #149 + - Distinguish Save and Save As when saving SQL files in the Execute SQL tab + - #152 + - Add two buttons to navigate to the head and the tail - #169 + - Support Indices without sorting - #176 + + Enhancements with progress, though more still needs to be done + + - Open Encrypted Database - #12 + - Add full support for tables without rowid - #51 + - NULL field values are not highlighted - #163 + - Ability to change language - #182 #187 + + Bug fixes + + - Foreign Key in Edit Create Table - #109 + - CSV export bug - Fields aren't automatically quoted when separator + character is present in the data - #144 + - [feature request]"Execute SQL": clear output if query returns nothing - + - #151 + - Export to SQL INT Datatype Expression - #156 + - Crash when opening db without rowid and composite primary key - #159 + - Database Structure view: wrong parsing of CHECK constraints - #179 + - tests: fix QCoreApplication parameters #185 + +------------------------------------------------------------------- +Mon Dec 8 10:51:35 UTC 2014 - lars(a)linux-schulserver.de + +- update to 3.4.0 + + CSV file import and export code has been extensively modified + for better RFC compatibility + + support for custom collation sequences. This lets people use + SQLite3 databases copied from their Android phone or tablet. + + several fixes in our SQL grammar parser + + Make adding new rows less confusing by showing automatically + generated data by default values, triggers or the PK right after + the new row is added + + Edit Table dialog: Add option for adding a unique constraint to columns + + UI improvements: Show line numbers in the SQL log + + Add a database schema pane (can be torn off) + + Added a Russian translation, fixed German translation + + new Project files feature, for saving metadata about your SQLite + Database files + + New: Plotting, a quick and dirty way to draw graphs from your + table data + + Bi-licensed under MPLv2 and GPLv3 +- adapt package license string for the bi-license +- use cmake now instead of old qmake +- let make install the sqlitebrowser binary +- build-require hicolor-icon-theme for the directory ownership + +------------------------------------------------------------------- Old: ---- sqlitebrowser-sqlb-3.0.2.tar.bz2 New: ---- sqlitebrowser-sqlitebrowser-0ddf048.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqlitebrowser.spec ++++++ --- /var/tmp/diff_new_pack.uQW2zb/_old 2015-04-03 14:34:43.000000000 +0200 +++ /var/tmp/diff_new_pack.uQW2zb/_new 2015-04-03 14:34:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sqlitebrowser # -# Copyright (c) 2012-2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: sqlitebrowser -Version: 3.0.2 -Release: 1 -License: GPL-3.0+ +Version: 3.5.1 +Release: 0 Summary: Create, design and edit SQLite Databases -Url: https://github.com/rp-/sqlitebrowser/ +License: GPL-3.0+ or MPL-2.0 Group: Productivity/Office/Organizers +Url: https://github.com/rp-/sqlitebrowser/ # https://github.com/rp-/sqlitebrowser/releases -Source0: %{name}-sqlb-%{version}.tar.bz2 +Source0: sqlitebrowser-sqlitebrowser-0ddf048.tar.gz Source1: sqlitebrowser.1 %if 0%{?suse_version} BuildRequires: update-desktop-files %endif BuildRequires: autoconf BuildRequires: automake +BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme BuildRequires: libQtWebKit-devel -BuildRequires: libqt4-devel -BuildRequires: make +BuildRequires: libqt4-devel >= 4.6 BuildRequires: sqlite3-devel BuildRequires: update-desktop-files %if 0%{?suse_version} > 1100 @@ -62,19 +64,18 @@ * Examine a log of all SQL commands issued by the application %prep -%setup -q -n %{name}-sqlb-%{version} +%setup -q -n sqlitebrowser-sqlitebrowser-0ddf048 %build -qmake +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} . make %{?_smp_mflags} %install -%make_install +make DESTDIR="%{buildroot}" install mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/{applications,pixmaps} -install -m755 src/sqlitebrowser %{buildroot}/%{_bindir}/ install -Dm644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/%{name}.1 install -m644 images/%{name}.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png -cat >> %{buildroot}/%{_datadir}/applications/%{name}.desktop << EOF +cat > %{buildroot}/%{_datadir}/applications/%{name}.desktop << EOF [Desktop Entry] Categories=Application;Network;GNOME;GTK;System;X-SuSE-ServiceConfiguration; StartupNotify=true @@ -100,13 +101,13 @@ %desktop_database_postun %endif - %files %defattr(-,root,root) -%doc README.rst LICENSE +%doc README.md LICENSE currentrelease %{_mandir}/man1/%{name}.1* %{_bindir}/* %{_datadir}/applications/* %{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/*/apps/sqlitebrowser.png %changelog

1 0

commit python3-bpython for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package python3-bpython for openSUSE:Factory checked in at 2015-04-03 14:34:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-bpython (Old) and /work/SRC/openSUSE:Factory/.python3-bpython.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-bpython" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-bpython/python3-bpython.changes 2015-01-25 21:15:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-bpython.new/python3-bpython.changes 2015-04-03 14:34:33.000000000 +0200 @@ -1,0 +2,94 @@ +Tue Mar 3 16:48:13 UTC 2015 - arun(a)gmx.de + +- update to version 0.14.1: + +* #483: Fixed jedi exceptions handling. +* #486: Fixed Python 3.3 compatibility. +* #489: Create history file with mode 0600. +* #491: Fix issues with file name completion. +* #494: Fix six version requirement. +* Fix conditional dependencies for SNI support in Python versions before 2.7.7. + +------------------------------------------------------------------- +Tue Feb 17 19:33:08 UTC 2015 - arun(a)gmx.de + +- specfile + * added dependcies greentlet, six, jedi, curtsies + * no more binary bpython-curtsies, bpython-gtk + * new binary bpython-curses, bpbd + * updated %doc: removed ROADMAP, TODO, added AUTHORS + * added new files bpython.png, bpython.appdata.xml + * add ifdef for 13.1 in %files section for %{_datadir}/appdata + +- update to version 0.14: + * This release contains major changes to the frontends: + - curtsies is the new default frontend. + - The old curses frontend is available as bpython-curses. + - The GTK+ frontend has been removed. + * New features: + - #194: Syntax-highlighted tracebacks. Thanks to Miriam Lauter. + - #234: Copy to system clipboard. + - #285: Re-evaluate session and reimport modules. + - #313: Warn when undo may take cause extended delay, and prompt to undo + multiple lines. + - #322: Watch imported modules for changes and re-evaluate on changes. + - #328: bpython history not re-evaluated to edit a previous line of a multiline + statement. + - #334: readline command Meta-. for yank last argument. Thanks to Susan + Steinman and Steph Samson. + - #338: bpython help with F1. + - #354: Edit config file from within bpython. + - #382: Partial support for pasting in text with blank lines. + - #410: Startup banner that shows Python and bpython version + - #426: Experimental mutliline autocompletion. + - fish style last history completion with Arrow Right. Thanks to Nicholas + Sweeting. + - fish style automatic reverse history search with Arrow Up. + Thanks to Nicholas Sweeting. + - Incremental forward and reverse search. + - All readline keys which kill/cut text correctly copy text for paste + with Ctrl-y or Meta-y. + - French translation. + - Removal links for bpaste pastebins are now displayed. + - More informative error messages when source cannot be found for an object. + Thanks to Liudmila Nikolaeva and Miriam Lauter. + - Message displayed if history in scrollback buffer is inconsistent with + output from last re-evaluation of bpython session. Thanks to Susan Steinman. + - Adjust logging level with -L or -LL. + - String literal attribute completion. + * Fixes: + - #254: Use ASCII characters if Unicode box characters are not supported by the + terminal. + - #284: __file__ is in scope after module run with bpython -i. Thanks to + Lindsey Raymond. + - #347: Fixed crash on unsafe autocompletion. + - #349: Fixed writing newlines to stderr. + - #363: Fixed banner crashing bpython-urwid. Thanks to Luca Barbato. + - #366, #367: Fixed help() support in curtsies. + - #369: Interactive sessions inherit compiler directives from files run with -i + interactive flag. + - #370, #401, #440, #448, #468, #472: Fixed various display issues in curtsies. + - #391: Fixed crash when using Meta-backspace. Thanks to Tony Wang. + - #438, #450: bpython-curtsies startup behavior fixed. Errors + during startup are reported instead of crashing. + - #447: Fixed behavior of duplicate keybindings. Thanks to Keyan Pishdadian. + - #458: Fixed dictionary key completion crash in Python 2.6. Thanks to Mary + Mokuolu. + - Documentation fixes from Lindsey Raymond. + - Fixed filename completion. + - Fixed various Unicode issues in curtsies. + - Fixed and re-enabled dictionary key completion in curtsies. + + The commandline option --type / -t has been renamed to --paste / -p. + Python 2.6, 2.7, 3.3 and newer are supported. Support for 2.5 has been dropped. + Furthermore, it is no longer necessary to run 2to3 on the source code. + This release brings a lot more code coverage, a new contributing guide, + and most of the code now conforms to PEP-8. + * Changes to dependencies: + - greenlet and curtsies are no longer optional. + - six is a new dependency. + - jedi is a new optional dependency required for multiline completion. + - watchdog is a new optional dependency required for watching changes in + imported modules. + +------------------------------------------------------------------- Old: ---- bpython-0.13.2.tar.gz New: ---- bpython-0.14.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-bpython.spec ++++++ --- /var/tmp/diff_new_pack.hGmgLs/_old 2015-04-03 14:34:34.000000000 +0200 +++ /var/tmp/diff_new_pack.hGmgLs/_new 2015-04-03 14:34:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-bpython # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python3-bpython -Version: 0.13.2 +Version: 0.14.1 Release: 0 Url: http://www.bpython-interpreter.org Summary: Fancy Curses Interface to the Python Interactive Interpreter @@ -26,6 +26,7 @@ Source: http://www.bpython-interpreter.org/releases/bpython-%{version}.tar.gz BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-six BuildRequires: update-desktop-files # Documentation requirements: BuildRequires: python3-Sphinx @@ -35,8 +36,12 @@ BuildRequires: python3-nose Requires: python3-Pygments Requires: python3-curses +Requires: python3-curtsies +Requires: python3-greenlet +Requires: python3-jedi Requires: python3-pyparsing Requires: python3-setuptools +Requires: python3-six Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch @@ -55,12 +60,16 @@ sed -i -e "/Icon.*/d" \ -e "s/bpython/bpython3/g" data/bpython.desktop mv data/bpython.desktop data/bpython3.desktop +mv data/bpython.png data/bpython3.png +mv data/bpython.appdata.xml data/bpython3.appdata.xml sed -i -e "s/bpython =/bpython-%{py3_ver} =/" \ - -e "s/bpython-curtsies =/bpython-curtsies-%{py3_ver} =/" \ - -e "s/bpython-gtk =/bpython-gtk-%{py3_ver} =/" \ + -e "s/bpbd =/bpbd-%{py3_ver} =/" \ + -e "s/bpython-curses =/bpython-curses-%{py3_ver} =/" \ -e "s/bpython-urwid =/bpython-urwid-%{py3_ver} =/" \ -e "s/bpython.1/bpython-%{py3_ver}.1/" \ -e "s/bpython.desktop/bpython3.desktop/" \ + -e "s/bpython.png/bpython3.png/" \ + -e "s/bpython.appdata.xml/bpython3.appdata.xml/" \ -e "s/bpython-config.5/bpython-config-%{py3_ver}.5/" setup.py sed -i -e "s/, 'bpython'/, 'bpython-%{py3_ver}'/" \ -e "s/, 'bpython-config'/, 'bpython-config-%{py3_ver}'/" doc/sphinx/source/conf.py @@ -71,9 +80,9 @@ %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +ln -s %{_bindir}/bpbd-%{py3_ver} %{buildroot}%{_bindir}/bpbd ln -s %{_bindir}/bpython-%{py3_ver} %{buildroot}%{_bindir}/bpython -ln -s %{_bindir}/bpython-curtsies-%{py3_ver} %{buildroot}%{_bindir}/bpython-curtsies -ln -s %{_bindir}/bpython-gtk-%{py3_ver} %{buildroot}%{_bindir}/bpython-gtk +ln -s %{_bindir}/bpython-curses-%{py3_ver} %{buildroot}%{_bindir}/bpython-curses ln -s %{_bindir}/bpython-urwid-%{py3_ver} %{buildroot}%{_bindir}/bpython-urwid ln -s %{_mandir}/man1/bpython-%{py3_ver}.1 %{buildroot}%{_mandir}/man1/bpython.1 ln -s %{_mandir}/man5/bpython-config-%{py3_ver}.5 %{buildroot}%{_mandir}/man5/bpython-config.5 @@ -90,8 +99,8 @@ # Since /usr/bin/pybabel became ghosted to be used with update-alternatives, we have to get rid # of the old binary resulting from the non-update-alternativies-ified package: [ -h %{_bindir}/bpython ] || rm -f %{_bindir}/bpython -[ -h %{_bindir}/bpython-curtsies ] || rm -f %{_bindir}/bpython-curtsies -[ -h %{_bindir}/bpython-gtk ] || rm -f %{_bindir}/bpython-gtk +[ -h %{_bindir}/bpbd ] || rm -f %{_bindir}/bpbd +[ -h %{_bindir}/bpython-curses ] || rm -f %{_bindir}/bpython-curses [ -h %{_bindir}/bpython-urwid ] || rm -f %{_bindir}/bpython-urwid [ -h %{_mandir}/man1/bpython.1.gz ] || rm -f %{_mandir}/man1/bpython.1.gz [ -h %{_mandir}/man5/bpython-config.5.gz ] || rm -f %{_mandir}/man5/bpython-config.5.gz @@ -99,8 +108,8 @@ %post update-alternatives \ --install %{_bindir}/bpython bpython %{_bindir}/bpython-%{py3_ver} 30 \ - --slave %{_bindir}/bpython-curtsies bpython-curtsies %{_bindir}/bpython-curtsies-%{py3_ver} \ - --slave %{_bindir}/bpython-gtk bpython-gtk %{_bindir}/bpython-gtk-%{py3_ver} \ + --slave %{_bindir}/bpbd bpbd %{_bindir}/bpbd-%{py3_ver} \ + --slave %{_bindir}/bpython-curses bpython-curses %{_bindir}/bpython-curses-%{py3_ver} \ --slave %{_bindir}/bpython-urwid bpython-urwid %{_bindir}/bpython-urwid-%{py3_ver} \ --slave %{_mandir}/man1/bpython.1.gz bpython.1 %{_mandir}/man1/bpython-%{py3_ver}.1.gz \ --slave %{_mandir}/man5/bpython-config.5.gz bpython-config.5 %{_mandir}/man5/bpython-config-%{py3_ver}.5.gz @@ -112,13 +121,13 @@ %files %defattr(-,root,root) -%doc AUTHORS CHANGELOG LICENSE ROADMAP TODO build/sphinx/html +%doc AUTHORS CHANGELOG LICENSE README.rst build/sphinx/html %ghost %{_bindir}/bpython %{_bindir}/bpython-%{py3_ver} -%ghost %{_bindir}/bpython-curtsies -%{_bindir}/bpython-curtsies-%{py3_ver} -%ghost %{_bindir}/bpython-gtk -%{_bindir}/bpython-gtk-%{py3_ver} +%ghost %{_bindir}/bpbd +%{_bindir}/bpbd-%{py3_ver} +%ghost %{_bindir}/bpython-curses +%{_bindir}/bpython-curses-%{py3_ver} %ghost %{_bindir}/bpython-urwid %{_bindir}/bpython-urwid-%{py3_ver} %{python3_sitelib}/bpdb @@ -129,5 +138,10 @@ %ghost %{_mandir}/man5/bpython-config.5.gz %{_mandir}/man5/bpython-config-%{py3_ver}.5.gz %{_datadir}/applications/bpython3.desktop +%if %{suse_version} == 1310 +%dir %{_datadir}/appdata +%endif +%{_datadir}/appdata/bpython3.appdata.xml +%{_datadir}/pixmaps/bpython3.png %changelog ++++++ bpython-0.13.2.tar.gz -> bpython-0.14.1.tar.gz ++++++ ++++ 16993 lines of diff (skipped)

1 0

commit libzypp-plugin-appdata for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package libzypp-plugin-appdata for openSUSE:Factory checked in at 2015-04-03 14:34:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp-plugin-appdata (Old) and /work/SRC/openSUSE:Factory/.libzypp-plugin-appdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp-plugin-appdata" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp-plugin-appdata/libzypp-plugin-appdata.changes 2015-03-18 13:02:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp-plugin-appdata.new/libzypp-plugin-appdata.changes 2015-04-03 14:34:25.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Apr 2 13:38:08 UTC 2015 - dimstar(a)opensuse.org + +- InstallAppdata.sh: pass --nonet to appstream-util when + validating appstream.xml.gz. + +------------------------------------------------------------------- +Tue Mar 31 13:41:00 UTC 2015 - dimstar(a)opensuse.org + +- InstallAppdata.sh: only install AppStream metadata, that + validates. + +------------------------------------------------------------------- +Fri Mar 20 12:55:38 UTC 2015 - dimstar(a)opensuse.org + +- Re-enable the actual libzypp plugin in place of shipping a static + version of appstream metadata (last updated for 13.2). We can do + this, as Tumbleweed now produces valid metadata. 3rd party repos + are not yet able to produce valid metadata it seems. + +------------------------------------------------------------------- Old: ---- openSUSE-13.2-icons.tar.gz openSUSE-13.2.xml.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-plugin-appdata.spec ++++++ --- /var/tmp/diff_new_pack.mBUwoE/_old 2015-04-03 14:34:28.000000000 +0200 +++ /var/tmp/diff_new_pack.mBUwoE/_new 2015-04-03 14:34:28.000000000 +0200 @@ -19,7 +19,6 @@ Name: libzypp-plugin-appdata Version: 1.0.1 Release: 0 -%define gs_plugin_api 7 Summary: Extend libzypp to handle AppStream metadata License: MIT Group: System/Libraries @@ -27,13 +26,11 @@ Source0: openSUSE-appstream-1.0.tar.xz Source1: openSUSE-appstream-process Source2: InstallAppdata.sh -Source10: openSUSE-13.2.xml.gz -Source11: openSUSE-13.2-icons.tar.gz BuildArch: noarch BuildRequires: appstream-glib >= 0.2.4 BuildRequires: fdupes -# Requires appstream-glib >= 0.2.4 for appstream-util install-basename -Requires: appstream-glib >= 0.2.4 +# appstream-glib >= 0.3.6 is the first to correctly to appstream-util uninstall in /var/cache +Requires: appstream-glib > 0.3.5 # appdata hook was introduced in libzypp 14.29.4 Requires: libzypp >= 14.29.4 @@ -79,28 +76,15 @@ done # Install AppData zypp plugin - temporarily disabled in favor of static AppStream metadata -#%%install -Dm 0755 %%{S:1} %%{buildroot}%%{_prefix}/lib/zypp/plugins/appdata/$(basename %%{S:1}) -DESTDIR=%{buildroot} appstream-util install %{S:10} %{S:11} -# marker, that we do no longer have to be aggressive in cleaning up remaining metadata in pre -touch %{buildroot}%{_datadir}/app-info/.zypp_plugin-1.0.1 - -# Link the few icons that are installed with different names -%fdupes %{buildroot}%{_datadir}/app-info/icons - -%pre -# In case we come from an old version of the plugin, we ensure to clean out any dynamic cache -if [ ! -f %{_datadir}/app-info/.zypp_plugin-1.0.1 ]; then - rm -rf %{_datadir}/app-info/ -fi +install -Dm 0755 %{S:2} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basename %{S:2}) %files %defattr(-,root,root) # zypp plugin triggering AppData update on repo refresh -#dir %{_prefix}/lib/zypp -#dir %{_prefix}/lib/zypp/plugins -#dir %{_prefix}/lib/zypp/plugins/appdata/ -#{_prefix}/lib/zypp/plugins/appdata/InstallAppdata.sh -%{_datadir}/app-info/ +%dir %{_prefix}/lib/zypp +%dir %{_prefix}/lib/zypp/plugins +%dir %{_prefix}/lib/zypp/plugins/appdata/ +%{_prefix}/lib/zypp/plugins/appdata/InstallAppdata.sh %files -n openSUSE-appstream-process %defattr(-,root,root) ++++++ InstallAppdata.sh ++++++ --- /var/tmp/diff_new_pack.mBUwoE/_old 2015-04-03 14:34:28.000000000 +0200 +++ /var/tmp/diff_new_pack.mBUwoE/_new 2015-04-03 14:34:28.000000000 +0200 @@ -26,7 +26,7 @@ YAST2=/suse/setup/descr # Cleanup existing appdata found on the system -for list in $(find /var/cache/app-info/xmls/*.xml.gz); do +for list in $(find /var/cache/app-info/xmls/*.xml.gz 2> /dev/null); do appdata=$(basename ${list} .xml.gz) appstream-util uninstall "${appdata}" 2>&1 > /dev/null done @@ -34,18 +34,22 @@ # Install new appdata files while ([ "$1" = "-R" ]); do case $4 in - rpm-md) - appstream-util install-origin "$2" $6$RPMMD/*appdata.xml.gz $6$RPMMD/*app-icons.tar.gz 2>&1 > /dev/null - ;; - yast2) - appstream-util install-origin "$2" "$6$YAST2/appdata.xml.gz" "$6$YAST2/appdata-icons.tar.gz" 2>&1 > /dev/null - ;; - *) - echo "unknown repo type - Appstream data not considered" + rpm-md) + if appstream-util validate-relax --nonet "$6$RPMMD/*appdata.xml.gz" 2>&1 > /dev/null; then + appstream-util install-origin "$2" "$6$RPMMD/*appdata.xml.gz" $6$RPMMD/*app-icons.tar.gz 2>&1 > /dev/null + fi + ;; + yast2) + if appstream-util validate-relax --nonet "$6$YAST2/appdata.xml.gz" 2>&1 > /dev/null; then + appstream-util install-origin "$2" "$6$YAST2/appdata.xml.gz" "$6$YAST2/appdata-icons.tar.gz" 2>&1 > /dev/null + fi + ;; + *) + echo "unknown repo type - Appstream data not considered" esac shift 6 done # Fixup icon that might have uncompressed with odd permissions -chmod 755 /usr/share/app-info/icons/* +chmod 755 /var/cache/app-info/icons/* ++++++ openSUSE-appstream-1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libzypp-plugin-appdata/openSUSE-appstream-1.0.tar.xz /work/SRC/openSUSE:Factory/.libzypp-plugin-appdata.new/openSUSE-appstream-1.0.tar.xz differ: char 26, line 1

1 0

commit gcab for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package gcab for openSUSE:Factory checked in at 2015-04-03 14:34:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcab (Old) and /work/SRC/openSUSE:Factory/.gcab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcab" Changes: -------- --- /work/SRC/openSUSE:Factory/gcab/gcab.changes 2015-03-27 09:38:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gcab.new/gcab.changes 2015-04-03 14:34:20.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Mar 30 15:16:56 UTC 2015 - dimstar(a)opensuse.org + +- Update to version 0.6: + + Fix for the AFL-detected crashes. + + Add file information getters (get_attributes(), get_date(), + get_size()). + + gcab learned --list-details to list files with those + informations. + + Fix the file date when creating cab. + + Build-sys fixes. + +------------------------------------------------------------------- Old: ---- gcab-0.5.tar.xz New: ---- gcab-0.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcab.spec ++++++ --- /var/tmp/diff_new_pack.4ZQs5e/_old 2015-04-03 14:34:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4ZQs5e/_new 2015-04-03 14:34:20.000000000 +0200 @@ -17,13 +17,13 @@ Name: gcab -Version: 0.5 +Version: 0.6 Release: 0 Summary: Cabinet file library and tool License: LGPL-2.1+ Group: Productivity/Archiving/Compression Url: http://ftp.gnome.org/pub/GNOME/sources/gcab -Source: http://ftp.acc.umu.se/pub/GNOME/sources/gcab/0.5/gcab-0.5.tar.xz +Source: http://ftp.acc.umu.se/pub/GNOME/sources/gcab/%{version}/%{name}-%{version}.… # PATCH-FIX-UPSTREAM gcab-checksum.patch bgo#746580 schwab(a)linux-m68k.org -- Fix checksum computation Patch: gcab-checksum.patch BuildRequires: gobject-introspection >= 0.9.4 ++++++ gcab-0.5.tar.xz -> gcab-0.6.tar.xz ++++++ ++++ 3290 lines of diff (skipped)

1 0

commit gnome-terminal for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '15

03 Apr '15

Hello community, here is the log from the commit of package gnome-terminal for openSUSE:Factory checked in at 2015-04-03 14:34:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-terminal (Old) and /work/SRC/openSUSE:Factory/.gnome-terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-terminal" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-terminal/gnome-terminal.changes 2015-03-30 19:23:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-terminal.new/gnome-terminal.changes 2015-04-03 14:34:12.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Mar 26 13:45:49 UTC 2015 - zaitor(a)opensuse.org + +- Add gnome-terminal-dark-theme.patch: Allow gnome-terminal to have + dark theme preferance. +- Add libtool BuildRequires and call autoreconf as the above patch + touches the buildsystem. + +------------------------------------------------------------------- New: ---- gnome-terminal-dark-theme.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-terminal.spec ++++++ --- /var/tmp/diff_new_pack.s4ziYm/_old 2015-04-03 14:34:12.000000000 +0200 +++ /var/tmp/diff_new_pack.s4ziYm/_new 2015-04-03 14:34:12.000000000 +0200 @@ -28,11 +28,15 @@ BuildRequires: fdupes # PATCH-FEATURE-OPENSUSE gnome-terminal-transparency.patch dimmstar(a)opensuse.org -- Allow gnome-terminal to have transparent windows Patch100: gnome-terminal-transparency.patch -# PATCH-FEATURE-OPENSSUE gnome-terminal-transparency-fix-for-broken-themes.patch dimstar(a)opensuse.org -- Ensure the window is always painted +# PATCH-FEATURE-OPENSUSE gnome-terminal-transparency-fix-for-broken-themes.patch dimstar(a)opensuse.org -- Ensure the window is always painted Patch101: gnome-terminal-transparency-fix-for-broken-themes.patch # Needed for search provider. It should not be needed in my opionion, we have to take this up with upstream, or just provide search provider interface definition file as source. +# PATCH-FEATURE-OPENSUSE gnome-terminal-dark-theme.patch zaitor(a)opensuse.org -- Allow gnome-terminal to have dark theme preferance. +Patch102: gnome-terminal-dark-theme.patch BuildRequires: gnome-shell BuildRequires: intltool >= 0.50.0 +# Needed for patch 102 +BuildRequires: libtool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: vala @@ -85,9 +89,12 @@ %setup -q %patch100 -p1 %patch101 -p1 +%patch102 -p1 translation-update-upstream %build +# Needed for patch102 +autoreconf -fiv %configure \ --disable-static \ --with-gtk=3.0 \ ++++++ gnome-terminal-dark-theme.patch ++++++ >From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Tue, 17 Feb 2015 13:22:11 +0100 Subject: [PATCH 1/2] Revert "prefs: Remove dark theme pref" This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18. --- src/org.gnome.Terminal.gschema.xml | 5 +++++ src/preferences.ui | 16 ++++++++++++++++ src/terminal-app.c | 4 ++++ src/terminal-prefs.c | 9 ++++++++- src/terminal-schemas.h | 1 + 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml index 051bdc4..95c5405 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -656,6 +656,11 @@ <summary>Whether to show the menubar in new windows</summary> </key> + <key name="dark-theme" type="b"> + <default>false</default> + <summary>Whether to use a dark theme variant</summary> + </key> + <key name="new-terminal-mode" enum="org.gnome.Terminal.NewTerminalMode"> <default>'window'</default> <summary>Whether to open new terminals as windows or tabs</summary> diff --git a/src/preferences.ui b/src/preferences.ui index f64a11b..df82508 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -139,6 +139,22 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="dark-theme-checkbutton"> + <property name="label" translatable="yes">Use _dark theme variant</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> <object class="GtkBox" id="hbox140"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/src/terminal-app.c b/src/terminal-app.c index 8a9434f..95302c5 100644 --- a/src/terminal-app.c +++ b/src/terminal-app.c @@ -362,6 +362,10 @@ terminal_app_init (TerminalApp *app) /* Terminal global settings */ app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA); + g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY, + gtk_settings_get_default (), + "gtk-application-prefer-dark-theme", + G_SETTINGS_BIND_GET); /* Check if we need to migrate from gconf to dconf */ maybe_migrate_settings (app); diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c index 97f6c33..a57dde6 100644 --- a/src/terminal-prefs.c +++ b/src/terminal-prefs.c @@ -562,7 +562,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button; GtkWidget *disable_shortcuts_button; GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button; - GtkWidget *new_terminal_mode_combo; + GtkWidget *dark_theme_button, *new_terminal_mode_combo; GtkWidget *default_hbox, *default_label; GtkTreeSelection *selection; GSettings *settings; @@ -583,6 +583,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, "preferences-dialog", "preferences-dialog", &dialog, "default-show-menubar-checkbutton", &show_menubar_button, + "dark-theme-checkbutton", &dark_theme_button, "new-terminal-mode-combobox", &new_terminal_mode_combo, "disable-mnemonics-checkbutton", &disable_mnemonics_button, "disable-shortcuts-checkbutton", &disable_shortcuts_button, @@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); g_settings_bind (settings, + TERMINAL_SETTING_DARK_THEME_KEY, + dark_theme_button, + "active", + G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + + g_settings_bind (settings, TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY, new_terminal_mode_combo, "active-id", diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h index 0fcbf52..c6acd7c 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h @@ -69,6 +69,7 @@ G_BEGIN_DECLS #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" +#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme" #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled" #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled" -- 2.1.0 >From 9fc68b087180e48cb4e2275f3134f66f2c43de14 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Tue, 17 Feb 2015 13:22:21 +0100 Subject: [PATCH 2/2] Revert "help: Remove dark theme pref" This reverts commit baaca6a4cc5ca78d7b0e02cfaee6c159bad7ce4b. --- help/C/pref-theme.page | 41 +++++++++++++++++++++++++++++++++++++++++ help/Makefile.am | 1 + 2 files changed, 42 insertions(+) create mode 100644 help/C/pref-theme.page diff --git a/help/C/pref-theme.page b/help/C/pref-theme.page new file mode 100644 index 0000000..a997d14 --- /dev/null +++ b/help/C/pref-theme.page @@ -0,0 +1,41 @@ +<page xmlns="http://projectmallard.org/1.0/" + xmlns:its="http://www.w3.org/2005/11/its" + type="guide" + id="pref-theme"> + + <info> + <link type="guide" xref="index#appearance"/> + <revision pkgversion="3.12" date="2014-02-26" status="review"/> + + <credit type="author copyright"> + <name>Ekaterina Gerasimova</name> + <email its:translate="no">kittykat3756(a)gmail.com</email> + <years>2014</years> + </credit> +  + + <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> + + <desc>Use either the light or dark theme for <app>Terminal</app>.</desc> + </info> + + <title>Chose the window theme</title> + + <p>You can chose to use either the dark theme or the light theme for the + terminal window.</p> + + <steps> + <item> + <p>Select + <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">General</gui></guiseq>.</p> + </item> + <item> + <p>To use the dark theme, select <gui>Use dark theme variant</gui>.</p> + </item> + </steps> + +</page> diff --git a/help/Makefile.am b/help/Makefile.am index 33389c5..9c02a74 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -35,6 +35,7 @@ HELP_FILES = \ pref-profile-encoding.page \ pref-scrolling.page \ pref-tab-window.page \ + pref-theme.page \ pref-user-input.page \ profile.page \ prob-reset.page \ -- 2.1.0

1 0