May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit thunar-plugin-archive for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package thunar-plugin-archive for openSUSE:Factory checked in at 2014-05-02 14:03:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thunar-plugin-archive (Old) and /work/SRC/openSUSE:Factory/.thunar-plugin-archive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "thunar-plugin-archive" Changes: -------- --- /work/SRC/openSUSE:Factory/thunar-plugin-archive/thunar-plugin-archive.changes 2013-05-13 15:56:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.thunar-plugin-archive.new/thunar-plugin-archive.changes 2014-05-02 14:03:39.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 30 21:55:00 UTC 2014 - gber(a)opensuse.org + +- add compatibility symlink for the desktop file from file-roller + >= 3.12 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar-plugin-archive.spec ++++++ --- /var/tmp/diff_new_pack.ziyYSv/_old 2014-05-02 14:03:40.000000000 +0200 +++ /var/tmp/diff_new_pack.ziyYSv/_new 2014-05-02 14:03:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package thunar-plugin-archive # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,6 +59,9 @@ %install %make_install +# for file-roller >= 3.12 +ln -s file-roller.desktop %{buildroot}%{_libexecdir}/thunar-archive-plugin/org.gnome.FileRoller.desktop + rm -rf %{buildroot}%{_libdir}/thunarx-2/thunar-archive-plugin.la # remove unsupported locales @@ -66,9 +69,6 @@ %find_lang %{plugin_name} %{?no_lang_C} -%clean -rm -rf "%{buildroot}" - %post %icon_theme_cache_post -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tboot for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package tboot for openSUSE:Factory checked in at 2014-05-02 14:03:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tboot (Old) and /work/SRC/openSUSE:Factory/.tboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tboot" Changes: -------- --- /work/SRC/openSUSE:Factory/tboot/tboot.changes 2014-02-20 06:23:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tboot.new/tboot.changes 2014-05-02 14:03:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 30 08:42:27 UTC 2014 - meissner(a)suse.com + +- tboot-cs381.patch: generate tboot entries correctly, from Intel. + bnc#875581 + +------------------------------------------------------------------- New: ---- tboot-cs381.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tboot.spec ++++++ --- /var/tmp/diff_new_pack.7oLMRb/_old 2014-05-02 14:03:35.000000000 +0200 +++ /var/tmp/diff_new_pack.7oLMRb/_new 2014-05-02 14:03:35.000000000 +0200 @@ -27,6 +27,7 @@ Source0: http://downloads.sourceforge.net/project/tboot/tboot/tboot-%{ver}.tar.gz Patch0: tboot-fix.patch Patch1: tboot-grub2-suse.patch +Patch2: tboot-cs381.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel BuildRequires: trousers-devel @@ -42,6 +43,7 @@ %setup -q -n %name-%ver %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ tboot-cs381.patch ++++++ # HG changeset patch # User Gang Wei <gang.wei(a)intel.com> # Date 1398749209 -28800 # Tue Apr 29 13:26:49 2014 +0800 # Node ID 0883c5da94978917c81e654cabbf734e82a33b23 # Parent acfeeead17db852d23631a3dd0ec8a29836fce2d Fix grub cfg file generation scripts for SLES12 Signed-off-by: Gang Wei <gang.wei(a)intel.com> diff -r acfeeead17db -r 0883c5da9497 tboot/20_linux_tboot --- a/tboot/20_linux_tboot Tue Apr 22 14:00:56 2014 +0800 +++ b/tboot/20_linux_tboot Tue Apr 29 13:26:49 2014 +0800 @@ -44,11 +44,6 @@ case ${GRUB_DEVICE} in /dev/loop/*|/dev/loop[0-9]) GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*($[^)]\+$).*/\1/"` - # We can't cope with devices loop-mounted from files here. - case ${GRUB_DEVICE} in - /dev/*) ;; - *) exit 0 ;; - esac ;; esac diff -r acfeeead17db -r 0883c5da9497 tboot/20_linux_xen_tboot --- a/tboot/20_linux_xen_tboot Tue Apr 22 14:00:56 2014 +0800 +++ b/tboot/20_linux_xen_tboot Tue Apr 29 13:26:49 2014 +0800 @@ -44,11 +44,6 @@ case ${GRUB_DEVICE} in /dev/loop/*|/dev/loop[0-9]) GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*($[^)]\+$).*/\1/"` - # We can't cope with devices loop-mounted from files here. - case ${GRUB_DEVICE} in - /dev/*) ;; - *) exit 0 ;; - esac ;; esac -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysstat for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2014-05-02 14:03:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysstat (Old) and /work/SRC/openSUSE:Factory/.sysstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysstat" Changes: -------- --- /work/SRC/openSUSE:Factory/sysstat/sysstat.changes 2014-01-29 07:17:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysstat.new/sysstat.changes 2014-05-02 14:03:29.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 28 07:17:44 UTC 2014 - coolo(a)suse.com + +- remove %ghost in /var/run, see + http://lists.opensuse.org/opensuse-packaging/2014-04/msg00046.html + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.KL4dQj/_old 2014-05-02 14:03:30.000000000 +0200 +++ /var/tmp/diff_new_pack.KL4dQj/_new 2014-05-02 14:03:30.000000000 +0200 @@ -107,7 +107,6 @@ install -D -m 0755 sysstat.cron.suse %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsysstat %find_lang %{name} -install -d %{buildroot}%{_localstatedir}/lock/sa %{buildroot}%{_unitdir} install -D -m 0644 %{S:4} %{buildroot}%{_unitdir}/sysstat.service # change /usr/lib to /usr/lib64 or something else when needed if [ "%{_libdir}" != "/usr/lib" ]; then @@ -144,7 +143,6 @@ %exclude %{_bindir}/isag %{_libdir}/sa %{_unitdir}/sysstat.service -%ghost %dir %{_localstatedir}/lock/sa %dir %{_localstatedir}/log/sa %{_sbindir}/rcsysstat -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sitecopy for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package sitecopy for openSUSE:Factory checked in at 2014-05-02 14:03:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sitecopy (Old) and /work/SRC/openSUSE:Factory/.sitecopy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sitecopy" Changes: -------- --- /work/SRC/openSUSE:Factory/sitecopy/sitecopy.changes 2011-09-23 12:46:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sitecopy.new/sitecopy.changes 2014-05-02 14:03:22.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 27 16:14:56 UTC 2014 - crrodriguez(a)opensuse.org + +- fix build with no SSLv2, caused by package using + bundled neon library, update supporting patch + (sitecopy-support-neon-0.29.diff) +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sitecopy.spec ++++++ --- /var/tmp/diff_new_pack.n2ugsZ/_old 2014-05-02 14:03:22.000000000 +0200 +++ /var/tmp/diff_new_pack.n2ugsZ/_new 2014-05-02 14:03:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sitecopy (Version 0.16.6) +# spec file for package sitecopy # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sitecopy -BuildRequires: fdupes libexpat-devel neon-devel openssl-devel pkgconfig +BuildRequires: fdupes +BuildRequires: neon-devel +BuildRequires: pkgconfig Summary: Local to Remote Website Synchronizer -Version: 0.16.6 -Release: 26 -Requires: %{name}-lang = %{version} License: GPL-2.0+ Group: Productivity/Networking/Web/Utilities +Version: 0.16.6 +Release: 0 +Requires: %{name}-lang = %{version} Url: http://www.manyfish.co.uk/sitecopy/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.lyra.org/sitecopy/sitecopy-%{version}.tar.bz2 @@ -44,12 +44,11 @@ %prep %setup -q %patch0 -p1 +# Forcibly prevent use of bundled neon/expat/gettext sources. +rm -r lib/neon/*.[ch] intl/*.[ch] %build -CFLAGS="$RPM_OPT_FLAGS" \ -./configure \ - --prefix=/usr \ - --mandir=%{_mandir} \ +%configure \ --with-expat \ --with-ssl make %{?jobs:-j%jobs} ++++++ sitecopy-support-neon-0.29.diff ++++++ --- /var/tmp/diff_new_pack.n2ugsZ/_old 2014-05-02 14:03:22.000000000 +0200 +++ /var/tmp/diff_new_pack.n2ugsZ/_new 2014-05-02 14:03:22.000000000 +0200 @@ -1,7 +1,5 @@ -Index: sitecopy-0.16.6/lib/neon/ne_openssl.c -=================================================================== ---- sitecopy-0.16.6.orig/lib/neon/ne_openssl.c 2008-02-06 12:27:38.000000000 +0100 -+++ sitecopy-0.16.6/lib/neon/ne_openssl.c 2010-09-06 14:33:36.278385141 +0200 +--- sitecopy-0.16.6.orig/lib/neon/ne_openssl.c ++++ sitecopy-0.16.6/lib/neon/ne_openssl.c @@ -615,6 +615,18 @@ void ne_ssl_context_destroy(ne_ssl_conte ne_free(ctx); } @@ -21,3 +19,23 @@ /* For internal use only. */ int ne__negotiate_ssl(ne_session *sess) { +--- sitecopy-0.16.6.orig/configure ++++ sitecopy-0.16.6/configure +@@ -8456,7 +8456,7 @@ fi + echo "${ECHO_T}$ne_cv_lib_neon" >&6; } + if test "$ne_cv_lib_neon" = "yes"; then + ne_cv_lib_neonver=no +- for v in 24 25 26 27 28; do ++ for v in 24 25 26 27 28 29 30 31; do + case $ne_libver in + 0.$v.*) ne_cv_lib_neonver=yes ;; + esac +@@ -9256,7 +9256,7 @@ fi + echo "${ECHO_T}$ne_cv_lib_neon" >&6; } + if test "$ne_cv_lib_neon" = "yes"; then + ne_cv_lib_neonver=no +- for v in 24 25 26 27 28; do ++ for v in 24 25 26 27 28 29 30 31; do + case $ne_libver in + 0.$v.*) ne_cv_lib_neonver=yes ;; + esac -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scpm for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package scpm for openSUSE:Factory checked in at 2014-05-02 14:03:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scpm (Old) and /work/SRC/openSUSE:Factory/.scpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scpm" Changes: -------- --- /work/SRC/openSUSE:Factory/scpm/scpm.changes 2012-09-13 00:06:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scpm.new/scpm.changes 2014-05-02 14:03:13.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 17 03:30:37 UTC 2014 - crrodriguez(a)opensuse.org + +- Use -fvisiblity-inlines-hidden +- scpm-md5.patch: This is one of the remaining two packages + that still require abandonware library "mhash", replace + its usage with cryptopp so we can drop the package in question. + +------------------------------------------------------------------- New: ---- scpm-md5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scpm.spec ++++++ --- /var/tmp/diff_new_pack.6fGbKJ/_old 2014-05-02 14:03:14.000000000 +0200 +++ /var/tmp/diff_new_pack.6fGbKJ/_new 2014-05-02 14:03:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scpm # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,8 @@ BuildRequires: graphviz-gnome BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: mhash-devel BuildRequires: xz +BuildRequires: pkgconfig(cryptopp) %if 0%{suse_version} > 1220 BuildRequires: makeinfo %endif @@ -44,6 +44,7 @@ Patch7: scpm-no_using_in_header.patch Patch8: scpm-constification.patch Patch9: scpm-doc_config.patch +Patch10: scpm-md5.patch Requires: diffutils Requires: textutils Requires(post): awk @@ -88,9 +89,9 @@ %patch7 %patch8 %patch9 - +%patch10 -p1 %build -export CXXFLAGS="%{optflags}" +export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden" echo -e "#!/bin/bash\n$(which %__cxx) \"\$@\"" >g++ chmod 755 g++ export PATH=`pwd`:$PATH ++++++ scpm-md5.patch ++++++ --- scpm-1.1.7.orig/src/main/modlib.cc +++ scpm-1.1.7/src/main/modlib.cc @@ -21,79 +21,44 @@ #include <cstdlib> #include <cstdio> #include <string> -#include <mhash.h> #include <fcntl.h> #include <iostream> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 +#include <cryptopp/md5.h> +#include <cryptopp/files.h> +#include <cryptopp/filters.h> +#include <cryptopp/hex.h> + using namespace std; +using namespace CryptoPP::Weak1; +using namespace CryptoPP; #define module_name "modlib" string Modlib::GetMD5sum( string filename ) { - int c; - int fd; - MHASH td; - unsigned char buffer[4096]; - unsigned char *hash; - static char hash_string[33]; - string hash_s; - - td = mhash_init(MHASH_MD5); - - if (td == MHASH_FAILED) return("__unknown"); - - if ( (fd=open( filename.c_str(), O_RDONLY )) == -1 ) { - return("__unknown"); - } - - while ( (c=read(fd, &buffer, 4096)) >0) { - mhash(td, &buffer, c); - } - - hash = (unsigned char *) mhash_end(td); - - for ( unsigned int i = 0; i < mhash_get_block_size(MHASH_MD5); i++) { - sprintf(&hash_string[i*2], "%.2x", hash[i]); - } - - close(fd); - hash_s = hash_string; + MD5 hash; + byte buffer[2 * MD5::DIGESTSIZE]; + + FileSource f(filename.c_str(), true, + new HashFilter(hash, + new HexEncoder(new ArraySink(buffer,2 * MD5::DIGESTSIZE), false))); - return hash_s; + return string((const char*)buffer,2 * MD5::DIGESTSIZE); } string Modlib::GetMD5sum( istream &input ) { - int c; - MHASH td; - unsigned char buffer[4096]; - unsigned char *hash; - static char hash_string[33]; - string hash_s; - - td = mhash_init(MHASH_MD5); - - if (td == MHASH_FAILED) return("__unknown"); - - while ( input.get( (char*)buffer, 4096, '\0' ) ) { - c = input.gcount(); - mhash(td, &buffer, c); - } - - hash = (unsigned char *) mhash_end(td); - - for ( unsigned int i = 0; i < mhash_get_block_size(MHASH_MD5); i++) { - sprintf(&hash_string[i*2], "%.2x", hash[i]); - } - + MD5 hash; + byte buffer[2 * MD5::DIGESTSIZE]; + FileSource f(input, true, new HashFilter(hash, new HexEncoder(new ArraySink(buffer,2 * MD5::DIGESTSIZE), false))); + return string((const char*)buffer,2 * MD5::DIGESTSIZE); - hash_s = hash_string; - return hash_s; } int Modlib::CallHandler( string resource_type, string resource_name, --- scpm-1.1.7.orig/src/libscpm/Makefile +++ scpm-1.1.7/src/libscpm/Makefile @@ -8,7 +8,7 @@ libscpm-schemes.so: libscpm-schemes.c gcc -g -o libscpm-schemes.so -I../../include -shared libscpm-schemes.c libscpm.so.$(LIBVERSION): ../main ../modules ../scdb - g++ -shared -fPIC -o libscpm.so.$(LIBVERSION) -Xlinker --whole-archive ../main/libmain.a ../modules/libmodules.a ../scdb/libscdb.a -Xlinker -lmhash -Xlinker -call_shared -Xlinker --no-whole-archive -Wl,-soname,libscpm.so.$(APIVERSION) + g++ $(CXXFLAGS) -shared -fPIC -o libscpm.so.$(LIBVERSION) -Xlinker --whole-archive ../main/libmain.a ../modules/libmodules.a ../scdb/libscdb.a -Xlinker -lcryptopp -Xlinker -call_shared -Xlinker --no-whole-archive -Wl,-soname,libscpm.so.$(APIVERSION) ln -sf libscpm.so.$(LIBVERSION) libscpm.so clean: rm -f libscpm.so.$(LIBVERSION) libscpm.o libscpm++.so libscpm-schemes.so libscpm.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sbcl for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package sbcl for openSUSE:Factory checked in at 2014-05-02 14:03:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbcl (Old) and /work/SRC/openSUSE:Factory/.sbcl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sbcl" Changes: -------- --- /work/SRC/openSUSE:Factory/sbcl/sbcl.changes 2014-04-05 16:48:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sbcl.new/sbcl.changes 2014-05-02 14:03:09.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Apr 29 10:57:23 UTC 2014 - toganm(a)opensuse.org + +- Update to version 1.1.18 + + * Optimization + + COERCE is now more effecient for more cases when + the type is known at compile-time. (lp#1309815) + * Bug fix + + correctly inherit condition initforms. (lp#1300904) + + properly pprint literal functions inside nested lists. + (lp#1300716) + + more-correctly handle array-type unity (broken for + ages, causing compilation problems since 1.1.13.x due to + smarter TYPEP type propagation reported by jasom in #lisp). + +------------------------------------------------------------------- +Fri Apr 11 11:41:11 UTC 2014 - toganm(a)opensuse.org + +- Use clisp for those distros and archs where sbcl is not available + yet + +------------------------------------------------------------------- Old: ---- sbcl-1.1.17-source.tar.bz2 New: ---- sbcl-1.1.18-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbcl.spec ++++++ --- /var/tmp/diff_new_pack.9yc9wf/_old 2014-05-02 14:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.9yc9wf/_new 2014-05-02 14:03:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: sbcl -Version: 1.1.17 +Version: 1.1.18 Release: 0 Summary: Steel Bank Common Lisp License: SUSE-Public-Domain and BSD-3-Clause @@ -29,7 +29,16 @@ Source3: customize-target-features.lisp BuildRequires: ctags BuildRequires: ghostscript +# Needed for fixing unresolved builds lacking sbcl. Can be removed once the sbcl package is there +%if 0%{?centos_version} == 600 || 0%{?rhel_version} == 600 || 0%{?suse_version} == 1110 +BuildRequires: clisp +%else +%ifarch ppc64 ppc ppc64p7 aarch64 armv6l armv7l +BuildRequires: clisp +%else BuildRequires: sbcl +%endif +%endif BuildRequires: zlib-devel %if 0%{?fedora_version:1} BuildRequires: texinfo-tex @@ -77,8 +86,11 @@ %build CFLAGS="%optflags" +%if 0%{?centos_version} == 600 || 0%{?rhel_version} == 600 || 0%{?suse_version} == 1110 +%_buildshell make.sh --xc-host='clisp -q -norc' --prefix=%{_prefix} +%else %_buildshell make.sh --xc-host="sbcl --disable-debugger --no-sysinit --no-userinit" --prefix=%{_prefix} - +%endif cd doc/manual && make %install ++++++ sbcl-1.1.17-source.tar.bz2 -> sbcl-1.1.18-source.tar.bz2 ++++++ ++++ 6066 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-salt-testing for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package python-salt-testing for openSUSE:Factory checked in at 2014-05-02 14:03:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-salt-testing (Old) and /work/SRC/openSUSE:Factory/.python-salt-testing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-salt-testing" Changes: -------- --- /work/SRC/openSUSE:Factory/python-salt-testing/python-salt-testing.changes 2014-01-03 14:50:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-salt-testing.new/python-salt-testing.changes 2014-05-02 14:03:05.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 24 19:34:10 UTC 2014 - aboe76(a)gmail.com + +- Updated to version 2014.4.24 + - first date based release + - Add skip_if_binaries_missing helper method + - Global exception handler to catch weird and uncaught exceptions + - Docker runtests support enhancements + - Mark the start and stop of each tests on a log message + +------------------------------------------------------------------- Old: ---- SaltTesting-0.5.4.tar.gz New: ---- SaltTesting-2014.4.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-salt-testing.spec ++++++ --- /var/tmp/diff_new_pack.5xYrAx/_old 2014-05-02 14:03:06.000000000 +0200 +++ /var/tmp/diff_new_pack.5xYrAx/_new 2014-05-02 14:03:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-salt-testing -Version: 0.5.4 +Version: 2014.4.24 Release: 0 Summary: Testing tools needed in the several Salt Stack projects License: Apache-2.0 ++++++ SaltTesting-0.5.4.tar.gz -> SaltTesting-2014.4.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/PKG-INFO new/SaltTesting-2014.4.24/PKG-INFO --- old/SaltTesting-0.5.4/PKG-INFO 2014-01-02 12:11:49.000000000 +0100 +++ new/SaltTesting-2014.4.24/PKG-INFO 2014-04-24 14:04:42.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: SaltTesting -Version: 0.5.4 +Version: 2014.4.24 Summary: Required testing tools needed in the several Salt Stack projects. Home-page: http://saltstack.org Author: Pedro Algarvio @@ -11,7 +11,7 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 -Classifier: Development Status :: 3 - Alpha +Classifier: Development Status :: 4 - Beta Classifier: Environment :: Console Classifier: Intended Audience :: Developers Classifier: Intended Audience :: Information Technology diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/SaltTesting.egg-info/PKG-INFO new/SaltTesting-2014.4.24/SaltTesting.egg-info/PKG-INFO --- old/SaltTesting-0.5.4/SaltTesting.egg-info/PKG-INFO 2014-01-02 12:11:33.000000000 +0100 +++ new/SaltTesting-2014.4.24/SaltTesting.egg-info/PKG-INFO 2014-04-24 14:04:32.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: SaltTesting -Version: 0.5.4 +Version: 2014.4.24 Summary: Required testing tools needed in the several Salt Stack projects. Home-page: http://saltstack.org Author: Pedro Algarvio @@ -11,7 +11,7 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 -Classifier: Development Status :: 3 - Alpha +Classifier: Development Status :: 4 - Beta Classifier: Environment :: Console Classifier: Intended Audience :: Developers Classifier: Intended Audience :: Information Technology diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/SaltTesting.egg-info/SOURCES.txt new/SaltTesting-2014.4.24/SaltTesting.egg-info/SOURCES.txt --- old/SaltTesting-0.5.4/SaltTesting.egg-info/SOURCES.txt 2014-01-02 12:11:33.000000000 +0100 +++ new/SaltTesting-2014.4.24/SaltTesting.egg-info/SOURCES.txt 2014-04-24 14:04:33.000000000 +0200 @@ -14,12 +14,14 @@ salttesting/mock.py salttesting/unit.py salttesting/version.py +salttesting/xmlunit.py salttesting/ext/__init__.py salttesting/ext/console.py salttesting/ext/os_data.py salttesting/parser/__init__.py salttesting/parser/cover.py salttesting/pylintplugins/__init__.py +salttesting/pylintplugins/flask_sqlalchemy_transform.py salttesting/pylintplugins/pep263.py salttesting/pylintplugins/pep8.py salttesting/pylintplugins/string_format.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/salttesting/helpers.py new/SaltTesting-2014.4.24/salttesting/helpers.py --- old/SaltTesting-0.5.4/salttesting/helpers.py 2014-01-02 12:03:08.000000000 +0100 +++ new/SaltTesting-2014.4.24/salttesting/helpers.py 2014-02-08 02:08:52.000000000 +0100 @@ -10,6 +10,7 @@ :license: Apache 2.0, see LICENSE for more details. ''' +# Import Python libs import os import sys import types @@ -19,6 +20,9 @@ import __builtin__ from functools import wraps +# Import Salt Testing libs +from salttesting.unit import skip, _id + log = logging.getLogger(__name__) @@ -520,9 +524,16 @@ try: try: return func(cls, username) - except Exception as exc: - log.exception(exc) - failure = exc + except Exception as exc: # pylint: disable=W0703 + log.error( + 'Running {0!r} raised an exception: {1}'.format( + func, exc + ), + exc_info=True + ) + # Store the original exception details which will be raised + # a little further down the code + failure = sys.exc_info() finally: if delete: delete_account = cls.run_function( @@ -544,7 +555,7 @@ ) if failure is not None: # If an exception was thrown, raise it - raise failure + raise failure[0], failure[1], failure[2] return wrap return decorator @@ -626,3 +637,20 @@ return caller(cls) return wrapper return decorator + + +def skip_if_binaries_missing(binaries, check_all=False): + import salt.utils + if check_all: + for binary in binaries: + if salt.utils.which(binary) is None: + return skip( + 'The {0!r} binary was not found'.format(binary) + ) + elif salt.utils.which_bin(binaries) is None: + return skip( + 'None of the following binaries was found: {0}'.format( + ', '.join(binaries) + ) + ) + return _id diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/salttesting/parser/__init__.py new/SaltTesting-2014.4.24/salttesting/parser/__init__.py --- old/SaltTesting-0.5.4/salttesting/parser/__init__.py 2014-01-02 12:03:08.000000000 +0100 +++ new/SaltTesting-2014.4.24/salttesting/parser/__init__.py 2014-04-18 02:21:34.000000000 +0200 @@ -6,7 +6,7 @@ Salt-Testing CLI access classes :codeauthor: :email:`Pedro Algarvio (pedro(a)algarvio.me)` - :copyright: © 2013 by the SaltStack Team, see AUTHORS for more details. + :copyright: © 2013-2014 by the SaltStack Team, see AUTHORS for more details :license: Apache 2.0, see LICENSE for more details. ''' @@ -18,10 +18,14 @@ import logging import optparse import tempfile +import traceback import subprocess import warnings +from functools import partial +from contextlib import closing from salttesting import TestLoader, TextTestRunner +from salttesting.xmlunit import HAS_XMLRUNNER, XMLTestRunner try: from salttesting.ext import console WIDTH, HEIGHT = console.getTerminalSize() @@ -29,20 +33,47 @@ except Exception: PNUM = 70 -try: - import xmlrunner -except ImportError: - xmlrunner = None +# This is a completely random and meaningful number intended to identify our +# own signal triggering. +WEIRD_SIGNAL_NUM = -45654 + + +# Let's setup a global exception hook handler which will log all exceptions +# Store a reference to the original handler +__GLOBAL_EXCEPTION_HANDLER = sys.excepthook + + +def __global_logging_exception_handler(exc_type, exc_value, exc_traceback): + ''' + This function will log all python exceptions. + ''' + # Log the exception + logging.getLogger(__name__).error( + 'An un-handled exception was caught by salt-testing\'s global ' + 'exception handler:\n{0}: {1}\n{2}'.format( + exc_type.__name__, + exc_value, + ''.join(traceback.format_exception( + exc_type, exc_value, exc_traceback + )).strip() + ) + ) + # Call the original sys.excepthook + __GLOBAL_EXCEPTION_HANDLER(exc_type, exc_value, exc_traceback) + + +# Set our own exception handler as the one to use +sys.excepthook = __global_logging_exception_handler def print_header(header, sep='~', top=True, bottom=True, inline=False, - centered=False): + centered=False, width=PNUM): ''' Allows some pretty printing of headers on the console, either with a "ruler" on bottom and/or top, inline, centered, etc. ''' if top and not inline: - print(sep * PNUM) + print(sep * width) if centered and not inline: fmt = u'{0:^{width}}' @@ -52,10 +83,10 @@ fmt = u'{0:{sep}^{width}}' else: fmt = u'{0}' - print(fmt.format(header, sep=sep, width=PNUM)) + print(fmt.format(header, sep=sep, width=width)) if bottom and not inline: - print(sep * PNUM) + print(sep * width) class SaltTestingParser(optparse.OptionParser): @@ -63,6 +94,18 @@ support_destructive_tests_selection = False source_code_basedir = None + _known_interpreters = { + 'salttest/arch': 'python2', + 'salttest/centos-5': 'python2.6', + 'salttest/centos-6': 'python2.6', + 'salttest/debian-7': 'python2.7', + 'salttest/opensuse-12.3': 'python2.7', + 'salttest/ubuntu-12.04': 'python2.7', + 'salttest/ubuntu-12.10': 'python2.7', + 'salttest/ubuntu-13.04': 'python2.7', + 'salttest/ubuntu-13.10': 'python2.7' + } + def __init__(self, testsuite_directory, *args, **kwargs): if kwargs.pop('html_output_from_env', None) is not None or \ kwargs.pop('html_output_dir', None) is not None: @@ -80,12 +123,14 @@ 'XML_TESTS_OUTPUT_DIR' ) xml_output_dir = kwargs.pop('xml_output_dir', None) - self.xml_output_dir = os.environ.get( - xml_output_dir_env_var, - xml_output_dir or os.path.join( + + if xml_output_dir_env_var in os.environ: + xml_output_dir = os.environ.get(xml_output_dir_env_var) + if not xml_output_dir: + xml_output_dir = os.path.join( tempfile.gettempdir(), 'xml-tests-output' ) - ) + self.xml_output_dir = xml_output_dir # Get the desired logfile to use while running tests self.tests_logfile = kwargs.pop('tests_logfile', None) @@ -109,13 +154,6 @@ 'Default: %default') ) - if self.support_docker_execution is True: - self.test_selection_group.add_option( - '--docked', - default=None, - help='Run the tests suite in the chosen Docker container' - ) - self.test_selection_group.add_option( '-n', '--name', @@ -127,6 +165,42 @@ ) self.add_option_group(self.test_selection_group) + if self.support_docker_execution is True: + self.docked_selection_group = optparse.OptionGroup( + self, + 'Docked Tests Execution', + 'Run the tests suite under a Docker container. This allows, ' + 'for example, to run destructive tests on your machine ' + 'without actually breaking it in any way.' + ) + self.docked_selection_group.add_option( + '--docked', + default=None, + metavar='CONTAINER', + help='Run the tests suite in the chosen Docker container' + ) + self.docked_selection_group.add_option( + '--docked-interpreter', + default=None, + metavar='PYTHON_INTERPRETER', + help='The python binary name to use when calling the tests ' + 'suite.' + ) + self.docked_selection_group.add_option( + '--docked-skip-delete', + default=False, + action='store_true', + help='Skip docker container deletion on exit. Default: False' + ) + self.docked_selection_group.add_option( + '--docked-skip-delete-on-errors', + default=False, + action='store_true', + help='Skip docker container deletion on exit if errors ' + 'occurred. Default: False' + ) + self.add_option_group(self.docked_selection_group) + self.output_options_group = optparse.OptionGroup( self, 'Output Options' ) @@ -138,6 +212,17 @@ action='count', help='Verbose test runner output' ) + self.output_options_group.add_option( + '--output-columns', + default=PNUM, + type=int, + help='Number of maximum columns to use on the output' + ) + self.output_options_group.add_option( + '--tests-logfile', + default=self.tests_logfile, + help='The path to the tests suite logging logfile' + ) if self.xml_output_dir is not None: self.output_options_group.add_option( '-x', @@ -182,9 +267,8 @@ self.options, self.args = optparse.OptionParser.parse_args( self, args, values ) - print_header(u'', inline=True) + print_header(u'', inline=True, width=self.options.output_columns) self.pre_execution_cleanup() - self._validate_options() if self.support_docker_execution and self.options.docked is not None: if self.source_code_basedir is None: @@ -192,10 +276,25 @@ 'You need to define the \'source_code_basedir\' attribute ' 'in {0!r}.'.format(self.__class__.__name__) ) + + if '/' not in self.options.docked: + self.options.docked = 'salttest/{0}'.format( + self.options.docked + ) + + if self.options.docked_interpreter is None: + self.options.docked_interpreter = self._known_interpreters.get( + self.options.docked, 'python' + ) + # No more processing should be done. We'll exit with the return # code we get from the docker container execution self.exit(self.run_suite_in_docker()) + # Validate options after checking that we're not goint to execute the + # tests suite under a docker container + self._validate_options() + print(' * Current Directory: {0}'.format(os.getcwd())) print(' * Test suite is running under PID {0}'.format(os.getpid())) @@ -203,7 +302,7 @@ try: return (self.options, self.args) finally: - print_header(u'', inline=True) + print_header(u'', inline=True, width=self.options.output_columns) def setup_additional_options(self): ''' @@ -215,16 +314,21 @@ Validate the default available options ''' if self.xml_output_dir is not None and self.options.xml_out and \ - xmlrunner is None: + HAS_XMLRUNNER is False: self.error( '\'--xml\' is not available. The xmlrunner library is not ' 'installed.' ) - elif self.xml_output_dir is not None and self.options.xml_out: + + if self.options.xml_out: + # Override any environment setting with the passed value + self.xml_output_dir = self.options.xml_out + + if self.xml_output_dir is not None and self.options.xml_out: if not os.path.isdir(self.xml_output_dir): os.makedirs(self.xml_output_dir) print( - 'Generated unit test XML reports will be stored ' + ' * Generated unit test XML reports will be stored ' 'at {0!r}'.format(self.xml_output_dir) ) @@ -251,17 +355,17 @@ '[%(levelname)-8s] %(message)s', datefmt='%H:%M:%S' ) - if self.tests_logfile: + if self.options.tests_logfile: filehandler = logging.FileHandler( mode='w', # Not preserved between re-runs - filename=self.tests_logfile + filename=self.options.tests_logfile ) filehandler.setLevel(logging.DEBUG) filehandler.setFormatter(formatter) logging.root.addHandler(filehandler) logging.root.setLevel(logging.DEBUG) - print(' * Logging tests on {0}'.format(self.tests_logfile)) + print(' * Logging tests on {0}'.format(self.options.tests_logfile)) # With greater verbosity we can also log to the console if self.options.verbosity > 2: @@ -314,10 +418,11 @@ tests = loader.discover(path, suffix, self.testsuite_directory) header = '{0} Tests'.format(display_name) - print_header('Starting {0}'.format(header)) + print_header('Starting {0}'.format(header), + width=self.options.output_columns) if self.options.xml_out: - runner = xmlrunner.XMLTestRunner( + runner = XMLTestRunner( stream=sys.stdout, output=self.xml_output_dir, verbosity=self.options.verbosity @@ -336,7 +441,8 @@ ''' print print_header( - u' Overall Tests Report ', sep=u'=', centered=True, inline=True + u' Overall Tests Report ', sep=u'=', centered=True, inline=True, + width=self.options.output_columns ) failures = errors = skipped = passed = 0 @@ -355,10 +461,14 @@ no_problems_found = False - print_header(u'*** {0} '.format(name), sep=u'*', inline=True) + print_header( + u'*** {0} '.format(name), sep=u'*', inline=True, + width=self.options.output_columns + ) if results.skipped: print_header( - u' -------- Skipped Tests ', sep='-', inline=True + u' -------- Skipped Tests ', sep='-', inline=True, + width=self.options.output_columns ) maxlen = len( max([testcase.id() for (testcase, reason) in @@ -367,43 +477,53 @@ fmt = u' -> {0: <{maxlen}} -> {1}' for testcase, reason in results.skipped: print(fmt.format(testcase.id(), reason, maxlen=maxlen)) - print_header(u' ', sep='-', inline=True) + print_header(u' ', sep='-', inline=True, + width=self.options.output_columns) if results.errors: print_header( - u' -------- Tests with Errors ', sep='-', inline=True + u' -------- Tests with Errors ', sep='-', inline=True, + width=self.options.output_columns ) for testcase, reason in results.errors: print_header( u' -> {0} '.format(testcase.id()), - sep=u'.', inline=True + sep=u'.', inline=True, + width=self.options.output_columns ) for line in reason.rstrip().splitlines(): print(' {0}'.format(line.rstrip())) - print_header(u' ', sep=u'.', inline=True) - print_header(u' ', sep='-', inline=True) + print_header(u' ', sep=u'.', inline=True, + width=self.options.output_columns) + print_header(u' ', sep='-', inline=True, + width=self.options.output_columns) if results.failures: print_header( - u' -------- Failed Tests ', sep='-', inline=True + u' -------- Failed Tests ', sep='-', inline=True, + width=self.options.output_columns ) for testcase, reason in results.failures: print_header( u' -> {0} '.format(testcase.id()), - sep=u'.', inline=True + sep=u'.', inline=True, + width=self.options.output_columns ) for line in reason.rstrip().splitlines(): print(' {0}'.format(line.rstrip())) - print_header(u' ', sep=u'.', inline=True) - print_header(u' ', sep='-', inline=True) + print_header(u' ', sep=u'.', inline=True, + width=self.options.output_columns) + print_header(u' ', sep='-', inline=True, + width=self.options.output_columns) if no_problems_found: print_header( u'*** No Problems Found While Running Tests ', - sep=u'*', inline=True + sep=u'*', inline=True, width=self.options.output_columns ) - print_header(u'', sep=u'=', inline=True) + print_header(u'', sep=u'=', inline=True, + width=self.options.output_columns) total = sum([passed, skipped, errors, failures]) print( '{0} (total={1}, skipped={2}, passed={3}, failures={4}, ' @@ -413,7 +533,8 @@ ) ) print_header( - ' Overall Tests Report ', sep='=', centered=True, inline=True + ' Overall Tests Report ', sep='=', centered=True, inline=True, + width=self.options.output_columns ) return @@ -442,20 +563,98 @@ ''' Run the tests suite in a Docker container ''' + def stop_running_docked_container(cid, signum=None, frame=None): + # Allow some time for the container to stop if it's going to be + # stopped by docker or any signals docker might have received + time.sleep(0.5) + + print_header('', inline=True, width=self.options.output_columns) + + # Let's check if, in fact, the container is stopped + scode_call = subprocess.Popen( + ['docker', 'inspect', '-format={{.State.Running}}', cid], + env=os.environ.copy(), + close_fds=True, + stdout=subprocess.PIPE + ) + scode_call.wait() + parsed_scode = scode_call.stdout.read().strip() + if parsed_scode != 'false': + # If the container is still running, let's make sure it + # properly stops + print(' * Making sure the container is stopped. CID:'), + sys.stdout.flush() + + stop_call = subprocess.Popen( + ['docker', 'stop', '--time=15', cid], + env=os.environ.copy(), + close_fds=True, + stdout=subprocess.PIPE + ) + stop_call.wait() + print(stop_call.stdout.read().strip()) + sys.stdout.flush() + time.sleep(0.5) + + # Let's get the container's exit code. We can't trust on Popen's + # returncode because it's not reporting the proper one? Still + # haven't narrowed it down why. + print(' * Container exit code:'), + sys.stdout.flush() + rcode_call = subprocess.Popen( + ['docker', 'inspect', '-format={{.State.ExitCode}}', cid], + env=os.environ.copy(), + close_fds=True, + stdout=subprocess.PIPE + ) + rcode_call.wait() + parsed_rcode = rcode_call.stdout.read().strip() + try: + returncode = int(parsed_rcode) + except ValueError: + returncode = -1 + print(parsed_rcode) + sys.stdout.flush() + + if self.options.docked_skip_delete is False and \ + (self.options.docked_skip_delete_on_errors is False or + (self.options.docked_skip_delete_on_error and + returncode == 0)): + print(' * Cleaning Up Temporary Docker Container. CID:'), + sys.stdout.flush() + cleanup_call = subprocess.Popen( + ['docker', 'rm', cid], + env=os.environ.copy(), + close_fds=True, + stdout=subprocess.PIPE + ) + cleanup_call.wait() + print(cleanup_call.stdout.read().strip()) + + if 'DOCKER_CIDFILE' not in os.environ: + # The CID file was not created "from the outside", so delete it + os.unlink(cidfile) + + print_header('', inline=True, width=self.options.output_columns) + # Finally, EXIT! + sys.exit(returncode) + # Let's start the Docker container and run the tests suite there if '/' not in self.options.docked: container = 'salttest/{0}'.format(self.options.docked) else: container = self.options.docked - calling_args = ['/salt-source/tests/runtests.py'] + calling_args = [self.options.docked_interpreter, + '/salt-source/tests/runtests.py'] for option in self._get_all_options(): if option.dest is None: # For example --version continue - if option.dest in ('docked', 'verbosity'): - # We don't need to pass the --docked argument inside the docker + if option.dest and (option.dest in ('verbosity',) or + option.dest.startswith('docked')): + # We don't need to pass any docker related arguments inside the # container, and verbose will be handled bellow continue @@ -493,16 +692,22 @@ '-{0}'.format('v' * (self.options.verbosity - 1)) ) - print_header( - 'Running the tests suite under the {0!r} docker container'.format( - container - ) - ) + print(' * Docker command: {0}'.format(' '.join(calling_args))) + print(' * Running the tests suite under the {0!r} docker ' + 'container. CID:'.format(container)), + sys.stdout.flush() - cidfile = tempfile.mktemp(prefix='docked-testsuite-', suffix='.cid') + cidfile = os.environ.get( + 'DOCKER_CIDFILE', + tempfile.mktemp(prefix='docked-testsuite-', suffix='.cid') + ) call = subprocess.Popen( ['docker', 'run', + #'--rm=true', Do not remove the container automatically, we need + # to get information back, even for stopped containers + '-t', # --tty but older versions don't support longopts + '-i', # --interactive=true, same as above '-v', '{0}:/salt-source'.format(self.source_code_basedir), '-w', @@ -515,16 +720,40 @@ 'LINES={0}'.format(HEIGHT), '-cidfile={0}'.format(cidfile), container, - ] + calling_args, + # We need to pass the runtests.py arguments as a single string so + # that the start-me-up.sh script can handle them properly + ' '.join(calling_args), + ], env=os.environ.copy(), close_fds=True, ) - signalled = terminating = exiting = False + cid = None + cid_printed = terminating = exiting = False + signal_handler_installed = signalled = False + + time.sleep(0.25) while True: try: time.sleep(0.15) + if cid_printed is False: + with closing(open(cidfile)) as cidfile_fd: + cid = cidfile_fd.read() + if cid: + print(cid) + sys.stdout.flush() + cid_printed = True + # Install our signal handler to properly shutdown + # the docker container + for sig in (signal.SIGTERM, signal.SIGINT, + signal.SIGHUP, signal.SIGQUIT): + signal.signal( + sig, + partial(stop_running_docked_container, cid) + ) + signal_handler_installed = True + if exiting: break elif terminating and not exiting: @@ -537,7 +766,7 @@ else: call.poll() if call.returncode is not None: - # Finshed + # Finished break except KeyboardInterrupt: print('Caught CTRL-C, exiting...') @@ -545,23 +774,16 @@ call.send_signal(signal.SIGINT) call.wait() - time.sleep(2) - - print_header('', inline=True) - print(' Cleaning Up Temporary Docker Container:'), - sys.stdout.flush() - cleanup_call = subprocess.Popen( - ['docker', 'rm', open(cidfile).read().strip()], - env=os.environ.copy(), - close_fds=True, - stdout=subprocess.PIPE - ) - os.unlink(cidfile) - cleanup_call.wait() - print(cleanup_call.stdout.read().strip()) - print_header('', inline=True) + time.sleep(0.25) - self.exit(call.returncode) + # Finish up + if signal_handler_installed: + stop_running_docked_container( + cid, + signum=(signal.SIGINT if signalled else WEIRD_SIGNAL_NUM) + ) + else: + sys.exit(call.returncode) class SaltTestcaseParser(SaltTestingParser): @@ -593,7 +815,8 @@ if not isinstance(testcase, list): header = '{0} Tests'.format(testcase.__name__) - print_header('Starting {0}'.format(header)) + print_header('Starting {0}'.format(header), + width=self.options.output_columns) runner = TextTestRunner( verbosity=self.options.verbosity).run(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/salttesting/pylintplugins/flask_sqlalchemy_transform.py new/SaltTesting-2014.4.24/salttesting/pylintplugins/flask_sqlalchemy_transform.py --- old/SaltTesting-0.5.4/salttesting/pylintplugins/flask_sqlalchemy_transform.py 1970-01-01 01:00:00.000000000 +0100 +++ new/SaltTesting-2014.4.24/salttesting/pylintplugins/flask_sqlalchemy_transform.py 2014-01-06 17:18:17.000000000 +0100 @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +''' + :codeauthor: :email:`Pedro Algarvio (pedro(a)algarvio.me)` + :copyright: © 2014 by the SaltStack Team, see AUTHORS for more details. + :license: Apache 2.0, see LICENSE for more details. + + + pylint_helpers + ~~~~~~~~~~~~~~ + + Help PyLint understand some of this projects parts +''' + +from astroid import MANAGER +from astroid import nodes +from astroid.builder import AstroidBuilder + + +def flask_sqlalchemy_transform(module): + if module.name != 'flask_sqlalchemy': + return + + import flask_sqlalchemy + flask_sqlalchemy._include_sqlalchemy(flask_sqlalchemy.SQLAlchemy) + + fake = AstroidBuilder(MANAGER).inspect_build(flask_sqlalchemy) + + for func_name, func in fake.locals.items(): + if func_name == 'SQLAlchemy': + func[0].Model = fake.locals['Model'][0] + module.locals[func_name] = func + + +def register(linter): + ''' + Allow this to be setup when loading the plugins + ''' + MANAGER.register_transform(nodes.Module, flask_sqlalchemy_transform) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/salttesting/pylintplugins/pep8.py new/SaltTesting-2014.4.24/salttesting/pylintplugins/pep8.py --- old/SaltTesting-0.5.4/salttesting/pylintplugins/pep8.py 2014-01-02 12:03:08.000000000 +0100 +++ new/SaltTesting-2014.4.24/salttesting/pylintplugins/pep8.py 2014-04-15 10:37:43.000000000 +0200 @@ -99,6 +99,11 @@ # Log warning?? continue + if code == 'E113': + if _PROCESSED_NODES[node.path].lines[lineno-1].strip().startswith('#'): + # If E113 is triggered in comments, which I consider a bug, + # skip it. See https://github.com/jcrocholl/pep8/issues/274 + continue self.add_message(pylintcode, line=lineno, args=code) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/salttesting/pylintplugins/strings.py new/SaltTesting-2014.4.24/salttesting/pylintplugins/strings.py --- old/SaltTesting-0.5.4/salttesting/pylintplugins/strings.py 2014-01-02 12:03:08.000000000 +0100 +++ new/SaltTesting-2014.4.24/salttesting/pylintplugins/strings.py 2014-01-12 22:17:08.000000000 +0100 @@ -12,7 +12,11 @@ ''' import sys -from logilab import astng +try: + # >= pylint 1.0 + import astroid +except ImportError: # pylint < 1.0 + from logilab import astng as astroid from pylint.checkers import utils from pylint.checkers import BaseChecker from pylint.checkers.utils import check_messages @@ -54,10 +58,10 @@ @check_messages(*(MSGS.keys())) def visit_callfunc(self, node): func = utils.safe_infer(node.func) - if isinstance(func, astng.BoundMethod) and func.name == 'format': + if isinstance(func, astroid.BoundMethod) and func.name == 'format': # If there's a .format() call, run the code below - if isinstance(node.func.expr, astng.Name): + if isinstance(node.func.expr, astroid.Name): # This is for: # foo = 'Foo {} bar' # print(foo.format(blah) @@ -80,7 +84,7 @@ # If it does not have an value attribute, it's not worth # checking return - elif isinstance(node.func.expr.value, astng.Name): + elif isinstance(node.func.expr.value, astroid.Name): # No need to check these either return elif '{}' in node.func.expr.value: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/salttesting/unit.py new/SaltTesting-2014.4.24/salttesting/unit.py --- old/SaltTesting-0.5.4/salttesting/unit.py 2014-01-02 12:03:08.000000000 +0100 +++ new/SaltTesting-2014.4.24/salttesting/unit.py 2014-02-06 20:12:42.000000000 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' :codeauthor: :email:`Pedro Algarvio (pedro(a)algarvio.me)` - :copyright: © 2013 by the SaltStack Team, see AUTHORS for more details. + :copyright: © 2013-2014 by the SaltStack Team, see AUTHORS for more details :license: Apache 2.0, see LICENSE for more details. @@ -11,20 +11,26 @@ Unit test related functions ''' +# Import python libs import sys +import logging + # support python < 2.7 via unittest2 if sys.version_info < (2, 7): try: from unittest2 import ( TestLoader as _TestLoader, - TextTestRunner as _TextTestRunner, + TextTestRunner as __TextTestRunner, TestCase as __TestCase, expectedFailure, TestSuite as _TestSuite, + skip, skipIf, TestResult as _TestResult, + TextTestResult as __TextTestResult ) + from unittest2.case import _id class NewStyleClassMixin(object): ''' @@ -38,7 +44,7 @@ class TestLoader(_TestLoader, NewStyleClassMixin): pass - class TextTestRunner(_TextTestRunner, NewStyleClassMixin): + class _TextTestRunner(__TextTestRunner, NewStyleClassMixin): pass class _TestCase(__TestCase, NewStyleClassMixin): @@ -50,18 +56,25 @@ class TestResult(_TestResult, NewStyleClassMixin): pass + class _TextTestResult(__TextTestResult, NewStyleClassMixin): + pass + + except ImportError: raise SystemExit('You need to install unittest2 to run the salt tests') else: from unittest import ( TestLoader, - TextTestRunner, + TextTestRunner as _TextTestRunner, TestCase as _TestCase, expectedFailure, TestSuite, + skip, skipIf, TestResult, + TextTestResult as _TextTestResult ) + from unittest.case import _id class TestCase(_TestCase): @@ -133,6 +146,31 @@ return _TestCase.failIfAlmostEqual(self, *args, **kwargs) +class TextTestResult(_TextTestResult): + ''' + Custom TestResult class whith logs the start and the end of a test + ''' + + def startTest(self, test): + logging.getLogger(__name__).debug( + '>>>>> START >>>>> {0}'.format(test.id()) + ) + return super(TextTestResult, self).startTest(test) + + def stopTest(self, test): + logging.getLogger(__name__).debug( + '<<<<< END <<<<<<< {0}'.format(test.id()) + ) + return super(TextTestResult, self).stopTest(test) + + +class TextTestRunner(_TextTestRunner): + ''' + Custom Text tests runner to log the start and the end of a test case + ''' + resultclass = TextTestResult + + __all__ = [ 'TestLoader', 'TextTestRunner', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/salttesting/version.py new/SaltTesting-2014.4.24/salttesting/version.py --- old/SaltTesting-0.5.4/salttesting/version.py 2014-01-02 12:09:13.000000000 +0100 +++ new/SaltTesting-2014.4.24/salttesting/version.py 2014-04-24 14:02:39.000000000 +0200 @@ -8,5 +8,5 @@ :license: Apache 2.0, see LICENSE for more details. ''' -__version_info__ = (0, 5, 4) +__version_info__ = (2014, 4, 24) __version__ = '.'.join(map(str, __version_info__)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/salttesting/xmlunit.py new/SaltTesting-2014.4.24/salttesting/xmlunit.py --- old/SaltTesting-0.5.4/salttesting/xmlunit.py 1970-01-01 01:00:00.000000000 +0100 +++ new/SaltTesting-2014.4.24/salttesting/xmlunit.py 2014-02-09 03:01:05.000000000 +0100 @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +''' + :codeauthor: :email:`Pedro Algarvio (pedro(a)algarvio.me)` + :copyright: © 2014 by the SaltStack Team, see AUTHORS for more details. + :license: Apache 2.0, see LICENSE for more details. + + + salttesting.xmlunit + ~~~~~~~~~~~~~~~~~~~ + + XML Unit Tests +''' + +# Import python libs +import logging + +try: + import xmlrunner + HAS_XMLRUNNER = True + + class _XMLTestResult(xmlrunner._XMLTestResult): + def startTest(self, test): + logging.getLogger(__name__).debug( + '>>>>> START >>>>> {0}'.format(test.id()) + ) + # xmlrunner classes are NOT new-style classes + return xmlrunner._XMLTestResult.startTest(self, test) + + def stopTest(self, test): + logging.getLogger(__name__).debug( + '<<<<< END <<<<<<< {0}'.format(test.id()) + ) + # xmlrunner classes are NOT new-style classes + return xmlrunner._XMLTestResult.stopTest(self, test) + + class XMLTestRunner(xmlrunner.XMLTestRunner): + def _make_result(self): + return _XMLTestResult( + self.stream, + self.descriptions, + self.verbosity, + self.elapsed_times + ) + + def run(self, test): + result = xmlrunner.XMLTestRunner.run(self, test) + self.stream.writeln('Finished generating XML reports') + return result + +except ImportError: + HAS_XMLRUNNER = False + + class XMLTestRunner(object): + ''' + This is a dumb class just so we don't break projects at import time + ''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SaltTesting-0.5.4/setup.py new/SaltTesting-2014.4.24/setup.py --- old/SaltTesting-0.5.4/setup.py 2013-11-12 06:14:36.000000000 +0100 +++ new/SaltTesting-2014.4.24/setup.py 2014-01-02 12:19:55.000000000 +0100 @@ -48,7 +48,7 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', - 'Development Status :: 3 - Alpha', + 'Development Status :: 4 - Beta', 'Environment :: Console', 'Intended Audience :: Developers', 'Intended Audience :: Information Technology', -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-oslo.rootwrap for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package python-oslo.rootwrap for openSUSE:Factory checked in at 2014-05-02 14:02:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.rootwrap (Old) and /work/SRC/openSUSE:Factory/.python-oslo.rootwrap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.rootwrap" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.rootwrap/python-oslo.rootwrap.changes 2014-03-30 12:25:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.rootwrap.new/python-oslo.rootwrap.changes 2014-05-02 14:02:59.000000000 +0200 @@ -2 +2 @@ -Mon Mar 24 16:41:43 UTC 2014 - dmueller(a)suse.com +Wed Apr 9 11:04:12 UTC 2014 - dmueller(a)suse.com @@ -4 +4,11 @@ -- reduce requires +- update to 1.2.0: + * Avoid matching ip -s netns exec in IpFilter + * Don't use system pip things in tox + * Add Python 3 trove classifiers + * To honor RFC5424 add use_syslog_rfc_format config option + * Trivial changes from oslo-incubator + +------------------------------------------------------------------- +Mon Mar 24 16:56:23 UTC 2014 - dmueller(a)suse.com + +- reduce test requires Old: ---- oslo.rootwrap-1.1.0.tar.gz New: ---- oslo.rootwrap-1.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.rootwrap.spec ++++++ --- /var/tmp/diff_new_pack.pFGaPL/_old 2014-05-02 14:02:59.000000000 +0200 +++ /var/tmp/diff_new_pack.pFGaPL/_new 2014-05-02 14:02:59.000000000 +0200 @@ -18,7 +18,7 @@ %define component oslo Name: python-oslo.rootwrap -Version: 1.1.0 +Version: 1.2.0 Release: 0 Url: https://launchpad.net/oslo/ Summary: OpenStack RootWrap ++++++ oslo.rootwrap-1.1.0.tar.gz -> oslo.rootwrap-1.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/AUTHORS new/oslo.rootwrap-1.2.0/AUTHORS --- old/oslo.rootwrap-1.1.0/AUTHORS 2014-01-28 22:01:06.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/AUTHORS 2014-03-24 17:09:38.000000000 +0100 @@ -1,15 +1 @@ -Davanum Srinivas <dims(a)linux.vnet.ibm.com> -Dina Belova <dbelova(a)mirantis.com> -Dirk Mueller <dirk(a)dmllr.de> -Julien Danjou <julien(a)danjou.info> -Mark McClain <mark.mcclain(a)dreamhost.com> -Mark McLoughlin <markmc(a)redhat.com> -Maru Newby <marun(a)redhat.com> -Monty Taylor <mordred(a)inaugust.com> -Roman Podolyaka <rpodolyaka(a)mirantis.com> -Sergey Kraynev <skraynev(a)mirantis.com> -Sergey Lukjanov <slukjanov(a)mirantis.com> -Stanislav Kudriashev <skudriashev(a)griddynamics.com> -Thierry Carrez <thierry(a)openstack.org> -Yufang Zhang <zhangyufang(a)360.cn> -Zhongyue Luo <zhongyue.nah(a)intel.com> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/ChangeLog new/oslo.rootwrap-1.2.0/ChangeLog --- old/oslo.rootwrap-1.1.0/ChangeLog 2014-01-28 22:01:06.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/ChangeLog 2014-03-24 17:09:38.000000000 +0100 @@ -1,503 +1,58 @@ -commit 42255ccae8f96a906547a20a62eeea6eb4ddb855 -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Fri Jan 24 15:07:22 2014 -0700 +CHANGES +======= - Discontinue usage of oslo-rootwrap - - Rootwrap should be used from specific console_scripts calling into - oslo.rootwrap.cmd:main, rather than using the specific oslo-rootwrap - wrapper. This matches how nova and cinder now consume oslo.rootwrap, - and ensures a smooth upgrade path. - - This change aligns the documentation and shipped files to match how - oslo.rootwrap should be used now. - - Change-Id: If01b8840c971d1c6d5c88c7698f5d6a2bf8fd5f0 +1.2.0 +----- -commit 6c8c432e1f5388998b608080741e537fe615d0c9 -Merge: 4c499d3 79b4316 -Author: Jenkins <jenkins(a)review.openstack.org> -Date: Mon Jan 27 20:16:13 2014 +0000 - - Merge "Fix spelling errors in comments" - -commit 4c499d366429f68ff29c7a2f93553b06f3697405 -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Fri Jan 10 15:38:07 2014 +0100 - - Add missing oslo/__init__.py - - Add the missing oslo/__init__.py, since its absence seems to prevent - devstack's setup.py-develop-from-git install of oslo.rootwrap from - operating correctly. - - Change-Id: I861ae7024554a8ba9b046c1048eccf1bcea69100 - -commit 79b4316942eeb98b7beb2f3d85e7c2f1a363ff27 -Author: Stanislav Kudriashev <skudriashev(a)griddynamics.com> -Date: Fri Dec 27 13:40:35 2013 +0200 - - Fix spelling errors in comments - - Change-Id: Icc8f26d8df00e52ef10781c91071356daa799afa - -commit d9edf600e7a4cd91237d2ae8cb584f1b1f1e767d -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Tue Dec 3 15:51:57 2013 +0100 - - Use oslo-rootwrap in config directory names - - Use oslo-rootwrap rather than oslo.rootwrap in directory names - (/etc/oslo-rootwrap and /usr/share/oslo-rootwrap), as suggested by - Chuck. Since this package is actually consumed through its binary - (oslo-rootwrap) rather than its library (oslo.rootwrap), this is - probably more appropriate. - - Change-Id: I0e249d70937307b5fe116750923c20d487506c97 - -commit b94ef1a017c0925ed3c33682d33617729b3f6bce -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Mon Dec 2 16:01:16 2013 +0100 - - Ship with etc/oslo.rootwrap instead of etc/oslo - - Ship default configuration file in etc/oslo.rootwrap to encourage best - packaging practices (packagers should deploy rootwrap.conf in - /etc/oslo.rootwrap rather than /etc/oslo/rootwrap or /etc/oslo). - - Also change default filters_path directory from - /etc/oslo.rootwrap/rootwrap.d to /etc/oslo.rootwrap/filters.d - as it avoids redundancy and is more self-explanatory. - - Change-Id: Iadf623571283cba1886bb27a5f55c59ba66c522f - -commit 25cc501f21828620a10dd01ad658febac8dbea7f -Merge: 9238c61 7effec0 -Author: Jenkins <jenkins(a)review.openstack.org> -Date: Mon Dec 2 13:35:41 2013 +0000 - - Merge "Add a complete README.rst" - -commit 7effec053445f52a520002ed9445980bf39d6bcd -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Wed Nov 27 15:17:52 2013 +0100 - - Add a complete README.rst - - Document the use of oslo-rootwrap in README.rst, before cutting - a first release. - - This obsoletes https://wiki.openstack.org/wiki/Rootwrap - - Change-Id: Ia7046e5a3c4b5ebdbc1a2d978cb6c6a9e4c69514 - -commit 9238c618fe4483e3aae634d99fcce2e958530eae -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Wed Nov 27 15:22:57 2013 +0100 - - Add .gitreview for oslo.rootwrap - - Add missing .gitreview for newly-created oslo.rootwrap repo. - - Change-Id: If41bcfe7fd28f0fc1fff4659afb58de4d3ec54ba - -commit fe258e097fbd1f6a1a06fb6ac31d4b338c6d6eca -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Thu Nov 21 15:18:25 2013 +0100 - - Add standalone project packaging support files - - Add Python packaging support files so that rootwrap can stand on its - own. - -commit d7f323271d7b14f1f912ca6c8736fd6786c4f189 -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Thu Nov 21 15:09:34 2013 +0100 - - Make Rootwrap python3-compatible - - cmd.py was still using ConfigParser, changed this to use - six.moves.configparser instead (like in wrapper.py). - -commit d2e833795da1e6b8e1ea9fae800d7236227944a4 -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Thu Nov 21 14:58:19 2013 +0100 - - Make tests not depend on openstack.common stuff - - Tests used to be run within oslo-incubator and therefore reused most of - the facilities there. Now that rootwrap is standalone, it's better if - its tests could run standalone as well. They didn't really need the - extra features anyway. - -commit 1cf9be7c5937d0323399a03ee7cede327841c274 -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Mon Nov 18 17:33:58 2013 +0100 - - Move files to new locations for oslo-config - -commit 59584649708b16f6b35ad19ea892105e8f59fb4b -Author: Dirk Mueller <dirk(a)dmllr.de> -Date: Thu Sep 19 21:56:24 2013 +0200 - - Skip hidden files while traversion rootwrap filters - - Hidden files are usually leftovers (like .e.g. .filter.conf~), - don't handle them. - - Change-Id: I194341dfd33632fb8a2e8db89cf74fb79d6aa318 - -commit 202a8cec01c3d00244554eb42707ef965f3a21b6 -Author: Davanum Srinivas <dims(a)linux.vnet.ibm.com> -Date: Thu Sep 5 23:12:46 2013 -0400 - - Fix os.getlogin() problem with no tty - - Catch OSError(s) from os.getlogin() and fall back to looking at - environment variables to figure out the user's name. The OSError - is thrown where there is no tty for the python process when - os.getlogin() is called. - - Fixes LP: 1221491 - - Change-Id: Id6634921cdf0deb77cf32a5b9101ec475946aa81 - -commit 5389e69bb0079b695863450f7f9f3928b1f3cb9a -Author: Maru Newby <marun(a)redhat.com> -Date: Sun Sep 1 19:13:53 2013 +0000 - - Send rootwrap exit error message to stderr - - Closes-Bug: #1219530 - Change-Id: Icc2216ddb4611d8a50fc351f9117090c68c6a89e - -commit b5d75e61a000a028bc13618b3cb8776c8609766d -Author: Julien Danjou <julien(a)danjou.info> -Date: Mon Jul 29 17:05:49 2013 +0200 - - rootwrap: improve Python 3 compatibility - - Change-Id: I83a7aa7e7ebecb287b0f25e5bf510c10779c4ddf - -commit 837849a2db5d10df2b298e3a3cbf43f29fcfd0c4 -Author: Sergey Kraynev <skraynev(a)mirantis.com> -Date: Mon Aug 19 02:31:59 2013 -0400 - - Replace using tests.utils part2 - - It is the second step to replace using tests.utils with - stack.common.test. - In this patch second part of tests is changed for using - openstack.common.test and added needed fixtures in test classes. - - Change-Id: I81e3ff41827f7153b650255e219ce25cb282507b - bp: common-unit-tests - -commit f9857d912bf8f564c909e0b2e2d7186d393bd8d4 -Author: Zhongyue Luo <zhongyue.nah(a)intel.com> -Date: Tue Aug 13 20:13:39 2013 +0800 - - Fixes files with wrong bitmode - - Some modules have bitmode 755. Changed to 644 - - Change-Id: I2084779186fcbd5ee2010451531355a0c67897f5 - -commit c1b1e30ba3da6931f993c27c3c1a84b8c146650b -Author: Dirk Mueller <dirk(a)dmllr.de> -Date: Tue Jul 2 09:28:27 2013 +0200 - - Remove DnsmasqFilter and DeprecatedDnsmasqFilter - - EnvFilter supersedes both, so remove them as all - usages have been converted to EnvFilter. - - Change-Id: I5acb0c924815caae1f96ed2fa6ee8b1f7ed93cf4 - -commit fc41c56f2f6f65f155e3a0ef0335975cb75d8b11 -Author: Dirk Mueller <dirk(a)dmllr.de> -Date: Tue Jun 11 18:25:20 2013 +0200 - - Handle empty arglists in Filters - - The various filters either asserted or incorrectly - assumed that an empty arglist matched the filter. - Add testcases to avoid regressions. - - Change-Id: If90fbad3d54749ecc645071675402ea2613870a2 - -commit 422081c74e2228a7c3e759b9844c10251f55b0af -Author: Dirk Mueller <dirk(a)dmllr.de> -Date: Tue Jun 18 19:37:34 2013 +0200 - - Handle empty PATH environment variable - - In locked down environments, PATH might be unavailable - when running rootwrap. - - Change-Id: Ia55514a7d69ab26c2bcf5d1839da1d36aaf46ebc - -commit f60944e404155eb13a28c7c33b70366be452674b -Author: Dirk Mueller <dirk(a)dmllr.de> -Date: Wed Jun 19 00:08:57 2013 +0200 - - Add IpFilter, IPNetnsExecFilter and EnvFilter - - These filters have been implemented in Quantum before: - - - IpFilter provides support for filtering ip commands - - IpNetnsExecFilter is a chaining command filter that - verifies that the command to be executed by ip netns exec - is covered by other established filters. - - IpNetnsExecFilter has been restricted to ensure that the - filter chains have all matching filters run as the same - user. - - EnvFilter is a new filter derived from CommandFilter - that allows a Command to be optionally prefixed by "env" - and a specific list of environment variables. - - This is intended to replace the specific DnsmasqFilter - and DnsmasqNetnsFilter in the future when all consumers - have been updated. - - Implements bp rootwrap-quantum-features - - Change-Id: I0cf39967126e99a8dc53d21bee824a0fe2f63aa0 - -commit 7cbcbb6c9a41529a0eee7e0c8935d2f7945126a1 -Author: Dirk Mueller <dirk(a)dmllr.de> -Date: Sat May 18 12:17:59 2013 +0200 - - Handle relative path arguments in Killfilter - - KillFilter currently expects an absolute path - to be specified for the process name to kill. This - is inconvenient when the exact location of the running - binary is not known or differs accross installs. - - Extend KillFilter to accept also commands in $PATH - to be killed if the given argument is not absolute. - - Change-Id: I6b90206b587ff3f949af2c256a78ca21af31867a - -commit 271796b2666d7e336a12f5ee3d132ec9e5c00e4e -Author: Dina Belova <dbelova(a)mirantis.com> -Date: Mon Jun 3 17:44:55 2013 +0400 - - Enable hacking H404 test. - - H404 - multi line docstring should start with a summary. - - Change-Id: I2099e1ee81ff9657f7a07401b8e8f3327d03bdbd - -commit d24fd1a62159655cd1104be90fcff8a57e77952e -Author: Sergey Lukjanov <slukjanov(a)mirantis.com> -Date: Sun Jun 2 20:41:20 2013 +0400 - - Enable hacking H402 test - - H402 one line docstring needs punctuation - - Change-Id: Ie848453cace318d8310cdf0234c512f4c1121119 - -commit 04a7cd0a4f3d7fdb7c9ee4d457bb63d1b7adb81c -Author: Yufang Zhang <zhangyufang(a)360.cn> -Date: Tue May 14 14:58:19 2013 +0800 - - Update KillFilter to stop at '\0' for readlink() function. - - Python's readlink() implementation doesn't stop at '\0' when reading - file path. Thus after dnsmasq upgrade, it may return something like - '/usr/sbin/dnsmasq\03453 (deleted)', while C's or Shell's readlink() - return '/usr/sbin/dnsmasq'. This patch fixes this problem by cutting - the readlink() results with '\0', so that KillFilter could get correct - path. - - Bug 1179793 - - Change-Id: I7354941e0508e019c8c9b63b87ad39f52ccb51ca - -commit 93b19d03c4aa244ab5b759dc0a5d4280b5288bc4 -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Thu May 9 15:10:56 2013 +0200 - - Stylistic improvements from quantum-rootwrap - - As part of the convergence effort between oslo-rootwrap and - quantum-rootwrap, import stylistic improvements introduced - in quantum-rootwrap, like: - - - HACKING-compliant docstrings - - More elegant return construct from match_filter in filters.py - - Remove overridden use of filters in wrapper.py - - Change-Id: I49a97271b1c385feb25adf4f62add5c71962b5dd - -commit 402e6d594671c8aee72c4e2dc572e0bf90a66786 -Author: Mark McLoughlin <markmc(a)redhat.com> -Date: Mon Apr 22 14:55:51 2013 +0100 - - Use print_function __future__ import - - Rather than continuing to use the old print statement, use the actual - print function introduced in python 2.6. See: - - http://docs.python.org/2/whatsnew/2.6.html#pep-3105-print-as-a-function - - Change-Id: I059d982d60e13f13e1caf49509c0fe0b18eda723 - -commit 22285ff58af96a4c986156da7304b8655c48c0c6 -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Mon Apr 22 15:35:19 2013 +0200 - - Revert common logging use in rootwrap - - Revert recent plug of common logging into rootwrap, as it breaks - rootwrap logging. Rootwrap does not make use of oslo logging and oslo - config in order to reduce the surface of code run as root. - - See https://review.openstack.org/#/c/26468/ for discussion. - - Change-Id: I276ade164a902d091f9aafab79bbd4cc189588eb - -commit 8395d37f73cb43f795f4493c1d800f334386fc3c -Author: Dirk Mueller <dirk(a)dmllr.de> -Date: Mon Apr 22 03:42:48 2013 +0200 - - Improve Python 3.x compatibility - - Mechanical translation of deprecated constructs - to 3.x compatible variants. - - Change-Id: I4988d0ac656903e0d0320aaa8361d4eeb774a0f9 - -commit 97e0c9effb734b0d0b43712c64f50bc9c970bb8d -Author: Zhongyue Luo <zhongyue.nah(a)intel.com> -Date: Tue Apr 9 13:40:26 2013 +0800 - - Replaces standard logging with common logging - - Common modules can now safely import other common modules - since update.py will automatically install dependencies. - - Change-Id: I0ad12d7e6e623657c40659aca4148439cd03d3fa - -commit 4b7825d576669b9f4adc4438f50e3dd45f4f6c41 -Author: Monty Taylor <mordred(a)inaugust.com> -Date: Wed Apr 3 11:20:33 2013 -0400 - - Move bin/ scripts to entrypoints. - - Instead of propogating more bin scripts, migrate these to be things - that can be consumed as entrypoints. - - Change-Id: Ic01e0f16fe9e7634708fbb51499ccea3f4f40d63 - -commit deb51b0412c340cdd149a9d6f5db5b5835af683f -Author: Roman Podolyaka <rpodolyaka(a)mirantis.com> -Date: Fri Mar 29 23:05:52 2013 +0200 - - Add PathFilter to rootwrap. - - PathFilter is a type of filter that allows to check - if path arguments of a command resolve to file system - paths within given directories. - - Fixes bug 1098568. - - Change-Id: Ie2686ad2ff114075c6d8d804031b6e3fa60a43ca - -commit 69d562f8095bd555df391d674ab436137d1c8c52 -Author: Mark McClain <mark.mcclain(a)dreamhost.com> -Date: Wed Mar 13 14:52:43 2013 -0400 - - update OpenStack, LLC to OpenStack Foundation - - fixes bug 1154745 - - The previous update (https://review.openstack.org/#/c/24103/) missed - header files that contained "OpenStack, LLC". This change corrects the - missed files to reflect the OpenStack Foundation. - - Change-Id: I9c6de265267485ef2c82ea7e6d8643e82134d102 - -commit a97cc5817b1a0b82424b36e492415b3f88ae8b02 -Author: Davanum Srinivas <dims(a)linux.vnet.ibm.com> -Date: Mon Mar 11 14:49:31 2013 -0400 - - Fix Copyright Headers - Rename LLC to Foundation - - One code change, rest are in headers - - Change-Id: I73f59681358629e1ad74e49d3d3ca13fcb5c2eb1 - -commit f14b0c999d70c85441b6d5f7484de6e1d0c115ea -Author: Monty Taylor <mordred(a)inaugust.com> -Date: Wed Jan 23 02:48:21 2013 -0500 - - Replaced direct usage of stubout with BaseTestCase. - - BaseTestCase properly hooks stubout into fixtures. Just use that. - - Part of blueprint grizzly-testtools. - - Change-Id: I4bf6b92b9b16d051d8c6ecaf52cf70925848ed8c - -commit b2a29c0a5056fbfbaa7094e9ad6bf8ace1841af6 -Author: Monty Taylor <mordred(a)inaugust.com> -Date: Tue Jan 22 19:54:57 2013 -0500 - - Use testtools as test base class. - - On the path to testr migration, we need to replace the unittest base classes - with testtools. - Replace tearDown with addCleanup, addCleanup is more resilient than tearDown. - The fixtures library has excellent support for managing and cleaning - tempfiles. Use it. - Replace skip_ with testtools.skipTest - - Part of blueprint grizzly-testtools. - - Change-Id: I45e11bbb1ff9b31f3278d3b016737dcb7850cd98 - -commit 0bfccbbc02c325a46ac45ca9b560fb202da48d25 -Author: Mark McLoughlin <markmc(a)redhat.com> -Date: Mon Jan 21 13:10:53 2013 +0000 - - Remove unused etc/openstack-common.conf.test - - This is unused since commit e0f57e92 removed the extensions module. - - Change-Id: Ia24d01c42fc9fb2e12eea697d217b30d7d6b2a51 - -commit cecd6480876238c0a985d86840e15b64beec1554 -Author: Monty Taylor <mordred(a)inaugust.com> -Date: Fri Jan 11 12:01:42 2013 +0100 - - Fix pep8 E125 errors. - - Caesar's wife must be above reproach. - - Change-Id: Iac85a57e71d403360f1567c07c8699057f0772fb - -commit 9bb74cba083aabf6e32f037a007db11ab1658eb3 -Author: Thierry Carrez <thierry(a)openstack.org> -Date: Wed Dec 19 14:06:12 2012 +0100 - - Move rootwrap code to openstack.common - - Copies current nova-rootwrap code to openstack.common, so that it - can be reused by Cinder and Quantum. - - Implements blueprint common-rootwrap. - - Before it can be used in projects, update.py needs to grow the - capability to deploy files in bin/ and etc/, as well as replacing - a placeholder text by the destination project name in source files - and binary names. - - In this proposed version, the placeholder text is "oslo". - - Change-Id: I8655d5b3cccacd1cc2225aa539339fb478615422 \ No newline at end of file +* Avoid matching ip -s netns exec in IpFilter +* Don't use system pip things in tox +* Add Python 3 trove classifiers +* To honor RFC5424 add use_syslog_rfc_format config option +* Trivial changes from oslo-incubator + +1.1.0 +----- + +* Discontinue usage of oslo-rootwrap +* Add missing oslo/__init__.py +* Fix spelling errors in comments + +1.0.0 +----- + +* Use oslo-rootwrap in config directory names +* Ship with etc/oslo.rootwrap instead of etc/oslo +* Add a complete README.rst +* Add .gitreview for oslo.rootwrap +* Add standalone project packaging support files +* Make Rootwrap python3-compatible +* Make tests not depend on openstack.common stuff +* Move files to new locations for oslo-config +* Skip hidden files while traversion rootwrap filters +* Fix os.getlogin() problem with no tty +* Send rootwrap exit error message to stderr +* rootwrap: improve Python 3 compatibility +* Replace using tests.utils part2 +* Fixes files with wrong bitmode +* Remove DnsmasqFilter and DeprecatedDnsmasqFilter +* Handle empty arglists in Filters +* Handle empty PATH environment variable +* Add IpFilter, IPNetnsExecFilter and EnvFilter +* Handle relative path arguments in Killfilter +* Enable hacking H404 test +* Enable hacking H402 test +* Update KillFilter to stop at '\0' for readlink() function +* Stylistic improvements from quantum-rootwrap +* Use print_function __future__ import +* Revert common logging use in rootwrap +* Improve Python 3.x compatibility +* Replaces standard logging with common logging +* Move bin/ scripts to entrypoints +* Add PathFilter to rootwrap +* update OpenStack, LLC to OpenStack Foundation +* Fix Copyright Headers - Rename LLC to Foundation +* Replaced direct usage of stubout with BaseTestCase +* Use testtools as test base class +* Remove unused etc/openstack-common.conf.test +* Fix pep8 E125 errors +* Move rootwrap code to openstack.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/PKG-INFO new/oslo.rootwrap-1.2.0/PKG-INFO --- old/oslo.rootwrap-1.1.0/PKG-INFO 2014-01-28 22:01:06.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/PKG-INFO 2014-03-24 17:09:38.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.rootwrap -Version: 1.1.0 +Version: 1.2.0 Summary: Oslo Rootwrap Home-page: https://launchpad.net/oslo Author: OpenStack @@ -111,6 +111,11 @@ Enable logging to syslog. Default value is False. Example: ``use_syslog=True`` + use_syslog_rfc_format + Enable RFC5424 compliant format for syslog (add APP-NAME before MSG part). + Default value is False. Example: + ``use_syslog_rfc_format=True`` + syslog_log_facility Which syslog facility to use for syslog logging. Valid values include `auth`, `authpriv`, `syslog`, `user0`, `user1`... @@ -298,3 +303,5 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/README.rst new/oslo.rootwrap-1.2.0/README.rst --- old/oslo.rootwrap-1.1.0/README.rst 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/README.rst 2014-03-24 17:09:14.000000000 +0100 @@ -103,6 +103,11 @@ Enable logging to syslog. Default value is False. Example: ``use_syslog=True`` +use_syslog_rfc_format + Enable RFC5424 compliant format for syslog (add APP-NAME before MSG part). + Default value is False. Example: + ``use_syslog_rfc_format=True`` + syslog_log_facility Which syslog facility to use for syslog logging. Valid values include `auth`, `authpriv`, `syslog`, `user0`, `user1`... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/etc/rootwrap.conf.sample new/oslo.rootwrap-1.2.0/etc/rootwrap.conf.sample --- old/oslo.rootwrap-1.1.0/etc/rootwrap.conf.sample 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/etc/rootwrap.conf.sample 2014-03-24 17:09:14.000000000 +0100 @@ -16,6 +16,11 @@ # Default value is False use_syslog=False +# Enable RFC5424 compliant format for syslog (add APP-NAME before MSG part) +# Default value is False - no format changes +# TODO(bogdando) remove or use True after existing syslog format deprecation in J +use_syslog_rfc_format=False + # Which syslog facility to use. # Valid values include auth, authpriv, syslog, user0, user1... # Default value is 'syslog' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/oslo/rootwrap/__init__.py new/oslo.rootwrap-1.2.0/oslo/rootwrap/__init__.py --- old/oslo.rootwrap-1.1.0/oslo/rootwrap/__init__.py 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/oslo/rootwrap/__init__.py 2014-03-24 17:09:14.000000000 +0100 @@ -1,16 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright (c) 2011 OpenStack Foundation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/oslo/rootwrap/cmd.py new/oslo.rootwrap-1.2.0/oslo/rootwrap/cmd.py --- old/oslo.rootwrap-1.1.0/oslo/rootwrap/cmd.py 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/oslo/rootwrap/cmd.py 2014-03-24 17:09:14.000000000 +0100 @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation. # All Rights Reserved. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/oslo/rootwrap/filters.py new/oslo.rootwrap-1.2.0/oslo/rootwrap/filters.py --- old/oslo.rootwrap-1.1.0/oslo/rootwrap/filters.py 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/oslo/rootwrap/filters.py 2014-03-24 17:09:14.000000000 +0100 @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation. # All Rights Reserved. # @@ -210,8 +208,10 @@ def match(self, userargs): if userargs[0] == 'ip': - if userargs[1] == 'netns': - return (userargs[2] in ('list', 'add', 'delete')) + # Avoid the 'netns exec' command here + for a, b in zip(userargs[1:], userargs[2:]): + if a == 'netns': + return (b != 'exec') else: return True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/oslo/rootwrap/wrapper.py new/oslo.rootwrap-1.2.0/oslo/rootwrap/wrapper.py --- old/oslo.rootwrap-1.1.0/oslo/rootwrap/wrapper.py 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/oslo/rootwrap/wrapper.py 2014-03-24 17:09:14.000000000 +0100 @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation. # All Rights Reserved. # @@ -15,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. - import logging import logging.handlers import os @@ -81,6 +78,13 @@ else: self.use_syslog = False + # use_syslog_rfc_format + if config.has_option("DEFAULT", "use_syslog_rfc_format"): + self.use_syslog_rfc_format = config.getboolean( + "DEFAULT", "use_syslog_rfc_format") + else: + self.use_syslog_rfc_format = False + def setup_syslog(execname, facility, level): rootwrap_logger = logging.getLogger() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/oslo.rootwrap.egg-info/PKG-INFO new/oslo.rootwrap-1.2.0/oslo.rootwrap.egg-info/PKG-INFO --- old/oslo.rootwrap-1.1.0/oslo.rootwrap.egg-info/PKG-INFO 2014-01-28 22:01:06.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/oslo.rootwrap.egg-info/PKG-INFO 2014-03-24 17:09:38.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.rootwrap -Version: 1.1.0 +Version: 1.2.0 Summary: Oslo Rootwrap Home-page: https://launchpad.net/oslo Author: OpenStack @@ -111,6 +111,11 @@ Enable logging to syslog. Default value is False. Example: ``use_syslog=True`` + use_syslog_rfc_format + Enable RFC5424 compliant format for syslog (add APP-NAME before MSG part). + Default value is False. Example: + ``use_syslog_rfc_format=True`` + syslog_log_facility Which syslog facility to use for syslog logging. Valid values include `auth`, `authpriv`, `syslog`, `user0`, `user1`... @@ -298,3 +303,5 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/setup.cfg new/oslo.rootwrap-1.2.0/setup.cfg --- old/oslo.rootwrap-1.1.0/setup.cfg 2014-01-28 22:01:06.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/setup.cfg 2014-03-24 17:09:38.000000000 +0100 @@ -16,6 +16,8 @@ Programming Language :: Python Programming Language :: Python :: 2.6 Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.3 [files] packages = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/tests/__init__.py new/oslo.rootwrap-1.2.0/tests/__init__.py --- old/oslo.rootwrap-1.1.0/tests/__init__.py 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/tests/__init__.py 2014-03-24 17:09:14.000000000 +0100 @@ -1,15 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2013 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/tests/test_rootwrap.py new/oslo.rootwrap-1.2.0/tests/test_rootwrap.py --- old/oslo.rootwrap-1.1.0/tests/test_rootwrap.py 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/tests/test_rootwrap.py 2014-03-24 17:09:14.000000000 +0100 @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -250,6 +248,17 @@ def test_IpFilter_non_netns(self): f = filters.IpFilter('/sbin/ip', 'root') self.assertTrue(f.match(['ip', 'link', 'list'])) + self.assertTrue(f.match(['ip', '-s', 'link', 'list'])) + self.assertTrue(f.match(['ip', '-s', '-v', 'netns', 'add'])) + self.assertTrue(f.match(['ip', 'link', 'set', 'interface', + 'netns', 'somens'])) + + def test_IpFilter_netns(self): + f = filters.IpFilter('/sbin/ip', 'root') + self.assertFalse(f.match(['ip', 'netns', 'exec', 'foo'])) + self.assertFalse(f.match(['ip', 'netns', 'exec'])) + self.assertFalse(f.match(['ip', '-s', 'netns', 'exec'])) + self.assertFalse(f.match(['ip', '-l', '42', 'netns', 'exec'])) def _test_IpFilter_netns_helper(self, action): f = filters.IpFilter('/sbin/ip', 'root') @@ -346,6 +355,7 @@ self.assertEqual(c.exec_dirs, []) self.assertFalse(config.use_syslog) + self.assertFalse(config.use_syslog_rfc_format) self.assertEqual(config.syslog_log_facility, logging.handlers.SysLogHandler.LOG_SYSLOG) self.assertEqual(config.syslog_log_level, logging.ERROR) @@ -361,6 +371,12 @@ config = wrapper.RootwrapConfig(raw) self.assertTrue(config.use_syslog) + raw.set('DEFAULT', 'use_syslog_rfc_format', 'oui') + self.assertRaises(ValueError, wrapper.RootwrapConfig, raw) + raw.set('DEFAULT', 'use_syslog_rfc_format', 'true') + config = wrapper.RootwrapConfig(raw) + self.assertTrue(config.use_syslog_rfc_format) + raw.set('DEFAULT', 'syslog_log_facility', 'moo') self.assertRaises(ValueError, wrapper.RootwrapConfig, raw) raw.set('DEFAULT', 'syslog_log_facility', 'local0') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.rootwrap-1.1.0/tox.ini new/oslo.rootwrap-1.2.0/tox.ini --- old/oslo.rootwrap-1.1.0/tox.ini 2014-01-28 22:00:44.000000000 +0100 +++ new/oslo.rootwrap-1.2.0/tox.ini 2014-03-24 17:09:14.000000000 +0100 @@ -1,8 +1,11 @@ [tox] -distribute = False +minversion = 1.6 envlist = py26,py27,py33,pep8 +skipsdist = True [testenv] +usedevelop = True +install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-eyeD3 for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package python-eyeD3 for openSUSE:Factory checked in at 2014-05-02 14:02:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-eyeD3 (Old) and /work/SRC/openSUSE:Factory/.python-eyeD3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-eyeD3" Changes: -------- --- /work/SRC/openSUSE:Factory/python-eyeD3/python-eyeD3.changes 2013-09-13 14:46:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-eyeD3.new/python-eyeD3.changes 2014-05-02 14:02:49.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Apr 28 12:05:49 UTC 2014 - jmatejek(a)suse.com + +- update to 0.7.4: + * new `fixup` plugin for repairing tags in directories + * more steps towards Python3 compatibility + * APIs modified to be more reusable + * recognize more exotic MIME types for mp3 files + * fixed crash on non-ascii URLs + * supports python-magic >= 0.4.4 + * several new features and bugfixes +- added CVE-2014-1934-mktemp.patch: insecure use of temporary files + (CVE-2014-1934-mktemp.patch, bnc#863744) + +------------------------------------------------------------------- Old: ---- eyeD3-0.7.3.tgz New: ---- CVE-2014-1934-mktemp.patch eyeD3-0.7.4.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-eyeD3.spec ++++++ --- /var/tmp/diff_new_pack.P3tdnX/_old 2014-05-02 14:02:50.000000000 +0200 +++ /var/tmp/diff_new_pack.P3tdnX/_new 2014-05-02 14:02:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-eyeD3 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,11 @@ Summary: Python Module for ID3 Tag Manipulation License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities -Version: 0.7.3 +Version: 0.7.4 Release: 0 Source0: http://eyed3.nicfit.net/releases/eyeD3-%{version}.tgz +# CVE-2014-1934: insecure use of `mktemp` when rewriting tags +Patch0: CVE-2014-1934-mktemp.patch Url: http://eyed3.nicfit.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: python-magic @@ -43,6 +45,7 @@ %prep %setup -n eyeD3-%{version} +%patch0 -p1 %build %__python setup.py build ++++++ CVE-2014-1934-mktemp.patch ++++++ Index: eyeD3-0.7.4/src/eyed3/id3/tag.py =================================================================== --- eyeD3-0.7.4.orig/src/eyed3/id3/tag.py 2014-04-28 14:14:05.635445665 +0200 +++ eyeD3-0.7.4/src/eyed3/id3/tag.py 2014-04-28 14:59:03.022541899 +0200 @@ -946,10 +946,10 @@ "padding" % (len(tag_data), len(padding))) if rewrite_required: # Open tmp file - tmp_name = tempfile.mktemp() - with open(tmp_name, "wb") as tmp_file: + tmp_fd, tmp_name = tempfile.mkstemp() + try: + tmp_file = os.fdopen(tmp_fd, 'w+b') tmp_file.write(tag_data + padding) - # Copy audio data in chunks with open(self.file_info.name, "rb") as tag_file: if curr_tag_size != 0: @@ -960,6 +960,8 @@ "byte %d (%x)" % (seek_point, seek_point)) tag_file.seek(seek_point) chunkCopy(tag_file, tmp_file) + finally: + tmp_file.close() # Move tmp to orig. shutil.copyfile(tmp_name, self.file_info.name) @@ -1118,9 +1120,12 @@ tag_file.seek(tag.file_info.tag_size) # Open tmp file - tmp_name = tempfile.mktemp() - with open(tmp_name, "wb") as tmp_file: + tmp_fd, tmp_name = tempfile.mkstemp() + try: + tmp_file = os.fdopen(tmp_fd, 'w+b') chunkCopy(tag_file, tmp_file) + finally: + tmp_file.close() # Move tmp to orig shutil.copyfile(tmp_name, filename) ++++++ eyeD3-0.7.3.tgz -> eyeD3-0.7.4.tgz ++++++ ++++ 3854 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-pyzmq for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package python3-pyzmq for openSUSE:Factory checked in at 2014-05-02 14:02:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-pyzmq (Old) and /work/SRC/openSUSE:Factory/.python3-pyzmq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-pyzmq" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-pyzmq/python3-pyzmq.changes 2013-06-19 15:48:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-pyzmq.new/python3-pyzmq.changes 2014-05-02 14:02:45.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 25 11:07:24 UTC 2014 - andrea(a)opensuse.org + +- update to version 14.2.0 + * Raise new ZMQVersionError when a requested method is not + supported by the linked libzmq. For backward compatibility, this + subclasses NotImplementedError. + * Bug fixes + +------------------------------------------------------------------- Old: ---- pyzmq-13.0.0.tar.gz New: ---- pyzmq-14.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-pyzmq.spec ++++++ --- /var/tmp/diff_new_pack.dem2KK/_old 2014-05-02 14:02:46.000000000 +0200 +++ /var/tmp/diff_new_pack.dem2KK/_new 2014-05-02 14:02:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-pyzmq # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,9 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: python3-pyzmq -Version: 13.0.0 +Version: 14.2.0 Release: 0 Summary: Python bindings for 0MQ License: LGPL-3.0+ ++++++ pyzmq-13.0.0.tar.gz -> pyzmq-14.2.0.tar.gz ++++++ ++++ 149097 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0