March 2012 - openSUSE Commits - openSUSE Mailing Lists

commit phonon-backend-gstreamer-0_10 for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package phonon-backend-gstreamer-0_10 for openSUSE:Factory checked in at 2012-03-20 13:29:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10 (Old) and /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phonon-backend-gstreamer-0_10", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon-backend-gstreamer-0_10/phonon-backend-gstreamer-0_10.changes 2012-01-05 13:49:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer-0_10.new/phonon-backend-gstreamer-0_10.changes 2012-03-20 13:29:21.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 20 09:28:12 UTC 2012 - cornelis(a)solcon.nl + +- Update to 4.6.0 release + * fix endless looping of KDE audio notifications + * Fix for volume fading + * Fix for VideoWidget +- Removed patch to fix build, part of 4.6.0 + +------------------------------------------------------------------- Old: ---- fix_build.diff phonon-backend-gstreamer-4.5.90.tar.bz2 New: ---- phonon-backend-gstreamer-4.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon-backend-gstreamer-0_10.spec ++++++ --- /var/tmp/diff_new_pack.oeNhc7/_old 2012-03-20 13:29:22.000000000 +0100 +++ /var/tmp/diff_new_pack.oeNhc7/_new 2012-03-20 13:29:22.000000000 +0100 @@ -17,7 +17,7 @@ Name: phonon-backend-gstreamer-0_10 -Version: 4.5.90 +Version: 4.6.0 Release: 0 Summary: Phonon Multimedia Platform Abstraction License: LGPL-2.0+ @@ -25,8 +25,7 @@ Url: http://phonon.kde.org/ %define filename phonon-backend-gstreamer %define _phonon_version 4.6.0 -Source0: %{filename}-%{version}.tar.bz2 -Patch0: fix_build.diff +Source0: %{filename}-%{version}.tar.xz BuildRequires: alsa-devel BuildRequires: automoc4 BuildRequires: cmake @@ -35,6 +34,7 @@ BuildRequires: kde4-filesystem BuildRequires: phonon-devel BuildRequires: update-desktop-files +BuildRequires: xz Requires: libphonon4 => %{_phonon_version} Supplements: packageand(gstreamer-0_10-plugins-base:phonon) Provides: phonon-backend = %{version} @@ -48,7 +48,6 @@ %prep %setup -q -n %{filename}-%{version} -%patch0 -p1 %build # compile everything for now, actually we should compile -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ding-libs for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package ding-libs for openSUSE:Factory checked in at 2012-03-20 13:29:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ding-libs (Old) and /work/SRC/openSUSE:Factory/.ding-libs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ding-libs", Maintainer is "rhafer(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ding-libs/ding-libs.changes 2011-09-23 01:55:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ding-libs.new/ding-libs.changes 2012-03-20 13:29:17.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Mar 11 19:24:54 UTC 2012 - jengelh(a)medozas.de + +- Update to new upstream release 0.1.3 +* Fixes a serious bug in libdhash with very large (>1024 slots) + initial size + +------------------------------------------------------------------- Old: ---- Fix-license-text-for-several-files-that-should-be-LGPLv3+.patch ding-libs-0.1.2.tar.bz2 New: ---- ding-libs-0.1.3.tar.bz2 pkgconfig-deps.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ding-libs.spec ++++++ --- /var/tmp/diff_new_pack.p5ntEO/_old 2012-03-20 13:29:18.000000000 +0100 +++ /var/tmp/diff_new_pack.p5ntEO/_new 2012-03-20 13:29:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ding-libs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,33 +14,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - -%global path_utils_version 0.2.1 -%global dhash_version 0.4.2 %global collection_version 0.6.0 -%global ref_array_version 0.1.1 +%global dhash_version 0.4.3 %global ini_config_version 0.6.1 +%global path_utils_version 0.2.1 +%global ref_array_version 0.1.1 Name: ding-libs -Version: 0.1.2 -Release: 1 +Version: 0.1.3 +Release: 0 Summary: "Ding is not GLib" assorted utility libraries -Group: Development/Libraries/C and C++ License: LGPL-3.0+ +Group: Development/Libraries/C and C++ Url: http://fedorahosted.org/sssd/ + +#DL-URL: https://fedorahosted.org/sssd/wiki/Releases +#Git-Clone: git://git.fedorahosted.org/ding-libs Source0: %{name}-%{version}.tar.bz2 Source2: baselibs.conf Patch0: doxygen-notimestamp.dif -Patch1: Fix-license-text-for-several-files-that-should-be-LGPLv3+.patch +Patch1: pkgconfig-deps.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ### Build Dependencies ### BuildRequires: autoconf BuildRequires: automake +BuildRequires: doxygen BuildRequires: libtool BuildRequires: m4 -BuildRequires: doxygen BuildRequires: pkg-config %description @@ -53,10 +54,9 @@ %package -n libpath_utils1 Summary: Filesystem Path Utilities -Group: Development/Libraries/C and C++ -License: LGPL-3.0+ +Group: System/Libraries Version: %{path_utils_version} -Release: 1 +Release: 0 %description -n libpath_utils1 Utility functions to manipulate filesystem pathnames @@ -65,9 +65,8 @@ Summary: Development files for libpath_utils Group: Development/Libraries/C and C++ Requires: libpath_utils1 = %{path_utils_version} -License: LGPL-3.0+ Version: %{path_utils_version} -Release: 1 +Release: 0 %description -n libpath_utils-devel Utility functions to manipulate filesystem pathnames @@ -95,11 +94,10 @@ ############################################################################## %package -n libdhash1 -Group: Development/Libraries/C and C++ Summary: Dynamic hash table -License: LGPL-3.0+ +Group: System/Libraries Version: %{dhash_version} -Release: 1 +Release: 0 %description -n libdhash1 A hash table which will dynamically resize to achieve optimal storage & access @@ -109,9 +107,8 @@ Summary: Development files for libdhash Group: Development/Libraries/C and C++ Requires: libdhash1 = %{dhash_version} -License: LGPL-3.0+ Version: %{dhash_version} -Release: 1 +Release: 0 %description -n libdhash-devel A hash table which will dynamically resize to achieve optimal storage & access @@ -123,8 +120,7 @@ %files -n libdhash1 %defattr(-,root,root,-) -%{_libdir}/libdhash.so.1 -%{_libdir}/libdhash.so.1.0.0 +%{_libdir}/libdhash.so.1* %files -n libdhash-devel %defattr(-,root,root,-) @@ -141,10 +137,9 @@ %package -n libcollection2 Summary: Collection data-type for C -Group: Development/Libraries/C and C++ -License: LGPL-3.0+ +Group: System/Libraries Version: %{collection_version} -Release: 1 +Release: 0 %description -n libcollection2 A data-type to collect data in a hierarchical structure for easy iteration @@ -153,10 +148,9 @@ %package -n libcollection-devel Summary: Development files for libcollection Group: Development/Libraries/C and C++ -License: LGPL-3.0+ Requires: libcollection2 = %{collection_version} Version: %{collection_version} -Release: 1 +Release: 0 %description -n libcollection-devel A data-type to collect data in a hierarchical structure for easy iteration @@ -188,10 +182,9 @@ %package -n libref_array1 Summary: A refcounted array for C -Group: Development/Libraries/C and C++ -License: LGPL-3.0+ +Group: System/Libraries Version: %{ref_array_version} -Release: 1 +Release: 0 %description -n libref_array1 A dynamically-growing, reference-counted array @@ -200,9 +193,8 @@ Summary: Development files for libref_array Group: Development/Libraries/C and C++ Requires: libref_array1 = %{ref_array_version} -License: LGPL-3.0+ Version: %{ref_array_version} -Release: 1 +Release: 0 %description -n libref_array-devel A dynamically-growing, reference-counted array @@ -231,10 +223,9 @@ %package -n libini_config2 Summary: INI file parser for C -Group: Development/Libraries/C and C++ -License: LGPL-3.0+ +Group: System/Libraries Version: %{ini_config_version} -Release: 1 +Release: 0 %description -n libini_config2 Library to process config files in INI format into a libcollection data @@ -243,10 +234,9 @@ %package -n libini_config-devel Summary: Development files for libini_config Group: Development/Libraries/C and C++ -License: LGPL-3.0+ Requires: libini_config2 = %{ini_config_version} Version: %{ini_config_version} -Release: 1 +Release: 0 %description -n libini_config-devel Library to process config files in INI format into a libcollection data @@ -275,8 +265,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -P 1 -p1 %build %configure \ ++++++ ding-libs-0.1.2.tar.bz2 -> ding-libs-0.1.3.tar.bz2 ++++++ ++++ 16778 lines of diff (skipped) ++++++ pkgconfig-deps.diff ++++++ From: Jan Engelhardt <jengelh(a)medozas.de> Date: 2012-03-12 00:18:26.252269956 +0100 build: resolve compile error ini_config.pc must Require collection, or linkage can fail: $ gcc tc.c $(pkg-config ini_config --libs) ld: cannot find -lcollection collect2: ld returned 1 exit status --- ini/ini_config.pc.in | 1 + 1 file changed, 1 insertion(+) Index: ding-libs-0.1.3/ini/ini_config.pc.in =================================================================== --- ding-libs-0.1.3.orig/ini/ini_config.pc.in +++ ding-libs-0.1.3/ini/ini_config.pc.in @@ -6,6 +6,7 @@ includedir=@includedir@ Name: ini_config Description: Library to process config files in INI format into a libcollection data structure Version: @INI_CONFIG_VERSION@ +Requires: collection Libs: -L${libdir} -lini_config -lcollection Cflags: -I${includedir} URL: http://fedorahosted.org/sssd/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clamav for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package clamav for openSUSE:Factory checked in at 2012-03-20 13:28:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clamav (Old) and /work/SRC/openSUSE:Factory/.clamav.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clamav", Maintainer is "max(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/clamav/clamav.changes 2012-03-20 01:58:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clamav.new/clamav.changes 2012-03-20 13:28:56.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 19:36:17 UTC 2012 - dimstar(a)opensuse.org + +- Add clamav-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- clamav-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.GBd5Vk/_old 2012-03-20 13:28:59.000000000 +0100 +++ /var/tmp/diff_new_pack.GBd5Vk/_new 2012-03-20 13:28:59.000000000 +0100 @@ -61,6 +61,7 @@ Source5: clamav-rcmilter Patch1: clamav-conf.patch Patch2: clamav-sles9.patch +Patch3: clamav-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -129,6 +130,7 @@ # SLES9's libmilter doesn't have smfi_insheader() %patch2 %endif +%patch3 -p1 %build %if 0%{?suse_version} >= 1010 ++++++ clamav-gcc47.patch ++++++ Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp =================================================================== --- clamav-0.97.3.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp +++ clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp @@ -15,6 +15,7 @@ // //===----------------------------------------------------------------------===// +#include <unistd.h> #include "JIT.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/System/DynamicLibrary.h" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop fonts-arabic from openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, FYI: Package fonts-arabic was dropped from openSUSE:Factory at Tue Mar 20 13:23:36 CET 2012. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=fo… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nginx-1.0 for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package nginx-1.0 for openSUSE:12.1:Update:Test checked in at 2012-03-20 13:22:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/nginx-1.0 (Old) and /work/SRC/openSUSE:12.1:Update:Test/.nginx-1.0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nginx-1.0", Maintainer is "schubi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/nginx-1.0/nginx-1.0.changes 2011-12-02 17:28:50.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.nginx-1.0.new/nginx-1.0.changes 2012-03-20 13:22:21.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 19 11:26:04 UTC 2012 - schubi(a)suse.com + +- Fixed VUL-0: CVE-2012-1180 nginx: information leak + (bnc #752482) + +------------------------------------------------------------------- New: ---- nginx-CVE-2012-1180.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nginx-1.0.spec ++++++ --- /var/tmp/diff_new_pack.hdckS9/_old 2012-03-20 13:22:21.000000000 +0100 +++ /var/tmp/diff_new_pack.hdckS9/_new 2012-03-20 13:22:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nginx-1.0 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: nginx-1.0 Version: 1.0.10 Release: 0 @@ -90,7 +92,10 @@ Patch3: nginx-0.4.0-perl_vendor_install.patch # PATCH-FIX-UPSTREAM nginx-1.0.4_default_config.patch Patch4: nginx-1.0.4_default_config.patch +# PATCH CVE-2012-1180 +Patch5: nginx-CVE-2012-1180.patch Summary: A HTTP server and IMAP/POP3 proxy server + %description nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev. It has been running on many heavily loaded Russian sites for more than two years. @@ -105,6 +110,7 @@ %patch2 %patch3 %patch4 +%patch5 perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl ++++++ nginx-CVE-2012-1180.patch ++++++ --- src/http/modules/ngx_http_fastcgi_module.c +++ src/http/modules/ngx_http_fastcgi_module.c @@ -1442,10 +1442,10 @@ h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1; - ngx_cpystrn(h->key.data, r->header_name_start, - h->key.len + 1); - ngx_cpystrn(h->value.data, r->header_start, - h->value.len + 1); + ngx_memcpy(h->key.data, r->header_name_start, h->key.len); + h->key.data[h->key.len] = '\0'; + ngx_memcpy(h->value.data, r->header_start, h->value.len); + h->value.data[h->value.len] = '\0'; } h->hash = r->header_hash; --- src/http/modules/ngx_http_proxy_module.c +++ src/http/modules/ngx_http_proxy_module.c @@ -1277,8 +1277,10 @@ h->value.data = h->key.data + h->key.len + 1; h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1; - ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1); - ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1); + ngx_memcpy(h->key.data, r->header_name_start, h->key.len); + h->key.data[h->key.len] = '\0'; + ngx_memcpy(h->value.data, r->header_start, h->value.len); + h->value.data[h->value.len] = '\0'; if (h->key.len == r->lowcase_index) { ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len); --- src/http/modules/ngx_http_scgi_module.c +++ src/http/modules/ngx_http_scgi_module.c @@ -894,8 +894,10 @@ h->value.data = h->key.data + h->key.len + 1; h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1; - ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1); - ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1); + ngx_memcpy(h->key.data, r->header_name_start, h->key.len); + h->key.data[h->key.len] = '\0'; + ngx_memcpy(h->value.data, r->header_start, h->value.len); + h->value.data[h->value.len] = '\0'; if (h->key.len == r->lowcase_index) { ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len); --- src/http/modules/ngx_http_uwsgi_module.c +++ src/http/modules/ngx_http_uwsgi_module.c @@ -944,8 +944,10 @@ h->value.data = h->key.data + h->key.len + 1; h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1; - ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1); - ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1); + ngx_memcpy(h->key.data, r->header_name_start, h->key.len); + h->key.data[h->key.len] = '\0'; + ngx_memcpy(h->value.data, r->header_start, h->value.len); + h->value.data[h->value.len] = '\0'; if (h->key.len == r->lowcase_index) { ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len); --- src/http/ngx_http_parse.c +++ src/http/ngx_http_parse.c @@ -813,6 +813,10 @@ break; } + if (ch == '\0') { + return NGX_HTTP_PARSE_INVALID_HEADER; + } + r->invalid_header = 1; break; @@ -875,6 +879,10 @@ break; } + if (ch == '\0') { + return NGX_HTTP_PARSE_INVALID_HEADER; + } + r->invalid_header = 1; break; @@ -893,6 +901,8 @@ r->header_start = p; r->header_end = p; goto done; + case '\0': + return NGX_HTTP_PARSE_INVALID_HEADER; default: r->header_start = p; state = sw_value; @@ -914,6 +924,8 @@ case LF: r->header_end = p; goto done; + case '\0': + return NGX_HTTP_PARSE_INVALID_HEADER; } break; @@ -927,6 +939,8 @@ break; case LF: goto done; + case '\0': + return NGX_HTTP_PARSE_INVALID_HEADER; default: state = sw_value; break; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop libxcrypt from openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, FYI: Package libxcrypt was dropped from openSUSE:Factory at Tue Mar 20 12:16:16 CET 2012. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=li… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sword for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package sword for openSUSE:Factory checked in at 2012-03-20 12:11:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sword (Old) and /work/SRC/openSUSE:Factory/.sword.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sword", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/sword/sword.changes 2011-09-23 12:47:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2012-03-20 12:11:57.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 16 17:43:53 UTC 2012 - dimstar(a)opensuse.org + +- Add sword-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- Old: ---- sword-1.6.2-fix_build_with_new_curl.patch sword-1.6.2.tar.bz2 New: ---- sword-1.6.2+svn2679.tar.bz2 sword-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sword.spec ++++++ --- /var/tmp/diff_new_pack.w1KkEG/_old 2012-03-20 12:11:58.000000000 +0100 +++ /var/tmp/diff_new_pack.w1KkEG/_new 2012-03-20 12:11:58.000000000 +0100 @@ -1,24 +1,35 @@ # # spec file for package sword # -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define libver 1_6_2 +%define libinstver 1.6.2 Name: sword -Version: 1.6.2 -Release: 1 -License: GPL-2.0 +Version: 1.6.2+svn2679 +Release: 0 Summary: Framework for manipulating Bible texts -Url: http://www.crosswire.org/sword +License: GPL-2.0 Group: Development/Libraries/C and C++ +Url: http://www.crosswire.org/sword Source0: %{name}-%{version}.tar.bz2 Patch1: sword-1.6.1-fix_compiler_warnings.patch Patch2: sword-1.6.1-curl.patch -Patch3: sword-1.6.2-fix_build_with_new_curl.patch +Patch3: sword-gcc47.patch Requires: libsword-%{libver} = %version BuildRequires: curl-devel BuildRequires: gcc-c++ @@ -45,8 +56,18 @@ # Mandriva # %if 0%{?mandriva_version} +%ifarch x86_64 +BuildRequires: lib64clucene-devel +%else BuildRequires: libclucene-devel %endif +%endif +# +# CentOS +# +%if ( %{defined centos_version} && 0%{?centos_version} < 600 ) +BuildRequires: sqlite +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,7 +90,11 @@ %package devel Summary: Include files and static libraries for developing sword applications Group: Development/Libraries/Other +%if 0%{?centos_version} < 600 +Requires: curl-devel +%else Requires: libcurl-devel +%endif Requires: sword = %{version} %description devel @@ -80,9 +105,14 @@ %setup -q %patch1 %patch2 -%patch3 +%patch3 -p1 %build + +%if 0%{?mandriva_version} +autoreconf +%endif + %configure --disable-static \ --with-icu \ --enable-tests \ @@ -148,7 +178,7 @@ %files -n libsword-%{libver} %defattr(-,root,root) %doc LICENSE -%{_libdir}/libsword-%{version}.so +%{_libdir}/libsword-%{libinstver}.so %files devel %defattr(-,root,root) @@ -156,6 +186,6 @@ %{_includedir}/* %{_libdir}/pkgconfig/sword.pc %{_libdir}/*.so -%exclude %{_libdir}/libsword-%{version}.so +%exclude %{_libdir}/libsword-%{libinstver}.so %changelog ++++++ sword-gcc47.patch ++++++ Index: sword-1.6.2+svn2679/include/multimapwdef.h =================================================================== --- sword-1.6.2+svn2679.orig/include/multimapwdef.h +++ sword-1.6.2+svn2679/include/multimapwdef.h @@ -19,14 +19,14 @@ public: } T& operator[](const Key& k) { - if (find(k) == this->end()) { - insert(value_type(k, T())); + if (this->find(k) == this->end()) { + this->insert(value_type(k, T())); } - return (*(find(k))).second; + return (*(this->find(k))).second; } bool has(const Key& k, const T &val) const { - typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k); - typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k); + typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k); + typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k); for (; start!=end; start++) { if (start->second == val) return true; -- 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-celery for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-celery for openSUSE:Factory checked in at 2012-03-20 12:11:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-celery (Old) and /work/SRC/openSUSE:Factory/.python-celery.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-celery", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-celery.new/python-celery.changes 2012-03-20 12:11:45.000000000 +0100 @@ -0,0 +1,476 @@ +------------------------------------------------------------------- +Mon Mar 19 10:32:04 UTC 2012 - cfarrell(a)suse.com + +- license update: BSD-3-Clause + See LICENSE file + +------------------------------------------------------------------- +Wed Mar 14 10:29:11 UTC 2012 - saschpe(a)suse.de + +- Don't buildrequire pymongo, it's not yet in Factory and only needed to let + some additional tests pass. It's however still suggested. + +------------------------------------------------------------------- +Sat Mar 10 17:44:01 UTC 2012 - saschpe(a)gmx.de + +- Suggest python-eventlet, python-gevent, python-pymongo, python-pytyrant +- Recommend python-curses, python-pyOpenSSL +- Run testsuite +- Changes file cleanup + +------------------------------------------------------------------- +Thu Mar 1 17:47:07 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 2.5.1: + * Eventlet/Gevent: A small typo caused celeryd to hang when eventlet/gevent + was used, this was because the environment was not monkey patched + early enough. + * Eventlet/Gevent: Another small typo caused the mediator to be started + with eventlet/gevent, which would make celeryd sometimes hang at shutdown. + * Mulitprocessing: Fixed an error occurring if the pool was stopped + before it was properly started. + * Proxy objects now redirects __doc__ and __name__ so help(obj) + works. + * Internal timer (timer2) now logs exceptions instead of swallowing them + * celeryctl shell: can now be started with --eventlet or + --gevent options to apply their monkey patches. + +------------------------------------------------------------------- +Fri Feb 24 22:26:12 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 2.5.0: + - Considerable size of changelog, please read + http://docs.celeryproject.org/en/latest/whatsnew-2.5.html or + the Changelog file inside the package. + +------------------------------------------------------------------- +Wed Dec 28 17:52:49 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.4.6: + - The group id was not changed if both --uid and --gid specified. + +------------------------------------------------------------------- +Fri Dec 2 23:43:13 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.4.5: + - Periodic task interval schedules were accidentally rounded down, + resulting in some periodic tasks being executed early. + - Logging of humanized times in the celerybeat log is now more detailed. + - New brokers section in the Getting Started part of the Documentation + This replaces the old tut-otherqueues tutorial, and adds + documentation for MongoDB, Beanstalk and CouchDB. + +------------------------------------------------------------------- +Fri Nov 25 21:56:24 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.4.4: + - [Security: CELERYSA-0001] Daemons would set effective id’s + rather than real id’s when the --uid/--gid arguments to + celeryd-multi, celeryd_detach, celerybeat and celeryev were used. + - Processes pool: Fixed rare deadlock at shutdown + - Webhook tasks issued the wrong HTTP POST headers + The Content-Type header has been changed from + application/json ⇒ application/x-www-form-urlencoded, and adds + a proper Content-Length header. + - Daemonization cookbook: Adds a configuration example using + Django and virtualenv together + - Generic init scripts now automatically creates log and pid + file directories + +------------------------------------------------------------------- +Tue Nov 22 22:25:20 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.4.3: + * Fixes module import typo in celeryctl + +------------------------------------------------------------------- +Mon Nov 14 12:35:54 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.4.2: + - Program module no longer uses relative imports so that it is + possible to do python -m celery.bin.name. + +------------------------------------------------------------------- +Mon Nov 7 23:26:56 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.4.1: + * celeryctl inspect commands was missing output. + * processes pool: Decrease polling interval for less idle CPU usage. + * processes pool: MaybeEncodingError was not wrapped in ExceptionInfo + * celeryd: would silence errors occuring after task consumer started. + * logging: Fixed a bug where unicode in stdout redirected log messages + couldn't be written + +------------------------------------------------------------------- +Fri Nov 4 17:20:46 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.4.0: + * Now supports Python 3. + * Fixed deadlock in worker process handling + * AMQP Result backend: Now expires results by default. + * Eventlet: Fixed problem with shutdown + * Broker transports can be now be specified using URLs + * The deprecated celery.loaders.setup_loader() function has been + removed. + * The CELERY_TASK_ERROR_WHITELIST setting has been replaced by a + more flexible approach + * There are additional deprecations. + * No longer depends on pyparsing. + * Now depends on Kombu 1.4.3. + * CELERY_IMPORTS can now be a scalar value + * Fixed a memory leak when using the thread pool + * The statedb was not saved at exit. + * Adds EMAIL_USE_TLS to enable secure SMTP connections + * Now handles missing fields in task messages as documented in the + message format documentation. + * Fixed race condition in celery.events.state (celerymon/celeryev) + where task info would be removed while iterating over it + * The Cache, Cassandra, MongoDB, Redis and Tyrant backends now respects + the CELERY_RESULT_SERIALIZER setting + * Logging calls no longer manually formats messages, but delegates that + to the logging system, so tools like Sentry can easier work with the + messages + * celeryd_multi now supports a stop_verify command to wait for + processes to shutdown. + * Cache backend did not work if the cache key was unicode + * New setting CELERY_RESULT_DB_SHORT_LIVED_SESSIONS added, which if + enabled will disable the caching of SQLAlchemy sessions + * All result backends now implements __reduce__ so that they can be pickled + * celeryd-multi did not work on Windows + * New-style CELERY_REDIS_* settings now takes precedence over the old + REDIS_* configuration keys + * Generic celerybeat init script no longer sets bash -e + * Documented that Chords do not work well with redis-server versions + before 2.2. + * The CELERYBEAT_MAX_LOOP_INTERVAL setting was not respected. + * inspect.registered_tasks renamed to inspect.registered for naming + consistency. + * Worker logged the string representation of args and kwargs without + safe guards + * RHEL init script: Changed celeryd startup priority. + * KeyValueStoreBackend.get_many did not respect the timeout argument + * celerybeat/celeryev’s –workdir option did not chdir before after + configuration was attempted + * After deprecating 2.4 support we can now name modules correctly, + since we can take use of absolute imports. + * AUTHORS file is now sorted alphabetically. + +------------------------------------------------------------------- +Fri Sep 23 12:35:58 UTC 2011 - oliver.bengs(a)opensuse.org + +- Added python-dateutil to Requires, + needed by %py_sitedir/celery/schedules.py + +------------------------------------------------------------------- +Mon Sep 19 18:42:37 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.3.3: + * Monkey patching sys.stdout could result in the worker + crashing if the replacing object did not define isatty + * CELERYD option in /etc/default/celeryd should not + be used with generic init scripts. + +------------------------------------------------------------------- +Thu Sep 8 01:42:58 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 2.3.2: + * Improved Contributing guide. + * Now depends on Kombu 1.3.1. + * Task.request now contains the current worker host name + * It is now easier for app subclasses to extend how they are + pickled. + * purge/discard_all was not working correctly + * he coloring of log messages didn’t handle non-ASCII data well + * [Windows] the multiprocessing pool tried to import os.kill even + though this is not available there + * Fixes case where the worker could become unresponsive because of + tasks exceeding the hard time limit. + * The task-sent event was missing from the event reference. + * ResultSet.iterate now returns results as they finish + * Retries will no longer be performed when tasks are called directly + (using __call__). + * Eventlet no longer crashes if autoscale is enabled. + * py24 target removed from tox.ini. + +------------------------------------------------------------------- +Mon Aug 8 01:02:52 UTC 2011 - alexandre(a)exatati.com.br + ++++ 279 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.python-celery.new/python-celery.changes New: ---- celery-2.5.1.tar.gz python-celery.changes python-celery.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-celery.spec ++++++ # # spec file for package python-celery # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-celery Version: 2.5.1 Release: 0 License: BSD-3-Clause Summary: Distributed Task Queue Url: http://celeryproject.org Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/c/celery/celery-%{version}.tar.gz BuildRequires: python-SQLAlchemy BuildRequires: python-cl BuildRequires: python-curses BuildRequires: python-dateutil BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-eventlet BuildRequires: python-gevent BuildRequires: python-kombu >= 2.1.1 BuildRequires: python-mock BuildRequires: python-nose-cover3 BuildRequires: python-pyOpenSSL Requires: python-anyjson Requires: python-dateutil Requires: python-kombu >= 2.1.1 Recommends: python-curses Recommends: python-pyOpenSSL Suggests: python-eventlet Suggests: python-gevent Suggests: python-pymongo Suggests: python-pytyrant BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Celery is an open source asynchronous task queue/job queue based on distributed message passing. It is focused on real-time operation, but supports scheduling as well. %prep %setup -q -n celery-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check python setup.py test %files %defattr(-,root,root,-) %doc Changelog README TODO %{_bindir}/camqadm %{_bindir}/celery* %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mjpegtools for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package mjpegtools for openSUSE:Factory checked in at 2012-03-20 12:11:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old) and /work/SRC/openSUSE:Factory/.mjpegtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mjpegtools", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes 2011-12-08 11:53:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes 2012-03-20 12:11:36.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 19:38:49 UTC 2012 - dimstar(a)opensuse.org + +- Add mjpegtools-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- mjpegtools-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mjpegtools.spec ++++++ --- /var/tmp/diff_new_pack.rg4mMd/_old 2012-03-20 12:11:37.000000000 +0100 +++ /var/tmp/diff_new_pack.rg4mMd/_new 2012-03-20 12:11:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mjpegtools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,12 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mjpegtools Version: 2.0.0 Release: 0 Summary: MJPEG Video Capture and Processing Tools -Url: http://mjpeg.sourceforge.net/ +License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Multimedia/Video/Editors and Convertors +Url: http://mjpeg.sourceforge.net/ %if 0%{?BUILD_ORIG} Source0: http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtool… %else @@ -28,7 +30,6 @@ #%(sh %{_sourcedir}/mjpegtools-codecpatch.sh %{_sourcedir} mjpegtools-%{version}.tar.gz mjpegtools-%{version}-patched.tar.gz ) Source0: %{name}-%{version}-patched.tar.gz %endif -License: BSD-3-Clause ; GPL-2.0+ Source1: mjpegtools-codecpatch.sh Patch0: mjpegtools-cpuinfo.patch Patch1: mjpegtools-vector_alignment.patch @@ -37,6 +38,7 @@ Patch4: mjpegtools-no_arch_tuning.patch Patch5: mjpegtools-config_h.patch Patch6: mjpegtools-v4l-2.6.38.patch +Patch7: mjpegtools-gcc47.patch Patch100: mjpegtools-codecpatch.patch BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -51,8 +53,8 @@ %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(libv4l1) %endif -BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(SDL_gfx) +BuildRequires: pkgconfig(sdl) Requires(post): info Requires(preun): info @@ -100,6 +102,7 @@ %if 0%{?suse_version} >= 1210 %patch6 %endif +%patch7 -p1 %if ! 0%{?BUILD_ORIG} # remove references to files removed by %%{name}-codecpatch.sh %patch100 ++++++ mjpegtools-2.0.0-patched.tar.gz ++++++ ++++++ mjpegtools-gcc47.patch ++++++ Index: mjpegtools-2.0.0/y4mdenoise/MotionSearcher.hh =================================================================== --- mjpegtools-2.0.0.orig/y4mdenoise/MotionSearcher.hh +++ mjpegtools-2.0.0/y4mdenoise/MotionSearcher.hh @@ -2196,7 +2196,7 @@ MotionSearcher<PIXEL_NUM,DIM,PIXEL_TOL,P { // This region is too small to be bothered with. // Just get rid of it. - DeleteRegion (a_pRegion); + this->DeleteRegion (a_pRegion); } else { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdbus-c++ for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package libdbus-c++ for openSUSE:Factory checked in at 2012-03-20 12:11:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbus-c++ (Old) and /work/SRC/openSUSE:Factory/.libdbus-c++.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdbus-c++", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.libdbus-c++.new/libdbus-c++.changes 2012-03-20 12:11:22.000000000 +0100 @@ -0,0 +1,18 @@ +------------------------------------------------------------------- +Mon Mar 12 08:42:55 UTC 2012 - davejplater(a)gmail.com + +- Added baselibs.conf for 32 bit compat libs. + +------------------------------------------------------------------- +Sun Mar 11 11:53:09 UTC 2012 - davejplater(a)gmail.com + +- Added libdbus-c++-noreturn.patch to fix rpmlint error, will be + reported upstream as the comment in the source file suggests that + the developer hasn't decided what to do about it yet. + +------------------------------------------------------------------- +Sat Feb 25 08:20:55 UTC 2012 - davejplater(a)gmail.com + +- Created package dbus-c++ for ffado svn build. +- See bnc#747391 & bnc#736115 + New: ---- baselibs.conf libdbus-c++-0.9.0.tar.bz2 libdbus-c++-gcc47.patch libdbus-c++-nodocdatetime.patch libdbus-c++-noreturn.patch libdbus-c++-pthread.patch libdbus-c++.changes libdbus-c++.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbus-c++.spec ++++++ # # spec file for package libdbus-c++ # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libdbus-c++ Version: 0.9.0 Release: 0 Summary: C++ Interface for DBus License: LGPL-2.1+ Group: System/Libraries Url: http://dbus-cplusplus.sourceforge.net/index.html Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf # Fix no return from function Patch0: libdbus-c++-noreturn.patch # Get ffado to build with libdbus-c++ Patch1: libdbus-c++-pthread.patch # No current date / time allowed in docs? Patch2: libdbus-c++-nodocdatetime.patch # Fix gcc47 build errors Patch3: libdbus-c++-gcc47.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: dos2unix BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz BuildRequires: gtkmm2-devel BuildRequires: libexpat-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) # ecore %if 0%{?suse_version} >= 1030 BuildRequires: libexpat-devel %else BuildRequires: expat %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description DBus-c++ attempts to provide a C++ API for D-BUS. The library has a glib and an ecore mainloop integration. It also offers an optional own main loop. %package -n libdbus-c++-1-0 Summary: The libdbus-c++ library Group: System/Libraries %description -n libdbus-c++-1-0 DBus-c++ attempts to provide a C++ API for D-BUS. The library has a glib and an ecore mainloop integration. It also offers an optional own main loop. The libdbus-c++ library. %package -n libdbus-c++-glib-1-0 Summary: Glib for libdbus-c++ Group: System/Libraries %description -n libdbus-c++-glib-1-0 DBus-c++ attempts to provide a C++ API for D-BUS. The library has a glib and an ecore mainloop integration. It also offers an optional own main loop. The glib libdbus-c++ library. %package devel Summary: Development files for libdbus-c++ Group: Development/Libraries/C and C++ Requires: libdbus-c++-1-0 = %{version} Requires: libdbus-c++-glib-1-0 = %{version} %description devel DBus-c++ attempts to provide a C++ API for D-BUS. The library has a glib and an ecore mainloop integration. It also offers an optional own main loop. Files for building against libdbus-c++ %prep %setup -q %patch0 %patch1 %patch2 %patch3 %build #./autogen.sh # FIXME: for some strange reason the 32 bit build needs -lpthread. %ifarch x86_64 export LDFLAGS="$LDFLAGS -lexpat" %else export LDFLAGS="$LDFLAGS -lexpat -lpthread" %endif %configure --disable-ecore --enable-doxygen-docs --enable-static=no make %{?_smp_flags} %install %make_install dos2unix -k AUTHORS rm -f %{buildroot}%{_libdir}/*.la %fdupes -s doc/ %post -n libdbus-c++-glib-1-0 -p /sbin/ldconfig %postun -n libdbus-c++-glib-1-0 -p /sbin/ldconfig %post -n libdbus-c++-1-0 -p /sbin/ldconfig %postun -n libdbus-c++-1-0 -p /sbin/ldconfig %files -n libdbus-c++-1-0 %defattr(755,root,root) %{_libdir}/libdbus-c++-1.so.0 %{_libdir}/libdbus-c++-1.so.0.0.0 %files -n libdbus-c++-glib-1-0 %defattr(755,root,root) %{_libdir}/libdbus-c++-glib-1.so.0 %{_libdir}/libdbus-c++-glib-1.so.0.0.0 # TODO: Separate the two lib's devel packages. There's only one set of headers though. # FIXME: Every html file contains date and time, must be fixed before docs are included. # FIXME: Add this to %%doc when fixed "doc/html doc/img" maybe a separate doc package. %files devel %defattr(-,root,root) %doc AUTHORS COPYING README TODO doc/html doc/img %{_bindir}/dbusxx-xml2cpp %{_bindir}/dbusxx-introspect %{_libdir}/libdbus-c++-1.so %{_libdir}/libdbus-c++-glib-1.so %{_includedir}/dbus-c++-1 %{_libdir}/pkgconfig/*.pc %changelog ++++++ baselibs.conf ++++++ libdbus-c++-1-0 libdbus-c++-glib-1-0 ++++++ libdbus-c++-gcc47.patch ++++++ Index: src/eventloop-integration.cpp =================================================================== --- src/eventloop-integration.cpp.orig 2011-11-28 17:04:18.000000000 +0200 +++ src/eventloop-integration.cpp 2012-03-19 09:22:12.179566265 +0200 @@ -38,6 +38,7 @@ #include <cassert> #include <sys/poll.h> #include <fcntl.h> +#include <unistd.h> using namespace DBus; using namespace std; ++++++ libdbus-c++-nodocdatetime.patch ++++++ Index: doc/foot.html =================================================================== --- doc/foot.html.orig 2011-11-30 18:57:37.000000000 +0200 +++ doc/foot.html 2012-03-13 14:44:14.494516524 +0200 @@ -10,7 +10,6 @@ <table><tr> <td></td> <td class="copyright">Copyright ©$year DBus-C++ Project</td> - <td class="generated">Docs generated $datetime</td> </tr></table> </div> ++++++ libdbus-c++-noreturn.patch ++++++ Index: include/dbus-c++/util.h =================================================================== --- include/dbus-c++/util.h.orig 2011-11-28 17:03:19.000000000 +0200 +++ include/dbus-c++/util.h 2012-03-11 13:21:18.851849466 +0200 @@ -243,6 +243,7 @@ public: // TODO: think about return type in this case // this assert should help me to find the use case where it's needed... //assert (false); + return _cb->call(param); } R call(P param) const @@ -255,6 +256,8 @@ public: // TODO: think about return type in this case // this assert should help me to find the use case where it's needed... //assert (false); + return _cb->call(param); + } bool empty() const ++++++ libdbus-c++-pthread.patch ++++++ Index: dbus-c++-1.pc.in =================================================================== --- dbus-c++-1.pc.in.orig 2011-11-28 22:52:01.000000000 +0200 +++ dbus-c++-1.pc.in 2012-03-11 15:49:36.452603560 +0200 @@ -7,5 +7,5 @@ Name: @PACKAGE@ Description: Native C++ bindings for D-Bus Requires: dbus-1 Version: @VERSION@ -Libs: -L${libdir} -ldbus-c++-1 +Libs: -L${libdir} -ldbus-c++-1 -lpthread Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-0_10-plugins-bad for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-bad for openSUSE:Factory checked in at 2012-03-20 12:11:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-0_10-plugins-bad (Old) and /work/SRC/openSUSE:Factory/.gstreamer-0_10-plugins-bad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-0_10-plugins-bad", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2012-02-16 16:14:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-0_10-plugins-bad.new/gstreamer-0_10-plugins-bad.changes 2012-03-20 12:11:08.000000000 +0100 @@ -1,0 +2,299 @@ +Fri Mar 2 08:37:20 UTC 2012 - vuntz(a)opensuse.org + +- Add a comment about GPL-3.0+ in the tarball, that were + mis-licensed by mistake. This is already fixed upstream. + +------------------------------------------------------------------- +Thu Mar 1 00:39:49 UTC 2012 - reddwarf(a)opensuse.org + +- Add support for vo-amrwbenc and vo-aacenc + +------------------------------------------------------------------- +Thu Feb 23 18:22:31 UTC 2012 - vuntz(a)opensuse.org + +- Comment out opencv-devel BuildRequires to avoid building the + opencv plugin until bnc#748666 is fixed: opencv currently has + dependencies on libqt4-x11 and libxine, and that's not a good + thing for a gstreamer plugin. + +------------------------------------------------------------------- +Tue Feb 21 15:19:29 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.10.23: + + aiffparse: extract ID3 tags embedded in ID3 chunks + + amrwbenc: switch to the free vo-amrwbenc library + + apexsink: add support for generation 2 AirTunes hardware + + applemedia: bump the rank of qtkitvideosrc to PRIMARY + + autoconvert: remove the initial-identity property from + autoconvert, update for basetransform changes in core + + avcsrc: add AVC Video Services plugin for OS/X (captures DV or + HDV video from Firewire port) + + basevideo: + - cater for format conversion + - fix locking, especially if both pads have different streaming + threads + + basevideodecoder: + - add API to drop a frame and post a QoS message on the bus + - reverse playback support; limited legacy seeking support + - better caps handling; event handling fixes esp. discont and + flush + + basevideoencoder: + - add support for new force-key-unit event API + - implement preset interface; enable clipping by default + - proxy the width/height/framerate/PAR constraints of + downstream caps to upstream + + bayer2rgb: rewrite signal processing and convert to orc for + better speed + + camerabin2: + - no longer experimental; add flags to disable conversion + elements + - add "audio-filter" property; countless fixes + + camerabin: + - add "image-formatter" property + - prevent audio source from providing clock; reset audiosrc + timestamping + - prevent captures from being lost when switching resolutions + + colorspace: + - add JPEG YCbCr matrix + - fix odd width and height handling in some fastpath cases + - fix r210 writing only half a scanline + + d3dvideosink: new d3dvideosink element + + dc1394src: implement LATENCY query + + debugutils: new elements: compare (with memcmp and ssim method) + and debugspy + + decklink: + - add more modes, connection type, "audio-input" and + "subdevice" properties + - add support for Windows; properly set up analog input + + decklinksink: add audio support + + dfbvideosink: also consider non-accelerated DirectFB surfaces + + diracparse: make diracparse work correctly + + directdrawsink: handle pixel-aspect-ratio, lower rank to + secondary + + dshowdecwrapper: fix COM initialization + + dtmf: post messages when starting to send/receive DTMF + + dtmfsrc: + - align DTMF sound buffers with last-stop from event + - reject start/stop requests that come out of order + + dvbsrc: add "timeout" property and use (interruptible) GstPoll + + element-templates: improve the audiofilter template + + faac: + - add properties for VBR encoding + - add profile and level to the caps; negotiate output format + from downstream caps + + facedetect: detect face features (mouth, nose, eyes) and drop + faces that don't have them + + faceoverlay: add element that displays an SVG image over a + detected face + + freeverb: new freeverb element (reverb effect) + + h263parse: also extract width and height into caps; propagate + downstream caps + + h264parse: + - many negotiation and caps-related fixes; propagate downstream + caps where appropriate + - countless parsing and timestamping fixes + + hlsdemux: + - allow bandwidth switching during caching of fragments + - make more error resilient + - cache number of fragments we are required to cache + - add seeking support (for streams that are not live) + - implement duration and seeking queries; improved duration + reporting + - send a flush-stop when switching pads. Fixes A -> A/V sync + issue + - implement buffering by posting buffering messages on the bus + - send NEWSEGMENT events in TIME format + - switch to higher/lower bitrate by more than one step at a + time + - handle change of media types + + inter: new intermediate surface elements: + inter{video,audio,sub}{sink,src} to decouple elements within the + same pipeline + + invtelecine: remove in favor of fieldanalysis + + irtspparse: add Interleaved RTSP parser element + + jifmux: change class to formatter, bump rank to secondary + + kateenc: don't error on empty input buffers + + kate: + - do not consider an empty SPU to be a fatal error + - pass on timed event metadata as tags when we can + - support for rendering on several YUV formats + + legacyh264parse: + - create correct avc codec-data + - delay pushing buffers until we have width/height + - fix output caps alignment for avc input + + modplug: fix modules playing as mono instead of stereo + + motioncells: new element to detect areas of motion + + mpeg2enc: support mjpegtools 2.0 + + mpeg4videoparse: properly handle profile and level in caps + + mpegpsdemux: timestamp handling and seeking fixes + + mpegpsmux: + - remember whether an incoming buffer is a keyunit or not + - add "aggregate-gops" property to aggregate GOPs into buffer + lists + - put stream headers into output caps + + mpeg[pt]sdemux: add support for AAC LATM/LOAS streams + + mpegtsbase: actually set seen_pat=TRUE when we see a PAT + + mpegtsdemux: + - always try to seek for to a keyframe; add accurate seeking + support + - fix frequent deadlock demuxing MPEG TS + - fix scanning stopping too early + - fix timestamps in newsegement event after seeking + - implement key_unit seeking for MPEG2 video + - payload parsing for H.264 + - push based seeking based on PCR + + mpegtsmux: + - add support for force key unit events + - unset the current PCR stream when starting a new unit + + mpegtsparse: + - fix parsing of PSI table IDs + - support more character set encodings + + mpegts: stop scanning for keyframes as early as possible + + ofa: don't crash when there's no data to create a fingerprint + from + + openal: new OpenAL sink and source elements: openalsrc, + openalsink + + opencv: allow to build against 2.3.1 + + opus: new Opus audio codec elements: opusdec, opusenc, + opusparsertpopusdepay, rtpopusay + + pcapparse: also support extracting tcp data; fix SLL parsing + + photography: add missing FLICKER_REDUCTION capability + + pvr2d: new pvrvideosink element + + psmux: fix writing of system header, which makes VLC not skip + the adjacent PSM and play embedded H.264 streams + + removesilence: new plugin + + resindvdsrc: do not try to seek before the first chapter + + rotate: angle is in radians already, do not scale it + + rsvgdec: use input buffer timings if possible + + rtmp: add rtmpsink element for output to an RTMP server + + rtpdtmfmux: add last-stop to dtmf-event upstream events + + rtpdtmfsrc: + - correctly recognize the end of a buffer + - just error out if there is no clock + - make sure rtpdtmfsrc timestamps don't overlap + - put the inter digit interval at the end, not at the start + - respect ptime from the caps + - start at the last_stop from the start event if there was one + + rtpvp8: + - fix bitstream parsing using the wrong kind of bitreader + - reject unknown bitstream versions + - update the pay/depay to the ietf-draft-01 spec + + schroenc: + - balance encoder and video format alloc/dealloc + - remove shape_output handling + + scopes: + - add a new element similar to synaesthesia + - add a simple fft based scope + - draw pixels with signle 32bit writes + - first version of a scopes plugin using a new baseclass + - fix elements descriptions + + shm: + - add ability to add uint64 tags on buffers + - add buffer-time property + + smooth: new element, port to 0.10 + + soundtouch: handling incoming rate when requested + + spacescope: + - add color-modes + - use the drawhelpers and add a draw-style property ++++ 102 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes ++++ and /work/SRC/openSUSE:Factory/.gstreamer-0_10-plugins-bad.new/gstreamer-0_10-plugins-bad.changes Old: ---- gst-plugins-bad-0.10.22-patched.tar.bz2 gst-plugins-bad-0.10.22.tar.bz2 gstreamer-0_10-plugins-bad-mjpegtool2.patch New: ---- gst-plugins-bad-0.10.23-patched.tar.xz gst-plugins-bad-0.10.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.udLWci/_old 2012-03-20 12:11:09.000000000 +0100 +++ /var/tmp/diff_new_pack.udLWci/_new 2012-03-20 12:11:09.000000000 +0100 @@ -17,7 +17,6 @@ %bcond_with divx4linux -%bcond_with libmms %bcond_with LV2 Name: gstreamer-0_10-plugins-bad @@ -25,21 +24,48 @@ # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. %define _name gst-plugins-bad -Version: 0.10.22 +Version: 0.10.23 Release: 0 +# FIXME: on new upstream version, double-check that the NOTE before the license tag can be removed +# FIXME: re-enable opencv BuildRequires once bnc#748666 is fixed (we don't want to depend on libxine!) +# FIXME: missing BuildRequires on opus (http://opus-codec.org/) +# FIXME: missing BuildRequires on spandsp (http://www.soft-switch.org/) +# FIXME: missing BuildRequires on libtiger (http://code.google.com/p/libtiger/) +# FIXME: missing BuildRequires on zbar (http://zbar.sourceforge.net/) %define gst_branch 0.10 +Summary: GStreamer Streaming-Media Framework Plug-Ins +License: GPL-2.0+ ; LGPL-2.1+ +Group: Productivity/Multimedia/Other +# NOTE: Some files for the vdpau plugin in this tarball have a GPL-3.0+ header; +# this was a mistake and is already fixed upstream, see bgo#671142 and +# http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=044df35560… +Url: http://gstreamer.freedesktop.org/ +%if 0%{?BUILD_ORIG} +Source: http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{_name}-%{version}.ta… +%else +# WARNING: This is not a comment, but the real command to repack souce: +#%(bash %{_sourcedir}/%{name}-patch-source.sh %{_name}-%{version}.tar.xz) +Source: %{_name}-%{version}-patched.tar.xz +# If the above patch source script fails due to a change in source tarball contents, you need +# to unpack the sources (this should already have happened) and examine the new plugin source for +# blacklisted content and if it's clean, edit the script and add to the allowed list in the script +%endif +Source1: %{name}-patch-source.sh +Patch6: gstreamer010-plugins-bad-real.patch # Please remove me when slv2 and lv2core are in factory. %if %{with LV2} BuildRequires: lv2core-devel BuildRequires: slv2-devel %endif BuildRequires: DirectFB-devel -BuildRequires: autoconf BuildRequires: SDL-devel +BuildRequires: autoconf BuildRequires: check-devel BuildRequires: dirac-devel BuildRequires: gcc-c++ -BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.33 +BuildRequires: glib2-devel >= 2.24 +BuildRequires: gstreamer-0_10-devel >= 0.10.36 +BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.36 BuildRequires: gtk-doc BuildRequires: gtk2-devel BuildRequires: jack-devel @@ -60,7 +86,9 @@ BuildRequires: libiptcdata-devel BuildRequires: libjasper-devel BuildRequires: libkate-devel +BuildRequires: liblrdf-devel BuildRequires: libmjpegutils-devel +BuildRequires: libmms-devel BuildRequires: libmodplug-devel BuildRequires: libmpcdec-devel BuildRequires: libmusicbrainz-devel @@ -74,7 +102,8 @@ BuildRequires: libvdpau-devel BuildRequires: libvpx-devel BuildRequires: neon-devel -# OpenCV 2.2.0 is too new. Recheck to see if the plugin has been updated. +BuildRequires: openal-soft-devel +# Disabled because of bnc#748666 #BuildRequires: opencv-devel BuildRequires: openssl-devel BuildRequires: orc @@ -83,16 +112,24 @@ BuildRequires: sgml-skel BuildRequires: soundtouch-devel BuildRequires: translation-update-upstream -%if %{with libmms} -BuildRequires: libmms-devel +BuildRequires: zvbi-devel +%ifarch %ix86 ppc x86_64 +BuildRequires: valgrind-devel +%endif +%if 0%{?suse_version} <= 1210 +BuildRequires: xz %endif # FIXME: flite: Not in openSUSE +# FIXME: kate: can be enhanced with libtiger. # FIXME: lv2: standard for plugins and matching host applications, # FIXME: mimic: Requires libmimic. # FIXME: mythtvsrc: Requires gmyth. # FIXME: nassink: Not in openSUSE +# FIXME: opus: Requires opus, not yet in openSUSE. # FIXME: rtmp: Not in openSUSE +# FIXME: spandsp: Requires spandsp, not yet in openSUSE. # FIXME: wildmidi: Requires WildMIDI Open Source Midi Synthesizer +# FIXME: zbar: Requires zbar. # NOTE: acm: Windows ACM library # NOTE: ivorbisdec: Integer arithmetic OGG Vorbis decoder. Interesting only for platforms without FPU. # NOTE: swfdec: Requires obsolete swfdec version. @@ -100,21 +137,40 @@ # NOTE: qtwrapper directdrawsink wininet: (Probably) not intended for Linux # NOTE: spc: Requires OpenSPC: SPC music files dumped by ZSNES and SNES9X. libgme already provides better support for such files in an arch-independent way %if 0%{?BUILD_ORIG} +# FIXME: Enable more modules. BuildRequires: faac-devel BuildRequires: faad2-devel -BuildRequires: libamrwb-devel BuildRequires: libaudio-devel BuildRequires: libdca-devel BuildRequires: libgmyth-devel BuildRequires: librtmp-devel BuildRequires: libxvidcore-devel +BuildRequires: pkgconfig(vo-aacenc) +BuildRequires: pkgconfig(vo-amrwbenc) %ifarch %ix86 # binary only so make conditional %if %{with divx4linux} BuildRequires: divx4linux-devel %endif %endif -# FIXME: Enable more modules. +%endif +%if 0%{?suse_version} >= 1140 +Requires(post): glib2-tools +Requires(postun): glib2-tools +%endif +%define gstreamer010_plugins_bad_req %(xzgrep --text "^GST.*_REQ" %{S:0} | sort -u | sed 's/GST_REQ=/gstreamer-0_10 >= /;s/GSTPB_REQ=/gstreamer-0_10-plugins-base >= /' | tr '\\n' ' ') +Requires: %gstreamer010_plugins_bad_req +Recommends: %{name}-lang +Enhances: gstreamer-0_10 +# ensure clean update after package merge. +Provides: gstreamer-0_10-schroedinger = 1.0.8 +Obsoletes: gstreamer-0_10-schroedinger <= 1.0.7 +# Name up to 10.3: +Provides: gstreamer010-plugins-bad = %{version} +Obsoletes: gstreamer010-plugins-bad < %{version} +# Generic name, never used in SuSE: +Provides: gst-plugins-bad = %{version} +%if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG_ADDON} Provides: patched_subset %else @@ -124,44 +180,7 @@ %else Provides: patched_subset %endif -%ifarch %ix86 ppc x86_64 -BuildRequires: valgrind-devel -%endif -%if 0%{?BUILD_ORIG} -Source: http://gstreamer.freedesktop.org/src/%{_name}/%{_name}-%{version}.tar.bz2 -%else -# WARNING: This is not a comment, but the real command to repack souce: -#%(bash %{_sourcedir}/%{name}-patch-source.sh %{_name}-%{version}.tar.bz2) -Source: %{_name}-%{version}-patched.tar.bz2 -# If the above patch source script fails due to a change in source tarball contents, you need -# to unpack the sources (this should already have happened) and examine the new plugin source for -# blacklisted content and if it's clean, edit the script and add to the allowed list in the script -%endif -Source1: %{name}-patch-source.sh -# From upstream GIT, remove in next version -Patch0: %{name}-mjpegtool2.patch -Patch6: gstreamer010-plugins-bad-real.patch -Url: http://gstreamer.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: GStreamer Streaming-Media Framework Plug-Ins -License: GPL-2.0+ ; LGPL-2.1+ -Group: Productivity/Multimedia/Other -Enhances: gstreamer-0_10 -# Name up to 10.3: -Provides: gstreamer010-plugins-bad = %{version} -Obsoletes: gstreamer010-plugins-bad < %{version} -# Generic name, never used in SuSE: -Provides: gst-plugins-bad = %{version} -%define gstreamer010_plugins_bad_req %(zgrep --text "^GST.*_REQ" %{S:0} | sort -u | sed 's/GST_REQ=/gstreamer-0_10 >= /;s/GSTPB_REQ=/gstreamer-0_10-plugins-base >= /' | tr '\\n' ' ') -Requires: %gstreamer010_plugins_bad_req -Recommends: %{name}-lang -# ensure clean update after package merge. -Provides: gstreamer-0_10-schroedinger = 1.0.8 -Obsoletes: gstreamer-0_10-schroedinger <= 1.0.7 -%if 0%{?suse_version} >= 1140 -Requires(post): glib2-tools -Requires(postun): glib2-tools -%endif %description GStreamer is a streaming media framework based on graphs of filters @@ -196,55 +215,66 @@ %endif %endif -%package -n libgstbasecamerabinsrc-0_10-0 +%package -n libgstbasecamerabinsrc-0_10-23 Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Productivity/Multimedia/Other -%description -n libgstbasecamerabinsrc-0_10-0 +%description -n libgstbasecamerabinsrc-0_10-23 GStreamer is a streaming media framework based on graphs of filters that operate on media data. Applications using this library can do anything media-related,from real-time sound processing to playing videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. -%package -n libgstphotography-0_10-0 +%package -n libgstbasevideo-0_10-23 Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Productivity/Multimedia/Other -%description -n libgstphotography-0_10-0 +%description -n libgstbasevideo-0_10-23 GStreamer is a streaming media framework based on graphs of filters that operate on media data. Applications using this library can do anything media-related,from real-time sound processing to playing videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. -%package -n libgstvdp-0_10-0 +%package -n libgstcodecparsers-0_10-23 Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Productivity/Multimedia/Other -%description -n libgstvdp-0_10-0 +%description -n libgstcodecparsers-0_10-23 GStreamer is a streaming media framework based on graphs of filters that operate on media data. Applications using this library can do anything media-related,from real-time sound processing to playing videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. -%package -n libgstbasevideo-0_10-0 +%package -n libgstphotography-0_10-23 Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Productivity/Multimedia/Other -%description -n libgstbasevideo-0_10-0 +%description -n libgstphotography-0_10-23 GStreamer is a streaming media framework based on graphs of filters that operate on media data. Applications using this library can do anything media-related,from real-time sound processing to playing videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. -%package -n libgstsignalprocessor-0_10-0 +%package -n libgstsignalprocessor-0_10-23 Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Productivity/Multimedia/Other -%description -n libgstsignalprocessor-0_10-0 +%description -n libgstsignalprocessor-0_10-23 +GStreamer is a streaming media framework based on graphs of filters +that operate on media data. Applications using this library can do +anything media-related,from real-time sound processing to playing +videos. Its plug-in-based architecture means that new data types or +processing capabilities can be added simply by installing new plug-ins. + +%package -n libgstvdp-0_10-23 +Summary: GStreamer Streaming-Media Framework Plug-Ins +Group: Productivity/Multimedia/Other + +%description -n libgstvdp-0_10-23 GStreamer is a streaming media framework based on graphs of filters that operate on media data. Applications using this library can do anything media-related,from real-time sound processing to playing @@ -254,7 +284,13 @@ %package devel Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Development/Libraries/C and C++ -Requires: libgstphotography-0_10-0 = %{version} gstreamer-0_10-devel +Requires: gstreamer-0_10-devel +Requires: libgstbasecamerabinsrc-0_10-23 = %{version} +Requires: libgstbasevideo-0_10-23 = %{version} +Requires: libgstcodecparsers-0_10-23 = %{version} +Requires: libgstphotography-0_10-23 = %{version} +Requires: libgstsignalprocessor-0_10-23 = %{version} +Requires: libgstvdp-0_10-23 = %{version} %description devel GStreamer is a streaming media framework based on graphs of filters @@ -282,7 +318,6 @@ %prep %setup -q -n %{_name}-%{version} translation-update-upstream po gst-plugins-bad-0.10 -%patch0 %patch6 %build @@ -310,25 +345,29 @@ %glib2_gsettings_schema_postun %endif -%post -n libgstbasecamerabinsrc-0_10-0 -p /sbin/ldconfig +%post -n libgstbasecamerabinsrc-0_10-23 -p /sbin/ldconfig + +%post -n libgstbasevideo-0_10-23 -p /sbin/ldconfig + +%post -n libgstcodecparsers-0_10-23 -p /sbin/ldconfig -%post -n libgstphotography-0_10-0 -p /sbin/ldconfig +%post -n libgstphotography-0_10-23 -p /sbin/ldconfig -%post -n libgstbasevideo-0_10-0 -p /sbin/ldconfig +%post -n libgstsignalprocessor-0_10-23 -p /sbin/ldconfig -%post -n libgstsignalprocessor-0_10-0 -p /sbin/ldconfig +%post -n libgstvdp-0_10-23 -p /sbin/ldconfig -%post -n libgstvdp-0_10-0 -p /sbin/ldconfig +%postun -n libgstbasevideo-0_10-23 -p /sbin/ldconfig -%postun -n libgstbasecamerabinsrc-0_10-0 -p /sbin/ldconfig +%postun -n libgstbasecamerabinsrc-0_10-23 -p /sbin/ldconfig -%postun -n libgstphotography-0_10-0 -p /sbin/ldconfig +%postun -n libgstcodecparsers-0_10-23 -p /sbin/ldconfig -%postun -n libgstbasevideo-0_10-0 -p /sbin/ldconfig +%postun -n libgstphotography-0_10-23 -p /sbin/ldconfig -%postun -n libgstsignalprocessor-0_10-0 -p /sbin/ldconfig +%postun -n libgstsignalprocessor-0_10-23 -p /sbin/ldconfig -%postun -n libgstvdp-0_10-0 -p /sbin/ldconfig +%postun -n libgstvdp-0_10-23 -p /sbin/ldconfig %files # File not found: /usr/lib64/gstreamer-0.10/libgstjack.so @@ -346,6 +385,7 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstapexsink.so %{_libdir}/gstreamer-%{gst_branch}/libgstasfmux.so %{_libdir}/gstreamer-%{gst_branch}/libgstassrender.so +%{_libdir}/gstreamer-%{gst_branch}/libgstaudiovisualizers.so %{_libdir}/gstreamer-%{gst_branch}/libgstautoconvert.so %{_libdir}/gstreamer-%{gst_branch}/libgstbayer.so %{_libdir}/gstreamer-%{gst_branch}/libgstbz2.so @@ -370,10 +410,12 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstdtmf.so %{_libdir}/gstreamer-%{gst_branch}/libgstdvb.so %{_libdir}/gstreamer-%{gst_branch}/libgstdvbsuboverlay.so +%{_libdir}/gstreamer-%{gst_branch}/libgstfaceoverlay.so %{_libdir}/gstreamer-%{gst_branch}/libgstfbdevsink.so %{_libdir}/gstreamer-%{gst_branch}/libgstfestival.so %{_libdir}/gstreamer-%{gst_branch}/libgstfieldanalysis.so %{_libdir}/gstreamer-%{gst_branch}/libgstfragmented.so +%{_libdir}/gstreamer-%{gst_branch}/libgstfreeverb.so %{_libdir}/gstreamer-%{gst_branch}/libgstfreeze.so %{_libdir}/gstreamer-%{gst_branch}/libgstfrei0r.so %{_libdir}/gstreamer-%{gst_branch}/libgstgaudieffects.so @@ -386,7 +428,6 @@ %{_libdir}/gstreamer-%{gst_branch}/libgsth264parse.so %{_libdir}/gstreamer-%{gst_branch}/libgsthdvparse.so %{_libdir}/gstreamer-%{gst_branch}/libgstid3tag.so -%{_libdir}/gstreamer-%{gst_branch}/libgstinvtelecine.so %{_libdir}/gstreamer-%{gst_branch}/libgstinterlace.so %{_libdir}/gstreamer-%{gst_branch}/libgstivfparse.so %{_libdir}/gstreamer-%{gst_branch}/libgstjp2k.so @@ -400,8 +441,8 @@ %if %{with LV2} %{_libdir}/gstreamer-%{gst_branch}/libgstlv2.so %endif +%{_libdir}/gstreamer-%{gst_branch}/libgstmms.so %{_libdir}/gstreamer-%{gst_branch}/libgstmodplug.so -%{_libdir}/gstreamer-%{gst_branch}/libgstmpeg4videoparse.so %{_libdir}/gstreamer-%{gst_branch}/libgstmpegdemux.so %{_libdir}/gstreamer-%{gst_branch}/libgstmpegpsmux.so %{_libdir}/gstreamer-%{gst_branch}/libgstmpegtsdemux.so @@ -415,6 +456,9 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstnsf.so %{_libdir}/gstreamer-%{gst_branch}/libgstnuvdemux.so %{_libdir}/gstreamer-%{gst_branch}/libgstofa.so +%{_libdir}/gstreamer-%{gst_branch}/libgstopenal.so +# Disabled because of bnc#748666 +#%{_libdir}/gstreamer-%{gst_branch}/libgstopencv.so %{_libdir}/gstreamer-%{gst_branch}/libgstpatchdetect.so %{_libdir}/gstreamer-%{gst_branch}/libgstpcapparse.so %{_libdir}/gstreamer-%{gst_branch}/libgstpnm.so @@ -423,6 +467,7 @@ %ifarch %ix86 x86_64 ppc %{_libdir}/gstreamer-%{gst_branch}/libgstreal.so %endif +%{_libdir}/gstreamer-%{gst_branch}/libgstremovesilence.so %{_libdir}/gstreamer-%{gst_branch}/libgstrfbsrc.so %{_libdir}/gstreamer-%{gst_branch}/libgstrsvg.so %{_libdir}/gstreamer-%{gst_branch}/libgstrtpmux.so @@ -434,11 +479,13 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstsdpelem.so %{_libdir}/gstreamer-%{gst_branch}/libgstsegmentclip.so %{_libdir}/gstreamer-%{gst_branch}/libgstshm.so +%{_libdir}/gstreamer-%{gst_branch}/libgstsmooth.so %{_libdir}/gstreamer-%{gst_branch}/libgstsndfile.so %{_libdir}/gstreamer-%{gst_branch}/libgstsoundtouch.so %{_libdir}/gstreamer-%{gst_branch}/libgstspeed.so %{_libdir}/gstreamer-%{gst_branch}/libgststereo.so %{_libdir}/gstreamer-%{gst_branch}/libgstsubenc.so +%{_libdir}/gstreamer-%{gst_branch}/libgstteletextdec.so %{_libdir}/gstreamer-%{gst_branch}/libgsttimidity.so %{_libdir}/gstreamer-%{gst_branch}/libgsttrm.so %{_libdir}/gstreamer-%{gst_branch}/libgsttta.so @@ -453,6 +500,7 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstvp8.so %{_libdir}/gstreamer-%{gst_branch}/libgsty4mdec.so %{_libdir}/gstreamer-%{gst_branch}/libresindvd.so +%{_libdir}/gstreamer-%{gst_branch}/libgstinter.so %if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG_ADDON} @@ -465,8 +513,9 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstdivxenc.so %endif %endif -%{_datadir}/gstreamer-%{gst_branch}/presets/GstAmrwbEnc.prs -%{_libdir}/gstreamer-%{gst_branch}/libgstamrwbenc.so +%{_datadir}/gstreamer-%{gst_branch}/presets/GstVoAmrwbEnc.prs +%{_libdir}/gstreamer-%{gst_branch}/libgstvoaacenc.so +%{_libdir}/gstreamer-%{gst_branch}/libgstvoamrwbenc.so %{_libdir}/gstreamer-%{gst_branch}/libgstdtsdec.so %{_libdir}/gstreamer-%{gst_branch}/libgstdvdspu.so %{_libdir}/gstreamer-%{gst_branch}/libgstfaac.so @@ -477,41 +526,45 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstrtmp.so %{_libdir}/gstreamer-%{gst_branch}/libgstsiren.so %{_libdir}/gstreamer-%{gst_branch}/libgstxvid.so -%if %{with libmms} -%{_libdir}/gstreamer-%{gst_branch}/libgstmms.so -%endif %endif -%files -n libgstphotography-0_10-0 +%files -n libgstbasecamerabinsrc-0_10-23 +%defattr(-, root, root) +%{_libdir}/libgstbasecamerabinsrc-0.10.so.23* + +%files -n libgstbasevideo-0_10-23 %defattr(-, root, root) -%{_libdir}/libgstphotography-0.10.so.0* +%{_libdir}/libgstbasevideo-0.10.so.23* -%files -n libgstbasevideo-0_10-0 +%files -n libgstcodecparsers-0_10-23 %defattr(-, root, root) -%{_libdir}/libgstbasevideo-0.10.so.0* +%{_libdir}/libgstcodecparsers-0.10.so.23* -%files -n libgstbasecamerabinsrc-0_10-0 +%files -n libgstphotography-0_10-23 %defattr(-, root, root) -%{_libdir}/libgstbasecamerabinsrc-0.10.so.0* +%{_libdir}/libgstphotography-0.10.so.23* -%files -n libgstsignalprocessor-0_10-0 +%files -n libgstsignalprocessor-0_10-23 %defattr(-, root, root) -%{_libdir}/libgstsignalprocessor-0.10.so.0* +%{_libdir}/libgstsignalprocessor-0.10.so.23* -%files -n libgstvdp-0_10-0 +%files -n libgstvdp-0_10-23 %defattr(-, root, root) -%{_libdir}/libgstvdp-0.10.so.0* +%{_libdir}/libgstvdp-0.10.so.23* %files devel %defattr(-, root, root) -%{_includedir}/gstreamer-%{gst_branch} +%{_includedir}/gstreamer-%{gst_branch}/ %{_libdir}/*.so +%{_libdir}/pkgconfig/gstreamer-basevideo-0.10.pc +%{_libdir}/pkgconfig/gstreamer-codecparsers-0.10.pc %{_libdir}/pkgconfig/gstreamer-plugins-bad-0.10.pc %files lang -f %{_name}-%{gst_branch}.lang %files doc %defattr(-, root, root) -%{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{gst_branch} +%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-libs-%{gst_branch}/ +%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{gst_branch}/ %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.udLWci/_old 2012-03-20 12:11:09.000000000 +0100 +++ /var/tmp/diff_new_pack.udLWci/_new 2012-03-20 12:11:09.000000000 +0100 @@ -1,7 +1,8 @@ gstreamer-0_10-plugins-bad gstreamer-0_10-plugins-bad-orig-addon -libgstbasecamerabinsrc-0_10-0 -libgstphotography-0_10-0 -libgstvdp-0_10-0 -libgstbasevideo-0_10-0 -libgstsignalprocessor-0_10-0 +libgstbasecamerabinsrc-0_10-23 +libgstbasevideo-0_10-23 +libgstcodecparsers-0_10-23 +libgstphotography-0_10-23 +libgstsignalprocessor-0_10-23 +libgstvdp-0_10-23 ++++++ gstreamer-0_10-plugins-bad-patch-source.sh ++++++ --- /var/tmp/diff_new_pack.udLWci/_old 2012-03-20 12:11:09.000000000 +0100 +++ /var/tmp/diff_new_pack.udLWci/_new 2012-03-20 12:11:09.000000000 +0100 @@ -13,7 +13,7 @@ SOURCE="$1" NEW_SOURCE=`echo $SOURCE | sed 's/\.tar/-patched.tar/'` -DIRECTORY=`echo $SOURCE | sed 's/\.tar\.bz2//'` +DIRECTORY=`echo $SOURCE | sed 's/\.tar\.xz//'` ALLOWED=" aacparse @@ -24,6 +24,7 @@ amrparse asfmux audioparsers +audiovisualizers autoconvert bayer camerabin @@ -36,8 +37,10 @@ debugutils dtmf dvbsuboverlay +faceoverlay festival fieldanalysis +freeverb freeze frei0r gaudieffects @@ -46,6 +49,7 @@ hdvparse hls id3tag +inter interlace invtelecine ivfparse @@ -70,6 +74,7 @@ qtmux rawparse real +removesilence rtpmux rtpvp8 scaletempo @@ -77,6 +82,7 @@ sdp segmentclip selector +smooth speed stereo subenc @@ -128,7 +134,7 @@ } rm -rf $DIRECTORY -tar xjf $SOURCE || error "Cannot unpack $SOURCE" +tar xJf $SOURCE || error "Cannot unpack $SOURCE" pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\"" for subdir in gst ext sys; do @@ -174,7 +180,7 @@ popd > /dev/null -tar cjf $NEW_SOURCE $DIRECTORY +tar cJf $NEW_SOURCE $DIRECTORY rm -rf $DIRECTORY echo "$NEW_SOURCE is ready to use" ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.udLWci/_old 2012-03-20 12:11:09.000000000 +0100 +++ /var/tmp/diff_new_pack.udLWci/_new 2012-03-20 12:11:09.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -for i in gst-plugins-bad*.tar.bz2 ; do +for i in gst-plugins-bad*.tar.xz ; do case $i in *patched*) continue ;; esac test -f ${i//.tar./-patched.tar.} && continue bash gstreamer-0_10-plugins-bad-patch-source.sh $i -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2012-03-20 12:05:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2012-03-01 07:25:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2012-03-20 12:05:22.000000000 +0100 @@ -1,0 +2,30 @@ +Tue Mar 13 16:11:33 UTC 2012 - vuntz(a)opensuse.org + +- Add NetworkManager Supplements to + NetworkManager-device-plugin-wimax so that it gets automatically + installed by default. + +------------------------------------------------------------------- +Fri Mar 2 19:23:53 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.3.995: + + Linux Wireless Extensions (WEXT) support can be disabled at + configure time with --with-wext=no + + IPv6 Privacy Extensions are now enabled by default for new + connections + + Support for checking Internet connectivity has been added + + The ifnet system config plugin rewrites config files less often +- Add pkgconfig(libsoup-2.4) BuildRequires and pass + --enable-concheck to configure to enable internet connectivity + check. + +------------------------------------------------------------------- +Wed Feb 29 17:59:27 UTC 2012 - dimstar(a)opensuse.org + +- Add with_wimax define, which prepares NM for wimax. If with_wimax + is defined to 1: + + Add pkgconfig(libiWmxSdk-0) BuildRequires + + Change --disable-wimax to --enable-wimax in configure + + Create NetworkManager-device-plugin-wimax subpackage + +------------------------------------------------------------------- Old: ---- NetworkManager-0.9.3.990.tar.xz New: ---- NetworkManager-0.9.3.995.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.pGHneV/_old 2012-03-20 12:05:25.000000000 +0100 +++ /var/tmp/diff_new_pack.pGHneV/_new 2012-03-20 12:05:25.000000000 +0100 @@ -19,10 +19,11 @@ # We cannot enable systemd support right now, as it is exclusive and means we # lose ConsoleKit support (bad for sysvinit) %define with_systemd 0 +%define with_wimax 0 Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ -Version: 0.9.3.990 +Version: 0.9.3.995 Release: 0 Summary: Network Link Manager and User Applications License: GPL-2.0+ @@ -53,12 +54,13 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gudev-1.0) -# We should get lib Intel Wimax in here! Remove --disable-wimax -# from configure when we have it. -#BuildRequires: pkgconfig(libiWmxSdk-0) +%if %{with_wimax} +BuildRequires: pkgconfig(libiWmxSdk-0) >= 1.5.1 +%endif BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(libnl-genl-3.0) BuildRequires: pkgconfig(libnl-route-3.0) +BuildRequires: pkgconfig(libsoup-2.4) >= 2.26 %if %{with_systemd} BuildRequires: pkgconfig(libsystemd-login) %endif @@ -91,6 +93,21 @@ obtain IP addresses from a DHCP server, and change name servers whenever it sees fit. +%if %{with_wimax} +%package device-plugin-wimax +Summary: WiMAX support for NetworkManager +Group: Productivity/Networking/System +Supplements: %{name} + +%description device-plugin-wimax +NetworkManager attempts to keep an active network connection available +at all times. The point of NetworkManager is to make networking +configuration and setup as painless and automatic as possible. If +using DHCP, NetworkManager is intended to replace default routes, +obtain IP addresses from a DHCP server, and change name servers +whenever it sees fit. +%endif + %package devel Summary: Libraries and headers for adding NetworkManager support to applications Group: Development/Libraries/Other @@ -176,10 +193,15 @@ --enable-more-warnings=no \ --with-pppd-plugin-dir=$pppddir \ --with-dhclient=/sbin/dhclient \ + --enable-concheck \ %if %{with_systemd} --with-session-tracking=systemd \ %endif +%if %{with_wimax} + --enable-wimax +%else --disable-wimax +%endif %__make %{?_smp_mflags} %install @@ -241,7 +263,8 @@ %doc %{_mandir}/man5/NetworkManager.conf.5* %doc %{_mandir}/man5/nm-system-settings.conf.5* %doc %{_mandir}/man8/NetworkManager.* -%{_libdir}/NetworkManager/ +%dir %{_libdir}/NetworkManager/ +%{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-suse.so %dir %{_libdir}/pppd/2.4.5 %{_libdir}/pppd/2.4.5/nm-pppd-plugin.* %{_libexecdir}/nm-avahi-autoipd.action @@ -265,6 +288,12 @@ /lib/udev/rules.d/77-nm-olpc-mesh.rules %ghost %config(noreplace) /var/log/NetworkManager +%if %{with_wimax} +%files device-plugin-wimax +%defattr(-,root,root) +%{_libdir}/NetworkManager/libnm-device-plugin-wimax.so +%endif + %files devel %defattr(-,root,root) %{_includedir}/NetworkManager/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5 for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2012-03-20 12:04:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2012-01-06 11:46:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2012-03-20 12:05:10.000000000 +0100 @@ -1,0 +2,44 @@ +Thu Mar 8 19:40:22 UTC 2012 - coolo(a)suse.com + +- fix license to spdx.org format + +------------------------------------------------------------------- +Tue Feb 28 09:08:30 UTC 2012 - pgajdos(a)suse.com + +- fixed build with new pcre (php bug 60986) + +------------------------------------------------------------------- +Sat Feb 4 16:35:07 UTC 2012 - crrodriguez(a)opensuse.org + +- Build with -fpie + +------------------------------------------------------------------- +Thu Feb 2 21:31:00 UTC 2012 - crrodriguez(a)opensuse.org + +- PHP 5.3.10, fixes CVE-2012-0830. + +------------------------------------------------------------------- +Sat Jan 28 18:52:35 UTC 2012 - crrodriguez(a)opensuse.org + +- remove unapplied patches + +------------------------------------------------------------------- +Wed Jan 18 15:17:02 UTC 2012 - pgajdos(a)suse.com + +- buildrequire libjpeg-devel + +------------------------------------------------------------------- +Tue Jan 17 08:35:44 UTC 2012 - pgajdos(a)suse.com + +- remove apache module conflict with apache2-worker [bnc#728671] +- amended README.SUSE instead + +------------------------------------------------------------------- +Wed Jan 11 01:46:14 UTC 2012 - crrodriguez(a)opensuse.org + +- Update to version 5.3.9 + * Drop already applied patches + * This update only contain minor bug fixes, it is a stop over + php 5.4.0 that should be out very soon. + +------------------------------------------------------------------- Old: ---- php-5.3.8-CVE-2011-1466.patch php-5.3.8-CVE-2011-3379.patch php-5.3.8-CVE-2011-4566.patch php-5.3.8-CVE-2011-4885.patch php-5.3.8.tar.bz2 php-wrong-page_size.patch php5-2g-crash.patch suhosin-0.9.32.1.tar.gz New: ---- php-5.3.10-pcre_fullinfo.patch php-5.3.10.tar.bz2 suhosin-0.9.33.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ ++++ 784 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/php5/php5.spec ++++ and /work/SRC/openSUSE:Factory/.php5.new/php5.spec ++++++ php-5.3.10-pcre_fullinfo.patch ++++++ http://svn.php.net/viewvc/?view=revision&revision=323096 http://svn.php.net/viewvc/?view=revision&revision=323097 Index: ext/pcre/php_pcre.c =================================================================== --- ext/pcre/php_pcre.c.orig +++ ext/pcre/php_pcre.c @@ -241,6 +241,7 @@ PHPAPI pcre_cache_entry* pcre_get_compil char *pattern; int do_study = 0; int poptions = 0; + int count = 0; unsigned const char *tables = NULL; #if HAVE_SETLOCALE char *locale = setlocale(LC_CTYPE, NULL); @@ -252,10 +253,10 @@ PHPAPI pcre_cache_entry* pcre_get_compil back the compiled pattern, otherwise go on and compile it. */ if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) { /* - * We use a quick pcre_info() check to see whether cache is corrupted, and if it + * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it * is, we flush it and compile the pattern from scratch. */ - if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { + if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { zend_hash_clean(&PCRE_G(pcre_cache)); } else { #if HAVE_SETLOCALE Index: ext/pcre/php_pcre.def =================================================================== --- ext/pcre/php_pcre.def.orig +++ ext/pcre/php_pcre.def @@ -4,7 +4,6 @@ php_pcre_copy_substring php_pcre_exec php_pcre_get_substring php_pcre_get_substring_list -php_pcre_info php_pcre_maketables php_pcre_study php_pcre_version Index: main/php_compat.h =================================================================== --- main/php_compat.h.orig +++ main/php_compat.h @@ -34,7 +34,6 @@ #define pcre_exec php_pcre_exec #define pcre_get_substring php_pcre_get_substring #define pcre_get_substring_list php_pcre_get_substring_list -#define pcre_info php_pcre_info #define pcre_maketables php_pcre_maketables #define pcre_study php_pcre_study #define pcre_version php_pcre_version ++++++ php-5.3.8.tar.bz2 -> php-5.3.10.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/php5/php-5.3.8.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.3.10.tar.bz2 differ: char 11, line 1 ++++++ php-5.3.2-aconf26x.patch ++++++ --- /var/tmp/diff_new_pack.DRhkKB/_old 2012-03-20 12:05:14.000000000 +0100 +++ /var/tmp/diff_new_pack.DRhkKB/_new 2012-03-20 12:05:14.000000000 +0100 @@ -40,7 +40,7 @@ --- configure.in.orig +++ configure.in @@ -1,7 +1,7 @@ - ## $Id: configure.in 315343 2011-08-23 08:56:29Z johannes $ -*- autoconf -*- + ## $Id: configure.in 323027 2012-02-02 17:29:58Z johannes $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) @@ -81,7 +81,7 @@ dnl ## In diversion 3 we check for compile-time options to the PHP dnl ## core and how to deal with different system dependencies. -@@ -675,7 +675,7 @@ if test "x$php_crypt_r" = "x1"; then +@@ -683,7 +683,7 @@ if test "x$php_crypt_r" = "x1"; then PHP_CRYPT_R_STYLE fi @@ -90,7 +90,7 @@ dnl ## In diversion 4 we check user-configurable general settings. -@@ -916,7 +916,7 @@ else +@@ -924,7 +924,7 @@ else AC_MSG_RESULT([using system default]) fi @@ -99,6 +99,16 @@ dnl ## In diversion 5 we check which extensions should be compiled. dnl ## All of these are normally in the extension directories. +@@ -1351,7 +1351,8 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) + ]) +-AC_PROG_LIBTOOL ++LT_INIT([disable-static pic-only dlopen]) ++#AC_PROG_LIBTOOL + + if test "$enable_debug" != "yes"; then + PHP_SET_LIBTOOL_VARIABLE([--silent]) --- build/buildcheck.sh.orig +++ build/buildcheck.sh @@ -51,7 +51,7 @@ if test "$1" = "2" -a "$2" -gt "59"; the ++++++ php-5.3.4-format-string-issues.patch ++++++ --- /var/tmp/diff_new_pack.DRhkKB/_old 2012-03-20 12:05:14.000000000 +0100 +++ /var/tmp/diff_new_pack.DRhkKB/_new 2012-03-20 12:05:14.000000000 +0100 @@ -11,7 +11,7 @@ PHPAPI char * php_conv_fp(register char format, register double num, --- main/main.c.orig +++ main/main.c -@@ -880,7 +880,7 @@ PHPAPI void php_html_puts(const char *st +@@ -898,7 +898,7 @@ PHPAPI void php_html_puts(const char *st /* {{{ php_error_cb extended error handling function */ @@ -89,25 +89,25 @@ if (p) { --- sapi/cli/php_cli.c.orig +++ sapi/cli/php_cli.c -@@ -832,8 +832,8 @@ int main(int argc, char *argv[]) +@@ -826,8 +826,8 @@ int main(int argc, char *argv[]) } request_started = 1; -- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s", +- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2012 The PHP Group\n%s", - PHP_VERSION, sapi_module.name, __DATE__, __TIME__, -+ php_printf("PHP %s (%s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s", ++ php_printf("PHP %s (%s) %s\nCopyright (c) 1997-2012 The PHP Group\n%s", + PHP_VERSION, sapi_module.name, #if ZEND_DEBUG && defined(HAVE_GCOV) "(DEBUG GCOV)", #elif ZEND_DEBUG --- sapi/cgi/cgi_main.c.orig +++ sapi/cgi/cgi_main.c -@@ -1932,7 +1932,7 @@ consult the installation file that came +@@ -1935,7 +1935,7 @@ consult the installation file that came #if ZEND_DEBUG - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #else -- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); -+ php_printf("PHP %s (%s) \nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); +- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s (%s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #endif php_request_shutdown((void *) 0); fcgi_shutdown(); ++++++ php-suse-addons.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/php-suse-addons/README.SUSE new/php-suse-addons/README.SUSE --- old/php-suse-addons/README.SUSE 2011-12-20 15:41:52.000000000 +0100 +++ new/php-suse-addons/README.SUSE 2012-01-18 09:56:57.000000000 +0100 @@ -41,7 +41,11 @@ Enabling/disabling the PHP5 module for Apache ============================================= - - do not use PHP module with Apache Worker + - PHP.net does not recommend to use PHP with Apache Worker, as some of the + libraries PHP relies on are not thread safe; see + http://php.net/manual/en/install.unix.apache2.php + http://www.php.net/manual/en/faq.installation.php#faq.installation.apache2 + for details - in /etc/sysconfig/apache2, add "php5" to APACHE_MODULES, or remove it to disable - possibly include /etc/apache2/conf.d/mod_php5.conf in individual virtual -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cogl for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package cogl for openSUSE:Factory checked in at 2012-03-20 12:04:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cogl (Old) and /work/SRC/openSUSE:Factory/.cogl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cogl", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cogl/cogl.changes 2012-03-01 09:50:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cogl.new/cogl.changes 2012-03-20 12:05:00.000000000 +0100 @@ -1,0 +2,36 @@ +Tue Mar 6 08:18:28 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.9.8: + + Various Visual Studio build fixes + + Correctly check for GL_EXT_packed_depth_stencil and support + using GL_OES_packed_depth_stencil on GLES2 + + Correctly handle pre-multiplied alpha conversions when reading + back texture data. + + Added cogl_renderer_{get,set}_driver functions so the + underlying driver can be chosen programmatically. + + Revamped the conformance testing framework so that it + automatically runs every test against GLES2 as well as GL and + also against all of the pipeline backends and with npot + textures disabled. + + Add a conformance test for reading back an RGBA texture as + alpha-only + + Added support for converting between all of Cogl's supported + pixel formats including pre-multiplied alpha conversions. + + Added conformance tests for converting to and from all of the + supported formats. + + Added a public cogl_framebuffer_read_pixels_into_bitmap() + function which will effective read into a CoglPixelBuffer. + + CoglPixelBuffer was changed to no longer have associated width, + height and format information and instead we will rely on + CoglBitmap to track that informations. + + Added public cogl_bitmap_get_{width,height,format,rowstride} + API + + Added a public accessor for the underlying pixel buffer of a + CoglBitmap. + + Added various missing cast macros for some buffer objects. + + Ported the Clutter based test-pixel-buffer test to be + standalone. + + Bugs fixed: bgo#666184, bgo#670793, bgo#671016. +- Rename libcogl8 to libcogl9, following upstream soversion change. + +------------------------------------------------------------------- Old: ---- cogl-1.9.6.tar.xz New: ---- cogl-1.9.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cogl.spec ++++++ --- /var/tmp/diff_new_pack.6cINxe/_old 2012-03-20 12:05:02.000000000 +0100 +++ /var/tmp/diff_new_pack.6cINxe/_new 2012-03-20 12:05:02.000000000 +0100 @@ -17,7 +17,7 @@ Name: cogl -Version: 1.9.6 +Version: 1.9.8 Release: 0 Summary: An object oriented GL/GLES Abstraction/Utility Layer License: LGPL-2.1+ @@ -45,7 +45,7 @@ Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures. -%package -n libcogl8 +%package -n libcogl9 Summary: An object oriented GL/GLES Abstraction/Utility Layer Group: System/Libraries Requires: Mesa @@ -53,7 +53,7 @@ # To make the lang package installable Provides: %{name} = %{version} -%description -n libcogl8 +%description -n libcogl9 Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures. @@ -91,8 +91,8 @@ Group: Development/Libraries/GNOME # cogl-defines.h includes GL/gl.h Requires: Mesa-devel -Requires: libcogl8 = %{version} Requires: libcogl-pango0 = %{version} +Requires: libcogl9 = %{version} Requires: typelib-1_0-Cogl-1_0 = %{version} Requires: typelib-1_0-CoglPango-1_0 = %{version} @@ -117,15 +117,15 @@ %find_lang cogl %fdupes %{buildroot}%{_libdir}/pkgconfig/ -%post -n libcogl8 -p /sbin/ldconfig +%post -n libcogl9 -p /sbin/ldconfig -%postun -n libcogl8 -p /sbin/ldconfig +%postun -n libcogl9 -p /sbin/ldconfig %post -n libcogl-pango0 -p /sbin/ldconfig %postun -n libcogl-pango0 -p /sbin/ldconfig -%files -n libcogl8 +%files -n libcogl9 %defattr(-,root,root) %doc COPYING NEWS README ChangeLog %{_libdir}/libcogl.so.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.6cINxe/_old 2012-03-20 12:05:02.000000000 +0100 +++ /var/tmp/diff_new_pack.6cINxe/_new 2012-03-20 12:05:02.000000000 +0100 @@ -1,3 +1,3 @@ -libcogl8 +libcogl9 requires "Mesa-<targettype>" libcogl-pango0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linux-glibc-devel for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package linux-glibc-devel for openSUSE:Factory checked in at 2012-03-20 12:04:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linux-glibc-devel (Old) and /work/SRC/openSUSE:Factory/.linux-glibc-devel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linux-glibc-devel", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/linux-glibc-devel/linux-glibc-devel.changes 2012-01-09 11:15:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linux-glibc-devel.new/linux-glibc-devel.changes 2012-03-20 12:04:58.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 19 12:24:26 UTC 2012 - aj(a)suse.de + +- Update to Linux 3.3 headers. + +------------------------------------------------------------------- +Fri Mar 16 08:28:51 UTC 2012 - aj(a)suse.de + +- Update version.h text (bnc#751668). + +------------------------------------------------------------------- Old: ---- linux-glibc-devel-3.2.tar.bz2 New: ---- linux-glibc-devel-3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux-glibc-devel.spec ++++++ --- /var/tmp/diff_new_pack.ijx83b/_old 2012-03-20 12:04:59.000000000 +0100 +++ /var/tmp/diff_new_pack.ijx83b/_new 2012-03-20 12:04:59.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + BuildRequires: fdupes Name: linux-glibc-devel @@ -24,10 +25,10 @@ BuildArch: noarch # this confusing version number has no meaning, it's the version # of the Linux kernel where these headers come from -Version: 3.2.0 +Version: 3.3.0 Release: 0 # A "-" is not allowed in version -%define upstream_version 3.2 +%define upstream_version 3.3 Url: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kernel-headers @@ -66,25 +67,26 @@ #error "programs should not directly include <linux/*.h> or" #error "<asm/*.h> as well." #error "" -#error "To build kernel modules please do the following:" -#error "" -#error " o Have the kernel sources installed" -#error "" -#error " o Make sure that the symbolic link" -#error " /lib/modules/\`uname -r\`/build exists and points to" -#error " the matching kernel source directory" -#error "" -#error " o When compiling, make sure to use the following" -#error " compiler option to use the correct include files:" +#error "Since Linux 2.6, the kernel module build process has been" +#error "updated such that users building modules should not typically" +#error "need to specify additional include directories at all." +#error "" +#error "To build kernel modules, ensure you have the build environment " +#error "available either via the kernel-devel and kernel-<flavor>-devel " +#error "packages or a properly configured kernel source tree." +#error "" +#error "Then, modules can be built using:" +#error "make -C <path> M=$PWD" +#error "" +#error "For the currently running kernel there will be a symbolic " +#error "link pointing to the build environment located at " +#error "/lib/modules/$(uname -r)/build for use as <path>." #error "" -#error " -I/lib/modules/\`uname -r\`/build/include" +#error "If you are seeing this message, your environment is " +#error "not configured properly. " #error "" -#error " instead of" -#error "" -#error " -I/usr/include/linux" -#error "" -#error " Please adjust the Makefile accordingly." -#error "=======================================================" +#error "Please adjust the Makefile accordingly." +#error "======================================================= #else BOGUS # Get LINUX_VERSION_CODE and KERNEL_VERSION directly from kernel ++++++ linux-glibc-devel-3.2.tar.bz2 -> linux-glibc-devel-3.3.tar.bz2 ++++++ ++++ 5241 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 yast2-core for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at 2012-03-20 12:04:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-core (Old) and /work/SRC/openSUSE:Factory/.yast2-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-core", Maintainer is "mvidner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-core/yast2-core.changes 2012-02-06 16:41:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-core.new/yast2-core.changes 2012-03-20 12:04:55.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Mar 19 11:18:22 CET 2012 - aschnell(a)suse.de + +- fixed for gcc 4.7 + +------------------------------------------------------------------- +Fri Mar 16 14:40:00 CET 2012 - aschnell(a)suse.de + +- do not use xcrypt (removes bigcrypt) (fate #312617) +- 2.22.5 + +------------------------------------------------------------------- +Wed Feb 22 14:59:37 CET 2012 - aschnell(a)suse.de + +- added tointeger builtin with explicite base qualification +- 2.22.4 + +------------------------------------------------------------------- Old: ---- yast2-core-2.22.3.tar.bz2 New: ---- yast2-core-2.22.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.JNgnYm/_old 2012-03-20 12:04:57.000000000 +0100 +++ /var/tmp/diff_new_pack.JNgnYm/_new 2012-03-20 12:04:57.000000000 +0100 @@ -16,20 +16,20 @@ # + Name: yast2-core -Version: 2.22.3 +Version: 2.22.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-core-%{version}.tar.bz2 +Group: System/YaST +License: GPL-2.0+ # obviously -BuildRequires: boost-devel -BuildRequires: gcc-c++ -BuildRequires: libtool +BuildRequires: boost-devel gcc-c++ libtool # we have a parser -BuildRequires: bison -BuildRequires: flex +BuildRequires: bison flex # needed for all yast packages BuildRequires: yast2-devtools # testsuite @@ -37,19 +37,14 @@ # autodocs BuildRequires: doxygen # docbook docs -BuildRequires: docbook-xsl-stylesheets -BuildRequires: libxslt +BuildRequires: docbook-xsl-stylesheets libxslt # catalog: convert URIs to local filenames BuildRequires: sgml-skel # logging # renamed: http://lists.opensuse.org/opensuse-packaging/2007-11/msg00076.html BuildRequires: libblocxx-devel -# libycp includes crypto built-ins -BuildRequires: libxcrypt-devel Summary: YaST2 - Core Libraries -License: GPL-2.0+ -Group: System/YaST Requires: perl = %{perl_version} Provides: liby2util = 2.16.1 Obsoletes: liby2util < 2.16.1 @@ -62,10 +57,9 @@ Requires: yast2-core = %version Summary: YaST2 - Core Libraries -Group: System/YaST Provides: liby2util-devel = 2.16.1 Obsoletes: liby2util-devel < 2.16.1 -Requires: libxcrypt-devel hwinfo-devel +Requires: hwinfo-devel Requires: glibc-devel libstdc++-devel pcre-devel libblocxx-devel sysfsutils # required for libscr # for FlexLexer.h; I think that this dependency could be made @@ -78,8 +72,8 @@ %package debugger Requires: yast2-core = %version -Summary: YaST2 - Core Libraries Group: Development/Libraries +Summary: YaST2 - Core Libraries %description debugger YCP debugger client. @@ -105,6 +99,7 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works ++++++ yast2-core-2.22.3.tar.bz2 -> yast2-core-2.22.5.tar.bz2 ++++++ ++++ 24252 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 systemd for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2012-03-20 12:04:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-gtk.changes 2012-03-13 00:46:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-gtk.changes 2012-03-20 12:04:51.000000000 +0100 @@ -1,0 +2,27 @@ +Mon Mar 19 10:11:23 UTC 2012 - fcrozat(a)suse.com + +- Add 0001-util-never-follow-symlinks-in-rm_rf_children.patch: fix + CVE-2012-1174 (bnc#752281). + +------------------------------------------------------------------- +Fri Mar 16 09:21:54 UTC 2012 - fcrozat(a)suse.com + +- Update to version 43: + + Support optional initialization of the machine ID from the KVM + or container configured UUID. + + Support immediate reboots with "systemctl reboot -ff" + + Show /etc/os-release data in systemd-analyze output + + Many bugfixes for the journal, including endianess fixes and + ensuring that disk space enforcement works + + non-UTF8 strings are refused if used in configuration and unit + files. + + Register Mimo USB Screens as suitable for automatic seat + configuration + + Reorder configuration file lookup order. /etc now always + overrides /run. + + manpages for journal utilities. +- Drop fix-c++-compat.patch, no-tmpfs-fsck.patch, + systemd-journald-fix-endianess-bug.patch. +- Requires util-linux >= 2.21 (needed to fix fsck on tmpfs). + +------------------------------------------------------------------- systemd.changes: same change Old: ---- fix-c++-compat.patch no-tmpfs-fsck.patch systemd-43.tar.xz systemd-journald-fix-endianess-bug.patch New: ---- 0001-util-never-follow-symlinks-in-rm_rf_children.patch systemd-44.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-gtk.spec ++++++ --- /var/tmp/diff_new_pack.JGceoI/_old 2012-03-20 12:04:55.000000000 +0100 +++ /var/tmp/diff_new_pack.JGceoI/_new 2012-03-20 12:04:55.000000000 +0100 @@ -18,7 +18,7 @@ Name: systemd-gtk Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 43 +Version: 44 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.JGceoI/_old 2012-03-20 12:04:55.000000000 +0100 +++ /var/tmp/diff_new_pack.JGceoI/_new 2012-03-20 12:04:55.000000000 +0100 @@ -20,7 +20,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 43 +Version: 44 Release: 0 Summary: A System and Session Manager License: GPL-2.0+ @@ -52,7 +52,7 @@ Requires: pam-config >= 0.79-5 Requires: systemd-presets-branding Requires: udev >= 172 -Requires: util-linux >= 2.19 +Requires: util-linux >= 2.21 Recommends: dbus-1-python Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -86,9 +86,7 @@ # Never add any patches to this package without the upstream commit id # in the patch. Any patches added here without a very good reason to make # an exception will be silently removed with the next version update. -Patch21: no-tmpfs-fsck.patch -Patch40: systemd-journald-fix-endianess-bug.patch -Patch41: fix-c++-compat.patch +Patch40: 0001-util-never-follow-symlinks-in-rm_rf_children.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -139,7 +137,6 @@ %patch15 -p1 %patch16 -p1 %patch19 -p1 -%patch21 -p1 %patch22 -p1 %patch23 -p1 %patch24 -p1 @@ -149,7 +146,6 @@ %patch38 -p1 %patch39 -p1 %patch40 -p1 -%patch41 -p1 %build autoreconf -fiv ++++++ 0001-util-never-follow-symlinks-in-rm_rf_children.patch ++++++ >From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 From: Michal Schmidt <mschmidt(a)redhat.com> Date: Fri, 2 Mar 2012 10:39:10 +0100 Subject: [PATCH] util: never follow symlinks in rm_rf_children() The function checks if the entry is a directory before recursing, but there is a window between the check and the open, during which the directory could be replaced with a symlink. CVE-2012-1174 https://bugzilla.redhat.com/show_bug.cgi?id=803358 --- src/util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util.c b/src/util.c index 20cbc2b..dfc1dc6 100644 --- a/src/util.c +++ b/src/util.c @@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { if (is_dir) { int subdir_fd; - if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { + subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); + if (subdir_fd < 0) { if (ret == 0 && errno != ENOENT) ret = -errno; continue; -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpm for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2012-03-20 12:04:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpm", Maintainer is "mls(a)suse.com" Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-02-03 10:26:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-03-20 12:04:41.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Mar 13 21:53:12 UTC 2012 - dimstar(a)opensuse.org + +- Add rpm-gcc47.patch: Fix build with gcc 4.7 by correcting a + strncat call and including missing headers. + +------------------------------------------------------------------- +Tue Mar 13 14:40:47 UTC 2012 - vuntz(a)opensuse.org + +- Add findlang-new-help.diff: patch based on git commit 6047ddf6 to + make find-lang know about the new gnome help layout. +- Add findlang-new-help-fix.diff: additional fix to above patch, so + that locales with a territory work too (for instance, fr_FR). +- Rebase langnoc.diff on top of findlang-new-help.diff, so that we + won't need to rebase it with a future release containing + findlang-new-help.diff. +- Update remove-translations.diff to also remove help translations + for languages that are not supported by the filesystem package. + +------------------------------------------------------------------- New: ---- findlang-new-help-fix.diff findlang-new-help.diff rpm-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-rpm.spec ++++++ --- /var/tmp/diff_new_pack.VdGEti/_old 2012-03-20 12:04:51.000000000 +0100 +++ /var/tmp/diff_new_pack.VdGEti/_new 2012-03-20 12:04:51.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: python3-rpm Version: 4.9.1.2 Release: 0 rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.VdGEti/_old 2012-03-20 12:04:51.000000000 +0100 +++ /var/tmp/diff_new_pack.VdGEti/_new 2012-03-20 12:04:51.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: rpm BuildRequires: binutils BuildRequires: bzip2 @@ -118,7 +117,7 @@ Patch62: pythondeps.diff Patch63: fontprovides.diff Patch64: rpm-gst-provides.patch -Patch65: langnoc.diff +Patch65: findlang-new-help.diff Patch66: initscriptsprov.diff Patch67: remove-translations.diff Patch68: no_rep_autop.diff @@ -136,6 +135,9 @@ Patch80: rpm-deptracking.patch Patch81: python3-abi-kind.diff Patch82: perl-python-attr.patch +Patch83: findlang-new-help-fix.diff +Patch84: langnoc.diff +Patch85: rpm-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -169,19 +171,20 @@ Summary: Tools and Scripts to create rpm packages Group: System/Packages Requires: rpm = %{version} -Provides: rpmbuild rpm:%_bindir/rpmbuild +Provides: rpm:%_bindir/rpmbuild +Provides: rpmbuild # SUSE's build essentials -Requires: bzip2 -Requires: xz -Requires: gzip Requires: binutils -Requires: make +Requires: bzip2 +Requires: findutils Requires: gcc Requires: gettext-tools -Requires: findutils -Requires: patch Requires: glibc-devel +Requires: gzip +Requires: make +Requires: patch Requires: perl-base +Requires: xz %description build If you want to build a rpm, you need this package. It provides rpmbuild @@ -208,7 +211,7 @@ %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 -%patch -P 80 -P 81 -P 82 +%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov ++++++ findlang-new-help-fix.diff ++++++ Index: scripts/find-lang.sh =================================================================== --- scripts/find-lang.sh.orig +++ scripts/find-lang.sh @@ -139,8 +139,8 @@ s:%lang(C) :: find $TOP_DIR -type d|sed ' s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$GNOME"'s:$.*/share/help/$$[^/_]\+$$/'"$NAME"'$$:%lang(\2) %doc \1\2\3/: -'"$ALL_NAME$GNOME"'s:$.*/share/help/$$[^/_]\+$$/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) %doc \1\2\3/: +'"$NO_ALL_NAME$GNOME"'s:$.*/share/help/$$[^/_]\+$$[^/]*$$/'"$NAME"'$$:%lang(\2) %doc \1\2\3\4/: +'"$ALL_NAME$GNOME"'s:$.*/share/help/$$[^/_]\+$$[^/]*$$/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) %doc \1\2\3\4/: s:^$[^%].*$:: s:%lang(C) :: /^$/d' >> $MO_NAME_NEW ++++++ findlang-new-help.diff ++++++ >From 6047ddf6aa984a65e334450e04d272631894b039 Mon Sep 17 00:00:00 2001 From: Panu Matilainen <pmatilai(a)redhat.com> Date: Wed, 7 Mar 2012 11:31:15 +0200 Subject: [PATCH] Teach find-lang about the new gnome help layout (RhBug:736523) --- scripts/find-lang.sh | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) Index: scripts/find-lang.sh =================================================================== --- scripts/find-lang.sh.orig +++ scripts/find-lang.sh @@ -122,6 +122,14 @@ s:%lang(C) :: find $TOP_DIR -type d|sed ' s:'"$TOP_DIR"':: +'"$NO_ALL_NAME$GNOME"'s:$.*/share/help/$$[^/_]\+$$/'"$NAME"'$$:%lang(\2) %doc \1\2\3/: +'"$ALL_NAME$GNOME"'s:$.*/share/help/$$[^/_]\+$$/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) %doc \1\2\3/: +s:^$[^%].*$:: +s:%lang(C) :: +/^$/d' >> $MO_NAME_NEW + +find $TOP_DIR -type d|sed ' +s:'"$TOP_DIR"':: '"$NO_ALL_NAME$GNOME"'s:$.*/gnome/help/'"$NAME"'$$:%dir %doc \1: '"$NO_ALL_NAME$GNOME"'s:$.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+$:: '"$NO_ALL_NAME$GNOME"'s:$.*/gnome/help/'"$NAME"'\/$$[^/_]\+$:%lang(\2) %doc \1\2: ++++++ langnoc.diff ++++++ --- /var/tmp/diff_new_pack.VdGEti/_old 2012-03-20 12:04:51.000000000 +0100 +++ /var/tmp/diff_new_pack.VdGEti/_new 2012-03-20 12:04:51.000000000 +0100 @@ -1,6 +1,8 @@ ---- ./macros.in.orig 2011-07-18 17:18:24.000000000 +0000 -+++ ./macros.in 2011-07-18 17:18:36.000000000 +0000 -@@ -1249,6 +1249,7 @@ EOF +Index: macros.in +=================================================================== +--- macros.in.orig ++++ macros.in +@@ -1253,6 +1253,7 @@ EOF # %files -f %{name}.lang # %find_lang %{_rpmconfigdir}/find-lang.sh %{buildroot} @@ -8,8 +10,10 @@ # Commands + opts to use for retrieving remote files # Proxy opts can be set through --httpproxy/--httpport popt aliases, ---- ./scripts/find-lang.sh.orig 2011-07-18 17:18:24.000000000 +0000 -+++ ./scripts/find-lang.sh 2011-07-18 17:18:36.000000000 +0000 +Index: scripts/find-lang.sh +=================================================================== +--- scripts/find-lang.sh.orig ++++ scripts/find-lang.sh @@ -62,6 +62,8 @@ MO= MO_NAME=$NAME.lang ALL_NAME=# @@ -34,7 +38,7 @@ * ) MO_NAME=${1} shift -@@ -117,27 +127,32 @@ s:'"$TOP_DIR"':: +@@ -134,6 +144,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$MO"'s:$.*/locale/$$[^/_]\+$$.*\.mo$$:%lang(\2) \1\2\3: '"$NO_ALL_NAME$MO"'s:$.*/locale/$$[^/_]\+$$.*/'"$NAME"'\.mo$$:%lang(\2) \1\2\3: s:^$[^%].*$:: @@ -43,6 +47,15 @@ s:%lang(C) :: /^$/d' >> $MO_NAME_NEW +@@ -142,27 +154,32 @@ s:'"$TOP_DIR"':: + '"$NO_ALL_NAME$GNOME"'s:$.*/share/help/$$[^/_]\+$$[^/]*$$/'"$NAME"'$$:%lang(\2) %doc \1\2\3\4/: + '"$ALL_NAME$GNOME"'s:$.*/share/help/$$[^/_]\+$$[^/]*$$/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) %doc \1\2\3\4/: + s:^$[^%].*$:: ++'"$ONLY_C"'/%lang(C)/!d ++'"$NO_C"'/%lang(C)/d + s:%lang(C) :: + /^$/d' >> $MO_NAME_NEW + find $TOP_DIR -type d|sed ' s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$GNOME"'s:$.*/gnome/help/'"$NAME"'$$:%dir %doc \1: @@ -71,7 +84,7 @@ /^$/d' >> $MO_NAME_NEW find $TOP_DIR -type f|sed ' -@@ -145,6 +160,8 @@ s:'"$TOP_DIR"':: +@@ -170,6 +187,8 @@ s:'"$TOP_DIR"':: '"$NO_ALL_NAME$GNOME"'s:$.*/omf/'"$NAME"'/'"$NAME"'-\([^/.]\+$\.omf\):%lang(\2) \1: '"$ALL_NAME$GNOME"'s:$.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+$\.omf\):%lang(\2) \1: s:^[^%].*:: @@ -80,7 +93,7 @@ s:%lang(C) :: /^$/d' >> $MO_NAME_NEW -@@ -157,6 +174,8 @@ s:'"$TOP_DIR"':: +@@ -182,6 +201,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+/$:: '"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) \1\2\3: s:^$[^%].*$:: @@ -89,7 +102,7 @@ s:%lang(C) :: /^$/d' >> $MO_NAME_NEW fi -@@ -170,6 +189,8 @@ s:'"$TOP_DIR"':: +@@ -195,6 +216,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+/$:: '"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) \1\2\3: s:^$[^%].*$:: @@ -98,7 +111,7 @@ s:%lang(C) :: /^$/d' >> $MO_NAME_NEW fi -@@ -182,6 +203,8 @@ s:'"$TOP_DIR"':: +@@ -207,6 +230,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$QT"'s:^$[^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*$\.qm$\):%lang(\2) \1: '"$ALL_NAME$QT"'s:^$[^%].*/[^/]\+_\([a-zA-Z]\{2\}$\.qm$\):%lang(\2) \1: s:^[^%].*:: @@ -107,7 +120,7 @@ s:%lang(C) :: /^$/d' >> $MO_NAME_NEW -@@ -190,6 +213,8 @@ s:'"$TOP_DIR"':: +@@ -215,6 +240,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$MAN"'s:$.*/man/\([^/_]\+$.*/man[a-z0-9]\+/\):: '"$ALL_NAME$MAN"'s:$.*/man/\([^/_]\+$.*/man[a-z0-9]\+$\):%lang(\2) \1*: s:^$[^%].*$:: @@ -116,7 +129,7 @@ s:%lang(C) :: /^$/d' >> $MO_NAME_NEW -@@ -197,6 +222,8 @@ find $TOP_DIR -type f -o -type l|sed ' +@@ -222,6 +249,8 @@ find $TOP_DIR -type f -o -type l|sed ' s:'"$TOP_DIR"':: '"$NO_ALL_NAME$MAN"'s:$.*/man/\([^/_]\+$.*/man[a-z0-9]\+/'"$NAME"'\.[a-z0-9].*\):%lang(\2) \1*: s:^$[^%].*$:: ++++++ remove-translations.diff ++++++ --- /var/tmp/diff_new_pack.VdGEti/_old 2012-03-20 12:04:51.000000000 +0100 +++ /var/tmp/diff_new_pack.VdGEti/_new 2012-03-20 12:04:51.000000000 +0100 @@ -1,8 +1,8 @@ Index: scripts/find-lang.sh =================================================================== ---- scripts/find-lang.sh.orig 2011-12-09 14:46:32.443023115 +0100 -+++ scripts/find-lang.sh 2011-12-09 14:46:52.086092200 +0100 -@@ -122,6 +122,17 @@ fi +--- scripts/find-lang.sh.orig ++++ scripts/find-lang.sh +@@ -112,6 +112,23 @@ fi MO_NAME_NEW=$MO_NAME.tmp.$$ rm -f $MO_NAME_NEW @@ -16,6 +16,12 @@ + rm -rf $TOP_DIR/usr/share/locale/$dir + fi +done ++find $TOP_DIR/usr/share/help/ -maxdepth 1 -type d | sed 's:'"$TOP_DIR"/usr/share/help/'::; /^$/d' | while read dir; do ++ if ! rpm -ql filesystem | egrep -q "/usr/share/help/$dir"$; then ++ echo -n "removing help translation /usr/share/help/$dir" ++ rm -rf $TOP_DIR/usr/share/help/$dir ++ fi ++done + find $TOP_DIR -type f -o -type l|sed ' s:'"$TOP_DIR"':: ++++++ rpm-gcc47.patch ++++++ Index: rpmio/rpmio.c =================================================================== --- rpmio/rpmio.c.orig +++ rpmio/rpmio.c @@ -1576,8 +1576,8 @@ fprintf(stderr, "*** Fdopen(%p,%s) %s\n" if (stdio[0] == '\0') return NULL; zstdio[0] = '\0'; - strncat(zstdio, stdio, sizeof(zstdio) - strlen(zstdio)); - strncat(zstdio, other, sizeof(zstdio) - strlen(zstdio)); + strncat(zstdio, stdio, sizeof(zstdio) - strlen(zstdio) - 1); + strncat(zstdio, other, sizeof(zstdio) - strlen(zstdio) - 1); if (end == NULL && other[0] == '\0') return fd; Index: lib/signature.c =================================================================== --- lib/signature.c.orig +++ lib/signature.c @@ -5,6 +5,7 @@ #include "system.h" #include <inttypes.h> +#include <arpa/inet.h> #include <rpm/rpmtypes.h> #include <rpm/rpmstring.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2012-03-20 12:04:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2012-02-16 16:25:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2012-03-20 12:04:36.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 14 15:42:19 CET 2012 - aschnell(a)suse.de + +- create link yast.ssh for 2nd stage ssh installation (bnc#745340) +- 2.22.5 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.22.4.tar.bz2 New: ---- yast2-installation-2.22.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.LEWiN3/_old 2012-03-20 12:04:38.000000000 +0100 +++ /var/tmp/diff_new_pack.LEWiN3/_new 2012-03-20 12:04:38.000000000 +0100 @@ -18,7 +18,7 @@ Name: yast2-installation -Version: 2.22.4 +Version: 2.22.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -153,6 +153,7 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works ++++++ yast2-installation-2.22.4.tar.bz2 -> yast2-installation-2.22.5.tar.bz2 ++++++ ++++ 2661 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.22.4/VERSION new/yast2-installation-2.22.5/VERSION --- old/yast2-installation-2.22.4/VERSION 2012-02-14 15:28:13.000000000 +0100 +++ new/yast2-installation-2.22.5/VERSION 2012-03-16 18:01:09.000000000 +0100 @@ -1 +1 @@ -2.22.4 +2.22.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.22.4/configure.in new/yast2-installation-2.22.5/configure.in --- old/yast2-installation-2.22.4/configure.in 2012-02-14 15:44:28.000000000 +0100 +++ new/yast2-installation-2.22.5/configure.in 2012-03-16 18:01:43.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.22.4, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.22.5, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.4" +VERSION="2.22.5" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.22.4/startup/Second-Stage/S08-start new/yast2-installation-2.22.5/startup/Second-Stage/S08-start --- old/yast2-installation-2.22.4/startup/Second-Stage/S08-start 2012-02-14 15:28:13.000000000 +0100 +++ new/yast2-installation-2.22.5/startup/Second-Stage/S08-start 2012-03-15 10:26:44.000000000 +0100 @@ -31,10 +31,12 @@ #================================================== # We are going to start a SSH based remote session #-------------------------------------------------- + ln -sf /usr/lib/YaST2/startup/YaST2.ssh /sbin/yast.ssh ssh_message while [ -f /var/lib/YaST2/runme_at_boot ]; do sleep 3 done + rm /sbin/yast.ssh fi #============================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.22.4/startup/YaST2.call new/yast2-installation-2.22.5/startup/YaST2.call --- old/yast2-installation-2.22.4/startup/YaST2.call 2012-02-14 15:28:13.000000000 +0100 +++ new/yast2-installation-2.22.5/startup/YaST2.call 2012-03-15 10:30:23.000000000 +0100 @@ -22,7 +22,7 @@ # : which is the same as the NCURSES mode # : - VNC Installation via browser # : -# STATUS : $Id: YaST2.call 67390 2012-02-09 09:55:25Z jsuchome $ +# STATUS : $Id: YaST2.call 67633 2012-03-15 09:30:21Z aschnell $ #---------------- # #set -x @@ -274,8 +274,7 @@ if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then echo "*** Preparing SSH installation for reboot ***" - echo "*** NOTE: after reboot, you have to reconnect and call ***" - echo "*** /usr/lib/YaST2/startup/YaST2.ssh ***" + echo "*** NOTE: after reboot, you have to reconnect and call yast.ssh ***" log "\tPreparing SSH installation for reboot" fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.22.4/startup/YaST2.ssh new/yast2-installation-2.22.5/startup/YaST2.ssh --- old/yast2-installation-2.22.4/startup/YaST2.ssh 2012-02-14 15:28:13.000000000 +0100 +++ new/yast2-installation-2.22.5/startup/YaST2.ssh 2012-03-15 10:30:23.000000000 +0100 @@ -15,7 +15,7 @@ # : if we are within a ssh installation environment # : This script is called manually # : -# STATUS : $Id: YaST2.ssh 67375 2012-02-07 16:25:24Z tgoettlicher $ +# STATUS : $Id: YaST2.ssh 67633 2012-03-15 09:30:21Z aschnell $ #---------------- #======================================== @@ -38,8 +38,7 @@ Your system has been updated and needs to reboot ... Reconnect to the system after it reboots and call - /usr/lib/YaST2/startup/YaST2.ssh again to continue - the installation ... + yast.ssh again to continue the installation ... EOF } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.22.4/startup/common/network.sh new/yast2-installation-2.22.5/startup/common/network.sh --- old/yast2-installation-2.22.4/startup/common/network.sh 2012-02-14 15:28:12.000000000 +0100 +++ new/yast2-installation-2.22.5/startup/common/network.sh 2012-03-15 10:30:23.000000000 +0100 @@ -12,7 +12,7 @@ # DESCRIPTION : Common used functions used for the YaST2 startup process # : refering to network environment issues # : -# STATUS : $Id: network.sh 66674 2011-11-03 11:20:48Z aschnell $ +# STATUS : $Id: network.sh 67633 2012-03-15 09:30:21Z aschnell $ #---------------- # #----[ is_iface_up ]-----# @@ -72,7 +72,7 @@ *** sshd has been started *** you can login now and proceed with the installation - run the command '/usr/lib/YaST2/startup/YaST2.ssh' + run the command 'yast.ssh' active interfaces: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2012-03-20 12:04:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2011-12-07 14:40:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2012-03-20 12:04:31.000000000 +0100 @@ -1,0 +2,63 @@ +Tue Mar 13 15:15:28 CET 2012 - fehr(a)suse.de + +- warn about slowness when resizing mounted fs by more than 50Gig + (bnc#749946) +- 2.22.1 + +------------------------------------------------------------------- +Mon Mar 05 11:30:46 CET 2012 - aschnell(a)suse.de + +- allow equal-sign "=" in passwords (bnc#750306) + +------------------------------------------------------------------- +Wed Jan 25 12:20:53 CET 2012 - fehr(a)suse.de + +- allow resize and move of simple btrfs volumes if they are + formatted anyway (bnc#742491) +- fix bug handling used devices of simple btrfs volumes in resize + +------------------------------------------------------------------- +Tue Jan 24 14:15:29 CET 2012 - aschnell(a)suse.de + +- do not query user to autostart multipath in AutoYaST (bnc#742913) + +------------------------------------------------------------------- +Tue Jan 24 13:52:45 CET 2012 - fehr(a)suse.de + +- ensure default mountby uuid for btrfs in all cases +- prevent display of outdated data with simple btrfs volumes + +------------------------------------------------------------------- +Thu Jan 19 10:52:02 GMT 2012 - aschnell(a)suse.de + +- improved layout for small screens (bnc#740006) + +------------------------------------------------------------------- +Tue Jan 10 18:59:52 CET 2012 - fehr(a)suse.de + +- fix parsing problem with old style size values (e.g. 10G instead + of 10GB) (bnc#740560) + +------------------------------------------------------------------- +Mon Jan 9 16:39:46 CET 2012 - fehr(a)suse.de + +- fix missing /boot partition in proposal (bnc#739091) +- do not enforce subvolumes to start with "@/" on openSuSE + (bnc#738542) + +------------------------------------------------------------------- +Tue Jan 03 11:59:51 CET 2012 - aschnell(a)suse.de + +- removed generating fstab entries for ZIP drives + +------------------------------------------------------------------- +Wed Dec 21 12:04:31 CET 2011 - aschnell(a)suse.de + +- handle FBA DASD with parted instead of fdasd (bnc#584703) + +------------------------------------------------------------------- +Tue Dec 20 14:08:55 CET 2011 - fehr(a)suse.de + +- fix proposal to reuse also larger root filesystems (bnc#727362) + +------------------------------------------------------------------- Old: ---- yast2-storage-2.22.0.tar.bz2 New: ---- yast2-storage-2.22.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.bFfUFB/_old 2012-03-20 12:04:33.000000000 +0100 +++ /var/tmp/diff_new_pack.bFfUFB/_new 2012-03-20 12:04:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-storage # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: yast2-storage -Version: 2.22.0 +Version: 2.22.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,7 +26,7 @@ Group: System/YaST License: GPL-2.0+ -BuildRequires: blocxx-devel boost-devel gcc-c++ libtool libxcrypt-devel openssl-devel sablot swig +BuildRequires: blocxx-devel boost-devel gcc-c++ libtool openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files BuildRequires: libstorage-devel >= 2.21.11 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0 ++++++ yast2-storage-2.22.0.tar.bz2 -> yast2-storage-2.22.1.tar.bz2 ++++++ ++++ 5893 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/VERSION new/yast2-storage-2.22.1/VERSION --- old/yast2-storage-2.22.0/VERSION 2011-11-15 15:03:04.000000000 +0100 +++ new/yast2-storage-2.22.1/VERSION 2012-03-16 16:16:25.000000000 +0100 @@ -1 +1 @@ -2.22.0 +2.22.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/configure.in new/yast2-storage-2.22.1/configure.in --- old/yast2-storage-2.22.0/configure.in 2011-12-06 17:21:23.000000000 +0100 +++ new/yast2-storage-2.22.1/configure.in 2012-03-16 16:17:08.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.22.0, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.22.1, http://bugs.opensuse.org/, yast2-storage) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.0" +VERSION="2.22.1" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.22.1/storage/src/include/custom_part_dialogs.ycp --- old/yast2-storage-2.22.0/storage/src/include/custom_part_dialogs.ycp 2011-11-18 15:27:09.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/include/custom_part_dialogs.ycp 2012-01-10 10:01:00.000000000 +0100 @@ -16,7 +16,7 @@ * ************************************************************* - $Id: custom_part_dialogs.ycp 66875 2011-11-18 14:27:06Z aschnell $ + $Id: custom_part_dialogs.ycp 67130 2012-01-09 15:41:07Z fehr $ */ { @@ -1401,15 +1401,17 @@ if( ret == `add ) { string pth = (string)UI::QueryWidget( `id(`new_path), `Value ); - y2milestone( "SubvolHandling add path:%1", pth ); + string svtmp = FileSystems::default_subvol + "/"; + y2milestone( "SubvolHandling add path:%1 svtmp:%2", pth, svtmp ); y2milestone( "SubvolHandling names:%1", SubvolNames( new ) ); if( pth==nil || size(pth)==0 ) Popup::Message(_("Empty subvolume name not allowed.")); - else if( substring( pth, 0, 2 )!="@/" ) + else if( size(FileSystems::default_subvol)>0 && + substring( pth, 0, size(svtmp) )!=svtmp ) { - Popup::Message( _("Only subvolume names starting with \"@/\" currently allowed! -Automatically prepending \"@/\" to name of subvolume.")); - pth = "@/" + pth; + string tmp = sformat( _("Only subvolume names starting with \"%1\" currently allowed! +Automatically prepending \"%1\" to name of subvolume."), svtmp ); + Popup::Message( tmp ); } if( contains( SubvolNames( new ), pth )) Popup::Message(sformat(_("Subvolume name %1 already exists."),pth)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/include/ep-all.ycp new/yast2-storage-2.22.1/storage/src/include/ep-all.ycp --- old/yast2-storage-2.22.0/storage/src/include/ep-all.ycp 2011-11-18 15:20:06.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/include/ep-all.ycp 2012-02-24 12:30:38.000000000 +0100 @@ -52,6 +52,11 @@ list<term> configs = []; + if (true) { + // menu entry text + configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); + } + if (IsAvailable("iscsi-client")) { // menu entry text configs = add(configs, `item(`id(`iscsi), `icon("yast-iscsi-client"), _("Configure &iSCSI..."))); @@ -60,15 +65,19 @@ if (true) { // menu entry text configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); - // menu entry text - configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); } - if (Arch::s390() && IsAvailable("s390")) { + if (Arch::s390() && IsAvailable("dasd")) { // menu entry text - configs = add(configs, `item(`id(`dasd), `icon("yast-dasd"), _("Configure &DASD..."))); + configs = add(configs, `item(`id(`dasd), `icon("yast-dasd"), _("Configure &DASD..."))); + } + + if (Arch::s390() && IsAvailable("zfcp")) { // menu entry text - configs = add(configs, `item(`id(`zfcp), `icon("yast-zfcp"), _("Configure &zFCP..."))); + configs = add(configs, `item(`id(`zfcp), `icon("yast-zfcp"), _("Configure &zFCP..."))); + } + + if (Arch::s390() && IsAvailable("xpram")) { // menu entry text configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"), _("Configure &XPRAM..."))); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/include/ep-btrfs-dialogs.ycp new/yast2-storage-2.22.1/storage/src/include/ep-btrfs-dialogs.ycp --- old/yast2-storage-2.22.0/storage/src/include/ep-btrfs-dialogs.ycp 2011-11-18 15:20:06.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/include/ep-btrfs-dialogs.ycp 2012-01-25 12:28:28.000000000 +0100 @@ -69,7 +69,7 @@ y2milestone( "GetPossibleVols parts:%1", devmap["partitions"]:[] ); list<map> parts = filter( map part, devmap["partitions"]:[], - ``( size(part["mount"]:"")==0 && + ``( (size(part["mount"]:"")==0 || part["used_by_type"]:`UB_NONE==`UB_BTRFS) && !contains( types_no, part["type"]:`primary ) && contains(allowed_enc_types, part["enc_type"]:`none) && (!Storage::IsUsedBy(part) || part["used_by_type"]:`UB_NONE==`UB_BTRFS) && @@ -131,14 +131,14 @@ { y2milestone("MiniWorkflowStepResizeVolume data:%1", data); - string vgname = data["name"]:"error"; list<string> pvs_new = []; list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `encrypted, `type ]); - map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_pvs = filter(map pv, GetPossibleVols(target_map), { return !Storage::IsUsedBy(pv); }); - list<map> used_pvs = filter(map pv, GetPossibleVols(target_map), { return pv["used_by_device"]:"" == data["uuid"]:""; }); + list<map> poss_pvs = GetPossibleVols(Storage::GetTargetMap()); + y2milestone( "MiniWorkflowStepResizeVolume poss:%1", maplist( map pv, poss_pvs, ``( [ pv["device"]:"", pv["used_by_device"]:"" ]))); + list<map> unused_pvs = filter(map pv, poss_pvs, ``(pv["used_by_type"]:`UB_NONE==`UB_NONE)); + list<map> used_pvs = filter(map pv, poss_pvs, ``(pv["used_by_device"]:""==data["uuid"]:"")); term contents = `VBox(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.22.1/storage/src/include/ep-dialogs.ycp --- old/yast2-storage-2.22.0/storage/src/include/ep-dialogs.ycp 2011-11-18 15:20:06.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/include/ep-dialogs.ycp 2012-03-13 16:45:06.000000000 +0100 @@ -637,6 +637,7 @@ map<string, boolean> possible = Storage::IsResizable(data); + y2milestone( "DlgResize data: %1", data ); if (!data["format"]:false && !possible["shrink"]:false && !possible["extend"]:false) { // popup text @@ -770,6 +771,7 @@ UI::ChangeWidget(`id(`custom_size_input), `Value, Storage::KByteToHumanString(size_k)); symbol widget = nil; + boolean asked_big_resize = false; integer old_size_k = size_k; @@ -836,7 +838,8 @@ boolean lvm = data["type"]:`unknown == `lvm; //1 - ask & be interactive, 2 - we are on lvm, 3 - cyl.diff, 4 - filesystem, 5 - mountpoint - if (!CheckResizePossible(false, lvm, size_k - old_size_k, used_fs, mountpoint)) + if (!data["format"]:false && + !CheckResizePossible(false, lvm, size_k - old_size_k, used_fs, mountpoint)) { //FIXME: To check whether the part. can be resized only //after user tries to do that is stupid - in some cases @@ -847,6 +850,25 @@ continue; } + if (!data["format"]:false && size(mountpoint)>0 && + contains( [`ext2, `ext3, `ext4], used_fs ) && + !asked_big_resize && size_k-old_size_k >= 1024*1024*50 ) + { + asked_big_resize = true; + string txt = sformat( +_("You are extending a mounted filesystem by %1 Gigabyte. +This may be quite slow and can take hours. You might possibly want +to consider umounting the filesystem, which will increase speed of +resize task a lot."), (size_k-old_size_k)/(1024*1024) ); + boolean answ = Popup::YesNo( txt ); + y2milestone("ResizeDlg big_resize_while_mounted ret:%1", answ ); + if( answ ) + { + widget = `again; + continue; + } + } + switch (data["type"]:`unknown) { case `primary: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/include/ep-hd-lib.ycp new/yast2-storage-2.22.1/storage/src/include/ep-hd-lib.ycp --- old/yast2-storage-2.22.0/storage/src/include/ep-hd-lib.ycp 2011-12-06 11:13:31.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/include/ep-hd-lib.ycp 2011-12-21 12:41:55.000000000 +0100 @@ -32,8 +32,12 @@ string default_label = Storage::DefaultDiskLabel(disk_device); list<string> labels = [ default_label ]; - if (!contains(labels, "gpt")) - labels = add(labels, "gpt"); + + if (default_label != "dasd") + { + if (!contains(labels, "gpt")) + labels = add(labels, "gpt"); + } string label = default_label; if (size(labels) > 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/include/ep-hd.ycp new/yast2-storage-2.22.1/storage/src/include/ep-hd.ycp --- old/yast2-storage-2.22.0/storage/src/include/ep-hd.ycp 2011-11-18 15:20:06.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/include/ep-hd.ycp 2012-02-20 13:54:46.000000000 +0100 @@ -325,13 +325,10 @@ list<term> expert_cmds = []; - if (!String::StartsWith(device, "/dev/dasd")) - { - expert_cmds = add(expert_cmds, - `item(`id(`create_partition_table), - // menu entry text - _("Create New Partition Table"))); - } + expert_cmds = add(expert_cmds, + `item(`id(`create_partition_table), + // menu entry text + _("Create New Partition Table"))); expert_cmds = add(expert_cmds, `item(`id(`clone_disk), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/inst_disk_proposal.ycp new/yast2-storage-2.22.1/storage/src/inst_disk_proposal.ycp --- old/yast2-storage-2.22.0/storage/src/inst_disk_proposal.ycp 2011-11-18 15:20:06.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/inst_disk_proposal.ycp 2012-01-19 11:51:05.000000000 +0100 @@ -211,29 +211,24 @@ term bframe = `VBox( `PushButton( `id(`detailed), detailed_str ), - `VSpacing(0.45), + `VSpacing(0.2), `PushButton( `id(`import), import_str ), - `VSpacing(0.45), + `VSpacing(0.2), `PushButton( `id(`modify), modify_str ) ); float space = StorageProposal::SaveHeight()?1:2; term contents = - `VBox( - `VSpacing(0.5), - `HBox( - `HSpacing(2), + `MarginBox(2, 0.4, `VBox( `MinHeight(8, `RichText(`id(`richtext), changes)), rframe, `VSpacing(space), bframe, `VStretch() - ), - `HSpacing(2) - ), - `VSpacing(2) ); + ) + ); // help on suggested partitioning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/modules/Storage.ycp new/yast2-storage-2.22.1/storage/src/modules/Storage.ycp --- old/yast2-storage-2.22.0/storage/src/modules/Storage.ycp 2011-12-06 17:17:39.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/modules/Storage.ycp 2012-03-05 11:34:40.000000000 +0100 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 67000 2011-12-06 16:17:38Z aschnell $ + * $Id: Storage.ycp 67561 2012-03-05 10:34:35Z aschnell $ */ { module "Storage"; @@ -371,6 +371,11 @@ { LibStorage::StorageInterface::setDetectMountedVolumes(sint, false); LibStorage::StorageInterface::setRootPrefix(sint, Installation::destdir); + + if (Mode::autoinst() || Mode::autoupgrade()) + { + LibStorage::StorageInterface::setMultipathAutostart(sint, LibStorage::MPAS_OFF()); + } } conts = getContainers(); @@ -397,7 +402,11 @@ { integer bytes = 0; if (!LibStorage::humanStringToByte(str, true, bytes)) - y2error("cannot parse %1", str); + { + string ts = str+"b"; + if( !LibStorage::humanStringToByte(ts, true, bytes)) + y2error("cannot parse %1 or %2", str, ts); + } return bytes; } @@ -1975,9 +1984,18 @@ else { tg[dev] = getContainerInfo(c); - if( dev=="/dev/btrfs" ) - tg = HandleBtrfsSimpleVolumes( tg ); } + integer numbt = size(filter( map p, tg[dev,"partitions"]:[], ``(p["used_fs"]:`unknown==`btrfs ))); + y2milestone( "UpdateTargetMapDisk btrfs:%1", numbt ); + if( numbt>0 && dev!="/dev/btrfs" ) + { + map bt = tg["/dev/btrfs"]:$[]; + if( size(bt)==0 ) + bt["type"] = `CT_BTRFS; + tg["/dev/btrfs"] = getContainerInfo(bt); + } + if( numbt>0 || dev=="/dev/btrfs" ) + tg = HandleBtrfsSimpleVolumes( tg ); StorageMap[targets_key] = tg; //SCR::Write(.target.ycp, "/tmp/upd_disk_aft_"+sformat("%1",count), StorageMap[targets_key]:$[] ); //count = count+1; @@ -1991,6 +2009,8 @@ string cdev=""; map mdev = GetPartition( tg, dev ); y2milestone( "UpdateTargetMapDev mdev %1", mdev ); + boolean btrfs = mdev["used_fs"]:`unknown == `btrfs; + y2milestone( "UpdateTargetMapDev btrfs %1", btrfs ); foreach( string key, map d, tg, ``{ if( size(cdev)==0 && @@ -2031,7 +2051,9 @@ else y2error( "UpdateTargetMapDev key %1 not found in target", disk["device"]:"" ); y2milestone( "UpdateTargetMapDev mdev %1", mdev ); - if( mdev["used_fs"]:`unknown == `btrfs ) + btrfs = btrfs || mdev["used_fs"]:`unknown == `btrfs; + y2milestone( "UpdateTargetMapDev btrfs %1", btrfs ); + if( btrfs ) { map bt = tg["/dev/btrfs"]:$[]; if( size(bt)==0 ) @@ -2541,6 +2563,8 @@ return( ret ); } +global symbol GetMountBy( string device ); + global boolean ChangeVolumeProperties( map part ) { integer ret = 0; @@ -2593,8 +2617,9 @@ else y2milestone( "ChangeVolumeProperties sint ret:%1", ret ); } + symbol defmb = GetMountBy( dev ); if( ret==0 && size(part["mount"]:"")>0 && - part["mountby"]:`id != curr["mountby"]:`id ) + part["mountby"]:defmb != curr["mountby"]:defmb ) { changed = true; tmp = fromSymbol(conv_mountby,part["mountby"]:`device); @@ -3250,8 +3275,6 @@ } -global symbol GetMountBy( string device ); - /** * Set the flag if a disk needs to be initialized * @param string the disk to be changed @@ -3295,11 +3318,16 @@ boolean ret = true; if( IsPartType(ctype) ) { + symbol mby = GetMountBy( p["device"]:"" ); + if( p["used_fs"]:`unknown == `btrfs ) + mby = `uuid; ret = Storage::CreatePartition( d["device"]:"", p["device"]:"", p["type"]:`primary, p["fsid"]:Partitions::fsid_native, p["region",0]:0, p["region",1]:0, - p["mountby"]:GetMountBy( p["device"]:"" ) ); + p["mountby"]:mby ); + if( !haskey( p, "mountby" ) && mby!=`device ) + p["mountby"] = mby; } else if( ctype == `CT_MD ) { @@ -3565,12 +3593,12 @@ return false; } - string allowed_chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ#* ,.;:._-+!$%&/|\?{[()]}@^\\<>"; + string allowed_chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ#* ,.;:._-+=!$%&/|\?{[()]}@^\\<>"; if (findfirstnotof(pw1, allowed_chars) != nil) { // popup text Popup::Message(_("The password may only contain the following characters: -0..9, a..z, A..Z, and any of \"@#* ,.;:._-+!$%&/|\?{[()]}^\\<>\". +0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|\?{[()]}^\\<>\". Try again.")); return false; } @@ -4626,6 +4654,7 @@ if (ret != save_chtxt) { + LibStorage::StorageInterface::dumpObjectList(sint); LibStorage::StorageInterface::dumpCommitInfos(sint); } @@ -5325,20 +5354,6 @@ Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "usb" ) ); Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "pts" ) ); - map m = $[]; - integer num = 0; - - foreach( string tdevice, any tdata, StorageDevices::ZipDrives(), - ``{ - m = FileSystems::GetFstabDefaultMap( "zip" ); - string zfile = "/zip"; - if( num > 0 ) - zfile = zfile + sformat( "%1", num ); - m["mount"] = "/media"+zfile; - m["spec"] = tdevice+"4"; - Storage::AddFstabEntry( m ); - num = num+1; - }); HandleModulesOnBoot( GetTargetMap() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.22.0/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.22.1/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.22.0/storage/src/modules/StorageProposal.ycp 2011-11-18 15:20:06.000000000 +0100 +++ new/yast2-storage-2.22.1/storage/src/modules/StorageProposal.ycp 2012-01-10 10:01:00.000000000 +0100 @@ -413,6 +413,14 @@ map<string, boolean> swapable = $[]; map<string, boolean> ishome = $[]; +void fill_ishome( list<map> pl ) + { + foreach( map p, pl, + ``{ + if( !haskey( ishome, p["device"]:"" )) + ishome[p["device"]:""] = Storage::DetectHomeFs(p); + }); + } global void flex_init_swapable(map<string, map> tg) { @@ -1517,20 +1525,20 @@ llg["gap",gindex,"cylinders"]:0 - part["cylinders"]:0; } list addl = [ pindex ]; - if( e["extended"]:false && !part["primary"]:false ) + if( e["exists"]:false ) + { + addl = add( addl, e["nr"]:0 ); + } + else if( e["extended"]:false && !part["primary"]:false ) { addl = add( addl, llg["ext_pnr",0]:5 ); llg["ext_pnr"] = remove( llg["ext_pnr"]:[0], 0 ); } - else if( !e["exists"]:false ) + else { addl = add( addl, llg["free_pnr",0]:1 ); llg["free_pnr"] = remove( llg["free_pnr"]:[0], 0 ); } - else - { - addl = add( addl, e["nr"]:0 ); - } llg["gap",gindex,"added"] = add( llg["gap",gindex,"added"]:[], addl ); if( pindex+1 < size(ps) ) @@ -2614,13 +2622,13 @@ return( ret ); } -list<map> can_mp_reuse( string mp, integer min, integer max, - list<map> partitions ) +list<map> can_home_reuse( integer min, integer max, + list<map> partitions ) { list<map> ret = []; if( max>0 ) max = max + max/10; - y2milestone( "can_mp_reuse mp %1 min %2 max %3", mp, min, max ); + y2milestone( "can_home_reuse min %1 max %2", min, max ); list<map> pl = []; pl = filter( map p, partitions, ``(!p["delete"]:false && @@ -2631,23 +2639,79 @@ p["size_k"]:0/1024 >= min && (max==0 || p["size_k"]:0/1024 <= max) && Storage::CanEdit( p, false ))); - y2milestone( "can_mp_reuse normal %1", pl ); + y2milestone( "can_home_reuse normal %1", pl ); if( size(pl)>0 ) { pl = sort( map a, map b, pl, ``(a["size_k"]:0>b["size_k"]:0)); - y2milestone( "can_mp_reuse sorted %1", pl ); + fill_ishome( pl ); + pl = (list<map>) union( + filter( map p, pl, ``(ishome[p["device"]:""]:false) ), + filter( map p, pl, ``(!ishome[p["device"]:""]:false) )); + y2milestone( "can_home_reuse sorted %1", pl ); + ret = maplist( map p, partitions, + ``{ + if( !p["delete"]:false && + p["device"]:""==pl[0,"device"]:"" ) + { + p = Storage::SetVolOptions( p, "/home", PropDefaultFs(), + "", "", "" ); + } + return( p ); + }); + } + y2milestone( "can_home_reuse ret %1", ret ); + return( ret ); + } + +list<map> can_root_reuse( integer min, integer max, + list<map> partitions ) + { + list<map> ret = []; + if( max>0 ) + max = max + max/10; + y2milestone( "can_root_reuse min %1 max %2", min, max ); + list<map> pl = []; + pl = filter( map p, partitions, + ``(!p["delete"]:false && + p["fsid"]:Partitions::fsid_native == + Partitions::fsid_native && + !Storage::IsUsedBy(p) && + size(p["mount"]:"")==0 && + p["size_k"]:0/1024 >= min && + Storage::CanEdit( p, false ))); + y2milestone( "can_root_reuse normal %1", pl ); + if( size(pl)>0 ) + { + fill_ishome( pl ); + list<map> p1 = sort( map a, map b, + filter( map p, pl, ``(ishome[p["device"]:""]:false)), + ``(a["size_k"]:0<b["size_k"]:0)); + y2milestone( "can_root_reuse p1 %1", p1 ); + list<map> p2 = sort( map a, map b, + filter( map p, pl, + ``(!ishome[p["device"]:""]:false&&p["size_k"]:0/1024>max)), + ``(a["size_k"]:0<b["size_k"]:0)); + y2milestone( "can_root_reuse p2 %1", p2 ); + list<map> p3 = sort( map a, map b, + filter( map p, pl, + ``(!ishome[p["device"]:""]:false&&p["size_k"]:0/1024<=max)), + ``(a["size_k"]:0>b["size_k"]:0)); + y2milestone( "can_root_reuse p3 %1", p3 ); + pl = (list<map>) union( p2, p1 ); + pl = (list<map>) union( p3, pl ); + y2milestone( "can_root_reuse sorted %1", pl ); ret = maplist( map p, partitions, ``{ if( !p["delete"]:false && p["device"]:""==pl[0,"device"]:"" ) { - p = Storage::SetVolOptions( p, mp, PropDefaultFs(), + p = Storage::SetVolOptions( p, "/", PropDefaultFs(), "", "", "" ); } return( p ); }); } - y2milestone( "can_mp_reuse ret %1", ret ); + y2milestone( "can_root_reuse ret %1", ret ); return( ret ); } @@ -2916,11 +2980,7 @@ Storage::CanDelete( p, disk, false ))); if( size(pl)>0 ) { - foreach( map p, pl, - ``{ - if( !haskey( ishome, p["device"]:"" )) - ishome[p["device"]:""] = Storage::DetectHomeFs(p); - }); + fill_ishome( pl ); pl = sort( map a, map b, pl, ``(a["size_k"]:0>b["size_k"]:0)); list<map> l1 = filter( map p, pl, ``(!Storage::IsUsedBy(p)) ); @@ -3197,28 +3257,24 @@ if( mode == `reuse ) { list<map> parts = disk["partitions"]:[]; - if( GetProposalHome() ) - { - if( avail_size > opts["home_limit"]:0 ) - parts = can_mp_reuse( "/home", 4*1024, 0, parts ); - else - parts = can_mp_reuse( "/", opts["root_base"]:0, 0, - parts ); - } - if( size(parts)>0 && avail_size > opts["home_limit"]:0 ) + list<map> tmp = []; + if( GetProposalHome() && avail_size>opts["home_limit"]:0 ) { - integer mx = 0; - if( GetProposalHome() ) - mx = opts["root_max"]:0; - parts = can_mp_reuse( "/", opts["root_base"]:0, - mx, parts ); + tmp = can_home_reuse( 4*1024, 0, parts ); + if( size(tmp)>0 ) + { + have_home = true; + parts = tmp; + } } - if( size(parts)>0 ) + tmp = can_root_reuse( opts["root_base"]:0, + opts["root_max"]:0, parts ); + if( size(tmp)>0 ) { - have_home = avail_size > opts["home_limit"]:0; have_root = true; - disk["partitions"] = parts; + parts = tmp; } + disk["partitions"] = parts; y2milestone( "get_inst_proposal reuse have_home %1 have_root %2", have_home, have_root ); if( have_home && have_root ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xemacs-packages for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package xemacs-packages for openSUSE:Factory checked in at 2012-03-20 11:36:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs-packages (Old) and /work/SRC/openSUSE:Factory/.xemacs-packages.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xemacs-packages", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs-packages/xemacs-packages.changes 2011-09-23 12:51:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xemacs-packages.new/xemacs-packages.changes 2012-03-20 11:36:49.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 2 12:25:51 UTC 2012 - werner(a)suse.de + +- Update to sumo-2012-02-14 + * as there are a lot of changes you may read + https://bitbucket.org/xemacs/xemacs-packages/changesets + +------------------------------------------------------------------- Old: ---- apel-upstream-cvs.diff bugzilla-130200-generate-autoloads-with-xemacs-21.5.patch disable-apel.patch disable-hyperbole.patch disable-lookup.patch disable-tm.patch fix-mule-make-coding-system.patch format-info.patch latin-unity.patch locale-start.patch packages-cvs-sumo-2003-02-05-Local.ruless.template.patch packages-cvs-sumo-2009-02-17.tar.bz2 packages-cvs-xemacs-sumo-2002-05-22-mule-ucs.patch update-vc.patch New: ---- xemacs-packages-rpmlintrc xemacs-sumo-2012-02-14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs-packages.spec ++++++ ++++ 1889 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/xemacs-packages/xemacs-packages.spec ++++ and /work/SRC/openSUSE:Factory/.xemacs-packages.new/xemacs-packages.spec ++++++ app-defaults.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,30 +1,49 @@ -Index: packages/mule-packages/locale/app-defaults/fr/Emacs -=================================================================== ---- packages/mule-packages/locale/app-defaults/fr/Emacs.orig -+++ packages/mule-packages/locale/app-defaults/fr/Emacs +--- packages/mule-packages/locale/app-defaults/de/Emacs ++++ packages/mule-packages/locale/app-defaults/de/Emacs 2012-02-28 14:10:14.754434028 +0000 +@@ -3,6 +3,20 @@ + ! German localization resources for XEmacs. + ! updated Fri Aug 10 16:17:07 2007 by Mike FABIAN <mfabian(a)suse.de> + ++!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ++!! FontSet for menus when you use --with-xfs or --with-xim=xlib. ++XEmacs*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*menubar*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*popup*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* ++XEmacs*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* ++ + ! Pulldown menu internationalization. The first line of the file + ! "*XlwMenu.resourceLabels: True" has to be there to make sure + ! all the labelString will be read and displayed by X. +--- packages/mule-packages/locale/app-defaults/fr/Emacs ++++ packages/mule-packages/locale/app-defaults/fr/Emacs 2012-02-28 14:10:32.129993870 +0000 @@ -1,3 +1,18 @@ +! -*- coding: iso-8859-1 -*- +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! FontSet for menus when you use --with-xfs or --with-xim=xlib. -+XEmacs*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ -+ -*-*-*-*-*-*-*-120-*-iso10646-1 -+XEmacs*menubar*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ -+ -*-*-*-*-*-*-*-120-*-iso10646-1 -+XEmacs*popup*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ -+ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*menubar*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*popup*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 +XEmacs*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +XEmacs*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* + *XlwMenu.resourceLabels: True -Index: packages/mule-packages/locale/app-defaults/ja/Emacs -=================================================================== ---- packages/mule-packages/locale/app-defaults/ja/Emacs.orig -+++ packages/mule-packages/locale/app-defaults/ja/Emacs +--- packages/mule-packages/locale/app-defaults/ja/Emacs ++++ packages/mule-packages/locale/app-defaults/ja/Emacs 2012-02-28 14:15:21.266434084 +0000 @@ -1,3 +1,4 @@ +! -*- coding: euc-jp -*- ! Japanese localization resources for XEmacs. @@ -35,73 +54,96 @@ *fontList: -*-gothic-medium-r-normal--14-120-75-75-c-*-*-*: !! FontSet for menus when you use --with-xfs or --with-xim=xlib. -*fontSet: -*-fixed-medium-r-normal--14-* -+XEmacs*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1, \ -+ -gnu-unifont-medium-r-normal--16-160-75-75-p-80-iso10646-1,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0 -+XEmacs*menubar*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1, \ -+ -gnu-unifont-medium-r-normal--16-160-75-75-p-80-iso10646-1,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0 -+XEmacs*popup*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1, \ -+ -gnu-unifont-medium-r-normal--16-160-75-75-p-80-iso10646-1,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ -+ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ -+ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0 ++XEmacs*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -gnu-unifont-medium-r-normal--16-160-75-75-p-80-iso10646-1,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0 ++XEmacs*menubar*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -gnu-unifont-medium-r-normal--16-160-75-75-p-80-iso10646-1,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0 ++XEmacs*popup*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -gnu-unifont-medium-r-normal--16-160-75-75-p-80-iso10646-1,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-iso10646-1,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,\ ++ -*-sazanami gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -kochi-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -*-gothic-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,\ ++ -*-*-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0 +XEmacs*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +XEmacs*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* ! Starting below here are menu label string which can be translated to ! different languages. -Index: packages/mule-packages/locale/app-defaults/ro/Emacs -=================================================================== ---- packages/mule-packages/locale/app-defaults/ro/Emacs.orig -+++ packages/mule-packages/locale/app-defaults/ro/Emacs -@@ -1,3 +1,18 @@ +--- packages/mule-packages/locale/app-defaults/ro/Emacs ++++ packages/mule-packages/locale/app-defaults/ro/Emacs 2012-02-28 14:12:21.574433767 +0000 +@@ -1,5 +1,19 @@ +-*XlwMenu.resourceLabels: True +! -*- coding: iso-8859-2 -*- +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! FontSet for menus when you use --with-xfs or --with-xim=xlib. -+XEmacs*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ -+ -*-*-*-*-*-*-*-120-*-iso10646-1 -+XEmacs*menubar*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ -+ -*-*-*-*-*-*-*-120-*-iso10646-1 -+XEmacs*popup*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ -+ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*menubar*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*popup*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 +XEmacs*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +XEmacs*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* -+ - *XlwMenu.resourceLabels: True ++*XlwMenu.resourceLabels: True + + ! menu-apps +--- packages/mule-packages/locale/app-defaults/sv/Emacs ++++ packages/mule-packages/locale/app-defaults/sv/Emacs 2012-02-28 14:10:02.974433917 +0000 +@@ -3,6 +3,20 @@ + ! Swedish localization resources for XEmacs. + ! Based on german localization resources by Mike FABIAN <mfabian(a)suse.de> + ++!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ++!! FontSet for menus when you use --with-xfs or --with-xim=xlib. ++XEmacs*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*menubar*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*popup*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,\ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*,\ ++ -*-*-*-*-*-*-*-120-*-iso10646-1 ++XEmacs*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* ++XEmacs*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* ++ + ! Pulldown menu internationalization. The first line of the file + ! "*XlwMenu.resourceLabels: True" has to be there to make sure + ! all the labelString will be read and displayed by X. ++++++ bugzilla-183805-missing-autoload-cookies.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,5 +1,5 @@ diff -ru packages.orig/xemacs-packages/build/build.el packages/xemacs-packages/build/build.el ---- packages.orig/xemacs-packages/build/build.el 2003-10-13 17:52:13.000000000 +0200 +--- packages/xemacs-packages/build/build.el 2003-10-13 17:52:13.000000000 +0200 +++ packages/xemacs-packages/build/build.el 2006-06-30 21:53:30.000000000 +0200 @@ -922,6 +922,7 @@ (match-string 2 (cdr result))) tags))) @@ -10,7 +10,7 @@ (cond ((string-match "-\$d\\|N\$\\b" val) diff -ru packages.orig/xemacs-packages/ps-print/ps-mule.el packages/xemacs-packages/ps-print/ps-mule.el ---- packages.orig/xemacs-packages/ps-print/ps-mule.el 2002-07-30 14:40:40.000000000 +0200 +--- packages/xemacs-packages/ps-print/ps-mule.el 2002-07-30 14:40:40.000000000 +0200 +++ packages/xemacs-packages/ps-print/ps-mule.el 2006-06-30 19:22:32.000000000 +0200 @@ -298,6 +298,7 @@ @@ -21,7 +21,7 @@ '((latin-iso8859-1 (normal nil nil iso-8859-1))) diff -ru packages.orig/xemacs-packages/ps-print/ps-print.el packages/xemacs-packages/ps-print/ps-print.el ---- packages.orig/xemacs-packages/ps-print/ps-print.el 2004-03-08 23:43:35.000000000 +0100 +--- packages/xemacs-packages/ps-print/ps-print.el 2004-03-08 23:43:35.000000000 +0100 +++ packages/xemacs-packages/ps-print/ps-print.el 2006-07-01 12:30:51.000000000 +0200 @@ -1436,6 +1436,7 @@ ++++++ dinbrief.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -10,10 +10,10 @@ (if (not (zerop (length options))) (insert LaTeX-optop options LaTeX-optcl)) (insert TeX-grop style TeX-grcl)) -Index: packages/xemacs-packages/auctex/style/dinbrief.el +Index: packages/xemacs-packages/auctex/etc/dinbrief.el =================================================================== ---- packages/xemacs-packages/auctex/style/dinbrief.el.orig -+++ packages/xemacs-packages/auctex/style/dinbrief.el +--- packages/xemacs-packages/auctex/etc/dinbrief.el.orig ++++ packages/xemacs-packages/auctex/etc/dinbrief.el @@ -2,6 +2,9 @@ ;; Contributed by Werner Fink <tex(a)itap.physik.uni-stuttgart.de> @@ -24,7 +24,7 @@ ;;; Commentary: -@@ -14,80 +17,139 @@ +@@ -14,80 +17,120 @@ (TeX-add-style-hook "dinbrief" (function (lambda () @@ -96,9 +96,13 @@ + (newline-and-indent) + (din-insert TeX-esc "usepackage" + TeX-grop "ngerman" TeX-grcl) ++ (newline-and-indent) ++ (din-insert TeX-esc "usepackage" ++ TeX-grop "umlaut" TeX-grcl) + (TeX-run-style-hooks "inputenc") + (TeX-run-style-hooks "fontenc") -+ (TeX-run-style-hooks "ngerman")))) ++ (TeX-run-style-hooks "ngerman") ++ (TeX-run-style-hooks "umlaut")))) (defun LaTeX-recipient-hook (environment) "Insert ENVIRONMENT and prompt for recipient and address." @@ -106,59 +110,55 @@ - (recipient (read-input "Empf\"anger: ")) - (address (read-input "Anschrift: ")) - (postvermerk (read-input "Postvermerk: ")) -+ (let ( -+ (sender (LaTeX-sender)) -+ (recipient (read-input "Empf�nger: ")) -+ (address (LaTeX-recipient)) - (date (read-input "Datum: " (LaTeX-today))) +- (date (read-input "Datum: " (LaTeX-today))) - (betreff (read-input "Betreff: ")) -+ (postremark (read-input "Postvermerk: ")) -+ (fenster (read-input "Fenster $ja/nein$: ")) - (vermerk (read-input "Behandlungsvermerk: ")) - (verteil (read-input "Verteiler: ")) +- (vermerk (read-input "Behandlungsvermerk: ")) +- (verteil (read-input "Verteiler: ")) - (anlage (read-input "Anlagen: ")) -+ (betreff (read-input "Betreff: ")) - (opening (read-input "Anrede: ")) +- (opening (read-input "Anrede: ")) - (closing (read-input "Schlu\"s: ")) - (fenster (read-input "Fenster $ja/nein$: ")) -+ (closing (read-input "Schluss: ")) - (signature (read-input "Unterschrift: ")) -+ (anlage (read-input "Anlagen: ")) +- (signature (read-input "Unterschrift: ")) ++ (let ( ++ (sender (LaTeX-sender)) ++ (recipient (read-string "Empf�nger: ")) ++ (address (LaTeX-recipient)) ++ (date (read-string "Datum: " (LaTeX-today))) ++ (postremark (read-string "Postvermerk: ")) ++ (fenster (read-string "Fenster $ja/nein$: ")) ++ (vermerk (read-string "Behandlungsvermerk: ")) ++ (verteil (read-string "Verteiler: ")) ++ (betreff (read-string "Betreff: ")) ++ (opening (read-string "Anrede: ")) ++ (closing (read-string "Schluss: ")) ++ (signature (read-string "Unterschrift: ")) ++ (anlage (read-string "Anlagen: ")) ) - (if (not (zerop (length sender))) -+ (if (not (zerop (length postremark))) - (progn +- (progn - (insert TeX-esc "Absender" TeX-grop sender TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length postvermerk))) - (progn - (insert TeX-esc "Postvermerk" TeX-grop postvermerk TeX-grcl) -+ (din-insert TeX-esc "postremark" TeX-grop postremark TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length betreff))) - (progn +- (newline-and-indent))) +- (if (not (zerop (length betreff))) +- (progn - (insert TeX-esc "Betreff" TeX-grop betreff TeX-grcl) -+ (din-insert TeX-esc "subject" TeX-grop) -+ (if (equal LaTeX-version "2e") -+ (din-insert TeX-esc "textbf" TeX-grop betreff TeX-grcl TeX-grcl) -+ (din-insert betreff TeX-grcl)) - (newline-and-indent))) - (if (not (zerop (length vermerk))) - (progn +- (newline-and-indent))) +- (if (not (zerop (length vermerk))) +- (progn - (insert TeX-esc "Behandlungsvermerk" TeX-grop vermerk TeX-grcl) -+ (din-insert TeX-esc "handling" TeX-grop vermerk TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length verteil))) - (progn +- (newline-and-indent))) +- (if (not (zerop (length verteil))) +- (progn - (insert TeX-esc "Verteiler" TeX-grop verteil TeX-grcl) -+ (din-insert TeX-esc "cc" TeX-grop verteil TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length anlage))) - (progn +- (newline-and-indent))) +- (if (not (zerop (length anlage))) +- (progn - (insert TeX-esc "Anlagen" TeX-grop anlage TeX-grcl) -+ (din-insert TeX-esc "encl" TeX-grop anlage TeX-grcl) - (newline-and-indent))) +- (newline-and-indent))) (if (string= fenster "ja") (progn - (insert TeX-esc "Fenster") @@ -171,7 +171,7 @@ + (newline-and-indent) + (din-insert TeX-esc "windowtics") + (newline-and-indent) -+ (let ((retouradr (read-input "Retouradresse: " sender))) ++ (let ((retouradr (read-string "Retouradresse: " sender))) (newline-and-indent) (if (not (zerop (length retouradr))) (progn @@ -200,7 +200,7 @@ (newline-and-indent))) (newline-and-indent) -@@ -112,9 +174,9 @@ +@@ -112,9 +155,32 @@ (progn (newline) (indent-to addr-column)))))))) @@ -208,11 +208,34 @@ + (din-insert "\n") (indent-to indentation)) - (insert TeX-esc "opening" ++ (if (not (zerop (length postremark))) ++ (progn ++ (din-insert TeX-esc "postremark" TeX-grop postremark TeX-grcl) ++ (newline-and-indent))) ++ (if (not (zerop (length betreff))) ++ (progn ++ (din-insert TeX-esc "subject" TeX-grop) ++ (if (equal LaTeX-version "2e") ++ (din-insert TeX-esc "textbf" TeX-grop betreff TeX-grcl TeX-grcl) ++ (din-insert betreff TeX-grcl)) ++ (newline-and-indent))) ++ (if (not (zerop (length vermerk))) ++ (progn ++ (din-insert TeX-esc "handling" TeX-grop vermerk TeX-grcl) ++ (newline-and-indent))) ++ (if (not (zerop (length verteil))) ++ (progn ++ (din-insert TeX-esc "cc" TeX-grop verteil TeX-grcl) ++ (newline-and-indent))) ++ (if (not (zerop (length anlage))) ++ (progn ++ (din-insert TeX-esc "encl" TeX-grop anlage TeX-grcl) ++ (newline-and-indent))) + (din-insert TeX-esc "opening" TeX-grop (if (zerop (length opening)) (concat TeX-esc " ") -@@ -123,7 +185,7 @@ +@@ -123,7 +189,7 @@ (indent-relative-maybe) (save-excursion @@ -221,16 +244,16 @@ TeX-grop (if (zerop (length closing)) (concat TeX-esc " ") -@@ -131,6 +193,47 @@ +@@ -131,6 +197,47 @@ TeX-grcl "\n") (indent-relative-maybe)))) +(defun LaTeX-sender nil + "Read and writes the senders address" + (interactive) -+ (let ((name (read-input "Absender: " (user-full-name))) -+ (str (read-input "Meine Strasse: ")) -+ (ort (read-input "Mein Wohnort: "))) ++ (let ((name (read-string "Absender: " (user-full-name))) ++ (str (read-string "Meine Strasse: ")) ++ (ort (read-string "Mein Wohnort: "))) + (if (not (zerop (length name))) + (progn + (goto-char (point-min)) ; insert before \end{document} @@ -255,8 +278,8 @@ +(defun LaTeX-recipient nil + "Read and returns the recipient address" + (interactive) -+ (let ((str (read-input "Wohnhaft in Strasse: ")) -+ (ort (read-input "Aus der Ortschaft: "))) ++ (let ((str (read-string "Wohnhaft in Strasse: ")) ++ (ort (read-string "Aus der Ortschaft: "))) + (if (not (zerop (length str))) + (if (not (zerop (length ort))) + (concat str " " TeX-esc TeX-esc " " ort) @@ -269,13 +292,13 @@ (defun LaTeX-today nil "Return a string representing todays date according to flavor." (interactive) -@@ -152,12 +255,13 @@ +@@ -152,12 +259,13 @@ ctime-string) (let ((year (substring ctime-string (match-beginning 3) (match-end 3))) (month (substring ctime-string (match-beginning 1) (match-end 1))) - (day (substring ctime-string (match-beginning 2) (match-end 2)))) + (day (substring ctime-string (match-beginning 2) (match-end 2))) -+ (place (read-input "Heutiger Ort: "))) ++ (place (read-string "Heutiger Ort: "))) (if (assoc month month-alist) (progn (setq month (cdr (assoc month month-alist))) ++++++ disable-skk.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,20 +1,5 @@ -Index: packages/mule-packages/Makefile -=================================================================== ---- packages/mule-packages/Makefile.orig -+++ packages/mule-packages/Makefile -@@ -19,7 +19,7 @@ - include ../Local.rules.inc - - ifeq ('$(MULE_PACKAGES)','mule-packages') --PACKAGES := mule-base locale leim edict egg-its skk \ -+PACKAGES := mule-base locale leim edict egg-its \ - mule-ucs latin-unity latin-euro-standards - else - PACKAGES := $(MULE_PACKAGES) -Index: packages/package-compile.el -=================================================================== ---- packages/package-compile.el.orig -+++ packages/package-compile.el +--- packges/package-compile.el.orig ++++ packges/package-compile.el @@ -220,7 +220,6 @@ ("lookup" . "mule-packages") ("mule-base" . "mule-packages") @@ -23,3 +8,14 @@ )) (defvar package-source-root nil) +--- packges/mule-packages/Makefile.orig ++++ packges/mule-packages/Makefile +@@ -19,7 +19,7 @@ + include ../Local.rules.inc + + ifeq ('$(MULE_PACKAGES)','mule-packages') +-PACKAGES := mule-base locale leim lookup edict egg-its skk \ ++PACKAGES := mule-base locale leim lookup edict egg-its \ + latin-unity latin-euro-standards mule-ucs + else + PACKAGES := $(MULE_PACKAGES) ++++++ edict-utf-8.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,7 +1,7 @@ packages/mule-packages/edict/CVSだけに発見: Base packages/mule-packages/edict/CVSだけに発見: Baserev diff -ru packages.orig/mule-packages/edict/edict.el packages/mule-packages/edict/edict.el ---- packages.orig/mule-packages/edict/edict.el 2002-01-31 11:08:35.000000000 +0100 +--- packages/mule-packages/edict/edict.el 2002-01-31 11:08:35.000000000 +0100 +++ packages/mule-packages/edict/edict.el 2003-08-23 23:57:05.000000000 +0200 @@ -181,11 +181,12 @@ "The variable edict-version contains a string that describes ++++++ gnus-utf-8.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,5 +1,5 @@ diff -ru packages.orig/xemacs-packages/gnus/lisp/mm-util.el packages/xemacs-packages/gnus/lisp/mm-util.el ---- packages.orig/xemacs-packages/gnus/lisp/mm-util.el 2005-11-15 04:45:54.000000000 +0100 +--- packages/xemacs-packages/gnus/lisp/mm-util.el 2005-11-15 04:45:54.000000000 +0100 +++ packages/xemacs-packages/gnus/lisp/mm-util.el 2005-12-14 16:58:44.000000000 +0100 @@ -785,7 +785,9 @@ (mapcar 'mm-mime-charset ++++++ packages-cvs-sumo-2002-09-19-comint.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,5 +1,5 @@ ---- packages.orig/xemacs-packages/xemacs-base/comint.el 2002-08-30 18:56:48.000000000 +0200 -+++ packages/xemacs-packages/xemacs-base/comint.el 2003-01-30 13:09:27.000000000 +0100 +--- packages/xemacs-packages/lisp/xemacs-base/comint.el 2002-08-30 18:56:48.000000000 +0200 ++++ packages/xemacs-packages/lisp/xemacs-base/comint.el 2003-01-30 13:09:27.000000000 +0100 @@ -143,6 +143,12 @@ ;; comint-completion-autolist boolean completion behavior ;; comint-completion-recexact boolean ... ++++++ packages-cvs-xemacs-sumo-2005-12-08-diff-mode.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,5 +1,5 @@ diff -ru packages.orig/xemacs-packages/prog-modes/diff-mode.el packages/xemacs-packages/prog-modes/diff-mode.el ---- packages.orig/xemacs-packages/prog-modes/diff-mode.el 2005-12-02 10:54:34.000000000 +0100 +--- packages/xemacs-packages/prog-modes/diff-mode.el 2005-12-02 10:54:34.000000000 +0100 +++ packages/xemacs-packages/prog-modes/diff-mode.el 2005-12-13 17:18:21.000000000 +0100 @@ -914,6 +914,26 @@ (equal ?\ c))) ++++++ texi-coding.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,18 +1,3 @@ -Index: packages/mule-packages/mule-base/texi/canna-jp.texi -=================================================================== ---- packages/mule-packages/mule-base/texi/canna-jp.texi.orig -+++ packages/mule-packages/mule-base/texi/canna-jp.texi -@@ -1,7 +1,8 @@ --\def\lang{jp} -+@c -*- mode: texinfo; coding: euc-jp; -*- -+\def\lang{jp} - %\kanjifiletype=20 - \overfullrule=0pt --\input texinfo @c -*-texinfo-*- -+\input texinfo - @comment %**start of header - @c canna.texinfo release 1.2 91-Sep-6 - @setfilename canna Index: packages/xemacs-packages/ecb/ecb.texi =================================================================== --- packages/xemacs-packages/ecb/ecb.texi.orig ++++++ texi.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,5 +1,5 @@ diff -ru packages.orig/xemacs-packages/tm/texi/tm-ja.texi packages/xemacs-packages/tm/texi/tm-ja.texi ---- packages.orig/xemacs-packages/tm/texi/tm-ja.texi 1998-06-15 07:54:30.000000000 +0200 +--- packages/xemacs-packages/tm/texi/tm-ja.texi 1998-06-15 07:54:30.000000000 +0200 +++ packages/xemacs-packages/tm/texi/tm-ja.texi 2005-02-15 11:21:45.000000000 +0100 @@ -340,7 +340,7 @@ ++++++ texi2utf8 ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,7 +1,14 @@ #!/bin/sh -for i in $(find packages -name "*.texi*") +for i in $(find . -name "*.texi*") do -xemacs -q -batch $i \ +xemacs -q -batch \ + -eval '(setq load-path (append (list "xemacs-packages/xemacs-base/") load-path)))' \ + -eval '(setq load-path (append (list "xemacs-packages/sgml/") load-path)))' \ + -eval '(setq load-path (append (list "xemacs-packages/texinfo/") load-path)))' \ + -eval '(load-library "skeleton")' \ + -eval '(load-library "outline")' \ + -eval '(load-library "texinfo")' \ + $i \ -eval '(set-language-environment "Japanese")' \ -eval '(replace-regexp "\$-\\*-.*coding:\\s-*\$\$\\S-+\$\$\\s-*-\\*-\$" "\\1utf-8\\3")' \ -eval '(set-buffer-file-coding-system (quote utf-8))' \ ++++++ xemacs-packages-rpmlintrc ++++++ addFilter(".*zero-length.*auto-autoloads\.el.*") addFilter(".*zero-length.*custom-load\.el.*") addFilter(".*zero-length.*ecb-buffertab\.el.*") addFilter(".*non-etc-or-var-file-marked-as-conffile.*/Emacs.*") addFilter(".*devel-file-in-non-devel-package.*/MANIFEST.pc.*") addFilter(".*hidden-file-or-dir.*/var/.dummy.*") addFilter(".*hidden-file-or-dir.*/x-symbol/.ispell_xsymb.*") addFilter(".*patch-not-applied.*comint.patch.*") addFilter(".*macro-in-comment.*%patch.*") addFilter(".*macro-in-comment.*%{buildroot}.*") addFilter(".*files-duplicate.*/.*\.el.*") addFilter(".*incorrect-fsf-address.*") ++++++ xemacs-packages.patch ++++++ --- /var/tmp/diff_new_pack.04mT3c/_old 2012-03-20 11:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.04mT3c/_new 2012-03-20 11:36:53.000000000 +0100 @@ -1,33 +1,3 @@ -Index: packages/xemacs-packages/bbdb/utils/bbdb-cid.pl -=================================================================== ---- packages/xemacs-packages/bbdb/utils/bbdb-cid.pl.orig -+++ packages/xemacs-packages/bbdb/utils/bbdb-cid.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl5 -w -+#!/usr/bin/perl -w - # - # Caller-ID-logger, by jwz (19-Jan-97) - # Modified: 24-Apr-97 -Index: packages/xemacs-packages/bbdb/utils/bbdb-srv.pl -=================================================================== ---- packages/xemacs-packages/bbdb/utils/bbdb-srv.pl.orig -+++ packages/xemacs-packages/bbdb/utils/bbdb-srv.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # This script reads a block of message headers on stdin, and converts them - # to an emacs-lisp string (quoting all dangerous characters) and then -Index: packages/xemacs-packages/bbdb/utils/bbdb-unlazy-lock.pl -=================================================================== ---- packages/xemacs-packages/bbdb/utils/bbdb-unlazy-lock.pl.orig -+++ packages/xemacs-packages/bbdb/utils/bbdb-unlazy-lock.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Author: Christopher Kline <ckline(a)media.mit.edu> - # Index: packages/xemacs-packages/calc/calc-ext.el =================================================================== --- packages/xemacs-packages/calc/calc-ext.el.orig @@ -632,3 +602,5 @@ nil) ((consp w3-use-menus) (w3-menu-install-menubar)) +Index: packages/package-compile.el +=================================================================== -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wvstreams for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package wvstreams for openSUSE:Factory checked in at 2012-03-20 11:36:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wvstreams (Old) and /work/SRC/openSUSE:Factory/.wvstreams.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wvstreams", Maintainer is "KLWang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wvstreams/wvstreams.changes 2012-02-14 19:09:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wvstreams.new/wvstreams.changes 2012-03-20 11:36:43.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 13:48:53 UTC 2012 - dimstar(a)opensuse.org + +- Add wvstreams-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- wvstreams-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wvstreams.spec ++++++ --- /var/tmp/diff_new_pack.p3UDbq/_old 2012-03-20 11:36:45.000000000 +0100 +++ /var/tmp/diff_new_pack.p3UDbq/_new 2012-03-20 11:36:45.000000000 +0100 @@ -16,14 +16,19 @@ # - Name: wvstreams Url: http://alumnit.ca/wiki/?WvStreams -BuildRequires: db-devel gcc-c++ openssl-devel pam-devel pkgconfig zlib-devel -License: LGPL-2.1+ +BuildRequires: db-devel +BuildRequires: gcc-c++ +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: zlib-devel Version: 4.4.1 -Release: 74 +Release: 0 Summary: Network Programming Library in C++ +License: LGPL-2.1+ +Group: Development/Libraries/Other Source0: http://open.nit.ca/download/%{name}-%{version}.tar.bz2 Patch0: set-empty.diff Patch1: sentinel.diff @@ -33,7 +38,7 @@ Patch8: wvstreams-gcc43.patch Patch9: wvstreams-openssl.patch Patch10: wvstreams-headers.patch -Group: Development/Libraries/Other +Patch11: wvstreams-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,6 +78,7 @@ %patch8 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build # This package failed when testing with -Wl,-as-needed being default. ++++++ wvstreams-gcc47.patch ++++++ Index: wvstreams-4.4.1/include/uniconftree.h =================================================================== --- wvstreams-4.4.1.orig/include/uniconftree.h +++ wvstreams-4.4.1/include/uniconftree.h @@ -108,7 +108,7 @@ public: void visit(const Visitor &visitor, void *userdata, bool preorder = true, bool postorder = false) const { - _recursive_unsorted_visit(this, reinterpret_cast< + this->_recursive_unsorted_visit(this, reinterpret_cast< const typename Base::BaseVisitor&>(visitor), userdata, preorder, postorder); } @@ -124,7 +124,7 @@ public: bool compare(const Sub *other, const Comparator &comparator, void *userdata) { - return _recursivecompare(this, other, reinterpret_cast< + return this->_recursivecompare(this, other, reinterpret_cast< const typename Base::BaseComparator&>(comparator), userdata); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wpa_supplicant for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package wpa_supplicant for openSUSE:Factory checked in at 2012-03-20 11:36:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wpa_supplicant (Old) and /work/SRC/openSUSE:Factory/.wpa_supplicant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wpa_supplicant", Maintainer is "GLin(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wpa_supplicant/wpa_supplicant.changes 2012-01-10 14:51:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wpa_supplicant.new/wpa_supplicant.changes 2012-03-20 11:36:30.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 22:30:51 UTC 2012 - dimstar(a)opensuse.org + +- Add wpa_supplicant-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- wpa_supplicant-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wpa_supplicant.spec ++++++ --- /var/tmp/diff_new_pack.F1XdSW/_old 2012-03-20 11:36:34.000000000 +0100 +++ /var/tmp/diff_new_pack.F1XdSW/_new 2012-03-20 11:36:34.000000000 +0100 @@ -15,11 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: wpa_supplicant -BuildRequires: dbus-1-devel libqt4 libqt4-devel openssl-devel pkg-config readline-devel +BuildRequires: dbus-1-devel +BuildRequires: libqt4 +BuildRequires: libqt4-devel +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: readline-devel %if 0%{?suse_version} > 1140 BuildRequires: libnl-1_1-devel %else @@ -27,10 +30,10 @@ %endif Url: http://hostap.epitest.fi/wpa_supplicant/ Version: 0.7.3 -Release: 6 +Release: 0 +Summary: WPA supplicant implementation License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Networking/Other -Summary: WPA supplicant implementation Source: http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.bz2 Source1: config Source2: %{name}.conf @@ -49,6 +52,8 @@ Patch5: wpa_supplicant-dbus-events.patch # PATCH-FIX-UPSTREAM wpa_supplicant-probed-cert-dbus-signal.patch bnc#574266 glin(a)suse.com -- emit a D-Bus signal when the AP returned the certificate of the RADIUS server Patch6: wpa_supplicant-probed-cert-dbus-signal.patch +# PATCH-FIX-UPSTREAM wpa_supplicant-gcc47.patch dimstar(a)opensuse.org -- Fix build with gcc 4.7. +Patch7: wpa_supplicant-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: logrotate @@ -64,10 +69,9 @@ Jouni Malinen <jkmaline(a)cc.hut.fi> %package gui -License: BSD-3-Clause ; GPL-2.0+ Summary: WPA supplicant graphical front-end -Requires: wpa_supplicant Group: System/Monitoring +Requires: wpa_supplicant %description gui This package contains a graphical front-end to wpa_supplicant, an @@ -88,6 +92,7 @@ %patch4 -p0 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build cd wpa_supplicant ++++++ wpa_supplicant-gcc47.patch ++++++ Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_networkconfig.o Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_peers.o Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_scanresults.o Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_userdatarequest.o Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: moc_wpagui.o Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/.obj: wpagui.o Only in wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4: wpa_gui diff -ur -p wpa_supplicant-0.7.3.orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/wpagui.cpp --- wpa_supplicant-0.7.3.orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2010-09-07 15:43:39.000000000 +0000 +++ wpa_supplicant-0.7.3/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-03-17 22:27:50.791658139 +0000 @@ -12,10 +12,8 @@ * See README and COPYING for more details. */ -#ifdef __MINGW32__ /* Need to get getopt() */ #include <unistd.h> -#endif #ifdef CONFIG_NATIVE_WINDOWS #include <windows.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Terminal for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package Terminal for openSUSE:Factory checked in at 2012-03-20 11:36:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Terminal (Old) and /work/SRC/openSUSE:Factory/.Terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Terminal", Maintainer is "xfce-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/Terminal/Terminal.changes 2011-10-25 17:13:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Terminal.new/Terminal.changes 2012-03-20 11:36:23.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 14 17:25:21 UTC 2012 - lazy.kent(a)opensuse.org + +- Moved localized man pages to language package. +- Clean up spec. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Terminal.spec ++++++ --- /var/tmp/diff_new_pack.tlvLgA/_old 2012-03-20 11:36:24.000000000 +0100 +++ /var/tmp/diff_new_pack.tlvLgA/_new 2012-03-20 11:36:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package Terminal # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,27 @@ # - Name: Terminal Version: 0.4.8 -Release: 1 +Release: 0 +Summary: Terminal Emulator for the Xfce Desktop Environment License: GPL-2.0+ -Summary: Terminal emulator for the Xfce desktop environment -Url: http://goodies.xfce.org/projects/applications/terminal Group: System/X11/Terminals +Url: http://goodies.xfce.org/projects/applications/terminal Source0: %{name}-%{version}.tar.bz2 Source1: %name-rpmlintrc # PATCH-FIX-UPSTREAM Terminal-0.4.8-fix-help.patch gber(a)opensuse.org -- Fix help by making sure there is no trailing '#' in URLs which make exo-helper-1 choke Patch0: Terminal-0.4.8-fix-help.patch +BuildRequires: fdupes BuildRequires: intltool -BuildRequires: libpng-devel +BuildRequires: startup-notification +BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(dbus-1) -BuildRequires: exo-devel +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(exo-1) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(vte) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: xfce4-dev-tools -BuildRequires: startup-notification -BuildRequires: update-desktop-files -BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang = %{version} Recommends: %{name}-doc = %{version} @@ -52,9 +50,8 @@ helps to save space on the desktop. %package doc -License: GPL-2.0+ -Group: Documentation/HTML Summary: Documentation for Terminal +Group: Documentation/HTML BuildArch: noarch Requires: %{name} = %{version} @@ -74,7 +71,7 @@ %install %makeinstall -%fdupes %{buildroot}/%{_mandir} +%fdupes %{buildroot}/%{_datadir} %suse_update_desktop_file -i Terminal System TerminalEmulator Utility rm %{buildroot}%{_datadir}/pixmaps/terminal.xpm # create terminal -> Terminal symlinks @@ -84,22 +81,15 @@ ln -sf "${manpage##*/}" \ "$(printf "%s\n" "${manpage##*/}" | tr [:upper:] [:lower:])" ) done -rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} -%find_lang %{name} - -%clean -rm -rf %{buildroot} - -%if 0%{?suse_version} >= 1140 +%find_lang %{name} --with-man %post -%desktop_database_post %icon_theme_cache_post +%desktop_database_post %postun -%desktop_database_postun %icon_theme_cache_postun -%endif +%desktop_database_postun %files %defattr(-,root,root) @@ -110,22 +100,11 @@ %{_datadir}/Terminal/*ui %{_datadir}/Terminal/Terminal.glade %{_datadir}/applications/Terminal.desktop -%dir %{_datadir}/icons/hicolor/* -%{_datadir}/icons/hicolor/*/*/ +%{_datadir}/icons/hicolor/*/*/* %dir %{_datadir}/gnome-control-center %dir %{_datadir}/gnome-control-center/default-apps %{_datadir}/gnome-control-center/default-apps/Terminal-default-apps.xml -%dir %{_mandir}/ca -%dir %{_mandir}/da -%dir %{_mandir}/el -%dir %{_mandir}/gl -%dir %{_mandir}/id -%dir %{_mandir}/pt -%dir %{_mandir}/ru -%dir %{_mandir}/ug -%dir %{_mandir}/sv -%dir %{_mandir}/zh_CN -%doc %{_mandir}/*/* +%doc %{_mandir}/man?/* %files doc %defattr(-,root,root) @@ -134,5 +113,11 @@ %doc %{_datadir}/xfce4/Terminal/html/ %files lang -f %{name}.lang +%defattr(-,root,root) +%dir %{_mandir}/?? +%dir %{_mandir}/??_?? +%doc %dir %{_mandir}/??/man1 +%doc %dir %{_mandir}/??_??/man1 +%doc %{_mandir}/*/man1/terminal.* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysvinit for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2012-03-20 11:36:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysvinit (Old) and /work/SRC/openSUSE:Factory/.sysvinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysvinit", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes 2012-03-02 13:50:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-03-20 11:36:17.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 16 16:51:33 UTC 2012 - werner(a)suse.de + +- Add two patch from upstream + + Handle deleted binaries in pidof (was upstream bug #34992) + + Allow init to delte extra environment variables (was upstream + bug #35858) + + Avoid that init double environment variables for its childs + (was upstream bug #35855) + +------------------------------------------------------------------- New: ---- sysvinit-2.88+dsf-dostat.patch sysvinit-2.88+dsf-env.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.EAbMiK/_old 2012-03-20 11:36:19.000000000 +0100 +++ /var/tmp/diff_new_pack.EAbMiK/_new 2012-03-20 11:36:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysvinit # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sysvinit %define PDVER 2.0.2 @@ -24,13 +22,16 @@ %define SCVER 1.16 %define SIVER 2.88+ %define START 0.58 -License: GPL-2.0+ -Group: System/Base Version: %{SIVER} -Release: 58 +Release: 0 Summary: SysV-Style init +License: GPL-2.0+ +Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel +BuildRequires: audit-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel +BuildRequires: pam-devel Url: http://savannah.nongnu.org/projects/sysvinit/ Source: sysvinit-%{SIVER}dsf.tar.bz2 Source2: killproc-%{KPVER}.tar.bz2 @@ -52,6 +53,8 @@ Patch7: %{name}-%{version}dsf-crypt.patch Patch8: %{name}-%{version}dsf-blowfish.dif Patch9: %{name}-2.88dsf-no-kill.patch +Patch10: %{name}-%{version}dsf-env.patch +Patch11: %{name}-%{version}dsf-dostat.patch Patch20: powerd-%{PDVER}.dif Patch21: powerd-%{PDVER}-getaddrinfo.patch Patch30: killproc-%{KPVER}.dif @@ -71,6 +74,7 @@ %package tools Summary: Tools for basic booting +Group: System/Base %if 0%{suse_version} > 1120 Requires(preun): coreutils %insserv_prereq Requires(postun): coreutils %insserv_prereq @@ -85,6 +89,7 @@ %package init Summary: Provides /sbin/init for sysvinit +Group: System/Base Provides: sbin_init Conflicts: otherproviders(sbin_init) Requires: %{name} @@ -103,6 +108,8 @@ %patch7 -p0 -b .crypt %patch8 -p0 -b .blowfish %patch9 -p0 -b .no-kill +%patch10 -p0 -b .env +%patch11 -p0 -b .dostat %patch pushd doc mkdir killproc powerd showconsole ++++++ sysvinit-2.88+dsf-dostat.patch ++++++ Index: src/killall5.c =================================================================== --- src/killall5.c (revision 114) +++ src/killall5.c (working copy) @@ -638,8 +638,32 @@ int readproc(int do_stat) if ((p->nfs = check4nfs(path, buf))) goto link; case DO_STAT: - if (stat(path, &st) != 0) + if (stat(path, &st) != 0) { + char * ptr; + + len = readlink(path, buf, PATH_MAX); + if (len <= 0) + break; + buf[len] = '\0'; + + ptr = strstr(buf, " (deleted)"); + if (!ptr) + break; + *ptr = '\0'; + len -= strlen(" (deleted)"); + + if (stat(buf, &st) != 0) + break; + p->dev = st.st_dev; + p->ino = st.st_ino; + p->pathname = (char *)xmalloc(len + 1); + memcpy(p->pathname, buf, len); + p->pathname[len] = '\0'; + + /* All done */ break; + } + p->dev = st.st_dev; p->ino = st.st_ino; ++++++ sysvinit-2.88+dsf-env.patch ++++++ Index: src/init.c =================================================================== --- src/init.c (revision 113) +++ src/init.c (working copy) @@ -248,7 +248,7 @@ void *imalloc(size_t size) } static -char *istrdup(char *s) +char *istrdup(const char *s) { char *m; int l; @@ -880,6 +880,27 @@ void initlog(int loglevel, char *s, ...) } } +/* + * Add or replace specific environment value + */ +int addnewenv(const char *new, char **curr, int n) +{ + size_t nlen = strcspn(new, "="); + int i; + for (i = 0; i < n; i++) { + if (nlen != strcspn(curr[i], "=")) + continue; + if (strncmp (new, curr[i], nlen) == 0) + break; + } + if (i >= n) + curr[n++] = istrdup(new); + else { + free(curr[i]); + curr[i] = istrdup(new); + } + return n; +} /* * Build a new environment for execve(). @@ -888,7 +909,7 @@ char **init_buildenv(int child) { char i_lvl[] = "RUNLEVEL=x"; char i_prev[] = "PREVLEVEL=x"; - char i_cons[32]; + char i_cons[128]; char i_shell[] = "SHELL=" SHELL; char **e; int n, i; @@ -898,25 +919,30 @@ char **init_buildenv(int child) n += NR_EXTRA_ENV; if (child) n += 8; - e = calloc(n, sizeof(char *)); + while ((e = (char**)calloc(n, sizeof(char *))) == NULL) { + initlog(L_VB, "out of memory"); + do_sleep(5); + } + for (n = 0; environ[n]; n++) e[n] = istrdup(environ[n]); for (i = 0; i < NR_EXTRA_ENV; i++) { - if (extra_env[i]) - e[n++] = istrdup(extra_env[i]); + if (extra_env[i] == NULL || *extra_env[i] == '\0') + continue; + n = addnewenv(extra_env[i], e, n); } if (child) { snprintf(i_cons, sizeof(i_cons), "CONSOLE=%s", console_dev); i_lvl[9] = thislevel; i_prev[10] = prevlevel; - e[n++] = istrdup(i_shell); - e[n++] = istrdup(i_lvl); - e[n++] = istrdup(i_prev); - e[n++] = istrdup(i_cons); - e[n++] = istrdup(E_VERSION); + n = addnewenv(i_shell, e, n); + n = addnewenv(i_lvl, e, n); + n = addnewenv(i_prev, e, n); + n = addnewenv(i_cons, e, n); + n = addnewenv(E_VERSION, e, n); } e[n++] = NULL; @@ -2133,41 +2159,46 @@ void fifo_new_level(int level) static void initcmd_setenv(char *data, int size) { - char *env, *p, *e, *eq; - int i, sz; + char *env, *p, *e; + size_t sz; + int i, eq; e = data + size; while (*data && data < e) { - eq = NULL; for (p = data; *p && p < e; p++) - if (*p == '=') eq = p; + ; if (*p) break; env = data; data = ++p; - sz = eq ? (eq - env) : (p - env); - - /*initlog(L_SY, "init_setenv: %s, %s, %d", env, eq, sz);*/ - /* * We only allow INIT_* to be set. */ if (strncmp(env, "INIT_", 5) != 0) continue; + sz = strcspn(env, "="); + eq = (env[sz] == '='); + + /*initlog(L_SY, "init_setenv: %s, %d, %d", env, eq, sz);*/ + /* Free existing vars. */ for (i = 0; i < NR_EXTRA_ENV; i++) { - if (extra_env[i] == NULL) continue; - if (!strncmp(extra_env[i], env, sz) && - extra_env[i][sz] == '=') { + if (extra_env[i] == NULL) + continue; + if (sz != strcspn(extra_env[i], "=")) + continue; + if (strncmp(extra_env[i], env, sz) == 0) { free(extra_env[i]); extra_env[i] = NULL; } } + if (eq == 0) + continue; + /* Set new vars if needed. */ - if (eq == NULL) continue; for (i = 0; i < NR_EXTRA_ENV; i++) { if (extra_env[i] == NULL) { extra_env[i] = istrdup(env); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sssd for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package sssd for openSUSE:Factory checked in at 2012-03-20 11:35:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sssd (Old) and /work/SRC/openSUSE:Factory/.sssd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sssd", Maintainer is "rhafer(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sssd/sssd.changes 2011-10-21 16:41:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sssd.new/sssd.changes 2012-03-20 11:35:56.000000000 +0100 @@ -1,0 +2,13 @@ +Sun Mar 11 18:36:44 UTC 2012 - jengelh(a)medozas.de + +- Update to new upstream release 1.8.0 +* Support for the service map in NSS +* Support for setting default SELinux user context from FreeIPA +* Support for retrieving SSH user and host keys from LDAP +* Support for caching autofs LDAP requests +* Support for caching SUDO rules +* Include the IPA AutoFS provider +* Fixed several memory-corruption bugs +* Fixed a regression in the proxy provider + +------------------------------------------------------------------- Old: ---- 0001-sss_client-avoid-leaking-file-descriptors.patch 0002-Request-password-control-unconditionally-during-bind.patch sssd-1.5.11.tar.bz2 New: ---- 0004-avoid-hard-crypto-dep.diff 0005-implicit-decl.diff sssd-1.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sssd.spec ++++++ --- /var/tmp/diff_new_pack.LE14Kx/_old 2012-03-20 11:35:58.000000000 +0100 +++ /var/tmp/diff_new_pack.LE14Kx/_new 2012-03-20 11:35:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sssd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,23 +14,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - - Name: sssd -Version: 1.5.11 -Release: 2 -Group: System/Daemons +Version: 1.8.0 +Release: 0 Summary: System Security Services Daemon License: GPL-3.0+ and LGPL-3.0+ +Group: System/Daemons Url: https://fedorahosted.org/sssd/ Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf -Patch1: 0001-sss_client-avoid-leaking-file-descriptors.patch -Patch2: 0002-Request-password-control-unconditionally-during-bind.patch Patch3: 0003-Allow-LDAP-to-decide-when-an-expiration-warning-is-w.patch +Patch4: 0004-avoid-hard-crypto-dep.diff +Patch5: 0005-implicit-decl.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 1140 +%if %suse_version >= 1210 %{?systemd_requires} %endif @@ -47,38 +44,53 @@ %endif ### Build Dependencies ### +%if 0%{?suse_version} >= 1210 +BuildRequires: pkgconfig(collection) >= 0.5.1 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dhash) >= 0.4.2 +BuildRequires: pkgconfig(ini_config) >= 0.6.1 +BuildRequires: pkgconfig(ldb) >= 0.9.2 +BuildRequires: pkgconfig(libcares) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libnl-1) >= 1.1 +BuildRequires: pkgconfig(libpcre) >= 7 +BuildRequires: pkgconfig(popt) +BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(talloc) +BuildRequires: pkgconfig(tdb) >= 1.1.3 +BuildRequires: pkgconfig(tevent) +%else +BuildRequires: dbus-1-devel +BuildRequires: libcares-devel +BuildRequires: libcollection-devel >= 0.5.1 +BuildRequires: libdhash-devel >= 0.4.2 +BuildRequires: libini_config-devel >= 0.6.1 +BuildRequires: libldb-devel >= 0.9.2 +BuildRequires: libnl-devel >= 1.1 +BuildRequires: libopenssl-devel +BuildRequires: libtalloc-devel +BuildRequires: libtdb-devel >= 1.1.3 +BuildRequires: libtevent-devel +BuildRequires: pcre-devel >= 7 +BuildRequires: popt-devel +BuildRequires: python-devel +%endif BuildRequires: autoconf BuildRequires: automake +BuildRequires: bind-utils +BuildRequires: docbook-xsl-stylesheets +BuildRequires: krb5-devel BuildRequires: libtool -BuildRequires: m4 -BuildRequires: popt-devel -BuildRequires: libtalloc-devel -BuildRequires: libtevent-devel -BuildRequires: libtdb-devel -BuildRequires: libldb-devel -BuildRequires: libxslt +BuildRequires: libunistring-devel +# wants: xmllint, xsltproc BuildRequires: libxml2 -BuildRequires: libcares-devel -BuildRequires: dbus-1-devel +BuildRequires: libxslt +BuildRequires: nscd BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: pkg-config -BuildRequires: pcre-devel -BuildRequires: docbook-xsl-stylesheets -BuildRequires: krb5-devel -BuildRequires: python-devel -BuildRequires: bind-utils -BuildRequires: nscd -BuildRequires: libpath_utils-devel -BuildRequires: libdhash-devel -BuildRequires: libini_config-devel -BuildRequires: libcollection-devel -BuildRequires: libref_array-devel -%if %suse_version > 1140 +%if %suse_version >= 1210 BuildRequires: systemd -BuildRequires: libnl-1_1-devel -%else -BuildRequires: libnl-devel %endif %description @@ -89,8 +101,8 @@ services for projects like FreeIPA. %package ipa-provider -License: GPL-3.0+ and LGPL-3.0+ Summary: FreeIPA provider plugin for sssd +License: GPL-3.0+ and LGPL-3.0+ Group: System/Daemons Requires: sssd = %{version} @@ -99,8 +111,8 @@ Services Daemon (sssd). %package tools -License: GPL-3.0+ and LGPL-3.0+ Summary: Commandline tools for sssd +License: GPL-3.0+ and LGPL-3.0+ Group: System/Management Requires: sssd = %{version} @@ -108,9 +120,38 @@ The packages contains commandline tools for managing users and groups using the "local" id provider of the System Security Services Daemon (sssd). -%package -n python-sssd-config +%package -n libipa_hbac0 +Summary: FreeIPA HBAC Evaluator library +License: LGPL-3.0+ +Group: System/Libraries + +%description -n libipa_hbac0 +Utility library to validate FreeIPA HBAC rules for authorization +requests. + +%package -n libipa_hbac-devel +Summary: Development files for the FreeIPA HBAC Evaluator library +License: LGPL-3.0+ +Group: Development/Libraries/C and C++ +Requires: libipa_hbac0 = %version + +%description -n libipa_hbac-devel +Utility library to validate FreeIPA HBAC rules for authorization +requests. + +%package -n python-ipa_hbac +Summary: Python bindings for the FreeIPA HBAC Evaluator library License: GPL-3.0+ and LGPL-3.0+ +Group: Development/Libraries/Python +%py_requires + +%description -n python-ipa_hbac +The python-ipa_hbac package contains the bindings so that libipa_hbac +can be used by Python applications. + +%package -n python-sssd-config Summary: Python API for configuring sssd +License: GPL-3.0+ and LGPL-3.0+ Group: Development/Libraries/Python %{py_requires} @@ -120,15 +161,21 @@ %prep %setup -q -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 3 -P 4 -P 5 -p1 %build autoreconf +%if 0%{?suse_version} < 1210 +# pkgconfig file not present export LDB_LIBS="-lldb" -export LDB_CFLAGS="-I/usr/include" +export LDB_CFLAGS=" " +export LDB_DIR="%_libdir/ldb" +%else +export LDB_DIR="$(pkg-config ldb --variable=modulesdir)" +%endif # help configure find nscd -export PATH=$PATH:/usr/sbin/ +export PATH="$PATH:/usr/sbin" %configure \ --with-db-path=%{dbpath} \ @@ -137,8 +184,7 @@ --with-init-dir=%{_initrddir} \ --enable-nsslibdir=/%{_lib} \ --enable-pammoddir=/%{_lib}/security \ - --enable-crypto=yes \ - --with-ldb-lib-dir=%{_libdir}/ldb \ + --with-ldb-lib-dir="$LDB_DIR" \ --with-selinux=no \ --with-os=suse \ --with-semanage=no @@ -149,9 +195,9 @@ # Copy default sssd.conf file install -d $RPM_BUILD_ROOT/%{_sysconfdir}/sssd -install -m600 src/examples/sssd.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf +install -m600 src/examples/sssd-example.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf install src/sysv/SUSE/sssd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/sssd -%if %suse_version > 1140 +%if %suse_version >= 1210 install -d $RPM_BUILD_ROOT/%{_unitdir} install src/sysv/systemd/sssd.service $RPM_BUILD_ROOT/%{_unitdir}/sssd.service %endif @@ -173,10 +219,7 @@ %find_lang %{name} --all-name -%clean -rm -rf $RPM_BUILD_ROOT - -%if %suse_version > 1140 +%if %suse_version >= 1210 %pre %service_add_pre sssd.service @@ -184,13 +227,13 @@ %post /sbin/ldconfig -%if %suse_version > 1140 +%if %suse_version >= 1210 %service_add_post sssd.service %endif %preun %stop_on_removal sssd -%if %suse_version > 1140 +%if %suse_version >= 1210 %service_del_preun sssd.service %endif @@ -198,15 +241,19 @@ /sbin/ldconfig %restart_on_update sssd %insserv_cleanup -%if %suse_version > 1140 +%if %suse_version >= 1210 %service_del_postun sssd.service %endif +%post -n libipa_hbac0 -p /sbin/ldconfig + +%postun -n libipa_hbac0 -p /sbin/ldconfig + %files -f sssd.lang %defattr(-,root,root,-) %doc COPYING %{_initrddir}/%{name} -%if %suse_version > 1140 +%if %suse_version >= 1210 %{_unitdir}/sssd.service %endif %{_sbindir}/sssd @@ -229,35 +276,23 @@ %attr(750,root,root) %dir %{_var}/log/%{name} %dir %{_sysconfdir}/sssd %config(noreplace) %{_sysconfdir}/sssd/sssd.conf -%config %{_sysconfdir}/sssd/sssd.api.conf -%attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d -%config %{_sysconfdir}/sssd/sssd.api.d/sssd-krb5.conf -%config %{_sysconfdir}/sssd/sssd.api.d/sssd-ldap.conf -%config %{_sysconfdir}/sssd/sssd.api.d/sssd-local.conf -%config %{_sysconfdir}/sssd/sssd.api.d/sssd-proxy.conf -%config %{_sysconfdir}/sssd/sssd.api.d/sssd-simple.conf /%{_lib}/libnss_sss.so.2 /%{_lib}/security/pam_sss.so %{_mandir}/man5/sssd-krb5.* %{_mandir}/man5/sssd-ldap.* %{_mandir}/man5/sssd-simple.* %{_mandir}/man5/sssd.conf.* +%_datadir/sssd +%exclude %_datadir/sssd/sssd.api.d/sssd-ipa.conf %files tools %defattr(-,root,root,-) -%dir %{_mandir}/cs -%dir %{_mandir}/cs/man8 -%dir %{_mandir}/uk -%dir %{_mandir}/uk/man8 -%dir %{_mandir}/es -%dir %{_mandir}/es/man8 -%dir %{_mandir}/nl -%dir %{_mandir}/nl/man8 -%{_mandir}/man8/* -%{_mandir}/cs/man8/* -%{_mandir}/uk/man8/* -%{_mandir}/es/man8/* -%{_mandir}/nl/man8/* +%_mandir/man8/* +%dir %_mandir/?? +%dir %_mandir/??/man* +%_mandir/??/man8/* +%{_sbindir}/sss_cache +%{_sbindir}/sss_debuglevel %{_sbindir}/sss_useradd %{_sbindir}/sss_userdel %{_sbindir}/sss_usermod @@ -269,14 +304,32 @@ %files ipa-provider %defattr(-,root,root,-) -%config %{_sysconfdir}/sssd/sssd.api.d/sssd-ipa.conf +%dir %_datadir/sssd +%dir %_datadir/sssd/sssd.api.d +%_datadir/sssd/sssd.api.d/sssd-ipa.conf %{_libdir}/sssd/libsss_ipa* %{_mandir}/man5/sssd-ipa.* +%files -n libipa_hbac0 +%defattr(-,root,root) +%_libdir/libipa_hbac.so.0* + +%files -n libipa_hbac-devel +%defattr(-,root,root) +%_includedir/ipa_hbac.h +%_libdir/libipa_hbac.so +%_libdir/pkgconfig/ipa_hbac.pc + +%files -n python-ipa_hbac +%defattr(-,root,root) +%python_sitearch/pyhbac.so + %files -n python-sssd-config -%defattr(-,root,root,-) -%{python_sitearch}/pysss.so -%{python_sitelib}/*.py* -%{python_sitelib}/*.egg-info +%defattr(-,root,root) +%python_sitearch/pysss.so +%python_sitelib/SSSDConfig*.py* +%python_sitelib/SSSDConfig*.egg-info +%python_sitelib/ipachangeconf.py* +%python_sitelib/sssd_upgrade_config.py* %changelog ++++++ 0004-avoid-hard-crypto-dep.diff ++++++ From: Jan Engelhardt <jengelh(a)medozas.de> Date: 2012-03-11 21:45:34.708782973 +0100 build: restore libcrypto support in the autotools files. References: https://bugzilla.redhat.com/show_bug.cgi?id=802169 --- configure.ac | 1 + src/external/crypto.m4 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) Index: sssd-1.8.0/configure.ac =================================================================== --- sssd-1.8.0.orig/configure.ac +++ sssd-1.8.0/configure.ac @@ -210,6 +210,7 @@ if test x$HAVE_SYSTEMD_UNIT != x; then fi AM_CHECK_NSS +AM_CHECK_LIBCRYPTO AM_CONDITIONAL([HAVE_NSS], [test x"$NSS_CFLAGS" != x]) AC_CHECK_HEADERS([sys/inotify.h]) Index: sssd-1.8.0/src/external/crypto.m4 =================================================================== --- sssd-1.8.0.orig/src/external/crypto.m4 +++ sssd-1.8.0/src/external/crypto.m4 @@ -1,9 +1,9 @@ AC_DEFUN([AM_CHECK_NSS], - [PKG_CHECK_MODULES([NSS],[nss]) + [PKG_CHECK_MODULES([NSS],[nss],[:],[:]) AC_DEFINE_UNQUOTED(HAVE_NSS, 1, [Build with NSS crypto back end]) ]) AC_DEFUN([AM_CHECK_LIBCRYPTO], - [PKG_CHECK_MODULES([CRYPTO],[libcrypto]) + [PKG_CHECK_MODULES([CRYPTO],[libcrypto],[:],[:]) AC_DEFINE_UNQUOTED(HAVE_LIBCRYPTO, 1, [Build with libcrypt crypto back end]) ]) ++++++ 0005-implicit-decl.diff ++++++ From: Jan Engelhardt <jengelh(a)medozas.de> Date: 2012-03-11 23:31:50.889566758 +0100 build: resolve compiler warnings about implicitly-defined functions crypto_sha512crypt.c: In function 'sha512_crypt_r': crypto_sha512crypt.c:200:9: warning: implicit declaration of function 'mempcpy' [-Wimplicit-function-declaration] crypto_sha512crypt.c:200:14: warning: incompatible implicit declaration of built-in function 'mempcpy' [enabled by default] crypto_sha512crypt.c:221:14: warning: incompatible implicit declaration of built-in function 'mempcpy' [enabled by default] --- src/util/crypto/libcrypto/crypto_sha512crypt.c | 1 + 1 file changed, 1 insertion(+) Index: sssd-1.8.0/src/util/crypto/libcrypto/crypto_sha512crypt.c =================================================================== --- sssd-1.8.0.orig/src/util/crypto/libcrypto/crypto_sha512crypt.c +++ sssd-1.8.0/src/util/crypto/libcrypto/crypto_sha512crypt.c @@ -10,6 +10,7 @@ /* SHA512-based Unix crypt implementation. Released into the Public Domain by Ulrich Drepper <drepper(a)redhat.com>. */ +#define _GNU_SOURCE 1 /* mempcpy */ #include <endian.h> #include <errno.h> #include <limits.h> ++++++ sssd-1.5.11.tar.bz2 -> sssd-1.8.0.tar.bz2 ++++++ ++++ 592905 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 siproxd for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package siproxd for openSUSE:Factory checked in at 2012-03-20 11:35:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/siproxd (Old) and /work/SRC/openSUSE:Factory/.siproxd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "siproxd", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/siproxd/siproxd.changes 2011-09-23 12:46:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.siproxd.new/siproxd.changes 2012-03-20 11:35:48.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 19 16:12:48 CET 2012 - ro(a)suse.de + +- switch from user nobody to own user siproxd (bnc#710608) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ siproxd.spec ++++++ --- /var/tmp/diff_new_pack.6g5HQL/_old 2012-03-20 11:35:49.000000000 +0100 +++ /var/tmp/diff_new_pack.6g5HQL/_new 2012-03-20 11:35:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package siproxd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,16 @@ # %define piddir /var/run/siproxd/ %define regdir /var/lib/siproxd/ -%define siproxduser nobody +%define siproxduser siproxd +%define siproxdgroup siproxd Name: siproxd Version: 0.8.1 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: A SIP masquerading proxy with RTP support -Url: http://siproxd.sourceforge.net/ +License: GPL-2.0+ Group: Productivity/Networking/Other +Url: http://siproxd.sourceforge.net/ Source0: %{name}-%{version}.tar.bz2 Source1: susefirewall2.%{name} Source2: %name.init.in @@ -44,8 +45,13 @@ #PATCH-FIX-FROM-DEBIAN use logger not user Patch1: siproxd-log.c.patch Patch9: siproxd.plugin_fix_bogus_via.c.patch -BuildRequires: docbook-utils libltdl libosip2 libosip2-devel libtool +BuildRequires: docbook-utils +BuildRequires: libltdl +BuildRequires: libosip2 +BuildRequires: libosip2-devel +BuildRequires: libtool Requires: logrotate +PreReq: %_sbindir/groupadd %_sbindir/useradd Suggests: SuSEfirewall2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,7 +65,6 @@ %package doc Summary: Documentation for %{name} -License: GPL-2.0+ Group: Documentation/Other %description doc @@ -106,6 +111,10 @@ %{__mkdir} -p %buildroot%_mandir/man8 %__install -m 0644 %{S:4} %{buildroot}%{_mandir}/man8/%name.8.gz +# +sed -i -e "s@nobody@%{siproxduser}@" %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +sed -i -e "s@nobody@%{siproxduser}@" %buildroot/%{_sysconfdir}/init.d/%{name} +# # Directory needs to exist for packaging %if %suse_version > 1120 %{__mkdir} -p %buildroot%{_localstatedir}/run/%{name} @@ -121,6 +130,10 @@ %post -p /sbin/ldconfig +%pre +%_sbindir/groupadd -r %{sipproxdgroup} 2> /dev/null || : +%_sbindir/useradd -r -o -g %{sipproxdgroup} -s /bin/false -c "Siproxd user" -d %{_localstatedir}/run/%{name} %{siproxduser} 2> /dev/null || : + %postun /sbin/ldconfig %restart_on_update %{name} @@ -148,7 +161,7 @@ %if %suse_version > 1120 #make rpm know about a directory but do not package it - %attr(0750,nobody,root) %ghost %{_localstatedir}/run/%{name} + %attr(0750,%{siproxduser},root) %ghost %{_localstatedir}/run/%{name} %endif %files doc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sblim-cmpi-ssh_service_profile for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package sblim-cmpi-ssh_service_profile for openSUSE:Factory checked in at 2012-03-20 11:35:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-cmpi-ssh_service_profile (Old) and /work/SRC/openSUSE:Factory/.sblim-cmpi-ssh_service_profile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sblim-cmpi-ssh_service_profile", Maintainer is "npaxton(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-cmpi-ssh_service_profile/sblim-cmpi-ssh_service_profile.changes 2011-11-28 18:28:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sblim-cmpi-ssh_service_profile.new/sblim-cmpi-ssh_service_profile.changes 2012-03-20 11:35:36.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 5 08:28:36 UTC 2012 - cfarrell(a)suse.com + +- license update: EPL-1.0 + + +------------------------------------------------------------------- +Tue Jan 24 08:45:54 UTC 2012 - kkaempf(a)suse.com + +- add missing pclose (bnc#530329) + +------------------------------------------------------------------- New: ---- bnc530329-pclose.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-ssh_service_profile.spec ++++++ --- /var/tmp/diff_new_pack.20JNRO/_old 2012-03-20 11:35:38.000000000 +0100 +++ /var/tmp/diff_new_pack.20JNRO/_new 2012-03-20 11:35:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sblim-cmpi-ssh_service_profile # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Release: 0 Group: System/Management Summary: Instrumentation for DMTF SSH Service Profile. -License: Other uncritical OpenSource License; Eclipse Public License 1.0 +License: EPL-1.0 # This is necessary to build the RPM as a non-root user. BuildRoot: %{_tmppath}/%{name}-%{version}-build # "yes" is the default, but we put it here explicitly to avoid someone @@ -34,6 +34,7 @@ Requires: sblim-sfcb sblim-cmpi-base Requires: cim-schema >= 2.17 Source0: sblim-cmpi-ssh_service_profile-%{version}.tar.gz +Patch1: bnc530329-pclose.patch %description Linux providers for instrumentation of DMTF SSH Service Profile (DSP @@ -50,6 +51,7 @@ %prep # Untar the sources. %setup -n sblim-cmpi-ssh_service_profile-%{version} +%patch1 -p1 %build # If the LD_RUN_PATH environment variable is set at link time, ++++++ bnc530329-pclose.patch ++++++ diff -wruN -x '*~' ../orig-sblim-cmpi-ssh_service_profile-1.0.0/src/Resource.c ./src/Resource.c --- ../orig-sblim-cmpi-ssh_service_profile-1.0.0/src/Resource.c 2008-08-07 18:31:58.000000000 +0200 +++ ./src/Resource.c 2012-01-24 09:40:14.000000000 +0100 @@ -252,7 +252,7 @@ if (!ptr) { free(data); - fclose(is); + pclose(is); return -1; } @@ -260,6 +260,7 @@ memcpy(&data[size++], &sess, sizeof(sess)); } + pclose(is); *sessions = data; *num_sessions = size; return 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sanlock for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package sanlock for openSUSE:Factory checked in at 2012-03-20 11:35:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sanlock (Old) and /work/SRC/openSUSE:Factory/.sanlock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sanlock", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes 2012-01-27 15:24:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2012-03-20 11:35:28.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 13 12:04:11 MDT 2012 - jfehlig(a)suse.com + +- Update to sanlock 2.1 + - python: release leases for other processes + - python: add shared resource parameter to acquire + - add a logrotate file + - status for all shared tokens + - retry transient sh failures + - fix inquire state string + +------------------------------------------------------------------- Old: ---- sanlock-1.9.tar.gz New: ---- sanlock-2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sanlock.spec ++++++ --- /var/tmp/diff_new_pack.FaUUmq/_old 2012-03-20 11:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.FaUUmq/_new 2012-03-20 11:35:32.000000000 +0100 @@ -15,22 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define with_systemd 0 %if 0%{?suse_version} > 1140 %define with_systemd 1 %endif - Name: sanlock -Version: 1.9 +Version: 2.1 Release: 1%{?dist} Summary: A shared disk lock manager - -Group: System/Base License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ -URL: https://fedorahosted.org/sanlock/ +Group: System/Base + +Url: https://fedorahosted.org/sanlock/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libblkid-devel libaio-devel python python-devel +BuildRequires: libaio-devel +BuildRequires: libblkid-devel +BuildRequires: python +BuildRequires: python-devel %if %{with_systemd} BuildRequires: systemd %{?systemd_requires} @@ -39,7 +42,7 @@ Requires: %{name}-lib = %{version}-%{release} # Latest version available at # https://fedorahosted.org/releases/s/a/sanlock/ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 Source1: sanlock.init Source2: wdmd.init Source3: sysconfig.sanlock ++++++ sanlock-1.9.tar.gz -> sanlock-2.1.tar.bz2 ++++++ ++++ 3484 lines of diff (skipped) ++++++ sanlock-SCHED_RESET_ON_FORK-undefined.patch ++++++ --- /var/tmp/diff_new_pack.FaUUmq/_old 2012-03-20 11:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.FaUUmq/_new 2012-03-20 11:35:32.000000000 +0100 @@ -2,9 +2,9 @@ =================================================================== --- src/main.c.orig +++ src/main.c -@@ -50,6 +50,10 @@ - #include "client_cmd.h" - #include "cmd.h" +@@ -52,6 +52,10 @@ + + #define RELEASE_VERSION "2.1" +#ifndef SCHED_RESET_ON_FORK +#define SCHED_RESET_ON_FORK 0 @@ -19,7 +19,7 @@ +++ wdmd/main.c @@ -43,6 +43,10 @@ - #define RELEASE_VERSION "1.9" + #define RELEASE_VERSION "2.1" +#ifndef SCHED_RESET_ON_FORK +#define SCHED_RESET_ON_FORK 0 ++++++ suse-no-date-time.patch ++++++ --- /var/tmp/diff_new_pack.FaUUmq/_old 2012-03-20 11:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.FaUUmq/_new 2012-03-20 11:35:32.000000000 +0100 @@ -1,8 +1,8 @@ -Index: sanlock-1.9/src/main.c +Index: sanlock-2.1/src/main.c =================================================================== ---- sanlock-1.9.orig/src/main.c -+++ sanlock-1.9/src/main.c -@@ -1430,8 +1430,7 @@ static int read_command_line(int argc, c +--- sanlock-2.1.orig/src/main.c ++++ sanlock-2.1/src/main.c +@@ -1439,8 +1439,7 @@ static int read_command_line(int argc, c if (!strcmp(arg1, "version") || !strcmp(arg1, "--version") || !strcmp(arg1, "-V")) { ++++++ suse-systemd.patch ++++++ --- /var/tmp/diff_new_pack.FaUUmq/_old 2012-03-20 11:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.FaUUmq/_new 2012-03-20 11:35:32.000000000 +0100 @@ -1,7 +1,7 @@ -Index: sanlock-1.9/init.d/sanlock.service +Index: sanlock-2.1/init.d/sanlock.service =================================================================== ---- sanlock-1.9.orig/init.d/sanlock.service -+++ sanlock-1.9/init.d/sanlock.service +--- sanlock-2.1.orig/init.d/sanlock.service ++++ sanlock-2.1/init.d/sanlock.service @@ -3,8 +3,9 @@ After=syslog.target wdmd.service [Service] @@ -14,10 +14,10 @@ [Install] WantedBy=multi-user.target -Index: sanlock-1.9/init.d/wdmd.service +Index: sanlock-2.1/init.d/wdmd.service =================================================================== ---- sanlock-1.9.orig/init.d/wdmd.service -+++ sanlock-1.9/init.d/wdmd.service +--- sanlock-2.1.orig/init.d/wdmd.service ++++ sanlock-2.1/init.d/wdmd.service @@ -3,8 +3,8 @@ After=syslog.target [Service] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2012-03-20 11:34:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2012-03-16 13:24:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2012-03-20 11:35:20.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 20 08:32:33 UTC 2012 - lnussel(a)suse.de + +- better deal with spaces in logrotate config +- add colord-sane dbus service to whitelist (bnc#752518) + +------------------------------------------------------------------- +Fri Mar 16 14:26:34 CET 2012 - dmueller(a)suse.de + +- fix parsing of update-alternatives and clarify info message + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CheckAlternativesGhostFiles.py ++++++ --- /var/tmp/diff_new_pack.Hm0zxA/_old 2012-03-20 11:35:22.000000000 +0100 +++ /var/tmp/diff_new_pack.Hm0zxA/_new 2012-03-20 11:35:22.000000000 +0100 @@ -32,8 +32,12 @@ if cls.INSTALL in c): #parse install - xs = command.split(None, 4) - ghost_files.append(xs[1]) + command_args = [] + for arg in command.split(None): + if not arg.startswith("--"): + command_args.append(arg) + + ghost_files.append(command_args[0]) if cls.SLAVE in command: for sc in ( \ @@ -70,12 +74,12 @@ addDetails( 'generic-name-not-marked-as-ghost', -'''The generic name is not marked as a ghost, which may cause a problems during -update. Mark it as a %ghost in %files section.''', +'''The update-alternatives generic name is not marked as a ghost in the %files section. +This causes problems during update. Mark it as a %ghost in %files section.''', 'generic-name-not-in-filelist', -'''The generic name is not in a filelist of package, add it to list marked as -%ghost. Note: this error will be raised, if you use a hash ($) in file name, -use rpm macros in spec file instead.''', +'''The update-alternatives generic name is not in a filelist of package. +Add it to list marked as %ghost. Note: this error will be raised, +if you use a hash ($) in file name, use rpm macros in spec file instead.''', ) ++++++ CheckLogrotate.py ++++++ --- /var/tmp/diff_new_pack.Hm0zxA/_old 2012-03-20 11:35:22.000000000 +0100 +++ /var/tmp/diff_new_pack.Hm0zxA/_new 2012-03-20 11:35:22.000000000 +0100 @@ -63,7 +63,8 @@ if line.endswith('{'): insection = True for logfile in line.split(' '): - if logfile == '{': + logfile = logfile.strip() + if len(logfile) == 0 or logfile == '{': continue dn = os.path.dirname(logfile) if not dn in dirs: ++++++ config ++++++ --- /var/tmp/diff_new_pack.Hm0zxA/_old 2012-03-20 11:35:22.000000000 +0100 +++ /var/tmp/diff_new_pack.Hm0zxA/_new 2012-03-20 11:35:22.000000000 +0100 @@ -1,5 +1,5 @@ # -*- python -*- -# vim: syntax=python +# vim: syntax=python sw=4 et # Configuration for the rpmlint utility. # Loaded before ~/.rpmlintrc # $Id: config,v 1.39 2003/12/22 11:20:55 flepied Exp $ @@ -481,6 +481,9 @@ # colord (bnc#698250) "org.freedesktop.ColorManager.service", "org.freedesktop.ColorManager.conf", + # colord-sane (bnc#752518) + "org.freedesktop.colord-sane.service", + "org.freedesktop.colord-sane.conf", # lightdm (bnc#708205) "org.freedesktop.DisplayManager.conf", # kdepim4/kalarm (bnc#707723) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rfc for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at 2012-03-20 11:34:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rfc (Old) and /work/SRC/openSUSE:Factory/.rfc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rfc", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rfc/rfc.changes 2012-03-11 20:05:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rfc.new/rfc.changes 2012-03-20 11:35:01.000000000 +0100 @@ -2 +2 @@ -Sat Mar 10 09:43:17 CET 2012 - autobuild(a)suse.de +Sun Mar 18 08:42:55 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-03-10 +- automated update on 2012-03-18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.tgz ++++++ /work/SRC/openSUSE:Factory/rfc/rfc.tgz /work/SRC/openSUSE:Factory/.rfc.new/rfc.tgz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at 2012-03-20 11:34:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old) and /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qtcurve-kde4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes 2011-09-23 12:43:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes 2012-03-20 11:34:42.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Mar 15 07:33:12 UTC 2012 - mlin(a)suse.com + +- Update to version 1.8.11 + * Fix flashing of clementine's position slider tooltip. + +- Changes in 1.8.10 + * Fix some toolbutton icon clipping. + * Korean translation - thanks to YoungUk Kim. + * Fix kwin button corruption when compositing is disabled under KDE SC4.8 + * Minimum 1ms delay for sub menus. + +- Changes in 1.8.9 + * Dont force alternate listview colours for KAboutApplicationDialog + * Fix issues with konqueror style menu toolbar buttons and the joined toolbar button style. + * Implement shadows for KDE SC4.7 + +------------------------------------------------------------------- Old: ---- QtCurve-KDE4-1.8.8.tar.bz2 New: ---- QtCurve-KDE4-1.8.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.NhFqvO/_old 2012-03-20 11:34:44.000000000 +0100 +++ /var/tmp/diff_new_pack.NhFqvO/_new 2012-03-20 11:34:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qtcurve-kde4 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: qtcurve-kde4 -Version: 1.8.8 -Release: 1 -License: GPL-2.0+ +Version: 1.8.11 +Release: 0 Summary: QtCurve style for KDE 4 -Url: http://www.kde-look.org/content/show.php?content=40492 +License: GPL-2.0+ Group: System/GUI/KDE +Url: http://www.kde-look.org/content/show.php?content=40492 Source0: QtCurve-KDE4-%{version}.tar.bz2 BuildRequires: kdebase4-workspace-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ QtCurve-KDE4-1.8.8.tar.bz2 -> QtCurve-KDE4-1.8.11.tar.bz2 ++++++ ++++ 7378 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-stomper for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-stomper for openSUSE:Factory checked in at 2012-03-20 11:34:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-stomper (Old) and /work/SRC/openSUSE:Factory/.python-stomper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-stomper", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-stomper.new/python-stomper.changes 2012-03-20 11:34:29.000000000 +0100 @@ -0,0 +1,58 @@ +------------------------------------------------------------------- +Wed Mar 14 10:32:57 UTC 2012 - saschpe(a)suse.de + +- Simplified macro usage, ran spec-cleaner + +------------------------------------------------------------------- +Thu Sep 22 12:17:04 UTC 2011 - saschpe(a)suse.de + +- Require python-uuid for SLE_10 and below. +- Use python-nose for unittests to fix SLE build + +------------------------------------------------------------------- +Thu Sep 22 08:56:39 UTC 2011 - saschpe(a)suse.de + +- Fixed license to Apache-2.0 + +------------------------------------------------------------------- +Thu Sep 22 08:51:57 UTC 2011 - saschpe(a)suse.de + +- Update to version 0.2.4: + *Fixing the problem whereby uuid would be installed on python2.5+. +- Changes from version 0.2.3: + * Fixed issue #9 with the example code. All messages are sent and received correctly. +- Spec file cleanup: + * Added proper changes file and spec file license header + * Run testsuite + +------------------------------------------------------------------- +Thu Apr 9 00:00:00 UTC 2009 - silas(a)sewell.ch + +- Remove Python version dependency + +------------------------------------------------------------------- +Sun Mar 29 00:00:00 UTC 2009 - silas(a)sewell.ch + +- Fix dependencies + +------------------------------------------------------------------- +Thu Mar 26 00:00:00 UTC 2009 - silas(a)sewell.ch + +- Update package name to conform to Fedora naming standards +- Change define to global + +------------------------------------------------------------------- +Fri Mar 20 00:00:00 UTC 2009 - silas(a)sewell.ch + +- Update upstream package to remove hidden files + +------------------------------------------------------------------- +Thu Mar 5 00:00:00 UTC 2009 - silas(a)sewell.ch + +- Manually remove hidden files + +------------------------------------------------------------------- +Wed Dec 17 00:00:00 UTC 2008 - silas(a)sewell.ch + +- Initial package + New: ---- python-stomper.changes python-stomper.spec stomper-0.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-stomper.spec ++++++ # # spec file for package python-stomper # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-stomper Version: 0.2.4 Release: 0 License: Apache-2.0 Summary: This is a transport neutral client implementation of the STOMP protocol Url: http://code.google.com/p/stomper Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/s/stomper/stomper-%{version}.tar.gz BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-nose BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description This is a python client implementation of the STOMP protocol. The client is attempting to be transport layer neutral. This module provides functions to create and parse STOMP messages in a programatic fashion. The messages can be easily generated and parsed, however its up to the user to do the sending and receiving. %prep %setup -q -n stomper-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check nosetests %files %defattr(-,root,root,-) %doc README lib/stomper/examples %{python_sitelib}/* %changelog -- 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-socketpool for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-socketpool for openSUSE:Factory checked in at 2012-03-20 11:34:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-socketpool (Old) and /work/SRC/openSUSE:Factory/.python-socketpool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-socketpool", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-socketpool.new/python-socketpool.changes 2012-03-20 11:34:15.000000000 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 14 10:33:50 UTC 2012 - saschpe(a)suse.de + +- Ran spec-cleaner + +------------------------------------------------------------------- +Thu Feb 2 10:03:09 UTC 2012 - saschpe(a)suse.de + +- Initial version + New: ---- python-socketpool.changes python-socketpool.spec socketpool-0.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-socketpool.spec ++++++ # # spec file for package python-socketpool # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-socketpool Version: 0.3.0 Release: 0 License: MIT Summary: Python socket pool Url: http://github.com/benoitc/socketpool Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/s/socketpool/socketpool-%{version}.t… BuildRequires: python-devel BuildRequires: python-nose Recommends: python-eventlet Recommends: python-gevent BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Socket pool is a simple socket pool that suports multiple factories and backends. It can easily be used by gevent, eventlet or any other library. %prep %setup -q -n socketpool-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} rm -r %{buildroot}%{_prefix}/socketpool # Remove wrongly installed docs %check nosetests %files %defattr(-,root,root,-) %doc README.rst *LICENSE examples %{python_sitelib}/* %changelog -- 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-slimit for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-slimit for openSUSE:Factory checked in at 2012-03-20 11:34:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-slimit (Old) and /work/SRC/openSUSE:Factory/.python-slimit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-slimit", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-slimit.new/python-slimit.changes 2012-03-20 11:34:01.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Mar 12 08:43:00 UTC 2012 - saschpe(a)suse.de + +- Initial version + New: ---- python-slimit.changes python-slimit.spec slimit-0.6.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-slimit.spec ++++++ # # spec file for package python-slimit # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-slimit Version: 0.6 Release: 0 Url: http://slimit.org Summary: JavaScript minifier written in Python License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/s/slimit/slimit-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-odict BuildRequires: python-ply BuildRequires: unzip %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description SlimIt is a JavaScript minifier written in Python. It compiles JavaScript into more compact code so that it downloads and runs faster. SlimIt also provides a library that includes a JavaScript parser, lexer, pretty printer and a tree visitor. %prep %setup -q -n slimit-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check python setup.py test %files %defattr(-,root,root,-) %doc CHANGES README.rst %{_bindir}/slimit %{python_sitelib}/* %changelog -- 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-Shed_Skin for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-Shed_Skin for openSUSE:Factory checked in at 2012-03-20 11:33:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Shed_Skin (Old) and /work/SRC/openSUSE:Factory/.python-Shed_Skin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Shed_Skin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Shed_Skin/python-Shed_Skin.changes 2011-09-23 12:42:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Shed_Skin.new/python-Shed_Skin.changes 2012-03-20 11:33:55.000000000 +0100 @@ -1,0 +2,66 @@ +Wed Mar 14 13:55:16 UTC 2012 - saschpe(a)suse.de + +- Update to version 0.9.1: + - new -L option to add library directories (Artem Egorkine) + - support /etc/shedskin/FLAGS, /usr/share/shedskin/lib (triggered by Paul Boddie) + - support enumerate 'start' argument + - itertools.product optimization (triggered by lesshaste) + - str.join and str non-equality optimization (triggered by lesshaste) + - new example: hq2x image scaling + - fix for itertools.izip (Jérémie Roquet) + - several fixes for MSVC (Liu Zhenhai) + - fix os.listdir crash (Pierre-Marie de Rodat) + - annotation fix (William Edwards) + - fix for 'not a < b < c' (François Boutines) + - os.popen2 improvement (triggered by Danny Milosavljevic) + - improved extmod warnings (triggered by Paul Boddie) + - sys.exit improvements (reported by rodseth) + - added missing class qualifier/include statement + - fix for ConfigParser model (reported by Danny Milosavljevic) +- Changes from version 0.9.0: + - major type inference scalability improvements (c64 emulator 10 times faster!) + - support for 'mmap' module (francois boutines) + - support for 'binascii' module (fahrzin hemmati) + - support for 'colorsys' module (tony veijalainen) + - greatly improved file I/O performance (francois) + - massive optimization for complex numbers (copy-by-value) + - optimized 'for .., .. in somedict.iteritems()' + - 6 new example programs (now 63 in total!): + - natural language parser (andreas van cranenburgh) + - sokoban (uses array, collections.deque) + - connect-4 + - interactive mandelbrot (tony veijalainen) + - dancing links sudoku solver + - K-means++ clustering + - c64 emulator example now without glitches for international karate + - fixes for 'universal mode' (francois) + - only print tracebacks for uncaught exceptions (shedskin -x; joris van zwieten) + - some further exception handling cleanups + - add set.isdisjoint, sys.maxsize (brent pedersen) + - several set methods now take multiple arguments (brent) + - string equality optimization (francois) + - fix for string/array equality and \0 (francois) + - improved support for overloading comparison operators + - several inheritance fixes (thanks to test case by jason ye) + - improvements for working with 'incompatible' types (e.g., [[]] == [[1]]) + - implementation of builtins split up into separate files (triggered by francois) + - cleaned up GCC warnings for builtins (triggered by francois) + - support 'id' builtin for non-scalars + - some optimizations for array('c') + - some improvements for 'copy' module + - use 'long' type for hash values everywhere + - support for 'isinstance' was dropped + - avoid 'jump' to 100% in progress bar + - removed -d command-line option, replaced it with hidden debug-level option + - add --silent mode, showing only warnings + - add timer (jason ye) + - os.utime implementation for windows + - documented how to profile extension modules + - documentation moved to wiki +- Use examples from external tarball +- Remove outdated %clean section +- Simplified macro usage +- Added some requirements you typically want to have when translating + Python modules to C++ with Shed Skin + +------------------------------------------------------------------- Old: ---- shedskin-0.8.tgz New: ---- shedskin-0.9.1.tgz shedskin-examples-0.9.1.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Shed_Skin.spec ++++++ --- /var/tmp/diff_new_pack.QDZ3BI/_old 2012-03-20 11:33:57.000000000 +0100 +++ /var/tmp/diff_new_pack.QDZ3BI/_new 2012-03-20 11:33:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-Shed_Skin # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,26 +16,28 @@ # - Name: python-Shed_Skin -Version: 0.8 -Release: 3 +Version: 0.9.1 +Release: 0 Url: http://shedskin.googlecode.com Summary: An Optimizing (restricted) Python-to-C++ Compiler License: GPL-3.0+ Group: Development/Languages/Python -Source: http://shedskin.googlecode.com/files/shedskin-0.8.tgz -Source99: shedskin-rpmlintrc +Source: http://shedskin.googlecode.com/files/shedskin-%{version}.tgz +Source1: http://shedskin.googlecode.com/files/shedskin-examples-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build +#BuildRequires: gc-devel +#BuildRequires: gcc-c++ +#BuildRequires: pcre-devel BuildRequires: python-devel -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +Requires: gc-devel +Requires: gcc-c++ +Requires: pcre-devel +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description Shed Skin is an experimental (restricted) Python-to-C++ compiler. It accepts @@ -48,8 +50,6 @@ home page for more details. %package doc - - Summary: An Optimizing (restricted) Python-to-C++ Compiler - Documentation Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -68,8 +68,8 @@ %prep %setup -q -n shedskin-%{version} -# Fix wrong EOL encoding -sed -i 's/\r$//' examples/{*.py,scene.txt,ml/*.{py,txt},testdata/*} +tar xxf %{SOURCE1} && mv shedskin-examples-%{version} examples # Unpack seperate examples +sed -i 's/\r$//' examples/{*.py,scene.txt,ml/*.{py,txt},testdata/*} # Fix wrong EOL encoding %build CFLAGS="%{optflags}" python setup.py build @@ -77,15 +77,13 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +# Disable testsuite, it takes far too long. Feel free to test after version updates: #%%check #python setup.py test -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) -%doc LICENSE README.html +%doc LICENSE README %{_bindir}/shedskin %{python_sitelib}/* ++++++ shedskin-0.8.tgz -> shedskin-0.9.1.tgz ++++++ ++++ 90173 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-passlib for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-passlib for openSUSE:Factory checked in at 2012-03-20 11:33:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-passlib (Old) and /work/SRC/openSUSE:Factory/.python-passlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-passlib", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-passlib/python-passlib.changes 2012-02-17 12:08:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-passlib.new/python-passlib.changes 2012-03-20 11:33:47.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 8 11:34:03 UTC 2012 - saschpe(a)suse.de + +- Don't run testsuite on SLE, fixes build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-passlib.spec ++++++ --- /var/tmp/diff_new_pack.qgD4MR/_old 2012-03-20 11:33:50.000000000 +0100 +++ /var/tmp/diff_new_pack.qgD4MR/_new 2012-03-20 11:33:50.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-passlib Version: 1.5.3 Release: 0 @@ -50,8 +51,10 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%if 0%{?suse_version} && 0%{?suse_version} > 1130 %check nosetests +%endif %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-matplotlib for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-matplotlib for openSUSE:Factory checked in at 2012-03-20 11:33:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-matplotlib (Old) and /work/SRC/openSUSE:Factory/.python-matplotlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-matplotlib", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-matplotlib/python-matplotlib.changes 2012-01-19 16:57:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-matplotlib.new/python-matplotlib.changes 2012-03-20 11:33:40.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 16 15:13:32 UTC 2012 - toddrme2178(a)gmail.com + +- Cleaned up spec file formatting +- Removed tests for obsolete openSUSE versions +- Added Qt Designer plugin from Python(x,y) project + +------------------------------------------------------------------- New: ---- matplotlibplugin.py matplotlibwidget.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-matplotlib.spec ++++++ --- /var/tmp/diff_new_pack.4KM2jz/_old 2012-03-20 11:33:42.000000000 +0100 +++ /var/tmp/diff_new_pack.4KM2jz/_new 2012-03-20 11:33:42.000000000 +0100 @@ -15,16 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -Name: python-matplotlib +%define modname matplotlib +Name: python-%{modname} Version: 1.1.0 Release: 0 Summary: Plotting Library for Python License: BSD-2-Clause Group: Development/Libraries/Python -Url: http://sourceforge.net/projects/matplotlib -Source: matplotlib-%{version}.tar.bz2 -Source1: matplotlib-setup.cfg +Url: http://sourceforge.net/projects/%{modname} +Source: %{modname}-%{version}.tar.bz2 +Source1: %{modname}-setup.cfg +Source2: %{modname}plugin.py +Source3: %{modname}widget.py BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fltk-devel @@ -33,6 +36,7 @@ BuildRequires: gtk2-devel BuildRequires: libpng-devel BuildRequires: python-gtk +BuildRequires: python-gtk-devel BuildRequires: python-numpy-devel >= 1.2.1 BuildRequires: python-tk BuildRequires: tcl @@ -44,25 +48,16 @@ Requires: python-numpy >= 1.2.1 Requires: python-tz %py_requires -%if %suse_version > 1130 -BuildRequires: python-wxWidgets -BuildRequires: wxWidgets-devel -%else +%if 0%{?sles_version} == 11 +BuildRequires: gnome-libs-devel +BuildRequires: python-qt BuildRequires: python-wxGTK BuildRequires: wxGTK-devel -%endif -BuildRequires: python-gtk-devel -%if 0%{?suse_version} >= 1120 -BuildRequires: python-qt4 %else -BuildRequires: python-qt -%endif -%if 0%{?suse_version} >= 1130 BuildRequires: libgnome-devel -%else -BuildRequires: gnome-libs-devel -%endif -%if %suse_version > 1130 +BuildRequires: python-qt4 +BuildRequires: python-wxWidgets +BuildRequires: wxWidgets-devel %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires %endif @@ -81,26 +76,40 @@ application servers, and six graphical user interface toolkits. %package tk -Summary: Tk backend for python-matplotlib +Summary: Tk backend for %{name} Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: python-tk %description tk -Tk backend for python-matplotlib plotting package +Tk backend for %{name} plotting package %package wx -Summary: Wx backend for python-matplotlib +Summary: Wx backend for %{name} Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: python-wxGTK %description wx -wxWidgets backend for python-matplotlib plotting package +wxWidgets backend for %{name} plotting package + +%package designer +Summary: %{name} widget for Qt Designer +Group: Development/Libraries/Python +License: MIT +Requires: %{name} = %{version} +Requires: python-qt4 +Requires: qt-creator + +%description designer +This is a plugin and widget to let you use %{name} +plots as widget in PyQt4 GUIs using Qt Designer + +This plugin comes from Python(x,y) %prep %setup -n matplotlib-%{version} -chmod -x lib/matplotlib/mpl-data/images/*.svg +chmod -x lib/%{modname}/mpl-data/images/*.svg %build cp %{SOURCE1} ./setup.cfg @@ -109,36 +118,45 @@ %install python setup.py install --root=%{buildroot} \ --record-rpm=INSTALLED_FILES --prefix=%{_prefix} +mkdir -p %{buildroot}%{_libdir}/qt4/PyQt4/plugins/ +cp -v %{SOURCE2} %{buildroot}%{_libdir}/qt4/PyQt4/plugins/ +cp -v %{SOURCE3} %{buildroot}%{py_sitedir}/%{modname}/ %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README.txt CHANGELOG INSTALL +%doc README.txt CHANGELOG %doc PKG-INFO TODO CXX examples -%{py_sitedir}/* -%exclude %{py_sitedir}/matplotlib/backends/backend_tkagg.* -%exclude %{py_sitedir}/matplotlib/backends/tkagg.* -%exclude %{py_sitedir}/matplotlib/backends/_tkagg.so -%exclude %{py_sitedir}/matplotlib/backends/backend_wx.* -%exclude %{py_sitedir}/matplotlib/backends/backend_wxagg.* -%if %suse_version <= 1020 -%exclude %{py_sitedir}/matplotlib/backends/_wxagg.so -%endif +%{py_sitedir}/%{modname}-%{version}-py%{py_ver}.egg-info +%{py_sitedir}/%{modname}/ +%{py_sitedir}/mpl_toolkits +%{py_sitedir}/pylab.py +%{py_sitedir}/pylab.pyc +%exclude %{py_sitedir}/%{modname}/backends/backend_tkagg.* +%exclude %{py_sitedir}/%{modname}/backends/tkagg.* +%exclude %{py_sitedir}/%{modname}/backends/_tkagg.so +%exclude %{py_sitedir}/%{modname}/backends/backend_wx.* +%exclude %{py_sitedir}/%{modname}/backends/backend_wxagg.* +%exclude %{py_sitedir}/%{modname}/%{modname}widget.py %files tk %defattr(-,root,root,-) -%{py_sitedir}/matplotlib/backends/backend_tkagg.* -%{py_sitedir}/matplotlib/backends/tkagg.* -%{py_sitedir}/matplotlib/backends/_tkagg.so +%{py_sitedir}/%{modname}/backends/backend_tkagg.* +%{py_sitedir}/%{modname}/backends/tkagg.* +%{py_sitedir}/%{modname}/backends/_tkagg.so %files wx %defattr(-,root,root,-) %{py_sitedir}/matplotlib/backends/backend_wx.* %{py_sitedir}/matplotlib/backends/backend_wxagg.* -%if %suse_version <= 1020 -%{py_sitedir}/matplotlib/backends/_wxagg.so -%endif + +%files designer +%defattr(-,root,root,-) +%dir %{_libdir}/qt4/PyQt4 +%dir %{_libdir}/qt4/PyQt4/plugins +%{_libdir}/qt4/PyQt4/plugins/%{modname}plugin.py +%{py_sitedir}/%{modname}/%{modname}widget.py %changelog ++++++ matplotlibplugin.py ++++++ # -*- coding: utf-8 -*- # # Copyright © 2009 Pierre Raybaut # Licensed under the terms of the MIT License from PyQt4.QtGui import QIcon from PyQt4.QtDesigner import QPyDesignerCustomWidgetPlugin import os from matplotlib import rcParams from matplotlibwidget import MatplotlibWidget rcParams['font.size'] = 9 class MatplotlibPlugin(QPyDesignerCustomWidgetPlugin): def __init__(self, parent=None): QPyDesignerCustomWidgetPlugin.__init__(self) self._initialized = False def initialize(self, formEditor): if self._initialized: return self._initialized = True def isInitialized(self): return self._initialized def createWidget(self, parent): return MatplotlibWidget(parent) def name(self): return "MatplotlibWidget" def group(self): return "Python(x,y)" def icon(self): image = os.path.join(rcParams['datapath'], 'images', 'matplotlib.png') return QIcon(image) def toolTip(self): return "" def whatsThis(self): return "" def isContainer(self): return False def domXml(self): return '<widget class="MatplotlibWidget" name="mplwidget">\n' \ '</widget>\n' def includeFile(self): return "matplotlibwidget" if __name__ == '__main__': import sys from PyQt4.QtGui import QApplication app = QApplication(sys.argv) widget = MatplotlibWidget() widget.show() sys.exit(app.exec_()) ++++++ matplotlibwidget.py ++++++ # -*- coding: utf-8 -*- # # Copyright © 2009 Pierre Raybaut # Licensed under the terms of the MIT License """ MatplotlibWidget ================ Example of matplotlib widget for PyQt4 Copyright © 2009 Pierre Raybaut This software is licensed under the terms of the MIT License Derived from 'embedding_in_pyqt4.py': Copyright © 2005 Florent Rougon, 2006 Darren Dale """ __version__ = "1.0.0" from PyQt4.QtGui import QSizePolicy from PyQt4.QtCore import QSize from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as Canvas from matplotlib.figure import Figure from matplotlib import rcParams rcParams['font.size'] = 9 class MatplotlibWidget(Canvas): """ MatplotlibWidget inherits PyQt4.QtGui.QWidget and matplotlib.backend_bases.FigureCanvasBase Options: option_name (default_value) ------- parent (None): parent widget title (''): figure title xlabel (''): X-axis label ylabel (''): Y-axis label xlim (None): X-axis limits ([min, max]) ylim (None): Y-axis limits ([min, max]) xscale ('linear'): X-axis scale yscale ('linear'): Y-axis scale width (4): width in inches height (3): height in inches dpi (100): resolution in dpi hold (False): if False, figure will be cleared each time plot is called Widget attributes: ----------------- figure: instance of matplotlib.figure.Figure axes: figure axes Example: ------- self.widget = MatplotlibWidget(self, yscale='log', hold=True) from numpy import linspace x = linspace(-10, 10) self.widget.axes.plot(x, x**2) self.wdiget.axes.plot(x, x**3) """ def __init__(self, parent=None, title='', xlabel='', ylabel='', xlim=None, ylim=None, xscale='linear', yscale='linear', width=4, height=3, dpi=100, hold=False): self.figure = Figure(figsize=(width, height), dpi=dpi) self.axes = self.figure.add_subplot(111) self.axes.set_title(title) self.axes.set_xlabel(xlabel) self.axes.set_ylabel(ylabel) if xscale is not None: self.axes.set_xscale(xscale) if yscale is not None: self.axes.set_yscale(yscale) if xlim is not None: self.axes.set_xlim(*xlim) if ylim is not None: self.axes.set_ylim(*ylim) self.axes.hold(hold) Canvas.__init__(self, self.figure) self.setParent(parent) Canvas.setSizePolicy(self, QSizePolicy.Expanding, QSizePolicy.Expanding) Canvas.updateGeometry(self) def sizeHint(self): w, h = self.get_width_height() return QSize(w, h) def minimumSizeHint(self): return QSize(10, 10) #=============================================================================== # Example #=============================================================================== if __name__ == '__main__': import sys from PyQt4.QtGui import QMainWindow, QApplication from numpy import linspace class ApplicationWindow(QMainWindow): def __init__(self): QMainWindow.__init__(self) self.mplwidget = MatplotlibWidget(self, title='Example', xlabel='Linear scale', ylabel='Log scale', hold=True, yscale='log') self.mplwidget.setFocus() self.setCentralWidget(self.mplwidget) self.plot(self.mplwidget.axes) def plot(self, axes): x = linspace(-10, 10) axes.plot(x, x**2) axes.plot(x, x**3) app = QApplication(sys.argv) win = ApplicationWindow() win.show() sys.exit(app.exec_()) -- 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-ldap for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-ldap for openSUSE:Factory checked in at 2012-03-20 11:33:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ldap (Old) and /work/SRC/openSUSE:Factory/.python-ldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ldap", Maintainer is "JMatejek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-ldap/python-ldap.changes 2011-10-11 17:59:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-ldap.new/python-ldap.changes 2012-03-20 11:33:36.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 16 14:34:59 UTC 2012 - saschpe(a)suse.de + +- Remove service +- Spec file cleanup: + * Remove outdated sections + * Proper macro usage + +------------------------------------------------------------------- Old: ---- python-ldap-2.4.3.tar.gz New: ---- python-ldap-2.4.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ldap.spec ++++++ --- /var/tmp/diff_new_pack.eSYzog/_old 2012-03-20 11:33:37.000000000 +0100 +++ /var/tmp/diff_new_pack.eSYzog/_new 2012-03-20 11:33:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-ldap # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: python-ldap -BuildRequires: fdupes krb5-devel openldap2-devel >= 2.4.11 python-devel -Requires: openldap2-client >= 2.4.11 +Version: 2.4.9 +Release: 0 +Summary: Python LDAP interface License: SUSE-Public-Domain Group: Development/Libraries/Python -AutoReqProv: on -Version: 2.4.3 -Release: 1 -Summary: Python LDAP interface Url: http://www.python-ldap.org/ Source: http://pypi.python.org/packages/source/p/python-ldap/python-ldap-%{version}… +BuildRequires: cyrus-sasl-devel +BuildRequires: fdupes +BuildRequires: krb5-devel +BuildRequires: openldap2-devel >= 2.4.11 +BuildRequires: python-devel +Requires: libldap-2_4-2 >= 2.4.11 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%endif %description python-ldap provides an LDAP client API for Python in the spirit of @@ -39,23 +42,20 @@ python-ldap pages on http://python-ldap.sourceforge.net/ %prep -%setup +%setup -q cp Build/setup.cfg.suse-linux setup.cfg find -name ".CVS" -o -name ".cvsignore" -exec rm -rf {} ";" %build -#export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" -python setup.py build +CFLAGS="%{optflags} -DLDAP_DEPRECATED" python setup.py build %install -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES -%fdupes $RPM_BUILD_ROOT/%{_libdir} - -%clean -rm -rf $RPM_BUILD_ROOT +python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%fdupes %{buildroot}/%{_libdir} -%files -f INSTALLED_FILES +%files %defattr(-,root,root) %doc README Demo CHANGES TODO LICENCE +%{python_sitearch}/* %changelog ++++++ python-ldap-2.4.3.tar.gz -> python-ldap-2.4.9.tar.gz ++++++ ++++ 2728 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-kombu for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-kombu for openSUSE:Factory checked in at 2012-03-20 11:33:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kombu (Old) and /work/SRC/openSUSE:Factory/.python-kombu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-kombu", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kombu/python-kombu.changes 2012-02-17 12:08:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-kombu.new/python-kombu.changes 2012-03-20 11:33:32.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Mar 10 17:49:39 UTC 2012 - saschpe(a)gmx.de + +- Require rabbitmq-server, suggest mongodb or couchdb + +------------------------------------------------------------------- +Sat Mar 10 17:00:40 UTC 2012 - saschpe(a)gmx.de + +- Update to version 2.1.1: + * Connection URLs now supports encoded characters. + * Fixed a case where connection pool could not recover from connection loss. + * We now patch amqplib's ``__del__`` method to skip trying to close the socket + if it is not connected, as this resulted in an annoying warning. + * Compression can now be used with binary message payloads. +- Don't install INSTALL +- Run testsuite + +------------------------------------------------------------------- @@ -12 +28,0 @@ - Old: ---- kombu-2.1.0.tar.bz2 New: ---- kombu-2.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kombu.spec ++++++ --- /var/tmp/diff_new_pack.ka1ygC/_old 2012-03-20 11:33:33.000000000 +0100 +++ /var/tmp/diff_new_pack.ka1ygC/_new 2012-03-20 11:33:33.000000000 +0100 @@ -15,28 +15,32 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-kombu -Version: 2.1.0 +Version: 2.1.1 Release: 0 License: BSD-2-Clause Summary: AMQP Messaging Framework for Python Url: http://github.com/ask/kombu/ Group: Development/Languages/Python -Source: kombu-%{version}.tar.bz2 +Source: kombu-%{version}.tar.gz +BuildRequires: python-amqplib +BuildRequires: python-anyjson BuildRequires: python-devel BuildRequires: python-distribute +BuildRequires: python-mock +BuildRequires: python-nose-cover3 Requires: python-amqplib Requires: python-anyjson +Requires: rabbitmq-server +Suggests: couchdb +Suggests: mongodb BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -%py_requires -%if %{?suse_version: %{suse_version} > 1110} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif %description An AMQP messaging framework for Python. @@ -59,9 +63,12 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%check +python setup.py test + %files %defattr(-,root,root,-) -%doc AUTHORS Changelog FAQ INSTALL README THANKS TODO +%doc AUTHORS Changelog FAQ README THANKS TODO %{python_sitelib}/* %changelog -- 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-interlude for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-interlude for openSUSE:Factory checked in at 2012-03-20 11:33:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-interlude (Old) and /work/SRC/openSUSE:Factory/.python-interlude.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-interlude", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-interlude.new/python-interlude.changes 2012-03-20 11:33:31.000000000 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 14 10:34:49 UTC 2012 - saschpe(a)suse.de + +- Use license mentioned in README.rst + +------------------------------------------------------------------- +Mon Mar 12 08:51:33 UTC 2012 - saschpe(a)suse.de + +- Initial version + New: ---- interlude-1.1.1.tar.gz python-interlude.changes python-interlude.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-interlude.spec ++++++ # # spec file for package python-interlude # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-interlude Version: 1.1.1 Release: 0 Url: http://github.com/collective/interlude Summary: Interlude for Doctests provides an Interactive Console License: LGPL-3.0+ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/i/interlude/interlude-%{version}.tar… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute Recommends: IPython %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Provides an interactive shell aka console inside your doctest case. The console looks exact like in a doctest-case and you can copy and paste code from the shell into your doctest. It feels as you are in the test case itself. Its not pdb, it's a python shell. In your doctest you can invoke the shell at any point by calling:: >>> interact( locals() ) To make your testrunner interlude aware following is needed: %prep %setup -q -n interlude-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc CHANGELOG.rst README.rst %{python_sitelib}/* %changelog -- 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-imaging for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-imaging for openSUSE:Factory checked in at 2012-03-20 11:33:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-imaging (Old) and /work/SRC/openSUSE:Factory/.python-imaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-imaging", Maintainer is "JMatejek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-imaging/python-imaging.changes 2011-09-23 12:42:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-imaging.new/python-imaging.changes 2012-03-20 11:33:11.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 14:06:38 UTC 2012 - dhall(a)wustl.edu + +- fixed jpeg support so factory passes tests + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-imaging.spec ++++++ --- /var/tmp/diff_new_pack.IupTdi/_old 2012-03-20 11:33:12.000000000 +0100 +++ /var/tmp/diff_new_pack.IupTdi/_new 2012-03-20 11:33:12.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-imaging (Version 1.1.7) +# spec file for package python-imaging # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,6 +20,9 @@ Name: python-imaging BuildRequires: freetype2-devel giflib-devel libgphoto2-devel libpng-devel libtiff-devel netpbm python-devel python-tk tix tk-devel xorg-x11-devel +%if 0%{?suse_version} > 1210 +BuildRequires: libjpeg8-devel +%endif %if 0%{?suse_version} > 1130 BuildRequires: sane-backends-devel %else -- 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-geopy for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-geopy for openSUSE:Factory checked in at 2012-03-20 11:33:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-geopy (Old) and /work/SRC/openSUSE:Factory/.python-geopy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-geopy", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-geopy/python-geopy.changes 2011-09-26 10:15:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-geopy.new/python-geopy.changes 2012-03-20 11:33:05.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 13 01:32:09 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 0.94.2: + ADDED: MANIFEST.in so that LICENSE file gets included in dist + packages (per req by Debian Python Module Team) + UPDATED: Yahoo geocoder uses new PlaceFinder API instead of + outdated MapsService V1 API. + +------------------------------------------------------------------- Old: ---- geopy-0.94.1.tar.bz2 New: ---- geopy-0.94.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-geopy.spec ++++++ --- /var/tmp/diff_new_pack.xhttrw/_old 2012-03-20 11:33:08.000000000 +0100 +++ /var/tmp/diff_new_pack.xhttrw/_new 2012-03-20 11:33:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-geopy # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-geopy -Version: 0.94.1 +Version: 0.94.2 Release: 0 -Url: http://www.geopy.org/ +Url: http://code.google.com/p/geopy/ Summary: Python Geocoding Toolbox License: MIT Group: Development/Languages/Python @@ -36,14 +38,13 @@ BuildArch: noarch %endif %endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description -geopy makes it easy for developers to locate the coordinates of addresses, cities, +Geopy makes it easy for developers to locate the coordinates of addresses, cities, countries, and landmarks across the globe using third-party geocoders and other data sources, such as wikis. -geopy currently includes support for six geocoders: Google Maps, Yahoo! Maps, Windows +Geopy currently includes support for six geocoders: Google Maps, Yahoo! Maps, Windows Local Live (Virtual Earth), geocoder.us, GeoNames, MediaWiki pages (with the GIS extension), and Semantic MediaWiki pages. @@ -56,12 +57,8 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -# TODO: Disable only tests that need network access -#%%check -#python setup.py test - %files %defattr(-,root,root,-) -%python_sitelib/* +%{python_sitelib}/* %changelog ++++++ geopy-0.94.1.tar.bz2 -> geopy-0.94.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/LICENSE new/geopy-0.94.2/LICENSE --- old/geopy-0.94.1/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/geopy-0.94.2/LICENSE 2012-03-12 20:27:30.000000000 +0100 @@ -0,0 +1,21 @@ +Copyright (c) 2006-2010 Brian Beck +Copyright (c) 2010-2012 GeoPy Project and individual contributors. +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/MANIFEST.in new/geopy-0.94.2/MANIFEST.in --- old/geopy-0.94.1/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100 +++ new/geopy-0.94.2/MANIFEST.in 2012-03-12 20:25:40.000000000 +0100 @@ -0,0 +1,3 @@ +include LICENSE +include MANIFEST.in +include RELEASES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/PKG-INFO new/geopy-0.94.2/PKG-INFO --- old/geopy-0.94.1/PKG-INFO 2011-03-24 23:28:45.000000000 +0100 +++ new/geopy-0.94.2/PKG-INFO 2012-03-12 20:42:29.000000000 +0100 @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: geopy -Version: 0.94.1 +Version: 0.94.2 Summary: Python Geocoding Toolbox Home-page: http://www.geopy.org/ -Author: Brian Beck -Author-email: exogen(a)gmail.com +Author: Mike Tigas +Author-email: mike.tigas(a)gmail.com License: MIT Download-URL: http://code.google.com/p/geopy/downloads/list Description: UNKNOWN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/RELEASES new/geopy-0.94.2/RELEASES --- old/geopy-0.94.1/RELEASES 1970-01-01 01:00:00.000000000 +0100 +++ new/geopy-0.94.2/RELEASES 2012-03-12 20:37:38.000000000 +0100 @@ -0,0 +1,67 @@ +0.94.2 - March 12, 2012 +========== +ADDED: MANIFEST.in so that LICENSE file gets included in dist packages + (per req by Debian Python Module Team) + +UPDATED: Yahoo geocoder uses new PlaceFinder API instead of outdated MapsService + V1 API. + +0.94.1 - March 24, 2011 +========== +ADDED: Test suite includes geocoding tests for the Google, Bing, Yahoo, + GeocoderDotUS, and GeoNames geocoders. + +CHANGED: `output_format` is deprecated in backends that used it. + +FIXED: Bing geocoder now works properly. Updated to use the JSON return + method rather than XML. `output_format` has always been ignored + and is now deprecated. + +FIXED: GeocoderDotUS now works properly. Updated to use more compact CSV + return method rather than XMLRPC. + +CHANGED: Yahoo geocoder now uses the "old" tuple return format + (address, (lat, lon)) rather than the undocumented Location() + object, for API consistency. (Object return values with rich + data will be implemented in a future release.) + +FIXED: Issue 40. Fixed "print" statement in Bing backend. No more + print statements remain. + +FIXED: Issue 39. In addition to checking for system `json` and `simplejson`, + geopy now looks for a system-installed `django` (which bundles a + copy of simplejson). + +FIXED: Issue 45. Implement __cmp__ on Distance so that distance objects may + be compared against one another. + +CHANGED: Added __repr__ and __str__ to Distance + +ADDED: Issue 46. Geocoder backend for MapQuest's OpenMapQuest API, contributed + by Shashwat Anand. + +0.94 - March 7, 2010 +==================== +ADDED: Partial test suite can now be run via "setup.py test" + +FIXED: Issue 5. Converted "print" statements to logger calls to + allow compatibility with WSGI. + +FIXED: Issue 16. Google geocoder backend now throws more descriptive + exceptions on certain failure statuses. + +FIXED: Issue 18. Add simplejson to install_requires for setup. Use + native (Python 2.6+/3.0+) json module if available. + +FIXED: Issue 21 and Issue 25. Distance calculations for values beyond + 180/-180 and 90/-90 now wrap instead of raising an error. + +FIXED: Issue 22. Fixed string representation of Point objects so + that they don't throw an exception. + +FIXED: Issue 23. Fixed GreatCircleDistance ValueErrors due to floating + point precision on extremely close points. + +Changes between 0.93 (October 8, 2006) and February 15, 2009 +============================================================ +See https://github.com/mtigas/geopy/compare/0451a051...ffebd5f3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/__init__.py new/geopy-0.94.2/geopy/__init__.py --- old/geopy-0.94.1/geopy/__init__.py 2011-03-24 23:27:43.000000000 +0100 +++ new/geopy-0.94.2/geopy/__init__.py 2012-03-12 20:38:14.000000000 +0100 @@ -2,12 +2,12 @@ from geopy.location import Location from geopy import geocoders -VERSION = (0, 94, 1) +VERSION = (0, 94, 2) def get_version(): version = '%s.%s' % (VERSION[0], VERSION[1]) if VERSION[2]: version = '%s.%s' % (version, VERSION[2]) if VERSION[3:]: - version = '%s-%s' % (version, VERSION[3]) + version = '%s.%s' % (version, VERSION[3]) return version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/geocoders/bing.py new/geopy-0.94.2/geopy/geocoders/bing.py --- old/geopy-0.94.1/geopy/geocoders/bing.py 2011-03-24 23:11:27.000000000 +0100 +++ new/geopy-0.94.2/geopy/geocoders/bing.py 2012-03-12 20:24:49.000000000 +0100 @@ -71,7 +71,7 @@ country = a.get('countryRegion', '').strip(stripchars) city_state = join_filter(", ", [city, state]) - place = join_filter(" ", [city_state, zip]) + place = join_filter(" ", [city_state, zipcode]) location = join_filter(", ", [address, place, country]) latitude = resource['point']['coordinates'][0] or None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/geocoders/google.py new/geopy-0.94.2/geopy/geocoders/google.py --- old/geopy-0.94.1/geopy/geocoders/google.py 2011-03-24 23:11:27.000000000 +0100 +++ new/geopy-0.94.2/geopy/geocoders/google.py 2012-03-12 20:24:49.000000000 +0100 @@ -139,8 +139,7 @@ status_code = status["code"] self.check_status_code(status_code) return None - - if exactly_one and len(places) != 1: + elif exactly_one and len(places) != 1: raise ValueError("Didn't find exactly one placemark! " \ "(Found %d.)" % len(places)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/geocoders/yahoo.py new/geopy-0.94.2/geopy/geocoders/yahoo.py --- old/geopy-0.94.1/geopy/geocoders/yahoo.py 2011-03-24 23:11:28.000000000 +0100 +++ new/geopy-0.94.2/geopy/geocoders/yahoo.py 2012-03-12 20:24:49.000000000 +0100 @@ -1,69 +1,84 @@ +""" +Wrapper to the Yahoo's new PlaceFinder API. (doc says that the API RELEASE 1.0 (22 JUNE 2010)) +""" import xml.dom.minidom from geopy import util +from geopy import Point from urllib import urlencode from urllib2 import urlopen from geopy.geocoders.base import Geocoder +try: + import json +except ImportError: + try: + import simplejson as json + except ImportError: + from django.utils import simplejson as json class Yahoo(Geocoder): - BASE_URL = "http://api.local.yahoo.com/MapsService/V1/geocode?%s" + BASE_URL = "http://where.yahooapis.com/geocode?%s" - def __init__(self, app_id, format_string='%s', output_format='xml'): + def __init__(self, app_id, format_string='%s', output_format=None): self.app_id = app_id self.format_string = format_string - self.output_format = output_format.lower() + + if output_format != None: + from warnings import warn + warn('geopy.geocoders.yahoo.Yahoo: The `output_format` parameter is deprecated '+ + 'and now ignored. JSON will be used internally.', DeprecationWarning) def geocode(self, string, exactly_one=True): params = {'location': self.format_string % string, - 'output': self.output_format, - 'appid': self.app_id + 'appid': self.app_id, + 'flags': 'J' } url = self.BASE_URL % urlencode(params) + util.logger.debug("Fetching %s..." % url) return self.geocode_url(url, exactly_one) def geocode_url(self, url, exactly_one=True): - util.logger.debug("Fetching %s..." % url) page = urlopen(url) - - return self.parse_xml(page, exactly_one) - - def parse_xml(self, page, exactly_one=True): + return self.parse_json(page, exactly_one) + + def parse_json(self, page, exactly_one=True): if not isinstance(page, basestring): page = util.decode_page(page) + doc = json.loads(page) + results = doc.get('ResultSet', []).get('Results', []) - doc = xml.dom.minidom.parseString(page) - results = doc.getElementsByTagName('Result') - - def parse_result(result): - strip = ", \n" - address = util.get_first_text(result, 'Address', strip) - city = util.get_first_text(result, 'City', strip) - state = util.get_first_text(result, 'State', strip) - zip = util.get_first_text(result, 'Zip', strip) - country = util.get_first_text(result, 'Country', strip) - city_state = util.join_filter(", ", [city, state]) - place = util.join_filter(" ", [city_state, zip]) - location = util.join_filter(", ", [address, place, country]) - latitude = float(util.get_first_text(result, 'Latitude')) or None - longitude = float(util.get_first_text(result, 'Longitude')) or None - - # TODO use Point/Location object API in 0.95 - #if latitude and longitude: - # point = Point(latitude, longitude) + if not results: + raise ValueError("No results found") + elif exactly_one and len(results) != 1: + raise ValueError("Didn't find exactly one placemark! " \ + "(Found %d.)" % len(results)) + + def parse_result(place): + line1, line2, line3, line4 = place.get('line1'), place.get('line2'), place.get('line3'), place.get('line4') + address = util.join_filter(", ", [line1, line2, line3, line4]) + city = place.get('city') + state = place.get('state') + country = place.get('country') + location = util.join_filter(", ", [address, city, country]) + lat, lng = place.get('latitude'), place.get('longitude') + #if lat and lng: + # point = Point(floatlat, lng) #else: - # point = Non - #return Location(location, point, { - # 'Address': address, - # 'City': city, - # 'State': state, - # 'Zip': zip, - # 'Country': country - #}) - - return address, (latitude, longitude) - + # point = None + return (location, (float(lat), float(lng))) + if exactly_one: return parse_result(results[0]) else: return [parse_result(result) for result in results] + + def reverse(self, coord, exactly_one=True): + (lat, lng) = coord + params = {'location': '%s,%s' % (lat, lng), + 'gflags' : 'R', + 'appid': self.app_id, + 'flags': 'J' + } + url = self.BASE_URL % urlencode(params) + return self.geocode_url(url, exactly_one) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/tests/fells_loop.gpx new/geopy-0.94.2/geopy/tests/fells_loop.gpx --- old/geopy-0.94.1/geopy/tests/fells_loop.gpx 1970-01-01 01:00:00.000000000 +0100 +++ new/geopy-0.94.2/geopy/tests/fells_loop.gpx 2010-12-28 03:35:17.000000000 +0100 @@ -0,0 +1,1110 @@ +<?xml version="1.0"?> + +<gpx + version="1.1" + creator="ExpertGPS 1.1 - http://www.topografix.com" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://www.topografix.com/GPX/1/1" + xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"> +<metadata> +<time>2002-02-27T17:18:33Z</time> +<bounds minlat="42.401051" minlon="-71.126602" maxlat="42.468655" maxlon="-71.102973"/> +</metadata> +<wpt lat="42.438878" lon="-71.119277"> + <ele>44.586548</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5066</name> + <desc><![CDATA[5066]]></desc> + <sym>Crossing</sym> + <type><![CDATA[Crossing]]></type> +</wpt> +<wpt lat="42.439227" lon="-71.119689"> + <ele>57.607200</ele> + <time>2001-06-02T03:26:55Z</time> + <name>5067</name> + <desc><![CDATA[5067]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.438917" lon="-71.116146"> + <ele>44.826904</ele> + <time>2001-11-16T23:03:38Z</time> + <name>5096</name> + <desc><![CDATA[5096]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.443904" lon="-71.122044"> + <ele>50.594727</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5142</name> + <desc><![CDATA[5142]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.447298" lon="-71.121447"> + <ele>127.711200</ele> + <time>2001-06-02T03:26:58Z</time> + <name>5156</name> + <desc><![CDATA[5156]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.454873" lon="-71.125094"> + <ele>96.926400</ele> + <time>2001-06-02T03:26:59Z</time> + <name>5224</name> + <desc><![CDATA[5224]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.459079" lon="-71.124988"> + <ele>82.600800</ele> + <time>2001-06-02T03:26:59Z</time> + <name>5229</name> + <desc><![CDATA[5229]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.456979" lon="-71.124474"> + <ele>82.905600</ele> + <time>2001-06-02T03:26:59Z</time> + <name>5237</name> + <desc><![CDATA[5237]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.454401" lon="-71.120990"> + <ele>66.696655</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5254</name> + <desc><![CDATA[5254]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.451442" lon="-71.121746"> + <ele>74.627442</ele> + <time>2001-11-07T23:53:41Z</time> + <name>5258</name> + <desc><![CDATA[5258]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.454404" lon="-71.120660"> + <ele>65.254761</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5264</name> + <desc><![CDATA[5264]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.457761" lon="-71.121045"> + <ele>77.419200</ele> + <time>2001-06-02T03:27:00Z</time> + <name>526708</name> + <desc><![CDATA[526708]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.457089" lon="-71.120313"> + <ele>74.676000</ele> + <time>2001-06-02T03:27:00Z</time> + <name>526750</name> + <desc><![CDATA[526750]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.456592" lon="-71.119676"> + <ele>78.713135</ele> + <time>2001-11-07T23:53:41Z</time> + <name>527614</name> + <desc><![CDATA[527614]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.456252" lon="-71.119356"> + <ele>78.713135</ele> + <time>2001-11-07T23:53:41Z</time> + <name>527631</name> + <desc><![CDATA[527631]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.458148" lon="-71.119135"> + <ele>68.275200</ele> + <time>2001-06-02T03:27:00Z</time> + <name>5278</name> + <desc><![CDATA[5278]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.459377" lon="-71.117693"> + <ele>64.008000</ele> + <time>2001-06-02T03:27:01Z</time> + <name>5289</name> + <desc><![CDATA[5289]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.464183" lon="-71.119828"> + <ele>52.997925</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5374FIRE</name> + <desc><![CDATA[5374FIRE]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.465650" lon="-71.119399"> + <ele>56.388000</ele> + <time>2001-06-02T03:27:02Z</time> + <name>5376</name> + <desc><![CDATA[5376]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.439018" lon="-71.114456"> + <ele>56.388000</ele> + <time>2001-06-02T03:26:55Z</time> + <name>6006</name> + <desc><![CDATA[600698]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.438594" lon="-71.114803"> + <ele>46.028564</ele> + <time>2001-11-28T21:05:28Z</time> + <name>6006BLUE</name> + <desc><![CDATA[6006BLUE]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.436757" lon="-71.113223"> + <ele>37.616943</ele> + <time>2001-11-28T21:05:28Z</time> + <name>6014MEADOW</name> + <desc><![CDATA[6014MEADOW]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.441754" lon="-71.113220"> + <ele>56.388000</ele> + <time>2001-06-02T03:26:55Z</time> + <name>6029</name> + <desc><![CDATA[6029]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.436243" lon="-71.109075"> + <ele>50.292000</ele> + <time>2001-06-02T03:27:05Z</time> + <name>6053</name> + <desc><![CDATA[6053]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.439250" lon="-71.107500"> + <ele>25.603200</ele> + <time>2001-06-02T03:26:57Z</time> + <name>6066</name> + <desc><![CDATA[6066]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.439764" lon="-71.107582"> + <ele>34.442400</ele> + <time>2001-06-02T03:26:57Z</time> + <name>6067</name> + <desc><![CDATA[6067]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.434766" lon="-71.105874"> + <ele>30.480000</ele> + <time>2001-06-02T03:26:57Z</time> + <name>6071</name> + <desc><![CDATA[6071]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.433304" lon="-71.106599"> + <ele>15.240000</ele> + <time>2001-06-02T03:26:56Z</time> + <name>6073</name> + <desc><![CDATA[6073]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.437338" lon="-71.104772"> + <ele>37.795200</ele> + <time>2001-06-02T03:26:57Z</time> + <name>6084</name> + <desc><![CDATA[6084]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.442196" lon="-71.110975"> + <ele>64.008000</ele> + <time>2001-06-02T03:26:55Z</time> + <name>6130</name> + <desc><![CDATA[6130]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.442981" lon="-71.111441"> + <ele>64.008000</ele> + <time>2001-06-02T03:26:58Z</time> + <name>6131</name> + <desc><![CDATA[6131]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.444773" lon="-71.108882"> + <ele>62.788800</ele> + <time>2001-06-02T03:27:05Z</time> + <name>6153</name> + <desc><![CDATA[6153]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.443592" lon="-71.106301"> + <ele>55.473600</ele> + <time>2001-06-02T03:27:05Z</time> + <name>6171</name> + <desc><![CDATA[6171]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.447804" lon="-71.106624"> + <ele>62.484000</ele> + <time>2001-06-02T03:27:04Z</time> + <name>6176</name> + <desc><![CDATA[6176]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.448448" lon="-71.106158"> + <ele>62.179200</ele> + <time>2001-06-02T03:27:04Z</time> + <name>6177</name> + <desc><![CDATA[6177]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.453415" lon="-71.106783"> + <ele>69.799200</ele> + <time>2001-06-02T03:26:55Z</time> + <name>6272</name> + <desc><![CDATA[6272]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.453434" lon="-71.107253"> + <ele>73.152000</ele> + <time>2001-06-02T03:26:56Z</time> + <name>6272</name> + <desc><![CDATA[6272]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.458298" lon="-71.106771"> + <ele>70.104000</ele> + <time>2001-06-02T03:27:04Z</time> + <name>6278</name> + <desc><![CDATA[6278]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.451430" lon="-71.105413"> + <ele>57.564209</ele> + <time>2001-11-16T23:03:38Z</time> + <name>6280</name> + <desc><![CDATA[6280]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.453845" lon="-71.105206"> + <ele>66.696655</ele> + <time>2001-11-16T23:03:38Z</time> + <name>6283</name> + <desc><![CDATA[6283]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.459986" lon="-71.106170"> + <ele>72.945191</ele> + <time>2001-11-16T23:03:38Z</time> + <name>6289</name> + <desc><![CDATA[6289]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.457616" lon="-71.105116"> + <ele>72.847200</ele> + <time>2001-06-02T03:27:04Z</time> + <name>6297</name> + <desc><![CDATA[6297]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.467110" lon="-71.113574"> + <ele>53.644800</ele> + <time>2001-06-02T03:27:02Z</time> + <name>6328</name> + <desc><![CDATA[6328]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.464202" lon="-71.109863"> + <ele>43.891200</ele> + <time>2001-06-02T03:27:03Z</time> + <name>6354</name> + <desc><![CDATA[6354]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.466459" lon="-71.110067"> + <ele>48.768000</ele> + <time>2001-06-02T03:27:02Z</time> + <name>635722</name> + <desc><![CDATA[635722]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.466557" lon="-71.109410"> + <ele>49.072800</ele> + <time>2001-06-02T03:27:02Z</time> + <name>635783</name> + <desc><![CDATA[635783]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.463495" lon="-71.107117"> + <ele>62.484000</ele> + <time>2001-06-02T03:27:03Z</time> + <name>6373</name> + <desc><![CDATA[6373]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.401051" lon="-71.110241"> + <ele>3.962400</ele> + <time>2001-06-02T03:26:56Z</time> + <name>6634</name> + <desc><![CDATA[6634]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.432621" lon="-71.106532"> + <ele>13.411200</ele> + <time>2001-06-02T03:26:56Z</time> + <name>6979</name> + <desc><![CDATA[6979]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.431033" lon="-71.107883"> + <ele>34.012085</ele> + <time>2001-11-16T23:03:38Z</time> + <name>6997</name> + <desc><![CDATA[6997]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</wpt> +<wpt lat="42.465687" lon="-71.107360"> + <ele>87.782400</ele> + <time>2001-06-02T03:27:03Z</time> + <name>BEAR HILL</name> + <cmt>BEAR HILL TOWER</cmt> + <desc><![CDATA[Bear Hill Tower]]></desc> + <sym>Tall Tower</sym> + <type><![CDATA[Tower]]></type> +</wpt> +<wpt lat="42.430950" lon="-71.107628"> + <ele>23.469600</ele> + <time>2001-06-02T00:18:15Z</time> + <name>BELLEVUE</name> + <cmt>BELLEVUE</cmt> + <desc><![CDATA[Bellevue Parking Lot]]></desc> + <sym>Parking Area</sym> + <type><![CDATA[Parking]]></type> +</wpt> +<wpt lat="42.438666" lon="-71.114079"> + <ele>43.384766</ele> + <time>2001-11-28T21:05:28Z</time> + <name>6016</name> + <desc><![CDATA[Bike Loop Connector]]></desc> + <sym>Trailhead</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.456469" lon="-71.124651"> + <ele>89.916000</ele> + <time>2001-06-02T03:26:59Z</time> + <name>5236BRIDGE</name> + <desc><![CDATA[Bridge]]></desc> + <sym>Bridge</sym> + <type><![CDATA[Bridge]]></type> +</wpt> +<wpt lat="42.465759" lon="-71.119815"> + <ele>55.473600</ele> + <time>2001-06-02T03:27:01Z</time> + <name>5376BRIDGE</name> + <desc><![CDATA[Bridge]]></desc> + <sym>Bridge</sym> + <type><![CDATA[Bridge]]></type> +</wpt> +<wpt lat="42.442993" lon="-71.105878"> + <ele>52.730400</ele> + <time>2001-06-02T03:27:05Z</time> + <name>6181CROSS</name> + <desc><![CDATA[Crossing]]></desc> + <sym>Crossing</sym> + <type><![CDATA[Crossing]]></type> +</wpt> +<wpt lat="42.435472" lon="-71.109664"> + <ele>45.110400</ele> + <time>2001-06-02T03:27:05Z</time> + <name>6042CROSS</name> + <desc><![CDATA[Crossing]]></desc> + <sym>Crossing</sym> + <type><![CDATA[Crossing]]></type> +</wpt> +<wpt lat="42.458516" lon="-71.103646"> + <name>DARKHOLLPO</name> + <desc><![CDATA[Dark Hollow Pond]]></desc> + <sym>Fishing Area</sym> +</wpt> +<wpt lat="42.443109" lon="-71.112675"> + <ele>56.083200</ele> + <time>2001-06-02T03:26:57Z</time> + <name>6121DEAD</name> + <desc><![CDATA[Dead End]]></desc> + <sym>Danger Area</sym> + <type><![CDATA[Dead End]]></type> +</wpt> +<wpt lat="42.449866" lon="-71.119298"> + <ele>117.043200</ele> + <time>2001-06-02T03:26:59Z</time> + <name>5179DEAD</name> + <desc><![CDATA[Dead End]]></desc> + <sym>Danger Area</sym> + <type><![CDATA[Dead End]]></type> +</wpt> +<wpt lat="42.459629" lon="-71.116524"> + <ele>69.494400</ele> + <time>2001-06-02T03:27:01Z</time> + <name>5299DEAD</name> + <desc><![CDATA[Dead End]]></desc> + <sym>Danger Area</sym> + <type><![CDATA[Dead End]]></type> +</wpt> +<wpt lat="42.465485" lon="-71.119148"> + <ele>56.997600</ele> + <time>2001-06-02T03:27:02Z</time> + <name>5376DEAD</name> + <desc><![CDATA[Dead End]]></desc> + <sym>Danger Area</sym> + <type><![CDATA[Dead End]]></type> +</wpt> +<wpt lat="42.462776" lon="-71.109986"> + <ele>46.939200</ele> + <time>2001-06-02T03:27:03Z</time> + <name>6353DEAD</name> + <desc><![CDATA[Dead End]]></desc> + <sym>Danger Area</sym> + <type><![CDATA[Dead End]]></type> +</wpt> +<wpt lat="42.446793" lon="-71.108784"> + <ele>61.264800</ele> + <time>2001-06-02T03:27:04Z</time> + <name>6155DEAD</name> + <desc><![CDATA[Dead End]]></desc> + <sym>Danger Area</sym> + <type><![CDATA[Dead End]]></type> +</wpt> +<wpt lat="42.451204" lon="-71.126602"> + <ele>110.947200</ele> + <time>2001-06-02T03:26:59Z</time> + <name>GATE14</name> + <desc><![CDATA[Gate 14]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Road]]></type> +</wpt> +<wpt lat="42.458499" lon="-71.122078"> + <ele>77.724000</ele> + <time>2001-06-02T03:27:00Z</time> + <name>GATE16</name> + <desc><![CDATA[Gate 16]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Road]]></type> +</wpt> +<wpt lat="42.459376" lon="-71.119238"> + <ele>65.836800</ele> + <time>2001-06-02T03:27:01Z</time> + <name>GATE17</name> + <desc><![CDATA[Gate 17]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Road]]></type> +</wpt> +<wpt lat="42.466353" lon="-71.119240"> + <ele>57.302400</ele> + <time>2001-06-02T03:27:02Z</time> + <name>GATE19</name> + <desc><![CDATA[Gate 19]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Road]]></type> +</wpt> +<wpt lat="42.468655" lon="-71.107697"> + <ele>49.377600</ele> + <time>2001-06-02T03:27:03Z</time> + <name>GATE21</name> + <desc><![CDATA[Gate 21]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Road]]></type> +</wpt> +<wpt lat="42.456718" lon="-71.102973"> + <ele>81.076800</ele> + <time>2001-06-02T03:27:03Z</time> + <name>GATE24</name> + <desc><![CDATA[Gate 24]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Road]]></type> +</wpt> +<wpt lat="42.430847" lon="-71.107690"> + <ele>21.515015</ele> + <time>2001-11-28T21:05:28Z</time> + <name>GATE5</name> + <desc><![CDATA[Gate 5]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Truck Stop]]></type> +</wpt> +<wpt lat="42.431240" lon="-71.109236"> + <ele>26.561890</ele> + <time>2001-11-07T23:53:41Z</time> + <name>GATE6</name> + <desc><![CDATA[Gate 6]]></desc> + <sym>Trailhead</sym> + <type><![CDATA[Trail Head]]></type> +</wpt> +<wpt lat="42.439502" lon="-71.106556"> + <ele>32.004000</ele> + <time>2001-06-02T00:18:16Z</time> + <name>6077LOGS</name> + <desc><![CDATA[Log Crossing]]></desc> + <sym>Amusement Park</sym> + <type><![CDATA[Obstacle]]></type> +</wpt> +<wpt lat="42.449765" lon="-71.122320"> + <ele>119.809082</ele> + <time>2001-11-07T23:53:41Z</time> + <name>5148NANEPA</name> + <desc><![CDATA[Nanepashemet Road Crossing]]></desc> + <sym>Trailhead</sym> + <type><![CDATA[Trail Head]]></type> +</wpt> +<wpt lat="42.457388" lon="-71.119845"> + <ele>73.761600</ele> + <time>2001-06-02T03:27:00Z</time> + <name>5267OBSTAC</name> + <desc><![CDATA[Obstacle]]></desc> + <sym>Amusement Park</sym> + <type><![CDATA[Obstacle]]></type> +</wpt> +<wpt lat="42.434980" lon="-71.109942"> + <ele>45.307495</ele> + <time>2001-11-07T23:53:41Z</time> + <name>PANTHRCAVE</name> + <desc><![CDATA[Panther Cave]]></desc> + <sym>Tunnel</sym> + <type><![CDATA[Tunnel]]></type> +</wpt> +<wpt lat="42.453256" lon="-71.121211"> + <ele>77.992066</ele> + <time>2001-11-07T23:53:41Z</time> + <name>5252PURPLE</name> + <desc><![CDATA[Purple Rock Hill]]></desc> + <sym>Summit</sym> + <type><![CDATA[Summit]]></type> +</wpt> +<wpt lat="42.457734" lon="-71.117481"> + <ele>67.970400</ele> + <time>2001-06-02T03:27:01Z</time> + <name>5287WATER</name> + <desc><![CDATA[Reservoir]]></desc> + <sym>Swimming Area</sym> + <type><![CDATA[Reservoir]]></type> +</wpt> +<wpt lat="42.459278" lon="-71.124574"> + <ele>81.076800</ele> + <time>2001-06-02T03:27:00Z</time> + <name>5239ROAD</name> + <desc><![CDATA[Road]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Road]]></type> +</wpt> +<wpt lat="42.458782" lon="-71.118991"> + <ele>67.360800</ele> + <time>2001-06-02T03:27:01Z</time> + <name>5278ROAD</name> + <desc><![CDATA[Road]]></desc> + <sym>Truck Stop</sym> + <type><![CDATA[Road]]></type> +</wpt> +<wpt lat="42.439993" lon="-71.120925"> + <ele>53.949600</ele> + <time>2001-06-02T00:18:14Z</time> + <name>5058ROAD</name> + <cmt>ROAD CROSSING</cmt> + <desc><![CDATA[Road Crossing]]></desc> + <sym>Dot</sym> + <type><![CDATA[Road Crossing]]></type> +</wpt> +<wpt lat="42.453415" lon="-71.106782"> + <ele>69.799200</ele> + <time>2001-06-02T00:18:13Z</time> + <name>SHEEPFOLD</name> + <desc><![CDATA[Sheepfold Parking Lot]]></desc> + <sym>Parking Area</sym> + <type><![CDATA[Parking]]></type> +</wpt> +<wpt lat="42.455956" lon="-71.107483"> + <ele>64.008000</ele> + <time>2001-06-02T03:27:04Z</time> + <name>SOAPBOX</name> + <desc><![CDATA[Soap Box Derby Track]]></desc> + <sym>Cemetery</sym> + <type><![CDATA[Intersection]]></type> +</wpt> +<wpt lat="42.465913" lon="-71.119328"> + <ele>64.533692</ele> + <time>2001-11-07T23:53:41Z</time> + <name>5376STREAM</name> + <desc><![CDATA[Stream Crossing]]></desc> + <sym>Bridge</sym> + <type><![CDATA[Bridge]]></type> +</wpt> +<wpt lat="42.445359" lon="-71.122845"> + <ele>61.649902</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5144SUMMIT</name> + <desc><![CDATA[Summit]]></desc> + <sym>Summit</sym> + <type><![CDATA[Summit]]></type> +</wpt> +<wpt lat="42.441727" lon="-71.121676"> + <ele>67.360800</ele> + <time>2001-06-02T00:18:16Z</time> + <name>5150TANK</name> + <cmt>WATER TANK</cmt> + <desc><![CDATA[Water Tank]]></desc> + <sym>Museum</sym> + <type><![CDATA[Water Tank]]></type> +</wpt> +<rte> + <name>BELLEVUE (first three waypoints)</name> + <desc><![CDATA[Bike Loop Bellevue]]></desc> + <number>1</number> +<rtept lat="42.430950" lon="-71.107628"> + <ele>23.469600</ele> + <time>2001-06-02T00:18:15Z</time> + <name>BELLEVUE</name> + <cmt>BELLEVUE</cmt> + <desc><![CDATA[Bellevue Parking Lot]]></desc> + <sym>Parking Area</sym> + <type><![CDATA[Parking]]></type> +</rtept> +<rtept lat="42.431240" lon="-71.109236"> + <ele>26.561890</ele> + <time>2001-11-07T23:53:41Z</time> + <name>GATE6</name> + <desc><![CDATA[Gate 6]]></desc> + <sym>Trailhead</sym> + <type><![CDATA[Trail Head]]></type> +</rtept> +<rtept lat="42.434980" lon="-71.109942"> + <ele>45.307495</ele> + <time>2001-11-07T23:53:41Z</time> + <name>PANTHRCAVE</name> + <desc><![CDATA[Panther Cave]]></desc> + <sym>Tunnel</sym> + <type><![CDATA[Tunnel]]></type> +</rtept> +</rte> +<rte> + <name>BELLEVUE</name> + <desc><![CDATA[Bike Loop Bellevue]]></desc> + <number>1</number> +<rtept lat="42.430950" lon="-71.107628"> + <ele>23.469600</ele> + <time>2001-06-02T00:18:15Z</time> + <name>BELLEVUE</name> + <cmt>BELLEVUE</cmt> + <desc><![CDATA[Bellevue Parking Lot]]></desc> + <sym>Parking Area</sym> + <type><![CDATA[Parking]]></type> +</rtept> +<rtept lat="42.431240" lon="-71.109236"> + <ele>26.561890</ele> + <time>2001-11-07T23:53:41Z</time> + <name>GATE6</name> + <desc><![CDATA[Gate 6]]></desc> + <sym>Trailhead</sym> + <type><![CDATA[Trail Head]]></type> +</rtept> +<rtept lat="42.434980" lon="-71.109942"> + <ele>45.307495</ele> + <time>2001-11-07T23:53:41Z</time> + <name>PANTHRCAVE</name> + <desc><![CDATA[Panther Cave]]></desc> + <sym>Tunnel</sym> + <type><![CDATA[Tunnel]]></type> +</rtept> +<rtept lat="42.436757" lon="-71.113223"> + <ele>37.616943</ele> + <time>2001-11-28T21:05:28Z</time> + <name>6014MEADOW</name> + <desc><![CDATA[6014MEADOW]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.439018" lon="-71.114456"> + <ele>56.388000</ele> + <time>2001-06-02T03:26:55Z</time> + <name>6006</name> + <desc><![CDATA[600698]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.438594" lon="-71.114803"> + <ele>46.028564</ele> + <time>2001-11-28T21:05:28Z</time> + <name>6006BLUE</name> + <desc><![CDATA[6006BLUE]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.438917" lon="-71.116146"> + <ele>44.826904</ele> + <time>2001-11-16T23:03:38Z</time> + <name>5096</name> + <desc><![CDATA[5096]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.438878" lon="-71.119277"> + <ele>44.586548</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5066</name> + <desc><![CDATA[5066]]></desc> + <sym>Crossing</sym> + <type><![CDATA[Crossing]]></type> +</rtept> +<rtept lat="42.439227" lon="-71.119689"> + <ele>57.607200</ele> + <time>2001-06-02T03:26:55Z</time> + <name>5067</name> + <desc><![CDATA[5067]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.439993" lon="-71.120925"> + <ele>53.949600</ele> + <time>2001-06-02T00:18:14Z</time> + <name>5058ROAD</name> + <cmt>ROAD CROSSING</cmt> + <desc><![CDATA[Road Crossing]]></desc> + <sym>Dot</sym> + <type><![CDATA[Road Crossing]]></type> +</rtept> +<rtept lat="42.441727" lon="-71.121676"> + <ele>67.360800</ele> + <time>2001-06-02T00:18:16Z</time> + <name>5150TANK</name> + <cmt>WATER TANK</cmt> + <desc><![CDATA[Water Tank]]></desc> + <sym>Museum</sym> + <type><![CDATA[Water Tank]]></type> +</rtept> +<rtept lat="42.443904" lon="-71.122044"> + <ele>50.594727</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5142</name> + <desc><![CDATA[5142]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.445359" lon="-71.122845"> + <ele>61.649902</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5144SUMMIT</name> + <desc><![CDATA[Summit]]></desc> + <sym>Summit</sym> + <type><![CDATA[Summit]]></type> +</rtept> +<rtept lat="42.447298" lon="-71.121447"> + <ele>127.711200</ele> + <time>2001-06-02T03:26:58Z</time> + <name>5156</name> + <desc><![CDATA[5156]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.449765" lon="-71.122320"> + <ele>119.809082</ele> + <time>2001-11-07T23:53:41Z</time> + <name>5148NANEPA</name> + <desc><![CDATA[Nanepashemet Road Crossing]]></desc> + <sym>Trailhead</sym> + <type><![CDATA[Trail Head]]></type> +</rtept> +<rtept lat="42.451442" lon="-71.121746"> + <ele>74.627442</ele> + <time>2001-11-07T23:53:41Z</time> + <name>5258</name> + <desc><![CDATA[5258]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.453256" lon="-71.121211"> + <ele>77.992066</ele> + <time>2001-11-07T23:53:41Z</time> + <name>5252PURPLE</name> + <desc><![CDATA[Purple Rock Hill]]></desc> + <sym>Summit</sym> + <type><![CDATA[Summit]]></type> +</rtept> +<rtept lat="42.456252" lon="-71.119356"> + <ele>78.713135</ele> + <time>2001-11-07T23:53:41Z</time> + <name>527631</name> + <desc><![CDATA[527631]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.456592" lon="-71.119676"> + <ele>78.713135</ele> + <time>2001-11-07T23:53:41Z</time> + <name>527614</name> + <desc><![CDATA[527614]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.457388" lon="-71.119845"> + <ele>73.761600</ele> + <time>2001-06-02T03:27:00Z</time> + <name>5267OBSTAC</name> + <desc><![CDATA[Obstacle]]></desc> + <sym>Amusement Park</sym> + <type><![CDATA[Obstacle]]></type> +</rtept> +<rtept lat="42.458148" lon="-71.119135"> + <ele>68.275200</ele> + <time>2001-06-02T03:27:00Z</time> + <name>5278</name> + <desc><![CDATA[5278]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.459377" lon="-71.117693"> + <ele>64.008000</ele> + <time>2001-06-02T03:27:01Z</time> + <name>5289</name> + <desc><![CDATA[5289]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.464183" lon="-71.119828"> + <ele>52.997925</ele> + <time>2001-11-28T21:05:28Z</time> + <name>5374FIRE</name> + <desc><![CDATA[5374FIRE]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.465650" lon="-71.119399"> + <ele>56.388000</ele> + <time>2001-06-02T03:27:02Z</time> + <name>5376</name> + <desc><![CDATA[5376]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.465913" lon="-71.119328"> + <ele>64.533692</ele> + <time>2001-11-07T23:53:41Z</time> + <name>5376STREAM</name> + <desc><![CDATA[Stream Crossing]]></desc> + <sym>Bridge</sym> + <type><![CDATA[Bridge]]></type> +</rtept> +<rtept lat="42.467110" lon="-71.113574"> + <ele>53.644800</ele> + <time>2001-06-02T03:27:02Z</time> + <name>6328</name> + <desc><![CDATA[6328]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.466459" lon="-71.110067"> + <ele>48.768000</ele> + <time>2001-06-02T03:27:02Z</time> + <name>635722</name> + <desc><![CDATA[635722]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.466557" lon="-71.109410"> + <ele>49.072800</ele> + <time>2001-06-02T03:27:02Z</time> + <name>635783</name> + <desc><![CDATA[635783]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.463495" lon="-71.107117"> + <ele>62.484000</ele> + <time>2001-06-02T03:27:03Z</time> + <name>6373</name> + <desc><![CDATA[6373]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.465687" lon="-71.107360"> + <ele>87.782400</ele> + <time>2001-06-02T03:27:03Z</time> + <name>BEAR HILL</name> + <cmt>BEAR HILL TOWER</cmt> + <desc><![CDATA[Bear Hill Tower]]></desc> + <sym>Tall Tower</sym> + <type><![CDATA[Tower]]></type> +</rtept> +<rtept lat="42.459986" lon="-71.106170"> + <ele>72.945191</ele> + <time>2001-11-16T23:03:38Z</time> + <name>6289</name> + <desc><![CDATA[6289]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.457616" lon="-71.105116"> + <ele>72.847200</ele> + <time>2001-06-02T03:27:04Z</time> + <name>6297</name> + <desc><![CDATA[6297]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.453845" lon="-71.105206"> + <ele>66.696655</ele> + <time>2001-11-16T23:03:38Z</time> + <name>6283</name> + <desc><![CDATA[6283]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.451430" lon="-71.105413"> + <ele>57.564209</ele> + <time>2001-11-16T23:03:38Z</time> + <name>6280</name> + <desc><![CDATA[6280]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.448448" lon="-71.106158"> + <ele>62.179200</ele> + <time>2001-06-02T03:27:04Z</time> + <name>6177</name> + <desc><![CDATA[6177]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.447804" lon="-71.106624"> + <ele>62.484000</ele> + <time>2001-06-02T03:27:04Z</time> + <name>6176</name> + <desc><![CDATA[6176]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.444773" lon="-71.108882"> + <ele>62.788800</ele> + <time>2001-06-02T03:27:05Z</time> + <name>6153</name> + <desc><![CDATA[6153]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.443592" lon="-71.106301"> + <ele>55.473600</ele> + <time>2001-06-02T03:27:05Z</time> + <name>6171</name> + <desc><![CDATA[6171]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.442981" lon="-71.111441"> + <ele>64.008000</ele> + <time>2001-06-02T03:26:58Z</time> + <name>6131</name> + <desc><![CDATA[6131]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.442196" lon="-71.110975"> + <ele>64.008000</ele> + <time>2001-06-02T03:26:55Z</time> + <name>6130</name> + <desc><![CDATA[6130]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.441754" lon="-71.113220"> + <ele>56.388000</ele> + <time>2001-06-02T03:26:55Z</time> + <name>6029</name> + <desc><![CDATA[6029]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.439018" lon="-71.114456"> + <ele>56.388000</ele> + <time>2001-06-02T03:26:55Z</time> + <name>6006</name> + <desc><![CDATA[600698]]></desc> + <sym>Dot</sym> + <type><![CDATA[Intersection]]></type> +</rtept> +<rtept lat="42.436757" lon="-71.113223"> + <ele>37.616943</ele> + <time>2001-11-28T21:05:28Z</time> + <name>6014MEADOW</name> + <desc><![CDATA[6014MEADOW]]></desc> + <sym>Dot</sym> + <type><![CDATA[Dot]]></type> +</rtept> +<rtept lat="42.434980" lon="-71.109942"> + <ele>45.307495</ele> + <time>2001-11-07T23:53:41Z</time> + <name>PANTHRCAVE</name> + <desc><![CDATA[Panther Cave]]></desc> + <sym>Tunnel</sym> + <type><![CDATA[Tunnel]]></type> +</rtept> +<rtept lat="42.431240" lon="-71.109236"> + <ele>26.561890</ele> + <time>2001-11-07T23:53:41Z</time> + <name>GATE6</name> + <desc><![CDATA[Gate 6]]></desc> + <sym>Trailhead</sym> + <type><![CDATA[Trail Head]]></type> +</rtept> +<rtept lat="42.430950" lon="-71.107628"> + <ele>23.469600</ele> + <time>2001-06-02T00:18:15Z</time> + <name>BELLEVUE</name> + <cmt>BELLEVUE</cmt> + <desc><![CDATA[Bellevue Parking Lot]]></desc> + <sym>Parking Area</sym> + <type><![CDATA[Parking]]></type> +</rtept> +</rte> +</gpx> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/tests/run_tests.py new/geopy-0.94.2/geopy/tests/run_tests.py --- old/geopy-0.94.1/geopy/tests/run_tests.py 2011-03-24 23:11:28.000000000 +0100 +++ new/geopy-0.94.2/geopy/tests/run_tests.py 2012-03-12 20:24:49.000000000 +0100 @@ -1,8 +1,8 @@ #!/usr/bin/env python import unittest import sys -from test_backends import get_suite as get_backend_suite -from test_gpx import get_suite as get_gpx_suite +from geopy.tests.test_backends import get_suite as get_backend_suite +from geopy.tests.test_gpx import get_suite as get_gpx_suite def all_tests(): # Test if BeautifulSoup is installed, since the microformat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/util.py new/geopy-0.94.2/geopy/util.py --- old/geopy-0.94.1/geopy/util.py 2011-03-24 23:11:28.000000000 +0100 +++ new/geopy-0.94.2/geopy/util.py 2012-03-12 20:24:49.000000000 +0100 @@ -1,3 +1,4 @@ +from sys import version_info import re import logging import htmlentitydefs @@ -26,11 +27,13 @@ return sep.join([unicode(i) for i in seq if pred(i)]) def get_encoding(page, contents=None): - plist = page.headers.getplist() - if plist: - key, value = plist[-1].split('=') - if key.lower() == 'charset': - return value + # TODO: clean up Py3k support + if version_info < (3, 0): + charset = page.headers.getparam("charset") or None + else: + charset = page.headers.get_param("charset") or None + if charset: + return charset if contents: try: @@ -42,7 +45,11 @@ contents = page.read() # HTTP 1.1 defines iso-8859-1 as the 'implied' encoding if none is given encoding = get_encoding(page, contents) or 'iso-8859-1' - return unicode(contents, encoding=encoding).encode('utf-8') + # TODO: clean up Py3k support + if version_info < (3, 0): + return unicode(contents, encoding=encoding).encode('utf-8') + else: + return str(contents, encoding=encoding) def get_first_text(node, tag_names, strip=None): if isinstance(tag_names, basestring): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy.egg-info/PKG-INFO new/geopy-0.94.2/geopy.egg-info/PKG-INFO --- old/geopy-0.94.1/geopy.egg-info/PKG-INFO 2011-03-24 23:28:45.000000000 +0100 +++ new/geopy-0.94.2/geopy.egg-info/PKG-INFO 2012-03-12 20:42:29.000000000 +0100 @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: geopy -Version: 0.94.1 +Version: 0.94.2 Summary: Python Geocoding Toolbox Home-page: http://www.geopy.org/ -Author: Brian Beck -Author-email: exogen(a)gmail.com +Author: Mike Tigas +Author-email: mike.tigas(a)gmail.com License: MIT Download-URL: http://code.google.com/p/geopy/downloads/list Description: UNKNOWN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy.egg-info/SOURCES.txt new/geopy-0.94.2/geopy.egg-info/SOURCES.txt --- old/geopy-0.94.1/geopy.egg-info/SOURCES.txt 2011-03-24 23:28:45.000000000 +0100 +++ new/geopy-0.94.2/geopy.egg-info/SOURCES.txt 2012-03-12 20:42:29.000000000 +0100 @@ -1,3 +1,6 @@ +LICENSE +MANIFEST.in +RELEASES setup.cfg setup.py geopy/__init__.py @@ -30,6 +33,7 @@ geopy/parsers/iso8601.py geopy/parsers/rdf.py geopy/tests/__init__.py +geopy/tests/fells_loop.gpx geopy/tests/run_tests.py geopy/tests/test_backends.py geopy/tests/test_distance.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/setup.py new/geopy-0.94.2/setup.py --- old/geopy-0.94.1/setup.py 2011-03-24 23:11:28.000000000 +0100 +++ new/geopy-0.94.2/setup.py 2012-03-12 20:42:15.000000000 +0100 @@ -22,8 +22,8 @@ setup(name='geopy', version=version, description='Python Geocoding Toolbox', - author='Brian Beck', - author_email='exogen(a)gmail.com', + author='Mike Tigas', # update this as needed + author_email='mike.tigas(a)gmail.com', # update this as needed url='http://www.geopy.org/', download_url='http://code.google.com/p/geopy/downloads/list', packages=find_packages(), -- 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-FormEncode for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-FormEncode for openSUSE:Factory checked in at 2012-03-20 11:32:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-FormEncode (Old) and /work/SRC/openSUSE:Factory/.python-FormEncode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-FormEncode", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-FormEncode.new/python-FormEncode.changes 2012-03-20 11:32:55.000000000 +0100 @@ -0,0 +1,209 @@ +------------------------------------------------------------------- +Wed Mar 14 13:44:30 UTC 2012 - saschpe(a)suse.de + +- Set license to SDPX style (Python-2.0) +- Removed outdated %clean section +- Simplified macro usage +- Only package HTML documentation (not the doc sources) + +------------------------------------------------------------------- +Thu Sep 1 08:46:05 UTC 2011 - saschpe(a)suse.de + +- Add provides/obsoletes for python-formencode + +------------------------------------------------------------------- +Thu Sep 1 08:38:45 UTC 2011 - saschpe(a)suse.de + +- Renamed to python-FormEncode to match upstream name +- Properly package documentation + +------------------------------------------------------------------- +Sun Jun 7 00:01:01 CEST 2009 - lars(a)linux-schulserver.de + +- disable runtime dependency to python-setuptools + +------------------------------------------------------------------- +Mon Apr 27 17:51:38 CEST 2009 - lars(a)linux-schulserver.de + +- update to 1.2.2 +- remove FormEncode-1.2-svn-fixes.patch +- added rpmlintrc + +------------------------------------------------------------------- +Sun Dec 14 00:00:00 CET 2008 - jfunk(a)funktronics.ca + +- Apply some fixes from SVN + +------------------------------------------------------------------- +Wed Dec 03 00:00:00 CET 2008 - jfunk(a)funktronics.ca + +- Update to 1.2 + * Added :class:`formencode.validators.IPAddress`, validating IP + addresses, from Leandro Lucarella. + * Added :meth:`formencode.api.Invalid.__unicode__` + * In :mod:`formencode.htmlfill` use a default encoding of utf8 when + handling mixed ``str``/``unicode`` content. Also do not modify + ``<input type="image">`` tags (previously ``src`` would be + overwritten, for no good reason). + * In :class:`formencode.validators.Email` allow single-character + domain names (like x.com). + * Make :class:`formencode.validators.FieldsMatch` give a normal + ``Invalid`` exception if you pass it a non-dictionary. Also treat + all missing keys as the empty string (previously the first key was + required and would raise KeyError). + * :class:`formencode.validators.Number` works with ``inf`` float + values (before it would raise a OverflowError). + * The ``tw`` locale has been renamed to the more standard ``zh_TW``. + * Added Japanese and Turkish translations. + * Fixed some outdated translations and errors in Spanish and Greek + translations. Translations now managed with `Babel + <http://babel.edgewall.org/>`_. +- 1.1 + * Fixed the ``is_empty()`` method in + :class:`formencode.validators.FieldStorageUploadConverter`; + previously it returned the opposite of the intended result. + * Added a parameter to ``htmlfill.render()``: ``prefix_error``. If + this parameter is true (the default) then errors automatically go + before the input field; if false then they go after the input field. + * Remove deprecated modules: ``fields``, ``formgen``, ``htmlform``, + ``sqlformgen``, and ``sqlschema``. + * Added ``formencode.htmlrename``, which renames HTML inputs. + * In ``formencode.htmlfill``, non-string values are compared usefully + (e.g., a select box with integer values). + * The validators ``Int`` and ``Number`` both take min/max arguments + (from Shannon Behrens). + * Validators based on ``formencode.validators.FormValidator`` will not + treat ``{}`` as an empty (unvalidated) value. + * Some adjustments to the URL validator. + * :class:`formencode.compound.All` does not handle empty values, + instead relying on sub-validators to check for emptiness. + * Fixed the ``if_missing`` attribute in + :class:`formencode.foreach.ForEach`; previously it would be the same + list instance, so if you modified it then it would effect future + ``if_missing`` values (reported by Felix Schwarz). + * Added formatter to :mod:`formencode.htmlfill`, so you can use + ``<form:error name="field_name" formatter="ignore" />`` -- this will + cause the error to be swallowed, not shown to the user. + * Added :class:`formencode.validators.XRI` for validation i-names, + i-numbers, URLs, etc (as used in OpenID). + * Look in ``/usr/share/locale`` for locale files, in addition to the + normal locations. + * Quiet Python 2.6 deprecation warnings. + * Fix :class:`formencode.validators.URL`, which was accepting illegal + characters (like newlines) and did not accept http://domain:PORT/ +- 1.0.1 + * ``chained_validators`` were removed from Schema somehow; now + replaced and working. + * Put in missing ``htmlfill.render(error_class=...)`` parameter (was + documented and implemented, but ``render()`` did not pass it + through). + +------------------------------------------------------------------- +Tue Nov 11 00:00:00 CET 2008 - cfarrell1980(a)gmail.com + +- try building with --record-rpm instead of --record - 1.0-1 + +------------------------------------------------------------------- +Wed Mar 19 00:00:00 CET 2008 - jfunk(a)funktronics.ca + +- Update to 1.0 + +------------------------------------------------------------------- +Thu Dec 27 00:00:00 CET 2007 - jfunk(a)funktronics.ca + +- Fix bad python interpreter path + +------------------------------------------------------------------- +Tue Dec 18 00:00:00 CET 2007 - jfunk(a)funktronics.ca + +- Update to 0.9: + - Backward incompatible changes + * The notion of "empty" has changed to include empty lists, + dictionaries, and tuples. If you get one of these values passed + into (or generated by) a validator with ``not_empty=True`` you can + get exceptions where you didn't previously. + - Enhancements + * Added support for Paste's MultiDict dictionary as input to + Schema.to_python, by converting it to a normal dict via MultiDict.mixed. + Previously MultiDicts wouldn't work with CompoundValidators (like + ForEach) + * Added encoding parameter to htmlfill, which will handle cases when mixed + str and unicode objects are used (turning all str objects into unicode) + * Include ``formencode.validators.InternationalPhoneNumber`` from + W-Mark Kubacki. + * ``validators.Int`` takes ``min`` and ``max`` options (from Felix + Schwarz). + * You can control the missing message (which by default is just + "Missing Value") using the message ``"missing"`` in a validator + (also from James Gardner). + * Added ``validators.CADR`` (for IP addresses with an optional range) + and ``validators.MACAddress`` (from Christoph Haas). + - Bug Fixes + * Be friendlier when loaded from a zip file (as with py2exe); + previously only egg zip files would work. + * Fixed bug in htmlfill when a document ends with no trailing text + after the last tag. + * Fix problem with HTMLParser's default unescaping routing, which only + understood a very limited number of entities in attribute values. + * Fix problem with looking up A records for email addresses. + * ``validators.String`` now always returns strings. It also converts + lists to comma-separated strings (no ``[...]``), and can encode + unicode if an ``encoding`` parameter is given. Empty values are + handled better. + * ``validators.UnicodeString`` properly handles non-Unicode inputs. + * Make ``validators.DateConverter`` serialize dates properly + (from James Gardner). + * Minor fix to setup.py to make FormEncode more friendly with + zc.buildout. + +------------------------------------------------------------------- +Mon Apr 23 00:00:00 CET 2007 - jfunk(a)funktronics.ca + +- Update to 0.7.1: + From 0.7.1: + * Set ``if_missing=()`` on ``validators.Set``, as a missing value + usually means empty for this value. + * Fix for ``Email`` validator that searches A records in addition to + MX records (from Jacob Smullyan). + * Fixes for the ``es`` locale. + From 0.7: + * **Backward compatibility issue**: Due to the addition of i18n + (internationalization) to FormEncode, Invalid exceptions now have + unicode messages. You may encounter unicode-related errors if you + are mixing these messages with non-ASCII ``str`` strings. + * gettext-enabled branch merged in + * Fixes `#1457145: Fails on URLs with port numbers + <http://sourceforge.net/tracker/index.php?func=detail&aid=1457145&group_id=9…>`_ + * Fixes `#1559918 Schema fails to accept unicode errors + <http://sourceforge.net/tracker/index.php?func=detail&aid=1559918&group_id=9…>`_ + * ``from formencode.validators import *`` will import the ``Invalid`` + exception now. + * ``Invalid().unpack_errors(encode_variables=True)`` now filters out + None values (which ``ForEach`` can produce even for keys with no + errors). + +------------------------------------------------------------------- +Mon Jan 08 00:00:00 CET 2007 - - poeml(a)suse.de + +- update to 0.6 + +------------------------------------------------------------------- +Mon Jun 26 00:00:00 CET 2006 - jfunk(a)funktronics.ca + +- Remove noarch + +------------------------------------------------------------------- +Fri Jun 23 00:00:00 CET 2006 - jfunk(a)funktronics.ca + ++++ 12 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.python-FormEncode.new/python-FormEncode.changes New: ---- FormEncode-1.2.4.tar.gz python-FormEncode.changes python-FormEncode.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-FormEncode.spec ++++++ # # spec file for package python-FormEncode # # Copyright (c) 2011 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-FormEncode Version: 1.2.4 Release: 0 Url: http://formencode.org Summary: HTML form validation, generation, and conversion package License: Python-2.0 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/F/FormEncode/FormEncode-%{version}.t… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute Provides: python-formencode = %{version} Obsoletes: python-formencode < %{version} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description FormEncode validates and converts nested structures. It allows for a declarative form of defining the validation, and decoupled processes for filling and generating forms. %prep %setup -q -n FormEncode-%{version} mv docs/_build docs/html # Use a better name for HTML docs sed -i "s/\r$//" docs/modules/national.txt # Fix EOL encoding %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc docs/html %{python_sitelib}/* %changelog -- 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-espeak for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-espeak for openSUSE:Factory checked in at 2012-03-20 11:32:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-espeak (Old) and /work/SRC/openSUSE:Factory/.python-espeak.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-espeak", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-espeak/python-espeak.changes 2012-03-07 13:44:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-espeak.new/python-espeak.changes 2012-03-20 11:32:46.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 11:52:11 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-3.0+ + No indication of GPL-3.0 (only) files. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-espeak.spec ++++++ --- /var/tmp/diff_new_pack.TAwuSf/_old 2012-03-20 11:32:47.000000000 +0100 +++ /var/tmp/diff_new_pack.TAwuSf/_new 2012-03-20 11:32:47.000000000 +0100 @@ -19,7 +19,7 @@ Name: python-espeak Version: 0.4 Release: 0 -License: GPL-3.0 +License: GPL-3.0+ Summary: Python bindings for espeak Url: https://launchpad.net/python-espeak Group: Development/Languages/Python -- 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-django-static for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-django-static for openSUSE:Factory checked in at 2012-03-20 11:32:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-static (Old) and /work/SRC/openSUSE:Factory/.python-django-static.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-static", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-static.new/python-django-static.changes 2012-03-20 11:32:33.000000000 +0100 @@ -0,0 +1,106 @@ +------------------------------------------------------------------- +Wed Mar 14 10:36:28 UTC 2012 - saschpe(a)suse.de + +- Simplified macro usage +- Removed outdated %clean section +- Package README.rst +- Pick BSD-3-Clause as license (instead of just 'BSD') + +------------------------------------------------------------------- +Thu Oct 27 22:34:23 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.5.5: + - Sorry, no changelog atm. + +------------------------------------------------------------------- +Tue Mar 22 16:15:01 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.5.4. + +------------------------------------------------------------------- +Sun Mar 20 20:41:47 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.5.3. + +------------------------------------------------------------------- +Fri Mar 11 19:27:34 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.5.2; +- Regenerated spec file with py2pack. + +------------------------------------------------------------------- +Sun Jan 16 20:38:05 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.5.1. + +------------------------------------------------------------------- +Tue Jan 11 01:57:57 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.5.0. + +------------------------------------------------------------------- +Mon Jan 10 18:40:24 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.4.1. + +------------------------------------------------------------------- +Wed Sep 15 02:06:53 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.4.0; +- Bzip2 source file. + +------------------------------------------------------------------- +Thu Aug 5 03:54:37 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3.9. + +------------------------------------------------------------------- +Sat Jun 12 18:34:35 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3.8. + +------------------------------------------------------------------- +Mon May 31 19:07:39 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3.7. + +------------------------------------------------------------------- +Mon May 31 11:23:10 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3.6. + +------------------------------------------------------------------- +Sat May 8 12:15:57 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3.5. + +------------------------------------------------------------------- +Fri May 7 12:18:38 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3.4. + +------------------------------------------------------------------- +Wed Apr 28 11:49:39 UTC 2010 - alexandre(a)exatati.com.br + +- Updatet to 1.3.3. + +------------------------------------------------------------------- +Wed Mar 31 22:17:06 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3.2; +- Spec file cleaned with spec-cleaner. + +------------------------------------------------------------------- +Mon Feb 8 10:27:06 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3.1. + +------------------------------------------------------------------- +Mon Jan 25 16:51:23 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.3. + +------------------------------------------------------------------- +Thu Dec 17 10:47:58 UTC 2009 - alexandre(a)exatati.com.br + +- Initial package (1.2.2) for openSUSE. New: ---- django-static-1.5.5.tar.bz2 python-django-static.changes python-django-static.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-static.spec ++++++ # # spec file for package python-django-static # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-django-static Version: 1.5.5 Release: 0 Url: http://github.com/peterbe/django-static Summary: Template tags for better serving static files from templates License: BSD-3-Clause Group: Development/Languages/Python Source: django-static-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel Requires: python-django %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Template tags for better serving static files from templates in Django. %prep %setup -q -n django-static-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc README.md %{python_sitelib}/* %changelog -- 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-django-picklefield for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-django-picklefield for openSUSE:Factory checked in at 2012-03-20 11:32:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-picklefield (Old) and /work/SRC/openSUSE:Factory/.python-django-picklefield.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-picklefield", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-picklefield.new/python-django-picklefield.changes 2012-03-20 11:32:22.000000000 +0100 @@ -0,0 +1,55 @@ +------------------------------------------------------------------- +Wed Mar 14 11:22:16 UTC 2012 - saschpe(a)suse.de + +- Use upstream tarball +- Simplified macro usage + +------------------------------------------------------------------- +Tue Feb 21 23:49:04 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 0.2.0: + * Allow pickling of subclasses of django.db.models.Model (thanks to + Simon Charette) +- Regenerate spec file with py2pack. + +------------------------------------------------------------------- +Tue Nov 16 00:21:17 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.9. + +------------------------------------------------------------------- +Mon Nov 8 04:12:48 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.8; +- Bzip2 source file. + +------------------------------------------------------------------- +Tue Apr 13 00:07:02 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.6. + +------------------------------------------------------------------- +Mon Apr 5 12:48:11 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.5. + +------------------------------------------------------------------- +Tue Mar 30 15:18:37 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.4; +- Spec file cleaned with spec-cleaner. + +------------------------------------------------------------------- +Sun Mar 28 15:19:18 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.3. + +------------------------------------------------------------------- +Sun Mar 28 03:20:10 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.2. + +------------------------------------------------------------------- +Fri Oct 9 15:09:51 UTC 2009 - alexandre(a)exatati.com.br + +- Initial package (0.1) for openSUSE. New: ---- django-picklefield-0.2.0.tar.gz python-django-picklefield.changes python-django-picklefield.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-picklefield.spec ++++++ # # spec file for package python-django-picklefield # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-django-picklefield Version: 0.2.0 Release: 0 Url: http://github.com/gintas/django-picklefield Summary: Pickled object field for Django License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/d/django-picklefield/django-picklefi… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute Requires: python-django %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description django-picklefield provides an implementation of a pickled object field. Such fields can contain any picklable objects. The implementation is taken and adopted from Django snippet #1694 <http://www.djangosnippets.org/snippets/1694/> by Taavi Taijala, which is in turn based on Django snippet #513 <http://www.djangosnippets.org/snippets/513/> by Oliver Beattie. %prep %setup -q -n django-picklefield-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc README %{python_sitelib}/* %changelog -- 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-distutils-extra for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-distutils-extra for openSUSE:Factory checked in at 2012-03-20 11:32:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-distutils-extra (Old) and /work/SRC/openSUSE:Factory/.python-distutils-extra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-distutils-extra", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-distutils-extra/python-distutils-extra.changes 2012-02-17 12:08:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-distutils-extra.new/python-distutils-extra.changes 2012-03-20 11:32:09.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Mar 14 11:02:40 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.32. Summary of changes since 2.23: + + Port code to be fully Python 3 compatible. + + Rename "check" command to "pylint". + + Add support for installing GSettings schema files. + + Properly support GI repository module detection. + + Remove pykdeuic4 integration. + + Drop support for the long-obsolete PolicyKit (pre polkit 1.0 + API). + + Several bug fixes. + +------------------------------------------------------------------- Old: ---- python-distutils-extra-2.23.tar.gz New: ---- python-distutils-extra-2.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-distutils-extra.spec ++++++ --- /var/tmp/diff_new_pack.6F087e/_old 2012-03-20 11:32:10.000000000 +0100 +++ /var/tmp/diff_new_pack.6F087e/_new 2012-03-20 11:32:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-distutils-extra -Version: 2.23 +Version: 2.32 Release: 0 Summary: Distutils/Setuptools Adapter License: GPL-2.0 ++++++ python-distutils-extra-2.23.tar.gz -> python-distutils-extra-2.32.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/DistUtilsExtra/__init__.py new/python-distutils-extra-2.32/DistUtilsExtra/__init__.py --- old/python-distutils-extra-2.23/DistUtilsExtra/__init__.py 2010-11-18 11:35:44.000000000 +0100 +++ new/python-distutils-extra-2.32/DistUtilsExtra/__init__.py 2012-03-02 17:46:22.000000000 +0100 @@ -1 +1 @@ -__version__ = '2.23' +__version__ = '2.32' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/DistUtilsExtra/auto.py new/python-distutils-extra-2.32/DistUtilsExtra/auto.py --- old/python-distutils-extra-2.23/DistUtilsExtra/auto.py 2010-11-18 11:33:11.000000000 +0100 +++ new/python-distutils-extra-2.32/DistUtilsExtra/auto.py 2012-03-02 17:45:10.000000000 +0100 @@ -10,10 +10,11 @@ * Python modules (./*.py, only in root directory) * Python packages (all directories with __init__.py) * Docbook-XML GNOME help files (help/<language>/{*.xml,*.omf,figures}) - * GtkBuilder (*.ui) [installed into prefix/share/<projectname>/] - * Qt4 user interfaces (*.ui) [compiled with pykdeuic into Python modules] + * GtkBuilder and Qt4 user interfaces (*.ui) [installed into + prefix/share/<projectname>/] * D-Bus (*.conf and *.service) - * PolicyKit (*.policy.in) + * GSettings schemas (*.gschema.xml) + * polkit (*.policy.in) * Desktop files (*.desktop.in) [into prefix/share/applications, or prefix/share/autostart if they have "autostart" anywhere in the path] * KDE4 notifications (*.notifyrc.in) @@ -40,6 +41,7 @@ import os, os.path, fnmatch, stat, sys, subprocess import ast import distutils.core +from functools import reduce from DistUtilsExtra import __version__ as __pkgversion from DistUtilsExtra.command import * @@ -84,11 +86,12 @@ __packages(attrs, src) __provides(attrs, src) __dbus(attrs, src) + __gschema(attrs, src) __apport_hooks(attrs, src) __data(attrs, src) __scripts(attrs, src) __stdfiles(attrs, src) - __gtkbuilder(attrs, src) + __ui(attrs, src) __manpages(attrs, src) if 'clean' not in sys.argv: @@ -97,9 +100,9 @@ distutils.core.setup(**attrs) if src: - print 'WARNING: the following files are not recognized by DistUtilsExtra.auto:' + print('WARNING: the following files are not recognized by DistUtilsExtra.auto:') for f in sorted(src): - print ' ', f + print (' ' + f) # # parts of setup() @@ -123,17 +126,17 @@ v.setdefault('build_help', build_help_auto) v.setdefault('build_i18n', build_i18n_auto) v.setdefault('build_icons', build_icons.build_icons) - v.setdefault('build_kdeui', build_kdeui_auto) v.setdefault('install', install_auto) v.setdefault('clean', clean_build_tree) v.setdefault('sdist', sdist_auto) + v.setdefault('pylint', pylint.pylint) def __modules(attrs, src): '''Default modules''' if 'py_modules' in attrs: for mod in attrs['py_modules']: - print mod + print(mod) src_markglob(src, os.path.join(mod, '*.py')) return @@ -195,6 +198,17 @@ if session_service: v.append(('share/dbus-1/services', session_service)) +def __gschema(attrs, src): + '''Install GSettings schema files''' + + v = attrs.setdefault('data_files', []) + schema_glob = '*.gschema.xml' + schemas = src_fileglob(src, schema_glob) + if schemas: + src_markglob(src, schema_glob) + src_markglob(src, '*gschemas.compiled') + v.append(('share/glib-2.0/schemas/', schemas)) + def __apport_hooks(attrs, src): '''Apport hooks''' v = attrs.setdefault('data_files', []) @@ -222,7 +236,7 @@ data_files = [] for f in src.copy(): if f.startswith('data/') and not f.startswith('data/icons/') and \ - not f.endswith('.desktop.in') and not f.endswith('*.notifyrc.in'): + not f.endswith('.desktop.in') and not f.endswith('.notifyrc.in'): if not os.path.islink(f): # symlinks are handled in install_auto v.append((os.path.join('share', attrs['name'], os.path.dirname(f[5:])), [f])) @@ -276,13 +290,16 @@ attrs.setdefault('data_files', []).append((os.path.join('share', 'doc', attrs['name']), readme)) -def __gtkbuilder(attrs, src): - '''Install GtkBuilder *.ui files''' +def __ui(attrs, src): + '''Install GtkBuilder/Qt *.ui files''' ui = [] for f in src_fileglob(src, '*.ui'): - contents = open(f).read() - if ('<interface>\n' in contents or '<interface ' in contents) and 'class="Gtk' in contents: + fd = open(f) + firstlines = fd.readline() + firstlines += '\n' + fd.readline() + fd.close() + if '<interface' in firstlines or '<ui version=' in firstlines: src_mark(src, f) ui.append(f) if ui: @@ -301,13 +318,14 @@ src_mark(src, f) mans.setdefault(f[-1], []).append(f) v = attrs.setdefault('data_files', []) - for section, files in mans.iteritems(): + for section, files in mans.items(): v.append((os.path.join('share', 'man', 'man' + section), files)) -def __external_mod(module, attrs): +def __external_mod(cur_module, module, attrs): '''Check if given Python module is not included in Python or locally''' - # filter out locally provided modules + # filter out locally provided modules early, to avoid importing them (which + # might raise an exception, or parse argv, etc.) if module in attrs['provides']: return False for m in _module_parents(module): @@ -315,34 +333,66 @@ return False try: - path = __import__(module).__file__ + mod = __import__(module) except ImportError: - print >> sys.stderr, 'ERROR: Python module %s not found' % module + # try relative import + try: + if cur_module: + mod = __import__(cur_module + '.' + module) + else: + raise ImportError + except ImportError: + sys.stderr.write('ERROR: Python module %s not found\n' % module) + return False + except ValueError: # weird ctypes case with wintypes + return False + except RuntimeError: # When Gdk can't be initialized + return False + except ValueError: # weird ctypes case with wintypes + return False + except RuntimeError: # When Gdk can't be initialized return False - except AttributeError: # builtin modules + + if not hasattr(mod, '__file__'): + # builtin module + return False + + # filter out locally provided modules + if mod.__name__ in attrs['provides']: return False - return 'dist-packages' in path or 'site-packages' in path or \ - not path.startswith(os.path.dirname(os.__file__)) + return 'dist-packages' in mod.__file__ or 'site-packages' in mod.__file__ or \ + not mod.__file__.startswith(os.path.dirname(os.__file__)) def __add_imports(imports, file, attrs): '''Add all imported modules from file to imports set. This filters out modules which are shipped with Python itself. ''' + if os.path.exists(os.path.join(os.path.dirname(file), '__init__.py')): + cur_module = '.'.join(file.split(os.path.sep)[:-1]) + else: + # this might happen for paths like bin/<script> which we do not want to + # treat as module for checking relative imports + cur_module = None + try: tree = ast.parse(open(file).read(), file) for node in ast.walk(tree): if isinstance(node, ast.Import): for alias in node.names: - if __external_mod(alias.name, attrs): + if alias.name and __external_mod(cur_module, alias.name, attrs): imports.add(alias.name) if isinstance(node, ast.ImportFrom): - if __external_mod(node.module, attrs): + if node.module == 'gi.repository': + for name in node.names: + imports.add('gi.repository.%s' % name.name) + + elif node.module and __external_mod(cur_module, node.module, attrs): imports.add(node.module) - except SyntaxError, e: - print >> sys.stderr, 'WARNING: syntax errors in', file, ':', e + except SyntaxError as e: + sys.stderr.write('WARNING: syntax errors in %s: %s\n' % (file, str(e))) def _module_parents(mod): '''Iterate over all parents of a module''' @@ -362,6 +412,9 @@ result = set() for m in modules: + if m.startswith('gi.repository.'): + result.add(m) + continue for p in _module_parents(m): if p in modules: break @@ -402,7 +455,7 @@ if 'provides' in attrs: return - provides = attrs.get('py_modules', []) + provides = list(attrs.get('py_modules', [])) # we need a copy here for p in attrs.get('packages', []): provides.append(p.replace(os.path.sep, '.')) attrs['provides'] = __filter_namespace(provides) @@ -489,24 +542,17 @@ global src global src_all - # add PolicyKit files + # add polkit files policy_files = [] for f in src_fileglob(src, '*.policy.in'): src_mark(src, f) policy_files.append(f) if policy_files: - # check if we have PolicyKit 1 API - if subprocess.call(['grep', '-q', 'org\.freedesktop\.PolicyKit1'] + - list(src_fileglob(src_all, '*.py')), - stderr=subprocess.PIPE) == 0: - destdir = os.path.join('share', 'polkit-1', 'actions') - else: - destdir = os.path.join('share', 'PolicyKit', 'policy') try: xf = eval(self.xml_files) except TypeError: xf = [] - xf.append((destdir, policy_files)) + xf.append((os.path.join('share', 'polkit-1', 'actions'), policy_files)) self.xml_files = repr(xf) # add desktop files @@ -575,9 +621,9 @@ if not os.path.isdir('po'): os.mkdir('po') potfiles_in = open('po/POTFILES.in', 'w') - print >> potfiles_in, '[encoding: UTF-8]' + potfiles_in.write('[encoding: UTF-8]\n') for f in files: - print >> potfiles_in, f + potfiles_in.write(f + '\n') potfiles_in.close() auto_potfiles_in = True @@ -594,30 +640,6 @@ except: pass -class build_kdeui_auto(build_kdeui.build_kdeui): - def finalize_options(self): - global src - - # add *.ui files which belong to KDE4 - kdeui_files = [] - for f in src_fileglob(src, '*.ui'): - fd = open(f) - # might be on the first or second line - if fd.readline().startswith('<ui version="') or \ - fd.readline().startswith('<ui version="'): - src_mark(src, f) - kdeui_files.append(f) - fd.close() - if kdeui_files: - try: - uf = eval(self.ui_files) - except TypeError: - uf = [] - uf += kdeui_files - self.ui_files = repr(uf) - - build_kdeui.build_kdeui.finalize_options(self) - # # Automatic sdist # @@ -679,26 +701,29 @@ preserve_times=0, preserve_symlinks=1, verbose=1) # install data/scripts symlinks - for f in distutils.filelist.findall(): - if not os.path.islink(f): - continue - if f.startswith('bin/') or f.startswith('data/'): - if f.startswith('bin'): - dir = self.install_scripts - dest = os.path.join(dir, os.path.sep.join(f.split(os.path.sep)[1:])) - elif f.startswith('data/icons'): - dir = os.path.join(self.install_data, 'share', 'icons', 'hicolor') - dest = os.path.join(dir, os.path.sep.join(f.split(os.path.sep)[2:])) - else: - dir = os.path.join(self.install_data, 'share', self.distribution.get_name()) - dest = os.path.join(dir, os.path.sep.join(f.split(os.path.sep)[1:])) - - d = os.path.dirname(dest) - if not os.path.isdir(d): - os.makedirs(d) - if os.path.exists(dest): - os.unlink(dest) - os.symlink(os.readlink(f), dest) + for (path, dirs, files) in os.walk('.'): + for f in files: + f = os.path.join(path, f) + if not os.path.islink(f): + continue + + if f.startswith('./bin/') or f.startswith('./data/'): + if f.startswith('./bin'): + dir = self.install_scripts + dest = os.path.join(dir, os.path.sep.join(f.split(os.path.sep)[2:])) + elif f.startswith('./data/icons'): + dir = os.path.join(self.install_data, 'share', 'icons', 'hicolor') + dest = os.path.join(dir, os.path.sep.join(f.split(os.path.sep)[3:])) + else: + dir = os.path.join(self.install_data, 'share', self.distribution.get_name()) + dest = os.path.join(dir, os.path.sep.join(f.split(os.path.sep)[2:])) + + d = os.path.dirname(dest) + if not os.path.isdir(d): + os.makedirs(d) + if os.path.exists(dest): + os.unlink(dest) + os.symlink(os.readlink(f), dest) distutils.command.install.install.run(self) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/DistUtilsExtra/command/__init__.py new/python-distutils-extra-2.32/DistUtilsExtra/command/__init__.py --- old/python-distutils-extra-2.23/DistUtilsExtra/command/__init__.py 2010-09-16 15:53:37.000000000 +0200 +++ new/python-distutils-extra-2.32/DistUtilsExtra/command/__init__.py 2011-02-09 15:30:30.000000000 +0100 @@ -2,5 +2,6 @@ "build_i18n", "build_icons", "build_help", - "build_kdeui", - "clean_i18n"] + "clean_i18n", + "pylint", + ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/DistUtilsExtra/command/build_help.py new/python-distutils-extra-2.32/DistUtilsExtra/command/build_help.py --- old/python-distutils-extra-2.23/DistUtilsExtra/command/build_help.py 2010-09-16 15:53:37.000000000 +0200 +++ new/python-distutils-extra-2.32/DistUtilsExtra/command/build_help.py 2011-03-15 11:44:37.000000000 +0100 @@ -25,10 +25,14 @@ path_xml = os.path.join('share/gnome/help', name, lang) path_figures = os.path.join('share/gnome/help', name, lang, 'figures') - data_files.append((path_xml, glob('%s/*.xml' % path))) + docbook_files = glob('%s/*.xml' % path) + mallard_files = glob('%s/*.page' % path) + data_files.append((path_xml, docbook_files + mallard_files)) data_files.append((path_figures, glob('%s/figures/*.png' % path))) - data_files.append((os.path.join('share', 'omf', name), glob(omf_pattern))) + omf_files = glob(omf_pattern) + if omf_files: + data_files.append((os.path.join('share', 'omf', name), omf_files)) return data_files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/DistUtilsExtra/command/build_icons.py new/python-distutils-extra-2.32/DistUtilsExtra/command/build_icons.py --- old/python-distutils-extra-2.23/DistUtilsExtra/command/build_icons.py 2010-09-16 15:53:37.000000000 +0200 +++ new/python-distutils-extra-2.32/DistUtilsExtra/command/build_icons.py 2011-04-26 16:51:58.000000000 +0200 @@ -35,7 +35,9 @@ for category in glob.glob(os.path.join(size, "*")): icons = [] for icon in glob.glob(os.path.join(category,"*")): - icons.append(icon) + if not os.path.islink(icon): + icons.append(icon) + if icons: data_files.append(("share/icons/hicolor/%s/%s" % \ (os.path.basename(size), \ os.path.basename(category)), \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/DistUtilsExtra/command/build_kdeui.py new/python-distutils-extra-2.32/DistUtilsExtra/command/build_kdeui.py --- old/python-distutils-extra-2.23/DistUtilsExtra/command/build_kdeui.py 2010-09-16 19:31:55.000000000 +0200 +++ new/python-distutils-extra-2.32/DistUtilsExtra/command/build_kdeui.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -"""distutils_extra.command.build_kdeui - -Implement DistutilsExtra's 'build_kdeui' command. -""" - -# Created by Martin Pitt - -import subprocess -import os.path -import distutils.dir_util - -class build_kdeui(distutils.cmd.Command): - - description = "compile KDE .ui files to .py with pykdeuic4" - - user_options= [('ui-files=', 'u', '.ui files that should be built'), - ('ui-package=', 'p', 'Python package name for the generated .py files'), - ] - - def initialize_options(self): - self.ui_files = None - self.ui_package = None - - def finalize_options(self): - if not self.ui_files: - return - if self.ui_package is None: - self.ui_package = '%s.kdeui' % self.distribution.get_name() - - self.destdir = os.path.join('build', 'kdeui', *self.ui_package.split('.')) - if self.distribution.package_dir is None: - self.distribution.package_dir = {} - self.distribution.package_dir[self.ui_package] = self.destdir - self.distribution.packages.append(self.ui_package) - - def run(self): - if not self.ui_files: - return - - distutils.dir_util.mkpath(self.destdir) - init = os.path.join(self.destdir, '__init__.py') - if not os.path.exists(init): - open(init, 'w').close() - - for f in eval(self.ui_files): - dest = os.path.join(self.destdir, - os.path.splitext(os.path.basename(f))[0] + '.py') - print 'kdeui: %s -> %s' % (f, dest) - result = subprocess.call(['python', '/usr/bin/pykdeuic4', '-o', dest, f]) - if result != 0: - raise SystemError('The KDE .ui file %s can not be converted' % f) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/DistUtilsExtra/command/check.py new/python-distutils-extra-2.32/DistUtilsExtra/command/check.py --- old/python-distutils-extra-2.23/DistUtilsExtra/command/check.py 2010-09-23 15:22:26.000000000 +0200 +++ new/python-distutils-extra-2.32/DistUtilsExtra/command/check.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -# DistUtilsExtra.command.check - check command for DistUtilsExtra -# -# Author: Rodney Dawes <rodney.dawes(a)canonical.com> -# Copyright 2009 Canonical Ltd. - -"""DistUtilsExtra.command.check - -Implements the DistUtilsExtra 'check' command. -""" - -import os -import subprocess - -from distutils.core import Command - - -class check (Command): - """Command to run lint and tests on a module.""" - - description = "integrate pylint checks" - - user_options = [("config-file=", None, - "pylint config file to use"), - ("exclude-files=", None, - "list of files to exclude from lint checks"), - ("lint-files=", None, - "list of modules or packages to run lint checks on") - ] - - def initialize_options (self): - self.config_file = None - self.exclude_files = None - self.lint_files = None - - def finalize_options (self): - if self.config_file is None: - self.config_file = "" - if self.exclude_files is None: - self.exclude_files = "[]" - if self.lint_files is None: - self.lint_files = "[" + self.__find_files() + "]" - - def run (self): - pylint_args = ["--output-format=parseable", - "--include-ids=yes"] - - if self.config_file: - pylint_args.append("--rcfile=" + self.config_file) - - for file in eval(self.lint_files): - pylint_args.append(file) - - p = subprocess.Popen(["pylint"] + pylint_args, - bufsize=4096, stdout=subprocess.PIPE) - notices = p.stdout - - output = "".join(notices.readlines()) - if output != "": - print "== Pylint notices ==" - print self.__group_lines_by_file(output) - - def __group_lines_by_file(self, input): - """Format file:line:message output as lines grouped by file.""" - outputs = [] - filename = "" - excludes = eval(self.exclude_files) - for line in input.splitlines(): - current = line.split(":", 3) - if line.startswith(" "): - outputs.append(" " + current[0] + "") - elif line.startswith("build/") or current[0] in excludes or \ - len(current) < 3: - pass - elif filename == current[0]: - outputs.append(" " + current[1] + ": " + current[2]) - elif filename != current[0]: - filename = current[0] - outputs.append("") - outputs.append(filename + ":") - outputs.append(" " + current[1] + ": " + current[2]) - - return "\n".join(outputs) - - def __find_files(self): - """Find all Python files under the current tree.""" - pyfiles = [] - for root, dirs, files in os.walk(os.getcwd(), topdown=False): - for file in files: - if file.endswith(".py"): - pyfiles.append("'" + os.path.join(root, file) + "'") - pyfiles.sort() - return ",".join(pyfiles) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/DistUtilsExtra/command/pylint.py new/python-distutils-extra-2.32/DistUtilsExtra/command/pylint.py --- old/python-distutils-extra-2.23/DistUtilsExtra/command/pylint.py 1970-01-01 01:00:00.000000000 +0100 +++ new/python-distutils-extra-2.32/DistUtilsExtra/command/pylint.py 2011-02-15 12:41:01.000000000 +0100 @@ -0,0 +1,92 @@ +# DistUtilsExtra.command.pylint - DistUtilsExtra command to call pylint +# +# Author: Rodney Dawes <rodney.dawes(a)canonical.com> +# Copyright 2009 Canonical Ltd. + +"""DistUtilsExtra.command.pylint + +Implements the DistUtilsExtra 'pylint' command. +""" + +import os +import subprocess + +from distutils.core import Command + + +class pylint (Command): + """Command to run pylint and tests on a module.""" + + description = "integrate pylint checks" + + user_options = [("config-file=", None, + "pylint config file to use"), + ("exclude-files=", None, + "list of files to exclude from lint checks"), + ("lint-files=", None, + "list of modules or packages to run lint checks on") + ] + + def initialize_options (self): + self.config_file = None + self.exclude_files = None + self.lint_files = None + + def finalize_options (self): + if self.config_file is None: + self.config_file = "" + if self.exclude_files is None: + self.exclude_files = "[]" + if self.lint_files is None: + self.lint_files = "[" + self.__find_files() + "]" + + def run (self): + pylint_args = ["--output-format=parseable", + "--include-ids=yes"] + + if self.config_file: + pylint_args.append("--rcfile=" + self.config_file) + + for file in eval(self.lint_files): + pylint_args.append(file) + + p = subprocess.Popen(["pylint"] + pylint_args, + bufsize=4096, stdout=subprocess.PIPE) + notices = p.stdout + + output = "".join(notices.readlines()) + if output != "": + print("== Pylint notices ==") + print(self.__group_lines_by_file(output)) + + def __group_lines_by_file(self, input): + """Format file:line:message output as lines grouped by file.""" + outputs = [] + filename = "" + excludes = eval(self.exclude_files) + for line in input.splitlines(): + current = line.split(":", 3) + if line.startswith(" "): + outputs.append(" " + current[0] + "") + elif line.startswith("build/") or current[0] in excludes or \ + len(current) < 3: + pass + elif filename == current[0]: + outputs.append(" " + current[1] + ": " + current[2]) + elif filename != current[0]: + filename = current[0] + outputs.append("") + outputs.append(filename + ":") + outputs.append(" " + current[1] + ": " + current[2]) + + return "\n".join(outputs) + + def __find_files(self): + """Find all Python files under the current tree.""" + pyfiles = [] + for root, dirs, files in os.walk(os.getcwd(), topdown=False): + for file in files: + if file.endswith(".py"): + pyfiles.append("'" + os.path.join(root, file) + "'") + pyfiles.sort() + return ",".join(pyfiles) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/PKG-INFO new/python-distutils-extra-2.32/PKG-INFO --- old/python-distutils-extra-2.23/PKG-INFO 2010-11-18 11:36:32.000000000 +0100 +++ new/python-distutils-extra-2.32/PKG-INFO 2012-03-02 17:50:39.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: python-distutils-extra -Version: 2.23 +Version: 2.32 Summary: Add support for i18n, documentation and icons to distutils Home-page: UNKNOWN Author: Sebastian Heinlein, Martin Pitt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/python_distutils_extra.egg-info/PKG-INFO new/python-distutils-extra-2.32/python_distutils_extra.egg-info/PKG-INFO --- old/python-distutils-extra-2.23/python_distutils_extra.egg-info/PKG-INFO 2010-11-18 11:36:32.000000000 +0100 +++ new/python-distutils-extra-2.32/python_distutils_extra.egg-info/PKG-INFO 2012-03-02 17:50:39.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: python-distutils-extra -Version: 2.23 +Version: 2.32 Summary: Add support for i18n, documentation and icons to distutils Home-page: UNKNOWN Author: Sebastian Heinlein, Martin Pitt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/python_distutils_extra.egg-info/SOURCES.txt new/python-distutils-extra-2.32/python_distutils_extra.egg-info/SOURCES.txt --- old/python-distutils-extra-2.23/python_distutils_extra.egg-info/SOURCES.txt 2010-11-18 11:36:32.000000000 +0100 +++ new/python-distutils-extra-2.32/python_distutils_extra.egg-info/SOURCES.txt 2012-03-02 17:50:39.000000000 +0100 @@ -8,9 +8,8 @@ DistUtilsExtra/command/build_help.py DistUtilsExtra/command/build_i18n.py DistUtilsExtra/command/build_icons.py -DistUtilsExtra/command/build_kdeui.py -DistUtilsExtra/command/check.py DistUtilsExtra/command/clean_i18n.py +DistUtilsExtra/command/pylint.py doc/FAQ doc/README doc/setup.cfg.example diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/python_distutils_extra.egg-info/entry_points.txt new/python-distutils-extra-2.32/python_distutils_extra.egg-info/entry_points.txt --- old/python-distutils-extra-2.23/python_distutils_extra.egg-info/entry_points.txt 2010-11-18 11:36:32.000000000 +0100 +++ new/python-distutils-extra-2.32/python_distutils_extra.egg-info/entry_points.txt 2012-03-02 17:50:39.000000000 +0100 @@ -1,8 +1,8 @@ [distutils.commands] build_icons = DistUtilsExtra.command.build_icons:build_icons +clean_i18n = DistUtilsExtra.command.clean_i18n:clean_i18n build_i18n = DistUtilsExtra.command.build_i18n:build_i18n -build_help = DistUtilsExtra.command.build_help:build_help +pylint = DistUtilsExtra.command.pylint:pylint build = DistUtilsExtra.command.build_extra:build -check = DistUtilsExtra.command.check:check -clean_i18n = DistUtilsExtra.command.clean_i18n:clean_i18n +build_help = DistUtilsExtra.command.build_help:build_help diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/setup.py new/python-distutils-extra-2.32/setup.py --- old/python-distutils-extra-2.23/setup.py 2010-11-06 19:53:39.000000000 +0100 +++ new/python-distutils-extra-2.32/setup.py 2011-02-09 14:57:07.000000000 +0100 @@ -21,6 +21,6 @@ "build_icons = DistUtilsExtra.command.build_icons:build_icons", "build_help = DistUtilsExtra.command.build_help:build_help", "clean_i18n = DistUtilsExtra.command.clean_i18n:clean_i18n", - "check = DistUtilsExtra.command.check:check", + "pylint = DistUtilsExtra.command.pylint:pylint", ],}, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-distutils-extra-2.23/test/auto.py new/python-distutils-extra-2.32/test/auto.py --- old/python-distutils-extra-2.23/test/auto.py 2010-11-06 19:53:39.000000000 +0100 +++ new/python-distutils-extra-2.32/test/auto.py 2012-03-02 17:45:10.000000000 +0100 @@ -6,12 +6,14 @@ class T(unittest.TestCase): def setUp(self): + self.maxDiff = None self.src = tempfile.mkdtemp() self._mksrc('setup.py', ''' # ignore warning about import from local path import warnings warnings.filterwarnings('ignore', 'Module DistUtilsExtra was already imported from.*') +warnings.filterwarnings('ignore', 'pipe2 set errno ENOSYS.*') from DistUtilsExtra.auto import setup @@ -55,12 +57,12 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o) + self.assertFalse('following files are not recognized' in o) f = self.installed_files() # just installs the .egg_info self.assertEqual(len(f), 1) - self.assert_(f[0].endswith('.egg-info')) + self.assertTrue(f[0].endswith('.egg-info')) def test_vcs(self): '''Ignores revision control files''' @@ -73,12 +75,12 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o) + self.assertFalse('following files are not recognized' in o) f = self.installed_files() # just installs the .egg_info self.assertEqual(len(f), 1) - self.assert_(f[0].endswith('.egg-info')) + self.assertTrue(f[0].endswith('.egg-info')) def test_modules(self): '''Python modules''' @@ -89,12 +91,12 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.assert_('following files are not recognized' in o) - self.assert_('\n stuff/notme.py\n' in o) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n stuff/notme.py\n' in o) f = '\n'.join(self.installed_files()) - self.assert_('-packages/yesme.py' in f) - self.failIf('notme' in f) + self.assertTrue('-packages/yesme.py' in f) + self.assertFalse('notme' in f) def test_packages(self): '''Python packages''' @@ -107,13 +109,13 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.assert_('following files are not recognized' in o) - self.assert_('\n noinit/notme.py\n' in o) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n noinit/notme.py\n' in o) f = '\n'.join(self.installed_files()) - self.assert_('foopkg/__init__.py' in f) - self.assert_('foopkg/bar.py' in f) - self.failIf('noinit' in f) + self.assertTrue('foopkg/__init__.py' in f) + self.assertTrue('foopkg/bar.py' in f) + self.assertFalse('noinit' in f) def test_dbus(self): '''D-BUS configuration and service files''' @@ -146,15 +148,34 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.assert_('following files are not recognized' in o) - self.assert_('\n stuff/super.service\n' in o) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n stuff/super.service\n' in o) f = self.installed_files() self.assertEqual(len(f), 4) # 3 D-BUS files plus .egg-info - self.assert_('/etc/dbus-1/system.d/com.example.foo.conf' in f) - self.assert_('/usr/share/dbus-1/system-services/com.example.foo.service' in f) - self.assert_('/usr/share/dbus-1/services/com.example.foo.gui.service' in f) - self.failIf('super.service' in '\n'.join(f)) + self.assertTrue('/etc/dbus-1/system.d/com.example.foo.conf' in f) + self.assertTrue('/usr/share/dbus-1/system-services/com.example.foo.service' in f) + self.assertTrue('/usr/share/dbus-1/services/com.example.foo.gui.service' in f) + self.assertFalse('super.service' in '\n'.join(f)) + + def test_gsettings(self): + '''GSettings schema files''' + + # schema files in dedicated directory + self._mksrc('data/glib-2.0/schemas/org.test.myapp.gschema.xml') + self._mksrc('data/glib-2.0/schemas/gschemas.compiled') + # schema files in data directory + self._mksrc('data/org.test.myapp2.gschema.xml') + self._mksrc('data/gschemas.compiled') + + (o, e, s) = self.do_install() + self.assertEqual(e, '') + self.assertEqual(s, 0) + + f = self.installed_files() + self.assertEqual(len(f), 3) # 2 schema files plus .egg-info + self.assertTrue('/usr/share/glib-2.0/schemas/org.test.myapp.gschema.xml' in f) + self.assertFalse('gschemas.compiled' in '\n'.join(f)) def test_apport_hook(self): '''Apport hooks''' @@ -170,12 +191,12 @@ ''') (o, e, s) = self.do_install() - self.failIf('following files are not recognized' in o, o) + self.assertFalse('following files are not recognized' in o, o) f = self.installed_files() self.assertEqual(len(f), 3, f) # 2 hook files plus .egg-info - self.assert_('/usr/share/apport/package-hooks/foo.py' in f, f) - self.assert_('/usr/share/apport/package-hooks/source_foo.py' in f, f) + self.assertTrue('/usr/share/apport/package-hooks/foo.py' in f, f) + self.assertTrue('/usr/share/apport/package-hooks/source_foo.py' in f, f) def test_po(self): '''gettext *.po files''' @@ -185,18 +206,18 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o) + self.assertFalse('following files are not recognized' in o) f = self.installed_files() - self.assert_('/usr/share/locale/de/LC_MESSAGES/foo.mo' in f) - self.assert_('/usr/share/locale/fr/LC_MESSAGES/foo.mo' in f) - self.failIf('junk' in '\n'.join(f)) + self.assertTrue('/usr/share/locale/de/LC_MESSAGES/foo.mo' in f) + self.assertTrue('/usr/share/locale/fr/LC_MESSAGES/foo.mo' in f) + self.assertFalse('junk' in '\n'.join(f)) msgunfmt = subprocess.Popen(['msgunfmt', os.path.join(self.install_tree, 'usr/share/locale/de/LC_MESSAGES/foo.mo')], stdout=subprocess.PIPE) out = msgunfmt.communicate()[0].decode() - self.assertEqual(out, open(os.path.join(self.src, 'po/de.po')).read()) + self.assertEqual(out, self._src_contents('po/de.po')) def test_policykit(self): '''*.policy.in PolicyKit files''' @@ -222,33 +243,15 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o) - - f = self.installed_files() - self.assert_('/usr/share/PolicyKit/policy/com.example.foo.policy' in f) - p = open(os.path.join(self.install_tree, - 'usr/share/PolicyKit/policy/com.example.foo.policy')).read() - self.assert_('<description>Good morning</description>' in p) - self.assert_('<description xml:lang="de">Guten Morgen</description>' in p) - self.assert_('<message>Hello</message>' in p) - self.assert_('<message xml:lang="de">Hallo</message>' in p) - - # polkit-1 - self._mksrc('foo.py', '''polkit = dbus.Interface(dbus.SystemBus().get_object( - 'org.freedesktop.PolicyKit1', - '/org/freedesktop/PolicyKit1/Authority', False), - 'org.freedesktop.PolicyKit1.Authority') -''') - self.setup_py(['clean', '-a']) - self.snapshot = None - (o, e, s) = self.do_install() - self.assertEqual(e, '') - self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o) + self.assertFalse('following files are not recognized' in o) f = self.installed_files() - self.failIf('/usr/share/PolicyKit/policy/com.example.foo.policy' in f) - self.assert_('/usr/share/polkit-1/actions/com.example.foo.policy' in f) + self.assertTrue('/usr/share/polkit-1/actions/com.example.foo.policy' in f) + p = self._installed_contents('usr/share/polkit-1/actions/com.example.foo.policy') + self.assertTrue('<description>Good morning</description>' in p) + self.assertTrue('<description xml:lang="de">Guten Morgen</description>' in p) + self.assertTrue('<message>Hello</message>' in p) + self.assertTrue('<message xml:lang="de">Hallo</message>' in p) def test_desktop(self): '''*.desktop.in files''' @@ -270,42 +273,47 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o) + self.assertFalse('following files are not recognized' in o) f = self.installed_files() - self.assert_('/usr/share/autostart/fooapplet.desktop' in f) - self.assert_('/usr/share/applications/foogtk.desktop' in f) - self.assert_('/usr/share/applications/foosettings.desktop' in f) + self.assertTrue('/usr/share/autostart/fooapplet.desktop' in f) + self.assertTrue('/usr/share/applications/foogtk.desktop' in f) + self.assertTrue('/usr/share/applications/foosettings.desktop' in f) # data/*.desktop.in shouldn't go to data dir - self.failIf('/usr/share/foo/' in f) + self.assertFalse('/usr/share/foo/' in f) - p = open(os.path.join(self.install_tree, - 'usr/share/autostart/fooapplet.desktop')).read() - self.assert_('\nName=Hello\n' in p) - self.assert_('\nName[de]=Hallo\n' in p) - self.assert_('\nComment[fr]=Bonjour\n' in p) + p = self._installed_contents('usr/share/autostart/fooapplet.desktop') + self.assertTrue('\nName=Hello\n' in p) + self.assertTrue('\nName[de]=Hallo\n' in p) + self.assertTrue('\nComment[fr]=Bonjour\n' in p) def test_icons(self): '''data/icons/''' self._mksrc('data/icons/scalable/actions/press.png') self._mksrc('data/icons/48x48/apps/foo.png') - action_icon_path = os.path.join(self.src, 'data', 'icons', 'scalable', - 'actions') - os.symlink(os.path.join(action_icon_path, 'press.png'), - os.path.join(action_icon_path, 'crunch.png')) + scalable_icon_path = os.path.join(self.src, 'data', 'icons', 'scalable') + os.symlink(os.path.join(scalable_icon_path, 'actions', 'press.png'), + os.path.join(scalable_icon_path, 'actions', 'crunch.png')) + + # test broken symlink, too + os.mkdir(os.path.join(scalable_icon_path, 'mimetypes')) + os.symlink('../apps/foo.svg', + os.path.join(scalable_icon_path, 'mimetypes', 'text-x-foo.svg')) (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o) + self.assertFalse('following files are not recognized' in o) f = self.installed_files() - self.assert_('/usr/share/icons/hicolor/scalable/actions/press.png' in f) - self.assert_('/usr/share/icons/hicolor/scalable/actions/crunch.png' in f) - self.assert_('/usr/share/icons/hicolor/48x48/apps/foo.png' in f) - self.assert_(os.path.islink(os.path.join(self.install_tree, + self.assertTrue('/usr/share/icons/hicolor/scalable/actions/press.png' in f) + self.assertTrue('/usr/share/icons/hicolor/scalable/actions/crunch.png' in f) + self.assertTrue('/usr/share/icons/hicolor/48x48/apps/foo.png' in f) + self.assertTrue(os.path.islink(os.path.join(self.install_tree, 'usr/share/icons/hicolor/scalable/actions/crunch.png'))) + self.assertTrue(os.path.islink(os.path.join(self.install_tree, + 'usr/share/icons/hicolor/scalable/mimetypes/text-x-foo.svg'))) def test_data(self): '''Auxiliary files in data/''' @@ -343,20 +351,20 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o) + self.assertFalse('following files are not recognized' in o) f = self.installed_files() - self.assert_('/usr/share/foo/stuff' in f) - self.assert_('/usr/share/foo/stufflink' in f) - self.assert_(os.path.islink(os.path.join(self.install_tree, 'usr', + self.assertTrue('/usr/share/foo/stuff' in f) + self.assertTrue('/usr/share/foo/stufflink' in f) + self.assertTrue(os.path.islink(os.path.join(self.install_tree, 'usr', 'share', 'foo', 'stufflink'))) - self.assert_('/usr/share/foo/handlers/red.py' in f) - self.assert_('/usr/share/foo/handlers/blue.py' in f) - self.assert_('/lib/udev/rules.d/40-foo.rules' in f) - self.assert_('/etc/foo/blob1.conf' in f) - self.assert_('/etc/foo/blob2.conf' in f) - self.failIf('/usr/share/foo/blob1.conf' in f) - self.failIf('/usr/share/foo/40-foo.rules' in f) + self.assertTrue('/usr/share/foo/handlers/red.py' in f) + self.assertTrue('/usr/share/foo/handlers/blue.py' in f) + self.assertTrue('/lib/udev/rules.d/40-foo.rules' in f) + self.assertTrue('/etc/foo/blob1.conf' in f) + self.assertTrue('/etc/foo/blob2.conf' in f) + self.assertFalse('/usr/share/foo/blob1.conf' in f) + self.assertFalse('/usr/share/foo/40-foo.rules' in f) def test_scripts(self): '''scripts''' @@ -375,28 +383,28 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.assert_('following files are not recognized' in o) - self.assert_('\n foob' in o) - self.assert_('\n bin/whisper' in o) - self.assert_('\n daemon/food' in o) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n foob' in o) + self.assertTrue('\n bin/whisper' in o) + self.assertTrue('\n daemon/food' in o) f = self.installed_files() - self.assert_('/usr/bin/yell' in f) - self.assert_('/usr/bin/shout' in f) - self.assert_('/usr/bin/shoutlink' in f) - self.assert_(os.path.islink(os.path.join(self.install_tree, 'usr', + self.assertTrue('/usr/bin/yell' in f) + self.assertTrue('/usr/bin/shout' in f) + self.assertTrue('/usr/bin/shoutlink' in f) + self.assertTrue(os.path.islink(os.path.join(self.install_tree, 'usr', 'bin', 'shoutlink'))) - self.assert_('/usr/bin/foo' in f) + self.assertTrue('/usr/bin/foo' in f) ftext = '\n'.join(f) - self.failIf('food' in ftext) - self.failIf('foob' in ftext) - self.failIf('whisper' in ftext) + self.assertFalse('food' in ftext) + self.assertFalse('foob' in ftext) + self.assertFalse('whisper' in ftext) # verify that they are executable binpath = os.path.join(self.install_tree, 'usr', 'bin') - self.assert_(os.access(os.path.join(binpath, 'yell'), os.X_OK)) - self.assert_(os.access(os.path.join(binpath, 'shout'), os.X_OK)) - self.assert_(os.access(os.path.join(binpath, 'foo'), os.X_OK)) + self.assertTrue(os.access(os.path.join(binpath, 'yell'), os.X_OK)) + self.assertTrue(os.access(os.path.join(binpath, 'shout'), os.X_OK)) + self.assertTrue(os.access(os.path.join(binpath, 'foo'), os.X_OK)) def test_pot_manual(self): '''PO template creation with manual POTFILES.in''' @@ -413,20 +421,18 @@ self.assertEqual(e, '') self.assertEqual(s, 0) # POT file should not be shown as not recognized - self.failIf('\n po/foo.pot\n' in o) + self.assertFalse('\n po/foo.pot\n' in o) + + pot = self._src_contents('po/foo.pot') - pot_path = os.path.join(self.src, 'po', 'foo.pot') - self.assert_(os.path.exists(pot_path)) - pot = open(pot_path).read() - - self.failIf('msgid "no"' in pot) - self.assert_('msgid "yes1"' in pot) - self.assert_('msgid "yes2 %s"' in pot) - self.failIf('msgid "yes5"' in pot) # we didn't add helpers.py - self.assert_('msgid "yes7"' in pot) # we did include the desktop file - self.failIf('msgid "yes5"' in pot) # we didn't add helpers.py - self.assert_('msgid "yes11"' in pot) # we added one GTKBuilder file - self.failIf('msgid "yes12"' in pot) # ... but not the other + self.assertFalse('msgid "no"' in pot) + self.assertTrue('msgid "yes1"' in pot) + self.assertTrue('msgid "yes2 %s"' in pot) + self.assertFalse('msgid "yes5"' in pot) # we didn't add helpers.py + self.assertTrue('msgid "yes7"' in pot) # we did include the desktop file + self.assertFalse('msgid "yes5"' in pot) # we didn't add helpers.py + self.assertTrue('msgid "yes11"' in pot) # we added one GTKBuilder file + self.assertFalse('msgid "yes12"' in pot) # ... but not the other def test_pot_auto(self): '''PO template creation with automatic POTFILES.in''' @@ -437,19 +443,17 @@ self.assertEqual(e, '') self.assertEqual(s, 0) # POT file should not be shown as not recognized - self.failIf('\n po/foo.pot\n' in o) + self.assertFalse('\n po/foo.pot\n' in o) - pot_path = os.path.join(self.src, 'po', 'foo.pot') - self.assert_(os.path.exists(pot_path)) - pot = open(pot_path).read() + pot = self._src_contents('po/foo.pot') - self.failIf('msgid "no"' in pot) + self.assertFalse('msgid "no"' in pot) for i in range(2, 15): - self.assert_('msgid "yes%i' % i in pot or + self.assertTrue('msgid "yes%i' % i in pot or 'msgid ""\n"yes%i' % i in pot, 'yes%i' % i) # above loop would match yes11 to yes1 as well, so test it explicitly - self.assert_('msgid "yes1"' in pot) + self.assertTrue('msgid "yes1"' in pot) def test_pot_auto_explicit(self): '''PO template creation with automatic POTFILES.in and explicit scripts''' @@ -466,6 +470,9 @@ self._mksrc('setup.py', ''' from DistUtilsExtra.auto import setup +import warnings +warnings.filterwarnings('ignore', 'pipe2 set errno ENOSYS.*') + setup( name='foo', version='0.1', @@ -478,19 +485,17 @@ self.assertEqual(e, '') self.assertEqual(s, 0) # POT file should not be shown as not recognized - self.failIf('\n po/foo.pot\n' in o) + self.assertFalse('\n po/foo.pot\n' in o) - pot_path = os.path.join(self.src, 'po', 'foo.pot') - self.assert_(os.path.exists(pot_path)) - pot = open(pot_path).read() + pot = self._src_contents('po/foo.pot') - self.failIf('msgid "no"' in pot) + self.assertFalse('msgid "no"' in pot) for i in range(2, 18): - self.assert_('msgid "yes%i' % i in pot or + self.assertTrue('msgid "yes%i' % i in pot or 'msgid ""\n"yes%i' % i in pot, 'yes%i' % i) # above loop would match yes11 to yes1 as well, so test it explicitly - self.assert_('msgid "yes1"' in pot) + self.assertTrue('msgid "yes1"' in pot) def test_standard_files(self): '''Standard files (MANIFEST.in, COPYING, etc.)''' @@ -508,17 +513,17 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o, o) + self.assertFalse('following files are not recognized' in o, o) f = self.installed_files() - self.assert_('/usr/share/doc/foo/README.txt' in f) - self.assert_('/usr/share/doc/foo/NEWS' in f) + self.assertTrue('/usr/share/doc/foo/README.txt' in f) + self.assertTrue('/usr/share/doc/foo/NEWS' in f) ftext = '\n'.join(f) - self.failIf('MANIFEST' in ftext) - self.failIf('COPYING' in ftext) - self.failIf('COPYING' in ftext) - self.failIf('AUTHORS' in ftext) - self.failIf('TODO' in ftext) + self.assertFalse('MANIFEST' in ftext) + self.assertFalse('COPYING' in ftext) + self.assertFalse('COPYING' in ftext) + self.assertFalse('AUTHORS' in ftext) + self.assertFalse('TODO' in ftext) # sub-dir READMEs shouldn't be installed by default self.snapshot = None @@ -526,8 +531,8 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.assert_('following files are not recognized' in o) - self.assert_('\n extra/README\n' in o) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n extra/README\n' in o) def test_sdist(self): '''default MANIFEST''' @@ -547,19 +552,19 @@ self._mksrc(f) (o, e, s) = self.setup_py(['sdist', '-o']) - self.assert_("'MANIFEST.in' does not exist" in e) + self.assertTrue("'MANIFEST.in' does not exist" in e) self.assertEqual(s, 0) - manifest = open(os.path.join(self.src, 'MANIFEST')).read().splitlines() + manifest = self._src_contents('MANIFEST').splitlines() for f in good: - self.assert_(f in manifest, '%s in manifest' % f) + self.assertTrue(f in manifest, '%s in manifest' % f) for f in bad: - self.failIf(f in manifest, '%s not in manifest' % f) + self.assertFalse(f in manifest, '%s not in manifest' % f) os.unlink(os.path.join(self.src, 'MANIFEST')) - def test_gtkbuilder(self): - '''GtkBuilder *.ui''' + def test_ui(self): + '''GtkBuilder/Qt *.ui''' self._mksrc('gtk/test.ui', '''<?xml version="1.0"?> <interface> @@ -579,19 +584,28 @@ </object> </interface>''') + self._mksrc('kde/mainwindow.ui', '''<?xml version="1.0"?> +<ui version="4.0"> + <class>CrashDialog</class> + <widget class="QDialog" name="CrashDialog"> + </widget> +</ui> +''') + self._mksrc('someweird.ui') (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.assert_('following files are not recognized' in o) - self.assert_('\n someweird.ui\n' in o) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n someweird.ui\n' in o) f = self.installed_files() - self.assert_('/usr/share/foo/test.ui' in f) - self.assert_('/usr/share/foo/settings.ui' in f) + self.assertTrue('/usr/share/foo/test.ui' in f) + self.assertTrue('/usr/share/foo/settings.ui' in f) + self.assertTrue('/usr/share/foo/mainwindow.ui' in f) ftext = '\n'.join(f) - self.failIf('someweird' in ftext) + self.assertFalse('someweird' in ftext) def test_manpages(self): '''manpages''' @@ -604,16 +618,16 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.assert_('following files are not recognized' in o) - self.assert_('\n cruft/food.1\n' in o) - self.assert_('\n daemon/notme.s\n' in o) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n cruft/food.1\n' in o) + self.assertTrue('\n daemon/notme.s\n' in o) f = self.installed_files() - self.assert_('/usr/share/man/man1/foo.1' in f) - self.assert_('/usr/share/man/man8/food.8' in f) + self.assertTrue('/usr/share/man/man1/foo.1' in f) + self.assertTrue('/usr/share/man/man8/food.8' in f) ftext = '\n'.join(f) - self.failIf('food.1' in ftext) - self.failIf('notme' in ftext) + self.assertFalse('food.1' in ftext) + self.assertFalse('notme' in ftext) def test_etc(self): '''etc/*''' @@ -629,19 +643,19 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o, o) + self.assertFalse('following files are not recognized' in o, o) f = self.installed_files() - self.assert_('/etc/cron.daily/foo' in f) - self.assert_('/etc/cron.weekly/foo' in f) - self.assert_('/etc/init.d/foo' in f) - self.assert_('/etc/foo.conf' in f) + self.assertTrue('/etc/cron.daily/foo' in f) + self.assertTrue('/etc/cron.weekly/foo' in f) + self.assertTrue('/etc/init.d/foo' in f) + self.assertTrue('/etc/foo.conf' in f) # verify that init script is executable - self.assert_(os.access(os.path.join(self.install_tree, 'etc', 'init.d', + self.assertTrue(os.access(os.path.join(self.install_tree, 'etc', 'init.d', 'foo'), os.X_OK)) # verify that symlinks get preserved - self.assert_(os.path.islink(os.path.join(self.install_tree, 'etc', + self.assertTrue(os.path.islink(os.path.join(self.install_tree, 'etc', 'cron.weekly', 'foo'))) # check that we can install again into the same source tree @@ -649,7 +663,7 @@ '--root=' + self.install_tree]) self.assertEqual(e, '') self.assertEqual(s, 0) - self.failIf('following files are not recognized' in o, o) + self.assertFalse('following files are not recognized' in o, o) def test_requires_provides(self): '''automatic requires/provides''' @@ -657,20 +671,31 @@ try: __import__('pkg_resources') __import__('httplib2') + __import__('gi.repository.GLib') except ImportError: - self.fail('You need to have pkg_resources and httplib2 installed for this test suite to work') + self.fail('You need to have pkg_resources, httplib2, and gi.repository.GLib installed for this test suite to work') self._mksrc('foo/__init__.py', '') self._mksrc('foo/stuff.py', '''import xml.parsers.expat import os, os.path, email.mime, distutils.command.register from email import header as h import httplib2.iri2uri, unknown +from . bar import poke +from bar.poke import x +import grab_cli +import broken ''') self._mksrc('foo/bar/__init__.py', '') - self._mksrc('foo/bar/poke.py', 'def x(): pass') + self._mksrc('foo/bar/poke.py', 'from . import broken\ndef x(): pass') + self._mksrc('foo/bar/broken.py', 'raise RuntimeError("cannot initialize system")') self._mksrc('mymod.py', 'import foo\nfrom foo.bar.poke import x') + # trying to import this will cause setup.py to not process any args any more + self._mksrc('grab_cli.py', 'from optparse import OptionParser\nOptionParser().parse_args()') + # trying to import this will break setup.py + self._mksrc('broken.py', 'raise SystemError("cannot initialize system")') + self._mksrc('pygi.py', 'from gi.repository import GLib\nimport gi.repository.GObject') self._mksrc('bin/foo-cli', '''#!/usr/bin/python import sys @@ -687,33 +712,33 @@ self._mksrc('data/example-code/mymod/shiny.py', 'import example.othermod') (o, e, s) = self.do_install() - self.assertEqual(s, 0) + self.assertEqual(s, 0, e) self.assertEqual(e, 'ERROR: Python module unknown not found\n') - self.failIf('following files are not recognized' in o) + self.assertFalse('following files are not recognized' in o) inst = self.installed_files() - self.assert_('/usr/share/foo/example-code/template.py' in inst) - self.assert_('/usr/share/foo/example-code/mymod/shiny.py' in inst) + self.assertTrue('/usr/share/foo/example-code/template.py' in inst) + self.assertTrue('/usr/share/foo/example-code/mymod/shiny.py' in inst) for f in inst: if 'template.py' in f or 'shiny' in f: - self.failIf('packages' in f) + self.assertFalse('packages' in f) # parse .egg-info (o, e, s) = self.setup_py(['install_egg_info', '-d', self.install_tree]) self.assertEqual(e, 'ERROR: Python module unknown not found\n') - egg = open(os.path.join(self.install_tree, - 'foo-0.1.egg-info')).read().splitlines() - self.assert_('Name: foo' in egg) + egg = self._installed_contents('foo-0.1.egg-info').splitlines() + self.assertTrue('Name: foo' in egg) # check provides prov = [prop.split(' ', 1)[1] for prop in egg if prop.startswith('Provides: ')] - self.assertEqual(set(prov), set(['foo', 'mymod'])) + self.assertEqual(set(prov), set(['foo', 'mymod', 'broken', 'grab_cli', 'pygi'])) # check requires req = [prop.split(' ', 1)[1] for prop in egg if prop.startswith('Requires: ')] - self.assertEqual(set(req), set(['httplib2', 'pkg_resources'])) + self.assertEqual(set(req), set(['httplib2', 'pkg_resources', + 'gi.repository.GLib', 'gi.repository.GObject'])) - def test_help(self): + def test_help_docbook(self): '''Docbook XML help''' self._mksrc('help/C/myprogram-C.omf') @@ -731,19 +756,48 @@ (o, e, s) = self.do_install() self.assertEqual(e, '') self.assertEqual(s, 0) - self.assert_('following files are not recognized' in o) - self.assert_('\n help/weird.xml\n' in o) - self.assert_('\n help/notme.png\n' in o) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n help/weird.xml\n' in o) + self.assertTrue('\n help/notme.png\n' in o) + + f = self.installed_files() + self.assertTrue('/usr/share/omf/foo/myprogram-C.omf' in f) + self.assertTrue('/usr/share/omf/foo/myprogram-de.omf' in f) + self.assertTrue('/usr/share/gnome/help/foo/C/myprogram.xml' in f) + self.assertTrue('/usr/share/gnome/help/foo/C/legal.xml' in f) + self.assertTrue('/usr/share/gnome/help/foo/C/figures/mainscreen.png' in f) + self.assertTrue('/usr/share/gnome/help/foo/de/myprogram.xml' in f) + self.assertTrue('/usr/share/gnome/help/foo/de/legal.xml' in f) + self.assertTrue('/usr/share/gnome/help/foo/de/figures/mainscreen.png' in f) + + def test_help_mallard(self): + '''Mallard XML help''' + + self._mksrc('help/C/index.page') + self._mksrc('help/C/legal.page') + self._mksrc('help/C/figures/mainscreen.png') + self._mksrc('help/de/index.page') + self._mksrc('help/de/legal.page') + self._mksrc('help/de/figures/mainscreen.png') + + self._mksrc('help/weird.page') + self._mksrc('help/notme.png') + + (o, e, s) = self.do_install() + self.assertEqual(e, '') + self.assertEqual(s, 0) + self.assertTrue('following files are not recognized' in o) + self.assertTrue('\n help/weird.page\n' in o) + self.assertTrue('\n help/notme.png\n' in o) f = self.installed_files() - self.assert_('/usr/share/omf/foo/myprogram-C.omf' in f) - self.assert_('/usr/share/omf/foo/myprogram-de.omf' in f) - self.assert_('/usr/share/gnome/help/foo/C/myprogram.xml' in f) - self.assert_('/usr/share/gnome/help/foo/C/legal.xml' in f) - self.assert_('/usr/share/gnome/help/foo/C/figures/mainscreen.png' in f) - self.assert_('/usr/share/gnome/help/foo/de/myprogram.xml' in f) - self.assert_('/usr/share/gnome/help/foo/de/legal.xml' in f) - self.assert_('/usr/share/gnome/help/foo/de/figures/mainscreen.png' in f) + self.assertFalse('/usr/share/omf/foo' in f) + self.assertTrue('/usr/share/gnome/help/foo/C/index.page' in f) + self.assertTrue('/usr/share/gnome/help/foo/C/legal.page' in f) + self.assertTrue('/usr/share/gnome/help/foo/C/figures/mainscreen.png' in f) + self.assertTrue('/usr/share/gnome/help/foo/de/index.page' in f) + self.assertTrue('/usr/share/gnome/help/foo/de/legal.page' in f) + self.assertTrue('/usr/share/gnome/help/foo/de/figures/mainscreen.png' in f) # # helper methods @@ -773,12 +827,6 @@ err = err.decode() os.chdir(oldcwd) - # python3 distutils bug workaround, filter out bogus errors - bogus_re = re.compile('^file .* $for module .*$ not found$') - err = '\n'.join([l for l in err.splitlines() if not bogus_re.match(l)]) - if err: - err += '\n' - return (out, err, s.returncode) def do_install(self): @@ -828,7 +876,7 @@ assert self.snapshot is None, 'snapshot already taken' self.snapshot = tempfile.mkdtemp() - shutil.copytree(self.src, os.path.join(self.snapshot, 's')) + shutil.copytree(self.src, os.path.join(self.snapshot, 's'), symlinks=True) def diff_snapshot(self): '''Compare source tree to snapshot. @@ -836,11 +884,11 @@ Return diff -Nur output. ''' assert self.snapshot, 'no snapshot taken' - diff = subprocess.Popen(['diff', '-x', 'foo.pot', '-Nur', os.path.join(self.snapshot, 's'), - self.src], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + diff = subprocess.Popen(['diff', '-x', 'foo.pot', '-x', '*.pyc', + '-Nur', os.path.join(self.snapshot, 's'), self.src], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = diff.communicate() - out = out.decode() - self.assertEqual(err, b'', 'diff error messages') + out = out.decode('UTF-8') return out def _mkpo(self): @@ -933,4 +981,16 @@ self._mksrc('daemon/foobarize', '#!/usr/bin/flex\np _("no8")', executable=True) + def _src_contents(self, path): + f = open(os.path.join(self.src, path)) + contents = f.read() + f.close() + return contents + + def _installed_contents(self, path): + f = open(os.path.join(self.install_tree, path)) + contents = f.read() + f.close() + return contents + unittest.main() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-blinker for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package python-blinker for openSUSE:Factory checked in at 2012-03-20 11:31:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-blinker (Old) and /work/SRC/openSUSE:Factory/.python-blinker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-blinker", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.python-blinker.new/python-blinker.changes 2012-03-20 11:31:53.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Sep 23 12:39:41 UTC 2011 - saschpe(a)suse.de + +- Initial version + New: ---- blinker-1.1.zip python-blinker.changes python-blinker.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-blinker.spec ++++++ # # spec file for package python-blinker # # Copyright (c) 2011 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-blinker Version: 1.1 Release: 0 Url: http://discorporate.us/projects/Blinker/ Summary: Fast, simple object-to-object and broadcast signaling License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/b/blinker/blinker-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-nose BuildRequires: unzip %if 0%{?suse_version} %py_requires %if 0%{?suse_version} > 1110 BuildArch: noarch %endif %endif %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description Blinker provides a fast dispatching system that allows any number of interested parties to subscribe to events, or "signals". Signal receivers can subscribe to specific senders or receive signals sent by any sender. %prep %setup -q -n blinker-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check nosetests %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE README docs/html %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit podofo for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package podofo for openSUSE:Factory checked in at 2012-03-20 11:31:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/podofo (Old) and /work/SRC/openSUSE:Factory/.podofo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "podofo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/podofo/podofo.changes 2011-11-29 16:24:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.podofo.new/podofo.changes 2012-03-20 11:31:42.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Mar 17 14:11:54 UTC 2012 - dimstar(a)opensuse.org + +- Change lua-devel BuildRequires to lua51-devel on openSUSE > 12.1: + the code is not ready to work with lua 5.2. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ podofo.spec ++++++ --- /var/tmp/diff_new_pack.VOU4NA/_old 2012-03-20 11:31:43.000000000 +0100 +++ /var/tmp/diff_new_pack.VOU4NA/_new 2012-03-20 11:31:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package podofo # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,11 @@ Name: podofo Version: 0.9.1 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Tools to work with PDF files -Url: http://podofo.sourceforge.net/ +License: GPL-2.0+ Group: Productivity/Publishing/PDF +Url: http://podofo.sourceforge.net/ # http://downloads.sourceforge.net/podofo/podofo-0.9.1.tar.gz Source0: %{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE podofobox.1_fix.patch asterios.dramis(a)gmail.com -- Fix "manual-page-warning" rpmlint warning @@ -36,7 +36,11 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +%if 0%{?suse_version} > 1210 +BuildRequires: lua51-devel +%else BuildRequires: lua-devel +%endif BuildRequires: openssl-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,16 +50,16 @@ %package -n libpodofo%{libver} -License: LGPL-2.1+ Summary: PDF parsing and creation library +License: LGPL-2.1+ Group: System/Libraries %description -n libpodofo%{libver} A cross platform PDF parsing and creation library. %package -n libpodofo-devel -License: LGPL-2.1+ Summary: Development files for podofo +License: LGPL-2.1+ Group: Development/Libraries/Other Requires: libpodofo%{libver} = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Bootloader for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2012-03-20 11:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2012-03-06 13:40:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2012-03-20 11:31:29.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 9 08:40:15 UTC 2012 - mchang(a)suse.com + +- grub2-skip-fs-probe-for-extended-partition.patch (bnc#750897) + +------------------------------------------------------------------- New: ---- grub2-skip-fs-probe-for-extended-partition.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.RCtyEc/_old 2012-03-20 11:31:31.000000000 +0100 +++ /var/tmp/diff_new_pack.RCtyEc/_new 2012-03-20 11:31:31.000000000 +0100 @@ -29,6 +29,7 @@ Source1: update-bootloader Source2: bootloader_entry Source3: boot.readme +Patch: grub2-skip-fs-probe-for-extended-partition.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl Conflicts: multipath-tools < 0.4.8-40.25.1 @@ -48,6 +49,7 @@ %prep %setup -q +%patch -p1 rm -rf perl-Bootloader-testsuite mkdir -p lib mv src lib/Bootloader ++++++ grub2-skip-fs-probe-for-extended-partition.patch ++++++ Index: perl-Bootloader-0.6.0/src/Core/GRUB2.pm =================================================================== --- perl-Bootloader-0.6.0.orig/src/Core/GRUB2.pm +++ perl-Bootloader-0.6.0/src/Core/GRUB2.pm @@ -655,6 +655,7 @@ Returns undef on fail, defined nonzero v # boolean InitializeBootloader () sub InitializeBootloader { my $self = shift; + my %glob = %{$self->{"global"}}; my $file = Bootloader::Path::Grub2_installdevice(); my $files_ref = $self->ReadFiles ([$file,]); @@ -663,6 +664,13 @@ sub InitializeBootloader { return undef; } + my $install_opts = "--force"; + my $skip_fs_probe = delete $glob{"boot_extended"}; + + if (defined $skip_fs_probe and $skip_fs_probe eq "true") { + $install_opts .= " --skip-fs-probe "; + } + my @devices = @{$files_ref->{$file} || []}; # Hmm .. grub2-install must has been run before @@ -679,7 +687,7 @@ sub InitializeBootloader { # the tradeoff is we can't capture errors # only patch grub2 package is possible way # to get around this problem - "/usr/sbin/grub2-install --force $dev", + "/usr/sbin/grub2-install $install_opts $dev", "/var/log/YaST2/y2log_bootloader" ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit package-translations for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package package-translations for openSUSE:Factory checked in at 2012-03-20 11:31:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/package-translations (Old) and /work/SRC/openSUSE:Factory/.package-translations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "package-translations", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/package-translations/package-translations.changes 2012-03-16 13:20:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.package-translations.new/package-translations.changes 2012-03-20 11:31:20.000000000 +0100 @@ -2 +2 @@ -Wed Mar 14 16:13:31 CET 2012 - <coolo(a)suse.com> +Fri Mar 16 16:13:30 CET 2012 - <coolo(a)suse.com> @@ -4 +4 @@ -- automated update on 2012-03-14 +- automated update on 2012-03-16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-translations.tar.bz2 ++++++ Files old/mo/package-translations-ru.mo and new/mo/package-translations-ru.mo differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openttd-openmsx for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package openttd-openmsx for openSUSE:Factory checked in at 2012-03-20 11:31:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openttd-openmsx (Old) and /work/SRC/openSUSE:Factory/.openttd-openmsx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openttd-openmsx", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.openttd-openmsx.new/openttd-openmsx.changes 2012-03-20 11:31:14.000000000 +0100 @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Mon Mar 19 22:01:55 UTC 2012 - suse(a)ammler.ch + +- change timidity from requires to recommends (bnc#752669) + +------------------------------------------------------------------- +Fri Mar 16 12:12:48 UTC 2012 - suse(a)ammler.ch + +- new install location for basesets + +------------------------------------------------------------------- +Thu Mar 15 10:27:36 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-2.0 + SPDX format + +------------------------------------------------------------------- +Sun Oct 31 17:36:59 UTC 2010 - ammler(a)openttdcoop.org + +- rename to openttd-openmsx to make it compliment to other distros + +------------------------------------------------------------------- +Tue Aug 10 15:33:56 UTC 2010 - ammler(a)openttdcoop.org + +- upstream update 0.3.1 + +------------------------------------------------------------------- +Thu Jul 15 20:27:58 UTC 2010 - ammler(a)openttdcoop.org + +- upstream update 0.3.0 + first complete set + +------------------------------------------------------------------- +Thu Apr 1 10:15:28 UTC 2010 - Marcel Gmür <ammler(a)openttdcoop.org> + +- upstream update 0.2.1 + +------------------------------------------------------------------- +Sun Mar 14 14:25:10 UTC 2010 - Marcel Gmür <ammler(a)openttdcoop.org> + +- Upstream update 0.2.0 + +------------------------------------------------------------------- +Sat Feb 27 13:22:16 UTC 2010 - ammler(a)openttdcoop.org + +- requires timidity + +------------------------------------------------------------------- +Sat Feb 27 01:47:28 UTC 2010 - ammler(a)openttdcoop.org + +- initial release 0.1.0 New: ---- openmsx-0.3.1-source.tar.gz openttd-openmsx.changes openttd-openmsx.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openttd-openmsx.spec ++++++ # # spec file for package openttd-openmsx # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: openttd-openmsx Version: 0.3.1 Release: 1%{?dist} Summary: An OpenTTD Music set License: GPL-2.0 Group: Amusements/Games/Strategy/Other Url: http://dev.openttdcoop.org/projects/openmsx Source0: http://bundles.openttdcoop.org/openmsx/releases/%{version}/openmsx-%{versio… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: python Requires: openttd-data >= 1.2 %if 0%{?suse_version} || 0%{?mdkversion} Recommends: timidity %endif %description OpenMSX is an open source replacement for the original Transport Tycoon Deluxe (TTD) music. All contributions are licensed under the GPL v2. %prep %setup -qn openmsx-%{version}-source %build make %{?_smp_mflags} _V= %install %define omsxdir %{_datadir}/openttd/baseset make install INSTALL_DIR=%{buildroot}%{omsxdir} _V= #openmsx adds a versioned dir to the install dir %define omsxdir %{_datadir}/openttd/baseset/openmsx-%{version} %files %defattr(-,root,root,-) %dir %{_datadir}/openttd %dir %{_datadir}/openttd/baseset %dir %{omsxdir} %doc %{omsxdir}/changelog.txt %doc %{omsxdir}/license.txt %doc %{omsxdir}/readme.txt %{omsxdir}/openmsx.obm %{omsxdir}/*.mid %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenLP for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package OpenLP for openSUSE:Factory checked in at 2012-03-20 11:30:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenLP (Old) and /work/SRC/openSUSE:Factory/.OpenLP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenLP", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/OpenLP/OpenLP.changes 2012-03-12 20:15:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.OpenLP.new/OpenLP.changes 2012-03-20 11:30:58.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 19 03:44:31 UTC 2012 - jdmulloy(a)gmail.com + +- Added python-xdg as a dependency so that data files are always + stored in ~/.local/share/openlp + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenLP.spec ++++++ --- /var/tmp/diff_new_pack.e1hwT8/_old 2012-03-20 11:31:00.000000000 +0100 +++ /var/tmp/diff_new_pack.e1hwT8/_new 2012-03-20 11:31:00.000000000 +0100 @@ -47,6 +47,7 @@ Requires: python-pyenchant Requires: python-qt4 Requires: python-sqlalchemy-migrate +Requires: python-xdg Recommends: libreoffice-pyuno BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): shared-mime-info -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit obs-service-tar_scm for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package obs-service-tar_scm for openSUSE:Factory checked in at 2012-03-20 11:30:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old) and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-tar_scm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes 2012-03-01 17:21:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes 2012-03-20 11:30:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 19 13:39:28 GMT 2012 - aspiers(a)suse.com + +- Check that git pull succeeds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar_scm ++++++ --- /var/tmp/diff_new_pack.NB2dWO/_old 2012-03-20 11:30:45.000000000 +0100 +++ /var/tmp/diff_new_pack.NB2dWO/_new 2012-03-20 11:30:45.000000000 +0100 @@ -327,7 +327,7 @@ if git branch | grep -q '^\* (no branch)$'; then echo "$MYREVISION does not refer to a branch, not attempting git pull" else - git pull + safe_run git pull fi ;; svn|bzr) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nxtvepg for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package nxtvepg for openSUSE:Factory checked in at 2012-03-20 11:30:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nxtvepg (Old) and /work/SRC/openSUSE:Factory/.nxtvepg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nxtvepg", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nxtvepg/nxtvepg.changes 2011-09-23 02:14:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nxtvepg.new/nxtvepg.changes 2012-03-20 11:30:40.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 10:42:15 UTC 2012 - toganm(a)opensuse.org + +- add %dir /usr/share/X11/app-defaults to fix factory build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nxtvepg.spec ++++++ --- /var/tmp/diff_new_pack.y9NjRo/_old 2012-03-20 11:30:41.000000000 +0100 +++ /var/tmp/diff_new_pack.y9NjRo/_new 2012-03-20 11:30:41.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package nxtvepg (Version 2.8.1) +# spec file for package nxtvepg # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: nxtvepg -BuildRequires: tk-devel xorg-x11-devel +BuildRequires: tk-devel +BuildRequires: xorg-x11-devel Url: http://nxtvepg.sourceforge.net/ -License: GPL-2.0+ -Group: Hardware/TV -AutoReqProv: on Version: 2.8.1 -Release: 1 +Release: 0 Summary: Nextview EPG Decoder and Browser +License: GPL-2.0+ +Group: Hardware/TV Source0: %{name}-%{version}.tar.bz2 Source1: rc.nxtvepg Patch1: nxtvepg-Makefile.patch @@ -88,6 +86,7 @@ /usr/bin/nxtvepg /usr/share/nxtvepg /usr/share/man/man1/nxtvepg.1* +%dir /usr/share/X11/app-defaults %{_datadir}/X11/app-defaults/Nxtvepg %doc CHANGES COPYRIGHT TODO README manual.html -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package MozillaFirefox-branding-openSUSE for openSUSE:Factory checked in at 2012-03-20 11:30:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox-branding-openSUSE", Maintainer is "maw(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2011-12-25 17:37:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox-branding-openSUSE.new/MozillaFirefox-branding-openSUSE.changes 2012-03-20 11:30:39.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Mar 15 08:18:11 UTC 2012 - wr(a)rosenauer.org + +- bumped version to 6.0 +- support firefox-esr RPM packages +- removed MozillaFirefox build dependency and PreReq + * everything controlled by Supplements and Requirements from + base package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.euFjY4/_old 2012-03-20 11:30:40.000000000 +0100 +++ /var/tmp/diff_new_pack.euFjY4/_new 2012-03-20 11:30:40.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package MozillaFirefox-branding-openSUSE # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2008-2011 Wolfgang Rosenauer +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008-2012 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,11 +18,15 @@ Name: MozillaFirefox-branding-openSUSE -Version: 5.0 +BuildRequires: bc +BuildRequires: unzip +BuildRequires: zip +Version: 6.0 Release: 0 Summary: openSUSE branding of MozillaFirefox -License: BSD-3-Clause ; GPL-v2.0+ +License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Networking/Web/Browsers +Url: http://www.opensuse.org/ Source: susefox-20111108.tar.bz2 Source1: opensuse-software.xml.in Source2: bookmarks.html.suse @@ -31,23 +35,20 @@ Source5: distribution.ini.in Source6: %{name}-COPYING Source7: all-openSUSE.js -BuildRequires: bc -BuildRequires: unzip -BuildRequires: zip -PreReq: MozillaFirefox >= 4.99 Supplements: packageand(MozillaFirefox:branding-openSUSE) +Supplements: packageand(firefox-esr:branding-openSUSE) Provides: MozillaFirefox-branding = %{version} +Provides: firefox-esr-branding = %{version} Conflicts: otherproviders(MozillaFirefox-branding) +Conflicts: otherproviders(firefox-esr-branding) BuildRoot: %{_tmppath}/%{name}-%{version}-build %define progdir %{_libdir}/firefox %define libgssapi libgssapi_krb5.so.2 %define suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null) # HINT: default homepage is a property now included in susefox -#%define gconf_confdir %{_sysconfdir}/gconf -#%gconf_schemas_prereq %description -This package provides openSUSE Look and Feel for MozillaFirefox. +This package provides openSUSE Look and Feel for Firefox. %prep cp -a %{SOURCE6} COPYING @@ -78,11 +79,6 @@ install -d $RPM_BUILD_ROOT%{progdir}/searchplugins sed -e 's,%VERSION%,%{suseversion},g' \ %{SOURCE1} > $RPM_BUILD_ROOT%{progdir}/searchplugins/opensuse-software.xml -# SCHEMA file -#mkdir -p $RPM_BUILD_ROOT%{gconf_confdir}/schemas -#install -m 644 %{SOURCE4} \ -# $RPM_BUILD_ROOT%{gconf_confdir}/schemas/ -#%%find_gconf_schemas # install the system extension mkdir susefox\(a)opensuse.org (cd susefox\(a)opensuse.org; unzip ../susefox.xpi) @@ -93,24 +89,18 @@ %clean rm -rf $RPM_BUILD_ROOT -#%pre -f %{name}.schemas_pre - -#%preun -f %{name}.schemas_preun - -#%posttrans -f %{name}.schemas_posttrans - -#%files -f %{name}.schemas_list - %files %defattr(-,root,root) %doc COPYING.susefox %doc ../COPYING +%dir %{progdir} +%dir %{progdir}/defaults/ %dir %{progdir}/defaults/pref %{progdir}/defaults/pref/all-openSUSE.js %{progdir}/defaults/pref/firefox-openSUSE.js %dir %{progdir}/defaults/profile/ %{progdir}/defaults/profile/bookmarks.html -%{progdir}/searchplugins/* +%{progdir}/searchplugins/ %{progdir}/distribution %{_datadir}/mozilla -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkinitrd for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2012-03-20 11:30:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkinitrd", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2012-02-24 06:53:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-03-20 11:30:37.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 13:32:58 UTC 2012 - rubin(a)raaftech.nl + +- Copy ifcfg settings regardless of nettype value (bnc#724775). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes new/mkinitrd-2.7.0/mkinitrd.changes --- old/mkinitrd-2.7.0/mkinitrd.changes 2012-02-23 16:32:27.000000000 +0100 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-03-14 14:50:06.000000000 +0100 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 14 13:32:58 UTC 2012 - rubin(a)raaftech.nl + +- Copy ifcfg settings regardless of nettype value (bnc#724775). + +------------------------------------------------------------------- Thu Feb 23 15:31:57 UTC 2012 - rjschwei(a)suse.com - support binaries in /usr tree. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh new/mkinitrd-2.7.0/scripts/setup-network.sh --- old/mkinitrd-2.7.0/scripts/setup-network.sh 2012-02-23 16:32:27.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2012-03-14 14:50:06.000000000 +0100 @@ -266,9 +266,9 @@ done # Copy ifcfg settings +mkdir -p $tmp_mnt/etc/sysconfig +cp -rp /etc/sysconfig/network $tmp_mnt/etc/sysconfig if [ "$nettype" = "ifup" ] ; then - mkdir -p $tmp_mnt/etc/sysconfig - cp -rp /etc/sysconfig/network $tmp_mnt/etc/sysconfig for i in /etc/sysconfig/network/ifcfg-*; do interface=${i##*/ifcfg-} if [ -d /sys/class/net/$interface/device ] ; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mgdiff for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package mgdiff for openSUSE:Factory checked in at 2012-03-20 11:29:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mgdiff (Old) and /work/SRC/openSUSE:Factory/.mgdiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mgdiff", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mgdiff/mgdiff.changes 2011-09-23 02:13:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mgdiff.new/mgdiff.changes 2012-03-20 11:30:36.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 10:26:06 UTC 2012 - toganm(a)opensuse.org + +- add %dir /usr/share/X11/app-defaults to fix factory build. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mgdiff.spec ++++++ --- /var/tmp/diff_new_pack.tfrDcw/_old 2012-03-20 11:30:37.000000000 +0100 +++ /var/tmp/diff_new_pack.tfrDcw/_new 2012-03-20 11:30:37.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package mgdiff (Version 1.0.1) +# spec file for package mgdiff # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: mgdiff -BuildRequires: openmotif openmotif-devel update-desktop-files -License: MIT -Group: Productivity/Text/Utilities -AutoReqProv: on +BuildRequires: openmotif +BuildRequires: openmotif-devel +BuildRequires: update-desktop-files Version: 1.0.1 -Release: 195 +Release: 0 Summary: Compare Files Side by Side +License: MIT +Group: Productivity/Text/Utilities BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: mgdiff-1.0.tar.bz2 Source1: mgdiff.desktop @@ -86,6 +85,7 @@ /usr/share/applications/*.desktop %{_bindir}/*diff %dir %{_x11data}/mgdiff +%dir %{_x11data}/app-defaults %{_x11data}/mgdiff/rmgdiff* %config %{_appdefdir}/Mgdiff %doc %{_mandir}/man1/*.1x.gz -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa-demo for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package Mesa-demo for openSUSE:Factory checked in at 2012-03-20 11:29:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa-demo (Old) and /work/SRC/openSUSE:Factory/.Mesa-demo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa-demo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa-demo/Mesa-demo.changes 2012-02-17 12:06:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Mesa-demo.new/Mesa-demo.changes 2012-03-20 11:30:35.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 15 16:47:21 UTC 2012 - sndirsch(a)suse.com + +- added "-x" subpackage for most common GLX-based demos like + glxgears, glxinfo, pbinfo (bnc #748373) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa-demo.spec ++++++ --- /var/tmp/diff_new_pack.8jbvVm/_old 2012-03-20 11:30:36.000000000 +0100 +++ /var/tmp/diff_new_pack.8jbvVm/_new 2012-03-20 11:30:36.000000000 +0100 @@ -58,6 +58,12 @@ * OpenGL is a trademark of Silicon Graphics Incorporated. +%package x +Summary: GLX-based demos + +%description x +This package contains some common GLX-based demos. + %prep %setup -qn mesa-demos-%{version} -b0 %patch0 -p0 @@ -73,9 +79,25 @@ find %{buildroot}%{_libdir}/mesa-demos -depth -type d -exec rmdir --ignore-fail-on-non-empty \{\} \; find %{buildroot}%{_libdir}/mesa-demos -name \*.py -exec chmod 755 \{\} \; chmod -R go=rX %{buildroot}/usr +mkdir -p %{buildroot}/%_bindir +ln -s %{_libdir}/mesa-demos/xdemos/glxgears %{buildroot}/%_bindir/glxgears +ln -s %{_libdir}/mesa-demos/xdemos/glxinfo %{buildroot}/%_bindir/glxinfo +ln -s %{_libdir}/mesa-demos/xdemos/pbinfo %{buildroot}/%_bindir/pbinfo %files %defattr(-,root,root) %{_libdir}/mesa-demos +%exclude %{_libdir}/mesa-demos/xdemos/glxgears +%exclude %{_libdir}/mesa-demos/xdemos/glxinfo +%exclude %{_libdir}/mesa-demos/xdemos/pbinfo + +%files x +%defattr(-,root,root) +%{_libdir}/mesa-demos/xdemos/glxgears +%{_libdir}/mesa-demos/xdemos/glxinfo +%{_libdir}/mesa-demos/xdemos/pbinfo +%_bindir/glxgears +%_bindir/glxinfo +%_bindir/pbinfo %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit memtest86+ for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package memtest86+ for openSUSE:Factory checked in at 2012-03-20 11:29:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/memtest86+ (Old) and /work/SRC/openSUSE:Factory/.memtest86+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "memtest86+", Maintainer is "duwe(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/memtest86+/memtest86+.changes 2011-09-23 02:12:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.memtest86+.new/memtest86+.changes 2012-03-20 11:30:32.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 14:19:45 UTC 2012 - lars(a)samba.org + +- PreReq perl to avoid update-bootloader to abort while install; (bnc#730022). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ memtest86+.spec ++++++ --- /var/tmp/diff_new_pack.3dTKOX/_old 2012-03-20 11:30:34.000000000 +0100 +++ /var/tmp/diff_new_pack.3dTKOX/_new 2012-03-20 11:30:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package memtest86+ # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,17 @@ # - Name: memtest86+ Version: 4.20 -Release: 1 +Release: 0 # -License: BSD-3-Clause -Group: System/Boot # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cdrkit-cdrtools-compat %ifarch x86_64 BuildRequires: glibc-devel-32bit %endif +PreReq: perl ExclusiveArch: %ix86 x86_64 Provides: lilo:/boot/memtest.bin Obsoletes: memtest86 <= 3.2 @@ -38,6 +36,8 @@ Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.bz2 Patch0: fix-destdir Summary: Memory Testing Image for x86 Architecture +License: BSD-3-Clause +Group: System/Boot %description Memtest86 is an image that can be booted instead of a real OS. Once -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lyx for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package lyx for openSUSE:Factory checked in at 2012-03-20 11:29:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lyx (Old) and /work/SRC/openSUSE:Factory/.lyx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lyx", Maintainer is "bg(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lyx/lyx.changes 2012-02-29 14:08:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lyx.new/lyx.changes 2012-03-20 11:30:28.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 14:50:22 UTC 2012 - cornelis(a)solcon.nl + +- Correct the license: lyx is GPL-2.0 and later, not LGPL-2.1 and later +- Fix some rpmlint warnings + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lyx.spec ++++++ --- /var/tmp/diff_new_pack.0bNVoc/_old 2012-03-20 11:30:31.000000000 +0100 +++ /var/tmp/diff_new_pack.0bNVoc/_new 2012-03-20 11:30:31.000000000 +0100 @@ -28,7 +28,7 @@ Version: 2.0.3 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor -License: LGPL-2.1+ +License: GPL-2.0+ Group: Productivity/Publishing/TeX/Frontends Url: http://www.lyx.org/ Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-%{version}.tar.gz @@ -42,7 +42,8 @@ Requires: ImageMagick Requires: texlive-latex -Recommends: texlive-xetex xindy +Recommends: texlive-xetex +Recommends: xindy %description LyX is a document processor that encourages an approach to writing @@ -79,6 +80,11 @@ # some defaults install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.dist +# Add executable to files with shebang as advised by rpmlint +chmod +x $RPM_BUILD_ROOT%{_datadir}/lyx/scripts/*.py +chmod +x $RPM_BUILD_ROOT%{_datadir}/lyx/scripts/listerrors +chmod +x $RPM_BUILD_ROOT%{_datadir}/lyx/lyx2lyx/profiling.py + mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} pushd $RPM_BUILD_ROOT%{_datadir}/lyx/doc/ for i in * -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lsyncd for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package lsyncd for openSUSE:Factory checked in at 2012-03-20 11:29:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lsyncd (Old) and /work/SRC/openSUSE:Factory/.lsyncd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lsyncd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lsyncd/lsyncd.changes 2011-09-23 02:12:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lsyncd.new/lsyncd.changes 2012-03-20 11:30:26.000000000 +0100 @@ -1,0 +2,34 @@ +Sun Feb 26 16:02:41 CET 2012 - dmueller(a)suse.de + +- fix build in factory (build against lua 5.1) + +------------------------------------------------------------------- +Mon Nov 28 09:58:02 UTC 2011 - eugene.istomin(a)edss.ee +- update to 2.0.5 + * fix: Lsyncd will now terminate if it inotify watching exceeds + its preset limit. + * fix: rsync error exit code 12 now results in retries. + * fix: Lsyncd 2.0.5 should now compile better on a bit elder + GNU/Linux versions. + * fix: examples are now installed in the configured document directory. + * fix: partial transfers during startup are considered ok. Lsyncd + will rework the specified files anyway. + * change: Layer 1 interface init() now receives an "Init" event + instead of an inlet. + * change: builtin Lua code is now loaded via a c-array.Now more + portable and correct memory flags are set. + * change: Lsyncd will now bail on unknown error codes. + * enhancement: settings.maxProcesses can now be set as a global limit of childprocesses + * enhancement: Lsyncd will refuse to start when any startup rsync + does not work cleanly and returns "again" unless settings.insist or + --insist is specified, then Lsyncd will keep retrying until it works. + * enhancement: option "rsyncBinary" determines which rsync Lsyncd calls. + Default is "/usr/bin/rsync" + * enhancement: fsevents ("inotify for OSX") fixed for Snowleopard. + and is available to configure by default. + * enhancement: settings.inotifyMode: the actualy Modification event + Lsyncd reacts to can now be configured. Default is to react on + file closing in write mode. + * enhancement: readdir(path) is available to userscripts, reads the contents + of a directory. +------------------------------------------------------------------- Old: ---- lsyncd-2.0.4.tar.bz2 New: ---- lsyncd-2.0.5.tar.gz lsyncd-init.d lsyncd.conf rsync_sudo.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsyncd.spec ++++++ --- /var/tmp/diff_new_pack.d0tY44/_old 2012-03-20 11:30:28.000000000 +0100 +++ /var/tmp/diff_new_pack.d0tY44/_new 2012-03-20 11:30:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lsyncd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: lsyncd -Version: 2.0.4 -Release: 1 -License: GPL-2.0 -Group: Productivity/Networking/Other +Version: 2.0.5 +Release: 0 Url: http://code.google.com/p/lsyncd/ -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.gz +Source1: %{name}-init.d +Source2: %{name}.conf +Source3: rsync_sudo.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -#BuildRequires: pkgconfig(lua) >= 5.1 +%if 0%{?suse_version} > 1210 +BuildRequires: lua51-devel +%else BuildRequires: lua-devel >= 5.1 +%endif Requires: rsync Summary: Live Syncing (Mirror) Daemon +License: GPL-2.0 +Group: Productivity/Networking/Other %description Lsyncd (Live Syncing (Mirror) Daemon) uses rsync to synchronize local directories with a remote machine running rsyncd. It watches multiple directory trees through inotify. The first step after adding the watches is to rsync all directories with the remote host, and then the software synchronizes single files by collecting the inotify events. lsyncd is a lightweight live mirror solution that should be easy to install and use while blending well with your system. @@ -51,8 +54,11 @@ %install %makeinstall %{__mkdir_p} %{buildroot}%{_docdir}/%{name} -mv %{buildroot}%{_datadir}/doc/%{name}/* %{buildroot}%{_docdir}/%{name} -rm -rf %{buildroot}%{_datadir}/doc/%{name} +%{__mkdir_p} %{buildroot}%{_sysconfdir}/%{name} +%{__mkdir_p} %{buildroot}%{_localstatedir}/log/lsyncd +%__install -Dm 755 %{S:1} %{buildroot}%{_initrddir}/lsyncd +%__install -Dm 755 %{S:2} %{buildroot}%{_sysconfdir}/lsyncd/lsyncd.conf +%__install -Dm 755 %{S:3} %{buildroot}%{_sysconfdir}/lsyncd/rsync_sudo.sh %clean test "%{buildroot}" != "/" && %__rm -rf %{buildroot} @@ -62,5 +68,10 @@ %doc ChangeLog COPYING %{_bindir}/lsyncd %{_mandir}/man1/lsyncd.1.gz +%{_initrddir}/lsyncd +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/lsyncd.conf +%config(noreplace) %{_sysconfdir}/%{name}/rsync_sudo.sh +%dir %{_localstatedir}/log/%{name} %changelog ++++++ lsyncd-init.d ++++++ #!/bin/bash # ### BEGIN INIT INFO # Provides:lsyncd # Required-Start: # Required-Stop: # Default-Start:3 5 # Default-Stop:0 1 2 6 # Short-Description:Start lsyncd # Description:Lsyncd uses rsync to synchronize local directories with a remote machine running rsyncd. ### END INIT INFO config="/etc/lsyncd/lsyncd.conf" lsyncd="/usr/bin/lsyncd" prog="lsyncd" . /etc/rc.status rc_reset case "$1" in start) echo -n "Starting $prog: " $lsyncd -log Exec $config rc_status -v ;; stop) echo -n "Shutting down $prog: " /bin/kill -9 `/sbin/pidof lsyncd` until [ -z $(/sbin/pidof lsyncd) ]; do :; done rc_status -v ;; restart) $0 stop $0 start rc_status ;; status) echo -n "$prog status:" rc_status -v ;; *) echo "Usage: $0 {start|stop|restart|status}" exit 1 ;; esac rc_exit ++++++ lsyncd.conf ++++++ settings = { statusFile = "/var/log/lsyncd/lsyncd.status", nodaemon = false, statusInterval = 5, maxDelays = 10, maxProcesses = 10, } --##Rsyslog sync{ default.rsyncssh, host="user@server", source="/etc/rsyslog.d", targetdir="/etc/rsyslog.d", rsyncBinary="/etc/lsyncd/rsync_sudo.sh", rsyncOpts={"-rltusogp"} }++++++ rsync_sudo.sh ++++++ #!/bin/bash /usr/bin/rsync --rsync-path="sudo /usr/bin/rsync" $@-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2012-03-20 11:29:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2012-03-06 13:39:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2012-03-20 11:30:20.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Mar 17 18:50:38 UTC 2012 - boris(a)steki.net + +- add lightdm-fix-missing-includes.patch which adds missing + includes (lp#958097) + +------------------------------------------------------------------- New: ---- lightdm-fix-missing-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.zgl1Cc/_old 2012-03-20 11:30:21.000000000 +0100 +++ /var/tmp/diff_new_pack.zgl1Cc/_new 2012-03-20 11:30:21.000000000 +0100 @@ -52,6 +52,8 @@ Patch8: lightdm-remove-xauthority-ownership-fix.patch # PATCH-FIX-UPSTREAM lightdm-call-g_thread_init-conditionally.patch gber(a)opensuse.org -- call g_thread_init() only on glib < 2.31.0 Patch10: lightdm-call-g_thread_init-conditionally.patch +# PATCH-FIX-UPSTREAM lightdm-fix-missing-includes.patch lp#958097 boris(a)steki.net -- Add missing header includes +Patch11: lightdm-fix-missing-includes.patch BuildRequires: gcc-c++ BuildRequires: gnome-common BuildRequires: gtk-doc @@ -179,6 +181,7 @@ %patch7 -p1 %patch8 -p1 %patch10 -p1 +%patch11 -p1 rm -f liblightdm-qt/*_moc.cpp greeters/qt/*_moc.cpp tests/src/*_moc.cpp %build ++++++ lightdm-fix-missing-includes.patch ++++++ # HG changeset patch # Parent df9d7501a5f380ec1a53d288e53cd161e061eda0 Add missing includes diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp --- a/liblightdm-qt/greeter.cpp +++ b/liblightdm-qt/greeter.cpp @@ -14,6 +14,8 @@ #include "QLightDM/Greeter" +#include <unistd.h> + #include <security/pam_appl.h> #include <QtCore/QDebug> #include <QtCore/QDir> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libunicap for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package libunicap for openSUSE:Factory checked in at 2012-03-20 11:28:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libunicap (Old) and /work/SRC/openSUSE:Factory/.libunicap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libunicap", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libunicap/libunicap.changes 2011-10-18 14:31:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libunicap.new/libunicap.changes 2012-03-20 11:30:16.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 16 20:30:33 CET 2012 - sbrabec(a)suse.cz + +- Port rules to the new udev (bnc#726471). + +------------------------------------------------------------------- New: ---- libunicap-udev.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libunicap.spec ++++++ --- /var/tmp/diff_new_pack.y8SBDf/_old 2012-03-20 11:30:18.000000000 +0100 +++ /var/tmp/diff_new_pack.y8SBDf/_new 2012-03-20 11:30:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libunicap # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _use_internal_dependency_generator 0 %{expand:%%define prev__find_provides %{__find_provides}} %define __find_provides sh %{SOURCE1} %{prev__find_provides} @@ -35,6 +36,8 @@ Patch1: libunicap-0.9.12-find_videodev.patch # PATCH-FIX-UPSTREAM uses the reserved keyword "private" https://bugs.launchpad.net/unicap/+bug/656229 Patch2: libunicap_0912_fixPrivate.patch +# PATCH-FIX-UPSTREAM libunicap-udev.patch bnc726471 https://bugs.launchpad.net/unicap/+bug/959626 sbrabec(a)suse.cz -- port rules to the new udev +Patch3: libunicap-udev.patch BuildRequires: alsa-lib-devel BuildRequires: gettext BuildRequires: gtk-doc >= 1.4 @@ -96,6 +99,7 @@ %patch1 %endif %patch2 -p 1 +%patch3 -p 1 %build %configure --disable-rpath --enable-gtk-doc --enable-libv4l @@ -109,6 +113,7 @@ %find_lang unicap %post -n libunicap2 -p /sbin/ldconfig + %postun -n libunicap2 -p /sbin/ldconfig %files -n libunicap2 -f unicap.lang ++++++ libunicap-udev.patch ++++++ Index: libunicap-0.9.12/data/50-euvccam.rules =================================================================== --- libunicap-0.9.12.orig/data/50-euvccam.rules +++ libunicap-0.9.12/data/50-euvccam.rules @@ -1,8 +1,13 @@ -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8201", GROUP="video", MODE="0660" -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8202", GROUP="video", MODE="0660" -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8203", GROUP="video", MODE="0660" -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8204", GROUP="video", MODE="0660" -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8205", GROUP="video", MODE="0660" -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8206", GROUP="video", MODE="0660" -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8207", GROUP="video", MODE="0660" +ACTION!="add", GOTO="euvccam_rules_end" +SUBSYSTEM!="usb", GOTO="euvccam_rules_end" +ENV{DEVTYPE}!="usb_device", GOTO="euvccam_rules_end" +ATTRS{idVendor}=="199e", ATTRS{idProduct}=="8201", GROUP="video", MODE="0660" +ATTRS{idVendor}=="199e", ATTRS{idProduct}=="8202", GROUP="video", MODE="0660" +ATTRS{idVendor}=="199e", ATTRS{idProduct}=="8203", GROUP="video", MODE="0660" +ATTRS{idVendor}=="199e", ATTRS{idProduct}=="8204", GROUP="video", MODE="0660" +ATTRS{idVendor}=="199e", ATTRS{idProduct}=="8205", GROUP="video", MODE="0660" +ATTRS{idVendor}=="199e", ATTRS{idProduct}=="8206", GROUP="video", MODE="0660" +ATTRS{idVendor}=="199e", ATTRS{idProduct}=="8207", GROUP="video", MODE="0660" + +LABEL="euvccam_rules_end" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqtweetlib for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package libqtweetlib for openSUSE:Factory checked in at 2012-03-20 11:28:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqtweetlib (Old) and /work/SRC/openSUSE:Factory/.libqtweetlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqtweetlib", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libqtweetlib/libqtweetlib.changes 2012-02-24 06:53:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqtweetlib.new/libqtweetlib.changes 2012-03-20 11:30:15.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Mar 17 17:37:01 UTC 2012 - dev(a)dominik-schmidt.de + +- Version bump to 0.5 + * Fix leading zeros in OAuth pins being cut off + +------------------------------------------------------------------- Old: ---- QTweetLib-0.4.tar.gz New: ---- QTweetLib-0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqtweetlib.spec ++++++ --- /var/tmp/diff_new_pack.ROjITD/_old 2012-03-20 11:30:16.000000000 +0100 +++ /var/tmp/diff_new_pack.ROjITD/_new 2012-03-20 11:30:16.000000000 +0100 @@ -17,10 +17,10 @@ %define _libname libQTweetLib -%define soname 0 +%define soname 1_0 Name: libqtweetlib -Version: 0.4 +Version: 0.5 Release: 0 Source0: QTweetLib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ QTweetLib-0.4.tar.gz -> QTweetLib-0.5.tar.gz ++++++ ++++ 45264 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 libofx for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package libofx for openSUSE:Factory checked in at 2012-03-20 11:28:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libofx (Old) and /work/SRC/openSUSE:Factory/.libofx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libofx", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libofx/libofx.changes 2012-01-12 15:30:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libofx.new/libofx.changes 2012-03-20 11:30:13.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 20:51:33 UTC 2012 - dimstar(a)opensuse.org + +- Add libofx-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- libofx-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libofx.spec ++++++ --- /var/tmp/diff_new_pack.aonR7b/_old 2012-03-20 11:30:15.000000000 +0100 +++ /var/tmp/diff_new_pack.aonR7b/_new 2012-03-20 11:30:15.000000000 +0100 @@ -24,6 +24,7 @@ Group: Development/Libraries/Other Url: http://libofx.sourceforge.net/ Source: http://downloads.sourceforge.net/project/libofx/libofx/0.9.5/%{name}-%{vers… +Patch0: libofx-gcc47.patch BuildRequires: curl-devel BuildRequires: doxygen BuildRequires: fdupes @@ -77,6 +78,7 @@ %prep %setup -q +%patch0 -p1 chmod -x doc/ofx_sample_files/ofx_spec160_stmtrs_example.sgml %build ++++++ libofx-gcc47.patch ++++++ Index: libofx-0.9.5/ofxconnect/ofxpartner.cpp =================================================================== --- libofx-0.9.5.orig/ofxconnect/ofxpartner.cpp +++ libofx-0.9.5/ofxconnect/ofxpartner.cpp @@ -37,6 +37,7 @@ #include <vector> #include <algorithm> #include <string.h> +#include <unistd.h> using std::string; using std::vector; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmsn for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package libmsn for openSUSE:Factory checked in at 2012-03-20 11:28:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmsn (Old) and /work/SRC/openSUSE:Factory/.libmsn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmsn", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libmsn/libmsn.changes 2012-02-10 17:16:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmsn.new/libmsn.changes 2012-03-20 11:30:11.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 12:14:36 UTC 2012 - dimstar(a)opensuse.org + +- Add libmsn-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- libmsn-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmsn.spec ++++++ --- /var/tmp/diff_new_pack.1AOImv/_old 2012-03-20 11:30:13.000000000 +0100 +++ /var/tmp/diff_new_pack.1AOImv/_new 2012-03-20 11:30:13.000000000 +0100 @@ -33,6 +33,7 @@ Patch1: gcc-warnings.diff Patch2: literal-string-compare.diff Patch3: install-xmlparser.patch +Patch4: libmsn-gcc47.patch Source99: COPYING.LGPL %define debug_package_requires libmsn0_1 = %{version}-%{release} @@ -69,6 +70,7 @@ %patch1 %patch2 %patch3 -p1 +%patch4 -p1 cp %{S:99} . %build ++++++ libmsn-gcc47.patch ++++++ Index: libmsn-4.2/msn/util.cpp =================================================================== --- libmsn-4.2.orig/msn/util.cpp +++ libmsn-4.2/msn/util.cpp @@ -32,6 +32,7 @@ #include <sys/timeb.h> #include "md5.h" #include "libsiren/siren7.h" +#include <unistd.h> //for unlink() #ifdef _WIN32 #define random rand -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcryptopp for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package libcryptopp for openSUSE:Factory checked in at 2012-03-20 11:28:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcryptopp (Old) and /work/SRC/openSUSE:Factory/.libcryptopp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcryptopp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libcryptopp/libcryptopp.changes 2012-02-07 14:46:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libcryptopp.new/libcryptopp.changes 2012-03-20 11:30:08.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 14:25:26 UTC 2012 - dimstar(a)opensuse.org + +- Add libcryptopp-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- libcryptopp-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcryptopp.spec ++++++ --- /var/tmp/diff_new_pack.pwWSFX/_old 2012-03-20 11:30:10.000000000 +0100 +++ /var/tmp/diff_new_pack.pwWSFX/_new 2012-03-20 11:30:10.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libcryptopp Version: 5.6.1 Release: 0 @@ -30,6 +31,7 @@ Source: cryptopp%{pkg_version}.tar.bz2 Source2: cryptopp.pc Patch1: libcryptopp-shared.patch +Patch2: libcryptopp-gcc47.patch BuildRequires: gcc-c++ BuildRequires: libstdc++-devel BuildRequires: pkg-config @@ -56,6 +58,7 @@ %prep %setup -q -c "%{name}-%{version}" %patch1 +%patch2 -p1 %build make %{?_smp_mflags} \ ++++++ libcryptopp-gcc47.patch ++++++ Index: libcryptopp-5.6.1/eccrypto.h =================================================================== --- libcryptopp-5.6.1.orig/eccrypto.h +++ libcryptopp-5.6.1/eccrypto.h @@ -43,7 +43,7 @@ public: void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) { this->m_groupPrecomputation.SetCurve(ec); - SetSubgroupGenerator(G); + this->SetSubgroupGenerator(G); m_n = n; m_k = k; } @@ -145,9 +145,9 @@ public: typedef typename EC::Point Element; void Initialize(const DL_GroupParameters_EC<EC> &params, const Element &Q) - {this->AccessGroupParameters() = params; SetPublicElement(Q);} + {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) - {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} + {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);} // X509PublicKey void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); @@ -166,9 +166,9 @@ public: void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> &params) - {GenerateRandom(rng, params);} + {this->GenerateRandom(rng, params);} void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) - {GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));} + {this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));} // PKCS8PrivateKey void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); Index: libcryptopp-5.6.1/secblock.h =================================================================== --- libcryptopp-5.6.1.orig/secblock.h +++ libcryptopp-5.6.1/secblock.h @@ -88,7 +88,7 @@ public: pointer allocate(size_type n, const void * = NULL) { - CheckSize(n); + this->CheckSize(n); if (n == 0) return NULL; Index: libcryptopp-5.6.1/eccrypto.cpp =================================================================== --- libcryptopp-5.6.1.orig/eccrypto.cpp +++ libcryptopp-5.6.1/eccrypto.cpp @@ -435,7 +435,7 @@ template <class EC> void DL_GroupParamet StringSource ssG(param.g, true, new HexDecoder); Element G; bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); - SetSubgroupGenerator(G); + this->SetSubgroupGenerator(G); assert(result); StringSource ssN(param.n, true, new HexDecoder); @@ -591,7 +591,7 @@ bool DL_GroupParameters_EC<EC>::Validate if (level >= 2 && pass) { const Integer &q = GetSubgroupOrder(); - Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); + Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q); pass = pass && IsIdentity(gq); } return pass; @@ -629,7 +629,7 @@ void DL_PublicKey_EC<EC>::BERDecodePubli typename EC::Point P; if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) BERDecodeError(); - SetPublicElement(P); + this->SetPublicElement(P); } template <class EC> Index: libcryptopp-5.6.1/algebra.cpp =================================================================== --- libcryptopp-5.6.1.orig/algebra.cpp +++ libcryptopp-5.6.1/algebra.cpp @@ -58,7 +58,7 @@ template <class T> const T& AbstractEucl Element g[3]={b, a}; unsigned int i0=0, i1=1, i2=2; - while (!Equal(g[i1], this->Identity())) + while (!this->Equal(g[i1], this->Identity())) { g[i2] = Mod(g[i0], g[i1]); unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; Index: libcryptopp-5.6.1/panama.cpp =================================================================== --- libcryptopp-5.6.1.orig/panama.cpp +++ libcryptopp-5.6.1/panama.cpp @@ -422,7 +422,7 @@ void PanamaHash<B>::TruncatedFinal(byte { this->ThrowIfInvalidTruncatedSize(size); - PadLastBlock(this->BLOCKSIZE, 0x01); + this->PadLastBlock(this->BLOCKSIZE, 0x01); HashEndianCorrectedBlock(this->m_data); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-03-20 11:28:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-03-09 21:22:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-03-20 11:30:01.000000000 +0100 @@ -1,0 +2,66 @@ +Fri Mar 16 14:27:06 CET 2012 - ms(a)suse.de + +- v5.02.19 released + +------------------------------------------------------------------- +Fri Mar 16 13:59:52 CET 2012 - ms(a)suse.de + +- fixed order of files in an ova tar archive per spec + in http://www.vmware.com/pdf/ovf_spec_draft.pdf (bnc #752581) + +------------------------------------------------------------------- +Fri Mar 16 13:55:01 CET 2012 - ms(a)suse.de + +- fixed malformed ovf file. the Envelope properties + xmlns:rasd and xmlns:vssd are split in two lines with + an extra quote (") (bnc #752580) + +------------------------------------------------------------------- +Thu Mar 15 15:23:15 CET 2012 - ms(a)suse.de + +- make split building more robust. the read-only partition size + will be a bit bigger than the actual read-only filesystem image + to be sure it fits into the partition. Due to the alignment this + was required and costs a few bytes + +------------------------------------------------------------------- +Thu Mar 15 11:02:28 CET 2012 - ms(a)suse.de + +- make sure kernelCheck() initializes list of kernels if empty (bnc #752259) + +------------------------------------------------------------------- +Wed Mar 14 11:17:59 CET 2012 - ms(a)suse.de + +- don't remove libbz2 from isoboot boot images for SLE11 + +------------------------------------------------------------------- +Wed Mar 14 10:30:27 CET 2012 - ms(a)suse.de + +- fixed removePackages() function + * make sure rpmLibs() is called prior to rpm. if all packages + are installed by bootstrap only this is required + * make sure to check for empty $final variable + +------------------------------------------------------------------- +Wed Mar 14 09:54:57 CET 2012 - ms(a)suse.de + +- added ovf format example to examples/suse-12.1/suse-vm-guest + +------------------------------------------------------------------- +Wed Mar 14 09:40:39 CET 2012 - ms(a)suse.de + +- better warning message about required machine section data + +------------------------------------------------------------------- +Tue Mar 13 09:02:57 CET 2012 - rjschwei(a)suse.de + +- run the unit tests in verbose mode during package build + +------------------------------------------------------------------- +Mon Mar 12 15:41:40 CET 2012 - rjschwei(a)suse.de + +- fix Validator test + Revert f551128061 and d76e57194c, comparison in question checks for + equality of objects, thus numerical comparison is appropriate + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.ViDHyI/_old 2012-03-20 11:30:06.000000000 +0100 +++ /var/tmp/diff_new_pack.ViDHyI/_new 2012-03-20 11:30:06.000000000 +0100 @@ -22,7 +22,7 @@ Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.02.18 +Version: 5.02.19 Release: 0 # requirements to build packages BuildRequires: gcc-c++ @@ -363,11 +363,11 @@ %build # empty because of rpmlint warning rpm-buildroot-usage -#%if %{suse_version} > 1140 -# -#%check -#make test -#%endif +%if %{suse_version} > 1140 + +%check +make KIWIVERBTEST=1 test +%endif %install # build ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-03-09 14:57:02.000000000 +0100 +++ new/kiwi/.revision 2012-03-16 14:27:44.000000000 +0100 @@ -1 +1 @@ -0ed9c17c2b116ea83c6e790467e755f06f2a100c +c96be4b3076b74e1d47b902aced3d44aec271672 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile --- old/kiwi/Makefile 2012-03-09 14:57:02.000000000 +0100 +++ new/kiwi/Makefile 2012-03-16 14:27:43.000000000 +0100 @@ -43,6 +43,10 @@ PACKDOCVZ = ${doc_prefix}/kiwi MANVZ = ${man_prefix}/man1 +ifdef KIWIVERBTEST +TESTVERBOSE = --verbose +endif + all: modules/KIWISchema.rng #============================================ # build tools @@ -170,7 +174,7 @@ for i in `find -name "*.t" | cut -d/ -f4`;do \ touch tests/.timestamps/$$i's';\ done - cd tests/unit && /usr/bin/prove -f . + cd tests/unit && /usr/bin/prove ${TESTVERBOSE} -f . rm -f .revision %.t: @@ -182,7 +186,7 @@ mkdir tests/.timestamps; \ fi touch tests/.timestamps/$@s - cd tests/unit && /usr/bin/prove -f $@ + cd tests/unit && /usr/bin/prove ${TESTVERBOSE} -f $@ clean: (cd system/boot && find -type f | grep -v .svn | xargs chmod u+w) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2012-03-09 14:57:02.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2012-03-16 14:27:57.000000000 +0100 @@ -464,7 +464,7 @@ # round compressed image size #------------------------------------------ if ($syszip) { - $syszip = $syszip / 1048576; + $syszip = $syszip / 1e6; $syszip = sprintf ("%.0f", $syszip); } #========================================== @@ -1791,7 +1791,7 @@ #------------------------------------------ if (($imgtype eq "split") && (-f $splitfile)) { my $splitsize = $main::global -> isize ($splitfile); - my $splitMB = ($splitsize * 1.2) / 1048576; + my $splitMB = int (($splitsize * 1.2) / 1048576); $kiwi -> info ( "Adding $splitMB MB space for split read-write portion" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2012-03-09 14:57:07.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2012-03-16 14:27:57.000000000 +0100 @@ -42,7 +42,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.02.18"; + $data{Version} = "5.02.19"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2012-03-09 14:57:02.000000000 +0100 +++ new/kiwi/modules/KIWIImageFormat.pm 2012-03-16 14:27:57.000000000 +0100 @@ -747,7 +747,11 @@ #------------------------------------------ if ((! %xenconfig) || (! $xenconfig{xen_diskdevice})) { $kiwi -> skipped (); - $kiwi -> warning ("Not enough or missing Xen machine config data"); + if (! %xenconfig) { + $kiwi -> warning ("No machine section for this image type found"); + } else { + $kiwi -> warning ("No disk device setup found in machine section"); + } $kiwi -> skipped (); return $file; } @@ -856,7 +860,11 @@ my %vmwconfig = %{$vmwref}; if ((! %vmwconfig) || (! $vmwconfig{vmware_disktype})) { $kiwi -> skipped (); - $kiwi -> warning ("Not enough or Missing VMware machine config data"); + if (! %vmwconfig) { + $kiwi -> warning ("No machine section for this image type found"); + } else { + $kiwi -> warning ("No disk device setup found in machine section"); + } $kiwi -> skipped (); return $file; } @@ -1011,7 +1019,11 @@ my %ovfconfig = %{$ovfref}; if ((! %ovfconfig) || (! $ovfconfig{ovf_type})) { $kiwi -> skipped (); - $kiwi -> warning ("Not enough or Missing OFV config data"); + if (! %ovfconfig) { + $kiwi -> warning ("No machine section for this image type found"); + } else { + $kiwi -> warning ("No disk device setup found in machine section"); + } $kiwi -> skipped (); return $ovf; } @@ -1056,11 +1068,11 @@ 'xmlns="http://schemas.dmtf.org/ovf/envelope/1"'."\n". 'xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common"'."\n". 'xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"'."\n". - 'xmlns:rasd="http://schemas.dmtf.org/"'."\n". - 'wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"'."\n". + 'xmlns:rasd="http://schemas.dmtf.org/'. + 'wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"'."\n". 'xmlns:vmw="http://www.vmware.com/schema/ovf"'."\n". - 'xmlns:vssd="http://schemas.dmtf.org/"'."\n". - 'wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"'."\n". + 'xmlns:vssd="http://schemas.dmtf.org/'. + 'wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"'."\n". 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'."\n"; #========================================== # image description @@ -1150,7 +1162,12 @@ my $destdir = dirname $this->{image}; my $ovaimage = basename $ovfdir; $ovaimage =~ s/\.ovf$/\.ova/; - my $status = qxx ("tar -h -C $ovfdir -cf $destdir/$ovaimage . 2>&1"); + my $ovabasis = $ovaimage; + $ovabasis =~ s/\.ova$//; + my $files = "$ovabasis.ovf $ovabasis.mf $ovabasis.vmdk"; + my $status = qxx ( + "tar -h -C $ovfdir -cf $destdir/$ovaimage $files 2>&1" + ); my $result = $? >> 8; if ($result != 0) { $kiwi -> failed (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2012-03-09 14:57:02.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2012-03-16 14:27:44.000000000 +0100 @@ -2722,6 +2722,9 @@ #====================================== # find installed kernel / initrd #-------------------------------------- + if [ -z "$KERNEL_LIST" ] ; then + kernelList $prefix + fi IFS="," ; for i in $KERNEL_LIST;do if test -z "$i";then continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2012-03-09 14:57:07.000000000 +0100 +++ new/kiwi/modules/KIWIManager.pm 2012-03-16 14:27:44.000000000 +0100 @@ -1391,6 +1391,7 @@ # Create screen call file #------------------------------------------ $kiwi -> info ("Removing packages..."); + $this -> rpmLibs(); my @removeOpts = ( "--nodeps --allmatches --noscripts" ); @@ -1404,9 +1405,13 @@ print $fd "@kchroot mount -t proc proc /proc"."\n"; print $fd "final=\$(@kchroot rpm -q @removePackages "; print $fd " | grep -v 'is not installed')"."\n"; + print $fd "if [ ! -z \"\$final\" ];then"."\n"; print $fd "@kchroot rpm -e @removeOpts \$final &\n"; print $fd "SPID=\$!;wait \$SPID\n"; print $fd "ECODE=\$?\n"; + print $fd "else"."\n"; + print $fd "ECODE=0"."\n"; + print $fd "fi"."\n"; print $fd "echo \$ECODE > $screenCall.exit\n"; print $fd "@kchroot umount /proc"."\n"; #print $fd "@kchroot /bin/bash\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm --- old/kiwi/modules/KIWIXMLValidator.pm 2012-03-09 14:57:07.000000000 +0100 +++ new/kiwi/modules/KIWIXMLValidator.pm 2012-03-16 14:27:44.000000000 +0100 @@ -497,7 +497,7 @@ return 1; } for my $pkgs (@pkgsNodes) { - if ("$pkgs" ne "$defPackSection") { + if ($pkgs != $defPackSection) { my $patternType = $pkgs -> getAttribute( 'patternType' ); if ($patternType && $patternType ne $defPatternTypeVal) { my $kiwi = $this->{kiwi}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2012-03-09 14:57:02.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2012-03-16 14:27:44.000000000 +0100 @@ -162,7 +162,6 @@ <package name="iptables"/> <package name="irqbalance"/> <package name="keyutils-libs"/> - <package name="libbz2-1"/> <package name="libexpat1"/> <package name="libjpeg"/> <package name="liblcms"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2012-03-09 14:57:02.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2012-03-16 14:27:44.000000000 +0100 @@ -163,7 +163,6 @@ <package name="iptables"/> <package name="irqbalance"/> <package name="keyutils-libs"/> - <package name="libbz2-1"/> <package name="libexpat1"/> <package name="libjpeg"/> <package name="liblcms"/> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-l10n for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package kde4-l10n for openSUSE:Factory checked in at 2012-03-20 11:28:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde4-l10n (Old) and /work/SRC/openSUSE:Factory/.kde4-l10n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde4-l10n", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kde4-l10n/kde4-l10n.changes 2012-01-27 15:19:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde4-l10n.changes 2012-03-20 11:28:45.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 7 10:18:48 UTC 2012 - idonmez(a)suse.com + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kde-l10n-ar-4.8.0.tar.bz2 kde-l10n-bg-4.8.0.tar.bz2 kde-l10n-bs-4.8.0.tar.bz2 kde-l10n-ca-4.8.0.tar.bz2 kde-l10n-ca(a)valencia-4.8.0.tar.bz2 kde-l10n-cs-4.8.0.tar.bz2 kde-l10n-da-4.8.0.tar.bz2 kde-l10n-de-4.8.0.tar.bz2 kde-l10n-el-4.8.0.tar.bz2 kde-l10n-en_GB-4.8.0.tar.bz2 kde-l10n-es-4.8.0.tar.bz2 kde-l10n-et-4.8.0.tar.bz2 kde-l10n-eu-4.8.0.tar.bz2 kde-l10n-fa-4.8.0.tar.bz2 kde-l10n-fi-4.8.0.tar.bz2 kde-l10n-fr-4.8.0.tar.bz2 kde-l10n-ga-4.8.0.tar.bz2 kde-l10n-gl-4.8.0.tar.bz2 kde-l10n-hr-4.8.0.tar.bz2 kde-l10n-hu-4.8.0.tar.bz2 kde-l10n-ia-4.8.0.tar.bz2 kde-l10n-is-4.8.0.tar.bz2 kde-l10n-it-4.8.0.tar.bz2 kde-l10n-ja-4.8.0.tar.bz2 kde-l10n-kk-4.8.0.tar.bz2 kde-l10n-km-4.8.0.tar.bz2 kde-l10n-ko-4.8.0.tar.bz2 kde-l10n-lt-4.8.0.tar.bz2 kde-l10n-lv-4.8.0.tar.bz2 kde-l10n-nb-4.8.0.tar.bz2 kde-l10n-nds-4.8.0.tar.bz2 kde-l10n-nl-4.8.0.tar.bz2 kde-l10n-nn-4.8.0.tar.bz2 kde-l10n-pa-4.8.0.tar.bz2 kde-l10n-pl-4.8.0.tar.bz2 kde-l10n-pt-4.8.0.tar.bz2 kde-l10n-pt_BR-4.8.0.tar.bz2 kde-l10n-ro-4.8.0.tar.bz2 kde-l10n-ru-4.8.0.tar.bz2 kde-l10n-si-4.8.0.tar.bz2 kde-l10n-sk-4.8.0.tar.bz2 kde-l10n-sl-4.8.0.tar.bz2 kde-l10n-sr-4.8.0.tar.bz2 kde-l10n-sv-4.8.0.tar.bz2 kde-l10n-tg-4.8.0.tar.bz2 kde-l10n-th-4.8.0.tar.bz2 kde-l10n-tr-4.8.0.tar.bz2 kde-l10n-uk-4.8.0.tar.bz2 kde-l10n-vi-4.8.0.tar.bz2 kde-l10n-wa-4.8.0.tar.bz2 kde-l10n-zh_CN-4.8.0.tar.bz2 kde-l10n-zh_TW-4.8.0.tar.bz2 New: ---- kde-l10n-ar-4.8.1.tar.bz2 kde-l10n-bg-4.8.1.tar.bz2 kde-l10n-bs-4.8.1.tar.bz2 kde-l10n-ca-4.8.1.tar.bz2 kde-l10n-ca(a)valencia-4.8.1.tar.bz2 kde-l10n-cs-4.8.1.tar.bz2 kde-l10n-da-4.8.1.tar.bz2 kde-l10n-de-4.8.1.tar.bz2 kde-l10n-el-4.8.1.tar.bz2 kde-l10n-en_GB-4.8.1.tar.bz2 kde-l10n-es-4.8.1.tar.bz2 kde-l10n-et-4.8.1.tar.bz2 kde-l10n-eu-4.8.1.tar.bz2 kde-l10n-fa-4.8.1.tar.bz2 kde-l10n-fi-4.8.1.tar.bz2 kde-l10n-fr-4.8.1.tar.bz2 kde-l10n-ga-4.8.1.tar.bz2 kde-l10n-gl-4.8.1.tar.bz2 kde-l10n-he-4.8.1.tar.bz2 kde-l10n-hr-4.8.1.tar.bz2 kde-l10n-hu-4.8.1.tar.bz2 kde-l10n-ia-4.8.1.tar.bz2 kde-l10n-id-4.8.1.tar.bz2 kde-l10n-is-4.8.1.tar.bz2 kde-l10n-it-4.8.1.tar.bz2 kde-l10n-ja-4.8.1.tar.bz2 kde-l10n-kk-4.8.1.tar.bz2 kde-l10n-km-4.8.1.tar.bz2 kde-l10n-ko-4.8.1.tar.bz2 kde-l10n-lt-4.8.1.tar.bz2 kde-l10n-lv-4.8.1.tar.bz2 kde-l10n-nb-4.8.1.tar.bz2 kde-l10n-nds-4.8.1.tar.bz2 kde-l10n-nl-4.8.1.tar.bz2 kde-l10n-nn-4.8.1.tar.bz2 kde-l10n-pa-4.8.1.tar.bz2 kde-l10n-pl-4.8.1.tar.bz2 kde-l10n-pt-4.8.1.tar.bz2 kde-l10n-pt_BR-4.8.1.tar.bz2 kde-l10n-ro-4.8.1.tar.bz2 kde-l10n-ru-4.8.1.tar.bz2 kde-l10n-si-4.8.1.tar.bz2 kde-l10n-sk-4.8.1.tar.bz2 kde-l10n-sl-4.8.1.tar.bz2 kde-l10n-sr-4.8.1.tar.bz2 kde-l10n-sv-4.8.1.tar.bz2 kde-l10n-tg-4.8.1.tar.bz2 kde-l10n-th-4.8.1.tar.bz2 kde-l10n-tr-4.8.1.tar.bz2 kde-l10n-ug-4.8.1.tar.bz2 kde-l10n-uk-4.8.1.tar.bz2 kde-l10n-vi-4.8.1.tar.bz2 kde-l10n-wa-4.8.1.tar.bz2 kde-l10n-zh_CN-4.8.1.tar.bz2 kde-l10n-zh_TW-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-l10n.spec ++++++ ++++ 678 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kde4-l10n/kde4-l10n.spec ++++ and /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde4-l10n.spec ++++++ kde-l10n-ar-4.8.0.tar.bz2 -> kde-l10n-ar-4.8.1.tar.bz2 ++++++ ++++ 175505 lines of diff (skipped) ++++++ kde-l10n-bg-4.8.0.tar.bz2 -> kde-l10n-bg-4.8.1.tar.bz2 ++++++ ++++ 147749 lines of diff (skipped) ++++++ kde-l10n-bs-4.8.0.tar.bz2 -> kde-l10n-bs-4.8.1.tar.bz2 ++++++ ++++ 156812 lines of diff (skipped) ++++++ kde-l10n-ca-4.8.0.tar.bz2 -> kde-l10n-ca-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-ca-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-ca-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-ca(a)valencia-4.8.0.tar.bz2 -> kde-l10n-ca(a)valencia-4.8.1.tar.bz2 ++++++ ++++ 149766 lines of diff (skipped) ++++++ kde-l10n-cs-4.8.0.tar.bz2 -> kde-l10n-cs-4.8.1.tar.bz2 ++++++ ++++ 163504 lines of diff (skipped) ++++++ kde-l10n-da-4.8.0.tar.bz2 -> kde-l10n-da-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-da-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-da-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-de-4.8.0.tar.bz2 -> kde-l10n-de-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-de-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-de-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-el-4.8.0.tar.bz2 -> kde-l10n-el-4.8.1.tar.bz2 ++++++ ++++ 159550 lines of diff (skipped) ++++++ kde-l10n-en_GB-4.8.0.tar.bz2 -> kde-l10n-en_GB-4.8.1.tar.bz2 ++++++ ++++ 158093 lines of diff (skipped) ++++++ kde-l10n-es-4.8.0.tar.bz2 -> kde-l10n-es-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-es-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-es-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-et-4.8.0.tar.bz2 -> kde-l10n-et-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-et-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-et-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-eu-4.8.0.tar.bz2 -> kde-l10n-eu-4.8.1.tar.bz2 ++++++ ++++ 144691 lines of diff (skipped) ++++++ kde-l10n-fa-4.8.0.tar.bz2 -> kde-l10n-fa-4.8.1.tar.bz2 ++++++ ++++ 146476 lines of diff (skipped) ++++++ kde-l10n-fi-4.8.0.tar.bz2 -> kde-l10n-fi-4.8.1.tar.bz2 ++++++ ++++ 165086 lines of diff (skipped) ++++++ kde-l10n-fr-4.8.0.tar.bz2 -> kde-l10n-fr-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-fr-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-fr-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-ga-4.8.0.tar.bz2 -> kde-l10n-ga-4.8.1.tar.bz2 ++++++ ++++ 162769 lines of diff (skipped) ++++++ kde-l10n-gl-4.8.0.tar.bz2 -> kde-l10n-gl-4.8.1.tar.bz2 ++++++ ++++ 161131 lines of diff (skipped) ++++++ kde-l10n-hr-4.8.0.tar.bz2 -> kde-l10n-he-4.8.1.tar.bz2 ++++++ ++++ 772789 lines of diff (skipped) ++++++ kde-l10n-hr-4.8.0.tar.bz2 -> kde-l10n-hr-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-hr-4.8.0/messages/entry.desktop new/kde-l10n-hr-4.8.1/messages/entry.desktop --- old/kde-l10n-hr-4.8.0/messages/entry.desktop 2012-01-03 21:06:34.000000000 +0100 +++ new/kde-l10n-hr-4.8.1/messages/entry.desktop 2012-03-02 13:49:41.000000000 +0100 @@ -73,6 +73,7 @@ Name[si]=ක්‍රොඒෂියානු Name[sk]=Chorvátčina Name[sl]=Hrvaščina +Name[sq]=Kroatisht Name[sr]=хрватски Name[sr@ijekavian]=хрватски Name[sr@ijekavianlatin]=hrvatski @@ -83,6 +84,7 @@ Name[tg]=Хорватӣ Name[th]=ภาษาโครเอเชีย Name[tr]=Hırvatça +Name[tt]=Хорват Name[ug]=خورۋاتچە Name[uk]=Хорватська Name[uz]=Xorvatcha diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-hr-4.8.0/messages/qt/phonon-xine.po new/kde-l10n-hr-4.8.1/messages/qt/phonon-xine.po --- old/kde-l10n-hr-4.8.0/messages/qt/phonon-xine.po 2011-10-11 17:16:11.000000000 +0200 +++ new/kde-l10n-hr-4.8.1/messages/qt/phonon-xine.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,148 +0,0 @@ -# Translation of phonon-xine to Croatian -# -# Andrej Dundovic <adundovi(a)gmail.com>, 2010. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-02 06:35+0200\n" -"PO-Revision-Date: 2010-01-24 16:52+0100\n" -"Last-Translator: Andrej Dundovic <adundovi(a)gmail.com>\n" -"Language-Team: Croatian <kde-croatia-list(a)lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: hr\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: qtrich\n" - -#: backend.cpp:85 -msgid "Phonon Xine Backend" -msgstr "" - -#: backend.cpp:639 -msgid "ALSA default output" -msgstr "" - -#: backend.cpp:640 -msgctxt "" -"This string is only shown when the KDE runtime is broken. The technical term " -"'Platform Plugin' might help users to find a solution, so it might make " -"sense to leave that term untranslated." -msgid "" -"<html><p>The Platform Plugin failed. This is a fallback to use the first " -"ALSA device available.</p></html>" -msgstr "" - -#: backend.cpp:649 -msgid "OSS default output" -msgstr "" - -#: backend.cpp:650 -msgctxt "" -"This string is only shown when the KDE runtime is broken. The technical term " -"'Platform Plugin' might help users to find a solution, so it might make " -"sense to leave that term untranslated." -msgid "" -"<html><p>The Platform Plugin failed. This is a fallback to use the first OSS " -"device available.</p></html>" -msgstr "" - -#: backend.cpp:660 -msgid "Jack Audio Connection Kit" -msgstr "" - -#: backend.cpp:661 -msgid "" -"<html><p>JACK is a low-latency audio server. It can connect a number of " -"different applications to an audio device, as well as allowing them to share " -"audio between themselves.</p><p>JACK was designed from the ground up for " -"professional audio work, and its design focuses on two key areas: " -"synchronous execution of all clients, and low latency operation.</p></html>" -msgstr "" - -#: backend.cpp:669 -msgid "aRts" -msgstr "aRts" - -#: backend.cpp:670 -msgid "" -"<html><p>aRts is the old sound server and media framework that was used in " -"KDE2 and KDE3. Its use is discouraged.</p></html>" -msgstr "" - -#: backend.cpp:676 -msgid "Esound (ESD)" -msgstr "Esound (ESD)" - -#: kequalizer_plugin.cpp:183 -msgid "" -"Equalizes audio using the very good IIR equalizer code by Anders Johansson " -"adopted from Audacious project.\n" -"\n" -"Parameters:\n" -"Preamp gain - used to alter up or down all gain values\n" -"10 Equalizer bands - actual IIR equalizer parameters.\n" -msgstr "" - -#: mediaobject.cpp:359 xinestream.cpp:255 -#, qt-format -msgid "Cannot open media data at '<i>%1</i>'" -msgstr "" - -#: volumefadereffect.cpp:50 -msgid "Volume" -msgstr "" - -#: volumefadereffect.cpp:51 -msgid "Fade Curve" -msgstr "" - -#: volumefadereffect.cpp:53 -msgid "Fade To Volume" -msgstr "" - -#: volumefadereffect.cpp:54 -msgid "Fade Time" -msgstr "" - -#: volumefadereffect.cpp:56 -msgid "Start Fade" -msgstr "" - -#: volumefader_plugin.cpp:246 -msgid "" -"Normalizes audio by maximizing the volume without distorting the sound.\n" -"\n" -"Parameters:\n" -" method: 1: use a single sample to smooth the variations via the standard " -"weighted mean over past samples (default); 2: use several samples to smooth " -"the variations via the standard weighted mean over past samples.\n" -msgstr "" - -#: xinestream.cpp:269 -#, qt-format -msgid "Cannot find input plugin for MRL [%1]" -msgstr "" - -#: xinestream.cpp:273 -msgid "Cannot find demultiplexer plugin for the given media data" -msgstr "" - -#: xinestream.cpp:275 -#, qt-format -msgid "Cannot find demultiplexer plugin for MRL [%1]" -msgstr "" - -#: xinestream.cpp:509 xinestream.cpp:1248 xinestream.cpp:1355 -#: xinestream.cpp:1395 xinestream.cpp:1423 -msgid "Xine failed to create a stream." -msgstr "" - -#: xinestream.cpp:1338 -msgid "Playback failed because no valid audio or video outputs are available" -msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-l10n-hr-4.8.0/messages/qt/phonon_gstreamer.po new/kde-l10n-hr-4.8.1/messages/qt/phonon_gstreamer.po --- old/kde-l10n-hr-4.8.0/messages/qt/phonon_gstreamer.po 2011-10-11 17:16:11.000000000 +0200 +++ new/kde-l10n-hr-4.8.1/messages/qt/phonon_gstreamer.po 2012-03-02 13:49:30.000000000 +0100 @@ -9,13 +9,13 @@ "PO-Revision-Date: 2010-01-24 16:52+0100\n" "Last-Translator: Andrej Dundovic <adundovi(a)gmail.com>\n" "Language-Team: Croatian <kde-croatia-list(a)lists.sourceforge.net>\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hr\n" "X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: qtrich\n" ++++++ kde-l10n-hu-4.8.0.tar.bz2 -> kde-l10n-hu-4.8.1.tar.bz2 ++++++ ++++ 176329 lines of diff (skipped) ++++++ kde-l10n-ia-4.8.0.tar.bz2 -> kde-l10n-ia-4.8.1.tar.bz2 ++++++ ++++ 87053 lines of diff (skipped) ++++++ kde-l10n-ia-4.8.0.tar.bz2 -> kde-l10n-id-4.8.1.tar.bz2 ++++++ ++++ 346531 lines of diff (skipped) ++++++ kde-l10n-is-4.8.0.tar.bz2 -> kde-l10n-is-4.8.1.tar.bz2 ++++++ ++++ 148242 lines of diff (skipped) ++++++ kde-l10n-it-4.8.0.tar.bz2 -> kde-l10n-it-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-it-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-it-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-ja-4.8.0.tar.bz2 -> kde-l10n-ja-4.8.1.tar.bz2 ++++++ ++++ 163683 lines of diff (skipped) ++++++ kde-l10n-kk-4.8.0.tar.bz2 -> kde-l10n-kk-4.8.1.tar.bz2 ++++++ ++++ 183856 lines of diff (skipped) ++++++ kde-l10n-km-4.8.0.tar.bz2 -> kde-l10n-km-4.8.1.tar.bz2 ++++++ ++++ 149731 lines of diff (skipped) ++++++ kde-l10n-ko-4.8.0.tar.bz2 -> kde-l10n-ko-4.8.1.tar.bz2 ++++++ ++++ 138289 lines of diff (skipped) ++++++ kde-l10n-lt-4.8.0.tar.bz2 -> kde-l10n-lt-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-lt-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-lt-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-lv-4.8.0.tar.bz2 -> kde-l10n-lv-4.8.1.tar.bz2 ++++++ ++++ 140667 lines of diff (skipped) ++++++ kde-l10n-nb-4.8.0.tar.bz2 -> kde-l10n-nb-4.8.1.tar.bz2 ++++++ ++++ 140708 lines of diff (skipped) ++++++ kde-l10n-nds-4.8.0.tar.bz2 -> kde-l10n-nds-4.8.1.tar.bz2 ++++++ ++++ 161219 lines of diff (skipped) ++++++ kde-l10n-nl-4.8.0.tar.bz2 -> kde-l10n-nl-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-nl-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-nl-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-nn-4.8.0.tar.bz2 -> kde-l10n-nn-4.8.1.tar.bz2 ++++++ ++++ 133511 lines of diff (skipped) ++++++ kde-l10n-pa-4.8.0.tar.bz2 -> kde-l10n-pa-4.8.1.tar.bz2 ++++++ ++++ 147220 lines of diff (skipped) ++++++ kde-l10n-pl-4.8.0.tar.bz2 -> kde-l10n-pl-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-pl-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-pl-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-pt-4.8.0.tar.bz2 -> kde-l10n-pt-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-pt-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-pt-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-pt_BR-4.8.0.tar.bz2 -> kde-l10n-pt_BR-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-pt_BR-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-pt_BR-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-ro-4.8.0.tar.bz2 -> kde-l10n-ro-4.8.1.tar.bz2 ++++++ ++++ 158489 lines of diff (skipped) ++++++ kde-l10n-ru-4.8.0.tar.bz2 -> kde-l10n-ru-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-ru-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-ru-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-si-4.8.0.tar.bz2 -> kde-l10n-si-4.8.1.tar.bz2 ++++++ ++++ 103289 lines of diff (skipped) ++++++ kde-l10n-sk-4.8.0.tar.bz2 -> kde-l10n-sk-4.8.1.tar.bz2 ++++++ ++++ 304883 lines of diff (skipped) ++++++ kde-l10n-sl-4.8.0.tar.bz2 -> kde-l10n-sl-4.8.1.tar.bz2 ++++++ ++++ 156970 lines of diff (skipped) ++++++ kde-l10n-sr-4.8.0.tar.bz2 -> kde-l10n-sr-4.8.1.tar.bz2 ++++++ ++++ 56878 lines of diff (skipped) ++++++ kde-l10n-sv-4.8.0.tar.bz2 -> kde-l10n-sv-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-sv-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-sv-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-tg-4.8.0.tar.bz2 -> kde-l10n-tg-4.8.1.tar.bz2 ++++++ ++++ 143184 lines of diff (skipped) ++++++ kde-l10n-th-4.8.0.tar.bz2 -> kde-l10n-th-4.8.1.tar.bz2 ++++++ ++++ 118713 lines of diff (skipped) ++++++ kde-l10n-tr-4.8.0.tar.bz2 -> kde-l10n-tr-4.8.1.tar.bz2 ++++++ ++++ 158321 lines of diff (skipped) ++++++ kde-l10n-uk-4.8.0.tar.bz2 -> kde-l10n-uk-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kde4-l10n/kde-l10n-uk-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kde4-l10n.new/kde-l10n-uk-4.8.1.tar.bz2 differ: char 11, line 1 ++++++ kde-l10n-vi-4.8.0.tar.bz2 -> kde-l10n-vi-4.8.1.tar.bz2 ++++++ ++++ 31171 lines of diff (skipped) ++++++ kde-l10n-wa-4.8.0.tar.bz2 -> kde-l10n-wa-4.8.1.tar.bz2 ++++++ ++++ 71862 lines of diff (skipped) ++++++ kde-l10n-zh_CN-4.8.0.tar.bz2 -> kde-l10n-zh_CN-4.8.1.tar.bz2 ++++++ ++++ 163824 lines of diff (skipped) ++++++ kde-l10n-zh_TW-4.8.0.tar.bz2 -> kde-l10n-zh_TW-4.8.1.tar.bz2 ++++++ ++++ 159604 lines of diff (skipped) ++++++ kde4-l10n.spec.in ++++++ --- /var/tmp/diff_new_pack.gjGwXk/_old 2012-03-20 11:29:54.000000000 +0100 +++ /var/tmp/diff_new_pack.gjGwXk/_new 2012-03-20 11:29:54.000000000 +0100 @@ -18,9 +18,9 @@ # icecream 0 Name: kde4-l10n -Version: 4.8.0 -Release: 1 -License: GPLv2+ +Version: 4.8.1 +Release: 0 +License: GPL-2.0+ Summary: English translations for KDE Url: http://l10n.kde.org/ Group: System/Localization ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.gjGwXk/_old 2012-03-20 11:29:54.000000000 +0100 +++ /var/tmp/diff_new_pack.gjGwXk/_new 2012-03-20 11:29:54.000000000 +0100 @@ -53,10 +53,10 @@ done echo "%package $lang" >&4 - echo "License: GPL v2 or later" >&4 echo "Summary: summary" >&4 echo "Group: System/Localization" >&4 - echo "Provides: kde-l10n-$lang locale(kdelibs4:$plang)" >&4 + echo "Provides: kde-l10n-$lang" >&4 + echo "Provides: locale(kdelibs4:$plang)" >&4 echo "Supplements: packageand(kdelibs4:kde3-i18n-$lang)" >&4 if test "$lang" = "nn"; then echo "Provides: kde4-l10n-no_NY = %{version}" >&4 @@ -70,7 +70,6 @@ if test $splitpackage; then echo "%package $lang-doc" >&4 echo "Summary: summary" >&4 - echo "License: GPL v2 or later" >&4 echo "Group: System/Localization" >&4 echo "Provides: locale(kdelibs4:$plang)" >&4 echo "Supplements: packageand(kdelibs4:kde3-i18n-$lang)" >&4 @@ -80,7 +79,7 @@ echo "" >&4 echo "%package $lang-data" >&4 echo "Summary: summary" >&4 - echo "License: GPL v2 or later" >&4 + echo "License: GPL-2.0+" >&4 echo "Group: System/Localization" >&4 echo "Provides: locale(kdelibs4:$plang)" >&4 echo "Supplements: packageand(kdelibs4:kde3-i18n-$lang)" >&4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2012-03-20 11:27:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2012-03-15 15:58:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2012-03-20 11:27:56.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 16 13:49:12 CET 2012 - snwint(a)suse.de + +- remove libelf0 + +------------------------------------------------------------------- +Fri Mar 16 11:32:42 CET 2012 - snwint(a)suse.de + +- adjust xorg lib deps + +------------------------------------------------------------------- Old: ---- installation-images-13.34.tar.bz2 new.patch New: ---- installation-images-13.36.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.uhvl27/_old 2012-03-20 11:27:58.000000000 +0100 +++ /var/tmp/diff_new_pack.uhvl27/_new 2012-03-20 11:27:58.000000000 +0100 @@ -91,7 +91,6 @@ BuildRequires: krb5-devel BuildRequires: libXi6 BuildRequires: libcares2 -BuildRequires: libelf0 BuildRequires: libexpat1 BuildRequires: libfuse2 BuildRequires: libidn @@ -335,10 +334,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.34 +Version: 13.36 Release: 0 -Source: installation-images-13.34.tar.bz2 -Patch0: new.patch +Source: installation-images-13.36.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -401,7 +399,6 @@ %prep %setup -%patch0 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build ++++++ installation-images-13.34.tar.bz2 -> installation-images-13.36.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.34/VERSION new/installation-images-13.36/VERSION --- old/installation-images-13.34/VERSION 2012-03-15 13:53:59.000000000 +0100 +++ new/installation-images-13.36/VERSION 2012-03-16 13:49:06.000000000 +0100 @@ -1 +1 @@ -13.34 +13.36 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.34/bin/mk_image new/installation-images-13.36/bin/mk_image --- old/installation-images-13.34/bin/mk_image 2012-03-14 13:56:59.000000000 +0100 +++ new/installation-images-13.36/bin/mk_image 2012-03-16 13:32:02.000000000 +0100 @@ -179,6 +179,7 @@ if($x =~ /^\//) { next if $x =~ m#^/lbin/#; next if $x =~ m#^/proc/#; + next if $x =~ m#^/dev/#; next if -e "$dir$x"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.34/changelog new/installation-images-13.36/changelog --- old/installation-images-13.34/changelog 2012-03-15 13:54:03.000000000 +0100 +++ new/installation-images-13.36/changelog 2012-03-16 13:49:10.000000000 +0100 @@ -1,4 +1,10 @@ -2012-03-15: HEAD +2012-03-16: HEAD + - use all of systemd + +2012-03-16: 13.35 + - adjust xorg lib deps + +2012-03-15: 13.34 - make vbox package optional - add yast.ssh link (bnc #745340) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.34/data/root/root.file_list new/installation-images-13.36/data/root/root.file_list --- old/installation-images-13.34/data/root/root.file_list 2012-03-15 13:53:04.000000000 +0100 +++ new/installation-images-13.36/data/root/root.file_list 2012-03-16 13:38:02.000000000 +0100 @@ -41,12 +41,11 @@ # # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# FIXME: for ltrace -libelf0: +libkmod*: / systemd: - /usr/<lib> + / libdb-*: / @@ -1316,11 +1315,11 @@ libgmodule-2_0-*: / -libxcb-render*: - / +#libxcb-render*: +# / -libxcb-shape*: - / +#libxcb-shape*: +# / libltdl*: / -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hydrogen for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package hydrogen for openSUSE:Factory checked in at 2012-03-20 11:27:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hydrogen (Old) and /work/SRC/openSUSE:Factory/.hydrogen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hydrogen", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hydrogen/hydrogen.changes 2011-10-26 20:21:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hydrogen.new/hydrogen.changes 2012-03-20 11:27:50.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 20:38:28 UTC 2012 - boris(a)steki.net + +- Add hydrogen-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- hydrogen-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hydrogen.spec ++++++ --- /var/tmp/diff_new_pack.8tr0KC/_old 2012-03-20 11:27:52.000000000 +0100 +++ /var/tmp/diff_new_pack.8tr0KC/_new 2012-03-20 11:27:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package hydrogen # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,9 +25,30 @@ %define librubberband 0 Name: hydrogen -BuildRequires: alsa-devel doxygen flac-devel libjack-devel liblrdf-devel libqt4-devel libsndfile-devel util-linux -BuildRequires: ladspa ladspa-devel lash-devel libarchive-devel libraptor-devel portaudio-devel zlib-devel -BuildRequires: cmake fdupes gcc-c++ help2man hicolor-icon-theme pkg-config rsync subversion update-desktop-files +BuildRequires: alsa-devel +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: flac-devel +BuildRequires: gcc-c++ +BuildRequires: help2man +BuildRequires: hicolor-icon-theme +BuildRequires: ladspa +BuildRequires: ladspa-devel +BuildRequires: lash-devel +BuildRequires: libarchive-devel +BuildRequires: libjack-devel +BuildRequires: liblrdf-devel +BuildRequires: libqt4-devel +BuildRequires: libraptor-devel +BuildRequires: libsndfile-devel +BuildRequires: pkg-config +BuildRequires: portaudio-devel +BuildRequires: rsync +BuildRequires: subversion +BuildRequires: update-desktop-files +BuildRequires: util-linux +BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt3Support) BuildRequires: pkgconfig(QtCLucene) BuildRequires: pkgconfig(QtCore) @@ -60,11 +81,11 @@ BuildRequires: rubberband-cli %endif Summary: A Real-Time Drum Machine and Sequencer +License: GPL-2.0+ +Group: Productivity/Multimedia/Sound/Midi # NOTE: Don't forget to update the libsuffix macro. Version: 0.9.6 Release: 0 -License: GPL-2.0+ -Group: Productivity/Multimedia/Sound/Midi BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.hydrogen-music.org/ Source0: %{name}-%{version}.tar.bz2 @@ -77,6 +98,8 @@ Patch1: hydrogen-no-current-time.patch # libhydrogencore has no soname and installs in _libexecdir Patch2: hydrogen-0.9.6-lib64.patch +# PATCH-FIX-UPSTREAM hydrogen-gcc47.patch boris(a)steki.net -- Fix build with gcc 4.7. +Patch3: hydrogen-gcc47.patch %description Hydrogen is an advanced drum machine for GNU/Linux. @@ -103,15 +126,15 @@ Export song to midi file. %package -n libhydrogen-core%{soversion} -Group: System/Libraries Summary: Library essential for hydrogen +Group: System/Libraries %description -n libhydrogen-core%{soversion} This is the core of hydrogen's operation. %package -n libhydrogen-core-devel -Group: Development/Libraries/C and C++ Summary: Development files and headers for libhydrogen-core +Group: Development/Libraries/C and C++ Requires: libhydrogen-core%{soversion} = %{version}-%{release} %description -n libhydrogen-core-devel @@ -123,6 +146,8 @@ %patch0 %patch1 %patch2 +%patch3 + # copy licence with correct fsf address install -m 0644 %{S:3} ./ ++++++ hydrogen-gcc47.patch ++++++ Index: src/gui/src/SongEditor/SongEditor.cpp =================================================================== --- src/gui/src/SongEditor/SongEditor.cpp.orig 2011-07-13 07:20:49.000000000 +0200 +++ src/gui/src/SongEditor/SongEditor.cpp 2012-03-17 21:26:39.717208076 +0100 @@ -21,6 +21,7 @@ */ #include <assert.h> +#include <unistd.h> #include <algorithm> #include <memory> Index: src/tests/xml.cpp =================================================================== --- src/tests/xml.cpp.orig 2011-07-22 09:34:28.000000000 +0200 +++ src/tests/xml.cpp 2012-03-17 21:25:11.436012069 +0100 @@ -1,4 +1,4 @@ - +#include <unistd.h> #include <hydrogen/helpers/filesystem.h> #include <hydrogen/basics/drumkit.h> Index: src/gui/src/MainForm.cpp =================================================================== --- src/gui/src/MainForm.cpp.orig 2011-07-04 23:27:45.000000000 +0200 +++ src/gui/src/MainForm.cpp 2012-03-17 21:33:34.983627498 +0100 @@ -20,6 +20,7 @@ * */ +#include <unistd.h> #include <hydrogen/version.h> #include <hydrogen/hydrogen.h> #include <hydrogen/playlist.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hxtools for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package hxtools for openSUSE:Factory checked in at 2012-03-20 11:27:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hxtools (Old) and /work/SRC/openSUSE:Factory/.hxtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hxtools", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/hxtools/hxtools.changes 2012-01-09 16:21:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hxtools.new/hxtools.changes 2012-03-20 11:27:38.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 12 11:27:33 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-2.0+ + spec file license should be in SPDX (compatible) format. GPL-2.0+ seems + to be the most appropriate license choice for the resulting binary (no + GPL-3.0 except for as choice in dual license situation) + +------------------------------------------------------------------- +Sat Feb 25 10:00:17 UTC 2012 - jengelh(a)medozas.de + +- Avoid fdupes-induced hardlink across partitions + +------------------------------------------------------------------- New: ---- 7a4b085-capabilities.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hxtools.spec ++++++ --- /var/tmp/diff_new_pack.uCB4uO/_old 2012-03-20 11:27:39.000000000 +0100 +++ /var/tmp/diff_new_pack.uCB4uO/_new 2012-03-20 11:27:39.000000000 +0100 @@ -15,23 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: hxtools Version: 20120107 Release: 0 -Group: System/Base Url: http://jengelh.medozas.de/projects/hxtools/ Summary: Collection of day-to-day tools (binaries) +License: GPL-2.0+ +Group: System/Base Source: %name-%version.tar.xz Source2: %name-%version.tar.xz.asc -License: GPL,PD +Patch1: 7a4b085-capabilities.diff +BuildRequires: fdupes +BuildRequires: libcap-devel >= 2 # xorg-x11 for "bdftopcf" -BuildRequires: libcap-devel xorg-x11 xz -BuildRequires: pkgconfig >= 0.23 pkgconfig(libHX) >= 3.12 +%if 0%{?suse_version} +BuildRequires: xorg-x11 +%endif +%if 0%{?rhel_version} || 0%{?fedora_version} +BuildRequires: bdftopcf +%endif +BuildRequires: pkgconfig >= 0.21 +BuildRequires: xz +%if 0%{?suse_version} >= 1130 +BuildRequires: pkgconfig(libHX) >= 3.12 +%else +BuildRequires: libHX-devel >= 3.12 +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -Recommends: %name-scripts = %version, %name-man = %version + +Requires: %name-scripts = %version +%if 0%{?suse_version} >= 1100 +Recommends: %name-man = %version +%else +Requires: %name-man = %version +%endif %define build_profile 1 @@ -47,10 +65,17 @@ * vfontas(1) — VGA font file assembler %package scripts -Group: System/Base Summary: Collection of day-to-day tools (scripts) +Group: System/Base +%if 0%{?suse_version} >= 1120 BuildArch: noarch -Recommends: %name, %name-man +%endif +Requires: %name +%if 0%{?suse_version} >= 1100 +Recommends: %name-man +%else +Requires: %name-man +%endif Requires: perl(Data::Dumper), perl(File::Find) Requires: perl(File::Find::Rule) Requires: perl(Getopt::Long), perl(IPC::Open2), perl(Text::CSV_XS) @@ -81,18 +106,22 @@ * wktimer(1) — work timer %package man -Group: Documentation/Man Summary: Manual pages for the hxtools suite +Group: Documentation/Man +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%endif %description man This package contains the manual pages for the binaries and scripts from hxtools. %package data -Group: System/Base Summary: Collection of day-to-day tools (data) +Group: System/Base +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%endif %description data Architecture-independent data from hxtools. @@ -102,11 +131,13 @@ * additional syntax highlighting definitions for mcedit %package profile -Group: System/Base Summary: The hxtools shell environment +Group: System/Base Requires: %name = %version, %name-scripts = %version Requires: %name-data = %version +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%endif %description profile Bash environment settings from hxtools. Particularly, this provides @@ -114,7 +145,13 @@ only important parts of a path. %prep +%if 0%{?__xz:1} %setup -q +%else +tar -xf "%{S:0}" --use=xz; +%setup -DTq +%endif +%patch -P 1 -p1 %build %configure \ @@ -132,7 +169,8 @@ install -dm0755 "$b/%_datadir/mc/syntax"; install -pm0644 cooledit/*.syntax "$b/%_datadir/mc/syntax/"; install -dm0755 "$b/%_sysconfdir/openldap/schema"; -install -pm0644 data/rfc2307bis-utf8.schema "$b/%_sysconfdir/openldap/schema/"; +ln -s "%_datadir/hxtools/rfc2307bis-utf8.schema" \ + "$b/%_sysconfdir/openldap/schema/"; cd "$b"; find ./%_bindir ./%_libexecdir ! -type d -exec grep -l ELF {} + | \ @@ -149,6 +187,8 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*; %endif +%fdupes %buildroot + %files -f binary.lst %defattr(-,root,root) %dir %_libexecdir/%name ++++++ 7a4b085-capabilities.diff ++++++ parent e688e5c6d8a9b0032db2218ab71766f11c19d2ca (rel-20120107-4-ge688e5c) commit 7a4b085d13182f690b1bbdc971401251b6be09a2 Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Sat Feb 11 02:13:39 2012 +0100 printcaps: guard against non-existing capability defines --- sadmin/printcaps.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/sadmin/printcaps.c b/sadmin/printcaps.c index bb957e3..bd14d6c 100644 --- a/sadmin/printcaps.c +++ b/sadmin/printcaps.c @@ -47,9 +47,15 @@ static const char *const cap_names[] = { E(LEASE), E(AUDIT_WRITE), E(AUDIT_CONTROL), +#ifdef CAP_SETFCAP E(SETFCAP), +#endif +#ifdef CAP_MAC_OVERRIDE E(MAC_OVERRIDE), +#endif +#ifdef CAP_MAC_ADMIN E(MAC_ADMIN), +#endif #undef E }; -- # Created with git-export-patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hugin for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at 2012-03-20 11:27:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hugin (Old) and /work/SRC/openSUSE:Factory/.hugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hugin", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2012-01-11 15:37:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hugin.new/hugin.changes 2012-03-20 11:27:32.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 19 17:30:17 UTC 2012 - alinm.elena(a)gmail.com + +- added patch to fix gcc 4.7 failure (gcc47.diff) +- added fdupes + +------------------------------------------------------------------- New: ---- gcc47.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.MzFgyC/_old 2012-03-20 11:27:33.000000000 +0100 +++ /var/tmp/diff_new_pack.MzFgyC/_new 2012-03-20 11:27:33.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: hugin BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel @@ -24,21 +23,22 @@ BuildRequires: boost-devel BuildRequires: cmake BuildRequires: fdupes +BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: lapack BuildRequires: libexiv2-devel +BuildRequires: libjpeg-devel BuildRequires: liblapack3 BuildRequires: libpano-devel >= 2.9.18 +BuildRequires: libtiff-devel BuildRequires: libxml2 BuildRequires: tclap BuildRequires: update-desktop-files BuildRequires: vigra BuildRequires: zip -BuildRequires: libtiff-devel -BuildRequires: libjpeg-devel %if 0%{?suse_version} > 1130 BuildRequires: python-wxWidgets >= 2.7.0 BuildRequires: wxWidgets-devel @@ -58,6 +58,7 @@ # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin #Source: %%{name}-svn2008xxxx.tar.bz2 Source1: %{name}-svn-dummy +Patch0: gcc47.diff Requires: enblend-enfuse >= 3.2 Recommends: autopano-sift Recommends: exiftool @@ -96,6 +97,7 @@ #mkdir bin #cp %%{SOURCE1} bin/svn #chmod +x bin/svn +%patch0 -p1 %build export PATH=$PWD/bin:$PATH @@ -119,6 +121,7 @@ mkdir -p %{buildroot}%{_docdir}/%{name} cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO %{buildroot}%{_docdir}/%{name}/ chmod -x %{buildroot}%{_docdir}/%{name}/* +%fdupes %{buildroot} %post %if 0%{?suse_version} > 1130 ++++++ gcc47.diff ++++++ diff -r 658ded2153f2 src/celeste/Utilities.h --- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100 +++ b/src/celeste/Utilities.h SunSat Jan 07 19:38:25 2012 +0000 @@ -33,6 +33,8 @@ #include <stdio.h> #ifdef _WINDOWS #include "direct.h" +#else +#include <unistd.h> #endif using namespace std; diff -r 658ded2153f2 src/foreign/zthread/include/zthread/Guard.h --- a/src/foreign/zthread/include/zthread/Guard.h SunSatSun Jan 01 13:23:39 2012 +0100 +++ b/src/foreign/zthread/include/zthread/Guard.h SunSatSunSat Jan 07 19:38:25 2012 +0000 @@ -428,7 +428,7 @@ template <class U, class V> Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { - LockingPolicy::shareScope(*this, extract(g)); + LockingPolicy::shareScope(*this, this->extract(g)); } @@ -458,7 +458,7 @@ template <class U, class V> Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { - LockingPolicy::transferScope(*this, extract(g)); + LockingPolicy::transferScope(*this, this->extract(g)); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit groff for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package groff for openSUSE:Factory checked in at 2012-03-20 11:27:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/groff (Old) and /work/SRC/openSUSE:Factory/.groff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "groff", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/groff/groff.changes 2011-10-02 10:10:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.groff.new/groff.changes 2012-03-20 11:27:21.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Mar 18 00:14:49 UTC 2012 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Enable parallel build with %_smp_mflags + +------------------------------------------------------------------- gxditview.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ groff.spec ++++++ --- /var/tmp/diff_new_pack.mSlIRf/_old 2012-03-20 11:27:23.000000000 +0100 +++ /var/tmp/diff_new_pack.mSlIRf/_new 2012-03-20 11:27:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package groff # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,16 +14,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild - - Name: groff -License: BSD-3-Clause ; GPL-2.0+ -Group: Productivity/Publishing/Troff Version: 1.21 -Release: 1 +Release: 0 Summary: GNU troff Document Formatting System +License: BSD-3-Clause ; GPL-2.0+ +Group: Productivity/Publishing/Troff Url: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz Source3: zzz-groff.sh @@ -51,15 +47,14 @@ Patch10: groff-force-locale-usage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: fdupes +BuildRequires: gcc-c++ Provides: normal-groff = %{version}-%{release} Provides: jgroff = %{version}-%{release} Obsoletes: jgroff < %{version} Requires(pre): %fillup_prereq Requires(pre): %install_info_prereq -AutoReqProv: on # for pre-grohtml and pdfroff Recommends: netpbm Recommends: ghostscript-library @@ -76,9 +71,8 @@ /usr/X11R6/man/. %package doc -License: BSD-3-Clause ; GPL-2.0+ -Group: Productivity/Publishing/Troff Summary: HTML documentation and examples for groff +Group: Productivity/Publishing/Troff %description doc The groff package provides compatible versions of troff, nroff, eqn, @@ -91,7 +85,7 @@ /usr/X11R6/man/. %prep -%setup -q -n groff-%{version} +%setup -q %patch0 -p1 -b .debian %patch1 %patch2 -p1 -b .bnc540600 @@ -118,9 +112,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{configure} ulimit -c unlimited -%{__make} +make %{?_smp_mflags} pushd doc - %{__make} + make %{?_smp_mflags} makeinfo groff.texinfo popd @@ -143,9 +137,6 @@ %fdupes -s %{buildroot} -%clean -rm -rf %{buildroot} - %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz ++++++ gxditview.spec ++++++ --- /var/tmp/diff_new_pack.mSlIRf/_old 2012-03-20 11:27:23.000000000 +0100 +++ /var/tmp/diff_new_pack.mSlIRf/_new 2012-03-20 11:27:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gxditview # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,16 +14,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - - Name: gxditview -License: MIT -Group: Productivity/Publishing/Troff -AutoReqProv: on Version: 1.21 -Release: 1 +Release: 0 Summary: Ditroff Output Displayer for Groff +License: MIT +Group: Productivity/Publishing/Troff Url: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz # for file in `cat series | grep -v '^#' | grep '^[a-z]' `; do @@ -52,9 +48,9 @@ the -X option. %package -n groff-devx +Summary: X output devices for groff License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Publishing/Troff -Summary: X output devices for groff Requires: groff Supplements: groff @@ -81,7 +77,7 @@ # export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" INSTALL_PROGRAM='${INSTALL}' %{configure} -%{__make} +make %{?_smp_mflags} %install @@ -101,9 +97,6 @@ %{__install} -m 0644 %{name}.man %{buildroot}%{_mandir}/man1/%{name}.1 popd -%clean -%{__rm} -rf %{buildroot} - %files %defattr(-,root,root) %doc src/devices/xditview/ChangeLog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gptfdisk for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package gptfdisk for openSUSE:Factory checked in at 2012-03-20 11:27:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gptfdisk (Old) and /work/SRC/openSUSE:Factory/.gptfdisk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gptfdisk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gptfdisk/gptfdisk.changes 2012-03-09 21:23:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gptfdisk.new/gptfdisk.changes 2012-03-20 11:27:14.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 15:12:31 UTC 2012 - dimstar(a)opensuse.org + +- Add gptfdisk-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- gptfdisk-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gptfdisk.spec ++++++ --- /var/tmp/diff_new_pack.01fUvW/_old 2012-03-20 11:27:15.000000000 +0100 +++ /var/tmp/diff_new_pack.01fUvW/_new 2012-03-20 11:27:15.000000000 +0100 @@ -22,10 +22,15 @@ Group: Applications/System Url: http://rodsbooks.com/gdisk Source: http://rodsbooks.com/gdisk/gptfdisk-0.8.2.tar.gz +Patch0: gptfdisk-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: e2fsprogs-devel gcc-c++ libicu-devel libuuid-devel -BuildRequires: ncurses-devel popt-devel +BuildRequires: gcc-c++ +BuildRequires: ncurses-devel +BuildRequires: pkgconfig(icu-io) +BuildRequires: pkgconfig(icu-uc) +BuildRequires: pkgconfig(popt) +BuildRequires: pkgconfig(uuid) %description Partitioning software for GPT disks and to repair MBR disks. The @@ -57,6 +62,7 @@ %prep %setup -q +%patch0 -p1 %build CFLAGS="%optflags" CXXFLAGS="%optflags" make %{?_smp_mflags} ++++++ gptfdisk-gcc47.patch ++++++ Index: gptfdisk-0.8.2/diskio-unix.cc =================================================================== --- gptfdisk-0.8.2.orig/diskio-unix.cc +++ gptfdisk-0.8.2/diskio-unix.cc @@ -22,6 +22,7 @@ #include <errno.h> #include <fcntl.h> #include <sys/stat.h> +#include <unistd.h> #ifdef __linux__ #include "linux/hdreg.h" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fwbuilder for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package fwbuilder for openSUSE:Factory checked in at 2012-03-20 11:27:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwbuilder (Old) and /work/SRC/openSUSE:Factory/.fwbuilder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fwbuilder", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fwbuilder/fwbuilder.changes 2012-02-10 17:13:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fwbuilder.new/fwbuilder.changes 2012-03-20 11:27:05.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 21:39:27 UTC 2012 - dimstar(a)opensuse.org + +- Add fwbuilder-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- fwbuilder-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwbuilder.spec ++++++ --- /var/tmp/diff_new_pack.2gZTWB/_old 2012-03-20 11:27:06.000000000 +0100 +++ /var/tmp/diff_new_pack.2gZTWB/_new 2012-03-20 11:27:06.000000000 +0100 @@ -27,6 +27,7 @@ Release: 0.0 Url: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.bz2 +Patch0: fwbuilder-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -64,6 +65,7 @@ %prep %setup -q +%patch0 -p1 %build ./autogen.sh ++++++ fwbuilder-gcc47.patch ++++++ Only in fwbuilder-5.0.1.3592: patches Only in fwbuilder-5.0.1.3592: .pc diff -upr fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h --- fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2011-12-08 02:02:07.000000000 +0100 +++ /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-03-17 22:29:16.317275376 +0100 @@ -31,6 +31,7 @@ #include <time.h> //for time_t definition #include <pthread.h> +#include <unistd.h> #include <string> #include <queue> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit firmwarekit for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package firmwarekit for openSUSE:Factory checked in at 2012-03-20 11:26:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firmwarekit (Old) and /work/SRC/openSUSE:Factory/.firmwarekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "firmwarekit", Maintainer is "trenn(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/firmwarekit/firmwarekit.changes 2011-09-23 01:57:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.firmwarekit.new/firmwarekit.changes 2012-03-20 11:26:57.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 16 09:14:03 UTC 2012 - aj(a)suse.de + +- It's nostdlib and not nostdlibs as command line option. +- Remove obsolete version checks. + +------------------------------------------------------------------- New: ---- firmwarekit-gcc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firmwarekit.spec ++++++ --- /var/tmp/diff_new_pack.jOAIsi/_old 2012-03-20 11:26:59.000000000 +0100 +++ /var/tmp/diff_new_pack.jOAIsi/_new 2012-03-20 11:26:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package firmwarekit (Version 3) +# spec file for package firmwarekit # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,7 @@ BuildRequires: bash coreutils dhcp-client findutils gawk gdb glib2-devel BuildRequires: grep iproute2 module-init-tools ncurses-devel newt newt-devel BuildRequires: perl pkgconfig sed sharutils slang-devel sysvinit -%if %suse_version > 1110 BuildRequires: acpica dmidecode -%else -BuildRequires: pmtools -%endif BuildRequires: termcap util-linux wget xorg-x11-util-devel Url: http://www.linuxfirmwarekit.org Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines @@ -36,11 +32,7 @@ Group: System/Boot AutoReqProv: on PreReq: gzip -%if %suse_version > 1110 Requires: acpica dmidecode -%else -Requires: pmtools -%endif Requires: hwinfo util-linux powertop Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,6 +53,7 @@ Patch12: %{name}-fix-rpmlint.patch Patch13: %{name}-outputdir Patch14: %{name}-dmidecode-detail +Patch15: %{name}-gcc.patch %description This tool, developed by Intel, is meant for vendors to validate and @@ -91,6 +84,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 # This is arch specific stuff, put all in /usr/lib/firmwarekit %define location /usr/lib/%{name} ++++++ firmwarekit-gcc.patch ++++++ Index: linuxfirmwarekit/Makefile =================================================================== --- linuxfirmwarekit.orig/Makefile +++ linuxfirmwarekit/Makefile @@ -1,7 +1,7 @@ CFLAGS = -Wall -W -Os -D_FORTIFY_SOURCE=2 -g override CFLAGS += `pkg-config --cflags glib-2.0` -I/usr/include/slang -fPIC -I. #LDFLAGS = -nodefaultlibs -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang -LDFLAGS = -nostdlibs -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang +LDFLAGS = -nostdlib -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang # Rip out lmbench, our package is in no good shape... ++++++ firmwarekit-outputdir ++++++ --- /var/tmp/diff_new_pack.jOAIsi/_old 2012-03-20 11:26:59.000000000 +0100 +++ /var/tmp/diff_new_pack.jOAIsi/_new 2012-03-20 11:26:59.000000000 +0100 @@ -15,8 +15,10 @@ ssh.c | 10 ++++++---- 6 files changed, 67 insertions(+), 9 deletions(-) ---- a/acpitable.c -+++ b/acpitable.c +Index: linuxfirmwarekit/acpitable.c +=================================================================== +--- linuxfirmwarekit.orig/acpitable.c ++++ linuxfirmwarekit/acpitable.c @@ -180,6 +180,7 @@ void extract_acpi_tables(void) * are located (should exist after compiling "acpicompile" plugin). * Since we're standalone, we could be called from a few different @@ -43,8 +45,10 @@ } void load_acpi_tables(void) { ---- a/biostest.h -+++ b/biostest.h +Index: linuxfirmwarekit/biostest.h +=================================================================== +--- linuxfirmwarekit.orig/biostest.h ++++ linuxfirmwarekit/biostest.h @@ -139,6 +139,7 @@ extern int locate_acpi_table(char *name, extern int e820_is_reserved(uint64_t memory); extern char *copy_acpi_table(void *address, char *name); @@ -53,8 +57,10 @@ /* lib.c */ ---- a/firmwarekit.h -+++ b/firmwarekit.h +Index: linuxfirmwarekit/firmwarekit.h +=================================================================== +--- linuxfirmwarekit.orig/firmwarekit.h ++++ linuxfirmwarekit/firmwarekit.h @@ -61,7 +61,9 @@ extern char *result_to_ascii(int res); extern char *get_relative_command(char *cmd, char *options); extern char *get_kernel_ver(void); @@ -66,9 +72,11 @@ #endif ---- a/lib.c -+++ b/lib.c -@@ -332,3 +332,53 @@ char *get_lfdk_ver(void) { +Index: linuxfirmwarekit/lib.c +=================================================================== +--- linuxfirmwarekit.orig/lib.c ++++ linuxfirmwarekit/lib.c +@@ -281,3 +281,53 @@ char *get_lfdk_ver(void) { chop_newline(lfdk_ver); return strdup(lfdk_ver); } @@ -122,8 +130,10 @@ + return returnpath; +} + ---- a/plugins.c -+++ b/plugins.c +Index: linuxfirmwarekit/plugins.c +=================================================================== +--- linuxfirmwarekit.orig/plugins.c ++++ linuxfirmwarekit/plugins.c @@ -261,15 +261,15 @@ void execute_plugins(char *directory) do_plugin(buffer); } @@ -143,8 +153,10 @@ do_exe_plugin(buffer); } ---- a/ssh.c -+++ b/ssh.c +Index: linuxfirmwarekit/ssh.c +=================================================================== +--- linuxfirmwarekit.orig/ssh.c ++++ linuxfirmwarekit/ssh.c @@ -67,10 +67,12 @@ int copy_via_ssh(const char *dest) } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit exim for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package exim for openSUSE:Factory checked in at 2012-03-20 11:26:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/exim (Old) and /work/SRC/openSUSE:Factory/.exim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "exim", Maintainer is "poeml(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/exim/exim.changes 2011-09-23 01:57:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.exim.new/exim.changes 2012-03-20 11:26:48.000000000 +0100 @@ -1,0 +2,94 @@ +Sat Mar 17 19:42:30 UTC 2012 - lars(a)samba.org + +- Disable format-security and missing-format-attribute warnings via CFLAGS on + pre-11.2 systems. + +------------------------------------------------------------------- +Wed Mar 7 16:13:51 UTC 2012 - lars(a)samba.org + +- Remove obsoleted Authors lines from spec file. + +------------------------------------------------------------------- +Wed Mar 7 15:33:12 UTC 2012 - lars(a)samba.org + +- update to 4.77 + - DKIM Verification: Fix relaxed canon for empty headers w/o + whitespace trailer + - Fix a couple more cases where we did not log the error message + when unlink() failed. See also change 4.74-TF/03. + - Make the exiwhat support code safe for signals. Previously Exim might + lock up or crash if it happened to be inside a call to libc when it + got a SIGUSR1 from exiwhat. + - The SIGUSR1 handler appends the current process status to the process + log which is later printed by exiwhat. It used to use the general + purpose logging code to do this, but several functions it calls are + not safe for signals. + - The new output code in the SIGUSR1 handler is specific to the process + log, and simple enough that it's easy to inspect for signal safety. + Removing some special cases also simplifies the general logging code. + Removing the spurious timestamps from the process log simplifies + exiwhat. + - Improved ratelimit ACL condition. + - Removed obsolete $Cambridge$ CVS revision strings. + - Removed a few PCRE remnants. + - Automatically extract Exim's version number from tags in the git + repository when doing development or release builds. + - Raise smtp_cmd_buffer_size to 16kB. + Bugzilla 879. Patch from Paul Fisher. + - Implement SSL-on-connect outbound with protocol=smtps on smtp transport. + Heavily based on revision 40f9a89a from Simon Arlott's tree. + Bugzilla 97. + - Use .dylib instead of .so for dynamic library loading on MacOS. + - Variable $av_failed, true if the AV scanner deferred. + Bugzilla 1078. Patch from John Horne. + - Stop make process more reliably on build failure. + Bugzilla 1087. Patch from Heiko Schlittermann. + - Make maildir_use_size_file an _expandable_ boolean. + Bugzilla 1089. Patch from Heiko Schlittermann. + - Handle ${run} returning more data than OS pipe buffer size. + Bugzilla 1131. Patch from Holger Weiß. + - Handle IPv6 addresses with SPF. + Bugzilla 860. Patch from Wolfgang Breyha. + - GnuTLS: support TLS 1.2 & 1.1. + Bugzilla 1156. + Use gnutls_certificate_verify_peers2() [patch from Andreas Metzler]. + Bugzilla 1095. + - match_* no longer expand right-hand-side by default. + New compile-time build option, EXPAND_LISTMATCH_RHS. + New expansion conditions, "inlist", "inlisti". + - fix uninitialised greeting string from PP/03 (smtps client support). + - shell and compiler warnings fixes for RC1-RC4 changes. + - fix log_write() format string regression from TF/03. + Bugzilla 1152. Patch from Dmitry Isaikin. + +- update to 4.77 + - The new ldap_require_cert option would segfault if used. Fixed. + - Harmonised TLS library version reporting; only show if debugging. + Layout now matches that introduced for other libraries in 4.74 PP/03. + - New openssl_options items: no_sslv2 no_sslv3 no_ticket no_tlsv1 + - New "dns_use_edns0" global option. + - Don't segfault on misconfiguration of ref:name exim-user as uid. + Bugzilla 1098. + - Extra paranoia around buffer usage at the STARTTLS transition. + nb: Exim is not vulnerable to http://www.kb.cert.org/vuls/id/555316 + - Updated PolarSSL code to 0.14.2. + Bugzilla 1097. Patch from Andreas Metzler. + - Catch divide-by-zero in ${eval:...}. + Fixes bugzilla 1102. + - Condition negation of bool{}/bool_lax{} did not negate. Fixed. + Bugzilla 1104. + - Bugzilla 1106: CVE-2011-1764 - DKIM log line was subject to a + format-string attack -- SECURITY: remote arbitrary code execution. + - SECURITY - DKIM signature header parsing was double-expanded, second + time unintentionally subject to list matching rules, letting the header + cause arbitrary Exim lookups (of items which can occur in lists, *not* + arbitrary string expansion). This allowed for information disclosure. + - Fix another SIGFPE (x86) in ${eval:...} expansion, this time related to + INT_MIN/-1 -- value coerced to INT_MAX. + +------------------------------------------------------------------- +Wed Mar 7 14:58:55 UTC 2012 - lars(a)samba.org + +- Package /var/log/exim owned by user and group mail; (bnc#670711). + +------------------------------------------------------------------- Old: ---- 109066729a54f6ba5c4e8bc174133da33242e930.diff exim-4.75.tar.bz2 New: ---- exim-4.77.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exim.spec ++++++ --- /var/tmp/diff_new_pack.2qedqg/_old 2012-03-20 11:26:50.000000000 +0100 +++ /var/tmp/diff_new_pack.2qedqg/_new 2012-03-20 11:26:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package exim # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,33 +15,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: exim -BuildRequires: db-devel openldap2-devel pcre-devel +BuildRequires: db-devel +BuildRequires: openldap2-devel +BuildRequires: pcre-devel %if %{?suse_version:1}%{?!suse_version:0} BuildRequires: tcpd-devel %if %suse_version > 910 BuildRequires: xorg-x11-devel %else -BuildRequires: XFree86-devel XFree86-libs +BuildRequires: XFree86-devel +BuildRequires: XFree86-libs %endif %else -BuildRequires: libXaw-devel libXext-devel libXt-devel openssl-devel tcp_wrappers xorg-x11-server-sdk +BuildRequires: libXaw-devel +BuildRequires: libXext-devel +BuildRequires: libXt-devel +BuildRequires: openssl-devel +BuildRequires: tcp_wrappers +BuildRequires: xorg-x11-server-sdk %endif Url: http://www.exim.org/ Conflicts: sendmail sendmail-tls postfix -License: GPL-2.0+ -Group: Productivity/Networking/Email/Servers -AutoReqProv: on Provides: smtp_daemon %if %{?suse_version:%suse_version}%{?!suse_version:0} > 800 Requires: logrotate PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils %endif -Version: 4.75 -Release: 3 +Version: 4.77 +Release: 0 %if %{?build_with_mysql:1}0 BuildRequires: mysql-devel Provides: exim = %version @@ -51,6 +54,8 @@ Provides: exim = %version %endif Summary: The Exim Mail Transfer Agent, a Replacement for sendmail +License: GPL-2.0+ +Group: Productivity/Networking/Email/Servers BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: exim-%{version}.tar.bz2 Source1: sysconfig.exim @@ -62,20 +67,19 @@ Source30: eximstats-html-update.py Source31: eximstats.conf Patch: exim-4.12-tail.patch -Patch1: 109066729a54f6ba5c4e8bc174133da33242e930.diff Patch2: format-security.diff %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %package -n eximon -License: GPL-2.0+ Summary: Eximon, an graphical frontend to administer Exim's mail queue Group: Productivity/Networking/Email/Servers %package -n eximstats-html -License: GPL-2.0+ Summary: Create HTML reports of exim logs Group: Productivity/Networking/Email/Servers -Requires: perl-GD perl-GDGraph perl-GDTextUtil +Requires: perl-GD +Requires: perl-GDGraph +Requires: perl-GDTextUtil %endif %description @@ -88,11 +92,6 @@ or senders, and for controlling mail relaying. - -Authors: --------- - Philip Hazel <ph10(a)cus.cam.ac.uk> - %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %description -n eximon @@ -102,11 +101,6 @@ header of mails. - -Authors: --------- - Philip Hazel <ph10(a)cus.cam.ac.uk> - %description -n eximstats-html If this package is installed alongside the exim MTA, and you enable EXIM_REPORT_WEEKLY_HTML in /etc/sysconfig/exim, logrotate/cron will @@ -120,23 +114,20 @@ once, if at all. The rest is done by logrotate / cron.) - -Authors: --------- - Philip Hazel <ph10(a)cus.cam.ac.uk> - %endif %prep %setup -q -n exim-%{version} %patch -%patch1 -p2 %patch2 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930 fPIE="-fPIE" pie="-pie" %endif +%if %{?suse_version:%suse_version}%{?!suse_version:99999} > 1100 +CFLAGS_OPT_WERROR="-Werror=format-security -Werror=missing-format-attribute" +%endif cat <<-EOF > Local/Makefile # see src/EDITME for comments. BIN_DIRECTORY=/usr/sbin @@ -243,7 +234,7 @@ # SPOOL_MODE=0640 SUPPORT_MOVE_FROZEN_MESSAGES=yes HAVE_IPV6=YES - CFLAGS=$RPM_OPT_FLAGS -Wall -Werror=format-security -Werror=missing-format-attribute -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED $fPIE + CFLAGS=$RPM_OPT_FLAGS -Wall $CFLAGS_OPT_WERROR -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED $fPIE EXTRALIBS=-ldl -L/usr/X11R6/%{_lib} $pie EOF touch Local/eximon.conf @@ -398,7 +389,7 @@ /usr/sbin/sendmail /usr/lib/sendmail /var/adm/fillup-templates/sysconfig.exim -%dir %attr(750,root,mail) /var/log/exim +%dir %attr(750,mail,mail) /var/log/exim %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %files -n eximon ++++++ exim-4.12-tail.patch ++++++ --- /var/tmp/diff_new_pack.2qedqg/_old 2012-03-20 11:26:50.000000000 +0100 +++ /var/tmp/diff_new_pack.2qedqg/_new 2012-03-20 11:26:50.000000000 +0100 @@ -7,7 +7,7 @@ =================================================================== --- scripts/Configure-config.h.orig +++ scripts/Configure-config.h -@@ -48,7 +48,7 @@ fi +@@ -47,7 +47,7 @@ fi # Double-check that config.h is complete. ++++++ exim-4.75.tar.bz2 -> exim-4.77.tar.bz2 ++++++ ++++ 12565 lines of diff (skipped) ++++++ format-security.diff ++++++ --- /var/tmp/diff_new_pack.2qedqg/_old 2012-03-20 11:26:51.000000000 +0100 +++ /var/tmp/diff_new_pack.2qedqg/_new 2012-03-20 11:26:51.000000000 +0100 @@ -1,6 +1,8 @@ ---- exim_monitor/em_log.c +Index: exim_monitor/em_log.c +=================================================================== +--- exim_monitor/em_log.c.orig +++ exim_monitor/em_log.c -@@ -58,6 +58,8 @@ +@@ -56,6 +56,8 @@ static int scrolled = FALSE; static int size = 0; static int top = 0; @@ -9,7 +11,7 @@ static void show_log(char *s, ...) { int length, newtop; -@@ -364,7 +366,7 @@ +@@ -362,7 +364,7 @@ link count of zero on the currently open if (log_datestamping) { uschar log_file_wanted[256]; @@ -18,9 +20,11 @@ if (Ustrcmp(log_file_wanted, log_file_open) != 0) { if (LOG != NULL) ---- exim_monitor/em_main.c +Index: exim_monitor/em_main.c +=================================================================== +--- exim_monitor/em_main.c.orig +++ exim_monitor/em_main.c -@@ -656,7 +656,7 @@ +@@ -654,7 +654,7 @@ today.) */ if (log_file[0] != 0) { @@ -29,9 +33,11 @@ log_datestamping = string_datestamp_offset >= 0; LOG = fopen(CS log_file_open, "r"); ---- exim_monitor/em_text.c +Index: exim_monitor/em_text.c +=================================================================== +--- exim_monitor/em_text.c.orig +++ exim_monitor/em_text.c -@@ -60,6 +60,8 @@ +@@ -58,6 +58,8 @@ XawTextSetInsertionPoint(w, text_count); * Display text from format * *************************************************/ @@ -40,9 +46,11 @@ void text_showf(Widget w, char *s, ...) { va_list ap; ---- src/demime.c +Index: src/demime.c +=================================================================== +--- src/demime.c.orig +++ src/demime.c -@@ -823,7 +823,7 @@ +@@ -821,7 +821,7 @@ void mime_trigger_error(int level, uscha (void)string_vformat(US f, 16383,(char *)format, ap); va_end(ap); f-=22; @@ -51,30 +59,11 @@ /* then copy to demime_reason_buffer if new level is greater than old level */ if (level > demime_errorlevel) { ---- src/dkim.c -+++ src/dkim.c -@@ -176,7 +176,7 @@ - } - - logmsg[ptr] = '\0'; -- log_write(0, LOG_MAIN, (char *)logmsg); -+ log_write(0, LOG_MAIN, "%s", (char *)logmsg); - - /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */ - dkim_signers = string_append(dkim_signers, ---- src/exim_dbutil.c -+++ src/exim_dbutil.c -@@ -59,6 +59,7 @@ - #include "dbstuff.h" - #include "osfunctions.h" - #include "store.h" -+#include "local_scan.h" - - - /* Identifiers for the different database types. */ ---- src/functions.h +Index: src/functions.h +=================================================================== +--- src/functions.h.orig +++ src/functions.h -@@ -82,7 +82,7 @@ +@@ -80,7 +80,7 @@ extern void decode_bits(unsigned int int, int, uschar *, bit_table *, int, uschar *, int); extern address_item *deliver_make_addr(uschar *, BOOL); extern int deliver_message(uschar *, BOOL, BOOL); @@ -83,68 +72,70 @@ extern void deliver_set_expansions(address_item *); extern int deliver_split_address(address_item *); extern void deliver_succeeded(address_item *); -@@ -181,9 +181,9 @@ +@@ -180,9 +180,9 @@ extern int mime_regex(uschar **); extern uschar *moan_check_errorcopy(uschar *); extern BOOL moan_skipped_syntax_errors(uschar *, error_block *, uschar *, BOOL, uschar *); --extern void moan_smtp_batch(uschar *, char *, ...); -+extern void moan_smtp_batch(uschar *, char *, ...) PRINTF_FUNCTION(2,3); - extern void moan_tell_someone(uschar *, address_item *, uschar *, char *, -- ...); -+ ...) PRINTF_FUNCTION(4,5); +-extern void moan_smtp_batch(uschar *, const char *, ...); ++extern void moan_smtp_batch(uschar *, const char *, ...) PRINTF_FUNCTION(2,3); + extern void moan_tell_someone(uschar *, address_item *, +- const uschar *, const char *, ...); ++ const uschar *, const char *, ...) PRINTF_FUNCTION(4,5); extern BOOL moan_to_sender(int, error_block *, header_line *, FILE *, BOOL); extern void moan_write_from(FILE *); - extern FILE *modefopen(uschar *, char *, mode_t); -@@ -271,7 +271,7 @@ + extern FILE *modefopen(const uschar *, const char *, mode_t); +@@ -270,7 +270,7 @@ extern int search_findtype_partial(u int *); extern void *search_open(uschar *, int, int, uid_t *, gid_t *); extern void search_tidyup(void); --extern void set_process_info(char *, ...); -+extern void set_process_info(char *, ...) PRINTF_FUNCTION(1,2); +-extern void set_process_info(const char *, ...); ++extern void set_process_info(const char *, ...) PRINTF_FUNCTION(1,2); extern void sha1_end(sha1 *, const uschar *, int, uschar *); extern void sha1_mid(sha1 *, const uschar *); extern void sha1_start(sha1 *); -@@ -299,7 +299,7 @@ +@@ -298,7 +298,7 @@ extern int smtp_setup_msg(void); extern BOOL smtp_start_session(void); extern int smtp_ungetc(int); extern BOOL smtp_verify_helo(void); --extern int smtp_write_command(smtp_outblock *, BOOL, char *, ...); -+extern int smtp_write_command(smtp_outblock *, BOOL, char *, ...) PRINTF_FUNCTION(3,4); +-extern int smtp_write_command(smtp_outblock *, BOOL, const char *, ...); ++extern int smtp_write_command(smtp_outblock *, BOOL, const char *, ...) PRINTF_FUNCTION(3,4); #ifdef WITH_CONTENT_SCAN extern int spam(uschar **); extern FILE *spool_mbox(unsigned long *, uschar *); -@@ -321,13 +321,13 @@ +@@ -320,13 +320,13 @@ extern uschar *string_copy_malloc(uschar extern uschar *string_copylc(uschar *); extern uschar *string_copynlc(uschar *, int); extern uschar *string_dequote(uschar **); --extern BOOL string_format(uschar *, int, char *, ...); -+extern BOOL string_format(uschar *, int, char *, ...) PRINTF_FUNCTION(3,4); +-extern BOOL string_format(uschar *, int, const char *, ...); ++extern BOOL string_format(uschar *, int, const char *, ...) PRINTF_FUNCTION(3,4); extern uschar *string_format_size(int, uschar *); extern int string_interpret_escape(uschar **); extern int string_is_ip_address(uschar *, int *); extern uschar *string_log_address(address_item *, BOOL, BOOL); extern uschar *string_nextinlist(uschar **, int *, uschar *, int); --extern uschar *string_open_failed(int, char *, ...); -+extern uschar *string_open_failed(int, char *, ...) PRINTF_FUNCTION(2,3); +-extern uschar *string_open_failed(int, const char *, ...); ++extern uschar *string_open_failed(int, const char *, ...) PRINTF_FUNCTION(2,3); extern uschar *string_printing2(uschar *, BOOL); extern uschar *string_split_message(uschar *); - extern BOOL string_vformat(uschar *, int, char *, va_list); ---- src/local_scan.h + extern BOOL string_vformat(uschar *, int, const char *, va_list); +Index: src/local_scan.h +=================================================================== +--- src/local_scan.h.orig +++ src/local_scan.h -@@ -175,7 +175,7 @@ - extern void header_remove(int, uschar *); - extern BOOL header_testname(header_line *, uschar *, int, BOOL); - extern BOOL header_testname_incomplete(header_line *, uschar *, int, BOOL); --extern void log_write(unsigned int, int, char *format, ...); -+extern void log_write(unsigned int, int, char *format, ...) PRINTF_FUNCTION(3,4); +@@ -173,7 +173,7 @@ extern void header_add_at_position(BO + extern void header_remove(int, const uschar *); + extern BOOL header_testname(header_line *, const uschar *, int, BOOL); + extern BOOL header_testname_incomplete(header_line *, const uschar *, int, BOOL); +-extern void log_write(unsigned int, int, const char *format, ...); ++extern void log_write(unsigned int, int, const char *format, ...) PRINTF_FUNCTION(3,4); extern int lss_b64decode(uschar *, uschar **); extern uschar *lss_b64encode(uschar *, int); extern int lss_match_domain(uschar *, uschar *); -@@ -190,6 +190,6 @@ - extern void smtp_vprintf(char *, va_list); +@@ -188,6 +188,6 @@ extern void smtp_printf(const char *, + extern void smtp_vprintf(const char *, va_list); extern uschar *string_copy(uschar *); extern uschar *string_copyn(uschar *, int); --extern uschar *string_sprintf(char *, ...); -+extern uschar *string_sprintf(char *, ...) PRINTF_FUNCTION(1,2); +-extern uschar *string_sprintf(const char *, ...); ++extern uschar *string_sprintf(const char *, ...) PRINTF_FUNCTION(1,2); /* End of local_scan.h */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dhcp for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package dhcp for openSUSE:Factory checked in at 2012-03-20 11:26:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhcp (Old) and /work/SRC/openSUSE:Factory/.dhcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dhcp", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2012-01-17 16:05:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dhcp.new/dhcp.changes 2012-03-20 11:26:40.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 19 09:37:52 UTC 2012 - mt(a)suse.com + +- dhcp-server: fixed to escape all values used in constructed + ldap filters as a DN may contain e.g. asterisks (bnc#721829, + [ISC-Bugs #28545]). + +------------------------------------------------------------------- New: ---- dhcp-4.2.3-P2-ldap-filter-value-escape.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.6u3lPE/_old 2012-03-20 11:26:42.000000000 +0100 +++ /var/tmp/diff_new_pack.6u3lPE/_new 2012-03-20 11:26:42.000000000 +0100 @@ -83,6 +83,7 @@ Patch21: dhcp-4.2.2-dhclient-send-hostname-rml.diff ## patch repo lives here: http://www.suse.de/~mt/git/dhcp-ldap.git/ Patch30: dhcp-4.2.3-P1-ldap-patch-mt01.diff.bz2 +Patch31: dhcp-4.2.3-P2-ldap-filter-value-escape.patch Patch40: dhcp-4.1.1-P1-lpf-bind-msg-fix.diff Patch44: dhcp-4.2.2-xen-checksum.diff Patch45: dhcp-4.2.2-dhclient-option-checks.bnc675052.diff @@ -213,6 +214,7 @@ %patch21 -p1 %if %{with_ldap} %patch30 -p1 +%patch31 -p1 %endif %patch40 -p1 %patch44 -p1 ++++++ dhcp-4.2.3-P2-ldap-filter-value-escape.patch ++++++ >From e8ad30e0ed9dcb77cb1a87e5e676f4dc56a36afa Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <mt(a)suse.de> Date: Tue, 31 Jan 2012 17:38:25 +0100 Subject: [PATCH] Fixed to escape values used in ldap filters Use ldap_bv2escaped_filter_value to escape all values used in constructed ldap filters, e.g. "o=*Test" in DN (bnc#721829). Signed-off-by: Marius Tomaschewski <mt(a)suse.de> --- server/ldap.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 97 insertions(+), 19 deletions(-) diff --git a/server/ldap.c b/server/ldap.c index 68acbbb..274e934 100644 --- a/server/ldap.c +++ b/server/ldap.c @@ -1024,6 +1024,17 @@ _do_ldap_retry(int ret, const char *server, int port) return 0; } +static struct berval * +_do_ldap_str2esc_filter_bv(const char *str, ber_len_t len, struct berval *bv_o) +{ + struct berval bv_i; + + if (!str || !bv_o || (ber_str2bv(str, len, 0, &bv_i) == NULL) || + (ldap_bv2escaped_filter_value(&bv_i, bv_o) != 0)) + return NULL; + return bv_o; +} + static void ldap_start (void) { @@ -1801,6 +1812,7 @@ ldap_read_config (void) size_t length; int ret, cnt; struct berval **tempbv = NULL; + struct berval bv_o[2]; if (local_family != AF_INET) return (ISC_R_SUCCESS); @@ -1825,24 +1837,49 @@ ldap_read_config (void) uname (&unme); if (ldap_dhcp_server_cn != NULL) { + if (_do_ldap_str2esc_filter_bv(ldap_dhcp_server_cn, 0, &bv_o[0]) == NULL) + { + log_error ("Cannot escape ldap filter value %s: %m", ldap_dhcp_server_cn); + return (ISC_R_FAILURE); + } + snprintf (hfilter, sizeof (hfilter), - "(&(objectClass=dhcpServer)(cn=%s))", ldap_dhcp_server_cn); - } - else - { - if(0 == get_host_entry(fqdn, sizeof(fqdn), NULL, 0)) - { - snprintf (hfilter, sizeof (hfilter), - "(&(objectClass=dhcpServer)(|(cn=%s)(cn=%s)))", - unme.nodename, fqdn); + "(&(objectClass=dhcpServer)(cn=%s))", bv_o[0].bv_val); + + ber_memfree(bv_o[0].bv_val); } else { - snprintf (hfilter, sizeof (hfilter), - "(&(objectClass=dhcpServer)(cn=%s))", unme.nodename); - } + if (_do_ldap_str2esc_filter_bv(unme.nodename, 0, &bv_o[0]) == NULL) + { + log_error ("Cannot escape ldap filter value %s: %m", unme.nodename); + return (ISC_R_FAILURE); + } + + if(0 == get_host_entry(fqdn, sizeof(fqdn), NULL, 0)) + { + if (_do_ldap_str2esc_filter_bv(fqdn, 0, &bv_o[1]) == NULL) + { + log_error ("Cannot escape ldap filter value %s: %m", fqdn); + ber_memfree(bv_o[0].bv_val); + return (ISC_R_FAILURE); + } - } + snprintf (hfilter, sizeof (hfilter), + "(&(objectClass=dhcpServer)(|(cn=%s)(cn=%s)))", + bv_o[0].bv_val, bv_o[1].bv_val); + + ber_memfree(bv_o[1].bv_val); + } + else + { + snprintf (hfilter, sizeof (hfilter), + "(&(objectClass=dhcpServer)(cn=%s))", + bv_o[0].bv_val); + } + + ber_memfree(bv_o[0].bv_val); + } ldap_enable_retry = 1; do @@ -1929,9 +1966,20 @@ ldap_read_config (void) res = ISC_R_SUCCESS; for (cnt=0; tempbv[cnt] != NULL; cnt++) { + + if (_do_ldap_str2esc_filter_bv(hostdn, 0, &bv_o[0]) == NULL) + { + log_error ("Cannot escape ldap filter value %s: %m", hostdn); + res = ISC_R_FAILURE; + break; + } + snprintf(sfilter, sizeof(sfilter), "(&(objectClass=dhcpService)" "(|(|(dhcpPrimaryDN=%s)(dhcpSecondaryDN=%s))(dhcpServerDN=%s)))", - hostdn, hostdn, hostdn); + bv_o[0].bv_val, bv_o[0].bv_val, bv_o[0].bv_val); + + ber_memfree(bv_o[0].bv_val); + ldres = NULL; if ((ret = ldap_search_ext_s (ld, tempbv[cnt]->bv_val, LDAP_SCOPE_BASE, sfilter, NULL, 0, NULL, NULL, NULL, @@ -2082,16 +2130,29 @@ ldap_parse_options (LDAPMessage * ent, struct group *group, if (temp2 != NULL) { - snprintf (filter, sizeof(filter), - "(&(cn=%.*s)(objectClass=dhcpGroup))", - (int)(temp2 - temp1), temp1); + struct berval bv_o; + + if (_do_ldap_str2esc_filter_bv(temp1, (temp2 - temp1), &bv_o) == NULL) + { + log_error ("Cannot escape ldap filter value %.*s: %m", + (int)(temp2 - temp1), temp1); + filter[0] = '\0'; + } + else + { + snprintf (filter, sizeof(filter), + "(&(cn=%s)(objectClass=dhcpGroup))", + bv_o.bv_val); + + ber_memfree(bv_o.bv_val); + } basedn = strchr (temp1, ','); if (basedn != NULL) ++basedn; } - if (basedn != NULL && *basedn != '\0') + if (basedn != NULL && *basedn != '\0' && filter[0] != '\0') { ret = ldap_search_ext_s (ld, basedn, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, NULL, 0, &groupdn); @@ -2163,6 +2224,8 @@ find_haddr_in_ldap (struct host_decl **hp, int htype, unsigned hlen, char up_hwaddr[20]; char lo_hwaddr[20]; int ret; + struct berval bv_o[2]; + if (local_family != AF_INET) return (0); @@ -2199,9 +2262,24 @@ find_haddr_in_ldap (struct host_decl **hp, int htype, unsigned hlen, print_hw_addr (htype, hlen, haddr)); x_strxform(up_hwaddr, lo_hwaddr, sizeof(up_hwaddr), toupper); + if (_do_ldap_str2esc_filter_bv(lo_hwaddr, 0, &bv_o[0]) == NULL) + { + log_error ("Cannot escape ldap filter value %s: %m", lo_hwaddr); + return (0); + } + if (_do_ldap_str2esc_filter_bv(up_hwaddr, 0, &bv_o[1]) == NULL) + { + log_error ("Cannot escape ldap filter value %s: %m", up_hwaddr); + ber_memfree(bv_o[0].bv_val); + return (0); + } + snprintf (buf, sizeof (buf), "(&(objectClass=dhcpHost)(|(dhcpHWAddress=%s %s)(dhcpHWAddress=%s %s)))", - type_str, lo_hwaddr, type_str, up_hwaddr); + type_str, bv_o[0].bv_val, type_str, bv_o[1].bv_val); + + ber_memfree(bv_o[0].bv_val); + ber_memfree(bv_o[1].bv_val); res = ent = NULL; for (curr = ldap_service_dn_head; -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dcmtk for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package dcmtk for openSUSE:Factory checked in at 2012-03-20 11:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dcmtk (Old) and /work/SRC/openSUSE:Factory/.dcmtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dcmtk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dcmtk/dcmtk.changes 2011-12-19 16:09:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dcmtk.new/dcmtk.changes 2012-03-20 11:26:32.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Mar 18 14:42:01 UTC 2012 - asterios.dramis(a)gmail.com + +- Added a patch (gcc-4.7_fix.patch) to fix compilation with gcc-4.7. +- Remove zero-length file /usr/share/dcmtk/wlistdb/OFFIS/lockfile (fix rpmlint + warning). + +------------------------------------------------------------------- New: ---- gcc-4.7_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcmtk.spec ++++++ --- /var/tmp/diff_new_pack.alij4u/_old 2012-03-20 11:26:33.000000000 +0100 +++ /var/tmp/diff_new_pack.alij4u/_new 2012-03-20 11:26:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dcmtk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,11 @@ # +%define libname libdcmtk3_6 + Name: dcmtk Version: 3.6.0 Release: 0 -%define libname libdcmtk3_6 Summary: DICOM Toolkit License: BSD-3-Clause and Apache-2.0 Group: Productivity/Scientific/Other @@ -41,6 +42,8 @@ Patch6: dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch # PATCH-FIX-OPENSUSE dcmtk-3.6.0.diff asterios.dramis(a)gmail.com -- Fix libraries linking Patch7: dcmtk-3.6.0.diff +# PATCH-FIX-UPSTREAM gcc-4.7_fix.patch asterios.dramis(a)gmail.com -- Fix compilation with gcc-4.7 +Patch8: gcc-4.7_fix.patch BuildRequires: CharLS-devel BuildRequires: cmake BuildRequires: doxygen @@ -72,7 +75,7 @@ Summary: DICOM Toolkit Group: System/Libraries -%description -n libdcmtk3_6 +%description -n %{libname} DCMTK is a collection of libraries and applications implementing large parts the DICOM standard. @@ -86,6 +89,7 @@ %patch5 -p1 %patch6 -p1 %patch7 +%patch8 -p1 # Make sure the internal library copy is not used rm -rf dcmjpls/libcharls/ @@ -117,6 +121,9 @@ %make_install cd .. +# Remove zero-length file (fix rpmlint warning) +rm -f %{buildroot}%{_datadir}/dcmtk/wlistdb/OFFIS/lockfile + # Fix binary name mv -f %{buildroot}%{_bindir}/dcmsign-3.6.0 %{buildroot}%{_bindir}/dcmsign @@ -142,7 +149,7 @@ %config(noreplace) %{_sysconfdir}/dcmtk/*.cfg %{_bindir}/* %{_datadir}/dcmtk/ -%{_docdir}/dcmtk/ +%doc %{_docdir}/dcmtk/ %files devel %defattr(-,root,root,-) ++++++ gcc-4.7_fix.patch ++++++ ++++ 945 lines (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 canna for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2012-03-20 11:26:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/canna (Old) and /work/SRC/openSUSE:Factory/.canna.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "canna", Maintainer is "LZWang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/canna/canna.changes 2011-12-25 17:33:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2012-03-20 11:26:21.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 15 13:59:25 UTC 2012 - dvaleev(a)suse.com + +- copy config.guess, as the stock one is too old and not able to + guess ppc64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ canna.spec ++++++ --- /var/tmp/diff_new_pack.FyHglp/_old 2012-03-20 11:26:23.000000000 +0100 +++ /var/tmp/diff_new_pack.FyHglp/_new 2012-03-20 11:26:23.000000000 +0100 @@ -20,6 +20,7 @@ BuildRequires: pwdutils BuildRequires: termcap BuildRequires: xorg-x11-devel +BuildRequires: automake PreReq: /usr/sbin/useradd /bin/rm %insserv_prereq %fillup_prereq PreReq: sysvinit(network) #BuildPrereq: termcap @@ -162,6 +163,7 @@ make Makefile make CDEBUGFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" CXXDEBUGFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" canna pushd canuum + cp /usr/share/automake-1.11/config.* . export CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" xmkmf -a -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit btrfsprogs for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2012-03-20 11:26:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "btrfsprogs", Maintainer is "MFasheh(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2012-02-21 12:15:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2012-03-20 11:26:15.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Mar 9 16:26:20 UTC 2012 - rschweikert(a)suse.com + +- place binaries in /usr tree (UsrMerge project) +- adjust mkinitrd scrippt accordingly + +------------------------------------------------------------------- +Mon Mar 5 13:06:43 CET 2012 - dsterba(a)suse.cz + +- add btrfsck repair options for: + - rebuild extent records + - fix block group accounting + - reset csums for rescue nodatasum mount + - prune corrupt extent allocation tree blocks +- device scanning fixes for dm and multipath +- initrd support: move btrfs device scan after block device setup +- documentation updates +- add csize for file commpressed size +- updated restore utility + +------------------------------------------------------------------- Old: ---- 0114-btrfs-progs-add-qgroup-commands.patch 0900-Revert-btrfs-progs-add-qgroup-commands.patch 0901-Revert-Btrfs-progs-add-restriper-commands.patch New: ---- 0114-btrfs-progs-Add-ioctl-to-read-compressed-size-of-a-f.patch 0139-Btrfs-progs-make-find-root-spit-out-the-size-of-the-.patch 0140-Btrfs-progs-add-some-verbose-output-to-find-root.patch 0141-Btrfs-progs-fix-restore-to-actually-use-the-root-loc.patch 0142-Btrfs-progs-remove-the-physical-disk-size-check-from.patch 0143-Btrfs-progs-fix-error-output-and-dont-read-from-cach.patch 0144-Btrfs-progs-print-the-objectid-of-the-root-we-find-w.patch 0145-Btrfs-progs-make-specifying-root-objectid-work-if-th.patch 0146-Btrfs-progs-don-t-free-the-existing-node.patch 0147-mkfs-Handle-creation-of-filesystem-larger-than-the-f.patch 0150-btrfs-progs-removed-extraneous-whitespace-from-mkfs-.patch 0151-btrfs-progs-document-rootdir-mkfs-switch.patch 0152-Add-open_ctree_fs_info-for-partial-FS-opens.patch 0153-btrfsck-print-some-progress-Signed-off-by-Chris-Maso.patch 0154-Allow-extent_buffers-to-use-more-ram.patch 0155-btrfsck-don-t-BUG-on-corrupted-extent-records.patch 0156-btrfs-corrupt-block-add-e-option-to-corrupt-the-exte.patch 0157-btrfsck-add-code-to-rebuild-extent-records.patch 0158-btrfs-corrupt-block-add-E-option-to-randomly-corrupt.patch 0159-btrfsck-fix-block-group-accounting-during-repair.patch 0160-Turn-off-some-commands-in-Makefile.patch 0161-Fix-btrfs-convert-btrfs-restore-and-btrfs-find-root-.patch 0162-btrfsck-make-sure-to-dirty-all-block-groups-as-we-fi.patch 0163-btrfsck-add-init-csum-tree-to-replace-the-csum-root-.patch 0164-btrfsck-make-sure-we-fix-the-block-group-accounting-.patch 0165-btrfsck-remove-extents-from-the-fsck-reference-track.patch 0166-Btrfsck-add-the-ability-to-prune-corrupt-extent-allo.patch 0167-Btrfs-use-proc-partitions-scanning-for-btrfs_scan_fo.patch 0168-Scan-dev-md-and-device-mapper-devices-last.patch 0169-btrfsck-add-early-code-to-handle-corrupted-block-gro.patch 0170-Btrfs-progs-btrfs-map-logical-Fix-typo-in-usage.patch 0171-Btrfs-progs-btrfs-corrupt-block-fix-the-wrong-usage.patch 0172-Btrfs-progs-fix-btrfsck-s-snapshot-wrong-unresolved-.patch btrfs-dev-clear-sb btrfs-man-update btrfs-mkfs-update-disclaimer.patch btrfs-reorder-commands-help ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.HFJOpo/_old 2012-03-20 11:26:16.000000000 +0100 +++ /var/tmp/diff_new_pack.HFJOpo/_new 2012-03-20 11:26:16.000000000 +0100 @@ -28,6 +28,7 @@ # git archive --format=tar --prefix=btrfs-progs-`git describe`/ HEAD > %D/btrfs-progs-`git describe`.tar Source: btrfs-progs-%{tar_version}.tar.bz2 Source1: boot-btrfs.sh +Source2: btrfs-dev-clear-sb Patch0: memleak-fix.diff Patch1: Plug-Memory-leak-in-find_and_setup_log_root.patch Patch1000: local-version-override.patch @@ -46,9 +47,9 @@ Patch110: 0110-Update-the-makefile-for-generating-the-man-page.patch Patch111: 0111-Show-the-help-messages-from-the-info-in-the-comment.patch Patch112: 0112-Update-the-makefile-for-generating-the-help-messages.patch -Patch113: 0113-Btrfs-progs-add-restriper-commands.patch -Patch114: 0114-btrfs-progs-add-qgroup-commands.patch Patch115: 0115-btrfs-progs-fixup-is_mounted-checks.patch +Patch113: 0113-Btrfs-progs-add-restriper-commands.patch +Patch114: 0114-btrfs-progs-Add-ioctl-to-read-compressed-size-of-a-f.patch # + josef's restore utility fixes Patch116: 0116-Btrfs-progs-add-an-option-for-specifying-the-root-to.patch Patch117: 0117-Btrfs-progs-try-other-mirrors-if-decomression-fails.patch @@ -69,17 +70,50 @@ Patch132: 0132-Btrfs-progs-make-find_and_setup_root-return-an-error.patch Patch133: 0133-Btrfs-progs-check-return-value-properly.patch Patch134: 0134-Btrfs-progs-give-restore-a-list-roots-option.patch +Patch139: 0139-Btrfs-progs-make-find-root-spit-out-the-size-of-the-.patch +Patch140: 0140-Btrfs-progs-add-some-verbose-output-to-find-root.patch +Patch141: 0141-Btrfs-progs-fix-restore-to-actually-use-the-root-loc.patch +Patch142: 0142-Btrfs-progs-remove-the-physical-disk-size-check-from.patch +Patch143: 0143-Btrfs-progs-fix-error-output-and-dont-read-from-cach.patch +Patch144: 0144-Btrfs-progs-print-the-objectid-of-the-root-we-find-w.patch +Patch145: 0145-Btrfs-progs-make-specifying-root-objectid-work-if-th.patch +Patch146: 0146-Btrfs-progs-don-t-free-the-existing-node.patch +Patch147: 0147-mkfs-Handle-creation-of-filesystem-larger-than-the-f.patch +Patch150: 0150-btrfs-progs-removed-extraneous-whitespace-from-mkfs-.patch +Patch151: 0151-btrfs-progs-document-rootdir-mkfs-switch.patch +Patch152: 0152-Add-open_ctree_fs_info-for-partial-FS-opens.patch +Patch153: 0153-btrfsck-print-some-progress-Signed-off-by-Chris-Maso.patch +Patch154: 0154-Allow-extent_buffers-to-use-more-ram.patch +Patch155: 0155-btrfsck-don-t-BUG-on-corrupted-extent-records.patch +Patch156: 0156-btrfs-corrupt-block-add-e-option-to-corrupt-the-exte.patch +Patch157: 0157-btrfsck-add-code-to-rebuild-extent-records.patch +Patch158: 0158-btrfs-corrupt-block-add-E-option-to-randomly-corrupt.patch +Patch159: 0159-btrfsck-fix-block-group-accounting-during-repair.patch +Patch160: 0160-Turn-off-some-commands-in-Makefile.patch +Patch161: 0161-Fix-btrfs-convert-btrfs-restore-and-btrfs-find-root-.patch +Patch162: 0162-btrfsck-make-sure-to-dirty-all-block-groups-as-we-fi.patch +Patch163: 0163-btrfsck-add-init-csum-tree-to-replace-the-csum-root-.patch +Patch164: 0164-btrfsck-make-sure-we-fix-the-block-group-accounting-.patch +Patch165: 0165-btrfsck-remove-extents-from-the-fsck-reference-track.patch +Patch166: 0166-Btrfsck-add-the-ability-to-prune-corrupt-extent-allo.patch +Patch167: 0167-Btrfs-use-proc-partitions-scanning-for-btrfs_scan_fo.patch +Patch168: 0168-Scan-dev-md-and-device-mapper-devices-last.patch +Patch169: 0169-btrfsck-add-early-code-to-handle-corrupted-block-gro.patch +Patch170: 0170-Btrfs-progs-btrfs-map-logical-Fix-typo-in-usage.patch +Patch171: 0171-Btrfs-progs-btrfs-corrupt-block-fix-the-wrong-usage.patch +Patch172: 0172-Btrfs-progs-fix-btrfsck-s-snapshot-wrong-unresolved-.patch + +# other fixes Patch135: 0135-Btrfs-progs-fix-compiler-warning-of-extent-tree.c.patch Patch136: 0136-Btrfs-progs-change-the-way-mkfs-picks-raid-profiles.patch Patch137: 0137-Btrfs-progs-fail-gracefully-on-error-from-open_ctree.patch Patch138: 0138-Btrfs-progs-bugfix-for-scrubbing-single-devices.patch # -Patch150: btrfs-progs-fix-open_ctree_usage_segfaults.patch - -# - missing kernel features: qgroups -Patch900: 0900-Revert-btrfs-progs-add-qgroup-commands.patch -Patch901: 0901-Revert-Btrfs-progs-add-restriper-commands.patch +Patch250: btrfs-progs-fix-open_ctree_usage_segfaults.patch +Patch251: btrfs-mkfs-update-disclaimer.patch +Source252: btrfs-man-update +Patch253: btrfs-reorder-commands-help BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel @@ -110,9 +144,10 @@ %patch110 -p1 %patch111 -p1 %patch112 -p1 -%patch113 -p1 -%patch114 -p1 %patch115 -p1 +%patch114 -p1 +%patch113 -p1 +# josef's tree %patch116 -p1 %patch117 -p1 %patch118 -p1 @@ -132,48 +167,100 @@ %patch132 -p1 %patch133 -p1 %patch134 -p1 +%patch139 -p1 +%patch140 -p1 +%patch141 -p1 +%patch142 -p1 +%patch143 -p1 +%patch144 -p1 +%patch145 -p1 +%patch146 -p1 +%patch147 -p1 +%patch150 -p1 +%patch151 -p1 +# other fixes %patch135 -p1 %patch136 -p1 %patch137 -p1 %patch138 -p1 -%patch150 -p1 -%patch900 -p1 -%patch901 -p1 +%patch152 -p1 +%patch153 -p1 +%patch154 -p1 +%patch155 -p1 +%patch156 -p1 +%patch157 -p1 +%patch158 -p1 +%patch159 -p1 +%patch160 -p1 +%patch161 -p1 +%patch162 -p1 +%patch163 -p1 +%patch164 -p1 +%patch165 -p1 +%patch166 -p1 +%patch167 -p1 +%patch168 -p1 +%patch169 -p1 +%patch170 -p1 +%patch171 -p1 +%patch172 -p1 +%patch250 -p1 +%patch251 -p1 +#%patch252 -p1 +%patch253 -p1 %build -make %{?_smp_mflags} CFLAGS="%{optflags}" all convert \ +make %{?_smp_mflags} CFLAGS="%{optflags}" all btrfs-convert \ btrfs-zero-log btrfs-select-super btrfs-image btrfstune \ - restore find-root btrfs-dump-super + btrfs-find-root btrfs-restore btrfs-dump-super + +patch -p1 < %{S:252} %install -make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} bindir=/sbin mandir=%{_mandir} -install -m 0755 -d ${RPM_BUILD_ROOT}/sbin +make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} +install -m 0755 -d ${RPM_BUILD_ROOT}/%{_sbindir} install -m 0755 -d ${RPM_BUILD_ROOT}/%{_bindir} -# remove dangerous and unwanted tools -rm ${RPM_BUILD_ROOT}/sbin/btrfs-corrupt-block -rm ${RPM_BUILD_ROOT}/sbin/calc-size # add btrfs- prefix to generic names -mv ${RPM_BUILD_ROOT}/sbin/restore ${RPM_BUILD_ROOT}/sbin/btrfs-restore -mv ${RPM_BUILD_ROOT}/sbin/find-root ${RPM_BUILD_ROOT}/sbin/btrfs-find-root -# move some utilities out of /sbin -mv ${RPM_BUILD_ROOT}/sbin/{btrfs-show,btrfs-vol,btrfsctl} ${RPM_BUILD_ROOT}/%{_bindir} -mv ${RPM_BUILD_ROOT}/sbin/{btrfs-map-logical,btrfs-debug-tree} ${RPM_BUILD_ROOT}/%{_bindir} +# move some utilities out of /usr/sbin +mv ${RPM_BUILD_ROOT}/%{_sbindir}/{btrfs-show,btrfs-vol,btrfsctl} ${RPM_BUILD_ROOT}/%{_bindir} +mv ${RPM_BUILD_ROOT}/%{_sbindir}/{btrfs-map-logical,btrfs-debug-tree} ${RPM_BUILD_ROOT}/%{_bindir} # mkinitrd rescue utilities -install -m 0755 btrfs-zero-log ${RPM_BUILD_ROOT}/sbin -install -m 0755 btrfs-select-super ${RPM_BUILD_ROOT}/sbin -install -m 0755 btrfs-image ${RPM_BUILD_ROOT}/sbin -install -m 0755 btrfstune ${RPM_BUILD_ROOT}/sbin -install -m 0755 btrfs-dump-super ${RPM_BUILD_ROOT}/sbin +install -m 0755 btrfs-zero-log ${RPM_BUILD_ROOT}/%{_sbindir} +install -m 0755 btrfs-select-super ${RPM_BUILD_ROOT}/%{_sbindir} +install -m 0755 btrfs-image ${RPM_BUILD_ROOT}/%{_sbindir} +install -m 0755 btrfstune ${RPM_BUILD_ROOT}/%{_sbindir} +install -m 0755 btrfs-dump-super ${RPM_BUILD_ROOT}/%{_sbindir} +install -m 0755 btrfs-restore ${RPM_BUILD_ROOT}/%{_sbindir} +install -m 0755 btrfs-find-root ${RPM_BUILD_ROOT}/%{_sbindir} +#UsrMerge +install -m 0755 -d ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfs ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfs-zero-log ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfs-convert ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfs-select-super ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfs-image ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfstune ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfsck ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfs-restore ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfs-find-root ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/btrfs-dump-super ${RPM_BUILD_ROOT}/sbin +ln -s %{_sbindir}/mkfs.btrfs ${RPM_BUILD_ROOT}/sbin +#EndUsrMerge # command line options are not compatible (bnc#599224) # copy needed if /bin is different fs from /sbin -cp /bin/true ${RPM_BUILD_ROOT}/sbin/fsck.btrfs +cp %{_bindir}/true ${RPM_BUILD_ROOT}/%{_sbindir}/fsck.btrfs +#UsrMerge +ln -s %{_sbindir}/fsck.btrfs ${RPM_BUILD_ROOT}/sbin +#EndUsrMerge install -d -m0755 ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ -cp %{S:1} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ +install -m 0755 %{S:1} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ +install -m 0755 %{S:2} ${RPM_BUILD_ROOT}/usr/sbin/ %files %defattr(-, root, root) /sbin/fsck.btrfs # mkinitrd utils +#UsrMerge /sbin/btrfs /sbin/btrfs-zero-log /sbin/btrfs-convert @@ -185,6 +272,20 @@ /sbin/btrfs-find-root /sbin/btrfs-dump-super /sbin/mkfs.btrfs +#EndUsrMerge +%{_sbindir}/btrfs +%{_sbindir}/btrfs-zero-log +%{_sbindir}/btrfs-convert +%{_sbindir}/btrfs-select-super +%{_sbindir}/btrfs-image +%{_sbindir}/btrfstune +%{_sbindir}/btrfsck +%{_sbindir}/btrfs-restore +%{_sbindir}/btrfs-find-root +%{_sbindir}/btrfs-dump-super +%{_sbindir}/fsck.btrfs +%{_sbindir}/mkfs.btrfs +/usr/sbin/btrfs-dev-clear-sb /lib/mkinitrd/scripts/boot-btrfs.sh # other /usr/bin/btrfs-map-logical ++++++ 0113-Btrfs-progs-add-restriper-commands.patch ++++++ ++++ 1115 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/btrfsprogs/0113-Btrfs-progs-add-restriper-commands.patch ++++ and /work/SRC/openSUSE:Factory/.btrfsprogs.new/0113-Btrfs-progs-add-restriper-commands.patch ++++++ 0114-btrfs-progs-Add-ioctl-to-read-compressed-size-of-a-f.patch ++++++ >From 72218a2090e1cbafe9baa97aaa465a28438c3dbb Mon Sep 17 00:00:00 2001 From: David Sterba <dsterba(a)suse.cz> Date: Mon, 19 Dec 2011 17:51:11 +0100 Subject: [PATCH 16/43] btrfs-progs: Add ioctl to read compressed size of a file Signed-off-by: David Sterba <dsterba(a)suse.cz> --- btrfs.c | 9 ++++++- btrfs_cmds.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ btrfs_cmds.h | 1 + ioctl.h | 13 ++++++++++ man/btrfs.8.in.old | 10 +++++++ 5 files changed, 100 insertions(+), 1 deletions(-) diff --git a/btrfs.c b/btrfs.c index e78f194..f5b8fd4 100644 --- a/btrfs.c +++ b/btrfs.c @@ -325,7 +325,14 @@ static struct Command commands[] = { "filesystem label", "<device> [<newlabel>]\n" "With one argument, get the label of filesystem on <device>.\n" "If <newlabel> is passed, set the filesystem label to <newlabel>.\n" - "The filesystem must be unmounted.\n" + "The filesystem must be unmounted." + }, + { do_compr_size, -1, + "filesystem csize", "[-s start] [-e end] <file>\n" + "Read ordinary and compressed size of extents in the range [start,end)\n" + "-s start range start inclusive, accepts K/M/G modifiers\n" + "-e end range end exclusive, accepts K/M/G modifiers\n", + NULL }, { do_scrub_start, -1, "scrub start", "[-Bdqr] <path>|<device>\n" diff --git a/btrfs_cmds.c b/btrfs_cmds.c index 12346e5..c8196d1 100644 --- a/btrfs_cmds.c +++ b/btrfs_cmds.c @@ -2058,3 +2058,71 @@ out: free(inodes); return ret; } + +int do_compr_size(int argc, char **argv) +{ + int ret; + int fd; + struct btrfs_ioctl_compr_size_args args; + + args.start = 0; + args.end = (u64)-1; + optind = 1; + while (1) { + int c = getopt(argc, argv, "s:e:r"); + if (c < 0) + break; + switch (c) { + case 's': + args.start = parse_size(optarg); + break; + case 'e': + args.end = parse_size(optarg); + break; + default: + fprintf(stderr, "ERROR: Invalid arguments for csize\n"); + return 1; + } + } + + if (args.start > args.end) { + fprintf(stderr, "ERROR: Invalid range for csize\n"); + return 1; + } + + if (argc - optind == 0) { + fprintf(stderr, "ERROR: Invalid arguments for csize\n"); + return 1; + } + argc -= optind; + + fd = open_file_or_dir(argv[optind]); + if (fd < 0) { + fprintf(stderr, "ERROR: can't access '%s'\n", argv[optind]); + return 1; + } + + ret = ioctl(fd, BTRFS_IOC_COMPR_SIZE, &args); + if (ret < 0) { + fprintf(stderr, "ERROR: ioctl returned %d, errno %d %s\n", + ret, errno, strerror(errno)); + return errno; + } + + printf("File name: %s\n", argv[optind]); + if (args.end == (u64)-1) + printf("File range: %llu-EOF\n", + (unsigned long long)args.start); + else + printf("File range: %llu-%llu\n", + (unsigned long long)args.start, + (unsigned long long)args.end); + + printf("Compressed size: %llu\n", + (unsigned long long)(args.compressed_size << 9)); + printf("Uncompressed size: %llu\n", + (unsigned long long)(args.size << 9)); + printf("Ratio: %3.2f%%\n", + 100.0 * args.compressed_size / args.size); + return 0; +} diff --git a/btrfs_cmds.h b/btrfs_cmds.h index 53d51d6..07dad7a 100644 --- a/btrfs_cmds.h +++ b/btrfs_cmds.h @@ -46,3 +46,4 @@ int open_file_or_dir(const char *fname); int do_ino_to_path(int nargs, char **argv); int do_logical_to_ino(int nargs, char **argv); char *path_for_root(int fd, u64 root); +int do_compr_size(int argc, char **argv); diff --git a/ioctl.h b/ioctl.h index 78aebce..a820098 100644 --- a/ioctl.h +++ b/ioctl.h @@ -272,6 +272,17 @@ struct btrfs_ioctl_logical_ino_args { __u64 inodes; }; +struct btrfs_ioctl_compr_size_args { + /* Range start, inclusive */ + __u64 start; /* in */ + /* Range end, exclusive */ + __u64 end; /* in */ + __u64 size; /* out */ + __u64 compressed_size; /* out */ + __u64 reserved[2]; +}; + + /* BTRFS_IOC_SNAP_CREATE is no longer used by the btrfs command */ #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ struct btrfs_ioctl_vol_args) @@ -330,5 +341,7 @@ struct btrfs_ioctl_logical_ino_args { struct btrfs_ioctl_ino_path_args) #define BTRFS_IOC_LOGICAL_INO _IOWR(BTRFS_IOCTL_MAGIC, 36, \ struct btrfs_ioctl_ino_path_args) +#define BTRFS_IOC_COMPR_SIZE _IOR(BTRFS_IOCTL_MAGIC, 51, \ + struct btrfs_ioctl_compr_size_args) #endif diff --git a/man/btrfs.8.in.old b/man/btrfs.8.in.old index be478e0..b7dacea 100644 --- a/man/btrfs.8.in.old +++ b/man/btrfs.8.in.old @@ -31,6 +31,8 @@ btrfs \- control a btrfs filesystem .PP \fBbtrfs\fP \fBfilesystem defragment\fP\fI <file>|<dir> [<file>|<dir>...]\fP .PP +\fBbtrfs\fP \fBfilesystem csize \fP\fI [-s start] [-e end] <file> \fP +.PP \fBbtrfs\fP \fBdevice scan\fP\fI [--all-devices|<device> [<device>...]]\fP .PP \fBbtrfs\fP \fBdevice show\fP\fI [--all-devices|<uuid>|<label>]\fP @@ -209,6 +211,14 @@ If \fB--all-devices\fP is passed, all the devices under /dev are scanned; otherwise the devices list is extracted from the /proc/partitions file. .TP +\fBfilesystem csize \fR \fI [-s start] [-e end] <file> \fR +Read ordinary and compressed size of extents in the range [start,end) of \fI<file>\fR +.IP +\fB-s start\fP range start inclusive, accepts K/M/G modifiers +.IP +\fB-e end\fP range end exclusive, accepts K/M/G modifiers +.TP + \fBdevice balance\fR \fI<path>\fR Balance the chunks of the filesystem identified by \fI<path>\fR across the devices. -- 1.7.6.233.gd79bc ++++++ 0139-Btrfs-progs-make-find-root-spit-out-the-size-of-the-.patch ++++++ >From b36b23becb0d79faefd38da11b684a78b95243c9 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef(a)redhat.com> Date: Wed, 4 Jan 2012 09:56:06 -0500 Subject: [PATCH 36/43] Btrfs-progs: make find root spit out the size of the disk In order to figure out what exactly is broken on a fs we need to spit out the current offset we are on and the size of the fs to know if the super is wrong and we just need to ignore it, or if the offset we got is bad and we should just keep searching. Thanks, Signed-off-by: Josef Bacik <josef(a)redhat.com> --- find-root.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/find-root.c b/find-root.c index e0bc069..f9cb7ed 100644 --- a/find-root.c +++ b/find-root.c @@ -258,7 +258,9 @@ static int find_root(struct btrfs_root *root) if (offset > btrfs_super_total_bytes(&root->fs_info->super_copy)) { - printf("Went past the fs size, exiting"); + printf("Went past the fs size, exiting, offset=%Lu, " + "total_bytes=%Lu\n", offset, + btrfs_super_total_bytes(&root->fs_info->super_copy)); break; } if (offset >= (metadata_offset + metadata_size)) { -- 1.7.6.233.gd79bc ++++++ 0140-Btrfs-progs-add-some-verbose-output-to-find-root.patch ++++++ >From d4d88fe3c9b393e2b21754237104c68a37123aa6 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef(a)redhat.com> Date: Wed, 4 Jan 2012 10:03:33 -0500 Subject: [PATCH 37/43] Btrfs-progs: add some verbose output to find-root Trying to track down why we can't find roots, add some verbose output so we know what chunks we're scanning and when we move to new chunks. Thanks, Signed-off-by: Josef Bacik <josef(a)redhat.com> --- find-root.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/find-root.c b/find-root.c index f9cb7ed..484f85f 100644 --- a/find-root.c +++ b/find-root.c @@ -250,6 +250,10 @@ static int find_root(struct btrfs_root *root) return ret; offset = metadata_offset; + if (verbose) + printf("Checking metadata chunk %Lu, size %Lu\n", + metadata_offset, metadata_size); + while (1) { u64 map_length = 4096; u64 type; @@ -264,6 +268,8 @@ static int find_root(struct btrfs_root *root) break; } if (offset >= (metadata_offset + metadata_size)) { + if (verbose) + printf("Moving to the next metadata chunk\n"); err = btrfs_next_metadata(&root->fs_info->mapping_tree, &metadata_offset, &metadata_size); @@ -272,6 +278,9 @@ static int find_root(struct btrfs_root *root) break; } offset = metadata_offset; + if (verbose) + printf("Checking metadata chunk %Lu, size %Lu" + "\n", metadata_offset, metadata_size); } mirror_num = 1; again: -- 1.7.6.233.gd79bc ++++++ 0141-Btrfs-progs-fix-restore-to-actually-use-the-root-loc.patch ++++++ >From f0346659db85b826c14392f9a627d845ab47b7e2 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef(a)redhat.com> Date: Wed, 4 Jan 2012 10:36:41 -0500 Subject: [PATCH 38/43] Btrfs-progs: fix restore to actually use the root location if specified We were using the wrong variable for the root location if we specified -f when doing restore. Fix this. Thanks, Signed-off-by: Josef Bacik <josef(a)redhat.com> --- restore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/restore.c b/restore.c index 95daef2..0b75902 100644 --- a/restore.c +++ b/restore.c @@ -871,13 +871,13 @@ static struct btrfs_root *open_fs(const char *dev, u64 root_location, int super_ return NULL; } if (!root_location) - bytenr = btrfs_super_root(&root->fs_info->super_copy); + root_location = btrfs_super_root(&root->fs_info->super_copy); blocksize = btrfs_level_size(root, btrfs_super_root_level(&root->fs_info->super_copy)); generation = btrfs_super_generation(&root->fs_info->super_copy); - root->fs_info->tree_root->node = read_tree_block(root, bytenr, + root->fs_info->tree_root->node = read_tree_block(root, root_location, blocksize, generation); if (!root->fs_info->tree_root->node) { @@ -895,7 +895,7 @@ static struct btrfs_root *open_fs(const char *dev, u64 root_location, int super_ root->fs_info->fs_root = btrfs_read_fs_root(root->fs_info, &key); if (IS_ERR(root->fs_info->fs_root)) { - fprintf(stderr, "Couldn't read fs_root: %ld\n", PTR_ERR(root)); + fprintf(stderr, "Couldn't read fs_root: %d\n", PTR_ERR(root)); close_ctree(root); return NULL; } -- 1.7.6.233.gd79bc ++++++ 0142-Btrfs-progs-remove-the-physical-disk-size-check-from.patch ++++++ >From a3958e5a851f8d0efeafe5946b8a32ea0fd45436 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef(a)redhat.com> Date: Wed, 4 Jan 2012 10:37:43 -0500 Subject: [PATCH 39/43] Btrfs-progs: remove the physical disk size check from find-root Our logical offsets may be beyond what we think the size of the disk is, so our check is bogus, remove it. Thanks, Signed-off-by: Josef Bacik <josef(a)redhat.com> --- find-root.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/find-root.c b/find-root.c index 484f85f..43cb778 100644 --- a/find-root.c +++ b/find-root.c @@ -260,13 +260,6 @@ static int find_root(struct btrfs_root *root) int mirror_num; int num_copies; - if (offset > - btrfs_super_total_bytes(&root->fs_info->super_copy)) { - printf("Went past the fs size, exiting, offset=%Lu, " - "total_bytes=%Lu\n", offset, - btrfs_super_total_bytes(&root->fs_info->super_copy)); - break; - } if (offset >= (metadata_offset + metadata_size)) { if (verbose) printf("Moving to the next metadata chunk\n"); -- 1.7.6.233.gd79bc ++++++ 0143-Btrfs-progs-fix-error-output-and-dont-read-from-cach.patch ++++++ >From 5ec6eeaff067c706e5bb9fc3144e9bab4e50da1e Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef(a)redhat.com> Date: Wed, 4 Jan 2012 10:48:32 -0500 Subject: [PATCH 40/43] Btrfs-progs: fix error output and dont read from cache If we have to build our fs_info by hand don't read from the cache when looking for the fs_root just in case we set something up last time. Also actually print the right error, not the root which is ok. Thanks, Signed-off-by: Josef Bacik <josef(a)redhat.com> --- restore.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/restore.c b/restore.c index 0b75902..abc66ca 100644 --- a/restore.c +++ b/restore.c @@ -893,9 +893,10 @@ static struct btrfs_root *open_fs(const char *dev, u64 root_location, int super_ key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; - root->fs_info->fs_root = btrfs_read_fs_root(root->fs_info, &key); + root->fs_info->fs_root = btrfs_read_fs_root_no_cache(root->fs_info, &key); if (IS_ERR(root->fs_info->fs_root)) { - fprintf(stderr, "Couldn't read fs_root: %d\n", PTR_ERR(root)); + fprintf(stderr, "Couldn't read fs_root: %d\n", + PTR_ERR(root->fs_info->fs_root)); close_ctree(root); return NULL; } -- 1.7.6.233.gd79bc ++++++ 0144-Btrfs-progs-print-the-objectid-of-the-root-we-find-w.patch ++++++ >From a657103b449bfae0cc67dc9d7153ee19c20d9115 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef(a)redhat.com> Date: Wed, 4 Jan 2012 10:50:31 -0500 Subject: [PATCH 41/43] Btrfs-progs: print the objectid of the root we find when doing find-root We need to know if we find a valid fs tree when doing find root, so print the objectid of the roots we find when we find a tree root. Thanks, Signed-off-by: Josef Bacik <josef(a)redhat.com> --- find-root.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/find-root.c b/find-root.c index 43cb778..bc7440a 100644 --- a/find-root.c +++ b/find-root.c @@ -138,7 +138,9 @@ static int dump_root_bytenr(struct btrfs_root *root, u64 bytenr, u64 gen) offset = btrfs_item_ptr_offset(leaf, slot); read_extent_buffer(leaf, &ri, offset, sizeof(ri)); - printf("Generation: %Lu Root bytenr: %Lu\n", gen, btrfs_root_bytenr(&ri)); + printf("Generation: %Lu Root bytenr: %Lu " + "Root objectid: %Lu\n", gen, + btrfs_root_bytenr(&ri), found_key.objectid); } path->slots[0]++; } -- 1.7.6.233.gd79bc ++++++ 0145-Btrfs-progs-make-specifying-root-objectid-work-if-th.patch ++++++ >From 87edb6fbf4991e47e7563c4589197aa88befe266 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef(a)redhat.com> Date: Wed, 4 Jan 2012 11:50:55 -0500 Subject: [PATCH 42/43] Btrfs-progs: make specifying root objectid work if the fs is broken We need to be able to handle the case where we want to restore from a specific root if the fs is really really really toast, this patch does that. Thanks, Signed-off-by: Josef Bacik <josef(a)redhat.com> --- restore.c | 109 +++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 70 insertions(+), 39 deletions(-) diff --git a/restore.c b/restore.c index abc66ca..5aa35ae 100644 --- a/restore.c +++ b/restore.c @@ -837,7 +837,35 @@ static int do_list_roots(struct btrfs_root *root) return 0; } -static struct btrfs_root *open_fs(const char *dev, u64 root_location, int super_mirror, int list_roots) +static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, + u32 stripesize, struct btrfs_root *root, + struct btrfs_fs_info *fs_info, u64 objectid) +{ + root->node = NULL; + root->commit_root = NULL; + root->sectorsize = sectorsize; + root->nodesize = nodesize; + root->leafsize = leafsize; + root->stripesize = stripesize; + root->ref_cows = 0; + root->track_dirty = 0; + + root->fs_info = fs_info; + root->objectid = objectid; + root->last_trans = 0; + root->highest_inode = 0; + root->last_inode_alloc = 0; + + INIT_LIST_HEAD(&root->dirty_list); + memset(&root->root_key, 0, sizeof(root->root_key)); + memset(&root->root_item, 0, sizeof(root->root_item)); + root->root_key.objectid = objectid; + return 0; +} + +static struct btrfs_root *open_fs(const char *dev, u64 root_location, + u64 fs_location, u64 root_objectid, + int super_mirror, int list_roots) { struct btrfs_key key; struct btrfs_root *root; @@ -889,23 +917,51 @@ static struct btrfs_root *open_fs(const char *dev, u64 root_location, int super_ if (list_roots) goto out; - key.objectid = BTRFS_FS_TREE_OBJECTID; - key.type = BTRFS_ROOT_ITEM_KEY; - key.offset = (u64)-1; + if (!root_objectid) + root_objectid = BTRFS_FS_TREE_OBJECTID; - root->fs_info->fs_root = btrfs_read_fs_root_no_cache(root->fs_info, &key); - if (IS_ERR(root->fs_info->fs_root)) { - fprintf(stderr, "Couldn't read fs_root: %d\n", - PTR_ERR(root->fs_info->fs_root)); - close_ctree(root); - return NULL; - } out: + if (fs_location) { + struct btrfs_root *fs_root = root->fs_info->fs_root; + if (fs_root) { + free_extent_buffer(fs_root->node); + } else { + fs_root = malloc(sizeof(struct btrfs_root)); + if (!fs_root) { + fprintf(stderr, "Out of memory\n"); + close_ctree(root); + return NULL; + } + __setup_root(4096, 4096, 4096, 4096, fs_root, + root->fs_info, root_objectid); + root->fs_info->fs_root = fs_root; + } + fs_root->node = read_tree_block(root, fs_location, 4096, 0); + if (!fs_root->node) { + fprintf(stderr, "Failed to read fs location\n"); + close_ctree(root); + return NULL; + } + } else if (root_objectid) { + key.objectid = root_objectid; + key.type = BTRFS_ROOT_ITEM_KEY; + key.offset = (u64)-1; + + root->fs_info->fs_root = + btrfs_read_fs_root_no_cache(root->fs_info, &key); + if (IS_ERR(root->fs_info->fs_root)) { + fprintf(stderr, "Error reading fs root %d\n", + PTR_ERR(root->fs_info->fs_root)); + close_ctree(root); + return NULL; + } + } + if (list_roots) { int ret = do_list_roots(root); if (ret) { - root = NULL; close_ctree(root); + return NULL; } } @@ -1074,22 +1130,14 @@ int main(int argc, char **argv) return -EBUSY; } - root = open_fs(argv[optind], tree_location, super_mirror, list_roots); + root = open_fs(argv[optind], tree_location, fs_location, root_objectid, + super_mirror, list_roots); if (root == NULL) return 1; if (list_roots) goto out; - if (fs_location != 0) { - free_extent_buffer(root->node); - root->node = read_tree_block(root, fs_location, 4096, 0); - if (!root->node) { - fprintf(stderr, "Failed to read fs location\n"); - goto out; - } - } - memset(path_name, 0, 4096); strncpy(dir_name, argv[optind + 1], 128); @@ -1102,23 +1150,6 @@ int main(int argc, char **argv) dir_name[len - 1] = '\0'; } - if (root_objectid != 0) { - struct btrfs_root *orig_root = root; - - key.objectid = root_objectid; - key.type = BTRFS_ROOT_ITEM_KEY; - key.offset = (u64)-1; - root = btrfs_read_fs_root(orig_root->fs_info, &key); - if (IS_ERR(root)) { - fprintf(stderr, "Error reading root\n"); - root = orig_root; - ret = 1; - goto out; - } - key.type = 0; - key.offset = 0; - } - if (find_dir) { ret = find_first_dir(root, &key.objectid); if (ret) -- 1.7.6.233.gd79bc ++++++ 0146-Btrfs-progs-don-t-free-the-existing-node.patch ++++++ >From 77ac61128a0722cab89c785f5f2247304133b214 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef(a)redhat.com> Date: Wed, 4 Jan 2012 11:55:43 -0500 Subject: [PATCH 43/43] Btrfs-progs: don't free the existing node It may be used elsewhere and in the case of a broken fs it won't be there at all and it makes an assertion trip. Thanks, Signed-off-by: Josef Bacik <josef(a)redhat.com> --- restore.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/restore.c b/restore.c index 5aa35ae..a2c2931 100644 --- a/restore.c +++ b/restore.c @@ -923,9 +923,7 @@ static struct btrfs_root *open_fs(const char *dev, u64 root_location, out: if (fs_location) { struct btrfs_root *fs_root = root->fs_info->fs_root; - if (fs_root) { - free_extent_buffer(fs_root->node); - } else { + if (!fs_root) { fs_root = malloc(sizeof(struct btrfs_root)); if (!fs_root) { fprintf(stderr, "Out of memory\n"); -- 1.7.6.233.gd79bc ++++++ 0147-mkfs-Handle-creation-of-filesystem-larger-than-the-f.patch ++++++ >From 7e2b203768ae87b3614149e99e00afe4fa9394ab Mon Sep 17 00:00:00 2001 From: Jan Kara <jack(a)suse.cz> Date: Thu, 26 Jan 2012 17:03:05 +0100 Subject: [PATCH] mkfs: Handle creation of filesystem larger than the first device make_btrfs() function takes a size of filesystem as an argument. It uses this value to set the size of the first device as well which is wrong for filesystems larger than this device. It results in 'attemp to access beyond end of device' messages from the kernel. So add size of the first device as an argument to make_btrfs(). CC: David Sterba <dsterba(a)suse.cz> Signed-off-by: Jan Kara <jack(a)suse.cz> --- convert.c | 2 +- mkfs.c | 6 ++++-- utils.c | 4 ++-- utils.h | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/convert.c b/convert.c index c036f46..13f3ece 100644 --- a/convert.c +++ b/convert.c @@ -2374,7 +2374,7 @@ int do_convert(const char *devname, int datacsum, int packing, int noxattr) goto fail; } ret = make_btrfs(fd, devname, ext2_fs->super->s_volume_name, - blocks, total_bytes, blocksize, blocksize, + blocks, total_bytes, total_bytes, blocksize, blocksize, blocksize, blocksize); if (ret) { fprintf(stderr, "unable to create initial ctree\n"); diff --git a/mkfs.c b/mkfs.c index be236d0..97481bd 100644 --- a/mkfs.c +++ b/mkfs.c @@ -1302,8 +1302,10 @@ int main(int ac, char **av) first_file = file; source_dir_size = size_sourcedir(source_dir, sectorsize, &num_of_meta_chunks, &size_of_data); - if(block_count < source_dir_size) + if (block_count < source_dir_size) block_count = source_dir_size; + dev_block_count = block_count; + ret = zero_output_file(fd, block_count, sectorsize); if (ret) { fprintf(stderr, "unable to zero the output file\n"); @@ -1329,7 +1331,7 @@ int main(int ac, char **av) leafsize * i; } - ret = make_btrfs(fd, file, label, blocks, block_count, + ret = make_btrfs(fd, file, label, blocks, block_count, dev_block_count, nodesize, leafsize, sectorsize, stripesize); if (ret) { diff --git a/utils.c b/utils.c index 6c96548..a2be9c9 100644 --- a/utils.c +++ b/utils.c @@ -74,7 +74,7 @@ static u64 reference_root_table[] = { }; int make_btrfs(int fd, const char *device, const char *label, - u64 blocks[7], u64 num_bytes, u32 nodesize, + u64 blocks[7], u64 num_bytes, u64 dev_num_bytes, u32 nodesize, u32 leafsize, u32 sectorsize, u32 stripesize) { struct btrfs_super_block super; @@ -276,7 +276,7 @@ int make_btrfs(int fd, const char *device, const char *label, dev_item = btrfs_item_ptr(buf, nritems, struct btrfs_dev_item); btrfs_set_device_id(buf, dev_item, 1); btrfs_set_device_generation(buf, dev_item, 0); - btrfs_set_device_total_bytes(buf, dev_item, num_bytes); + btrfs_set_device_total_bytes(buf, dev_item, dev_num_bytes); btrfs_set_device_bytes_used(buf, dev_item, BTRFS_MKFS_SYSTEM_GROUP_SIZE); btrfs_set_device_io_align(buf, dev_item, sectorsize); diff --git a/utils.h b/utils.h index c5f55e1..bf2d5a4 100644 --- a/utils.h +++ b/utils.h @@ -22,7 +22,7 @@ #define BTRFS_MKFS_SYSTEM_GROUP_SIZE (4 * 1024 * 1024) int make_btrfs(int fd, const char *device, const char *label, - u64 blocks[6], u64 num_bytes, u32 nodesize, + u64 blocks[6], u64 num_bytes, u64 dev_num_bytes, u32 nodesize, u32 leafsize, u32 sectorsize, u32 stripesize); int btrfs_make_root_dir(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid); -- 1.7.6.233.gd79bc ++++++ 0150-btrfs-progs-removed-extraneous-whitespace-from-mkfs-.patch ++++++ >From c250b72ed982832cb8833dd962afed6ec7c5b27e Mon Sep 17 00:00:00 2001 From: Phillip Susi <psusi(a)cfl.rr.com> Date: Mon, 9 Jan 2012 10:18:55 -0500 Subject: [PATCH 150/151] btrfs-progs: removed extraneous whitespace from mkfs man page There were extra spaces around some of the arguments in the man page for mkfs. Signed-off-by: Phillip Susi <psusi(a)cfl.rr.com> --- man/mkfs.btrfs.8.in | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) Index: btrfs-progs-v0.19-118-gfdb6c04/man/mkfs.btrfs.8.in =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/man/mkfs.btrfs.8.in +++ btrfs-progs-v0.19-118-gfdb6c04/man/mkfs.btrfs.8.in @@ -5,16 +5,16 @@ mkfs.btrfs \- create an btrfs filesystem .B mkfs.btrfs [ \fB\-A\fP\fI alloc-start\fP ] [ \fB\-b\fP\fI byte-count\fP ] -[ \fB \-d\fP\fI data-profile\fP ] -[ \fB \-f\fP ] -[ \fB \-l\fP\fI leafsize\fP ] -[ \fB \-L\fP\fI label\fP ] -[ \fB \-m\fP\fI metadata profile\fP ] -[ \fB \-M\fP\fI mixed data+metadata\fP ] -[ \fB \-n\fP\fI nodesize\fP ] -[ \fB \-s\fP\fI sectorsize\fP ] -[ \fB \-h\fP ] -[ \fB \-V\fP ] \fI device\fP [ \fI device ...\fP ] +[ \fB\-d\fP\fI data-profile\fP ] +[ \fB\-f\fP ] +[ \fB\-l\fP\fI leafsize\fP ] +[ \fB\-L\fP\fI label\fP ] +[ \fB\-m\fP\fI metadata profile\fP ] +[ \fB\-M\fP\fI mixed data+metadata\fP ] +[ \fB\-n\fP\fI nodesize\fP ] +[ \fB\-s\fP\fI sectorsize\fP ] +[ \fB\-h\fP ] +[ \fB\-V\fP ] \fI device\fP [ \fI device ...\fP ] .SH DESCRIPTION .B mkfs.btrfs is used to create an btrfs filesystem (usually in a disk partition, or an array ++++++ 0151-btrfs-progs-document-rootdir-mkfs-switch.patch ++++++ >From 3a858a5e19255c402f7c97f492d0b2ac69cf286a Mon Sep 17 00:00:00 2001 From: Phillip Susi <psusi(a)cfl.rr.com> Date: Mon, 9 Jan 2012 10:18:56 -0500 Subject: [PATCH 151/151] btrfs-progs: document --rootdir mkfs switch Signed-off-by: Phillip Susi <psusi(a)cfl.rr.com> --- man/mkfs.btrfs.8.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Index: btrfs-progs-v0.19-118-gfdb6c04/man/mkfs.btrfs.8.in =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/man/mkfs.btrfs.8.in +++ btrfs-progs-v0.19-118-gfdb6c04/man/mkfs.btrfs.8.in @@ -13,6 +13,7 @@ mkfs.btrfs \- create an btrfs filesystem [ \fB\-M\fP\fI mixed data+metadata\fP ] [ \fB\-n\fP\fI nodesize\fP ] [ \fB\-s\fP\fI sectorsize\fP ] +[ \fB\-r\fP\fI rootdir\fP ] [ \fB\-h\fP ] [ \fB\-V\fP ] \fI device\fP [ \fI device ...\fP ] .SH DESCRIPTION @@ -62,6 +63,9 @@ Specify the nodesize. By default the val \fB\-s\fR, \fB\-\-sectorsize \fIsize\fR Specify the sectorsize, the minimum block allocation. .TP +\fB\-r\fR, \fB\-\-rootdir \fIrootdir\fR +Specify a directory to copy into the newly created fs. +.TP \fB\-V\fR, \fB\-\-version\fR Print the \fBmkfs.btrfs\fP version and exit. .SH AVAILABILITY ++++++ 0152-Add-open_ctree_fs_info-for-partial-FS-opens.patch ++++++ >From bffb42193524b984ec8407773a0997707bb20cbf Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Sun, 5 Feb 2012 16:11:48 -0500 Subject: [PATCH 01/18] Add open_ctree_fs_info for partial FS opens fsck needs to be able to open a damaged FS, which means open_ctree needs to be able to return a damaged FS. This adds a new open_ctree_fs_info which can be used to open any and all roots that are valid. btrfs-debug-tree is changed to use it. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfsck.c | 7 +++- debug-tree.c | 59 +++++++++++++++++++++++++------------- disk-io.c | 90 ++++++++++++++++++++++++++++++++++++--------------------- disk-io.h | 3 ++ extent_io.c | 3 ++ 5 files changed, 107 insertions(+), 55 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index 509ab72..40eb407 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -2809,6 +2809,7 @@ int main(int ac, char **av) { struct cache_tree root_cache; struct btrfs_root *root; + struct btrfs_fs_info *info; u64 bytenr = 0; int ret; int num; @@ -2846,11 +2847,13 @@ int main(int ac, char **av) return -EBUSY; } - root = open_ctree(av[optind], bytenr, 0); + info = open_ctree_fs_info(av[optind], bytenr, 0, 0); - if (root == NULL) + if (info == NULL) return 1; + root = info->fs_root; + ret = check_extents(root); if (ret) goto out; diff --git a/debug-tree.c b/debug-tree.c index 2aeabfd..c497892 100644 --- a/debug-tree.c +++ b/debug-tree.c @@ -104,6 +104,7 @@ static void print_old_roots(struct btrfs_super_block *super) int main(int ac, char **av) { struct btrfs_root *root; + struct btrfs_fs_info *info; struct btrfs_path path; struct btrfs_key key; struct btrfs_root_item ri; @@ -152,12 +153,18 @@ int main(int ac, char **av) if (ac != 1) print_usage(); - root = open_ctree(av[optind], 0, 0); - if (!root) { + info = open_ctree_fs_info(av[optind], 0, 0, 1); + if (!info) { fprintf(stderr, "unable to open %s\n", av[optind]); exit(1); } + root = info->fs_root; + if (block_only) { + if (!root) { + fprintf(stderr, "unable to open %s\n", av[optind]); + exit(1); + } leaf = read_tree_block(root, block_only, root->leafsize, 0); @@ -184,25 +191,32 @@ int main(int ac, char **av) if (!extent_only) { if (roots_only) { printf("root tree: %llu level %d\n", - (unsigned long long)root->fs_info->tree_root->node->start, - btrfs_header_level(root->fs_info->tree_root->node)); + (unsigned long long)info->tree_root->node->start, + btrfs_header_level(info->tree_root->node)); printf("chunk tree: %llu level %d\n", - (unsigned long long)root->fs_info->chunk_root->node->start, - btrfs_header_level(root->fs_info->chunk_root->node)); + (unsigned long long)info->chunk_root->node->start, + btrfs_header_level(info->chunk_root->node)); } else { - printf("root tree\n"); - btrfs_print_tree(root->fs_info->tree_root, - root->fs_info->tree_root->node, 1); + if (info->tree_root->node) { + printf("root tree\n"); + btrfs_print_tree(info->tree_root, + info->tree_root->node, 1); + } - printf("chunk tree\n"); - btrfs_print_tree(root->fs_info->chunk_root, - root->fs_info->chunk_root->node, 1); + if (info->chunk_root->node) { + printf("chunk tree\n"); + btrfs_print_tree(info->chunk_root, + info->chunk_root->node, 1); + } } } - tree_root_scan = root->fs_info->tree_root; + tree_root_scan = info->tree_root; btrfs_init_path(&path); again: + if (!extent_buffer_uptodate(tree_root_scan->node)) + goto no_node; + key.offset = 0; key.objectid = 0; btrfs_set_key_type(&key, BTRFS_ROOT_ITEM_KEY); @@ -232,6 +246,9 @@ again: btrfs_level_size(tree_root_scan, btrfs_root_level(&ri)), 0); + if (!extent_buffer_uptodate(buf)) + goto next; + switch(found_key.objectid) { case BTRFS_ROOT_TREE_OBJECTID: if (!skip) @@ -320,13 +337,15 @@ again: } } } +next: path.slots[0]++; } +no_node: btrfs_release_path(root, &path); - if (tree_root_scan == root->fs_info->tree_root && - root->fs_info->log_root_tree) { - tree_root_scan = root->fs_info->log_root_tree; + if (tree_root_scan == info->tree_root && + info->log_root_tree) { + tree_root_scan = info->log_root_tree; goto again; } @@ -334,14 +353,14 @@ again: return 0; if (root_backups) - print_old_roots(&root->fs_info->super_copy); + print_old_roots(&info->super_copy); printf("total bytes %llu\n", - (unsigned long long)btrfs_super_total_bytes(&root->fs_info->super_copy)); + (unsigned long long)btrfs_super_total_bytes(&info->super_copy)); printf("bytes used %llu\n", - (unsigned long long)btrfs_super_bytes_used(&root->fs_info->super_copy)); + (unsigned long long)btrfs_super_bytes_used(&info->super_copy)); uuidbuf[36] = '\0'; - uuid_unparse(root->fs_info->super_copy.fsid, uuidbuf); + uuid_unparse(info->super_copy.fsid, uuidbuf); printf("uuid %s\n", uuidbuf); printf("%s\n", BTRFS_BUILD_VERSION); return 0; diff --git a/disk-io.c b/disk-io.c index b0b9502..e9fdba8 100644 --- a/disk-io.c +++ b/disk-io.c @@ -445,8 +445,9 @@ static int find_and_setup_root(struct btrfs_root *tree_root, generation = btrfs_root_generation(&root->root_item); root->node = read_tree_block(root, btrfs_root_bytenr(&root->root_item), blocksize, generation); - if (!root->node) - return -ENOENT; + if (!extent_buffer_uptodate(root->node)) + return -EIO; + return 0; } @@ -473,7 +474,9 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root, btrfs_super_generation(disk_super) + 1); fs_info->log_root_tree = log_root; - BUG_ON(!log_root->node); + + if (!extent_buffer_uptodate(log_root->node)) + return -EIO; return 0; } @@ -603,9 +606,9 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info, return root; } -struct btrfs_root *__open_ctree_fd(int fp, const char *path, u64 sb_bytenr, +static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, u64 sb_bytenr, u64 root_tree_bytenr, int writes, - int use_earliest_bdev) + int use_earliest_bdev, int partial) { u32 sectorsize; u32 nodesize; @@ -742,7 +745,7 @@ struct btrfs_root *__open_ctree_fd(int fp, const char *path, u64 sb_bytenr, chunk_root->node = read_tree_block(chunk_root, btrfs_super_chunk_root(disk_super), blocksize, generation); - if (!chunk_root->node) { + if (!extent_buffer_uptodate(chunk_root->node)) { printk("Couldn't read chunk root\n"); goto out_devices; } @@ -754,7 +757,7 @@ struct btrfs_root *__open_ctree_fd(int fp, const char *path, u64 sb_bytenr, if (!(btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_METADUMP)) { ret = btrfs_read_chunk_tree(chunk_root); if (ret) - goto out_chunk; + goto out_failed; } blocksize = btrfs_level_size(tree_root, @@ -766,15 +769,15 @@ struct btrfs_root *__open_ctree_fd(int fp, const char *path, u64 sb_bytenr, tree_root->node = read_tree_block(tree_root, root_tree_bytenr, blocksize, generation); - if (!tree_root->node) { + if (!extent_buffer_uptodate(tree_root->node)) { printk("Couldn't read tree root\n"); - goto out_chunk; + goto out_failed; } ret = find_and_setup_root(tree_root, fs_info, BTRFS_EXTENT_TREE_OBJECTID, extent_root); if (ret) { printk("Couldn't setup extent tree\n"); - goto out_tree; + goto out_failed; } extent_root->track_dirty = 1; @@ -782,7 +785,7 @@ struct btrfs_root *__open_ctree_fd(int fp, const char *path, u64 sb_bytenr, BTRFS_DEV_TREE_OBJECTID, dev_root); if (ret) { printk("Couldn't setup device tree\n"); - goto out_extent; + goto out_failed; } dev_root->track_dirty = 1; @@ -790,7 +793,7 @@ struct btrfs_root *__open_ctree_fd(int fp, const char *path, u64 sb_bytenr, BTRFS_CSUM_TREE_OBJECTID, csum_root); if (ret) { printk("Couldn't setup csum tree\n"); - goto out_dev; + goto out_failed; } csum_root->track_dirty = 1; @@ -806,23 +809,28 @@ struct btrfs_root *__open_ctree_fd(int fp, const char *path, u64 sb_bytenr, fs_info->fs_root = btrfs_read_fs_root(fs_info, &key); if (!fs_info->fs_root) - goto out_csum; + goto out_failed; fs_info->data_alloc_profile = (u64)-1; fs_info->metadata_alloc_profile = (u64)-1; fs_info->system_alloc_profile = fs_info->metadata_alloc_profile; - return fs_info->fs_root; -out_csum: - free_extent_buffer(fs_info->csum_root->node); -out_dev: - free_extent_buffer(fs_info->dev_root->node); -out_extent: - free_extent_buffer(fs_info->extent_root->node); -out_tree: - free_extent_buffer(fs_info->tree_root->node); -out_chunk: - free_extent_buffer(fs_info->chunk_root->node); + return fs_info; + +out_failed: + if (partial) + return fs_info; + + if (fs_info->csum_root) + free_extent_buffer(fs_info->csum_root->node); + if (fs_info->dev_root) + free_extent_buffer(fs_info->dev_root->node); + if (fs_info->extent_root) + free_extent_buffer(fs_info->extent_root->node); + if (fs_info->tree_root) + free_extent_buffer(fs_info->tree_root->node); + if (fs_info->chunk_root) + free_extent_buffer(fs_info->chunk_root->node); out_devices: close_all_devices(fs_info); out_cleanup: @@ -842,10 +850,12 @@ out: return NULL; } -struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, int writes) +struct btrfs_fs_info *open_ctree_fs_info(const char *filename, + u64 sb_bytenr, int writes, + int partial) { int fp; - struct btrfs_root *root; + struct btrfs_fs_info *info; int flags = O_CREAT | O_RDWR; if (!writes) @@ -856,33 +866,47 @@ struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, int writes) fprintf (stderr, "Could not open %s\n", filename); return NULL; } - root = __open_ctree_fd(fp, filename, sb_bytenr, 0, writes, 0); + info = __open_ctree_fd(fp, filename, sb_bytenr, 0, writes, 0, partial); close(fp); + return info; +} - return root; +struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, int writes) +{ + struct btrfs_fs_info *info; + + info = open_ctree_fs_info(filename, sb_bytenr, writes, 0); + if (!info) + return NULL; + return info->fs_root; } struct btrfs_root *open_ctree_recovery(const char *filename, u64 sb_bytenr, u64 root_tree_bytenr) { int fp; - struct btrfs_root *root; + struct btrfs_fs_info *info; fp = open(filename, O_RDONLY); if (fp < 0) { fprintf (stderr, "Could not open %s\n", filename); return NULL; } - root = __open_ctree_fd(fp, filename, sb_bytenr, root_tree_bytenr, 0, 0); + info = __open_ctree_fd(fp, filename, sb_bytenr, root_tree_bytenr, 0, 0, 0); close(fp); - - return root; + if (!info) + return NULL; + return info->fs_root; } struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr, int writes, int use_earliest_bdev) { - return __open_ctree_fd(fp, path, sb_bytenr, 0, writes, use_earliest_bdev); + struct btrfs_fs_info *info; + info = __open_ctree_fd(fp, path, sb_bytenr, 0, writes, use_earliest_bdev, 0); + if (!info) + return NULL; + return info->fs_root; } struct btrfs_root *open_ctree_broken(int fd, const char *device) diff --git a/disk-io.h b/disk-io.h index 2b1fcd5..664cabd 100644 --- a/disk-io.h +++ b/disk-io.h @@ -48,6 +48,9 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr, int writes, int use_earliest_bdev); struct btrfs_root *open_ctree_recovery(const char *filename, u64 sb_bytenr, u64 root_tree_bytenr); +struct btrfs_fs_info *open_ctree_fs_info(const char *filename, + u64 sb_bytenr, int writes, + int partial); struct btrfs_root *open_ctree_broken(int fd, const char *device); int close_ctree(struct btrfs_root *root); int write_all_supers(struct btrfs_root *root); diff --git a/extent_io.c b/extent_io.c index 973e918..9990338 100644 --- a/extent_io.c +++ b/extent_io.c @@ -706,6 +706,9 @@ int clear_extent_buffer_uptodate(struct extent_io_tree *tree, int extent_buffer_uptodate(struct extent_buffer *eb) { + if (!eb) + return 0; + if (eb->flags & EXTENT_UPTODATE) return 1; return 0; -- 1.7.6.233.gd79bc ++++++ 0153-btrfsck-print-some-progress-Signed-off-by-Chris-Maso.patch ++++++ >From bed79b9cd39caf88f5bf8fe9340afa539924a8cc Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Mon, 6 Feb 2012 05:05:59 -0500 Subject: [PATCH 02/18] btrfsck: print some progress Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfsck.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index 40eb407..a3c6286 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -2854,13 +2854,16 @@ int main(int ac, char **av) root = info->fs_root; + fprintf(stderr, "checking extents\n"); ret = check_extents(root); if (ret) goto out; + fprintf(stderr, "checking fs roots\n"); ret = check_fs_roots(root, &root_cache); if (ret) goto out; + fprintf(stderr, "checking root refs\n"); ret = check_root_refs(root, &root_cache); out: free_root_recs(&root_cache); -- 1.7.6.233.gd79bc ++++++ 0154-Allow-extent_buffers-to-use-more-ram.patch ++++++ >From 769671c6aeef3359498100f0ef31975706d99fca Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Mon, 6 Feb 2012 05:06:18 -0500 Subject: [PATCH 03/18] Allow extent_buffers to use more ram This changes free_some_buffers (called each time we allocate an extent buffer) to allow a higher hard limit on the number of extent buffers in use. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- extent_io.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extent_io.c b/extent_io.c index 9990338..ebb35b2 100644 --- a/extent_io.c +++ b/extent_io.c @@ -28,7 +28,8 @@ #include "extent_io.h" #include "list.h" -u64 cache_max = 1024 * 1024 * 32; +u64 cache_soft_max = 1024 * 1024 * 256; +u64 cache_hard_max = 1 * 1024 * 1024 * 1024; void extent_io_tree_init(struct extent_io_tree *tree) { @@ -540,18 +541,19 @@ static int free_some_buffers(struct extent_io_tree *tree) struct extent_buffer *eb; struct list_head *node, *next; - if (tree->cache_size < cache_max) + if (tree->cache_size < cache_soft_max) return 0; + list_for_each_safe(node, next, &tree->lru) { eb = list_entry(node, struct extent_buffer, lru); if (eb->refs == 1) { free_extent_buffer(eb); - if (tree->cache_size < cache_max) + if (tree->cache_size < cache_hard_max) break; } else { list_move_tail(&eb->lru, &tree->lru); } - if (nrscan++ > 64) + if (nrscan++ > 64 && tree->cache_size < cache_hard_max) break; } return 0; -- 1.7.6.233.gd79bc ++++++ 0155-btrfsck-don-t-BUG-on-corrupted-extent-records.patch ++++++ >From ab19832dce62c53452454897fe1d2eaf2e1dbd59 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Mon, 6 Feb 2012 08:53:43 -0500 Subject: [PATCH 04/18] btrfsck: don't BUG on corrupted extent records --- btrfsck.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index a3c6286..90e9c80 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -2441,11 +2441,14 @@ static int process_extent_item(struct cache_tree *extent_cache, 0); break; default: - BUG(); + fprintf(stderr, "corrupt extent record: key %Lu %u %Lu\n", + key.objectid, key.type, key.offset); + goto out; } ptr += btrfs_extent_inline_ref_size(type); } WARN_ON(ptr > end); +out: return 0; } -- 1.7.6.233.gd79bc ++++++ 0156-btrfs-corrupt-block-add-e-option-to-corrupt-the-exte.patch ++++++ >From a0e60b027576e8e3e3d77b77eaff1360a374af60 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Mon, 6 Feb 2012 08:54:05 -0500 Subject: [PATCH 05/18] btrfs-corrupt-block: add -e option to corrupt the extent record This will zero out the extent allocation tree records for the extent. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfs-corrupt-block.c | 115 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 76 insertions(+), 39 deletions(-) diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index ace61c1..59e7cb4 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -32,11 +32,6 @@ #include "list.h" #include "version.h" -/* we write the mirror info to stdout unless they are dumping the data - * to stdout - * */ -static FILE *info_file; - struct extent_buffer *debug_corrupt_block(struct btrfs_root *root, u64 bytenr, u32 blocksize, int copy) { @@ -62,7 +57,7 @@ struct extent_buffer *debug_corrupt_block(struct btrfs_root *root, u64 bytenr, device->total_ios++; eb->dev_bytenr = multi->stripes[0].physical; - fprintf(info_file, "mirror %d logical %Lu physical %Lu " + fprintf(stdout, "mirror %d logical %Lu physical %Lu " "device %s\n", mirror_num, (unsigned long long)bytenr, (unsigned long long)eb->dev_bytenr, device->name); kfree(multi); @@ -106,24 +101,88 @@ static struct option long_options[] = { { 0, 0, 0, 0} }; +static int corrupt_extent(struct btrfs_root *root, u64 bytenr, int copy) +{ + struct btrfs_trans_handle *trans; + struct btrfs_key key; + struct extent_buffer *leaf; + u32 item_size; + unsigned long ptr; + struct btrfs_path *path; + int ret; + int slot; + + trans = btrfs_start_transaction(root, 1); + path = btrfs_alloc_path(); + + key.objectid = bytenr; + key.type = (u8)-1; + key.offset = (u64)-1; + + while(1) { + ret = btrfs_search_slot(trans, root->fs_info->extent_root, + &key, path, 0, 1); + if (ret < 0) + break; + + if (ret > 0) { + if (path->slots[0] == 0) + break; + path->slots[0]--; + } + leaf = path->nodes[0]; + slot = path->slots[0]; + btrfs_item_key_to_cpu(leaf, &key, slot); + if (key.objectid != bytenr) + break; + + if (key.type != BTRFS_EXTENT_ITEM_KEY && + key.type != BTRFS_TREE_BLOCK_REF_KEY && + key.type != BTRFS_EXTENT_DATA_REF_KEY && + key.type != BTRFS_EXTENT_REF_V0_KEY && + key.type != BTRFS_SHARED_BLOCK_REF_KEY && + key.type != BTRFS_SHARED_DATA_REF_KEY) + goto next; + + fprintf(stderr, "corrupting extent record: key %Lu %u %Lu\n", + key.objectid, key.type, key.offset); + + ptr = btrfs_item_ptr_offset(leaf, slot); + item_size = btrfs_item_size_nr(leaf, slot); + memset_extent_buffer(leaf, 0, ptr, item_size); + btrfs_mark_buffer_dirty(leaf); +next: + btrfs_release_path(NULL, path); + + if (key.offset > 0) + key.offset--; + if (key.offset == 0) + break; + } + + btrfs_free_path(path); + btrfs_commit_transaction(trans, root); + ret = close_ctree(root); + BUG_ON(ret); + return 0; +} + int main(int ac, char **av) { struct cache_tree root_cache; struct btrfs_root *root; struct extent_buffer *eb; char *dev; - char *output_file = NULL; u64 logical = 0; int ret = 0; int option_index = 0; int copy = 0; u64 bytes = 4096; - int out_fd = 0; - int err; + int extent_rec; while(1) { int c; - c = getopt_long(ac, av, "l:c:", long_options, + c = getopt_long(ac, av, "l:c:e", long_options, &option_index); if (c < 0) break; @@ -152,6 +211,9 @@ int main(int ac, char **av) print_usage(); } break; + case 'e': + extent_rec = 1; + break; default: print_usage(); } @@ -174,23 +236,9 @@ int main(int ac, char **av) fprintf(stderr, "Open ctree failed\n"); exit(1); } - - info_file = stdout; - if (output_file) { - if (strcmp(output_file, "-") == 0) { - out_fd = 1; - info_file = stderr; - } else { - out_fd = open(output_file, O_RDWR | O_CREAT, 0600); - if (out_fd < 0) - goto close; - err = ftruncate(out_fd, 0); - if (err) { - close(out_fd); - goto close; - } - info_file = stdout; - } + if (extent_rec) { + ret = corrupt_extent (root, logical, 0); + goto out; } if (bytes == 0) @@ -201,21 +249,10 @@ int main(int ac, char **av) while (bytes > 0) { eb = debug_corrupt_block(root, logical, root->sectorsize, copy); - if (eb && output_file) { - err = write(out_fd, eb->data, eb->len); - if (err < 0 || err != eb->len) { - fprintf(stderr, "output file write failed\n"); - goto out_close_fd; - } - } free_extent_buffer(eb); logical += root->sectorsize; bytes -= root->sectorsize; } - -out_close_fd: - if (output_file && out_fd != 1) - close(out_fd); -close: +out: return ret; } -- 1.7.6.233.gd79bc ++++++ 0157-btrfsck-add-code-to-rebuild-extent-records.patch ++++++ ++++ 892 lines (skipped) ++++++ 0158-btrfs-corrupt-block-add-E-option-to-randomly-corrupt.patch ++++++ >From 395fb7119f0aa110a2b8988e68159ff1fcf1f7f0 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Tue, 7 Feb 2012 08:36:38 -0500 Subject: [PATCH 07/18] btrfs-corrupt-block: add -E option to randomly corrupt the extent_root Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfs-corrupt-block.c | 132 +++++++++++++++++++++++++++++++++++++++---------- extent-tree.c | 9 ++- 2 files changed, 111 insertions(+), 30 deletions(-) diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 59e7cb4..9ad3e05 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -93,17 +93,9 @@ static void print_usage(void) exit(1); } -static struct option long_options[] = { - /* { "byte-count", 1, NULL, 'b' }, */ - { "logical", 1, NULL, 'l' }, - { "copy", 1, NULL, 'c' }, - { "bytes", 1, NULL, 'b' }, - { 0, 0, 0, 0} -}; - -static int corrupt_extent(struct btrfs_root *root, u64 bytenr, int copy) +static int corrupt_extent(struct btrfs_trans_handle *trans, + struct btrfs_root *root, u64 bytenr, int copy) { - struct btrfs_trans_handle *trans; struct btrfs_key key; struct extent_buffer *leaf; u32 item_size; @@ -111,8 +103,8 @@ static int corrupt_extent(struct btrfs_root *root, u64 bytenr, int copy) struct btrfs_path *path; int ret; int slot; + int should_del = rand() % 3; - trans = btrfs_start_transaction(root, 1); path = btrfs_alloc_path(); key.objectid = bytenr; @@ -121,7 +113,7 @@ static int corrupt_extent(struct btrfs_root *root, u64 bytenr, int copy) while(1) { ret = btrfs_search_slot(trans, root->fs_info->extent_root, - &key, path, 0, 1); + &key, path, -1, 1); if (ret < 0) break; @@ -129,6 +121,7 @@ static int corrupt_extent(struct btrfs_root *root, u64 bytenr, int copy) if (path->slots[0] == 0) break; path->slots[0]--; + ret = 0; } leaf = path->nodes[0]; slot = path->slots[0]; @@ -144,13 +137,26 @@ static int corrupt_extent(struct btrfs_root *root, u64 bytenr, int copy) key.type != BTRFS_SHARED_DATA_REF_KEY) goto next; - fprintf(stderr, "corrupting extent record: key %Lu %u %Lu\n", - key.objectid, key.type, key.offset); + if (should_del) { + fprintf(stderr, "deleting extent record: key %Lu %u %Lu\n", + key.objectid, key.type, key.offset); - ptr = btrfs_item_ptr_offset(leaf, slot); - item_size = btrfs_item_size_nr(leaf, slot); - memset_extent_buffer(leaf, 0, ptr, item_size); - btrfs_mark_buffer_dirty(leaf); + if (key.type == BTRFS_EXTENT_ITEM_KEY) { + /* make sure this extent doesn't get + * reused for other purposes */ + btrfs_pin_extent(root->fs_info, + key.objectid, key.offset); + } + + btrfs_del_item(trans, root, path); + } else { + fprintf(stderr, "corrupting extent record: key %Lu %u %Lu\n", + key.objectid, key.type, key.offset); + ptr = btrfs_item_ptr_offset(leaf, slot); + item_size = btrfs_item_size_nr(leaf, slot); + memset_extent_buffer(leaf, 0, ptr, item_size); + btrfs_mark_buffer_dirty(leaf); + } next: btrfs_release_path(NULL, path); @@ -161,12 +167,65 @@ next: } btrfs_free_path(path); - btrfs_commit_transaction(trans, root); - ret = close_ctree(root); - BUG_ON(ret); return 0; } +static void btrfs_corrupt_extent_leaf(struct btrfs_trans_handle *trans, + struct btrfs_root *root, struct extent_buffer *eb) +{ + u32 nr = btrfs_header_nritems(eb); + u32 victim = rand() % nr; + u64 objectid; + struct btrfs_key key; + + btrfs_item_key_to_cpu(eb, &key, victim); + objectid = key.objectid; + corrupt_extent(trans, root, objectid, 1); +} + +static void btrfs_corrupt_extent_tree(struct btrfs_trans_handle *trans, + struct btrfs_root *root, struct extent_buffer *eb) +{ + int i; + u32 nr; + + if (!eb) + return; + + nr = btrfs_header_nritems(eb); + if (btrfs_is_leaf(eb)) { + btrfs_corrupt_extent_leaf(trans, root, eb); + return; + } + + if (btrfs_header_level(eb) == 1 && eb != root->node) { + if (rand() % 5) + return; + } + + for (i = 0; i < nr; i++) { + struct extent_buffer *next; + + next = read_tree_block(root, btrfs_node_blockptr(eb, i), + root->leafsize, btrfs_node_ptr_generation(eb, i)); + if (!next) + continue; + btrfs_corrupt_extent_tree(trans, root, next); + free_extent_buffer(next); + } +} + +static struct option long_options[] = { + /* { "byte-count", 1, NULL, 'b' }, */ + { "logical", 1, NULL, 'l' }, + { "copy", 1, NULL, 'c' }, + { "bytes", 1, NULL, 'b' }, + { "extent-record", 0, NULL, 'e' }, + { "extent-tree", 0, NULL, 'E' }, + { 0, 0, 0, 0} +}; + + int main(int ac, char **av) { struct cache_tree root_cache; @@ -178,11 +237,14 @@ int main(int ac, char **av) int option_index = 0; int copy = 0; u64 bytes = 4096; - int extent_rec; + int extent_rec = 0; + int extent_tree = 0; + + srand(128); while(1) { int c; - c = getopt_long(ac, av, "l:c:e", long_options, + c = getopt_long(ac, av, "l:c:eE", long_options, &option_index); if (c < 0) break; @@ -214,6 +276,9 @@ int main(int ac, char **av) case 'e': extent_rec = 1; break; + case 'E': + extent_tree = 1; + break; default: print_usage(); } @@ -221,7 +286,7 @@ int main(int ac, char **av) ac = ac - optind; if (ac == 0) print_usage(); - if (logical == 0) + if (logical == 0 && !extent_tree) print_usage(); if (copy < 0) print_usage(); @@ -237,8 +302,19 @@ int main(int ac, char **av) exit(1); } if (extent_rec) { - ret = corrupt_extent (root, logical, 0); - goto out; + struct btrfs_trans_handle *trans; + trans = btrfs_start_transaction(root, 1); + ret = corrupt_extent (trans, root, logical, 0); + btrfs_commit_transaction(trans, root); + goto out_close; + } + if (extent_tree) { + struct btrfs_trans_handle *trans; + trans = btrfs_start_transaction(root, 1); + btrfs_corrupt_extent_tree(trans, root->fs_info->extent_root, + root->fs_info->extent_root->node); + btrfs_commit_transaction(trans, root); + goto out_close; } if (bytes == 0) @@ -253,6 +329,8 @@ int main(int ac, char **av) logical += root->sectorsize; bytes -= root->sectorsize; } -out: + return ret; +out_close: + close_ctree(root); return ret; } diff --git a/extent-tree.c b/extent-tree.c index 1f13992..01dfa3f 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1083,7 +1083,9 @@ static int lookup_inline_extent_backref(struct btrfs_trans_handle *trans, ptr += sizeof(struct btrfs_tree_block_info); BUG_ON(ptr > end); } else { - BUG_ON(!(flags & BTRFS_EXTENT_FLAG_DATA)); + if (!(flags & BTRFS_EXTENT_FLAG_DATA)) { + return -EIO; + } } err = -ENOENT; @@ -2120,8 +2122,6 @@ static int __free_extent(struct btrfs_trans_handle *trans, extent_slot = path->slots[0]; } } else { - btrfs_print_leaf(extent_root, path->nodes[0]); - WARN_ON(1); printk(KERN_ERR "btrfs unable to find ref byte nr %llu " "parent %llu root %llu owner %llu offset %llu\n", (unsigned long long)bytenr, @@ -2129,6 +2129,8 @@ static int __free_extent(struct btrfs_trans_handle *trans, (unsigned long long)root_objectid, (unsigned long long)owner_objectid, (unsigned long long)owner_offset); + ret = -EIO; + goto fail; } leaf = path->nodes[0]; @@ -2238,6 +2240,7 @@ static int __free_extent(struct btrfs_trans_handle *trans, mark_free); BUG_ON(ret); } +fail: btrfs_free_path(path); finish_current_insert(trans, extent_root); return ret; -- 1.7.6.233.gd79bc ++++++ 0159-btrfsck-fix-block-group-accounting-during-repair.patch ++++++ >From 4fc0390c2bbce8a5b39fb592da80bfe1870152a4 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Wed, 8 Feb 2012 21:29:13 -0500 Subject: [PATCH 08/18] btrfsck: fix block group accounting during repair Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfsck.c | 36 +++++++++----- convert.c | 62 +----------------------- ctree.h | 3 + extent-tree.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 174 insertions(+), 75 deletions(-) Index: btrfs-progs-v0.19-118-gfdb6c04/btrfsck.c =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/btrfsck.c +++ btrfs-progs-v0.19-118-gfdb6c04/btrfsck.c @@ -2725,7 +2725,7 @@ static int add_root_to_pending(struct ex static int delete_extent_records(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, - u64 bytenr) + u64 bytenr, u64 new_len) { struct btrfs_key key; struct btrfs_key found_key; @@ -2787,7 +2787,7 @@ static int delete_extent_records(struct if (found_key.type == BTRFS_EXTENT_ITEM_KEY) { ret = btrfs_update_block_group(trans, root, bytenr, - found_key.offset, 0, 1); + found_key.offset, 0, 0); if (ret) break; } @@ -2959,7 +2959,7 @@ static int fixup_extent_refs(struct btrf /* step one, delete all the existing records */ ret = delete_extent_records(trans, info->extent_root, path, - rec->start); + rec->start, rec->max_size); if (ret < 0) goto out; @@ -2987,19 +2987,16 @@ out: return ret; } -static int check_extent_refs(struct btrfs_root *root, - struct cache_tree *extent_cache, int repair) +static int check_extent_refs(struct btrfs_trans_handle *trans, + struct btrfs_root *root, + struct cache_tree *extent_cache, int repair) { struct extent_record *rec; struct cache_extent *cache; - struct btrfs_trans_handle *trans = NULL; int err = 0; int ret = 0; int fixed = 0; - if (repair) - trans = btrfs_start_transaction(root, 1); - if (repair) { /* * if we're doing a repair, we have to make sure @@ -3074,12 +3071,12 @@ repair_abort: fprintf(stderr, "failed to repair damaged filesystem, aborting\n"); exit(1); } - btrfs_commit_transaction(trans, root); } return err; } -static int check_extents(struct btrfs_root *root, int repair) +static int check_extents(struct btrfs_trans_handle *trans, + struct btrfs_root *root, int repair) { struct cache_tree extent_cache; struct cache_tree seen; @@ -3160,7 +3157,7 @@ static int check_extents(struct btrfs_ro if (ret != 0) break; } - ret = check_extent_refs(root, &extent_cache, repair); + ret = check_extent_refs(trans, root, &extent_cache, repair); free(bits); return ret; } @@ -3183,6 +3180,7 @@ int main(int ac, char **av) struct cache_tree root_cache; struct btrfs_root *root; struct btrfs_fs_info *info; + struct btrfs_trans_handle *trans = NULL; u64 bytenr = 0; int ret; int num; @@ -3244,9 +3242,16 @@ int main(int ac, char **av) root = info->fs_root; fprintf(stderr, "checking extents\n"); - ret = check_extents(root, repair); + if (repair) + trans = btrfs_start_transaction(root, 1); + + ret = check_extents(trans, root, repair); if (ret) goto out; + + if (repair) + btrfs_fix_block_accounting(trans, root); + fprintf(stderr, "checking fs roots\n"); ret = check_fs_roots(root, &root_cache); if (ret) @@ -3256,6 +3261,11 @@ int main(int ac, char **av) ret = check_root_refs(root, &root_cache); out: free_root_recs(&root_cache); + if (repair) { + ret = btrfs_commit_transaction(trans, root); + if (ret) + exit(1); + } close_ctree(root); if (found_old_backref) { Index: btrfs-progs-v0.19-118-gfdb6c04/convert.c =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/convert.c +++ btrfs-progs-v0.19-118-gfdb6c04/convert.c @@ -1504,66 +1504,6 @@ fail: return new_root; } -/* - * Fixup block accounting. The initial block accounting created by - * make_block_groups isn't accuracy in this case. - */ -static int fixup_block_accounting(struct btrfs_trans_handle *trans, - struct btrfs_root *root) -{ - int ret; - int slot; - u64 start = 0; - u64 bytes_used = 0; - struct btrfs_path path; - struct btrfs_key key; - struct extent_buffer *leaf; - struct btrfs_block_group_cache *cache; - struct btrfs_fs_info *fs_info = root->fs_info; - - while(1) { - cache = btrfs_lookup_block_group(fs_info, start); - if (!cache) - break; - start = cache->key.objectid + cache->key.offset; - btrfs_set_block_group_used(&cache->item, 0); - cache->space_info->bytes_used = 0; - } - - btrfs_init_path(&path); - key.offset = 0; - key.objectid = 0; - btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY); - ret = btrfs_search_slot(trans, root->fs_info->extent_root, - &key, &path, 0, 0); - if (ret < 0) - return ret; - while(1) { - leaf = path.nodes[0]; - slot = path.slots[0]; - if (slot >= btrfs_header_nritems(leaf)) { - ret = btrfs_next_leaf(root, &path); - if (ret < 0) - return ret; - if (ret > 0) - break; - leaf = path.nodes[0]; - slot = path.slots[0]; - } - btrfs_item_key_to_cpu(leaf, &key, slot); - if (key.type == BTRFS_EXTENT_ITEM_KEY) { - bytes_used += key.offset; - ret = btrfs_update_block_group(trans, root, - key.objectid, key.offset, 1, 0); - BUG_ON(ret); - } - path.slots[0]++; - } - btrfs_set_super_bytes_used(&root->fs_info->super_copy, bytes_used); - btrfs_release_path(root, &path); - return 0; -} - static int create_chunk_mapping(struct btrfs_trans_handle *trans, struct btrfs_root *root) { @@ -1735,7 +1675,7 @@ static int init_btrfs(struct btrfs_root ret = btrfs_make_block_groups(trans, root); if (ret) goto err; - ret = fixup_block_accounting(trans, root); + ret = btrfs_fixup_block_accounting(trans, root); if (ret) goto err; ret = create_chunk_mapping(trans, root); Index: btrfs-progs-v0.19-118-gfdb6c04/ctree.h =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/ctree.h +++ btrfs-progs-v0.19-118-gfdb6c04/ctree.h @@ -1785,6 +1785,9 @@ static inline u32 btrfs_level_size(struc btrfs_item_offset_nr(leaf, slot))) /* extent-tree.c */ +int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, + struct btrfs_root *root); +int btrfs_check_block_accounting(struct btrfs_root *root); void btrfs_pin_extent(struct btrfs_fs_info *fs_info, u64 bytenr, u64 num_bytes); int btrfs_extent_post_op(struct btrfs_trans_handle *trans, struct btrfs_root *root); Index: btrfs-progs-v0.19-118-gfdb6c04/extent-tree.c =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/extent-tree.c +++ btrfs-progs-v0.19-118-gfdb6c04/extent-tree.c @@ -1734,7 +1734,12 @@ static int update_space_info(struct btrf if (found) { found->total_bytes += total_bytes; found->bytes_used += bytes_used; - WARN_ON(found->total_bytes < found->bytes_used); + if (found->total_bytes < found->bytes_used) { + fprintf(stderr, "warning, bad space info total_bytes " + "%llu used %llu\n", + (unsigned long long)found->total_bytes, + (unsigned long long)found->bytes_used); + } *space_info = found; return 0; } @@ -1853,6 +1858,7 @@ static int update_block_group(struct btr old_val = btrfs_block_group_used(&cache->item); num_bytes = min(total, cache->key.offset - byte_in_group); + if (alloc) { old_val += num_bytes; cache->space_info->bytes_used += num_bytes; @@ -3274,3 +3280,143 @@ int btrfs_update_block_group(struct btrf return update_block_group(trans, root, bytenr, num_bytes, alloc, mark_free); } + +static int btrfs_count_extents_in_block_group(struct btrfs_root *root, + struct btrfs_path *path, u64 start, + u64 len, + u64 *total) +{ + struct btrfs_key key; + struct extent_buffer *leaf; + u64 bytes_used = 0; + int ret; + int slot; + + key.offset = 0; + key.objectid = start; + btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY); + ret = btrfs_search_slot(NULL, root->fs_info->extent_root, + &key, path, 0, 0); + if (ret < 0) + return ret; + while(1) { + leaf = path->nodes[0]; + slot = path->slots[0]; + if (slot >= btrfs_header_nritems(leaf)) { + ret = btrfs_next_leaf(root, path); + if (ret < 0) + return ret; + if (ret > 0) + break; + leaf = path->nodes[0]; + slot = path->slots[0]; + } + btrfs_item_key_to_cpu(leaf, &key, slot); + if (key.objectid > start + len) + break; + if (key.type == BTRFS_EXTENT_ITEM_KEY) + bytes_used += key.offset; + path->slots[0]++; + } + *total = bytes_used; + btrfs_release_path(root, path); + return 0; +} + +int btrfs_check_block_accounting(struct btrfs_root *root) +{ + int ret; + u64 start = 0; + u64 bytes_used = 0; + struct btrfs_path path; + struct btrfs_block_group_cache *cache; + struct btrfs_fs_info *fs_info = root->fs_info; + + btrfs_init_path(&path); + + while(1) { + cache = btrfs_lookup_block_group(fs_info, start); + if (!cache) + break; + + ret = btrfs_count_extents_in_block_group(root, &path, + cache->key.objectid, + cache->key.offset, + &bytes_used); + + if (ret == 0) { + u64 on_disk = btrfs_block_group_used(&cache->item); + if (on_disk != bytes_used) { + fprintf(stderr, "bad block group accounting found %llu " + "expected %llu block group %llu\n", + (unsigned long long)bytes_used, + (unsigned long long)on_disk, + (unsigned long long)cache->key.objectid); + } + } + start = cache->key.objectid + cache->key.offset; + + cache->space_info->bytes_used = 0; + } + return 0; +} + +/* + * Fixup block accounting. The initial block accounting created by + * make_block_groups isn't accuracy in this case. + */ +int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, + struct btrfs_root *root) +{ + int ret; + int slot; + u64 start = 0; + u64 bytes_used = 0; + struct btrfs_path path; + struct btrfs_key key; + struct extent_buffer *leaf; + struct btrfs_block_group_cache *cache; + struct btrfs_fs_info *fs_info = root->fs_info; + + while(1) { + cache = btrfs_lookup_block_group(fs_info, start); + if (!cache) + break; + start = cache->key.objectid + cache->key.offset; + btrfs_set_block_group_used(&cache->item, 0); + cache->space_info->bytes_used = 0; + } + + btrfs_init_path(&path); + key.offset = 0; + key.objectid = 0; + btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY); + ret = btrfs_search_slot(trans, root->fs_info->extent_root, + &key, &path, 0, 0); + if (ret < 0) + return ret; + while(1) { + leaf = path.nodes[0]; + slot = path.slots[0]; + if (slot >= btrfs_header_nritems(leaf)) { + ret = btrfs_next_leaf(root, &path); + if (ret < 0) + return ret; + if (ret > 0) + break; + leaf = path.nodes[0]; + slot = path.slots[0]; + } + btrfs_item_key_to_cpu(leaf, &key, slot); + if (key.type == BTRFS_EXTENT_ITEM_KEY) { + bytes_used += key.offset; + ret = btrfs_update_block_group(trans, root, + key.objectid, key.offset, 1, 0); + BUG_ON(ret); + } + path.slots[0]++; + } + btrfs_set_super_bytes_used(&root->fs_info->super_copy, bytes_used); + btrfs_release_path(root, &path); + return 0; +} ++++++ 0160-Turn-off-some-commands-in-Makefile.patch ++++++ >From 6608cffe25fb1d1c3c33caffc98f2f9ba59ed2e6 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Wed, 8 Feb 2012 21:38:20 -0500 Subject: [PATCH 09/18] Turn off some commands in Makefile Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 055d2d6..930500e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ LIBS=-luuid RESTORE_LIBS=-lz -llzo2 progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \ - btrfs btrfs-map-logical restore find-root calc-size btrfs-corrupt-block \ + btrfs btrfs-map-logical btrfs-image btrfs-zero-log \ btrfs-dump-super btrfs_man_page_source = btrfs.c btrfs_cmds.c scrub.c -- 1.7.6.233.gd79bc ++++++ 0161-Fix-btrfs-convert-btrfs-restore-and-btrfs-find-root-.patch ++++++ >From 46f7f481f4270304f358c4c6a0020ca0ca7b9e97 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Wed, 8 Feb 2012 22:26:26 -0500 Subject: [PATCH 10/18] Fix btrfs-convert, btrfs-restore and btrfs-find-root build Signed-off-by: Chris Mason <chris.mason(a)oracle.com> fixit Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- Makefile | 14 +++++++------- convert.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 930500e..556bcce 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,8 @@ LIBS=-luuid RESTORE_LIBS=-lz -llzo2 progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \ - btrfs btrfs-map-logical btrfs-image btrfs-zero-log \ + btrfs btrfs-map-logical btrfs-image btrfs-zero-log btrfs-convert \ + btrfs-find-root btrfs-restore btrfstune \ btrfs-dump-super btrfs_man_page_source = btrfs.c btrfs_cmds.c scrub.c @@ -47,11 +48,11 @@ btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o helpmsg.o calc-size: $(objects) calc-size.o gcc $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS) -find-root: $(objects) find-root.o - gcc $(CFLAGS) -o find-root find-root.o $(objects) $(LDFLAGS) $(LIBS) +btrfs-find-root: $(objects) find-root.o + gcc $(CFLAGS) -o btrfs-find-root find-root.o $(objects) $(LDFLAGS) $(LIBS) -restore: $(objects) restore.o - gcc $(CFLAGS) -o restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS) +btrfs-restore: $(objects) restore.o + gcc $(CFLAGS) -o btrfs-restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS) btrfsctl: $(objects) btrfsctl.o $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) @@ -98,7 +99,7 @@ dir-test: $(objects) dir-test.o quick-test: $(objects) quick-test.o $(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) -convert: $(objects) convert.o +btrfs-convert: $(objects) convert.o $(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS) ioctl-test: $(objects) ioctl-test.o @@ -140,7 +141,6 @@ clean : install: $(progs) install-man $(INSTALL) -m755 -d $(DESTDIR)$(bindir) $(INSTALL) $(progs) $(DESTDIR)$(bindir) - if [ -e btrfs-convert ]; then $(INSTALL) btrfs-convert $(DESTDIR)$(bindir); fi test: test-userspace test-root diff --git a/convert.c b/convert.c index a2f7925..5afcc45 100644 --- a/convert.c +++ b/convert.c @@ -1675,7 +1675,7 @@ static int init_btrfs(struct btrfs_root *root) ret = btrfs_make_block_groups(trans, root); if (ret) goto err; - ret = btrfs_fixup_block_accounting(trans, root); + ret = btrfs_fix_block_accounting(trans, root); if (ret) goto err; ret = create_chunk_mapping(trans, root); -- 1.7.6.233.gd79bc ++++++ 0162-btrfsck-make-sure-to-dirty-all-block-groups-as-we-fi.patch ++++++ >From 494ba283ed46df812d56652d6ccc1b548bb5fe17 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Thu, 9 Feb 2012 09:29:19 -0500 Subject: [PATCH 11/18] btrfsck: make sure to dirty all block groups as we fix accounting The code that corrects the count of bytes used in each block group was only marking block groups dirty when they contained extents. This fixes things to dirty all the block groups, so any empty block groups are written with their correct (zero) count. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- extent-tree.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/extent-tree.c b/extent-tree.c index 544ab2f..5c4057e 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -3378,6 +3378,8 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, struct btrfs_block_group_cache *cache; struct btrfs_fs_info *fs_info = root->fs_info; + root = root->fs_info->extent_root; + while(1) { cache = btrfs_lookup_block_group(fs_info, start); if (!cache) @@ -3385,6 +3387,10 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, start = cache->key.objectid + cache->key.offset; btrfs_set_block_group_used(&cache->item, 0); cache->space_info->bytes_used = 0; + set_extent_bits(&root->fs_info->block_group_cache, + cache->key.objectid, + cache->key.objectid + cache->key.offset -1, + BLOCK_GROUP_DIRTY, GFP_NOFS); } btrfs_init_path(&path); -- 1.7.6.233.gd79bc ++++++ 0163-btrfsck-add-init-csum-tree-to-replace-the-csum-root-.patch ++++++ >From 80a0a84e46d07d2b2b07991ee2813b017301786c Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Thu, 9 Feb 2012 10:38:05 -0500 Subject: [PATCH 12/18] btrfsck: add --init-csum-tree to replace the csum root with an empty one This will effectively delete all of your crcs, but at least you'll be able to mount the FS with nodatasum. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfsck.c | 27 ++++++++++++++++++++++----- ctree.c | 40 ++++++++++++++++++++++++++++++++++++++++ ctree.h | 2 ++ disk-io.c | 3 ++- 4 files changed, 66 insertions(+), 6 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index 1320238..a451397 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -3171,6 +3171,7 @@ static void print_usage(void) static struct option long_options[] = { { "super", 1, NULL, 's' }, { "repair", 0, NULL, 0 }, + { "init-csum-tree", 0, NULL, 0 }, { 0, 0, 0, 0} }; @@ -3185,6 +3186,8 @@ int main(int ac, char **av) int num; int repair = 0; int option_index = 0; + int init_csum_tree = 0; + int rw = 0; while(1) { int c; @@ -3206,6 +3209,11 @@ int main(int ac, char **av) if (option_index == 1) { printf("enabling repair mode\n"); repair = 1; + rw = 1; + } else if (option_index == 2) { + printf("Creating a new CRC tree\n"); + init_csum_tree = 1; + rw = 1; } } @@ -3225,7 +3233,7 @@ int main(int ac, char **av) return -EBUSY; } - info = open_ctree_fs_info(av[optind], bytenr, repair, 1); + info = open_ctree_fs_info(av[optind], bytenr, rw, 1); if (info == NULL) return 1; @@ -3241,9 +3249,19 @@ int main(int ac, char **av) root = info->fs_root; fprintf(stderr, "checking extents\n"); - if (repair) + if (rw) trans = btrfs_start_transaction(root, 1); + if (init_csum_tree) { + fprintf(stderr, "Reinit crc root\n"); + ret = btrfs_fsck_reinit_root(trans, info->csum_root); + if (ret) { + fprintf(stderr, "crc root initialization failed\n"); + return -EIO; + } + goto out; + } + ret = check_extents(trans, root, repair); if (ret) goto out; @@ -3260,15 +3278,14 @@ int main(int ac, char **av) ret = check_root_refs(root, &root_cache); out: free_root_recs(&root_cache); - if (repair) { + if (rw) { ret = btrfs_commit_transaction(trans, root); if (ret) exit(1); } close_ctree(root); - if (found_old_backref) { - /* + if (found_old_backref) { /* * there was a disk format change when mixed * backref was in testing tree. The old format * existed about one week. diff --git a/ctree.c b/ctree.c index 005550f..282c868 100644 --- a/ctree.c +++ b/ctree.c @@ -138,6 +138,46 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans, return 0; } +int btrfs_fsck_reinit_root(struct btrfs_trans_handle *trans, + struct btrfs_root *root) +{ + struct extent_buffer *c; + struct extent_buffer *old = root->node; + int level; + struct btrfs_disk_key disk_key = {0,0,0}; + + level = 0; + + c = btrfs_alloc_free_block(trans, root, + btrfs_level_size(root, 0), + root->root_key.objectid, + &disk_key, level, 0, 0); + if (IS_ERR(c)) + return PTR_ERR(c); + + memset_extent_buffer(c, 0, 0, sizeof(struct btrfs_header)); + btrfs_set_header_level(c, level); + btrfs_set_header_bytenr(c, c->start); + btrfs_set_header_generation(c, trans->transid); + btrfs_set_header_backref_rev(c, BTRFS_MIXED_BACKREF_REV); + btrfs_set_header_owner(c, root->root_key.objectid); + + write_extent_buffer(c, root->fs_info->fsid, + (unsigned long)btrfs_header_fsid(c), + BTRFS_FSID_SIZE); + + write_extent_buffer(c, root->fs_info->chunk_tree_uuid, + (unsigned long)btrfs_header_chunk_tree_uuid(c), + BTRFS_UUID_SIZE); + + btrfs_mark_buffer_dirty(c); + + free_extent_buffer(old); + root->node = c; + add_root_to_dirty_list(root); + return 0; +} + /* * check if the tree block can be shared by multiple trees */ diff --git a/ctree.h b/ctree.h index 6f12869..c53f65a 100644 --- a/ctree.h +++ b/ctree.h @@ -1851,6 +1851,8 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 bytenr, u64 num, int alloc, int mark_free); /* ctree.c */ +int btrfs_fsck_reinit_root(struct btrfs_trans_handle *trans, + struct btrfs_root *root); void reada_for_search(struct btrfs_root *root, struct btrfs_path *path, int level, int slot, u64 objectid); struct extent_buffer *read_node_slot(struct btrfs_root *root, diff --git a/disk-io.c b/disk-io.c index e9fdba8..d9df313 100644 --- a/disk-io.c +++ b/disk-io.c @@ -793,7 +793,8 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, u64 sb_by BTRFS_CSUM_TREE_OBJECTID, csum_root); if (ret) { printk("Couldn't setup csum tree\n"); - goto out_failed; + if (!partial) + goto out_failed; } csum_root->track_dirty = 1; -- 1.7.6.233.gd79bc ++++++ 0164-btrfsck-make-sure-we-fix-the-block-group-accounting-.patch ++++++ >From 1cc34194f336d77e96bc11baec9bea765fdc9849 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Thu, 9 Feb 2012 11:53:33 -0500 Subject: [PATCH 13/18] btrfsck: make sure we fix the block group accounting during repair The block group accounting is fixed after we check the extent back references. This makes sure the accounting is fixed unless we were not able to repair the backrefs. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfsck.c | 12 ++++++++---- extent-tree.c | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index a451397..3aa19ae 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -3070,7 +3070,12 @@ repair_abort: if (ret) { fprintf(stderr, "failed to repair damaged filesystem, aborting\n"); exit(1); + } else { + btrfs_fix_block_accounting(trans, root); } + if (err) + fprintf(stderr, "repaired damaged extent references\n"); + return ret; } return err; } @@ -3263,11 +3268,10 @@ int main(int ac, char **av) } ret = check_extents(trans, root, repair); - if (ret) + if (ret) { + fprintf(stderr, "check extents failed with %d!!!!!!!!!\n", ret); goto out; - - if (repair) - btrfs_fix_block_accounting(trans, root); + } fprintf(stderr, "checking fs roots\n"); ret = check_fs_roots(root, &root_cache); diff --git a/extent-tree.c b/extent-tree.c index 5c4057e..dd593fe 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1953,6 +1953,21 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, return 0; } +static int extent_root_pending_ops(struct btrfs_fs_info *info) +{ + u64 start; + u64 end; + int ret; + + ret = find_first_extent_bit(&info->extent_ins, 0, &start, + &end, EXTENT_LOCKED); + if (!ret) { + ret = find_first_extent_bit(&info->pending_del, 0, &start, &end, + EXTENT_LOCKED); + } + return ret == 0; + +} static int finish_current_insert(struct btrfs_trans_handle *trans, struct btrfs_root *extent_root) { @@ -3380,6 +3395,15 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, root = root->fs_info->extent_root; + while(extent_root_pending_ops(fs_info)) { + ret = finish_current_insert(trans, root); + if (ret) + return ret; + ret = del_pending_extents(trans, root); + if (ret) + return ret; + } + while(1) { cache = btrfs_lookup_block_group(fs_info, start); if (!cache) -- 1.7.6.233.gd79bc ++++++ 0165-btrfsck-remove-extents-from-the-fsck-reference-track.patch ++++++ >From a84a34ca88e7157fda4306ab87a6372e0825628d Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Fri, 10 Feb 2012 13:28:50 -0500 Subject: [PATCH 14/18] btrfsck: remove extents from the fsck reference tracker as they are freed During btrfsck --repair, we make an index of extents that have incorrect reference counts. Once we've collect the whole index, we go through and modify the extent allocation tree to reflect the correct results. Changing the extent allocation tree may free blocks, and so it may end up removing a block that had a missing reference structure. The fsck code may then circle back around and add the reference back. The result is an extent that isn't actually used, but is recorded in the extent allocation tree. This commit adds a hook called as extents are freed. The hook searches the index of incorrect references and updates it to reflect the freeing of the extent. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfsck.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- ctree.h | 6 ++++ extent-tree.c | 6 ++++ 3 files changed, 99 insertions(+), 7 deletions(-) Index: btrfs-progs-v0.19-118-gfdb6c04/btrfsck.c =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/btrfsck.c +++ btrfs-progs-v0.19-118-gfdb6c04/btrfsck.c @@ -2137,7 +2137,7 @@ static int add_extent_rec(struct cache_t if (inc_ref) rec->refs++; if (rec->nr == 1) - rec->nr = nr; + rec->nr = max(nr, max_size); if (start != rec->start) { fprintf(stderr, "warning, start mismatch %llu %llu\n", @@ -2175,7 +2175,7 @@ static int add_extent_rec(struct cache_t rec = malloc(sizeof(*rec)); rec->start = start; rec->max_size = max_size; - rec->nr = nr; + rec->nr = max(nr, max_size); rec->content_checked = 0; rec->owner_ref_checked = 0; INIT_LIST_HEAD(&rec->backrefs); @@ -2722,6 +2722,77 @@ static int add_root_to_pending(struct ex return 0; } +/* as we fix the tree, we might be deleting blocks that + * we're tracking for repair. This hook makes sure we + * remove any backrefs for blocks as we are fixing them. + */ +static int free_extent_hook(struct btrfs_trans_handle *trans, + struct btrfs_root *root, + u64 bytenr, u64 num_bytes, u64 parent, + u64 root_objectid, u64 owner, u64 offset, + int refs_to_drop) +{ + struct extent_record *rec; + struct cache_extent *cache; + int is_data; + struct cache_tree *extent_cache = root->fs_info->fsck_extent_cache; + + is_data = owner >= BTRFS_FIRST_FREE_OBJECTID; + cache = find_cache_extent(extent_cache, bytenr, num_bytes); + if (!cache) + return 0; + + rec = container_of(cache, struct extent_record, cache); + if (is_data) { + struct data_backref *back; + back = find_data_backref(rec, parent, root_objectid, owner, + offset); + if (!back) + goto out; + if (back->node.found_ref) { + back->found_ref -= refs_to_drop; + if (rec->refs) + rec->refs -= refs_to_drop; + } + if (back->node.found_extent_tree) { + back->num_refs -= refs_to_drop; + if (rec->extent_item_refs) + rec->extent_item_refs -= refs_to_drop; + } + if (back->found_ref == 0) + back->node.found_ref = 0; + if (back->num_refs == 0) + back->node.found_extent_tree = 0; + + if (!back->node.found_extent_tree && back->node.found_ref) { + list_del(&back->node.list); + free(back); + } + } else { + struct tree_backref *back; + back = find_tree_backref(rec, parent, root_objectid); + if (!back) + goto out; + if (back->node.found_ref) { + if (rec->refs) + rec->refs--; + back->node.found_ref = 0; + } + if (back->node.found_extent_tree) { + if (rec->extent_item_refs) + rec->extent_item_refs--; + back->node.found_extent_tree = 0; + } + if (!back->node.found_extent_tree && back->node.found_ref) { + list_del(&back->node.list); + free(back); + } + } + maybe_free_extent_rec(extent_cache, rec); +out: + return 0; +} + static int delete_extent_records(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, @@ -3008,7 +3079,7 @@ static int check_extent_refs(struct btrf while(cache) { rec = container_of(cache, struct extent_record, cache); btrfs_pin_extent(root->fs_info, - rec->start, rec->nr); + rec->start, rec->max_size); cache = next_cache_extent(cache); } } @@ -3105,6 +3176,11 @@ static int check_extents(struct btrfs_tr cache_tree_init(&nodes); cache_tree_init(&reada); + if (repair) { + root->fs_info->fsck_extent_cache = &extent_cache; + root->fs_info->free_extent_hook = free_extent_hook; + } + bits_nr = 1024; bits = malloc(bits_nr * sizeof(struct block_info)); if (!bits) { @@ -3163,6 +3239,12 @@ static int check_extents(struct btrfs_tr break; } ret = check_extent_refs(trans, root, &extent_cache, repair); + + if (repair) { + root->fs_info->fsck_extent_cache = NULL; + root->fs_info->free_extent_hook = NULL; + } + free(bits); return ret; } @@ -3269,10 +3351,8 @@ int main(int ac, char **av) } ret = check_extents(trans, root, repair); - if (ret) { - fprintf(stderr, "check extents failed with %d!!!!!!!!!\n", ret); - goto out; - } + if (ret) + fprintf(stderr, "Errors found in extent allocation tree\n"); fprintf(stderr, "checking fs roots\n"); ret = check_fs_roots(root, &root_cache); Index: btrfs-progs-v0.19-118-gfdb6c04/ctree.h =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/ctree.h +++ btrfs-progs-v0.19-118-gfdb6c04/ctree.h @@ -797,6 +797,12 @@ struct btrfs_fs_info { struct list_head space_info; int system_allocs; int readonly; + int (*free_extent_hook)(struct btrfs_trans_handle *trans, + struct btrfs_root *root, + u64 bytenr, u64 num_bytes, u64 parent, + u64 root_objectid, u64 owner, u64 offset, + int refs_to_drop); + struct cache_tree * fsck_extent_cache; }; /* Index: btrfs-progs-v0.19-118-gfdb6c04/extent-tree.c =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/extent-tree.c +++ btrfs-progs-v0.19-118-gfdb6c04/extent-tree.c @@ -2083,6 +2083,12 @@ static int __free_extent(struct btrfs_tr u32 item_size; u64 refs; + if (root->fs_info->free_extent_hook) { + root->fs_info->free_extent_hook(trans, root, bytenr, num_bytes, + parent, root_objectid, owner_objectid, + owner_offset, refs_to_drop); + + } path = btrfs_alloc_path(); if (!path) return -ENOMEM; ++++++ 0166-Btrfsck-add-the-ability-to-prune-corrupt-extent-allo.patch ++++++ ++++ 974 lines (skipped) ++++++ 0167-Btrfs-use-proc-partitions-scanning-for-btrfs_scan_fo.patch ++++++ >From 8ded348cf85fd8572d4ee7fc9d0cad150f4fc2be Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Tue, 21 Feb 2012 15:33:20 -0500 Subject: [PATCH 16/18] Btrfs: use /proc/partitions scanning for btrfs_scan_for_fsid btrfs_scan_for_fsid is used by open_ctree and by mkfs when it is checking for mounted devices. It currently scans all of /dev, which is rarely the right answer. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- utils.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/utils.c b/utils.c index cfb8fde..2d82342 100644 --- a/utils.c +++ b/utils.c @@ -1052,7 +1052,12 @@ fail: int btrfs_scan_for_fsid(struct btrfs_fs_devices *fs_devices, u64 total_devs, int run_ioctls) { - return btrfs_scan_one_dir("/dev", run_ioctls); + int ret; + + ret = btrfs_scan_block_devices(run_ioctls); + if (ret) + ret = btrfs_scan_one_dir("/dev", run_ioctls); + return ret; } int btrfs_device_already_in_root(struct btrfs_root *root, int fd, -- 1.7.6.233.gd79bc ++++++ 0168-Scan-dev-md-and-device-mapper-devices-last.patch ++++++ >From bde44c1e4808c8b3d7291d2ad22536d4b5d7e2f5 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Tue, 21 Feb 2012 15:56:10 -0500 Subject: [PATCH 17/18] Scan /dev/md and device mapper devices last When we're using multipath or raid0, it is possible that btrfs dev scan will find one of the component devices instead of the proper virtual device the kernel creates. We want to make sure the kernel scans the virtual devices last, since it always remembers the last device it finds with a given fsid. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- utils.c | 25 ++++++++++++++++++++++++- volumes.c | 9 ++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/utils.c b/utils.c index 2d82342..0beaf80 100644 --- a/utils.c +++ b/utils.c @@ -1156,7 +1156,10 @@ int btrfs_scan_block_devices(int run_ioctl) int i; char buf[1024]; char fullpath[110]; + int scans = 0; + int special; +scan_again: proc_partitions = fopen("/proc/partitions","r"); if (!proc_partitions) { fprintf(stderr, "Unable to open '/proc/partitions' for scanning\n"); @@ -1172,8 +1175,23 @@ int btrfs_scan_block_devices(int run_ioctl) strcpy(fullpath,"/dev/"); while(fgets(buf, 1023, proc_partitions)) { - i = sscanf(buf," %*d %*d %*d %99s", fullpath+5); + + /* + * multipath and MD devices may register as a btrfs filesystem + * both through the original block device and through + * the special (/dev/mapper or /dev/mdX) entry. + * This scans the special entries last + */ + special = strncmp(fullpath, "/dev/dm-", strlen("/dev/dm-")) == 0; + if (!special) + special = strncmp(fullpath, "/dev/md", strlen("/dev/md")) == 0; + + if (scans == 0 && special) + continue; + if (scans > 0 && !special) + continue; + ret = lstat(fullpath, &st); if (ret < 0) { fprintf(stderr, "failed to stat %s\n", fullpath); @@ -1198,6 +1216,11 @@ int btrfs_scan_block_devices(int run_ioctl) } fclose(proc_partitions); + + if (scans == 0) { + scans++; + goto scan_again; + } return 0; } diff --git a/volumes.c b/volumes.c index 74c88de..e7f4c3e 100644 --- a/volumes.c +++ b/volumes.c @@ -130,7 +130,14 @@ static int device_list_add(const char *path, btrfs_stack_device_bytes_used(&disk_super->dev_item); list_add(&device->dev_list, &fs_devices->devices); device->fs_devices = fs_devices; - } + } else if (!device->name || strcmp(device->name, path)) { + char *name = strdup(path); + if (!name) + return -ENOMEM; + kfree(device->name); + device->name = name; + } + if (found_transid > fs_devices->latest_trans) { fs_devices->latest_devid = devid; -- 1.7.6.233.gd79bc ++++++ 0169-btrfsck-add-early-code-to-handle-corrupted-block-gro.patch ++++++ >From 6d1e1b7a4cfd1e0ab93efa42c14759848a26a6d4 Mon Sep 17 00:00:00 2001 From: Chris Mason <chris.mason(a)oracle.com> Date: Tue, 21 Feb 2012 21:20:54 -0500 Subject: [PATCH 18/18] btrfsck: add early code to handle corrupted block groups This is mostly disabled, but it is step one in handling corrupted block groups in the extent allocation tree. Signed-off-by: Chris Mason <chris.mason(a)oracle.com> --- btrfs-corrupt-block.c | 5 ---- btrfsck.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++- ctree.c | 8 +++++- extent-tree.c | 19 ++++++---------- volumes.c | 12 ---------- volumes.h | 13 +++++++++++ 6 files changed, 81 insertions(+), 32 deletions(-) diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 980a006..7051e99 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -242,11 +242,6 @@ static void btrfs_corrupt_extent_tree(struct btrfs_trans_handle *trans, if (!eb) return; - if ((rand() % 10) == 0) { - corrupt_keys(trans, root, eb); - return; - } - nr = btrfs_header_nritems(eb); if (btrfs_is_leaf(eb)) { btrfs_corrupt_extent_leaf(trans, root, eb); diff --git a/btrfsck.c b/btrfsck.c index 7dc84b5..c1a28bc 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -26,6 +26,7 @@ #include <getopt.h> #include "kerncompat.h" #include "ctree.h" +#include "volumes.h" #include "repair.h" #include "disk-io.h" #include "print-tree.h" @@ -3140,6 +3141,55 @@ static void free_corrupt_blocks(struct btrfs_fs_info *info) } } +static int check_block_group(struct btrfs_trans_handle *trans, + struct btrfs_fs_info *info, + struct map_lookup *map, + int *reinit) +{ + struct btrfs_key key; + struct btrfs_path path; + int ret; + + key.objectid = map->ce.start; + key.offset = map->ce.size; + key.type = BTRFS_BLOCK_GROUP_ITEM_KEY; + + btrfs_init_path(&path); + ret = btrfs_search_slot(NULL, info->extent_root, + &key, &path, 0, 0); + btrfs_release_path(NULL, &path); + if (ret <= 0) + goto out; + + ret = btrfs_make_block_group(trans, info->extent_root, 0, map->type, + BTRFS_FIRST_CHUNK_TREE_OBJECTID, + key.objectid, key.offset); + *reinit = 1; +out: + return ret; +} + +static int check_block_groups(struct btrfs_trans_handle *trans, + struct btrfs_fs_info *info, int *reinit) +{ + struct cache_extent *ce; + struct map_lookup *map; + struct btrfs_mapping_tree *map_tree = &info->mapping_tree; + + /* this isn't quite working */ + return 0; + + ce = find_first_cache_extent(&map_tree->cache_tree, 0); + while (1) { + if (!ce) + break; + map = container_of(ce, struct map_lookup, ce); + check_block_group(trans, info, map, reinit); + ce = next_cache_extent(ce); + } + return 0; +} + static int check_extent_refs(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct cache_tree *extent_cache, int repair) @@ -3149,6 +3199,7 @@ static int check_extent_refs(struct btrfs_trans_handle *trans, int err = 0; int ret = 0; int fixed = 0; + int reinit = 0; if (repair) { /* @@ -3174,6 +3225,9 @@ static int check_extent_refs(struct btrfs_trans_handle *trans, cache = next_cache_extent(cache); } prune_corrupt_blocks(trans, root->fs_info); + check_block_groups(trans, root->fs_info, &reinit); + if (reinit) + btrfs_read_block_groups(root->fs_info->extent_root); } while(1) { fixed = 0; @@ -3356,6 +3410,7 @@ static struct option long_options[] = { { "super", 1, NULL, 's' }, { "repair", 0, NULL, 0 }, { "init-csum-tree", 0, NULL, 0 }, + { "init-extent-tree", 0, NULL, 0 }, { 0, 0, 0, 0} }; @@ -3445,7 +3500,6 @@ int main(int ac, char **av) } goto out; } - ret = check_extents(trans, root, repair); if (ret) fprintf(stderr, "Errors found in extent allocation tree\n"); diff --git a/ctree.c b/ctree.c index a49bce4..2d86b1e 100644 --- a/ctree.c +++ b/ctree.c @@ -151,8 +151,10 @@ int btrfs_fsck_reinit_root(struct btrfs_trans_handle *trans, btrfs_level_size(root, 0), root->root_key.objectid, &disk_key, level, 0, 0); - if (IS_ERR(c)) - return PTR_ERR(c); + if (IS_ERR(c)) { + c = old; + extent_buffer_get(c); + } memset_extent_buffer(c, 0, 0, sizeof(struct btrfs_header)); btrfs_set_header_level(c, level); @@ -1262,6 +1264,8 @@ again: key->objectid); b = read_node_slot(root, b, slot); + if (!extent_buffer_uptodate(b)) + return -EIO; } else { p->slots[level] = slot; if (ins_len > 0 && diff --git a/extent-tree.c b/extent-tree.c index ee87f1f..20cdffa 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1703,7 +1703,6 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans, cache = (struct btrfs_block_group_cache *)(unsigned long)ptr; ret = write_one_cache_group(trans, root, path, cache); - BUG_ON(ret); } btrfs_free_path(path); return 0; @@ -1894,6 +1893,10 @@ static int update_pinned_extents(struct btrfs_root *root, } while (num > 0) { cache = btrfs_lookup_block_group(fs_info, bytenr); + if (!cache) { + len = min((u64)root->sectorsize, num); + goto next; + } WARN_ON(!cache); len = min(num, cache->key.offset - (bytenr - cache->key.objectid)); @@ -1906,6 +1909,7 @@ static int update_pinned_extents(struct btrfs_root *root, cache->space_info->bytes_pinned -= len; fs_info->total_pinned -= len; } +next: bytenr += len; num -= len; } @@ -2263,9 +2267,7 @@ static int __free_extent(struct btrfs_trans_handle *trans, BUG_ON(ret); } - ret = update_block_group(trans, root, bytenr, num_bytes, 0, - mark_free); - BUG_ON(ret); + update_block_group(trans, root, bytenr, num_bytes, 0, mark_free); } fail: btrfs_free_path(path); @@ -2596,13 +2598,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, ret = update_block_group(trans, root, ins->objectid, ins->offset, 1, 0); - if (ret) { - printk(KERN_ERR "btrfs update block group failed for %llu " - "%llu\n", (unsigned long long)ins->objectid, - (unsigned long long)ins->offset); - BUG(); - } - return ret; + return 0; } static int alloc_tree_block(struct btrfs_trans_handle *trans, @@ -3185,7 +3181,6 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, finish_current_insert(trans, extent_root); ret = del_pending_extents(trans, extent_root); - BUG_ON(ret); set_avail_alloc_bits(extent_root->fs_info, type); return 0; } diff --git a/volumes.c b/volumes.c index e7f4c3e..088f639 100644 --- a/volumes.c +++ b/volumes.c @@ -35,18 +35,6 @@ struct stripe { u64 physical; }; -struct map_lookup { - struct cache_extent ce; - u64 type; - int io_align; - int io_width; - int stripe_len; - int sector_size; - int num_stripes; - int sub_stripes; - struct btrfs_bio_stripe stripes[]; -}; - #define map_lookup_size(n) (sizeof(struct map_lookup) + \ (sizeof(struct btrfs_bio_stripe) * (n))) diff --git a/volumes.h b/volumes.h index c34af74..4755176 100644 --- a/volumes.h +++ b/volumes.h @@ -18,6 +18,7 @@ #ifndef __BTRFS_VOLUMES_ #define __BTRFS_VOLUMES_ + struct btrfs_device { struct list_head dev_list; struct btrfs_root *dev_root; @@ -92,6 +93,18 @@ struct btrfs_multi_bio { struct btrfs_bio_stripe stripes[]; }; +struct map_lookup { + struct cache_extent ce; + u64 type; + int io_align; + int io_width; + int stripe_len; + int sector_size; + int num_stripes; + int sub_stripes; + struct btrfs_bio_stripe stripes[]; +}; + #define btrfs_multi_bio_size(n) (sizeof(struct btrfs_multi_bio) + \ (sizeof(struct btrfs_bio_stripe) * (n))) -- 1.7.6.233.gd79bc ++++++ 0170-Btrfs-progs-btrfs-map-logical-Fix-typo-in-usage.patch ++++++ >From 863db40c3f7cc3a3f7c035ea5747e84c9e2b8747 Mon Sep 17 00:00:00 2001 From: Miao Xie <miaox(a)cn.fujitsu.com> Date: Thu, 23 Feb 2012 15:51:09 +0800 Subject: [PATCH 1/3] Btrfs-progs, btrfs-map-logical: Fix typo in usage The right option is 'o' not 'c'. And this tool is used for the block devices on which there is a btrfs file system, so change "mount_point" to "device". Signed-off-by: Miao Xie <miaox(a)cn.fujitsu.com> --- btrfs-map-logical.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index d79a73a..fa4fb3f 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -84,7 +84,7 @@ struct extent_buffer *debug_read_block(struct btrfs_root *root, u64 bytenr, static void print_usage(void) { - fprintf(stderr, "usage: btrfs-map-logical [options] mount_point\n"); + fprintf(stderr, "usage: btrfs-map-logical [options] device\n"); fprintf(stderr, "\t-l Logical extent to map\n"); fprintf(stderr, "\t-c Copy of the extent to read (usually 1 or 2)\n"); fprintf(stderr, "\t-o Output file to hold the extent\n"); @@ -96,7 +96,7 @@ static struct option long_options[] = { /* { "byte-count", 1, NULL, 'b' }, */ { "logical", 1, NULL, 'l' }, { "copy", 1, NULL, 'c' }, - { "output", 1, NULL, 'c' }, + { "output", 1, NULL, 'o' }, { "bytes", 1, NULL, 'b' }, { 0, 0, 0, 0} }; -- 1.7.6.233.gd79bc ++++++ 0171-Btrfs-progs-btrfs-corrupt-block-fix-the-wrong-usage.patch ++++++ >From 2b0d4908db8a2b6120be1617b50187b32b79e56e Mon Sep 17 00:00:00 2001 From: Miao Xie <miaox(a)cn.fujitsu.com> Date: Thu, 23 Feb 2012 15:52:05 +0800 Subject: [PATCH 2/3] Btrfs-progs, btrfs-corrupt-block: fix the wrong usage The old usage is a copy of btrfs-map-logical, it's wrong, fix it. Signed-off-by: Miao Xie <miaox(a)cn.fujitsu.com> --- btrfs-corrupt-block.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 7051e99..124fb38 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -85,11 +85,14 @@ struct extent_buffer *debug_corrupt_block(struct btrfs_root *root, u64 bytenr, static void print_usage(void) { - fprintf(stderr, "usage: btrfs-map-logical [options] mount_point\n"); - fprintf(stderr, "\t-l Logical extent to map\n"); - fprintf(stderr, "\t-c Copy of the extent to read (usually 1 or 2)\n"); - fprintf(stderr, "\t-o Output file to hold the extent\n"); - fprintf(stderr, "\t-b Number of bytes to read\n"); + fprintf(stderr, "usage: btrfs-corrupt-block [options] device\n"); + fprintf(stderr, "\t-l Logical extent to be corrupted\n"); + fprintf(stderr, "\t-c Copy of the extent to be corrupted" + " (usually 1 or 2, default: 0)\n"); + fprintf(stderr, "\t-b Number of bytes to be corrupted\n"); + fprintf(stderr, "\t-e Extent to be corrupted\n"); + fprintf(stderr, "\t-E The whole extent free to be corrupted\n"); + fprintf(stderr, "\t-k Corrupt keys\n"); exit(1); } @@ -296,7 +299,7 @@ int main(int ac, char **av) while(1) { int c; - c = getopt_long(ac, av, "l:c:eEk", long_options, + c = getopt_long(ac, av, "l:c:b:eEk", long_options, &option_index); if (c < 0) break; -- 1.7.6.233.gd79bc ++++++ 0172-Btrfs-progs-fix-btrfsck-s-snapshot-wrong-unresolved-.patch ++++++ >From c1d427d2a7b8557265a641a6d199f1b9436d27af Mon Sep 17 00:00:00 2001 From: Miao Xie <miaox(a)cn.fujitsu.com> Date: Thu, 23 Feb 2012 15:52:58 +0800 Subject: [PATCH 3/3] Btrfs-progs: fix btrfsck's snapshot wrong "unresolved refs" If the fs/file tree is not the parent of the snapshot, it is reasonable that we can not find the relative reference and back reference. But btrfsck doesn't consider this case, and reports "unresolved refs" message, it's wrong, fix it. Signed-off-by: Miao Xie <miaox(a)cn.fujitsu.com> --- btrfsck.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 67 insertions(+), 5 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index c1a28bc..2f1a515 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -747,7 +747,65 @@ static int leave_shared_node(struct btrfs_root *root, return 0; } -static int process_dir_item(struct extent_buffer *eb, +static int is_child_root(struct btrfs_root *root, u64 parent_root_id, + u64 child_root_id) +{ + struct btrfs_path path; + struct btrfs_key key; + struct extent_buffer *leaf; + int has_parent = 0; + int ret; + + btrfs_init_path(&path); + + key.objectid = parent_root_id; + key.type = BTRFS_ROOT_REF_KEY; + key.offset = child_root_id; + ret = btrfs_search_slot(NULL, root->fs_info->tree_root, &key, &path, + 0, 0); + BUG_ON(ret < 0); + btrfs_release_path(root, &path); + if (!ret) + return 1; + + key.objectid = child_root_id; + key.type = BTRFS_ROOT_BACKREF_KEY; + key.offset = 0; + ret = btrfs_search_slot(NULL, root->fs_info->tree_root, &key, &path, + 0, 0); + BUG_ON(ret <= 0); + + while (1) { + leaf = path.nodes[0]; + if (path.slots[0] >= btrfs_header_nritems(leaf)) { + ret = btrfs_next_leaf(root->fs_info->tree_root, &path); + BUG_ON(ret < 0); + + if (ret > 0) + break; + } + + btrfs_item_key_to_cpu(leaf, &key, path.slots[0]); + if (key.objectid != child_root_id || + key.type != BTRFS_ROOT_BACKREF_KEY) + break; + + has_parent = 1; + + if (key.offset == parent_root_id) { + btrfs_release_path(root, &path); + return 1; + } + + path.slots[0]++; + } + + btrfs_release_path(root, &path); + return has_parent? 0 : -1; +} + +static int process_dir_item(struct btrfs_root *root, + struct extent_buffer *eb, int slot, struct btrfs_key *key, struct shared_node *active_node) { @@ -795,9 +853,13 @@ static int process_dir_item(struct extent_buffer *eb, key->objectid, key->offset, namebuf, len, filetype, key->type, error); } else if (location.type == BTRFS_ROOT_ITEM_KEY) { - add_inode_backref(root_cache, location.objectid, - key->objectid, key->offset, namebuf, - len, filetype, key->type, error); + u64 parent = root->objectid; + + if (is_child_root(root, parent, location.objectid)) + add_inode_backref(root_cache, location.objectid, + key->objectid, key->offset, + namebuf, len, filetype, + key->type, error); } else { fprintf(stderr, "warning line %d\n", __LINE__); } @@ -1028,7 +1090,7 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb, switch (key.type) { case BTRFS_DIR_ITEM_KEY: case BTRFS_DIR_INDEX_KEY: - ret = process_dir_item(eb, i, &key, active_node); + ret = process_dir_item(root, eb, i, &key, active_node); break; case BTRFS_INODE_REF_KEY: ret = process_inode_ref(eb, i, &key, active_node); -- 1.7.6.233.gd79bc ++++++ boot-btrfs.sh ++++++ --- /var/tmp/diff_new_pack.HFJOpo/_old 2012-03-20 11:26:17.000000000 +0100 +++ /var/tmp/diff_new_pack.HFJOpo/_new 2012-03-20 11:26:17.000000000 +0100 @@ -1,10 +1,10 @@ #!/bin/bash -e -#%stage: block +#%stage: filesystem #%if: "$rootfstype" = "btrfs" #%programs: /sbin/btrfs /sbin/btrfs-zero-log /sbin/btrfs-convert /sbin/btrfs-select-super /sbin/btrfs-image /sbin/btrfstune /sbin/btrfs-restore /sbin/btrfs-find-root /sbin/btrfsck /sbin/mkfs.btrfs /sbin/btrfs-dump-super modprobe btrfs -if [ -x /sbin/btrfs ]; then - /sbin/btrfs dev scan >& /dev/null +if [ -x /usr/sbin/btrfs ]; then + /usr/sbin/btrfs dev scan >& /dev/null fi ++++++ btrfs-dev-clear-sb ++++++ #!/usr/bin/perl # clear btrfs signature from a device use Fcntl; use constant BTRFS_SUPER_INFO_OFFSET => 64 * 1024; use constant BTRFS_SUPER_INFO_SIZE => 4096; use constant BTRFS_SUPER_MIRROR_MAX => 3; use constant BTRFS_SUPER_MIRROR_SHIFT => 12; use constant BTRFS_MAGIC => "_BHRfS_M"; use constant BTRFS_DEAD => '_BHRf$_M'; sub btrfs_sb_offset($) { my $mirror =$_[0]; my $start = 16 * 1024; if ($mirror>0) { return $start << (BTRFS_SUPER_MIRROR_SHIFT * $mirror); } return BTRFS_SUPER_INFO_OFFSET; } my $dbg=1; my $savesb=0; # main my $dev=$ARGV[0]; my $size; if(!-b $dev) { print("Not a block device: $dev\n"); $size=(stat($dev))[7]; } else { $size=`blkdev --getsize64 "$dev"`; } sysopen(F, $dev, O_EXCL | O_RDWR) or die("Cannot open $dev exclusively: $!"); sysseek(F, 0, 2); $size=tell(F); print("Device size: $size\n") if($dbg); for(my $i=0;$i<6;$i++) { my $off=btrfs_sb_offset($i); if($off > $size) { print("Offset for SB $i beyond EOF\n") if($dbg); last; } print("Offset $i is $off\n") if($dbg); sysseek(F, $off, 0); sysread(F, $buf, BTRFS_SUPER_INFO_SIZE); if($savesb) { open(Q,">SB$i"); print Q ($buf); close(Q); } my $sbmagic=substr($buf, 0x40, length(BTRFS_MAGIC)); print("SB magic: $sbmagic\n") if($dbg); if(BTRFS_MAGIC eq $sbmagic) { print("Found a valid signature of superblock $i\n"); sysseek(F, $off + 0x40, 0); print("Clearing...\n"); syswrite(F, BTRFS_DEAD, length(BTRFS_DEAD)); } elsif(BTRFS_DEAD eq $sbmagic) { print("Found a signature of a dead superblock $i\n"); } else { print("Superblock $i does not look like a btrfs one\n"); } } close(F); print("Syncing dev\n"); system("fsync \'$dev\'"); ++++++ btrfs-man-update ++++++ Index: btrfs-progs-v0.19-118-gfdb6c04/man/btrfs.8.in =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/man/btrfs.8.in +++ btrfs-progs-v0.19-118-gfdb6c04/man/btrfs.8.in @@ -29,15 +29,36 @@ btrfs \- control a btrfs filesystem \fB\fBbtrfs\fP \fBfilesystem sync\fP\fI <path> \fP \fP .PP -\fB\fBbtrfs\fP \fBscrub cancel\fP {\fI<path>\fP|\fI<device>\fP} +\fB\fBbtrfs\fP \fBfilesystem df\fP\fI <path> \fP \fP .PP -\fB\fBbtrfs\fP \fBscrub resume\fP [-Bdqru] {\fI<path>\fP|\fI<device>\fP} +\fB\fBbtrfs\fP \fBfilesystem balance start [-d [filters]] [-m [filters]] [-s [filters]] [-vf]\fP\fI <path> \fP +\fP +.PP +\fB\fBbtrfs\fP \fBfilesystem balance pause\fP\fI <path> \fP +\fP +.PP +\fB\fBbtrfs\fP \fBfilesystem balance cancel\fP\fI <path> \fP +\fP +.PP +\fB\fBbtrfs\fP \fBfilesystem balance resume\fP\fI <path> \fP +\fP +.PP +\fB\fBbtrfs\fP \fBfilesystem balance status [-v]\fP\fI <path> \fP +\fP +.PP +\fB\fBbtrfs\fP \fBfilesystem csize [-s start] [-e end]\fP\fI <file> \fP \fP .PP \fB\fBbtrfs\fP \fBscrub start\fP [-Bdqru] {\fI<path>\fP|\fI<device>\fP} \fP .PP +\fB\fBbtrfs\fP \fBscrub cancel\fP {\fI<path>\fP|\fI<device>\fP} +\fP +.PP +\fB\fBbtrfs\fP \fBscrub resume\fP [-Bdqru] {\fI<path>\fP|\fI<device>\fP} +\fP +.PP \fB\fBbtrfs\fP \fBscrub status\fP [-d] {\fI<path>\fP|\fI<device>\fP} \fP .PP @@ -56,9 +77,18 @@ btrfs \- control a btrfs filesystem \fB\fBbtrfs\fP \fBsubvolume set-default\fP\fI <id> <path>\fP \fP .PP +\fB\fBbtrfs\fP \fBsubvolume get-default\fP\fI <path>\fP +\fP +.PP \fB\fBbtrfs\fP \fBsubvolume snapshot\fP\fI [-r] <source> [<dest>/]<name>\fP \fP .PP +\fB\fBbtrfs\fP \fBinspect-internal inode-resolve [-v] <inode> \fP\fI<path>\fP +\fP +.PP +\fB\fBbtrfs\fP \fBinspect-internal logical-resolve [-v] [-P] <logical> \fP\fI<path>\fP +\fP +.PP .SH DESCRIPTION \fBbtrfs\fP is used to control the filesystem and the files and directories stored. It is the tool to create or destroy a snapshot or a subvolume for @@ -171,24 +201,26 @@ otherwise the devices list is extracted Force a sync for the filesystem identified by \fI<path>\fP. .TP -\fBbtrfs\fP \fBscrub cancel\fP {\fI<path>\fP|\fI<device>\fP} -If a scrub is running on the filesystem identified by \fI<path>\fP, cancel it. -Progress is saved in the scrub progress file and scrubbing can be resumed later -using the \fBscrub resume\fP command. -If a \fI<device>\fP is given, the corresponding filesystem is found and -\fBscrub cancel\fP behaves as if it was called on that filesystem. +\fBbtrfs\fP \fBfilesystem df\fP\fI <path> \fP +Show space usage information for the filesystem identified by \fI<path>\fP. .TP -\fBbtrfs\fP \fBscrub resume\fP [-Bdqru] {\fI<path>\fP|\fI<device>\fP} -Resume a canceled or interrupted scrub cycle on the filesystem identified by -\fI<path>\fP or on a given \fI<device>\fP. Does not start a new scrub if the -last scrub finished successfully. -.RS +\fBbtrfs\fP \fBfilesystem balance\fP\fI <path> \fP + +Balance chunks across the devices, control by subcommands \fIstart\fP, +\fIpause\fP, \fIcancel\fP, \fIresume\fP and read \fIstatus\fP. See section +BALANCE FILTERS for more details. -\fIOptions\fP .TP -see \fBscrub start\fP. -.RE +\fB\fBbtrfs\fP \fBfilesystem csize [-s start] [-e end]\fP\fI <file> \fP +Read regular and compressed size of extents in the range \fI[start,end)\fP. + +\fB-s start\fP +range start inclusive, accepts K/M/G modifiers +\fB-e end\fP +range end exclusive, accepts K/M/G modifiers + +No range reads whole file, no end of range reads up to the end of file. .TP \fBbtrfs\fP \fBscrub start\fP [-Bdqru] {\fI<path>\fP|\fI<device>\fP} @@ -213,6 +245,26 @@ Scrub unused space as well. (NOT IMPLEME .RE .TP +\fBbtrfs\fP \fBscrub cancel\fP {\fI<path>\fP|\fI<device>\fP} +If a scrub is running on the filesystem identified by \fI<path>\fP, cancel it. +Progress is saved in the scrub progress file and scrubbing can be resumed later +using the \fBscrub resume\fP command. +If a \fI<device>\fP is given, the corresponding filesystem is found and +\fBscrub cancel\fP behaves as if it was called on that filesystem. + +.TP +\fBbtrfs\fP \fBscrub resume\fP [-Bdqru] {\fI<path>\fP|\fI<device>\fP} +Resume a canceled or interrupted scrub cycle on the filesystem identified by +\fI<path>\fP or on a given \fI<device>\fP. Does not start a new scrub if the +last scrub finished successfully. +.RS + +\fIOptions\fP +.TP +see \fBscrub start\fP. +.RE + +.TP \fBbtrfs\fP \fBscrub status\fP [-d] {\fI<path>\fP|\fI<device>\fP} Show status of a running scrub for the filesystem identified by \fI<path>\fP or for the specified \fI<device>\fP. ++++++ btrfs-mkfs-update-disclaimer.patch ++++++ Index: btrfs-progs-v0.19-118-gfdb6c04/mkfs.c =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/mkfs.c +++ btrfs-progs-v0.19-118-gfdb6c04/mkfs.c @@ -1297,8 +1297,13 @@ int main(int ac, char **av) if (ac == 0) print_usage(); - printf("\nWARNING! - %s IS EXPERIMENTAL\n", BTRFS_BUILD_VERSION); - printf("WARNING! - see http://btrfs.wiki.kernel.org before using\n\n"); + printf("\n%s\n", BTRFS_BUILD_VERSION); + printf("\n\ +ATTENTION:\n\ +\n\ +mkfs.btrfs is not intended to be used directly. Please use the\n\ +YaST partitioner to create and manage btrfs filesystems to be\n\ +in a supported state on SUSE Linux Enterprise systems.\n\n"); if (source_dir == 0) { file = av[optind++]; @@ -1456,7 +1461,6 @@ raid_groups: pretty_buf = pretty_sizes(btrfs_super_total_bytes(&root->fs_info->super_copy))); free(pretty_buf); - printf("%s\n", BTRFS_BUILD_VERSION); btrfs_commit_transaction(trans, root); if (source_dir_set) { ++++++ btrfs-reorder-commands-help ++++++ Index: btrfs-progs-v0.19-118-gfdb6c04/btrfs.c =================================================================== --- btrfs-progs-v0.19-118-gfdb6c04.orig/btrfs.c +++ btrfs-progs-v0.19-118-gfdb6c04/btrfs.c @@ -231,17 +231,17 @@ static struct Command commands[] = { "the name <name> in the <dest> directory.", NULL }, - { do_delete_subvolume, 1, - "subvolume delete", "<subvolume>\n" - "Delete the subvolume <subvolume>.", - NULL - }, { do_create_subvol, 1, "subvolume create", "[<dest>/]<name>\n" "Create a subvolume in <dest> (or the current directory if\n" "not passed).", NULL }, + { do_delete_subvolume, 1, + "subvolume delete", "<subvolume>\n" + "Delete the subvolume <subvolume>.", + NULL + }, { do_subvol_list, -1, "subvolume list", "[-p] <path>\n" "List the snapshot/subvolume of a filesystem.", "[-p] <path>\n" @@ -254,6 +254,9 @@ static struct Command commands[] = { "as default.", NULL }, + { do_get_default_subvol, 1, "subvolume get-default", "<path>\n" + "Get the default subvolume of a filesystem." + }, { do_find_newer, 2, "subvolume find-new", "<path> <last_gen>\n" "List the recently modified files in a filesystem.", NULL @@ -270,9 +273,6 @@ static struct Command commands[] = { "-l len defragment only up to len bytes\n" "-t size minimal size of file to be considered for defragmenting\n" }, - { do_get_default_subvol, 1, "subvolume get-default", "<path>\n" - "Get the default subvolume of a filesystem." - }, { do_fssync, 1, "filesystem sync", "<path>\n" "Force a sync on the filesystem <path>.", ++++++ local-version-override.patch ++++++ --- /var/tmp/diff_new_pack.HFJOpo/_old 2012-03-20 11:26:17.000000000 +0100 +++ /var/tmp/diff_new_pack.HFJOpo/_new 2012-03-20 11:26:17.000000000 +0100 @@ -1,7 +1,7 @@ -Index: btrfs-progs-v0.19-35-g1b444cd/version.sh +Index: btrfs-progs-v0.19-116-g13eced9/version.sh =================================================================== ---- btrfs-progs-v0.19-35-g1b444cd.orig/version.sh -+++ btrfs-progs-v0.19-35-g1b444cd/version.sh +--- btrfs-progs-v0.19-116-g13eced9.orig/version.sh ++++ btrfs-progs-v0.19-116-g13eced9/version.sh @@ -6,7 +6,7 @@ # Copyright 2008, Oracle # Released under the GNU GPLv2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit brp-extract-appdata for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package brp-extract-appdata for openSUSE:Factory checked in at 2012-03-20 11:26:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-extract-appdata (Old) and /work/SRC/openSUSE:Factory/.brp-extract-appdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brp-extract-appdata", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/brp-extract-appdata/brp-extract-appdata.changes 2012-03-16 13:10:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brp-extract-appdata.new/brp-extract-appdata.changes 2012-03-20 11:26:07.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 19 08:31:40 UTC 2012 - coolo(a)suse.com + +- remove the icon tag if there is no icon + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extract-icons.pl ++++++ --- /var/tmp/diff_new_pack.2G5DhB/_old 2012-03-20 11:26:08.000000000 +0100 +++ /var/tmp/diff_new_pack.2G5DhB/_new 2012-03-20 11:26:08.000000000 +0100 @@ -103,7 +103,11 @@ next if defined $ids{$id->{content}}; $ids{$id->{content}} = 1; my $icon = extract_icon(@{$app->{icon}}[0], $tmpdir); - $app->{icon} = [ { "type" => "local", "content" => $icon } ]; + if ($icon) { + $app->{icon} = [ { "type" => "local", "content" => $icon } ]; + } else { + delete $app->{icon}; + } push(@napps, $app); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bleachbit for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package bleachbit for openSUSE:Factory checked in at 2012-03-20 11:25:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bleachbit (Old) and /work/SRC/openSUSE:Factory/.bleachbit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bleachbit", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/bleachbit/bleachbit.changes 2011-11-16 17:17:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bleachbit.new/bleachbit.changes 2012-03-20 11:25:52.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Mar 17 19:02:59 UTC 2012 - Sascha.Manns(a)open-slx.de + +- updated to version 0.9.2 +- These are the changes since version 0.9.1 +These are the changes since version 0.9.1: + * Clean Firefox crash reports. + * Clean more Google Chrome and Chromium history: omnibox shortcuts, + Network Action Predictor, and keywords_backup. + * Clean LibreOffice. + +------------------------------------------------------------------- Old: ---- bleachbit-0.9.1.tar.bz2 bleachbit-bnc712471.patch New: ---- bleachbit-0.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bleachbit.spec ++++++ --- /var/tmp/diff_new_pack.gOgwvP/_old 2012-03-20 11:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.gOgwvP/_new 2012-03-20 11:25:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bleachbit # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 8/2011 by open-slx GmbH <Sascha.Manns(a)open-slx.de> # Copyright (c) 2010 - 7/2011 by Sascha Manns <saigkill(a)opensuse.org> # @@ -20,16 +20,14 @@ Name: bleachbit -Version: 0.9.1 +Version: 0.9.2 Release: 1 License: GPL-3.0 Summary: Remove unnecessary files, free space, and maintain privacy BuildRequires: fdupes BuildRequires: make BuildRequires: python-devel -%if 0%{?suse_version} >= 1110 BuildRequires: update-desktop-files -%endif %if 0%{?fedora} == 11 BuildRequires: python BuildRequires: python-devel @@ -46,10 +44,8 @@ Obsoletes: %{name} < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if 0%{?suse_version} >= 1110 %py_requires %lang_package -%endif %description BleachBit deletes unnecessary files to free valuable disk space and ++++++ bleachbit-0.9.1.tar.bz2 -> bleachbit-0.9.2.tar.bz2 ++++++ ++++ 9068 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 audacity for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2012-03-20 11:25:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacity", Maintainer is "MSeben(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2012-01-04 07:23:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.audacity.new/audacity.changes 2012-03-20 11:25:43.000000000 +0100 @@ -1,0 +2,43 @@ +Wed Mar 14 15:06:03 UTC 2012 - reddwarf(a)opensuse.org + +- Update to version 2.0.0 + + * Bug fixes for: + + - Interface: + - Fixed playback speed and synchronization problems when dragging + clips or tracks between tracks having different sample rates. + + - Imports and Exports: + - Fixed crashes when changing the sample format of read-directly WAV + or AIFF files using the Track Drop-Down Menu. + - Fixed a crash importing MP3 files that had duplicate metadata tags + (this is a bug in current libsndfile which has been patched in + Audacity; MP3 files mislabeled as WAV which have duplicate tags + will still crash Audacity on Linux if Audacity has been compiled + against an affected version of system libsndfile). + - Fixed an issue where excessively high or corrupted sample values in + the audio could corrupt exports from the start of the problem for + the rest of the file, and could corrupt the rest of the project. + - Fixed Audacity could not be compiled against FFmpeg + 0.7.x and 0.8.x. + + - Effects and Analysis: + - Fixed crash on launch when using "Ambisonic Decoders (PC)" VST + plug-ins and other plug-ins that enable additional floating point + exceptions. + - Fixed Plot Spectrum background could be transparent on some machines. + - Bug fixes for Click Track, High Pass, Low Pass and Vocal Remover. + - Chirp, Tone and Silence generators now remember their settings. + + - Other miscellaneous bug fixes. + + * Changes and Improvements: + + - New Interface preference to show the track name in the display (this + is off by default). + - Longer default Playback preference for effects preview and preview + before cut. + - Restored use of Page Up and Page Down to scroll horizontally. + +------------------------------------------------------------------- Old: ---- audacity-1.3.13-ffmpeg.patch audacity-minsrc-1.3.14-beta.tar.bz2 New: ---- audacity-minsrc-2.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.ID29U2/_old 2012-03-20 11:25:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ID29U2/_new 2012-03-20 11:25:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package audacity # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,6 @@ Name: audacity BuildRequires: alsa-devel -# we use internal PortAudio(so it is not included here in BuildRequires), because audacity team grab sources -# from Portaudio's svn more frequently than we (e.g. see support for non-mmap devices like pulseaudio) BuildRequires: flac-devel BuildRequires: gcc-c++ BuildRequires: jack-devel @@ -32,18 +30,19 @@ BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel +# This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio. +#BuildRequires: portaudio-devel BuildRequires: soundtouch-devel BuildRequires: taglib-devel BuildRequires: update-desktop-files %if %suse_version > 1130 BuildRequires: wxWidgets-wxcontainer-devel +%define _use_internal_dependency_generator 0 +%define __find_requires %wx_requires %else BuildRequires: wxGTK-devel %endif -#vamp-plugin-sdk-devel is available since openSUSE 11.2 -%if %suse_version > 1110 BuildRequires: vamp-plugin-sdk-devel -%endif %if %{with ffmpeg} BuildRequires: libffmpeg-devel %endif @@ -53,25 +52,19 @@ %if %{with twolame} BuildRequires: libtwolame-devel %endif -Version: 1.3.14 -Release: 1 -License: GPL-2.0+ +Version: 2.0.0 +Release: 0 Summary: A Free, Cross-Platform Digital Audio Editor -Url: http://audacity.sourceforge.net/ +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Editors and Convertors -Source0: http://%{name}.googlecode.com/files/%{name}-minsrc-%{version}-beta.tar.bz2 +Url: http://audacity.sourceforge.net/ +Source0: http://%{name}.googlecode.com/files/%{name}-minsrc-%{version}.tar.bz2 Source1: %{name}.png Source2: %{name}-license-nyquist # PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch reddwarf(a)opensuse.org -- this patch removes the buildstamp Patch0: %{name}-no_buildstamp.patch Patch16: %{name}-implicit.patch -# PATCH-FIX-UPSTREAM %{name}-1.3.13-ffmpeg.patch reddwarf(a)opensuse.org -- make it compile against latest ffmpeg -Patch17: %{name}-1.3.13-ffmpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 1130 -%define _use_internal_dependency_generator 0 -%define __find_requires %wx_requires -%endif %description Audacity is a program that manipulates digital audio wave forms. In @@ -81,12 +74,9 @@ physical memory size of your computer. %prep -%setup -q -n %{name}-src-%{version}-beta +%setup -q -n %{name}-src-%{version} %patch0 %patch16 -%if %{with ffmpeg} -%patch17 -p1 -%endif %{__cp} %{S:2} LICENSE_NYQUIST.txt %build ++++++ audacity-minsrc-1.3.14-beta.tar.bz2 -> audacity-minsrc-2.0.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/audacity/audacity-minsrc-1.3.14-beta.tar.bz2 /work/SRC/openSUSE:Factory/.audacity.new/audacity-minsrc-2.0.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at 2012-03-20 11:25:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old) and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2012-03-16 13:09:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2012-03-20 11:25:34.000000000 +0100 @@ -2 +2 @@ -Thu Mar 15 06:40:19 CET 2012 - autobuild(a)suse.de +Sat Mar 17 05:40:07 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-03-15 +- automated update on 2012-03-17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.gUnmkM/_old 2012-03-20 11:25:36.000000000 +0100 +++ /var/tmp/diff_new_pack.gUnmkM/_new 2012-03-20 11:25:36.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Summary: Ethercodes Data for arpwatch -Version: 2012.3.15 +Version: 2012.3.17 Release: 1 Source0: http://standards.ieee.org/regauth/oui/oui.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt ++++++ --- /var/tmp/diff_new_pack.gUnmkM/_old 2012-03-20 11:25:36.000000000 +0100 +++ /var/tmp/diff_new_pack.gUnmkM/_new 2012-03-20 11:25:36.000000000 +0100 @@ -80756,6 +80756,12 @@ MANASSAS VA 20110 UNITED STATES +04-98-F3 (hex) ALPS Electric Co,. Ltd. +0498F3 (base 16) ALPS Electric Co,. Ltd. + 6-1 NISHIDA + KAKUDA MIYAGI PREF 9876-8501 + JAPAN + 04-9F-81 (hex) Simena, LLC 049F81 (base 16) Simena, LLC 46030 Manekin Plaza @@ -83916,6 +83922,13 @@ Hsinchu 300 TAIWAN, REPUBLIC OF CHINA +20-9B-A5 (hex) JIAXING GLEAD Electronics Co.,Ltd +209BA5 (base 16) JIAXING GLEAD Electronics Co.,Ltd + No.66 Zhengyuan Road in Tanghu Industrial Garden + Jiaxing Economic Development Zone + Jiaxing Zhejiang 314003 + CHINA + 20-A2-E7 (hex) Lee-Dickens Ltd 20A2E7 (base 16) Lee-Dickens Ltd Rushton Rd @@ -86404,6 +86417,12 @@ Cupertino CA 95014 UNITED STATES +40-70-4A (hex) Power Idea Technology Limited +40704A (base 16) Power Idea Technology Limited + 1401A, Mintai Building, WenXin 5 Road, ShenZhen, PRC + Guang Dong Shen Zhen 518054 + CHINA + 40-7B-1B (hex) Mettle Networks Inc. 407B1B (base 16) Mettle Networks Inc. 111 N. Market St STE 300 @@ -87737,6 +87756,12 @@ Shenzhen Guangdong 518103 CHINA +50-8C-77 (hex) DIRMEIER Systems +508C77 (base 16) DIRMEIER Systems + Siemensstra�e 2 + Nabburg Bayern 92507 + GERMANY + 50-93-4F (hex) Gradual Tecnologia Ltda. 50934F (base 16) Gradual Tecnologia Ltda. Rod. Alkindar M. Junqueira, Km 34,2 @@ -88851,6 +88876,12 @@ Essen NRW 45149 GERMANY +60-84-3B (hex) Soladigm, Inc. +60843B (base 16) Soladigm, Inc. + 195. S Milpitas Blvd + Milpitas CA 95035 + UNITED STATES + 60-86-45 (hex) Avery Weigh-Tronix, LLC 608645 (base 16) Avery Weigh-Tronix, LLC 1000 Armstrong Drive @@ -88924,6 +88955,12 @@ Encino CA 91436 UNITED STATES +60-B9-82 (hex) RO.VE.R. Laboratories S.p.A. +60B982 (base 16) RO.VE.R. Laboratories S.p.A. + Via Parini, 2 + Sirmione Brescia 25019 + ITALY + 60-C5-47 (hex) Apple, Inc. 60C547 (base 16) Apple, Inc. 1 Infinite Loop @@ -90154,6 +90191,12 @@ Oulu 90100 FINLAND +70-30-18 (hex) Avaya, Inc +703018 (base 16) Avaya, Inc + 211 Mount Airy Road + Basking Ridge NJ 07920 + UNITED STATES + 70-31-87 (hex) ACX GmbH 703187 (base 16) ACX GmbH �u�ere Zwickauer Str. 8 @@ -90829,6 +90872,13 @@ Acton MA 01720 UNITED STATES +78-25-44 (hex) Omnima Limited +782544 (base 16) Omnima Limited + Oxford Science Park + John Eccles House, Robert Robinson Ave + Oxford Oxfordshire OX4 4GP + UNITED KINGDOM + 78-25-AD (hex) SAMSUNG ELECTRONICS CO., LTD. 7825AD (base 16) SAMSUNG ELECTRONICS CO., LTD. 416, MAETAN-3DONG, PALDAL-GU @@ -94490,6 +94540,13 @@ Draper UT 84020 UNITED STATES +A4-18-75 (hex) Cisco Systems +A41875 (base 16) Cisco Systems + 80 West Tasman Dr. + SJCM1-1 + San Jose CA 95134 + UNITED STATES + A4-1B-C0 (hex) Fastec Imaging Corporation A41BC0 (base 16) Fastec Imaging Corporation 17150 Via Del Campo @@ -94541,12 +94598,25 @@ Tsim Sha Tsui HONG KONG +A4-4C-11 (hex) Cisco Systems +A44C11 (base 16) Cisco Systems + 80 West Tasman Dr. + SJCM1-1 + San Jose CA 95134 + UNITED STATES + A4-50-55 (hex) busware.de A45055 (base 16) busware.de Loessnitzgrundstrasse 115a Moritzburg Saxony 01468 GERMANY +A4-52-6F (hex) ADB Broadband Italia +A4526F (base 16) ADB Broadband Italia + VIALE SARCA 336 + MILANO ITALY 20126 + ITALY + A4-56-1B (hex) MCOT Corporation A4561B (base 16) MCOT Corporation Yogohigashi 1-5-12 @@ -95197,6 +95267,12 @@ Qingdao City Shandong Province 266071 CHINA +AC-4B-C8 (hex) Juniper Networks +AC4BC8 (base 16) Juniper Networks + 1194 N Mathilda Avenue + Sunnyvale CA 94089 + UNITED STATES + AC-4F-FC (hex) SVS-VISTEK GmbH AC4FFC (base 16) SVS-VISTEK GmbH Muehlbachstr. 20 @@ -95886,6 +95962,12 @@ Shanghai 201203 CHINA +B4-62-38 (hex) Exablox +B46238 (base 16) Exablox + 365 San Antonio Road + Mountain View CA 94040 + UNITED STATES + B4-67-E9 (hex) Qingdao GoerTek Technology Co., Ltd. B467E9 (base 16) Qingdao GoerTek Technology Co., Ltd. 5F, No.3 Building, Fortune Center @@ -97357,6 +97439,12 @@ Ljubljana 1000 SLOVENIA +C4-F5-7C (hex) Brocade Communications Systems, Inc. +C4F57C (base 16) Brocade Communications Systems, Inc. + 130 Holger Way + San Jose CA 95134 + UNITED STATES + C4-FC-E4 (hex) DishTV NZ Ltd C4FCE4 (base 16) DishTV NZ Ltd 10 Penney Ave @@ -97620,6 +97708,12 @@ Taipei 11493 TAIWAN, REPUBLIC OF CHINA +C8-9F-42 (hex) VDII Innovation AB +C89F42 (base 16) VDII Innovation AB + Nedre Holl�ndaregatan 5 + Helsingborg 25225 + SWEDEN + C8-A1-B6 (hex) Shenzhen Longway Technologies Co., Ltd C8A1B6 (base 16) Shenzhen Longway Technologies Co., Ltd Suite 707,Incubation Building, China Academy of Science&Tech Development, South area @@ -97662,6 +97756,12 @@ C8-AA-CC (hex) PRIVATE C8AACC (base 16) +C8-AE-9C (hex) Shanghai TYD Elecronic Technology Co. Ltd +C8AE9C (base 16) Shanghai TYD Elecronic Technology Co. Ltd + 21F, BLKB, NO.391 GuiPing Rd, + Shanghai 200233 + CHINA + C8-AF-40 (hex) marco Systemanalyse und Entwicklung GmbH C8AF40 (base 16) marco Systemanalyse und Entwicklung GmbH Hans-B�ckler-Str. 2 @@ -101911,6 +102011,12 @@ Nan-Tou Hsien, 542 TAIWAN, REPUBLIC OF CHINA +FC-50-90 (hex) SIMEX Sp. z o.o. +FC5090 (base 16) SIMEX Sp. z o.o. + ul. Wielopole 7 + Gda�sk pomorskie 80-556 + POLAND + FC-5B-24 (hex) Weibel Scientific A/S FC5B24 (base 16) Weibel Scientific A/S Solvang 30 @@ -101986,6 +102092,12 @@ SEOUL 152-777 KOREA, REPUBLIC OF +FC-94-E3 (hex) Technicolor USA Inc. +FC94E3 (base 16) Technicolor USA Inc. + 101 West 103rd Street + Indianapolis IN 46290 + UNITED STATES + FC-A1-3E (hex) Samsung Electronics FCA13E (base 16) Samsung Electronics #94-1, Imsoo-Dong -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit armagetron for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package armagetron for openSUSE:Factory checked in at 2012-03-20 11:25:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armagetron (Old) and /work/SRC/openSUSE:Factory/.armagetron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "armagetron", Maintainer is "pth(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes 2011-09-26 10:29:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes 2012-03-20 11:25:22.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Mar 15 22:53:39 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.2.8.3.2: + + Various security and bug fixes + + For a full list of changes see NEWS file. +- Drop patches that have been fixed upstream: + + armagetronad-0.2.8.2.1-no_type_punning.patch + + armagetronad-0.2.8.2.1-string_const.patch + + armagetronad-missing_headers.patch + + gcc46_add_default_ctors.patch +- Add armagetron-configure.patch: Change detection of libpng. + +------------------------------------------------------------------- Old: ---- armagetronad-0.2.8.2.1-no_type_punning.patch armagetronad-0.2.8.2.1-string_const.patch armagetronad-0.2.8.2.1.tar.bz2 armagetronad-missing_headers.patch gcc46_add_default_ctors.patch New: ---- armagetron-configure.patch armagetronad-0.2.8.3.2.src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armagetron.spec ++++++ --- /var/tmp/diff_new_pack.PgqLzl/_old 2012-03-20 11:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.PgqLzl/_new 2012-03-20 11:25:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package armagetron # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,20 @@ # - Name: armagetron -BuildRequires: SDL_image-devel SDL_mixer-devel kdelibs3-devel +BuildRequires: SDL_image-devel +BuildRequires: SDL_mixer-devel +BuildRequires: kdelibs3-devel PreReq: sh-utils fileutils Summary: OpenGL Game Similar to the Film Tron -Version: 0.2.8.2.1 -Release: 12 License: GPL-2.0+ Group: Amusements/Games +Version: 0.2.8.3.2 +Release: 0 Url: http://armagetronad.sourceforge.net -Source: %{name}ad-%{version}.tar.bz2 +Source: %{name}ad-%{version}.src.tar.bz2 Source1: armagetron_add.tar.gz -Patch1: armagetronad-missing_headers.patch -Patch4: gcc46_add_default_ctors.patch -#backports from 0.2.8.3 -Patch2: armagetronad-0.2.8.2.1-no_type_punning.patch -Patch3: armagetronad-0.2.8.2.1-string_const.patch +Patch0: armagetron-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,12 +44,14 @@ %prep %setup -q -a 1 -n armagetronad-%version -%patch1 -%patch2 -%patch3 -%patch4 +%patch0 -p1 +#patch1 +#patch2 +#patch3 +#patch4 %build +autoreconf -fi export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %configure \ --enable-music \ ++++++ armagetron-configure.patch ++++++ Index: armagetronad-0.2.8.3.2/configure.ac =================================================================== --- armagetronad-0.2.8.3.2.orig/configure.ac +++ armagetronad-0.2.8.3.2/configure.ac @@ -731,7 +731,7 @@ fi CPPFLAGS="$CPPFLAGS `libpng-config --cflags`" LIBS="$LIBS $PNGLIBS" -AC_CHECK_FUNC(png_check_sig, +AC_CHECK_FUNC(png_sig_cmp, , AC_MSG_ERROR([You need libpng to compile Armagetron.])) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aria2 for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package aria2 for openSUSE:Factory checked in at 2012-03-20 11:25:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aria2 (Old) and /work/SRC/openSUSE:Factory/.aria2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aria2", Maintainer is "poeml(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aria2/aria2.changes 2011-10-16 12:43:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aria2.new/aria2.changes 2012-03-20 11:25:17.000000000 +0100 @@ -1,0 +2,100 @@ +Tue Mar 13 08:32:18 UTC 2012 - cfarrell(a)suse.com + +- license update: SUSE-GPL-2.0+-with-openssl-exception + Package expressly allows linking against openSSL + +------------------------------------------------------------------- +Wed Feb 29 18:56:56 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 1.14.2: + * only accepts 32 bit integer values from int and i4 elements in XML-RPC; + fixed overflow bug in aria2.tellWaiting and aria2.tellStopped RPC methods + * updated Spanish, Italian, Russian and Chinese (Simplified) translations + * fixed the bug that aria2 does not listen on address given in --interface + * check scheme part in redirected URI more strictly: the previous + implementation mistakenly sees '/abspath?uri=http://foo' as an absolute URI + because it contains '://', but actually it is not; this change checks + scheme part is constructed in the allowed character set described in RFC + 3986 Section 3.1 + * allow missing params in XML-RPC request + * fixed "Max payload length exceeded or invalid" error when the number of + pieces is very large + * added --deferred-input option; if true is given to --deferred-input option, + aria2 does not read all URIs and options from file specified by -i option + at startup, but it reads one by one when it needs later; this may reduce + memory usage if input file contains a lot of URIs to download; if false is + given, aria2 reads all URIs and options at startup;tThis option defaults to + false + +------------------------------------------------------------------- +Sat Feb 18 11:04:36 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 1.14.1: + + This version fixes the bug that prevents the --checksum option + from working correctly. + + It also fixes the bug where a log file was not created if a + warn level log was created before the log file was opened. + + Now aria2 doesn't assume the download has completed just + because file size matched. The old behavior is problematic, + because aria2 just assumes the download is completed, but in + reality it is not. + +------------------------------------------------------------------- +Thu Jan 12 11:30:29 UTC 2012 - coolo(a)suse.com + +- change license to be in spdx.org format + +------------------------------------------------------------------- +Mon Dec 26 11:06:49 UTC 2011 - pascal.bleser(a)opensuse.org + +- update to 1.14.0: + * updated Chinese (Simplified), Spanish, French and Russian translations + * ignore peer which possibly sent bad data in next few minutes. In aria2, one + piece is downloaded from several peers, so when hash check failed for that + piece, it cannot determine which peer(s) sent bad data. So, we ignore peer + who sent last block of data in random minutes. We use randomized timeout + because all peers get waken up at the almost same time. + * Added suggestion for unknown/ambiguous options. The help messages shown when + argument error were redesigned and less verbose now. When unknown or + ambiguous option is given, show suggestions like "Did you mean...". Some + constant values related to levenstein distance are borrowed from git help.c. + * Added --stop-with-process=PID option. This feature stops application when + process PID is not running. This is useful if aria2 process is forked from a + parent process. The parent process can fork aria2 with its own pid and when + parent process exits for some reason, aria2 can detect it and shutdown + itself. + * Support IPv6 address for FTP via HTTP tunneling. + * The previous implementation could not handle the situation when user, + password and proxy URI is given various order. Now we just set rules: + username set in --*-proxy-user overrides username in --*-proxy option, no + matter in any order username, password and proxy URI are parsed. Likewise, + password set in --*--proxy-passwd overrides password in --*-proxy option. + * Changed format of ETA. Now no leading 0 is used. If hour part and/or min + part is non-zero, and sec part is 0, sec part is omitted, like this "1h3m". + * Rewritten Metalink XML parser. Now we don't strip white spaces while parsing + Metalink V3 document. + * Now xml attribute and characters in RPC request is not stripped at all. + * Fixed bug that some information such as port number is lost if redirect URI + contains only path component. + * Apply PREF_MAX_CONNECTION_PER_SERVER to BitTorrent WEB Seeding hosts. + * Reuse in-flight and pooled URIs when a download is paused. + * Deprecated --metalink-server option. Use --split option instead. + * Made max value of --select-file to 65535 + * Use same domain-match algorithm for no-proxy and netrc. Now "example.org" + does not domain-match ".example.org" in both functions. + * For waiting or paused downloads, the options listed in Input File subsection + in man page are available in aria2.changeOption RPC method, except for + following options: dry-run, metalink-base-uri, parameterized-uri, pause and + piece_length. + * Made --download-result, --save-session, --server-stat-of and --save-cookies + option available in aria2.changeGlobalOption. In addition to them, the + options listed in Input File subsection in man page are also available, + except for following options: checksum, index-out, out, pause and + select-file. + * Made --uri-selector option available in -i list. + * Support IPv6 literal address in proxy option. + * Support IPv6 CIDR block in --http-no-proxy option. + * HttpProxyOptionHandler: Enclose hostname with square brackets if hostname is + IPv6 numeric address. + +------------------------------------------------------------------- Old: ---- aria2-1.13.0.tar.bz2 New: ---- aria2-1.14.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aria2.spec ++++++ --- /var/tmp/diff_new_pack.jHt3uz/_old 2012-03-20 11:25:20.000000000 +0100 +++ /var/tmp/diff_new_pack.jHt3uz/_new 2012-03-20 11:25:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package aria2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,20 +41,21 @@ %endif Name: aria2 -Version: 1.13.0 -Release: 1 +Version: 1.14.2 +Release: 0 Summary: Parallelizing Multi-Protocol Utility for Downloading Files +License: SUSE-GPL-2.0+-with-openssl-exception +Group: Productivity/Networking/Other Source: http://prdownloads.sourceforge.net/aria2/aria2-%{version}.tar.bz2 Patch1: aria2-cares-static.patch Patch2: aria2-cares-lib64.patch Patch4: aria2-atoi.patch Url: http://sourceforge.net/projects/aria2 -Group: Productivity/Networking/Other -License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version:1} %if %{?with_nettle:1}0 -BuildRequires: gmp-devel libnettle-devel +BuildRequires: gmp-devel +BuildRequires: libnettle-devel %endif %if %{?with_gnutls:1}0 BuildRequires: libgcrypt-devel @@ -89,8 +90,13 @@ BuildRequires: cppunit-devel %endif BuildRequires: zlib-devel -BuildRequires: gettext gettext-devel intltool -BuildRequires: gcc-c++ glibc-devel libstdc++-devel make +BuildRequires: gettext +BuildRequires: gettext-devel +BuildRequires: intltool +BuildRequires: gcc-c++ +BuildRequires: glibc-devel +BuildRequires: libstdc++-devel +BuildRequires: make %if 0%{?suse_version} >= 1130 BuildRequires: libcares-devel %endif #cares @@ -101,7 +107,11 @@ BuildRequires: sqlite3-devel %endif #suse_version %endif #with_sqlite -BuildRequires: autoconf automake libtool +BuildRequires: bison +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: bash Provides: aria2c = %{version}-%{release} %if %with_bashcomp @@ -124,7 +134,6 @@ %if %with_bashcomp %package bash-completion -License: GNU General Public License (GPL) Summary: Bash Completion for %{name} Group: Productivity/Networking/Other Requires: %{name} = %{version} ++++++ aria2-1.13.0.tar.bz2 -> aria2-1.14.2.tar.bz2 ++++++ ++++ 111391 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 arabic-fonts for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package arabic-fonts for openSUSE:Factory checked in at 2012-03-20 11:24:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arabic-fonts (Old) and /work/SRC/openSUSE:Factory/.arabic-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arabic-fonts", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.arabic-fonts.new/arabic-fonts.changes 2012-03-20 11:25:12.000000000 +0100 @@ -0,0 +1,96 @@ +------------------------------------------------------------------- +Thu Mar 15 10:42:16 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-2.0+ + See the license file. This is _not_ public domain. Also, use SPDX + (http://www.spdx.org) format + +------------------------------------------------------------------- +Wed Feb 1 12:44:15 UTC 2012 - pgajdos(a)suse.com + +- renamed to arabic-fonts + +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh(a)medozas.de + +- Apply packaging guidelines (remove redundant/obsolete + tags/sections from specfile, etc.) + +------------------------------------------------------------------- +Thu Apr 8 18:27:31 CEST 2010 - tiwai(a)suse.de + +- remove unnecessary buildrequires for too old distros + +------------------------------------------------------------------- +Wed Jan 14 13:03:28 CET 2009 - mfabian(a)suse.de + +- bnc#465330: update also ae_fonts (ttf) to 2.0. + +------------------------------------------------------------------- +Mon Jan 12 14:54:46 CET 2009 - mfabian(a)suse.de + +- bnc#465330: update kacst fonts to 2.0. + +------------------------------------------------------------------- +Fri Aug 04 17:24:29 CEST 2006 - mfabian(a)suse.de + +- move fonts to /usr/share/fonts/ in STABLE (paths changed + because of the move to Xorg X11R7). + +------------------------------------------------------------------- +Wed Mar 01 13:27:56 CET 2006 - mfabian(a)suse.de + +- add "Provides: locale(ar)". + +------------------------------------------------------------------- +Wed Jan 25 21:46:21 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jan 13 15:09:35 CET 2005 - mfabian(a)suse.de + +- update Kacst fonts to 1.6.2. +- add ae_fonts1_ttf_1.1 + +------------------------------------------------------------------- +Fri Dec 03 18:50:15 CET 2004 - mfabian(a)suse.de + +- use new macro "%run_suseconfig_fonts" + +------------------------------------------------------------------- +Mon Sep 13 16:44:40 CEST 2004 - mfabian(a)suse.de + +- Bugzilla #45156: add "Provides: scalable-font-ar". + +------------------------------------------------------------------- +Tue Aug 17 18:39:38 CEST 2004 - mfabian(a)suse.de + +- Bugzilla #39451: run SuSEconfig.fonts only if it exists + +------------------------------------------------------------------- +Tue Aug 17 18:18:19 CEST 2004 - mfabian(a)suse.de + +- add freetype2, freetype2-devel to neededforbuild + (bdftopcf needs libfreetype). + +------------------------------------------------------------------- +Thu Mar 18 18:43:31 CET 2004 - mfabian(a)suse.de + +- use %suseconfig_fonts_prereq + +------------------------------------------------------------------- +Tue Feb 17 12:29:24 CET 2004 - ro(a)suse.de + +- fix typo in specfile + +------------------------------------------------------------------- +Sat Feb 14 04:13:53 CET 2004 - mfabian(a)suse.de + +- don't build as root +- run SuSEconfig.fonts and SuSEconfig.pango in %post and %postun + +------------------------------------------------------------------- +Thu May 29 00:27:08 CEST 2003 - mfabian(a)suse.de + +- new package: fonts-arabic version 0.20030528 New: ---- ae_fonts_2.0.tar.bz2 ae_fonts_mono.tar.bz2 arabic-fonts.changes arabic-fonts.spec haydar_fonts.tar.bz2 kacst_fonts_2.01.tar.bz2 lateef.shaikh_fonts.tar.bz2 sharif.univ_ttf.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arabic-fonts.spec ++++++ # # spec file for package fonts-arabic (Version 0.20091208) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: arabic-fonts BuildRequires: xorg-x11 %define bitmap_fontdir /usr/share/fonts/misc %define ttf_fontdir /usr/share/fonts/truetype License: GPL-2.0+ Group: System/X11/Fonts Provides: scalable-font-ar PreReq: %suseconfig_fonts_prereq Provides: locale(ar) # FIXME: This causes a rpmlint warning; change <= to < once here's a new upstream version Obsoletes: fonts-arabic <= %{version} Provides: fonts-arabic == %{version} Version: 0.20091208 Release: 2 Url: http://www.arabeyes.org/resources.php # public domain: Source0: ae_fonts_mono.tar.bz2 Source1: http://heanet.dl.sourceforge.net/sourceforge/arabeyes/haydar_fonts.tar.bz2 Source2: kacst_fonts_2.01.tar.bz2 Source3: http://heanet.dl.sourceforge.net/sourceforge/arabeyes/lateef.shaikh_fonts.t… Source4: http://heanet.dl.sourceforge.net/sourceforge/arabeyes/sharif.univ_ttf.bz2 Source5: http://downloads.sourceforge.net/arabeyes/ae_fonts_2.0.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Collection of Free Arabic Fonts %description A collection of free Arabic fonts available from http://www.arabeyes.org/resources.php. %prep %setup -T -c %{name} -n %{name} -a 0 -a 1 -a 2 -a 3 -a 5 bunzip2 --stdout $RPM_SOURCE_DIR/sharif.univ_ttf.bz2 > sharif.univ.ttf mv License.txt License.Naqsh.txt cp KacstArabicFonts-*/LICENSE LICENSE.Kacst cp ae_fonts*/COPYING COPYING.ae_fonts cp ae_fonts*/ChangeLog ChangeLog.ae_fonts cp ae_fonts*/README README.ae_fonts %build %install mkdir -p $RPM_BUILD_ROOT%{bitmap_fontdir} mkdir -p $RPM_BUILD_ROOT%{ttf_fontdir} for i in *.ttf */*.ttf */*/*.ttf do # one of the kacst TrueType font files has size zero # make sure to install only .ttf files with size greater than zero # (OpenOffice even coredumps when .ttf files with size zero # are in the path). if [ -s $i ] ; then install -c -m 644 $i $RPM_BUILD_ROOT%{ttf_fontdir} fi done for i in */*.bdf do bdftopcf $i | gzip -9 > \ $RPM_BUILD_ROOT%{bitmap_fontdir}/`basename $i .bdf`.pcf.gz done %post %run_suseconfig_fonts %postun %run_suseconfig_fonts %files %defattr(-, root,root) %doc License* LICENSE* %{bitmap_fontdir} %{ttf_fontdir} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit acpid for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package acpid for openSUSE:Factory checked in at 2012-03-20 11:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/acpid (Old) and /work/SRC/openSUSE:Factory/.acpid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "acpid", Maintainer is "hmacht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/acpid/acpid.changes 2012-01-25 15:01:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.acpid.new/acpid.changes 2012-03-20 11:24:43.000000000 +0100 @@ -1,0 +2,50 @@ +Fri Mar 16 12:49:12 UTC 2012 - tabraham(a)novell.com + +- Update to acpid 2.0.15 + + Improve man page (Debian bug #656676) + (acpid.8 acpi_listen.8) (Ted Felix) + + Change makefile to get rid of double slashes on install paths. + Note: This change was lost due to introduction of autoconf which + wiped out the old Makefile. (Makefile) (Gilles Espinasse) + + Switch from Makefile to autoconf build system. Fix some related + warnings. + (Makefile Makefile.am README TODO acpi_ids.c acpi_ids.h acpid.h + configure.ac connection_list.h event.c kacpimon/Makefile.am + kacpimon/makefile proc.h sock.h) + (Cristian Rodriguez) + + Fix build warnings uncovered by new gcc settings from autoconf. + (inotify_handler.c input_layer.c kacpimon/acpi_ids.c kacpimon/acpi_ids.h + kacpimon/connection_list.c kacpimon/connection_list.h + kacpimon/input_layer.c kacpimon/kacpimon.c kacpimon/netlink.c netlink.c + proc.c sock.c) + (Ted Felix) + + Remove fcntl() calls to set FD_CLOEXEC and replace with + CLOEXEC flags within the various open(), recvmsg() and other calls. + Requires kernel version 2.6.23 and above. + (acpi_listen.c inotify_handler.c input_layer.c libnetlink.c netlink.c + proc.c ud_socket.c) + (Cristian Rodriguez) + + Add SOCK_NONBLOCK to ud_create_socket(). + (ud_socket.c) (Cristian Rodriguez) + + Use isfdtype() instead of getsockopt() in is_socket(). Use fchmod(), + fstat(), and fchown() instead of the non-"f" versions in open_sock(). + (sock.c) (Cristian Rodriguez) + + Use __attribute__ for argument checking in acpid_log(). + (input_layer.c log.h netlink.c ud_socket.c) (Cristian Rodriguez) + + Close only the open fds in close_fds(). + (acpid.c) (Cristian Rodriguez) + + Use accept4() with SOCK_CLOEXEC and SOCK_NONBLOCK in ud_accept(). + Remove unnecessary calls to fcntl() in process_sock(). + (sock.c ud_socket.c) (Cristian Rodriguez) + + Use asprintf() instead of snprintf() in process_sock(). + (sock.c) (Cristian Rodriguez) + + Use TEMP_FAILURE_RETRY macro instead of bogus checks for EINTR. + (acpi_listen.c acpid.c event.c input_layer.c libnetlink.c netlink.c + proc.c ud_socket.c) (Cristian Rodriguez) + + Use safer, faster, and more modern functions asprintf(), fstatat(), + openat(), and fdopen() in the configuration file processing. + (event.c) (Cristian Rodriguez) + +- refreshed patches - acpid-makefile.patch acpid-wrong-memset.patch + +------------------------------------------------------------------- Old: ---- acpid-2.0.14.tar.gz New: ---- acpid-2.0.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.yLA275/_old 2012-03-20 11:24:44.000000000 +0100 +++ /var/tmp/diff_new_pack.yLA275/_new 2012-03-20 11:24:44.000000000 +0100 @@ -18,7 +18,7 @@ Name: acpid -Version: 2.0.14 +Version: 2.0.15 Release: 0 License: GPL-2.0+ Summary: Executes Actions at ACPI Events @@ -55,12 +55,13 @@ %prep %setup -q %patch1 -%patch2 -p1 +%patch2 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} . %build export LDFLAGS="-Wl,-z,relro,-z,now" +%configure make OPT="%{optflags}" %{?_smp_mflags} %install @@ -111,10 +112,12 @@ %_unitdir/%{name}.service %{_sbindir}/rcacpid %{_sbindir}/acpid +%{_sbindir}/kacpimon %{_bindir}/acpi_listen %doc README.SuSE README Changelog examples %{_mandir}/man8/acpid.8.gz %{_mandir}/man8/acpi_listen.8.gz +%{_mandir}/man8/kacpimon.8.gz %ghost %config(noreplace,missingok) %{_localstatedir}/log/acpid %changelog ++++++ acpid-2.0.14.tar.gz -> acpid-2.0.15.tar.gz ++++++ ++++ 16540 lines of diff (skipped) ++++++ acpid-makefile.patch ++++++ --- /var/tmp/diff_new_pack.yLA275/_old 2012-03-20 11:24:45.000000000 +0100 +++ /var/tmp/diff_new_pack.yLA275/_new 2012-03-20 11:24:45.000000000 +0100 @@ -1,13 +1,11 @@ -Index: Makefile -=================================================================== ---- Makefile.orig -+++ Makefile -@@ -49,7 +49,7 @@ install_docs: - for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done - cp -a samples $(DESTDIR)/$(DOCDIR) +--- Makefile.in.orig 2012-03-16 09:34:42.474574907 -0400 ++++ Makefile.in 2012-03-16 09:34:59.373363642 -0400 +@@ -890,7 +890,7 @@ + + info-am: + +-install-data-am: install-dist_docDATA install-man ++install-data-am: install-man + + install-dvi: install-dvi-recursive --install: $(PROGS) man install_docs -+install: $(PROGS) man - mkdir -p $(DESTDIR)/$(SBINDIR) - mkdir -p $(DESTDIR)/$(BINDIR) - install -m 0750 acpid $(DESTDIR)/$(SBINDIR) ++++++ acpid-wrong-memset.patch ++++++ --- /var/tmp/diff_new_pack.yLA275/_old 2012-03-20 11:24:45.000000000 +0100 +++ /var/tmp/diff_new_pack.yLA275/_new 2012-03-20 11:24:45.000000000 +0100 @@ -1,13 +1,11 @@ -Index: acpid-2.0.13/libnetlink.c -=================================================================== ---- acpid-2.0.13.orig/libnetlink.c -+++ acpid-2.0.13/libnetlink.c -@@ -41,7 +41,7 @@ int rtnl_open_byproto(struct rtnl_handle +--- libnetlink.c.orig 2012-03-16 09:03:33.422941268 -0400 ++++ libnetlink.c 2012-03-16 09:03:52.113707601 -0400 +@@ -41,7 +41,7 @@ int sndbuf = 32768; int rcvbuf = 32768; - memset(rth, 0, sizeof(rth)); + memset(rth, 0, sizeof(*rth)); - rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol); + rth->fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, protocol); if (rth->fd < 0) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2012-03-20 10:35:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux", Maintainer is "PUzel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/util-linux.changes 2012-02-28 14:16:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.util-linux.new/util-linux.changes 2012-03-20 10:35:32.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Mar 16 09:56:21 UTC 2012 - fcrozat(a)suse.com + +- Fix Obsoletes / Provides for login. + +------------------------------------------------------------------- +Tue Mar 13 16:38:34 CET 2012 - kukuk(a)suse.de + +- Enable /bin/login and obsolete old fork now merged back + (not moved to /usr/bin until all problems are solved to + avoid that root is not able to login). + +------------------------------------------------------------------- +Tue Mar 6 21:18:56 UTC 2012 - rschweikert(a)suse.com + +- keep binaries in /usr tree (UsrMerge project) + +------------------------------------------------------------------- New: ---- login.pamd remote.pamd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.GvWYpD/_old 2012-03-20 10:35:36.000000000 +0100 +++ /var/tmp/diff_new_pack.GvWYpD/_new 2012-03-20 10:35:36.000000000 +0100 @@ -52,15 +52,17 @@ Group: System/Base Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/%{name}-%{version}.ta… Source1: util-linux-rpmlintrc -# XXX: make nologin part of login package +# XXX: make nologin part of util-linux upstream Source2: nologin.c Source3: nologin.8 Source4: raw.init Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf +Source8: login.pamd +Source9: remote.pamd # TODO: split to separate package -Source9: http://ftp.debian.org/debian/pool/main/a/adjtimex/adjtimex_%{adjtimex_ver}.… +Source10: http://ftp.debian.org/debian/pool/main/a/adjtimex/adjtimex_%{adjtimex_ver}.… Source11: klogconsole.tar.bz2 # TODO: split to separate package Source12: which-%{which_ver}.tar.bz2 @@ -106,8 +108,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed # -Provides: util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} uuid-runtime = %{version}-%{release} -Obsoletes: util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} uuid-runtime < %{version}-%{release} +Provides: base = %{version}-%{release} +Provides: login = 4.0-33.7 +Provides: raw = %{version}-%{release} +Provides: rawio = %{version}-%{release} +Provides: util = %{version}-%{release} +Provides: uuid-runtime = %{version}-%{release} +Obsoletes: base < %{version}-%{release} +Obsoletes: login < 4.0-33.7 +Obsoletes: raw < %{version}-%{release} +Obsoletes: rawio < %{version}-%{release} +Obsoletes: util < %{version}-%{release} +Obsoletes: uuid-runtime < %{version}-%{release} %description This package contains a large variety of low-level system utilities @@ -165,7 +177,7 @@ %description -n libmount1 Library designed to be used in low-level utils like -mount(8) and /sbin/mount.<type> helpers. +mount(8) and /usr/sbin/mount.<type> helpers. %package -n libmount-devel Summary: Development files for libmount1 @@ -177,7 +189,7 @@ %lang_package %prep -%setup -q -n %{name}-%{version} -a 9 -b 11 -b 12 -b 13 +%setup -q -n %{name}-%{version} -a 10 -b 11 -b 12 -b 13 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -235,8 +247,6 @@ export SUID_CFLAGS="-fpie" export SUID_LDFLAGS="-pie" %configure \ - --bindir=/bin \ - --sbindir=/sbin \ --with-audit \ --with-selinux \ --enable-mesg \ @@ -246,6 +256,7 @@ --enable-line \ --enable-libmount-mount \ --enable-ddate \ + --enable-login-utils \ --disable-mountpoint \ --disable-use-tty-group \ --disable-static \ @@ -259,13 +270,15 @@ %{__cc} -fwhole-program %{optflags} -o chrp-addnote %{SOURCE31} %install -mkdir -p %{buildroot}{/etc/init.d,%{_mandir}/man{1,8},/bin,/sbin,/usr/bin,/usr/sbin,%{_infodir}} +mkdir -p %{buildroot}{/etc/init.d,/etc/pam.d,%{_mandir}/man{1,8},/bin,/sbin,/usr/bin,/usr/sbin,%{_infodir}} mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid/ mkdir -p %{buildroot}%{_localstatedir}/run/uuidd/ install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf +install -m 644 %{SOURCE8} %{buildroot}/etc/pam.d/login +install -m 644 %{SOURCE9} %{buildroot}/etc/pam.d/remote mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -cp adjtimex-*/adjtimex %{buildroot}/sbin/ +cp adjtimex-*/adjtimex %{buildroot}/%{_sbindir} cp adjtimex-*/adjtimex.8 %{buildroot}%{_mandir}/man8/ pushd .. # which install @@ -297,20 +310,60 @@ # util-linux install # %make_install -mv %{buildroot}%{_bindir}/logger %{buildroot}/bin/logger +#UsrMerge +ln -s %{_bindir}/logger %{buildroot}/bin +ln -s %{_bindir}/dmesg %{buildroot}/bin +ln -s %{_bindir}/more %{buildroot}/bin +ln -s %{_bindir}/mount %{buildroot}/bin +ln -s %{_bindir}/umount %{buildroot}/bin +ln -s %{_bindir}/findmnt %{buildroot}/bin +ln -s %{_bindir}/lsblk %{buildroot}/bin +ln -s %{_sbindir}/adjtimex %{buildroot}/sbin +ln -s %{_sbindir}/agetty %{buildroot}/sbin +ln -s %{_sbindir}/blockdev %{buildroot}/sbin +ln -s %{_sbindir}/cfdisk %{buildroot}/sbin +ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin +ln -s %{_sbindir}/fdisk %{buildroot}/sbin +ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin +ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin +ln -s %{_sbindir}/hwclock %{buildroot}/sbin +ln -s %{_sbindir}/losetup %{buildroot}/sbin +ln -s %{_sbindir}/mkfs %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin +ln -s %{_sbindir}/mkswap %{buildroot}/sbin +ln -s %{_sbindir}/pivot_root %{buildroot}/sbin +ln -s %{_sbindir}/raw %{buildroot}/sbin +ln -s %{_sbindir}/sfdisk %{buildroot}/sbin +ln -s %{_sbindir}/swapoff %{buildroot}/sbin +ln -s %{_sbindir}/swapon %{buildroot}/sbin +ln -s %{_sbindir}/blkid %{buildroot}/sbin +ln -s %{_sbindir}/findfs %{buildroot}/sbin +ln -s %{_sbindir}/fsck %{buildroot}/sbin +ln -s %{_sbindir}/switch_root %{buildroot}/sbin +ln -s %{_sbindir}/wipefs %{buildroot}/sbin +ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin +ln -s %{_sbindir}/swaplabel %{buildroot}/sbin +ln -s %{_sbindir}/fstrim %{buildroot}/sbin +ln -s %{_sbindir}/chcpu %{buildroot}/sbin +#EndUsrMerge install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems -install -m 755 nologin %{buildroot}/sbin +install -m 755 nologin %{buildroot}/%{_sbindir} +#UsrMerge +ln -s %{_sbindir}/nologin %{buildroot}/sbin +#EndUsrMerge rm -f %{buildroot}/%{_libdir}/libblkid.la rm -f %{buildroot}/%{_libdir}/libuuid.la rm -f %{buildroot}/%{_libdir}/libmount.la %ifnarch ppc ppc64 -install -m 755 mkzimage_cmdline %{buildroot}%{_prefix}/bin +install -m 755 mkzimage_cmdline %{buildroot}/%{_bindir} install -m 644 %{S:28} %{buildroot}%{_mandir}/man8 -install -m 755 chrp-addnote %{buildroot}%{_prefix}/bin +install -m 755 chrp-addnote %{buildroot}/%{_bindir} %endif install -m 644 nologin.8 %{buildroot}%{_mandir}/man8 # setctsid install -install -m 755 setctsid %{buildroot}%{_prefix}/sbin +install -m 755 setctsid %{buildroot}/%{_sbindir} install -m 444 setctsid.8 %{buildroot}%{_mandir}/man8/ echo -e "#! /bin/bash\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb chmod 755 %{buildroot}%{_sbindir}/flushb @@ -326,12 +379,22 @@ # Do not package these files to get rid of the perl dependency rm -f %{buildroot}%{_bindir}/chkdupexe rm -f %{buildroot}%{_mandir}/man1/chkdupexe.1 +# we use this tools from pwdutils +rm -f %{buildroot}/%{_bindir}/{chfn,chsh,newgrp} +rm -f %{buildroot}/%{_sbindir}/{vigr,vipw} +rm -f %{buildroot}/%{_mandir}/man1/{chfn.1*,chsh.1*,newgrp.1*} +rm -f %{buildroot}/%{_mandir}/man8/{vigr.8*,vipw.8*} +# login is always and only in /bin +mv %{buildroot}/%{_bindir}/login %{buildroot}/bin/ # arch dependent %ifarch s390 s390x rm -f %{buildroot}%{_sysconfdir}/fdprm rm -f %{buildroot}%{_bindir}/cytune rm -f %{buildroot}%{_sbindir}/fdformat +rm -f %{buildroot}%{_sbindir}/hwclock +#UsrMerge rm -f %{buildroot}/sbin/hwclock +#EndUsrMerge rm -f %{buildroot}%{_sbindir}/klogconsole rm -f %{buildroot}%{_bindir}/setterm rm -f %{buildroot}%{_sbindir}/tunelp @@ -344,11 +407,20 @@ %ifarch ia64 %sparc rm -f %{buildroot}/%{_mandir}/man8/cfdisk.8* rm -f %{buildroot}/%{_mandir}/man8/sfdisk.8* +rm -f %{buildroot}%{_sbindir}/cfdisk +#UsrMerge rm -f %{buildroot}/sbin/cfdisk +#EndUsrMerge +rm -f %{buildroot}%{_sbindir}/sfdisk +#UsrMerge rm -f %{buildroot}/sbin/sfdisk +#EndUsrMerge %endif %ifarch ia64 +rm -f %{buildroot}%{_sbindir}/fdisk +#UsrMerge rm -f %{buildroot}/sbin/fdisk +#EndUsrMerge rm -f %{buildroot}%{_mandir}/man8/fdisk.8* %endif %find_lang %{name} %{name}.lang @@ -373,7 +445,7 @@ %if 0%{?suse_version} <= 1130 %run_permissions %else -%set_permissions /usr/bin/wall /usr/bin/write /bin/mount /bin/umount +%set_permissions /usr/bin/wall /usr/bin/write /usr/bin/mount /usr/bin/umount %endif # mount option 'code=' is now called 'codepage=' so change fstab @@ -388,7 +460,7 @@ %{insserv_cleanup} %verifyscript -%verify_permissions -e /usr/bin/wall -e /usr/bin/write -e /bin/mount -e /bin/umount +%verify_permissions -e /usr/bin/wall -e /usr/bin/write -e /usr/bin/mount -e /usr/bin/umount %post -n libblkid1 -p /sbin/ldconfig @@ -449,11 +521,16 @@ %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf +%config(noreplace) /etc/pam.d/login +%config(noreplace) /etc/pam.d/remote +#UsrMerge /bin/dmesg /bin/more /bin/mount /bin/umount /bin/findmnt +/bin/logger +/bin/login /bin/lsblk /sbin/adjtimex /sbin/agetty @@ -481,8 +558,7 @@ /sbin/swaplabel /sbin/fstrim /sbin/chcpu -%{_bindir}/ipcmk -/bin/logger +#EndUsrMerge %{_bindir}/cal %{_bindir}/chrt %{_bindir}/col @@ -490,46 +566,80 @@ %{_bindir}/colrm %{_bindir}/column %{_bindir}/ddate +%{_bindir}/dmesg %{_bindir}/fallocate +%{_bindir}/findmnt %{_bindir}/flock %{_bindir}/getopt %{_bindir}/hexdump %{_bindir}/ionice +%{_bindir}/ipcmk %{_bindir}/ipcrm %{_bindir}/ipcs %{_bindir}/isosize %{_bindir}/line +%{_bindir}/logger %{_bindir}/look +%{_bindir}/lsblk %{_bindir}/lscpu %{_bindir}/mcookie %{_bindir}/mesg -%{_bindir}/uuidgen -%ifnarch ppc ppc64 -%{_bindir}/chrp-addnote -%{_bindir}/mkzimage_cmdline -%endif +%{_bindir}/more +%{_bindir}/mount %{_bindir}/namei %{_bindir}/prlimit %{_bindir}/rename %{_bindir}/renice %{_bindir}/rev %{_bindir}/script -%{_bindir}/setarch %{_bindir}/scriptreplay +%{_bindir}/setarch %{_bindir}/setsid -%{_bindir}/ul %{_bindir}/tailf %{_bindir}/taskset %{_bindir}/time +%{_bindir}/ul +%{_bindir}/umount %{_bindir}/unshare +%{_bindir}/uuidgen %{_bindir}/which +%ifnarch ppc ppc64 +%{_bindir}/chrp-addnote +%{_bindir}/mkzimage_cmdline +%endif %{_sbindir}/addpart +%{_sbindir}/adjtimex +%{_sbindir}/agetty +%{_sbindir}/blkid +%{_sbindir}/blockdev +%{_sbindir}/chcpu +%{_sbindir}/ctrlaltdel %{_sbindir}/delpart +%{_sbindir}/findfs +%{_sbindir}/fsck +%{_sbindir}/fsck.minix +%{_sbindir}/fsck.cramfs +%{_sbindir}/fsfreeze +%{_sbindir}/fstrim %{_sbindir}/ldattach +%{_sbindir}/losetup +%{_sbindir}/mkfs +%{_sbindir}/mkfs.bfs +%{_sbindir}/mkfs.minix +%{_sbindir}/mkfs.cramfs +%{_sbindir}/mkswap +%{_sbindir}/nologin %{_sbindir}/partx +%{_sbindir}/pivot_root +%{_sbindir}/raw %{_sbindir}/rcraw %{_sbindir}/rtcwake %{_sbindir}/setctsid +%{_sbindir}/swaplabel +%{_sbindir}/swapoff +%{_sbindir}/swapon +%{_sbindir}/switch_root +%{_sbindir}/wipefs %verify(not mode) %attr(0755,root,tty) %{_bindir}/wall %{_bindir}/whereis %verify(not mode) %attr(0755,root,tty) %{_bindir}/write @@ -555,6 +665,7 @@ %{_mandir}/man1/ipcs.1.gz %{_mandir}/man1/line.1.gz %{_mandir}/man1/logger.1.gz +%{_mandir}/man1/login.1.gz %{_mandir}/man1/look.1.gz %{_mandir}/man1/lscpu.1.gz %{_mandir}/man1/mcookie.1.gz @@ -630,19 +741,29 @@ %ifnarch ia64 #XXX: post our patches upstream #XXX: call fdupes on /usr/share/man +#UsrMerge /sbin/fdisk +#EndUsrMerge +%{_sbindir}/fdisk %{_mandir}/man8/fdisk.8.gz %endif %ifnarch %sparc ia64 %{_mandir}/man8/cfdisk.8.gz %{_mandir}/man8/sfdisk.8.gz +#UsrMerge /sbin/cfdisk /sbin/sfdisk +#EndUsrMerge +%{_sbindir}/cfdisk +%{_sbindir}/sfdisk %endif %ifnarch s390 s390x %{_bindir}/cytune %{_sbindir}/fdformat +#UsrMerge /sbin/hwclock +#EndUsrMerge +%{_sbindir}/hwclock %{_sbindir}/klogconsole %{_bindir}/setterm %{_sbindir}/tunelp ++++++ login.pamd ++++++ #%PAM-1.0 auth requisite pam_nologin.so auth [user_unknown=ignore success=ok ignore=ignore auth_err=die default=bad] pam_securetty.so auth include common-auth account include common-account password include common-password session required pam_loginuid.so session include common-session session optional pam_lastlog.so nowtmp showfailed session optional pam_mail.so standard ++++++ remote.pamd ++++++ #%PAM-1.0 # This file is used by /bin/login in case of remote logins (means where # the -h option is used auth requisite pam_nologin.so auth [user_unknown=ignore success=ok ignore=ignore auth_err=die default=bad] pam_securetty.so auth include common-auth account include common-account password include common-password session required pam_loginuid.so session include common-session session optional pam_lastlog.so nowtmp showfailed session optional pam_mail.so standard -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop KhmerOS-fonts from openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, FYI: Package KhmerOS-fonts was dropped from openSUSE:Factory at Tue Mar 20 02:15:31 CET 2012. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=Kh… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop culmus from openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, FYI: Package culmus was dropped from openSUSE:Factory at Tue Mar 20 02:14:50 CET 2012. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=cu… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sunpinyin for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package sunpinyin for openSUSE:Factory checked in at 2012-03-20 02:05:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sunpinyin (Old) and /work/SRC/openSUSE:Factory/.sunpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sunpinyin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/sunpinyin/sunpinyin.changes 2012-02-21 07:32:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sunpinyin.new/sunpinyin.changes 2012-03-20 02:05:28.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 23:29:50 UTC 2012 - zaitor(a)opensuse.org + +- Add sunpinyin-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- sunpinyin-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sunpinyin.spec ++++++ --- /var/tmp/diff_new_pack.eu5d2V/_old 2012-03-20 02:05:33.000000000 +0100 +++ /var/tmp/diff_new_pack.eu5d2V/_new 2012-03-20 02:05:33.000000000 +0100 @@ -27,6 +27,8 @@ Source: %{name}-%{version}.tar.bz2 Source1: lm_sc.t3g.arpa.tar.bz2 Source2: dict.utf8.tar.bz2 +# PATCH-FIX-UPSTREAM sunpinyin-gcc47.patch zaitor(a)opensuse.org -- Fix build with gcc 4.7 +Patch0: sunpinyin-gcc47.patch BuildRequires: fdupes BuildRequires: update-desktop-files BuildRequires: scons @@ -60,6 +62,7 @@ %prep %setup -q +%patch0 %build %{__cp} -r %{S:1} ./raw/ ++++++ sunpinyin-gcc47.patch ++++++ --- src/lexicon/genPYT.cpp 2012-02-05 17:28:01.000000000 +0100 +++ src/lexicon/genPYT.cpp 2012-03-17 23:59:12.116605521 +0100 @@ -37,7 +37,7 @@ #include <locale.h> #include <stdlib.h> - +#include <unistd.h> #include "pytrie.h" #include "pytrie_gen.h" #include "../slm/slm.h" --- src/ime-core/ic_history.cpp 2012-02-05 17:28:01.000000000 +0100 +++ src/ime-core/ic_history.cpp 2012-03-18 00:10:24.387297778 +0100 @@ -42,6 +42,7 @@ #include <fcntl.h> #include <stdio.h> #include <stdint.h> +#include <unistd.h> #include <cassert> #include <arpa/inet.h> #include <sys/stat.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fiwalk for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package fiwalk for openSUSE:Factory checked in at 2012-03-20 02:05:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fiwalk (Old) and /work/SRC/openSUSE:Factory/.fiwalk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fiwalk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fiwalk/fiwalk.changes 2012-02-14 19:00:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fiwalk.new/fiwalk.changes 2012-03-20 02:05:16.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 22:37:44 UTC 2012 - dimstar(a)opensuse.org + +- Add fiwalk-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- fiwalk-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fiwalk.spec ++++++ --- /var/tmp/diff_new_pack.srKSMT/_old 2012-03-20 02:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.srKSMT/_new 2012-03-20 02:05:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fiwalk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: fiwalk Version: 0.6.15 Release: 0 -License: SUSE-Public-Domain Summary: A computer forensic application for walking forensic images -Url: http://afflib.org/downloads/%name.tar.gz +License: SUSE-Public-Domain Group: Productivity/File utilities +Url: http://afflib.org/downloads/%name.tar.gz Source: %name.tar.gz +Patch0: fiwalk-gcc47.patch +BuildRequires: afflib-devel BuildRequires: gcc-c++ -BuildRequires: zlib-devel openssl-devel -BuildRequires: libtsk3-3 sleuthkit-devel libewf-devel afflib-devel +BuildRequires: libewf-devel +BuildRequires: libtsk3-3 +BuildRequires: openssl-devel +BuildRequires: sleuthkit-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -36,6 +42,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -50,4 +57,5 @@ %_bindir/fiwalk %_bindir/jpeg_extract %_bindir/test_arff + %changelog ++++++ fiwalk-gcc47.patch ++++++ Only in fiwalk-0.6.15/plugins: jpeg_extract Only in fiwalk-0.6.15/plugins: jpeg_extract.o Only in fiwalk-0.6.15/src: fiwalk Only in fiwalk-0.6.15/src: test_arff Only in fiwalk-0.6.15/src: test_arff.o diff -upr fiwalk-0.6.15.orig/src/xml.cpp fiwalk-0.6.15/src/xml.cpp --- fiwalk-0.6.15.orig/src/xml.cpp 2011-05-13 15:51:12.000000000 +0000 +++ fiwalk-0.6.15/src/xml.cpp 2012-03-17 22:36:34.472147899 +0000 @@ -29,6 +29,7 @@ using namespace std; #include <sys/param.h> #include <assert.h> #include <fcntl.h> +#include <unistd.h> // Implementation of mkstemp for windows found on pan-devel mailing Only in fiwalk-0.6.15/src: xml.o -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clamav for openSUSE:Factory
by root＠hilbert.suse.de 20 Mar '12

20 Mar '12

Hello community, here is the log from the commit of package clamav for openSUSE:Factory checked in at 2012-03-20 01:58:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clamav (Old) and /work/SRC/openSUSE:Factory/.clamav.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clamav", Maintainer is "max(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/clamav/clamav.changes 2011-10-21 16:27:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.clamav.new/clamav.changes 2012-03-20 01:58:54.000000000 +0100 @@ -1,0 +2,22 @@ +Sat Mar 17 14:18:48 UTC 2012 - toganm(a)opensuse.org + +- New version 0.97.4 + * libclamav/bytecode.c: reset to BYTECODE_AUTO mode at db reload + so that we don't fail to re-enable or re-disable it again + (bb#3789) + * misc: performance improvement for HP-UX PA-RISC - patch from + Michael Pelletier <michael.v.pelletier*raytheon.com> + (bb#3926) + * libclamav/pe.c: parse vinfo where varfileinfo occours before + stringfileinfo (bb#3062) + * clamd: add support for on-access scanning on OS X with ClamAuth + (beta) + * libclamav/bytecode_api*: Fix Sparc crash (bb #4324) + * libclamav: fix bytecode whitelisting + * libclamav: fix macro detection in OLE2BlockMacros (bb#4269) + * libclamav/readdb.c: allow comments in all db files (bb#3930) + * libclamav/scanners.c: use lsigs when scanning vba data (bb#3922) + * libclamav/matcher-hash.c: Fix SIGBUS on PA-RISC (big-endian) + architectures (bb #3894). + +------------------------------------------------------------------- Old: ---- clamav-0.97.3.tar.gz New: ---- clamav-0.97.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.UNYmL6/_old 2012-03-20 01:58:59.000000000 +0100 +++ /var/tmp/diff_new_pack.UNYmL6/_new 2012-03-20 01:58:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package clamav # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +16,16 @@ # - Name: clamav -BuildRequires: ncurses-devel sed sendmail sendmail-devel +BuildRequires: ncurses-devel +BuildRequires: sed +BuildRequires: sendmail +BuildRequires: sendmail-devel %define llvm --disable-llvm %if 0%{?suse_version} >= 1010 -BuildRequires: bc pkgconfig zlib-devel +BuildRequires: bc +BuildRequires: pkgconfig +BuildRequires: zlib-devel %ifarch %ix86 x86_64 %define llvm --enable-llvm # Needed for compiling LLVM. @@ -29,17 +33,20 @@ %endif %endif %if 0%{?suse_version} >= 1030 -BuildRequires: check-devel libbz2-devel pwdutils python-devel +BuildRequires: check-devel +BuildRequires: libbz2-devel +BuildRequires: pwdutils +BuildRequires: python-devel %define clamav_check --enable-check %else BuildRequires: bzip2 %define clamav_check --disable-check %endif Summary: Antivirus Toolkit -Version: 0.97.3 -Release: 1 License: GPL-2.0 Group: Productivity/Security +Version: 0.97.4 +Release: 0 Url: http://www.clamav.net Requires: latex2html-pngicons Obsoletes: clamav-db < 0.88.3 @@ -95,9 +102,9 @@ MacOffice files, HTML, RTF and PDF %package db +Summary: Virus Database for ClamAV License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain ; MIT Group: Productivity/Security -Summary: Virus Database for ClamAV PreReq: clamav sed /bin/cp /usr/bin/awk /bin/rm %if 0%{?suse_version} > 1120 BuildArch: noarch ++++++ clamav-0.97.3.tar.gz -> clamav-0.97.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/clamav/clamav-0.97.3.tar.gz /work/SRC/openSUSE:Factory/.clamav.new/clamav-0.97.4.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pwdutils for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package pwdutils for openSUSE:Factory checked in at 2012-03-19 10:12:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pwdutils (Old) and /work/SRC/openSUSE:Factory/.pwdutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pwdutils", Maintainer is "kukuk(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pwdutils/pwdutils.changes 2011-11-24 11:36:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pwdutils.new/pwdutils.changes 2012-03-19 10:12:28.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 15:56:01 CET 2012 - kukuk(a)suse.de + +- Update to version 3.2.18 (fixes [bnc#738114]) + +------------------------------------------------------------------- Old: ---- pwdutils-3.2.17.tar.bz2 New: ---- pwdutils-3.2.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pwdutils.spec ++++++ --- /var/tmp/diff_new_pack.fd4LA6/_old 2012-03-19 10:12:30.000000000 +0100 +++ /var/tmp/diff_new_pack.fd4LA6/_new 2012-03-19 10:12:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pwdutils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define enable_selinux 1 Name: pwdutils -BuildRequires: audit-devel libnscd-devel libtool openldap2-devel openslp-devel openssl-devel pam-devel +BuildRequires: audit-devel +BuildRequires: libnscd-devel +BuildRequires: libtool +BuildRequires: openldap2-devel +BuildRequires: openslp-devel +BuildRequires: openssl-devel +BuildRequires: pam-devel %if %{enable_selinux} BuildRequires: libselinux-devel %endif Url: http://www.thkukuk.de/pam/pwdutils/ +Version: 3.2.18 +Release: 0 +Summary: Utilities to Manage User and Group Accounts License: GPL-2.0 Group: System/Base -Version: 3.2.17 -Release: 4 -Summary: Utilities to Manage User and Group Accounts Requires: pam-modules Source: pwdutils-%{version}.tar.bz2 Source2: ldap.conf @@ -47,11 +52,9 @@ %package plugin-audit -License: GPL-2.0 Summary: Plugin for the Linux Audit-Subsystem Group: System/Base Requires: pwdutils = %{version} -AutoReqProv: on %description plugin-audit This package includes the plugin for the password/account management @@ -62,11 +65,9 @@ %package rpasswd -License: GPL-2.0 Summary: Server/Client for secure remote password changing Group: System/Base Requires: pwdutils = %{version} -AutoReqProv: on %description rpasswd This package includes the server, client and a PAM module to change the ++++++ pwdutils-3.2.17.tar.bz2 -> pwdutils-3.2.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pwdutils-3.2.17/ChangeLog new/pwdutils-3.2.18/ChangeLog --- old/pwdutils-3.2.17/ChangeLog 2011-05-16 11:25:30.000000000 +0200 +++ new/pwdutils-3.2.18/ChangeLog 2012-03-13 14:15:33.000000000 +0100 @@ -1,3 +1,20 @@ +2012-03-13 Thorsten Kukuk <kukuk(a)suse.de> + + * release version 3.2.18 + +2012-01-31 Thorsten Kukuk <kukuk(a)suse.de> + + * lib/chown_dir_rec.c (chown_entry): Check against correct + old values [bnc#738114]. + +2011-08-05 Thorsten Kukuk <kukuk(a)suse.de> + + * src/gpasswd.c (main): Remove dead code. + +2011-05-23 Thorsten Kukuk <kukuk(a)suse.de> + + * lib/user.c (write_user_data): jump to correct label. + 2011-05=16 Thorsten Kukuk <kukuk(a)suse.de> * release 3.2.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pwdutils-3.2.17/NEWS new/pwdutils-3.2.18/NEWS --- old/pwdutils-3.2.17/NEWS 2011-05-16 11:25:51.000000000 +0200 +++ new/pwdutils-3.2.18/NEWS 2012-03-13 14:15:03.000000000 +0100 @@ -1,9 +1,12 @@ pwdutils NEWS -- history of user-visible changes. -Copyright (C) 2002-2011 Thorsten Kukuk +Copyright (C) 2002-2012 Thorsten Kukuk Please send bug reports, questions and suggestions to <kukuk(a)thkukuk.de>. +Version 3.2.18 +* Fix changing of permissions if uid/gid of user will be modified + Version 3.2.17 * Fix useradd.local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pwdutils-3.2.17/configure new/pwdutils-3.2.18/configure --- old/pwdutils-3.2.17/configure 2011-05-16 11:26:05.000000000 +0200 +++ new/pwdutils-3.2.18/configure 2012-03-13 14:15:42.000000000 +0100 @@ -2431,7 +2431,7 @@ # Define the identity of the package. PACKAGE="pwdutils" - VERSION=3.2.17 + VERSION=3.2.18 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pwdutils-3.2.17/configure.in new/pwdutils-3.2.18/configure.in --- old/pwdutils-3.2.17/configure.in 2011-05-16 11:25:40.000000000 +0200 +++ new/pwdutils-3.2.18/configure.in 2012-03-13 14:14:09.000000000 +0100 @@ -1,10 +1,10 @@ dnl -dnl Copyright (c) 2001-2010 Thorsten Kukuk, Germany +dnl Copyright (c) 2001-2012 Thorsten Kukuk, Germany dnl dnl Author: Thorsten Kukuk <kukuk(a)thkukuk.de> dnl AC_INIT(src/passwd.c) -AM_INIT_AUTOMAKE("pwdutils", 3.2.17) +AM_INIT_AUTOMAKE("pwdutils", 3.2.18) AM_CONFIG_HEADER(config.h) AC_PREFIX_DEFAULT(/usr) AC_CANONICAL_HOST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pwdutils-3.2.17/etc/useradd.local new/pwdutils-3.2.18/etc/useradd.local --- old/pwdutils-3.2.17/etc/useradd.local 2011-05-16 13:20:20.000000000 +0200 +++ new/pwdutils-3.2.18/etc/useradd.local 2011-05-20 10:28:19.000000000 +0200 @@ -26,7 +26,7 @@ # If SELinux is enabled, we have to run restorecon to assign # appropriate fcontexts to the respective $HOME and files under it -if [ -x /usr/sbin/selinuxenabled -a ! /usr/sbin/selinuxenabled ] ; then +if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled ; then test -x /sbin/restorecon || exit 2 if [ $# -lt 4 ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pwdutils-3.2.17/lib/chown_dir_rec.c new/pwdutils-3.2.18/lib/chown_dir_rec.c --- old/pwdutils-3.2.17/lib/chown_dir_rec.c 2006-11-29 14:17:16.000000000 +0100 +++ new/pwdutils-3.2.18/lib/chown_dir_rec.c 2012-01-31 17:11:45.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2005 Thorsten Kukuk +/* Copyright (C) 2003, 2005, 2012 Thorsten Kukuk Author: Thorsten Kukuk <kukuk(a)suse.de> This program is free software; you can redistribute it and/or modify @@ -39,14 +39,14 @@ if (st->st_uid == old_uid) use_uid = new_uid; else - use_uid = old_uid; + use_uid = st->st_uid; if (st->st_gid == old_gid) use_gid = new_gid; else - use_gid = old_gid; + use_gid = st->st_gid; - if (use_uid != old_uid || use_gid != old_gid) + if (use_uid != st->st_uid || use_gid != st->st_gid) { if (lchown (entry, use_uid, use_gid) < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pwdutils-3.2.17/lib/user.c new/pwdutils-3.2.18/lib/user.c --- old/pwdutils-3.2.17/lib/user.c 2010-09-17 11:22:46.000000000 +0200 +++ new/pwdutils-3.2.18/lib/user.c 2011-05-23 10:13:39.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005, 2009, 2010 Thorsten Kukuk +/* Copyright (C) 2002, 2003, 2004, 2005, 2009, 2010, 2011 Thorsten Kukuk Author: Thorsten Kukuk <kukuk(a)thkukuk.de> This program is free software; you can redistribute it and/or modify @@ -894,7 +894,7 @@ shadow_tmp); fclose (newpf); retval = -1; - goto error_passwd; + goto error_shadow; } if (fsync (fileno(newpf)) != 0) @@ -904,7 +904,7 @@ shadow_tmp); fclose (newpf); retval = -1; - goto error_passwd; + goto error_shadow; } if (fclose (newpf) != 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pwdutils-3.2.17/src/gpasswd.c new/pwdutils-3.2.18/src/gpasswd.c --- old/pwdutils-3.2.17/src/gpasswd.c 2008-04-11 12:37:09.000000000 +0200 +++ new/pwdutils-3.2.18/src/gpasswd.c 2011-08-05 13:19:13.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Thorsten Kukuk +/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2011 Thorsten Kukuk Author: Thorsten Kukuk <kukuk(a)suse.de> This program is free software; you can redistribute it and/or modify @@ -115,7 +115,6 @@ char *binddn = NULL; int P_flag = 0; group_t *gr_data; - char *caller_name; char *use_service = NULL; int stdin_flag = 0; @@ -246,28 +245,6 @@ } else { - int buflen = 256; - char *buffer = alloca (buflen); - struct passwd resultbuf; - struct passwd *pw; - - /* Determine our own user name for authentication. */ - while (getpwuid_r (getuid (), &resultbuf, buffer, buflen, &pw) != 0 - && errno == ERANGE) - { - errno = 0; - buflen += 256; - buffer = alloca (buflen); - } - if (!pw) - { - sec_log (program, MSG_NO_ACCOUNT_FOUND, getuid ()); - fprintf (stderr, _("%s: Cannot determine your user name.\n"), - program); - return E_NOPERM; - } - caller_name = strdupa (pw->pw_name); - group = argv[0]; gr_data = find_group_data (group, 0, use_service); if (gr_data == NULL || gr_data->service == S_NONE) ++++++ pwdutils-no-add-needed.patch ++++++ --- /var/tmp/diff_new_pack.fd4LA6/_old 2012-03-19 10:12:30.000000000 +0100 +++ /var/tmp/diff_new_pack.fd4LA6/_new 2012-03-19 10:12:30.000000000 +0100 @@ -7,7 +7,7 @@ -AC_INIT(src/passwd.c) +AC_INIT +AC_CONFIG_SRCDIR([src/passwd.c]) - AM_INIT_AUTOMAKE("pwdutils", 3.2.17) + AM_INIT_AUTOMAKE("pwdutils", 3.2.18) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADERS([config.h]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit psmisc for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package psmisc for openSUSE:Factory checked in at 2012-03-19 10:12:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psmisc (Old) and /work/SRC/openSUSE:Factory/.psmisc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "psmisc", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/psmisc/psmisc.changes 2012-02-28 14:15:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc.changes 2012-03-19 10:12:19.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 13 15:26:37 UTC 2012 - werner(a)suse.de + +- Submit ASCII null fix in pstree upsrtream +- Submit support for static background process for stat system call + upstream +- Rebuild package with upstream patches + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psmisc.spec ++++++ --- /var/tmp/diff_new_pack.h15qRN/_old 2012-03-19 10:12:23.000000000 +0100 +++ /var/tmp/diff_new_pack.h15qRN/_new 2012-03-19 10:12:23.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: psmisc BuildRequires: automake BuildRequires: gcc-c++ @@ -24,19 +23,19 @@ BuildRequires: libselinux-devel BuildRequires: ncurses-devel Url: http://sourceforge.net/projects/psmisc/ -License: GPL-2.0+ -Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq Version: 22.16 -Release: 1 +Release: 0 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system +License: GPL-2.0+ +Group: System/Monitoring Source: http://sourceforge.net/projects/psmisc/files/psmisc/%{name}-%{version}.tar.… Patch0: %name-22.16.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.12-pstree.patch -Patch3: pstree-segfault.patch -Patch42: %name-22.16-timeout.patch +Patch42: pstree-segfault.patch +Patch43: %name-22.16-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %sparc hppa @@ -51,10 +50,10 @@ %prep %setup -q -%patch42 -p0 -b .to +%patch42 -p1 -b .to +%patch43 -p1 -b .comm %patch1 -p0 -b .tigetstr %patch2 -p0 -b .pstree -%patch3 -p0 -b .comm %patch0 -p0 -b .0 %build ++++++ psmisc-22.16-timeout.patch ++++++ --- /var/tmp/diff_new_pack.h15qRN/_old 2012-03-19 10:12:24.000000000 +0100 +++ /var/tmp/diff_new_pack.h15qRN/_new 2012-03-19 10:12:24.000000000 +0100 @@ -1,113 +1,87 @@ ---- src/Makefile.am -+++ src/Makefile.am 2012-02-27 00:00:00.000000000 +0000 -@@ -23,7 +23,7 @@ if WANT_PEEKFD_MIPS - AM_CFLAGS += -DMIPS +diff --git a/ChangeLog b/ChangeLog +index b42a4d7..baba19e 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,10 @@ ++ * Make it possible to use --enable-timeout-stat as well as ++ --enable-timeout-stat=static for a static background process which ++ does the final stat system calls ++ * Do not mix HAVE_TIMEOUT_STAT with WITH_TIMEOUT_STAT ++ * Add timeout.c/timeout.h for static background process which is able ++ to read the file name from pipe, does the stat(2) system call, and ++ writes the result back to a pipe. + * Really add ASCII null at command string in add_proc() of pstree.c + + Changes in 22.16 +diff --git a/configure.ac b/configure.ac +index 0615f5f..9265d82 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,12 +30,16 @@ AC_SUBST([SELINUX_LIB]) + # Call fork before all stat calls to stop hanging on NFS mounts + AC_SUBST([WITH_TIMEOUT_STAT]) + AC_ARG_ENABLE([timeout_stat], +- [AS_HELP_STRING([--enable-timeout-stat], [Use a timeout on stat calls])], ++ [AS_HELP_STRING([--enable-timeout-stat], [Use a timeout on stat calls (optional with argument "static" for a static background process)])], + [enable_timeout_stat=$enableval], + [enable_timeout_stat="no"]) + if test "$enable_timeout_stat" = "yes"; then + AC_DEFINE([WITH_TIMEOUT_STAT], [1], [Use timeout on stat calls]) + fi ++if test "$enable_timeout_stat" = "static"; then ++ AC_DEFINE([WITH_TIMEOUT_STAT], [2], [Use timeout on stat calls]) ++fi ++AM_CONDITIONAL([WANT_TIMEOUT_STAT], [test "$enable_timeout_stat" = "static"]) + + # Enable hardened compile and link flags + AC_ARG_ENABLE([harden_flags], +diff --git a/src/Makefile.am b/src/Makefile.am +index d511f24..a28af7d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -24,6 +24,9 @@ if WANT_PEEKFD_MIPS endif --fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h -+fuser_SOURCES = fuser.c comm.h signals.c signals.h timeout.c i18n.h fuser.h lists.h timeout.h + fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h ++if WANT_TIMEOUT_STAT ++ fuser_SOURCES += timeout.c timeout.h ++endif fuser_LDADD = @LIBINTL@ ---- src/Makefile.in -+++ src/Makefile.in 2012-02-27 17:19:33.626434528 +0000 -@@ -68,7 +68,7 @@ CONFIG_CLEAN_VPATH_FILES = - @WANT_PEEKFD_MIPS_TRUE@am__EXEEXT_5 = peekfd$(EXEEXT) - am__installdirs = "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) --am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT) -+am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT) timeout.$(OBJEXT) - fuser_OBJECTS = $(am_fuser_OBJECTS) - fuser_DEPENDENCIES = - am_killall_OBJECTS = killall.$(OBJEXT) signals.$(OBJEXT) ---- src/fuser.c -+++ src/fuser.c 2012-02-27 17:09:23.901933700 +0000 -@@ -111,9 +111,8 @@ static dev_t device(const char *path); +diff --git a/src/fuser.c b/src/fuser.c +index e4081eb..09548ff 100644 +--- a/src/fuser.c ++++ b/src/fuser.c +@@ -111,9 +111,13 @@ static dev_t device(const char *path); #endif static char *expandpath(const char *path); -typedef int (*stat_t)(const char*, struct stat*); #ifdef WITH_TIMEOUT_STAT --static int timeout(stat_t func, const char *path, struct stat *buf, unsigned int seconds); -+#include "timeout.h" ++# if (WITH_TIMEOUT_STAT == 2) ++# include "timeout.h" ++# else ++typedef int (*stat_t)(const char*, struct stat*); + static int timeout(stat_t func, const char *path, struct stat *buf, unsigned int seconds); ++# endif #else #define timeout(func,path,buf,dummy) (func)((path),(buf)) #endif /* WITH_TIMEOUT_STAT */ -@@ -1779,72 +1778,6 @@ scan_swaps(struct names *names_head, str - fclose(fp); - } - --/* -- * Execute stat(2) system call with timeout to avoid deadlock -- * on network based file systems. -- */ +@@ -1783,7 +1787,7 @@ scan_swaps(struct names *names_head, struct inode_list *ino_head, + * Execute stat(2) system call with timeout to avoid deadlock + * on network based file systems. + */ -#ifdef HAVE_TIMEOUT_STAT -- --static sigjmp_buf jenv; -- --static void --sigalarm(int sig) --{ -- if (sig == SIGALRM) -- siglongjmp(jenv, 1); --} -- --static int --timeout(stat_t func, const char *path, struct stat *buf, unsigned int seconds) --{ -- pid_t pid = 0; -- int ret = 0, pipes[4]; -- ssize_t len; -- -- if (pipe(&pipes[0]) < 0) -- goto err; -- switch ((pid = fork ())) { -- case -1: -- close(pipes[0]); -- close(pipes[1]); -- goto err; -- case 0: -- (void) signal(SIGALRM, SIG_DFL); -- close(pipes[0]); -- if ((ret = func(path, buf)) == 0) -- do len = write(pipes[1], buf, sizeof(struct stat)); -- while (len < 0 && errno == EINTR); -- close(pipes[1]); -- exit(ret); -- default: -- close(pipes[1]); -- if (sigsetjmp(jenv, 1)) { -- (void) alarm(0); -- (void) signal(SIGALRM, SIG_DFL); -- if (waitpid(0, (int*)0, WNOHANG) == 0) -- kill(pid, SIGKILL); -- errno = ETIMEDOUT; -- seconds = 1; -- goto err; -- } -- (void) signal(SIGALRM, sigalarm); -- (void) alarm(seconds); -- if (read(pipes[0], buf, sizeof(struct stat)) == 0) { -- errno = EFAULT; -- ret = -1; -- } -- (void) alarm(0); -- (void) signal(SIGALRM, SIG_DFL); -- close(pipes[0]); -- waitpid(pid, NULL, 0); -- break; -- } -- return ret; --err: -- return -1; --} --#endif /* HAVE_TIMEOUT_STAT */ -- - #ifdef _LISTS_H - /* - * Use /proc/self/mountinfo of modern linux system to determine ---- src/timeout.c -+++ src/timeout.c 2012-02-27 00:00:00.000000000 +0000 ++#if defined(WITH_TIMEOUT_STAT) && (WITH_TIMEOUT_STAT == 1) + + static sigjmp_buf jenv; + +diff --git a/src/timeout.c b/src/timeout.c +new file mode 100644 +index 0000000..1fe0354 +--- /dev/null ++++ b/src/timeout.c @@ -0,0 +1,267 @@ +/* + * timout.c Advanced timeout handling for file system calls @@ -376,8 +350,11 @@ +/* + * End of timeout.c + */ ---- src/timeout.h -+++ src/timeout.h 2012-02-27 00:00:00.000000000 +0000 +diff --git a/src/timeout.h b/src/timeout.h +new file mode 100644 +index 0000000..546c13b +--- /dev/null ++++ b/src/timeout.h @@ -0,0 +1,36 @@ +/* + * timout.h Advanced timeout handling for file system calls ++++++ pstree-segfault.patch ++++++ --- /var/tmp/diff_new_pack.h15qRN/_old 2012-03-19 10:12:24.000000000 +0100 +++ /var/tmp/diff_new_pack.h15qRN/_new 2012-03-19 10:12:24.000000000 +0100 @@ -1,11 +1,32 @@ ---- src/pstree.c -+++ src/pstree.c 2012-02-27 17:15:05.418433600 +0000 -@@ -376,7 +376,7 @@ add_proc(const char *comm, pid_t pid, pi +diff --git a/ChangeLog b/ChangeLog +index 45f6c04..b42a4d7 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,5 @@ ++ * Really add ASCII null at command string in add_proc() of pstree.c ++ + Changes in 22.16 + ================ + * Use strncpy for COMM_LEN and make it 18 characters to cover brackets +diff --git a/src/pstree.c b/src/pstree.c +index 80cfcec..a6c8f6e 100644 +--- a/src/pstree.c ++++ b/src/pstree.c +@@ -265,7 +265,7 @@ static PROC *new_proc(const char *comm, pid_t pid, uid_t uid) + exit(1); + } + strncpy(new->comm, comm, COMM_LEN+2); +- new->comm[COMM_LEN+1]='\0'; /* make sure nul terminated*/ ++ new->comm[COMM_LEN+1] = '\0'; /* make sure nul terminated*/ + new->pid = pid; + new->uid = uid; + new->flags = 0; +@@ -354,7 +354,7 @@ add_proc(const char *comm, pid_t pid, pid_t ppid, uid_t uid, #endif /*WITH_SELINUX */ else { strncpy(this->comm, comm, COMM_LEN+2); - this->comm[COMM_LEN+1]; -+ this->comm[COMM_LEN+1]='\0'; ++ this->comm[COMM_LEN+1] = '\0'; this->uid = uid; } if (args) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2012-03-19 10:11:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2012-03-13 11:24:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2012-03-19 10:12:02.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 14 09:47:52 UTC 2012 - kruber(a)zib.de + +- added fix for KMail2 crashes from + https://bugs.kde.org/show_bug.cgi?id=295474#c27 + +------------------------------------------------------------------- New: ---- kmail2-crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.Pm9sab/_old 2012-03-19 10:12:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Pm9sab/_new 2012-03-19 10:12:04.000000000 +0100 @@ -109,6 +109,8 @@ Patch18: plasma-libs.diff Patch20: ignore-inline-menu.diff Patch24: ksuseinstall.diff +# fix for KDE Bug 295474 from https://bugs.kde.org/show_bug.cgi?id=295474#c27 +Patch25: kmail2-crash.diff PreReq: permissions Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -173,6 +175,7 @@ %patch18 %patch20 %patch24 +%patch25 -p1 # # define KDE version exactly ++++++ kmail2-crash.diff ++++++ diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp index abe55ea..e65e66e 100644 --- a/nepomuk/core/resourcedata.cpp +++ b/nepomuk/core/resourcedata.cpp @@ -175,7 +175,7 @@ void Nepomuk::ResourceData::resetAll( bool isDelete ) if( !m_uri.isEmpty() ) { m_rm->m_initializedData.remove( m_uri ); if( m_rm->m_watcher && m_addedToWatcher ) { - m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri)); + QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri))); m_addedToWatcher = false; } } @@ -394,15 +394,16 @@ bool Nepomuk::ResourceData::load() if(!m_rm->m_watcher) { m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager); + m_rm->m_watcher->moveToThread(m_rm->m_manager->thread()); QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)), m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) ); QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)), m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) ); m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) ); - m_rm->m_watcher->start(); + QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection); } else { - m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) ); + QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) ); } m_addedToWatcher = true; diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h index 06b9622..92b12f5 100644 --- a/nepomuk/core/resourcewatcher.h +++ b/nepomuk/core/resourcewatcher.h @@ -93,6 +93,7 @@ namespace Nepomuk { */ virtual ~ResourceWatcher(); + public Q_SLOTS: /** * \brief Add a type to be watched. * @@ -204,7 +205,6 @@ namespace Nepomuk { */ QList<Types::Property> properties() const; - public Q_SLOTS: /** * \brief Start the signalling of changes. * -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libpng12 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libpng12 for openSUSE:Factory checked in at 2012-03-19 10:11:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpng12 (Old) and /work/SRC/openSUSE:Factory/.libpng12.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpng12", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libpng12/libpng12.changes 2012-02-20 16:14:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpng12.new/libpng12.changes 2012-03-19 10:11:48.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 14 11:22:02 UTC 2012 - pgajdos(a)suse.com + +- updated to 1.2.48: + * fixed CVE-2011-3045 [bnc#752008] + +------------------------------------------------------------------- Old: ---- libpng-1.2.47.tar.bz2 New: ---- libpng-1.2.48.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng12.spec ++++++ --- /var/tmp/diff_new_pack.l8Hdk4/_old 2012-03-19 10:11:50.000000000 +0100 +++ /var/tmp/diff_new_pack.l8Hdk4/_new 2012-03-19 10:11:50.000000000 +0100 @@ -19,7 +19,7 @@ # %define major 1 %define minor 2 -%define micro 47 +%define micro 48 %define branch %{major}%{minor} %define libname libpng%{branch}-0 ++++++ libpng-1.2.47.tar.bz2 -> libpng-1.2.48.tar.bz2 ++++++ ++++ 8430 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 libindi for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libindi for openSUSE:Factory checked in at 2012-03-19 10:07:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libindi (Old) and /work/SRC/openSUSE:Factory/.libindi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libindi", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libindi/libindi.changes 2012-01-20 22:07:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libindi.new/libindi.changes 2012-03-19 10:08:19.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 21:01:30 UTC 2012 - asterios.dramis(a)gmail.com + +- Added a patch (taken from Fedora) to fix compilation with gcc-4.7. + +------------------------------------------------------------------- New: ---- libindi-usleep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindi.spec ++++++ --- /var/tmp/diff_new_pack.Sei4X9/_old 2012-03-19 10:08:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Sei4X9/_new 2012-03-19 10:08:27.000000000 +0100 @@ -16,6 +16,8 @@ # +%define so_ver 0 + Name: libindi Version: 0.9 Release: 0 @@ -23,11 +25,13 @@ License: GPL-2.0+ ; LGPL-2.1+ Group: Productivity/Scientific/Astronomy Url: http://www.indilib.org/ -Source0: http://prdownloads.sourceforge.net/indi/%{name}_%{version}.tar.gz +Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz # PATCH-FIX-UPSTREAM no-return-in-nonvoid-function.patch asterios.dramis(a)gmail.com -- Fix "no-return-in-nonvoid-function" post-build check errors Patch0: no-return-in-nonvoid-function.patch # PATCH-FIX-UPSTREAM cfitsio_link_libs.patch asterios.dramis(a)gmail.com -- Add "pthread" in target_link_libraries where needed Patch1: cfitsio_link_libs.patch +# PATCH-FIX-UPSTREAM libindi-usleep.patch asterios.dramis(a)gmail.com -- Fix compilation with gcc-4.7 (taken from Fedora) +Patch2: libindi-usleep.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libcfitsio-devel @@ -35,7 +39,7 @@ BuildRequires: libnova-devel BuildRequires: libusb-devel BuildRequires: zlib-devel -Requires: libindi0 = %{version} +Requires: libindi%{so_ver} = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,16 +54,16 @@ Summary: Development files for libindi Group: Development/Libraries/C and C++ Requires: glibc-devel -Requires: libindi0 = %{version} +Requires: libindi%{so_ver} = %{version} %description devel This package contains development files for libindi. -%package -n libindi0 +%package -n libindi%{so_ver} Summary: Instrument Neutral Distributed Interface Group: System/Libraries -%description -n libindi0 +%description -n libindi%{so_ver} INDI is an Instrument Neutral Distributed Interface control protocol for astronomical devices, which provides a framework that decouples low level hardware drivers from high level front end clients. Clients that @@ -71,6 +75,7 @@ %setup -q %patch0 %patch1 +%patch2 -p1 %build mkdir build @@ -87,9 +92,9 @@ %make_install cd .. -%post -n libindi0 -p /sbin/ldconfig +%post -n libindi%{so_ver} -p /sbin/ldconfig -%postun -n libindi0 -p /sbin/ldconfig +%postun -n libindi%{so_ver} -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -105,8 +110,8 @@ %{_libdir}/libindi.so %{_libdir}/libindi*.a -%files -n libindi0 +%files -n libindi%{so_ver} %defattr(-,root,root,-) -%{_libdir}/libindi.so.0* +%{_libdir}/libindi.so.%{so_ver}* %changelog ++++++ libindi-usleep.patch ++++++ diff -ur libindi-0.9/drivers/focuser/robofocus.cpp libindi-0.9.new/drivers/focuser/robofocus.cpp --- libindi-0.9/drivers/focuser/robofocus.cpp 2012-01-13 19:40:06.000000000 +0100 +++ libindi-0.9.new/drivers/focuser/robofocus.cpp 2012-01-24 23:34:02.814667216 +0100 @@ -25,6 +25,7 @@ #include <termios.h> #include <string.h> #include <sys/time.h> +#include <unistd.h> #define RF_MAX_CMD 9 #define RF_TIMEOUT 15 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmodplug for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libmodplug for openSUSE:Factory checked in at 2012-03-19 10:07:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmodplug (Old) and /work/SRC/openSUSE:Factory/.libmodplug.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmodplug", Maintainer is "StShaw(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libmodplug/libmodplug.changes 2011-09-23 02:08:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmodplug.new/libmodplug.changes 2012-03-19 10:08:07.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 13:10:41 UTC 2012 - aj(a)suse.de + +- Fix buffer overflow. + +------------------------------------------------------------------- New: ---- libmodplug-overflow.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmodplug.spec ++++++ --- /var/tmp/diff_new_pack.bU18Uq/_old 2012-03-19 10:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.bU18Uq/_new 2012-03-19 10:08:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmodplug # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,8 @@ Source1: baselibs.conf # PATCH-FIX-OPENSUSE libmodplug-timidity.patch -- set paths to openSUSE timidity package Patch1: libmodplug-timidity.patch +# PATCH-FIX-OPENSUSE Fix buffer overflow +Patch2: libmodplug-overflow.patch BuildRequires: dos2unix gcc-c++ pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,7 +42,6 @@ %package -n libmodplug%{soname} - License: SUSE-Public-Domain Summary: Development files for libmodplug Group: Development/Libraries/C and C++ @@ -65,6 +66,7 @@ %prep %setup -q %patch1 +%patch2 -p1 # Fix eol encoding. dos2unix -o ChangeLog ++++++ libmodplug-overflow.patch ++++++ Index: libmodplug-0.8.8.4/src/load_amf.cpp =================================================================== --- libmodplug-0.8.8.4.orig/src/load_amf.cpp +++ libmodplug-0.8.8.4/src/load_amf.cpp @@ -371,7 +371,7 @@ BOOL CSoundFile::ReadAMF(LPCBYTE lpStrea } // Store tracks positions BYTE **pTrackData = new BYTE *[realtrackcnt]; - memset(pTrackData, 0, sizeof(pTrackData)); + memset(*pTrackData, 0, sizeof(pTrackData)); for (UINT iTrack=0; iTrack<realtrackcnt; iTrack++) if (dwMemPos <= dwMemLength - 3) { UINT nTrkSize = bswapLE16(*(USHORT *)(lpStream+dwMemPos)); ++++++ libmodplug-timidity.patch ++++++ --- /var/tmp/diff_new_pack.bU18Uq/_old 2012-03-19 10:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.bU18Uq/_new 2012-03-19 10:08:11.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/load_pat.cpp +Index: src/load_pat.cpp +=================================================================== +--- src/load_pat.cpp.orig +++ src/load_pat.cpp -@@ -53,8 +53,8 @@ +@@ -59,8 +59,8 @@ typedef UWORD WORD; #define PATHFORPAT "C:\\TIMIDITY\\INSTRUMENTS" #else #define DIRDELIM '/' -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit samba for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2012-03-19 10:07:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "samba", Maintainer is "samba-maintainers(a)SuSE.de" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba-doc.changes 2012-01-06 11:46:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new/samba-doc.changes 2012-03-19 10:07:54.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 17:39:53 UTC 2012 - lmuelle(a)suse.de + +- Add the ldapsmb sources as else patches against them have no chance to apply. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2012-03-09 21:27:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2012-03-19 10:07:55.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 20:00:25 UTC 2012 - lmuelle(a)suse.de + +- Remove obsoleted Authors lines from spec file for post-11.2 systems. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.A1cCF7/_old 2012-03-19 10:08:00.000000000 +0100 +++ /var/tmp/diff_new_pack.A1cCF7/_new 2012-03-19 10:08:00.000000000 +0100 @@ -106,6 +106,7 @@ %endif Version: 3.6.3 Release: 1 +%define ldapsmb_ver 1.34b Url: http://www.samba.org/ License: GPL-3.0+ Summary: Samba Documentation @@ -122,6 +123,7 @@ Source2: patches.tar.bz2 Source3: build-source-timestamp Source4: baselibs.conf +Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 # Choose some features / extra packages here ############################################ %define make_devel 0 @@ -189,6 +191,10 @@ # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 %setup -n samba-%{samba_ver_full} -q +# ldapsmb +%if %{make_ldapsmb} +%setup -T -D -a 11 -n samba-%{samba_ver_full} -q +%endif # patches %setup -T -D -a 2 -n samba-%{samba_ver_full} -q for patch in $( patches/tools/guards %{guards_symbols} <patches/series); do @@ -443,12 +449,7 @@ the man pages. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.A1cCF7/_old 2012-03-19 10:08:00.000000000 +0100 +++ /var/tmp/diff_new_pack.A1cCF7/_new 2012-03-19 10:08:00.000000000 +0100 @@ -211,13 +211,7 @@ how to. - -Authors: --------- - The Samba Team <samba(a)samba.org> - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package client @@ -258,12 +252,7 @@ how to. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -283,13 +272,7 @@ develop programs which make use of Samba. - -Authors: --------- - The Samba Team <samba(a)samba.org> - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif @@ -314,12 +297,7 @@ the man pages. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif @@ -341,12 +319,7 @@ A wrapper binary to run smbspool with the original calling UID. - -Authors: --------- - Jeremy Allison <jra at samba dot org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if %{make_utils} @@ -362,12 +335,7 @@ Some of the debug-tools for developpers. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif @@ -399,12 +367,7 @@ This is the winbind-daemon and the wbinfo-tool. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -430,14 +393,14 @@ %description -n libsmbclient -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif @@ -449,10 +412,6 @@ libsmbclient for SUSE version < 11.0 while versions > 10.0 will have libsmbclient0. -Authors: --------- - The Samba Team <samba(a)samba.org> - %package -n libsmbclient-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support @@ -480,12 +439,7 @@ develop programs which make use of the smbclient programming interface. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libnetapi0 @@ -498,12 +452,7 @@ This package includes the netapi library. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libnetapi-devel @@ -522,12 +471,7 @@ develop programs which make use of the netapi programming interface. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -548,23 +492,19 @@ %description -n libsmbsharemodes -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif This package includes the smbsharemodes library. -Authors: --------- - The Samba Team <samba(a)samba.org> - %package -n libsmbsharemodes-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support @@ -585,13 +525,7 @@ develop programs which make use of the smbsharemodes programming interface. - -Authors: --------- - The Samba Team <samba(a)samba.org> - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libwbclient0 @@ -604,12 +538,7 @@ This package includes the wbclient library. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libwbclient-devel @@ -628,12 +557,7 @@ develop programs which make use of the wbclient programming interface. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtalloc2 @@ -648,12 +572,7 @@ This package includes the talloc library. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtalloc-devel @@ -674,12 +593,7 @@ develop programs which make use of the talloc programming interface. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtdb1 @@ -694,12 +608,7 @@ This package includes the tdb library. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtdb-devel @@ -716,12 +625,7 @@ develop programs which make use of the tdb programming interface. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtevent0 @@ -736,12 +640,7 @@ This package includes the tevent library. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtevent-devel @@ -763,13 +662,7 @@ develop programs which make use of the tevent programming interface. - -Authors: --------- - The Samba Team <samba(a)samba.org> - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libldb1 @@ -785,13 +678,7 @@ This package includes the ldb library. - -Authors: --------- - The Samba Team <samba(a)samba.org> - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libldb-devel @@ -813,12 +700,7 @@ develop programs which make use of the tevent programming interface. - -Authors: --------- - The Samba Team <samba(a)samba.org> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if %{make_ldapsmb} @@ -836,12 +718,7 @@ Controller that uses the ldapsam passdb backend. - -Authors: --------- - Guenther Deschner <guenther at deschner dot de> - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.A1cCF7/_old 2012-03-19 10:08:00.000000000 +0100 +++ /var/tmp/diff_new_pack.A1cCF7/_new 2012-03-19 10:08:00.000000000 +0100 @@ -1,2 +1,2 @@ -2769 +2775 Branch : trunk ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2012-02-27 23:41:56.000000000 +0100 +++ new/vendor-files/tools/package-data 2012-03-15 00:23:29.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2769" +SAMBA_PACKAGE_SVN_VERSION="2775" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ncurses-pkg for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory checked in at 2012-03-19 10:07:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ncurses-pkg (Old) and /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ncurses-pkg", Maintainer is "gs(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2012-03-09 21:29:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new/yast2-ncurses-pkg.changes 2012-03-19 10:07:50.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 14 13:42:38 CET 2012 - gs(a)suse.de + +- Online Update: possibility to search in patch summary, improve + formatting of patch descriptions +- 2.22.3 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-pkg-2.22.2.tar.bz2 New: ---- yast2-ncurses-pkg-2.22.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.tYZUM5/_old 2012-03-19 10:07:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tYZUM5/_new 2012-03-19 10:07:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-ncurses-pkg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,16 @@ Name: yast2-ncurses-pkg -Version: 2.22.2 +Version: 2.22.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ncurses-pkg-%{version}.tar.bz2 - Group: System/YaST License: GPL-2.0 -BuildRequires: doxygen dejagnu gcc-c++ yast2-core-devel yast2-devtools libtool -BuildRequires: libxcrypt-devel blocxx-devel ncurses-devel yast2-ncurses-devel +BuildRequires: dejagnu doxygen gcc-c++ libtool yast2-core-devel yast2-devtools +BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel Summary: YaST2 - Character Based Package Manager Frontend Provides: yast2-ncurses:%{_libdir}/YaST2/plugin/libpy2ncurses.so ++++++ yast2-ncurses-pkg-2.22.2.tar.bz2 -> yast2-ncurses-pkg-2.22.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/VERSION new/yast2-ncurses-pkg-2.22.3/VERSION --- old/yast2-ncurses-pkg-2.22.2/VERSION 2012-03-07 12:19:59.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/VERSION 2012-03-14 14:26:37.000000000 +0100 @@ -1 +1 @@ -2.22.2 +2.22.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/configure new/yast2-ncurses-pkg-2.22.3/configure --- old/yast2-ncurses-pkg-2.22.2/configure 2012-03-07 12:20:50.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/configure 2012-03-14 14:27:04.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.22.2. +# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.22.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -709,8 +709,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses-pkg' PACKAGE_TARNAME='yast2-ncurses-pkg' -PACKAGE_VERSION='2.22.2' -PACKAGE_STRING='yast2-ncurses-pkg 2.22.2' +PACKAGE_VERSION='2.22.3' +PACKAGE_STRING='yast2-ncurses-pkg 2.22.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1492,7 +1492,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ncurses-pkg 2.22.2 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses-pkg 2.22.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1564,7 +1564,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.22.2:";; + short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.22.3:";; esac cat <<\_ACEOF @@ -1680,7 +1680,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses-pkg configure 2.22.2 +yast2-ncurses-pkg configure 2.22.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2224,7 +2224,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ncurses-pkg $as_me 2.22.2, which was +It was created by yast2-ncurses-pkg $as_me 2.22.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3154,7 +3154,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses-pkg' - VERSION='2.22.2' + VERSION='2.22.3' cat >>confdefs.h <<_ACEOF @@ -3276,7 +3276,7 @@ -VERSION="2.22.2" +VERSION="2.22.3" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" @@ -16076,7 +16076,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses-pkg $as_me 2.22.2, which was +This file was extended by yast2-ncurses-pkg $as_me 2.22.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16142,7 +16142,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-ncurses-pkg config.status 2.22.2 +yast2-ncurses-pkg config.status 2.22.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/configure.in new/yast2-ncurses-pkg-2.22.3/configure.in --- old/yast2-ncurses-pkg-2.22.2/configure.in 2012-03-07 12:20:42.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/configure.in 2012-03-14 14:26:56.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses-pkg, 2.22.2, http://bugs.opensuse.org/, yast2-ncurses-pkg) +AC_INIT(yast2-ncurses-pkg, 2.22.3, http://bugs.opensuse.org/, yast2-ncurses-pkg) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.2" +VERSION="2.22.3" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.cc --- old/yast2-ncurses-pkg-2.22.2/src/NCPackageSelector.cc 2012-02-22 14:10:13.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.cc 2012-03-14 13:39:51.000000000 +0100 @@ -380,7 +380,7 @@ // // Fills the patch list with search results // -bool NCPackageSelector::fillPatchSearchList( const string & expr ) +bool NCPackageSelector::fillPatchSearchList( const string & expr, bool checkName, bool checkSum ) { NCPkgTable * packageList = PackageList(); @@ -396,7 +396,14 @@ q.addString( expr ); q.addKind( zypp::ResKind::patch ); q.addAttribute( zypp::sat::SolvAttr::keywords ); - q.addAttribute( zypp::sat::SolvAttr::name ); + if ( checkName ) + { + q.addAttribute( zypp::sat::SolvAttr::name ); + } + if ( checkSum ) + { + q.addAttribute( zypp::sat::SolvAttr::summary ); + } for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin(); it != q.selectableEnd(); it++) @@ -1343,7 +1350,7 @@ NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), // headline of a popup showing the package license - string( _("End User License Agreement") ), + _("End User License Agreement"), "<i>" + pkgName + "</i><br><br>" + html_text, NCPkgStrings::AcceptLabel(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.h --- old/yast2-ncurses-pkg-2.22.2/src/NCPackageSelector.h 2012-02-28 14:59:33.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.h 2012-03-14 13:30:23.000000000 +0100 @@ -300,7 +300,7 @@ * @param checkRequires Check in Requires (true or false) * @return bool */ - bool fillPatchSearchList( const string & expr ); + bool fillPatchSearchList( const string & expr, bool checkName, bool checkSum ); bool fillDefaultList(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPkgFilterSearch.cc new/yast2-ncurses-pkg-2.22.3/src/NCPkgFilterSearch.cc --- old/yast2-ncurses-pkg-2.22.2/src/NCPkgFilterSearch.cc 2012-01-17 13:30:58.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPkgFilterSearch.cc 2012-03-14 13:35:34.000000000 +0100 @@ -321,10 +321,6 @@ settings->doCheckRequires() ); } - else - { - packager->fillPatchSearchList( filter ); - } return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPkgPackageDetails.cc new/yast2-ncurses-pkg-2.22.3/src/NCPkgPackageDetails.cc --- old/yast2-ncurses-pkg-2.22.2/src/NCPkgPackageDetails.cc 2012-03-07 12:31:27.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPkgPackageDetails.cc 2012-03-14 11:30:33.000000000 +0100 @@ -182,13 +182,13 @@ text += pkgPtr->installSize().asString(); text += " "; - ZyppPkg package; + ZyppPkg package = tryCastToZyppPkg( pkgPtr ); ZyppPkg candidate = tryCastToZyppPkg( slbPtr->candidateObj() ); ZyppPkg installed = tryCastToZyppPkg( slbPtr->installedObj() ); if ( installed ) package = installed; - else + else if ( candidate ) package = candidate; if ( package ) @@ -415,8 +415,19 @@ // get and format the patch description string value = patchPtr->description(); + string html_text = ""; + const string htmlIdent(DOCTYPETAG); + + if ( value.find( htmlIdent ) != string::npos ) + { + html_text = value; // HTML text + } + else + { + html_text = "<pre>" + value + "</pre>"; // add <pre> to preserve newlines and spaces + } - descr += createHtmlText( value ); + descr += html_text; descr += _("References:<br>"); for ( Patch::ReferenceIterator rit = patchPtr->referencesBegin(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPkgPatchSearch.cc new/yast2-ncurses-pkg-2.22.3/src/NCPkgPatchSearch.cc --- old/yast2-ncurses-pkg-2.22.2/src/NCPkgPatchSearch.cc 2012-01-17 13:31:54.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPkgPatchSearch.cc 2012-03-14 13:33:53.000000000 +0100 @@ -70,7 +70,7 @@ , searchExpr( 0 ) , packager( pkger ) { - createLayout( _("Search for Patch Name") ); + createLayout( _("Search for Patches") ); } /////////////////////////////////////////////////////////////////// @@ -117,8 +117,16 @@ new NCSpacing( vSplit, YD_VERT, false, 0.6 ); + NCMultiSelectionBox * settings = new NCMultiSelectionBox( vSplit, NCPkgStrings::SearchIn() ); + YItemCollection items; + searchName = new YItem ( _( "Name of the Patch" ), true); + items.push_back( searchName ); + searchSum = new YItem ( _( "Summary" ), true); + items.push_back( searchSum ); + settings->addItems( items ); + + new NCSpacing( vSplit, YD_VERT, false, 0.6 ); NCLayoutBox * hSplit3 = new NCLayoutBox( vSplit, YD_HORIZ ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // add the cancel and the ok button @@ -131,7 +139,7 @@ cancelButton->setFunctionKey( 9 ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - + new NCSpacing( vSplit, YD_VERT, false, 0.6 ); } /////////////////////////////////////////////////////////////////// @@ -200,7 +208,7 @@ // int NCPkgPatchSearch::preferredHeight() { - return 10; + return 16; } /////////////////////////////////////////////////////////////////// @@ -248,8 +256,9 @@ postevent.result = getSearchExpression(); string filter = postevent.result; - - packager->fillPatchSearchList( filter ); + bool checkName = searchName->selected(); + bool checkSum = searchSum->selected(); + packager->fillPatchSearchList( filter, checkName, checkSum ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPkgPatchSearch.h new/yast2-ncurses-pkg-2.22.3/src/NCPkgPatchSearch.h --- old/yast2-ncurses-pkg-2.22.2/src/NCPkgPatchSearch.h 2012-01-17 13:28:12.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPkgPatchSearch.h 2012-03-14 13:16:24.000000000 +0100 @@ -70,6 +70,9 @@ private: NCComboBox * searchExpr; + + YItem * searchName; + YItem * searchSum; NCPushButton * cancelButton; NCPushButton * okButton; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysconfig for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2012-03-19 10:07:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysconfig", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2012-02-16 16:23:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2012-03-19 10:07:45.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 27 10:46:45 UTC 2012 - werner(a)suse.de + +- In poll.tcpip avoid warnings messages of fetchmail by using the + owner ship of the system wide configuration file /etc/fechmailrc + which should be owned by the user and group mail. + +------------------------------------------------------------------- New: ---- sysconfig-0.76.1.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.P8b5ra/_old 2012-03-19 10:07:49.000000000 +0100 +++ /var/tmp/diff_new_pack.P8b5ra/_new 2012-03-19 10:07:49.000000000 +0100 @@ -31,6 +31,7 @@ BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 +Patch: %name-%version.dif %description This package provides the SuSE system configuration scheme and the @@ -50,6 +51,7 @@ %prep %setup -n sysconfig-%{version} +%patch %build autoreconf --force --install ++++++ sysconfig-0.76.1.dif ++++++ --- scripts/poll.tcpip +++ scripts/poll.tcpip 2012-02-27 10:39:54.430433600 +0000 @@ -86,13 +86,22 @@ done # # Do we get mails with fetchmail over pop3/imap? # We support only a system wide configuration -# file /etc/fetchmailrc. +# file /etc/fetchmailrc. Use the user id of the +# system wide configuration file, e.g. `mail'. +# For this the file /etc/fetchmailrc should have +# the permisssions 0600 and be owned by the user +# and the group `mail' # while true ; do test -x /usr/bin/fetchmail || break test -r /etc/fetchmailrc || break + mailid=$(stat -c '%U' /etc/fetchmailrc) checkproc /usr/bin/fetchmail && break - /usr/bin/fetchmail -f /etc/fetchmailrc + if test -n "$mailid" -a "$mailid" != root && type -p sudo > /dev/null 2>&1 ; then + sudo -u $mailid /usr/bin/fetchmail -f /etc/fetchmailrc + else + /usr/bin/fetchmail -f /etc/fetchmailrc + fi break done -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postfix for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2012-03-19 10:07:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix", Maintainer is "varkoly(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2012-03-09 21:26:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2012-03-19 10:07:05.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 13:35:13 UTC 2012 - varkoly(a)suse.com + +- Documentation for bnc#751994 - SuSEconfig module postfix does not exist + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix-SuSE.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/README.SuSE new/postfix-SuSE/README.SuSE --- old/postfix-SuSE/README.SuSE 2004-04-15 18:46:30.000000000 +0200 +++ new/postfix-SuSE/README.SuSE 2012-03-13 14:32:47.000000000 +0100 @@ -1,9 +1,21 @@ -README.SuSE - 18.11.2002 +README.SuSE - 13.03.2012 ---------------------------------------------------------------------- NEW: +With SLE11SP2 /sbin/conf.d/SuSEconfig.postfix was moved to /usr/sbin/ +to avoid unnecessary calls of the module. + +* If you have changed postfix configuration via yast2 mail module + /usr/sbin/SuSEconfig.postfix will be called. +* If you have changed /etc/sysconfig/postfix you have to execute + /usr/sbin/SuSEconfig.postfix manualy +* If you modify the postmaps or post aliases you have to restart + postfix to rebuild the postmap and aliases databases. + Remember that this happends for the maps listed in + POSTFIX_MAP_LIST only if POSTFIX_UPDATE_MAPS ist set to yes. + The SuSE postfix package now comes with a tool to manage OpenSSL certificates. SuSEconfig.postfix will create and set up a CA and create a server certificate, if POSTFIX_SMTP_TLS_SERVER is set to yes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/sysconfig.postfix new/postfix-SuSE/sysconfig.postfix --- old/postfix-SuSE/sysconfig.postfix 2011-07-06 15:08:51.000000000 +0200 +++ new/postfix-SuSE/sysconfig.postfix 2012-03-13 14:34:53.000000000 +0100 @@ -106,7 +106,7 @@ ## Config: postfix # # Start postfix services chrooted, that are able to run chrooted? -# Note: if you want SuSEconfig to maintain the chroot jail, you +# Note: if you want SuSEconfig.postfix to maintain the chroot jail, you # also have to set POSTFIX_UPDATE_CHROOT_JAIL to yes. # Note: if you want postfix runs in CHROOT enviroment, then the whole # /var directory must be on one partition. @@ -117,7 +117,7 @@ ## Default: no ## Config: postfix # -# Set this to yes, if SuSEconfig should setup the chroot jail itself +# Set this to yes, if SuSEconfig.postfix should setup the chroot jail itself # POSTFIX_UPDATE_CHROOT_JAIL="no" @@ -125,7 +125,7 @@ ## Default: no ## Config: postfix # -# Set this to yes, if SuSEconfig should activate ldap stuff in main.cf +# Set this to yes, if SuSEconfig.postfix should activate ldap stuff in main.cf # This extends virtual_alias_maps with "ldap:/etc/postfix/ldap_aliases.cf" # POSTFIX_WITH_LDAP="no" @@ -134,7 +134,7 @@ ## Default: no ## Config: postfix # -# Set this to yes, if SuSEconfig should activate mysql stuff in main.cf +# Set this to yes, if SuSEconfig.postfix should activate mysql stuff in main.cf # and having 'mysql.sock' inside chroot jail # Note: When POSTFIX_CHROOT="yes" then 'mysql.sock' will be available # in postfix CHROOT @@ -167,7 +167,7 @@ ## Default: yes ## Config: postfix # -# Should SuSEconfig update the different .db maps in /etc/postfix? +# Should SuSEconfig.postfix update the different .db maps in /etc/postfix? # POSTFIX_UPDATE_MAPS="yes" @@ -234,7 +234,7 @@ # A comma or space separated list of restrictions # Note: "if set to "medium" default is "$POSTFIX_RBL_HOSTS" # -# "POSTFIX_RBL_HOSTS" will be placed by SuSEconfig. You do not need to define it here. +# "POSTFIX_RBL_HOSTS" will be placed by SuSEconfig.postfix. You do not need to define it here. # Fill "POSTFIX_RBL_HOSTS" instead # # Example: @@ -343,7 +343,7 @@ # # Enable SMTP-AUTH for the postfix smtp client # you have to edit /etc/postfix/sasl_passwd and call -# SuSEconfig -module postfix afterwards +# SuSEconfig.postfix afterwards # POSTFIX_SMTP_AUTH="no" @@ -497,6 +497,6 @@ # otherwise every user in the same subnet as you, can use # your postfix server as a mail relay for spam. # If you set POSTFIX_DIALUP to "yes" mynetworks_style -# will be set to "host" by SuSEconfig. +# will be set to "host" by SuSEconfig.postfix. # POSTFIX_ADD_MYNETWORKS_STYLE="subnet" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dbus-1-python for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package dbus-1-python for openSUSE:Factory checked in at 2012-03-19 10:06:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1-python (Old) and /work/SRC/openSUSE:Factory/.dbus-1-python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dbus-1-python", Maintainer is "THoenig(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1-python/dbus-1-python.changes 2012-01-26 15:58:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dbus-1-python.new/dbus-1-python.changes 2012-03-19 10:07:03.000000000 +0100 @@ -1,0 +2,42 @@ +Thu Mar 8 20:33:58 UTC 2012 - asterios.dramis(a)gmail.com + +- New upstream version 1.0.0: + Dependencies: + - libdbus 1.4 or later is now required. + - Python 2.6 or later is now required. If Python 3 is used, it must be + version 3.2 or later. + - GNU make (or, at your own risk, another make with the GNU $(patsubst) + extension) is now required. + API changes: + - dbus_bindings, which was never meant to be public API and has been + deprecated for nearly 5 years, has finally been removed. + - The repr() of every dbus-python object is now unicode. + - The Python 3 API is not the same as the Python 2 API; see PY3PORT.rst for + details. + Enhancements: + - Python 3 compatibility (fd.o #26420) + - MethodCallMessage and SignalMessage now have a more useful repr() + Fixes: + - OOM while appending a unicode object to a message no longer leaks a string + - If libdbus somehow gives us invalid UTF-8, don't crash + - Fix rst2html failure in non-UTF-8 locales + From version 0.84.0: + Enhancements: + - fd.o #30812: add the UnixFd type, and support Unix fd passing if compiled + against a new enough libdbus + - fd.o #34342: add Connection.set_allow_anonymous(bool) + - fd.o #21017: add configure arguments PYTHON_INCLUDES and PYTHON_LIBS which + can be used to override $PYTHON-config + Fixes: + - fd.o #35626: clear ProxyObject's pending introspection queue after + execution + - fd.o #22560: remove duplicate code from example-async-client + - fd.o #36206: allow signature='x' among ProxyObject method arguments +- Spec file updates: + - Removed pyrex from BuildRequires: (not needed anymore). + - Removed "autoreconf -fi" from %build section and also libtool requirement + (not needed). + - Added epydoc and python-docutils in BuildRequires: to enable generation of + HTML docs and API documentation. + +------------------------------------------------------------------- Old: ---- dbus-python-0.83.2.tar.gz New: ---- dbus-python-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-python.spec ++++++ --- /var/tmp/diff_new_pack.0PThOT/_old 2012-03-19 10:07:05.000000000 +0100 +++ /var/tmp/diff_new_pack.0PThOT/_new 2012-03-19 10:07:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dbus-1-python # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,58 +16,79 @@ # - Name: dbus-1-python -BuildRequires: dbus-1-glib-devel pyrex python-devel -BuildRequires: libtool -Url: http://dbus.freedesktop.org/ +Version: 1.0.0 +Release: 0 +Summary: Python bindings for D-Bus License: MIT Group: Development/Libraries/Python -Version: 0.83.2 -Release: 1 -Summary: Python bindings for D-Bus -Source0: dbus-python-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) +Url: http://www.freedesktop.org/wiki/Software/DBusBindings/ +Source0: http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar… +BuildRequires: epydoc +BuildRequires: fdupes +BuildRequires: python-devel +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +BuildRequires: docutils +%else +BuildRequires: python-docutils +%endif +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbus-glib-1) Requires: libxml2-python Requires: python-xml +Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} +%description +D-Bus python bindings for use with python programs. + %package -n dbus-1-python-devel -License: MIT Summary: Python bindings for D-Bus +Group: Development/Libraries/Python +Requires: dbus-1-python = %{version} Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) Requires: dbus-1-devel >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1-devel`) -Requires: dbus-1-python = %{version} -Group: Development/Libraries/Python - -%description -Python bindings for D-Bus. %description -n dbus-1-python-devel Developer files for Python bindings for D-Bus. %prep -%setup -n dbus-python-%{version} -q +%setup -q -n dbus-python-%{version} %build -autoreconf -fi -export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector -fno-strict-aliasing -fPIC" -%configure --docdir=%_docdir/dbus-python +export CFLAGS="%{optflags} -fstack-protector -fno-strict-aliasing -fPIC" +%configure --docdir=%{_docdir}/dbus-1-python make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install +# Install additional docs +install -pm 0644 AUTHORS COPYING ChangeLog %{buildroot}%{_docdir}/dbus-1-python/ +rm -f %{buildroot}%{_docdir}/dbus-1-python-devel-doc/examples/Makefile* +# Remove empty files (fix rpmlint warning "zero-length") +rm -f %{buildroot}%{_docdir}/dbus-1-python/TODO* +# Remove files that will be included in dbus-1-python-devel +rm -f %{buildroot}%{_docdir}/dbus-1-python/{API_CHANGES.*,HACKING.*,PY3PORT.*,tutorial.*} + +# Install devel docs (do it manually to fix also rpmlint warning "files-duplicate" with %%fdupes) +mkdir -p %{buildroot}%{_docdir}/dbus-1-python-devel-doc +cp -a api/ doc/ examples/ %{buildroot}%{_docdir}/dbus-1-python-devel-doc/ +# Remove Makefile* (fix rpmlint warning "makefile-junk") +rm -f %{buildroot}%{_docdir}/dbus-1-python-devel-doc/examples/Makefile* + +%fdupes -s %{buildroot} + %files -%defattr(-, root, root) -%dir %{_docdir}/dbus-python +%defattr(-,root,root,-) +%doc %{_docdir}/dbus-1-python/ %{python_sitelib}/* %{python_sitearch}/* -%{_docdir}/dbus-python/* %files -n dbus-1-python-devel -%defattr(-, root, root) +%defattr(-,root,root,-) +%doc %{_docdir}/dbus-1-python-devel-doc/ %{_includedir}/dbus-1.0/dbus/dbus-python.h %{_libdir}/pkgconfig/dbus-python.pc ++++++ dbus-python-0.83.2.tar.gz -> dbus-python-1.0.0.tar.gz ++++++ ++++ 27509 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 sendmail for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package sendmail for openSUSE:Factory checked in at 2012-03-19 10:06:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sendmail (Old) and /work/SRC/openSUSE:Factory/.sendmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sendmail", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sendmail/uucp.changes 2012-02-16 16:23:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sendmail.new/uucp.changes 2012-03-19 10:06:54.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 11:31:21 UTC 2012 - mweckbecker(a)suse.com + +- Add missing linkerflags to make it build w/ -fPIE properly + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uucp.spec ++++++ --- /var/tmp/diff_new_pack.IlYiVK/_old 2012-03-19 10:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.IlYiVK/_new 2012-03-19 10:07:02.000000000 +0100 @@ -82,7 +82,7 @@ --with-newconfigdir=/etc/uucp \ --with-oldconfigdir=/etc/uucp/hdb_config \ --prefix=/usr --mandir=%{_mandir} --infodir=%{_infodir} - make CFLAGS="-Wall ${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE" + make CFLAGS="-Wall ${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE" LDFLAGS="-pie" %install ID=$(id -u) -- 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-distribute for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package python-distribute for openSUSE:Factory checked in at 2012-03-19 10:06:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-distribute (Old) and /work/SRC/openSUSE:Factory/.python-distribute.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-distribute", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-distribute/python-distribute.changes 2012-03-01 17:26:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-distribute.new/python-distribute.changes 2012-03-19 10:06:49.000000000 +0100 @@ -0,0 +1,17 @@ +------------------------------------------------------------------ +Sat Mar 10 12:44:00 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 0.6.25: + - Issue #258: Workaround a cache issue + - Issue #260: distribute_setup.py now accepts the --user + parameter for Python 2.6 and later. + - Issue #262: package_index.open_with_auth no longer throws + LookupError on Python 3. + - Issue #269: AttributeError when an exception occurs reading + Manifest.in on late releases of Python. + - Issue #272: Prevent TypeError when namespace package names + are unicode and single-install-externally-managed is used. Also + fixes PIP issue 449. + - Issue #273: Legacy script launchers now install with Python2/3 + support. + --- /work/SRC/openSUSE:Factory/python-distribute/python3-distribute.changes 2012-03-01 17:26:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-distribute.new/python3-distribute.changes 2012-03-19 10:06:49.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Mar 10 12:44:42 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 0.6.25: + - Issue #258: Workaround a cache issue + - Issue #260: distribute_setup.py now accepts the --user + parameter for Python 2.6 and later. + - Issue #262: package_index.open_with_auth no longer throws + LookupError on Python 3. + - Issue #269: AttributeError when an exception occurs reading + Manifest.in on late releases of Python. + - Issue #272: Prevent TypeError when namespace package names + are unicode and single-install-externally-managed is used. Also + fixes PIP issue 449. + - Issue #273: Legacy script launchers now install with Python2/3 + support. + +------------------------------------------------------------------- Old: ---- distribute-0.6.24.tar.gz New: ---- distribute-0.6.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-distribute.spec ++++++ --- /var/tmp/diff_new_pack.Mt76pC/_old 2012-03-19 10:06:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Mt76pC/_new 2012-03-19 10:06:53.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-distribute -Version: 0.6.24 +Version: 0.6.25 Release: 0 Url: http://packages.python.org/distribute Summary: Easily download, build, install, upgrade, and uninstall Python packages python3-distribute.spec: same change ++++++ distribute-0.6.24.tar.gz -> distribute-0.6.25.tar.gz ++++++ ++++ 1812 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 libedit for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libedit for openSUSE:Factory checked in at 2012-03-19 10:06:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libedit (Old) and /work/SRC/openSUSE:Factory/.libedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libedit", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libedit/libedit.changes 2012-02-24 12:05:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libedit.new/libedit.changes 2012-03-19 10:06:47.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 13 01:51:31 UTC 2012 - crrodriguez(a)opensuse.org + +- open all FDs with O_CLOEXEC in the library code. +- use gcc visibility by just reusing upstream macros "public" + and "protected" + +------------------------------------------------------------------- New: ---- libedit-ocloexec.patch libedit-visibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libedit.spec ++++++ --- /var/tmp/diff_new_pack.ZFaEee/_old 2012-03-19 10:06:49.000000000 +0100 +++ /var/tmp/diff_new_pack.ZFaEee/_new 2012-03-19 10:06:49.000000000 +0100 @@ -35,7 +35,8 @@ Source1: README.SuSE Source2: baselibs.conf Patch2: libedit-20100424-3.0-ncurses.patch -# +Patch3: libedit-ocloexec.patch +Patch4: libedit-visibility.patch Summary: Command Line Editing and History Library License: BSD-3-Clause Group: Development/Libraries/C and C++ @@ -74,10 +75,11 @@ This package holds the development files for libedit. %prep -%setup -n %{pkg_name}-%{pkg_version} +%setup -q -n %{pkg_name}-%{pkg_version} %{__cp} %{S:1} . %patch2 - +%patch3 -p1 +%patch4 -p1 %build NOCONFIGURE=1 autoreconf -fiv %configure --disable-static --with-pic \ ++++++ libedit-ocloexec.patch ++++++ Index: libedit-20110802-3.0/src/readline.c =================================================================== --- libedit-20110802-3.0.orig/src/readline.c +++ libedit-20110802-3.0/src/readline.c @@ -1175,15 +1175,15 @@ history_truncate_file (const char *filen if (filename == NULL && (filename = _default_history_file()) == NULL) return errno; - if ((fp = fopen(filename, "r+")) == NULL) + if ((fp = fopen(filename, "r+e")) == NULL) return errno; strcpy(template, _history_tmp_template); - if ((fd = mkstemp(template)) == -1) { + if ((fd = mkostemp(template, O_CLOEXEC)) == -1) { ret = errno; goto out1; } - if ((tp = fdopen(fd, "r+")) == NULL) { + if ((tp = fdopen(fd, "r+e")) == NULL) { close(fd); ret = errno; goto out2; Index: libedit-20110802-3.0/src/vi.c =================================================================== --- libedit-20110802-3.0.orig/src/vi.c +++ libedit-20110802-3.0/src/vi.c @@ -37,6 +37,7 @@ #include <unistd.h> #include <limits.h> #include <sys/wait.h> +#include <fcntl.h> #if !defined(lint) && !defined(SCCSID) #if 0 @@ -1015,7 +1016,7 @@ vi_histedit(EditLine *el, Int c __attrib return CC_ERROR; } - fd = mkstemp(tempfile); + fd = mkostemp(tempfile, O_CLOEXEC); if (fd < 0) return CC_ERROR; len = (size_t)(el->el_line.lastchar - el->el_line.buffer); Index: libedit-20110802-3.0/src/el.c =================================================================== --- libedit-20110802-3.0.orig/src/el.c +++ libedit-20110802-3.0/src/el.c @@ -539,7 +539,7 @@ el_source(EditLine *el, const char *fnam #endif } if (fp == NULL) - fp = fopen(fname, "r"); + fp = fopen(fname, "re"); if (fp == NULL) { el_free(path); return -1; Index: libedit-20110802-3.0/src/history.c =================================================================== --- libedit-20110802-3.0.orig/src/history.c +++ libedit-20110802-3.0/src/history.c @@ -741,7 +741,7 @@ history_load(TYPE(History) *h, const cha static ct_buffer_t conv; #endif - if ((fp = fopen(fname, "r")) == NULL) + if ((fp = fopen(fname, "re")) == NULL) return i; if ((line = fgetln(fp, &sz)) == NULL) @@ -802,7 +802,7 @@ history_save(TYPE(History) *h, const cha static ct_buffer_t conv; #endif - if ((fp = fopen(fname, "w")) == NULL) + if ((fp = fopen(fname, "we")) == NULL) return -1; if (fchmod(fileno(fp), S_IRUSR|S_IWUSR) == -1) ++++++ libedit-visibility.patch ++++++ Index: libedit-20110802-3.0/src/sys.h =================================================================== --- libedit-20110802-3.0.orig/src/sys.h +++ libedit-20110802-3.0/src/sys.h @@ -63,7 +63,7 @@ #endif #ifndef public -# define public /* Externally visible functions/variables */ +# define public __attribute__ ((visibility ("default"))) /* Externally visible functions/variables */ #endif #ifndef private @@ -71,7 +71,7 @@ #endif #ifndef protected -# define protected /* Redefined from elsewhere to "static" */ +# define protected __attribute__ ((visibility ("hidden"))) /* Redefined from elsewhere to "static" */ /* When we want to hide everything */ #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluez for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at 2012-03-19 10:06:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez (Old) and /work/SRC/openSUSE:Factory/.bluez.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bluez", Maintainer is "ACho(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bluez/bluez-gstreamer.changes 2012-01-31 10:19:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bluez.new/bluez-gstreamer.changes 2012-03-19 10:06:44.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Mar 8 21:06:29 UTC 2012 - seife+obs(a)b1-systems.com + +- update to bluez-4.99: + - Fix issue with missing retries for BNEP connection setup. + - Fix issue with not showing name if first EIR has no details. + - Fix issue with running SDP discovery for LE devices. + - Add support for GATT using 128-bit Bluetooth UUIDs. + - Add support for retrieving key size information. + - Add support for storing Long Term Keys. + - Add support for Proximity Reporter API. + - Add support for KeyboardDisplay IO capability. + - Add support for version 1.0 of management API. + - Add support for monitoring interface. + +------------------------------------------------------------------- bluez.changes: same change Old: ---- bluez-4.98.tar.bz2 New: ---- bluez-4.99.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.8n7y3Y/_old 2012-03-19 10:06:46.000000000 +0100 +++ /var/tmp/diff_new_pack.8n7y3Y/_new 2012-03-19 10:06:46.000000000 +0100 @@ -27,20 +27,20 @@ %if 0%{?suse_version} > 1130 BuildRequires: pkgconfig(systemd) %endif -BuildRequires: pkgconfig(libnl-1) -BuildRequires: glib2-devel >= 2.16 -BuildRequires: libusb-devel BuildRequires: alsa-devel -BuildRequires: libsndfile-devel -BuildRequires: pkg-config BuildRequires: check-devel -BuildRequires: udev +BuildRequires: glib2-devel >= 2.16 BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel -BuildRequires: readline-devel +BuildRequires: libsndfile-devel BuildRequires: libudev-devel +BuildRequires: libusb-devel +BuildRequires: pkg-config +BuildRequires: readline-devel +BuildRequires: udev +BuildRequires: pkgconfig(libnl-1) Url: http://www.bluez.org -Version: 4.98 +Version: 4.99 Release: 0 Summary: Bluetooth Sound Support License: GPL-2.0+ ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.8n7y3Y/_old 2012-03-19 10:06:46.000000000 +0100 +++ /var/tmp/diff_new_pack.8n7y3Y/_new 2012-03-19 10:06:46.000000000 +0100 @@ -29,20 +29,20 @@ %{?systemd_requires} %define has_systemd 1 %endif -BuildRequires: pkgconfig(libnl-1) -BuildRequires: glib2-devel >= 2.16 -BuildRequires: libusb-devel BuildRequires: alsa-devel +BuildRequires: automake +BuildRequires: check-devel +BuildRequires: glib2-devel >= 2.16 BuildRequires: libsndfile-devel +BuildRequires: libtool +BuildRequires: libudev-devel +BuildRequires: libusb-devel BuildRequires: pkg-config -BuildRequires: check-devel -BuildRequires: udev BuildRequires: readline-devel -BuildRequires: libudev-devel -BuildRequires: libtool -BuildRequires: automake +BuildRequires: udev +BuildRequires: pkgconfig(libnl-1) Url: http://www.bluez.org -Version: 4.98 +Version: 4.99 Release: 0 Summary: Bluetooth Stack for Linux License: GPL-2.0+ @@ -143,7 +143,9 @@ Summary: Tools for testing of various Bluetooth-functions License: GPL-2.0+ ; MIT Group: Development/Tools/Debuggers -Requires: libbluetooth3 = %{version} python-gobject2 dbus-1-python +Requires: dbus-1-python +Requires: libbluetooth3 = %{version} +Requires: python-gobject2 %description test Contains a few tools for testing various bluetooth functions. The ++++++ bluez-4.98.tar.bz2 -> bluez-4.99.tar.bz2 ++++++ ++++ 15218 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 dos2unix for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package dos2unix for openSUSE:Factory checked in at 2012-03-19 10:06:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dos2unix (Old) and /work/SRC/openSUSE:Factory/.dos2unix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dos2unix", Maintainer is "pth(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dos2unix/dos2unix.changes 2012-02-01 13:15:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dos2unix.new/dos2unix.changes 2012-03-19 10:06:36.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 12 18:25:19 UTC 2012 - tabraham(a)novell.com + +- Update to 5.3.3: + - enabled wildcard expansion + - small update in RETURN VALUE section of man page + +- removed dos2unix-correct_ending.patch (instead pass HTMLEXT="html" + to make) + +------------------------------------------------------------------- Old: ---- dos2unix-5.3.2.tar.gz dos2unix-correct_ending.patch New: ---- dos2unix-5.3.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dos2unix.spec ++++++ --- /var/tmp/diff_new_pack.U0ut7w/_old 2012-03-19 10:06:38.000000000 +0100 +++ /var/tmp/diff_new_pack.U0ut7w/_new 2012-03-19 10:06:38.000000000 +0100 @@ -16,15 +16,15 @@ # + Name: dos2unix Summary: Text converters to and from DOS/MAC to UNIX License: BSD-3-Clause Group: Productivity/Text/Convertors -Version: 5.3.2 +Version: 5.3.3 Release: 0 Url: http://waterlan.home.xs4all.nl/dos2unix.html Source: %{name}-%{version}.tar.gz -Patch0: dos2unix-correct_ending.patch Provides: unix2dos = %{version} Obsoletes: unix2dos < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,12 +39,11 @@ %prep %setup -q -%patch0 find . -type f | xargs chmod -x %build export RPM_OPT_FLAGS -make %{?_smp_mflags} CC="%{__cc}" +make %{?_smp_mflags} CC="%{__cc}" HTMLEXT="html" %install %makeinstall docdir=%{_defaultdocdir}/%{name} ++++++ dos2unix-5.3.2.tar.gz -> dos2unix-5.3.3.tar.gz ++++++ ++++ 2401 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 sensors for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package sensors for openSUSE:Factory checked in at 2012-03-19 10:04:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sensors (Old) and /work/SRC/openSUSE:Factory/.sensors.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sensors", Maintainer is "JDelvare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sensors/sensors.changes 2012-02-15 16:18:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sensors.new/sensors.changes 2012-03-19 10:04:19.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Mar 8 10:35:17 CET 2012 - jdelvare(a)suse.de + +- lm_sensors-r5993-fix-loading-of-cpuid-module.patch: Fix loading + of the cpuid module. +- lm_sensors-r6016-handle-superio-wo-logdev.patch: Properly handle + Super-I/O chips without logical device. +- lm_sensors-r6017-fix-sysfs-detection.patch: libsensors: Change + sysfs detection to survive upcoming kernel changes (bnc#751180). +- lm_sensors-r6025-sensord-fix-memory-leaks.patch: sensord: Fix + memory leaks revealed by valgrind (bnc#751177). +- lm_sensors-r6030-fix-power-interval-output.patch: Fix power + interval output. + +------------------------------------------------------------------- New: ---- lm_sensors-r5993-fix-loading-of-cpuid-module.patch lm_sensors-r6016-handle-superio-wo-logdev.patch lm_sensors-r6017-fix-sysfs-detection.patch lm_sensors-r6025-sensord-fix-memory-leaks.patch lm_sensors-r6030-fix-power-interval-output.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.NpD2pt/_old 2012-03-19 10:04:23.000000000 +0100 +++ /var/tmp/diff_new_pack.NpD2pt/_new 2012-03-19 10:04:23.000000000 +0100 @@ -37,6 +37,11 @@ Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch Patch5: lm_sensors-r5991-improve-filtering-of-fake-DMI-data.patch Patch6: lm_sensors-r5992-print-DMI-product-version.patch +Patch7: lm_sensors-r5993-fix-loading-of-cpuid-module.patch +Patch8: lm_sensors-r6016-handle-superio-wo-logdev.patch +Patch9: lm_sensors-r6017-fix-sysfs-detection.patch +Patch10: lm_sensors-r6025-sensord-fix-memory-leaks.patch +Patch11: lm_sensors-r6030-fix-power-interval-output.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -141,6 +146,11 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ++++++ lm_sensors-r5993-fix-loading-of-cpuid-module.patch ++++++ Fix loading of the cpuid module. On non-udev systems, or even on udev systems where /dev/cpu/0/cpuid is part of the static device node tree, the previous test would succeed even when the cpuid module isn't loaded, resulting in missing detections (of coretemp-supported CPU models in particuler.) Check if the module is loaded by looking in sysfs instead, this is much more reliable. --- prog/detect/sensors-detect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- lm_sensors-3.3.1.orig/prog/detect/sensors-detect +++ lm_sensors-3.3.1/prog/detect/sensors-detect @@ -6636,7 +6636,7 @@ sub main "Do you want to scan for them? This is totally safe. (YES/no): "; unless (<STDIN> =~ /^\s*n/i) { # Load the cpuid driver if needed - unless (-e "/dev/cpu/$cpu[0]->{nr}/cpuid") { + unless (-e "$sysfs_root/class/cpuid") { load_module("cpuid"); udev_settle(); } ++++++ lm_sensors-r6016-handle-superio-wo-logdev.patch ++++++ Properly handle Super-I/O chips without logical device. Just report that we can't support the chip yet, instead of spitting I/O errors. --- prog/detect/sensors-detect | 4 ++++ 1 file changed, 4 insertions(+) --- lm_sensors-3.3.1.orig/prog/detect/sensors-detect +++ lm_sensors-3.3.1/prog/detect/sensors-detect @@ -3747,6 +3747,10 @@ sub probe_superio print "\n (hardware monitoring capabilities accessible via SMBus only)\n"; return FEAT_SMBUS; } + if (!exists $chip->{logdev}) { + print "\n (no support yet)\n"; + return 0; + } # Switch to the sensor logical device outb($addrreg, $superio{logdevreg}); ++++++ lm_sensors-r6017-fix-sysfs-detection.patch ++++++ References: bnc#751180 Upcoming change in sysfs will break the way libsensors detects if sysfs is mounted. Adjust the implementation so that it still works after said change. --- lib/sysfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- lm_sensors-3.3.1.orig/lib/sysfs.c +++ lm_sensors-3.3.1/lib/sysfs.c @@ -24,6 +24,7 @@ #include <sys/types.h> #include <sys/stat.h> +#include <sys/vfs.h> #include <unistd.h> #include <string.h> #include <stdlib.h> @@ -40,6 +41,7 @@ /****************************************************************************/ #define ATTR_MAX 128 +#define SYSFS_MAGIC 0x62656572 /* * Read an attribute from sysfs @@ -585,11 +587,11 @@ exit_free: /* returns !0 if sysfs filesystem was found, 0 otherwise */ int sensors_init_sysfs(void) { - struct stat statbuf; + struct statfs statfsbuf; snprintf(sensors_sysfs_mount, NAME_MAX, "%s", "/sys"); - if (stat(sensors_sysfs_mount, &statbuf) < 0 - || statbuf.st_nlink <= 2) /* Empty directory */ + if (statfs(sensors_sysfs_mount, &statfsbuf) < 0 + || statfsbuf.f_type != SYSFS_MAGIC) return 0; return 1; ++++++ lm_sensors-r6025-sensord-fix-memory-leaks.patch ++++++ References: bnc#751177 Fix memory leaks in sensord revealed by valgrind. The leak in daemonize() is harmless, we're about to exit anyway. Fix it still to make valgrind happy. The leak in do_features() is real, as the function is called periodically by the daemon, for all actions. If the intervals at set low and the system has many sensors, the leak could be significant, maybe 150 kB/day. --- prog/sensord/sense.c | 22 +++++++++++++--------- prog/sensord/sensord.c | 6 +++++- 2 files changed, 18 insertions(+), 10 deletions(-) --- lm_sensors-3.3.1.orig/prog/sensord/sense.c +++ lm_sensors-3.3.1/prog/sensord/sense.c @@ -132,14 +132,7 @@ static int do_features(const sensors_chi const FeatureDescriptor *feature, int action) { char *label; - int alrm, beep; - - label = sensors_get_label(chip, feature->feature); - if (!label) { - sensorLog(LOG_ERR, "Error getting sensor label: %s/%s", - chip->prefix, feature->feature->name); - return -1; - } + int alrm, beep, ret; alrm = get_flag(chip, feature->alarmNumber); if (alrm == -1) @@ -151,7 +144,18 @@ static int do_features(const sensors_chi if (beep == -1) return -1; - return get_features(chip, feature, action, label, alrm, beep); + label = sensors_get_label(chip, feature->feature); + if (!label) { + sensorLog(LOG_ERR, "Error getting sensor label: %s/%s", + chip->prefix, feature->feature->name); + return -1; + } + + ret = get_features(chip, feature, action, label, alrm, beep); + + free(label); + + return ret; } static int doKnownChip(const sensors_chip_name *chip, --- lm_sensors-3.3.1.orig/prog/sensord/sensord.c +++ lm_sensors-3.3.1/prog/sensord/sensord.c @@ -204,7 +204,11 @@ static void daemonize(void) } else if (pid != 0) { fprintf(file, "%d\n", pid); fclose(file); - unloadLib(); + + freeChips(); + if (unloadLib()) + exit(EXIT_FAILURE); + exit(EXIT_SUCCESS); } ++++++ lm_sensors-r6030-fix-power-interval-output.patch ++++++ Fix power interval output Power interval is measured in seconds, not Watt. --- prog/sensors/chips.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) --- lm_sensors-3.3.1.orig/prog/sensors/chips.c +++ lm_sensors-3.3.1/prog/sensors/chips.c @@ -564,11 +564,25 @@ static void print_chip_power(const senso } else printf(" N/A "); - for (i = 0; i < sensor_count; i++) - scale_value(&sensors[i].value, &sensors[i].unit); + for (i = 0; i < sensor_count; i++) { + /* + * Unit is W and needs to be scaled for all attributes except + * interval, which does not need to be scaled and is reported in + * seconds. + */ + if (strcmp(sensors[i].name, "interval")) { + char *tmpstr; + tmpstr = alloca(4); + scale_value(&sensors[i].value, &unit); + snprintf(tmpstr, 4, "%sW", unit); + sensors[i].unit = tmpstr; + } else { + sensors[i].unit = "s"; + } + } print_limits(sensors, sensor_count, alarms, alarm_count, - label_size, "%s = %6.2f %sW"); + label_size, "%s = %6.2f %s"); printf("\n"); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flac for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package flac for openSUSE:Factory checked in at 2012-03-19 10:03:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flac (Old) and /work/SRC/openSUSE:Factory/.flac.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flac", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/flac/flac.changes 2012-03-09 21:22:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.flac.new/flac.changes 2012-03-19 10:03:36.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 13 20:45:17 UTC 2012 - dimstar(a)opensuse.org + +- Add flac-gcc47.patch: Replacing strcpy without 'lenght + limitation' with strncpy, limited to 4 chars. This is safe, as we + check the length already to be sure it is 4 chars, yet do not + suffer from the problem that strcpy wants to add a '\0' char in + plus to the target string. + +------------------------------------------------------------------- New: ---- flac-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flac.spec ++++++ --- /var/tmp/diff_new_pack.pgTlo2/_old 2012-03-19 10:03:37.000000000 +0100 +++ /var/tmp/diff_new_pack.pgTlo2/_new 2012-03-19 10:03:37.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: flac BuildRequires: gcc-c++ BuildRequires: libogg-devel @@ -30,12 +29,12 @@ Obsoletes: flac-64bit %endif Version: 1.2.1 -Release: 83 -License: BSD-3-Clause +Release: 0 # Summary: Free Lossless Audio Codec -Url: http://flac.sourceforge.net/ +License: BSD-3-Clause Group: Productivity/Multimedia/Sound/Utilities +Url: http://flac.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -53,13 +52,14 @@ Patch6: flac-visibility.patch Patch7: flac-leaks.patch Patch8: flac-disable-hidden-visibility-for-ppc.patch +# PATCH-FIX-UPSTREAM flac-gcc47.patch dimstar(a)opensuse.org -- Fix build with gcc 4.7 +Patch9: flac-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FLAC is an open source lossless audio codec developed by Josh Coalson. %package -n libFLAC8 -License: BSD-3-Clause Summary: Free Lossless Audio Codec Library Group: System/Libraries Obsoletes: libflac <= %{version} @@ -70,7 +70,6 @@ developed by Josh Coalson. %package -n libFLAC++6 -License: BSD-3-Clause Summary: Free Lossless Audio Codec Library Group: System/Libraries @@ -79,7 +78,6 @@ Codec) developed by Josh Coalson. %package devel -License: BSD-3-Clause Summary: FLAC Library Development Package Group: Development/Libraries/C and C++ Requires: glibc-devel @@ -104,6 +102,7 @@ %ifarch ppc ppc64 %patch8 -p1 %endif +%patch9 -p1 %build autoreconf --force --install ++++++ flac-gcc47.patch ++++++ Index: flac-1.2.1/src/metaflac/options.c =================================================================== --- flac-1.2.1.orig/src/metaflac/options.c +++ flac-1.2.1/src/metaflac/options.c @@ -1041,7 +1041,7 @@ FLAC__bool parse_block_type(const char * out->entries[entry].filter_application_by_id = (0 != r); if(0 != r) { if(strlen(r) == 4) { - strcpy(out->entries[entry].application_id, r); + memcpy(out->entries[entry].application_id, r, 4); } else if(strlen(r) == 10 && strncmp(r, "0x", 2) == 0 && strspn(r+2, "0123456789ABCDEFabcdef") == 8) { FLAC__uint32 x = strtoul(r+2, 0, 16); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shared-mime-info for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package shared-mime-info for openSUSE:Factory checked in at 2012-03-19 09:59:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shared-mime-info (Old) and /work/SRC/openSUSE:Factory/.shared-mime-info.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shared-mime-info", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/shared-mime-info/shared-mime-info.changes 2012-02-28 14:16:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shared-mime-info.new/shared-mime-info.changes 2012-03-19 09:59:23.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 27 07:52:10 UTC 2012 - vuntz(a)opensuse.org + +- Change libxml2 PreReq to libxml2-2, after libxml2 packaging + split: we have PreReq for the libraries used by + update-mime-database. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shared-mime-info.spec ++++++ --- /var/tmp/diff_new_pack.DcGgfA/_old 2012-03-19 09:59:25.000000000 +0100 +++ /var/tmp/diff_new_pack.DcGgfA/_new 2012-03-19 09:59:25.000000000 +0100 @@ -41,7 +41,7 @@ # libgio-2_0-0 Requires: shared-mime-info, but this can't exist yet. We explicitly ignore this dependency here. #!BuildIgnore: shared-mime-info # needed by update-mime-database -PreReq: libxml2 libglib-2_0-0 +PreReq: libxml2-2 libglib-2_0-0 Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scrollkeeper for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package scrollkeeper for openSUSE:Factory checked in at 2012-03-19 09:59:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scrollkeeper (Old) and /work/SRC/openSUSE:Factory/.scrollkeeper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scrollkeeper", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/scrollkeeper/scrollkeeper.changes 2012-02-28 14:16:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scrollkeeper.new/scrollkeeper.changes 2012-03-19 09:59:11.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 27 07:52:58 UTC 2012 - vuntz(a)opensuse.org + +- Remove /bin/touch PreReq: it isn't needed as far as I can tell. +- Remove /usr/bin/xmlcatalog and libxml2 PreReq: while + edit-xml-catalog (from sgml-skel, which we use in scriptlets) + uses binaries from libxml2-tools, we're not supposed to know + that. +- Remove docbook_4 and libxslt PreReq: I don't think this is + needed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scrollkeeper.spec ++++++ --- /var/tmp/diff_new_pack.VsvdXJ/_old 2012-03-19 09:59:12.000000000 +0100 +++ /var/tmp/diff_new_pack.VsvdXJ/_new 2012-03-19 09:59:12.000000000 +0100 @@ -43,7 +43,7 @@ Requires: libxslt BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://scrollkeeper.sourceforge.net/ -PreReq: /bin/touch sgml-skel /usr/bin/xmlcatalog libxml2 docbook_4 libxslt +PreReq: sgml-skel Requires(post): update-alternatives Requires(postun): update-alternatives # The build service fails to build the package because it doesn't really @@ -62,15 +62,6 @@ It will also be able to communicate with catalog servers on the net to search for documents which are not on the local system. - - -Authors: --------- - Dan Mueth <muet(a)alumni.uchicago.edu> - Eric Fischer <eric(a)eazel.com> - Gregory Leblanc <gleblanc(a)cu-portland.edu> - Laszlo Kovacs <laszlo.kovacs(a)sun.com> - %lang_package %prep %setup -q -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit PackageKit for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2012-03-19 09:59:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2012-02-16 16:21:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2012-03-19 09:59:08.000000000 +0100 @@ -1,0 +2,28 @@ +Fri Mar 2 10:59:58 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.7.3: + + New Features: + - Add LANGUAGE_SUPPORT what-provides type + + Libraries (glib): + - Don't segfault the client if there are no cached properties + - Fix a critical warning in gnome-settings-daemon when setting + the proxy + - Fix transfer annotation of pk_results_get_package_sack() + - Fix transfer annotations for GPtrArray returns + - Do not send progress updates for non-verb packages + + Non-zypp backends updates. + + Bugfixes: + - Document CODEC what-provides type + - Don't crash when the system bus isn't available, just abort + with an error + - Fix a critical warning when starting gnome-settings-daemon + - Imply the install trusted polkit auth when we get the remove + auth + - Imply the install trusted polkit auth when we get the + untrusted auth + - Port the session example code to GDBus + - Website updates. +- Remove xz BuildRequires now that it comes for free in the build + system. + +------------------------------------------------------------------- Old: ---- PackageKit-0.7.2.tar.xz New: ---- PackageKit-0.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.YxVSis/_old 2012-03-19 09:59:10.000000000 +0100 +++ /var/tmp/diff_new_pack.YxVSis/_new 2012-03-19 09:59:10.000000000 +0100 @@ -34,7 +34,7 @@ %endif Name: PackageKit -Version: 0.7.2 +Version: 0.7.3 Release: 0 BuildRequires: NetworkManager-devel BuildRequires: automake @@ -67,8 +67,6 @@ BuildRequires: shared-mime-info BuildRequires: sqlite-devel BuildRequires: translation-update-upstream -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz Summary: Simple software installation management software License: GPL-2.0+ Group: System/Daemons ++++++ 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch ++++++ --- /var/tmp/diff_new_pack.YxVSis/_old 2012-03-19 09:59:10.000000000 +0100 +++ /var/tmp/diff_new_pack.YxVSis/_new 2012-03-19 09:59:10.000000000 +0100 @@ -1,12 +1,12 @@ -From 1cc0fe92824696e1a76efa3ae634e807a92c1bad Mon Sep 17 00:00:00 2001 +From f30bd44a4998df7b17d04d283f3c54abfd330d09 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)opensuse.org> Date: Tue, 26 Jul 2011 11:34:22 +0200 Subject: [PATCH 1/2] Change the configuration of the cron script to a sysconfig-like config --- - contrib/cron/packagekit-background | 43 +++++++++++++++++++++++++++-------- - 1 files changed, 33 insertions(+), 10 deletions(-) + contrib/cron/packagekit-background | 43 +++++++++++++++++++++++++++--------- + 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/contrib/cron/packagekit-background b/contrib/cron/packagekit-background index e5b5c9b..783e2df 100644 @@ -65,5 +65,5 @@ +# SLEEP_MAX=3600 -- -1.7.8 +1.7.9.2 ++++++ 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch ++++++ --- /var/tmp/diff_new_pack.YxVSis/_old 2012-03-19 09:59:10.000000000 +0100 +++ /var/tmp/diff_new_pack.YxVSis/_new 2012-03-19 09:59:10.000000000 +0100 @@ -1,4 +1,4 @@ -From 54bf835491693986f50d90fb7f8734e3c69af6d0 Mon Sep 17 00:00:00 2001 +From d5810deb4748946db068d7ff4912112b63f2f6c1 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer <wr(a)rosenauer.org> Date: Tue, 25 Oct 2011 14:27:15 +0200 Subject: [PATCH 2/2] Build against npapi-sdk instead of xulrunner @@ -6,10 +6,10 @@ https://bugs.freedesktop.org/show_bug.cgi?id=40026 --- configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index ad2b2d0..cfc0c2b 100644 +index a40eeb0..5632b4b 100644 --- a/configure.ac +++ b/configure.ac @@ -348,7 +348,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br @@ -22,5 +22,5 @@ nspr >= 4.8 \ cairo \ -- -1.7.8 +1.7.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit p11-kit for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package p11-kit for openSUSE:Factory checked in at 2012-03-19 09:58:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/p11-kit (Old) and /work/SRC/openSUSE:Factory/.p11-kit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "p11-kit", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/p11-kit/p11-kit.changes 2012-02-16 16:21:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.p11-kit.new/p11-kit.changes 2012-03-19 09:58:57.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 9 19:37:44 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.12: + + Build fix. + +------------------------------------------------------------------- Old: ---- p11-kit-0.11.tar.gz New: ---- p11-kit-0.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ p11-kit.spec ++++++ --- /var/tmp/diff_new_pack.uN2jgM/_old 2012-03-19 09:58:59.000000000 +0100 +++ /var/tmp/diff_new_pack.uN2jgM/_new 2012-03-19 09:58:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: p11-kit -Version: 0.11 +Version: 0.12 Release: 0 Summary: Library to work with PKCS#11 modules License: BSD-3-Clause ++++++ p11-kit-0.11.tar.gz -> p11-kit-0.12.tar.gz ++++++ ++++ 5923 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 nautilus for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package nautilus for openSUSE:Factory checked in at 2012-03-19 09:58:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nautilus (Old) and /work/SRC/openSUSE:Factory/.nautilus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nautilus", Maintainer is "DLiang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nautilus/nautilus.changes 2012-02-28 19:25:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nautilus.new/nautilus.changes 2012-03-19 09:58:51.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Mar 5 21:17:19 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + Ensure pathbar scrolling works with latest GTK + + Fix a crash when unmounting volumes with non-empty trash + + Fix a race condition leading to a crash when closing window + slots under certain circumstances. +- Replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0). +- Remove gtk2-devel Requires from -devel package. It's been a while + that nautilus is using gtk3. +- Remove glib2-devel Requires from -devel package: it is added + automatically the pkgconfig() way. +- Drop nautilus-sysadmin-desktop-items.diff: the feature which this + patch implemented is obsolete by now, as we do not have desktop + icons by default anymore (bnc#533598). + +------------------------------------------------------------------- Old: ---- nautilus-3.3.90.tar.xz nautilus-sysadmin-desktop-items.diff New: ---- nautilus-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.PoOtuf/_old 2012-03-19 09:58:53.000000000 +0100 +++ /var/tmp/diff_new_pack.PoOtuf/_new 2012-03-19 09:58:53.000000000 +0100 @@ -17,9 +17,8 @@ Name: nautilus -Version: 3.3.90 +Version: 3.3.91 Release: 0 -# FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop License: GPL-2.0+ Group: Productivity/File utilities @@ -31,8 +30,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico(a)novell.com Patch15: nautilus-drives-and-volumes-on-desktop.diff -# PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico(a)novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE) -Patch21: nautilus-sysadmin-desktop-items.diff # needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -41,16 +38,16 @@ BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: libexempi-devel BuildRequires: libselinux-devel # We need the %%mime_database_* macros BuildRequires: shared-mime-info BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gail-3.0) BuildRequires: pkgconfig(glib-2.0) >= 2.31.9 BuildRequires: pkgconfig(gnome-desktop-3.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.7 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.17 BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libxml-2.0) @@ -89,7 +86,7 @@ %package devel Summary: File Manager for the GNOME Desktop -- Development Files Group: Development/Libraries/GNOME -Requires: %{name} = %{version} glib2-devel gtk2-devel +Requires: %{name} = %{version} Requires: typelib-1_0-Nautilus-3_0 = %{version} Provides: nautilus2-devel = %{version} Obsoletes: nautilus2-devel < %{version} @@ -105,7 +102,6 @@ translation-update-upstream #gnome-patch-translation-prepare ### %patch15 -p1 -#%patch21 -p1 #gnome-patch-translation-update %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libwnck2 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libwnck2 for openSUSE:Factory checked in at 2012-03-19 09:58:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwnck2 (Old) and /work/SRC/openSUSE:Factory/.libwnck2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libwnck2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libwnck2/libwnck2.changes 2012-02-21 12:21:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libwnck2.new/libwnck2.changes 2012-03-19 09:58:43.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 7 04:54:09 UTC 2012 - praful.johari(a)gmail.com + +- Update to version 2.31.0: + + Add wnck_pager_set_layout_policy() API. + + Add macros to determine libwnck version at build time. + +------------------------------------------------------------------- Old: ---- libwnck-2.30.7.tar.bz2 New: ---- libwnck-2.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwnck2.spec ++++++ --- /var/tmp/diff_new_pack.mKURG7/_old 2012-03-19 09:58:44.000000000 +0100 +++ /var/tmp/diff_new_pack.mKURG7/_new 2012-03-19 09:58:44.000000000 +0100 @@ -18,7 +18,7 @@ Name: libwnck2 %define _name libwnck -Version: 2.30.7 +Version: 2.31.0 Release: 0 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libwnck-1) @@ -26,7 +26,7 @@ Summary: Window Navigator Construction Kit (Library Package) License: LGPL-2.1+ Group: Development/Libraries/GNOME -Source: http://download.gnome.org/sources/libwnck/2.30/%{_name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/libwnck/2.31/%{_name}-%{version}.tar.xz Source1: %{name}_spec-update.sh Source99: baselibs.conf BuildRequires: fdupes -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libwebkit for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libwebkit for openSUSE:Factory checked in at 2012-03-19 09:58:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwebkit (Old) and /work/SRC/openSUSE:Factory/.libwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libwebkit", Maintainer is "DMZhang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libwebkit/libwebkit.changes 2012-03-01 07:49:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libwebkit.new/libwebkit.changes 2012-03-19 09:58:41.000000000 +0100 @@ -1,0 +2,24 @@ +Mon Mar 12 13:37:11 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.7.91: + + Properly advertise flac support for the audio tag. + + Fix a WebProcess segmentation fault related to clipboard + handling. + + Add a Find API for WebKit2. + + Add zoom-text-only setting to WebKit2 GTK+ API. + + Miscellaneous build fixes. +- Drop libwebkit-fix-gtk2.patch: fixed upstream. + +------------------------------------------------------------------- +Mon Feb 27 19:59:02 CET 2012 - dmueller(a)suse.de + +- Fix build on ARM (reducing functionality that is compiled in). + When building for ARM, pass these to configure: + --disable-webgl + --disable-sql-database + --disable-svg +- Add some configure options: --enable-javascript-debugger + (useful), --disable-static and --enable-shared (since we care + only about shared libraries). + +------------------------------------------------------------------- libwebkit3.changes: same change Old: ---- libwebkit-fix-gtk2.patch webkit-1.7.90.tar.xz New: ---- webkit-1.7.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwebkit.spec ++++++ --- /var/tmp/diff_new_pack.xMJCgm/_old 2012-03-19 09:58:43.000000000 +0100 +++ /var/tmp/diff_new_pack.xMJCgm/_new 2012-03-19 09:58:43.000000000 +0100 @@ -43,7 +43,7 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0 ; LGPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.7.90 +Version: 1.7.91 Release: 0 # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions # FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the build @@ -54,8 +54,6 @@ Patch0: webkit-gir-fixup.patch # PATCH-FIX-OPENSUSE webkit-ld-optimization.patch vuntz(a)opensuse.org -- Add ld options to use less memory when linking, should help building on OBS, but this will be slower Patch2: webkit-ld-optimization.patch -# PATCH-FIX-UPSTREAM libwebkit-fix-gtk2.patch vuntz(a)opensuse.org -- Fix build of the gtk+ 2 version, sent upstream by irc -Patch3: libwebkit-fix-gtk2.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: flex @@ -223,7 +221,6 @@ %setup -q -n webkit-%{version} %patch0 -p1 %patch2 -%patch3 -p1 # FIXME: workaround needed in > 1.7.90 to fix build mkdir DerivedSources/ANGLE mkdir DerivedSources/InjectedBundle @@ -238,9 +235,17 @@ %configure \ --with-gtk=%{_gtkver} \ --enable-geolocation \ - --enable-introspection -make -#make %{?jobs:-j %jobs} + --enable-introspection \ + --enable-javascript-debugger \ +%ifarch %arm + --disable-webgl \ + --disable-sql-database \ + --disable-svg \ +%endif + --disable-static \ + --enable-shared +#make VERBOSE=1 %{?jobs:-j %jobs} +make VERBOSE=1 %install %makeinstall ++++++ libwebkit3.spec ++++++ --- /var/tmp/diff_new_pack.xMJCgm/_old 2012-03-19 09:58:43.000000000 +0100 +++ /var/tmp/diff_new_pack.xMJCgm/_new 2012-03-19 09:58:43.000000000 +0100 @@ -43,7 +43,7 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0 ; LGPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.7.90 +Version: 1.7.91 Release: 0 # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions # FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the build @@ -54,8 +54,6 @@ Patch0: webkit-gir-fixup.patch # PATCH-FIX-OPENSUSE webkit-ld-optimization.patch vuntz(a)opensuse.org -- Add ld options to use less memory when linking, should help building on OBS, but this will be slower Patch2: webkit-ld-optimization.patch -# PATCH-FIX-UPSTREAM libwebkit-fix-gtk2.patch vuntz(a)opensuse.org -- Fix build of the gtk+ 2 version, sent upstream by irc -Patch3: libwebkit-fix-gtk2.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: flex @@ -223,7 +221,6 @@ %setup -q -n webkit-%{version} %patch0 -p1 %patch2 -%patch3 -p1 # FIXME: workaround needed in > 1.7.90 to fix build mkdir DerivedSources/ANGLE mkdir DerivedSources/InjectedBundle @@ -238,9 +235,17 @@ %configure \ --with-gtk=%{_gtkver} \ --enable-geolocation \ - --enable-introspection -make -#make %{?jobs:-j %jobs} + --enable-introspection \ + --enable-javascript-debugger \ +%ifarch %arm + --disable-webgl \ + --disable-sql-database \ + --disable-svg \ +%endif + --disable-static \ + --enable-shared +#make VERBOSE=1 %{?jobs:-j %jobs} +make VERBOSE=1 %install %makeinstall -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsoup for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libsoup for openSUSE:Factory checked in at 2012-03-19 09:58:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsoup (Old) and /work/SRC/openSUSE:Factory/.libsoup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsoup", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libsoup/libsoup.changes 2012-02-28 19:24:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsoup.new/libsoup.changes 2012-03-19 09:58:24.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Mar 6 08:09:16 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.37.91: + + Fixed an out-of-bounds memory read that could occur when + parsing malformed requests/responses. + + Fixed a build-related bug in Makefile.glib that affected + locales such as Estonian where "Z" is not the last (ASCII) + letter of the alphabet. [bgo#654395] + + Fixed the handling of file: URIs with query components, which + got broken in 2.37.90. + + Fixed SoupAuthManagerNTLM to not fall back to allowing Basic + auth when NTLM failed. + + Further tweaked the warnings/fallback in SoupURI, so that + soup_uri_to_string() on an http URI with a NULL path would + translate that to "/" like it used to. [bgo#670431] + + Fixed a warning when cancelling the load of a page with many + subresources. [bgo#667245] + + Use G_GNUC_BEGIN/END_IGNORE_DEPRECATIONS if GLib is new enough, + to avoid getting warned about the use of GValueArray. + +------------------------------------------------------------------- Old: ---- libsoup-2.37.90.tar.xz New: ---- libsoup-2.37.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsoup.spec ++++++ --- /var/tmp/diff_new_pack.tHhf4m/_old 2012-03-19 09:58:27.000000000 +0100 +++ /var/tmp/diff_new_pack.tHhf4m/_new 2012-03-19 09:58:27.000000000 +0100 @@ -20,7 +20,7 @@ Summary: HTTP client/server library for GNOME License: LGPL-2.1+ Group: Development/Libraries/GNOME -Version: 2.37.90 +Version: 2.37.91 Release: 0 Url: http://www.gnome.org Source: http://download.gnome.org/sources/libsoup/2.37/%{name}-%{version}.tar.xz -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libproxy for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2012-03-19 09:58:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libproxy (Old) and /work/SRC/openSUSE:Factory/.libproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libproxy", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2012-02-03 10:23:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2012-03-19 09:58:18.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 21:19:29 UTC 2012 - dimstar(a)opensuse.org + +- Add libproxy-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- libproxy.changes: same change New: ---- libproxy-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.6kqEVa/_old 2012-03-19 09:58:23.000000000 +0100 +++ /var/tmp/diff_new_pack.6kqEVa/_new 2012-03-19 09:58:23.000000000 +0100 @@ -51,6 +51,8 @@ Patch1: libproxy-mozjs185.patch # PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#739069 dimstar(a)opensuse.org -- Trim strings in ignore list; taken from upstream svn, r821. Patch2: libproxy-trim-ignores.patch +# PATCH-FIX-UPSTREAM libproxy-gcc47.patch dimstar(a)opensuse.org -- Fix build with gcc 4.7. Taken from upstream svn, r833. +Patch3: libproxy-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -73,10 +75,10 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif -BuildRequires: pkgconfig(mozjs185) BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel +BuildRequires: pkgconfig(mozjs185) %endif %else %if 0%{?have_mono} @@ -309,6 +311,7 @@ %patch0 -p0 %patch1 -p1 %patch2 -p0 +%patch3 -p1 mkdir build %build ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.6kqEVa/_old 2012-03-19 09:58:23.000000000 +0100 +++ /var/tmp/diff_new_pack.6kqEVa/_new 2012-03-19 09:58:23.000000000 +0100 @@ -51,6 +51,8 @@ Patch1: libproxy-mozjs185.patch # PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#739069 dimstar(a)opensuse.org -- Trim strings in ignore list; taken from upstream svn, r821. Patch2: libproxy-trim-ignores.patch +# PATCH-FIX-UPSTREAM libproxy-gcc47.patch dimstar(a)opensuse.org -- Fix build with gcc 4.7. Taken from upstream svn, r833. +Patch3: libproxy-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -73,10 +75,10 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif -BuildRequires: pkgconfig(mozjs185) BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel +BuildRequires: pkgconfig(mozjs185) %endif %else %if 0%{?have_mono} @@ -309,6 +311,7 @@ %patch0 -p0 %patch1 -p1 %patch2 -p0 +%patch3 -p1 mkdir build %build ++++++ libproxy-gcc47.patch ++++++ Index: libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp +++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp @@ -21,6 +21,9 @@ #include <cstdlib> #include <map> #include <fstream> +#include <unistd.h> +#include <sys/types.h> + #include "../extension_config.hpp" using namespace libproxy; Index: libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/modules/pacrunner_mozjs.cpp +++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include <cstring> // ? +#include <unistd.h> // gethostname #include "../extension_pacrunner.hpp" using namespace libproxy; @@ -85,7 +86,7 @@ static JSBool myIpAddress(JSContext *cx, if (!gethostname(hostname, 1023)) { JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname)); jsval arg = STRING_TO_JSVAL(myhost); - return dnsResolve_(cx, 1, &arg); + return dnsResolve_(cx, arg, vp); } JS_free(cx, hostname); JS_SET_RVAL(cx, vp, JSVAL_NULL); Index: libproxy-0.4.7/libproxy/modules/pacrunner_natus.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/modules/pacrunner_natus.cpp +++ libproxy-0.4.7/libproxy/modules/pacrunner_natus.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include "../extension_pacrunner.hpp" +#include <unistd.h> // gethostname using namespace libproxy; #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE Index: libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/modules/pacrunner_webkit.cpp +++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include "../extension_pacrunner.hpp" +#include <unistd.h> // gethostname using namespace libproxy; #ifdef __APPLE__ Index: libproxy-0.4.7/libproxy/url.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/url.cpp +++ libproxy-0.4.7/libproxy/url.cpp @@ -33,6 +33,7 @@ #include <cstdlib> // For atoi() #include <sys/stat.h> // For stat() #include <algorithm> // For transform() +#include <unistd.h> // For read() close() #ifdef WIN32 #include <io.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgweather for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libgweather for openSUSE:Factory checked in at 2012-03-19 09:58:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgweather (Old) and /work/SRC/openSUSE:Factory/.libgweather.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgweather", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libgweather/libgweather.changes 2012-02-28 14:14:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgweather.new/libgweather.changes 2012-03-19 09:58:12.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Mar 9 22:20:39 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.4.1: + + Link with libm explicitly + + Set the URL for the package's home page in AC_INIT +- Drop libgweather-libm.patch: fixed upstream. + +------------------------------------------------------------------- +Wed Mar 7 21:16:35 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.4.0: + + Move API documentation to inline comments + + Improve autotools configuration a bit + + Updated translations. +- Add libgweather-libm.patch: link against libm where needed. + +------------------------------------------------------------------- Old: ---- libgweather-3.2.1.tar.bz2 New: ---- libgweather-3.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgweather.spec ++++++ --- /var/tmp/diff_new_pack.jemovB/_old 2012-03-19 09:58:14.000000000 +0100 +++ /var/tmp/diff_new_pack.jemovB/_new 2012-03-19 09:58:14.000000000 +0100 @@ -17,13 +17,13 @@ Name: libgweather -Version: 3.2.1 +Version: 3.4.1 Release: 0 Summary: Library to get online weather information License: GPL-2.0+ Group: Development/Libraries/GNOME Url: http://developer.gnome.org/libgweather/ -Source: http://download.gnome.org/sources/libgweather/3.2/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/libgweather/3.4/%{name}-%{version}.tar.xz Source99: baselibs.conf # PATCH-FEATURE-OPENSUSE libgweather-bnc428346-bundle.patch bnc428346 vuntz(a)novell.com -- Support a bundle directory so that bundle-lang-gnome-* doesn't conflict with libgweather-lang. Patch1: libgweather-bnc428346-bundle.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgnome-keyring for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libgnome-keyring for openSUSE:Factory checked in at 2012-03-19 09:58:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgnome-keyring (Old) and /work/SRC/openSUSE:Factory/.libgnome-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgnome-keyring", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libgnome-keyring/libgnome-keyring.changes 2012-02-16 16:18:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgnome-keyring.new/libgnome-keyring.changes 2012-03-19 09:58:04.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 9 19:09:09 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + GObject introspection fixes. + + Build fixes. + +------------------------------------------------------------------- Old: ---- libgnome-keyring-3.3.5.tar.xz New: ---- libgnome-keyring-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.4LNh9w/_old 2012-03-19 09:58:05.000000000 +0100 +++ /var/tmp/diff_new_pack.4LNh9w/_new 2012-03-19 09:58:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: libgnome-keyring -Version: 3.3.5 +Version: 3.3.91 Release: 0 Url: http://www.gnome.org/ Summary: Library to integrate with the GNOME Keyring -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgdata for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libgdata for openSUSE:Factory checked in at 2012-03-19 09:57:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgdata (Old) and /work/SRC/openSUSE:Factory/.libgdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgdata", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libgdata/libgdata.changes 2012-01-09 15:42:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgdata.new/libgdata.changes 2012-03-19 09:57:58.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 12 20:39:40 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.11.1: + + bgo#667577: fix introspection for srcdir != builddir builds. + + bgo#668365: libgdata 0.10.x link error because of exported + symbols that don't exist. + + bgo#671535: Security issue in libgdata: Validate SSL + certificates for all connections + + Updated translations. + +------------------------------------------------------------------- Old: ---- libgdata-0.11.0.tar.xz New: ---- libgdata-0.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgdata.spec ++++++ --- /var/tmp/diff_new_pack.HAMM9a/_old 2012-03-19 09:57:59.000000000 +0100 +++ /var/tmp/diff_new_pack.HAMM9a/_new 2012-03-19 09:57:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgdata # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # Update baselibs.conf when changing this %define _sover 13 Name: libgdata -Version: 0.11.0 +Version: 0.11.1 Release: 0 Summary: GLib-based library for accessing online service APIs using the GData protocol License: LGPL-2.1+ @@ -39,7 +40,7 @@ # installed, so no need to depend on it #BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libsoup-2.4) -BuildRequires: pkgconfig(libsoup-gnome-2.4) +BuildRequires: pkgconfig(libsoup-gnome-2.4) >= 2.37.91 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(oauth) BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit itstool for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package itstool for openSUSE:Factory checked in at 2012-03-19 09:57:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/itstool (Old) and /work/SRC/openSUSE:Factory/.itstool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "itstool", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/itstool/itstool.changes 2012-02-16 16:17:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.itstool.new/itstool.changes 2012-03-19 09:57:55.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 6 13:46:28 UTC 2012 - coolo(a)suse.com + +- Remove python BuildRequires and %py_requires: we only need a + minimal python, which libxml2-python will bring in both cases; + and we don't need a specific version of python. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ itstool.spec ++++++ --- /var/tmp/diff_new_pack.exvTHO/_old 2012-03-19 09:57:56.000000000 +0100 +++ /var/tmp/diff_new_pack.exvTHO/_new 2012-03-19 09:57:56.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: itstool Version: 1.1.2 Release: 0 @@ -24,11 +25,9 @@ Url: http://itstool.org Source: http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2 BuildRequires: libxml2-python -BuildRequires: python Requires: libxml2-python BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%py_requires %description ITS Tool extracts messages from XML files and outputs PO template files, then @@ -47,9 +46,6 @@ %install %make_install -%clean -%{?buildroot:%__rm -rf %{buildroot}} - %files %defattr(-,root,root) %doc ChangeLog COPYING COPYING.GPL3 NEWS -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iso-codes for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package iso-codes for openSUSE:Factory checked in at 2012-03-19 09:57:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iso-codes (Old) and /work/SRC/openSUSE:Factory/.iso-codes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iso-codes", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/iso-codes/iso-codes.changes 2012-01-11 15:37:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iso-codes.new/iso-codes.changes 2012-03-19 09:57:53.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Mar 4 11:10:04 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.33: + + ISO-15924: + - Update ISO-15924 as of 2012-02-06 changes. + + ISO 639-3: + - Update to 2012-02-06. + + ISO 3166: + - Add accent in "Réunion" (alioth#313537). + + Updated translations for ISO 3166, ISO 15924 and ISO 639-3. + +------------------------------------------------------------------- Old: ---- iso-codes-3.32.tar.bz2 New: ---- iso-codes-3.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iso-codes.spec ++++++ --- /var/tmp/diff_new_pack.fIdUKj/_old 2012-03-19 09:57:54.000000000 +0100 +++ /var/tmp/diff_new_pack.fIdUKj/_new 2012-03-19 09:57:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: iso-codes -Version: 3.32 +Version: 3.33 Release: 0 Summary: ISO Code Lists and Translations License: LGPL-2.1+ @@ -69,7 +69,7 @@ %files %defattr(-,root,root) %doc ChangeLog README TODO -%{_datadir}/xml/iso-codes +%{_datadir}/xml/iso-codes/ %files lang -f %{name}.lang ++++++ iso-codes-3.32.tar.bz2 -> iso-codes-3.33.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/iso-codes/iso-codes-3.32.tar.bz2 /work/SRC/openSUSE:Factory/.iso-codes.new/iso-codes-3.33.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtkhtml for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gtkhtml for openSUSE:Factory checked in at 2012-03-19 09:57:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkhtml (Old) and /work/SRC/openSUSE:Factory/.gtkhtml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtkhtml", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkhtml/gtkhtml.changes 2012-02-16 16:16:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gtkhtml.new/gtkhtml.changes 2012-03-19 09:57:51.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 08:25:51 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 4.3.91: + + Updated translations. + +------------------------------------------------------------------- Old: ---- gtkhtml-4.3.5.tar.xz New: ---- gtkhtml-4.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkhtml.spec ++++++ --- /var/tmp/diff_new_pack.Fs8z5l/_old 2012-03-19 09:57:52.000000000 +0100 +++ /var/tmp/diff_new_pack.Fs8z5l/_new 2012-03-19 09:57:52.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _gtkhtml_version 4.0 %define _gtkhtml_editor_version 4.0 %define _gtkhtml_api 4_0 @@ -23,7 +24,7 @@ %define _gtkhtml_editor_major 0 Name: gtkhtml -Version: 4.3.5 +Version: 4.3.91 Release: 0 Summary: Lightweight HTML rendering/printing/editing engine License: GPL-2.0+ ; LGPL-2.1+ @@ -56,8 +57,8 @@ Group: System/Libraries Recommends: %{name}-%{_gtkhtml_api}-lang # For the lang package to be installable -Provides: %{name}-%{_gtkhtml_api} = %{version} Provides: %{name} = %{version} +Provides: %{name}-%{_gtkhtml_api} = %{version} Obsoletes: %{name} < %{version} Provides: gtkhtml2 = %{version} Obsoletes: gtkhtml2 < %{version} @@ -80,8 +81,8 @@ %package -n glade-catalog-gtkhtml Summary: Lightweight HTML rendering/printing/editing engine -- Catalog for Glade Group: Development/Tools/GUI Builders -Requires: libgtkhtml-editor-%{_gtkhtml_editor_api}-%{_gtkhtml_editor_major} = %{version} Requires: glade +Requires: libgtkhtml-editor-%{_gtkhtml_editor_api}-%{_gtkhtml_editor_major} = %{version} Supplements: packageand(glade:%{name}-devel) %description -n glade-catalog-gtkhtml -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gtk3 for openSUSE:Factory checked in at 2012-03-19 09:57:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk3 (Old) and /work/SRC/openSUSE:Factory/.gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtk3", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gtk3/gtk3.changes 2012-02-28 19:23:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gtk3.new/gtk3.changes 2012-03-19 09:57:28.000000000 +0100 @@ -1,0 +2,29 @@ +Tue Mar 6 08:02:39 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.18: + + Add support for touch devices: + - New device types GDK_SOURCE_TOUCHSCREEN and + GDK_SOURCE_TOUCHPAD for direct and indirect touch devices + - New event GdkEventTouch and GDK_TOUCH_MASK + - New signal GtkWidget::touch-event + + Add support for smooth scrolling: + - Scroll events can contain scroll deltas, obtainable via + gdk_event_get_scroll_deltas() + - Scroll direction for such events is GDK_SCROLL_SMOOTH + - To receive scroll events, widgets must now set either + GDK_SCROLL_MASK or GDK_SMOOTH_SCROLL_MASK + + GtkScrolledWindow will do kinetic scrolling with touch devices + + XInput2 is now required for building the X11 backend, support + for XInput1 has been removed + + Deprecations are now versioned, and new API is marked with the + version it was introduced. Use these with + GDK_VERSION_{MIN,MAX}_REQUIRED + + Theming: + - Memory consumption of the CSS parser has been reduced + - CSS selectors of the form "a + b" and "a ~ b" work now + + Bugs fixed: bgo#650693, bgo#655065, bgo#668141, bgo#669335, + bgo#669342, bgo#670555, bgo#670881, bgo#671057, bgo#671070, + bgo#671170. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gtk+-3.3.16.tar.xz New: ---- gtk+-3.3.18.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3.spec ++++++ --- /var/tmp/diff_new_pack.g1doDN/_old 2012-03-19 09:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.g1doDN/_new 2012-03-19 09:57:31.000000000 +0100 @@ -24,7 +24,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.3.16 +Version: 3.3.18 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ @@ -48,7 +48,7 @@ BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.25.2 -BuildRequires: pkgconfig(glib-2.0) >= 2.31.18 +BuildRequires: pkgconfig(glib-2.0) >= 2.31.20 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(pango) @@ -209,8 +209,8 @@ Requires: %{name} = %{version} Requires(post): %{name}-tools Requires(postun): %{name}-tools -Provides: locale(%{name}:ko) Provides: locale(%{name}:ja) +Provides: locale(%{name}:ko) Provides: locale(%{name}:th) Provides: locale(%{name}:zh) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gobject-introspection for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gobject-introspection for openSUSE:Factory checked in at 2012-03-19 09:57:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gobject-introspection (Old) and /work/SRC/openSUSE:Factory/.gobject-introspection.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gobject-introspection", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gobject-introspection/gobject-introspection.changes 2012-02-16 16:14:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gobject-introspection.new/gobject-introspection.changes 2012-03-19 09:57:24.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Mar 5 15:37:46 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.31.20: + + scanner: + - Allow adding annotations to vfuncs directly + - Add better errors for unknown param names + + typelib: fix invalid alignment assumptions, that break + platforms like m68k. + + Many improvements to g-ir-doctool. + + Updated annotations for glib. + + Several other code changes. + + Build and test improvements/fixes. +- Rebase g-ir-dep-tool.patch. + +------------------------------------------------------------------- Old: ---- gobject-introspection-1.31.10.tar.xz New: ---- gobject-introspection-1.31.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gobject-introspection.spec ++++++ --- /var/tmp/diff_new_pack.LS18Q0/_old 2012-03-19 09:57:27.000000000 +0100 +++ /var/tmp/diff_new_pack.LS18Q0/_new 2012-03-19 09:57:27.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gobject-introspection -Version: 1.31.10 +Version: 1.31.20 Release: 0 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel Summary: GObject Introspection Tools @@ -118,7 +119,6 @@ %{_bindir}/g-ir-annotation-tool %{_bindir}/g-ir-compiler %{_bindir}/g-ir-dep-tool -%{_bindir}/g-ir-doc-tool %{_bindir}/g-ir-generate %{_bindir}/g-ir-scanner %doc %{_mandir}/man1/g-ir-compiler.1* ++++++ g-ir-dep-tool.patch ++++++ --- /var/tmp/diff_new_pack.LS18Q0/_old 2012-03-19 09:57:27.000000000 +0100 +++ /var/tmp/diff_new_pack.LS18Q0/_new 2012-03-19 09:57:27.000000000 +0100 @@ -22,11 +22,11 @@ +++ b/Makefile-tools.am @@ -1,5 +1,6 @@ bin_PROGRAMS += g-ir-compiler g-ir-generate - bin_SCRIPTS += g-ir-scanner g-ir-annotation-tool g-ir-doc-tool + bin_SCRIPTS += g-ir-scanner g-ir-annotation-tool +bin_PROGRAMS += g-ir-dep-tool - EXTRA_DIST += \ - tools/g-ir-scanner.in \ + if BUILD_DOCTOOL + bin_SCRIPTS += g-ir-doc-tool @@ -38,8 +39,15 @@ g_ir_generate_LDADD = \ libgirepository-1.0.la \ $(GIREPO_LIBS) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-panel for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gnome-panel for openSUSE:Factory checked in at 2012-03-19 09:57:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-panel (Old) and /work/SRC/openSUSE:Factory/.gnome-panel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-panel", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-panel/gnome-panel.changes 2012-02-28 19:23:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-panel.new/gnome-panel.changes 2012-03-19 09:57:11.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Mar 5 13:06:02 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Panel: + - Fix rendering of the handle in the applet frame widget + - Fix themed background pattern + - Several PanelSeparator improvements + - Fix position re-shuffling on orientation change + + Misc: + - Add --disable-documentation option + - Fix srcdir != builddir for gresources + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-panel-3.3.90.tar.xz New: ---- gnome-panel-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-panel.spec ++++++ --- /var/tmp/diff_new_pack.xJNwvV/_old 2012-03-19 09:57:13.000000000 +0100 +++ /var/tmp/diff_new_pack.xJNwvV/_new 2012-03-19 09:57:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-panel -Version: 3.3.90 +Version: 3.3.91 Release: 0 # FIXME: gnome-main-menu not ported to new panel API, for this reason we do not Recommend gnome-main-menu. Summary: The GNOME Desktop Panel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-icon-theme for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gnome-icon-theme for openSUSE:Factory checked in at 2012-03-19 09:57:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-icon-theme (Old) and /work/SRC/openSUSE:Factory/.gnome-icon-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-icon-theme", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-icon-theme/gnome-icon-theme.changes 2012-01-06 11:44:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-icon-theme.new/gnome-icon-theme.changes 2012-03-19 09:57:08.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 5 16:34:23 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + trophies icons + + UPS icon + +------------------------------------------------------------------- Old: ---- gnome-icon-theme-3.2.1.2.tar.bz2 New: ---- gnome-icon-theme-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.07VNVN/_old 2012-03-19 09:57:11.000000000 +0100 +++ /var/tmp/diff_new_pack.07VNVN/_new 2012-03-19 09:57:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-icon-theme # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gnome-icon-theme -Version: 3.2.1.2 +Version: 3.3.91 Release: 0 Summary: GNOME Icon Theme License: LGPL-3.0+ or CC-BY-SA-3.0 Group: System/GUI/GNOME Url: http://www.gnome.org/ -Source: http://download.gnome.org/sources/gnome-icon-theme/3.2/%{name}-%{version}.t… +Source: http://download.gnome.org/sources/gnome-icon-theme/3.3/%{name}-%{version}.t… BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: icon-naming-utils-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-doc-utils for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gnome-doc-utils for openSUSE:Factory checked in at 2012-03-19 09:56:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-doc-utils (Old) and /work/SRC/openSUSE:Factory/.gnome-doc-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-doc-utils", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-doc-utils/gnome-doc-utils.changes 2012-02-28 14:13:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-doc-utils.new/gnome-doc-utils.changes 2012-03-19 09:56:58.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Mar 2 20:10:47 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.20.7: + + Use gawk --traditional option instead of -W compat + + Added support for silent rules to gnome-doc-utils.make + + Fixed xml2po.pc to not Require libxml.pc + + Added --disable-documentation build option + + Dropped Mallard definitions from gnome-doc-utils + + Updated translations. +- Remove libxml2-devel Requires from xml2po-devel package: the .pc + file no longer references libxml. +- Remove obsoleted conditions for openSUSE <= 11.1. + +------------------------------------------------------------------- Old: ---- gnome-doc-utils-0.20.6.tar.bz2 New: ---- gnome-doc-utils-0.20.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-doc-utils.spec ++++++ --- /var/tmp/diff_new_pack.xNaa0N/_old 2012-03-19 09:56:59.000000000 +0100 +++ /var/tmp/diff_new_pack.xNaa0N/_new 2012-03-19 09:56:59.000000000 +0100 @@ -17,13 +17,13 @@ Name: gnome-doc-utils -Version: 0.20.6 +Version: 0.20.7 Release: 0 Summary: A Collection of Documentation Utilities for GNOME License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.8/%{name}-%{version… +Source: http://download.gnome.org/sources/gnome-doc-utils/0.20/%{name}-%{version}.t… BuildRequires: docbook_4 BuildRequires: fdupes BuildRequires: intltool @@ -37,9 +37,6 @@ Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if %suse_version <= 1110 -%define python_sitelib %{py_sitedir} -%endif %description The gnome-doc-utils package is a collection of documentation utilities @@ -82,7 +79,6 @@ Summary: Tool to extract translatable content from XML documents License: GPL-2.0+ Group: System/GUI/GNOME -Requires: libxml2-devel Requires: xml2po = %{version} %description -n xml2po-devel @@ -118,21 +114,15 @@ %doc AUTHORS COPYING ChangeLog NEWS README %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ -%dir %{_datadir}/omf/ %dir %{_datadir}/gnome/help/gnome-doc-make/ %doc %{_datadir}/gnome/help/gnome-doc-make/C/ -%dir %{_datadir}/omf/gnome-doc-make/ -%doc %{_datadir}/omf/gnome-doc-make/gnome-doc-make-C.omf %dir %{_datadir}/gnome/help/gnome-doc-xslt/ %doc %{_datadir}/gnome/help/gnome-doc-xslt/C/ -%dir %{_datadir}/omf/gnome-doc-xslt/ -%doc %{_datadir}/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf %{_bindir}/gnome-doc-tool %dir %{_datadir}/gnome-doc-utils %{_datadir}/gnome-doc-utils/icons %{_datadir}/gnome-doc-utils/watermarks %{_datadir}/xml/gnome -%{_datadir}/xml/mallard %files -n xml2po %defattr (-, root, root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-desktop for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gnome-desktop for openSUSE:Factory checked in at 2012-03-19 09:56:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-desktop (Old) and /work/SRC/openSUSE:Factory/.gnome-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-desktop", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-desktop/gnome-desktop.changes 2012-02-28 19:22:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-desktop.new/gnome-desktop.changes 2012-03-19 09:56:51.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 5 13:04:55 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + libgnome-desktop: + - Add missing linking with -lrt for clock_gettime() + - GnomeRR: Consider Embedded Display Port outputs as the + laptop's built-in display + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-desktop-3.3.90.tar.xz New: ---- gnome-desktop-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop.spec ++++++ --- /var/tmp/diff_new_pack.7MB1Xu/_old 2012-03-19 09:56:53.000000000 +0100 +++ /var/tmp/diff_new_pack.7MB1Xu/_new 2012-03-19 09:56:53.000000000 +0100 @@ -19,7 +19,7 @@ %define IS_DEFAULT_GNOME_DESKTOP 1 Name: gnome-desktop -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: The GNOME Desktop API Library License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gmime for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gmime for openSUSE:Factory checked in at 2012-03-19 09:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gmime (Old) and /work/SRC/openSUSE:Factory/.gmime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gmime", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gmime/gmime.changes 2012-03-02 13:47:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gmime.new/gmime.changes 2012-03-19 09:56:44.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Mar 10 08:55:45 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 2.6.7: + + Remove the trailing comma from the last enum item to silence + gcc -pedantic warnings. + + Be lenient from "From " lines found in message headers. + (bgo#671680). + +------------------------------------------------------------------- Old: ---- gmime-2.6.6.tar.xz New: ---- gmime-2.6.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gmime.spec ++++++ --- /var/tmp/diff_new_pack.chOnVq/_old 2012-03-19 09:56:45.000000000 +0100 +++ /var/tmp/diff_new_pack.chOnVq/_new 2012-03-19 09:56:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: gmime -Version: 2.6.6 +Version: 2.6.7 Release: 0 Url: http://spruce.sourceforge.net/gmime/ Summary: MIME Parser and Utility Library -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glib-networking for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package glib-networking for openSUSE:Factory checked in at 2012-03-19 09:56:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib-networking (Old) and /work/SRC/openSUSE:Factory/.glib-networking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glib-networking", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/glib-networking/glib-networking.changes 2012-02-16 16:14:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glib-networking.new/glib-networking.changes 2012-03-19 09:56:36.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 6 08:08:18 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.31.20: + + gnutls: Fixed a linking problem on some platforms when PKCS#11 + is enabled (bgo#670956) + + Updated translations. + +------------------------------------------------------------------- Old: ---- glib-networking-2.31.16.tar.xz New: ---- glib-networking-2.31.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib-networking.spec ++++++ --- /var/tmp/diff_new_pack.Uv9SWj/_old 2012-03-19 09:56:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Uv9SWj/_new 2012-03-19 09:56:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: glib-networking -Version: 2.31.16 +Version: 2.31.20 Release: 0 Summary: Network-related GIO modules for glib License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glibmm2 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package glibmm2 for openSUSE:Factory checked in at 2012-03-19 09:56:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibmm2 (Old) and /work/SRC/openSUSE:Factory/.glibmm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibmm2", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/glibmm2/glibmm2.changes 2012-03-06 14:05:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glibmm2.new/glibmm2.changes 2012-03-19 09:56:33.000000000 +0100 @@ -1,0 +2,25 @@ +Thu Mar 8 17:04:48 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.31.20: + + Glib: + - Fix exceptions thrown by Thread::create() and + Threads::Thread::create (bgo#640029). + - Fix the build with --disable-deprecated-api (bgo#640029). + + Gio: + - Application: Add quit(). + + Gio::DBus: + - DBus::Error, DBus::Proxy: Fix interaction with + generate_wrap_init.pl (bgo#640029). + - Documentation: Signal*: Better description of the connect*() + methods (bgo#669906). + + gmmproc and tools: + - gmmproc: Allow destructors to be documented (bgo#668918). + - docextract_to_xml.py: Generate signal documentation too + (bgo#668918). + - Add some scripts to regenerate the .defs files. + - generate_wrap_init.pl: Improve reg. of exception classes in + sub-namespaces and improve it for deprecated files and + sub-namespaces (bgo#640029). + - h2defs.py: Ignore the new GDK_AVAILABLE_IN_* macros. + +------------------------------------------------------------------- Old: ---- glibmm-2.31.18.1.tar.xz New: ---- glibmm-2.31.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibmm2.spec ++++++ --- /var/tmp/diff_new_pack.rw2Y8C/_old 2012-03-19 09:56:34.000000000 +0100 +++ /var/tmp/diff_new_pack.rw2Y8C/_new 2012-03-19 09:56:34.000000000 +0100 @@ -21,7 +21,7 @@ Name: glibmm2 %define _name glibmm -Version: 2.31.18.1 +Version: 2.31.20 Release: 0 Summary: C++ Interface for Glib License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glib2 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2012-03-19 09:55:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glib2", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2012-02-28 19:22:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glib2.new/glib2.changes 2012-03-19 09:56:00.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Mar 5 15:34:35 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.31.20: + + Update to Unicode 6.1 + + Update PCRE to 8.30 + + Deprecations are now versioned, and new API is marked with the + version it was introduced. Use these with + GLIB_VERSION_{MIN,MAX}_REQUIRED + + The performance of signal emissions has been improved for + simple cases + + Bugs fixed: bgo#529806, bgo#580873, bgo#592666, bgo#597785, + bgo#621368, bgo#622149, bgo#639873, bgo#640202, bgo#668295, + bgo#669670, bgo#670542, bgo#670557, bgo#670721, bgo#670751, + bgo#670909, bgo#670922, bgo#670969, bgo#671025, bgo#671270, + bgo#671281. + + Updated translations. + +------------------------------------------------------------------- Old: ---- glib-2.31.18.tar.xz New: ---- glib-2.31.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.Ek0jPZ/_old 2012-03-19 09:56:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Ek0jPZ/_new 2012-03-19 09:56:02.000000000 +0100 @@ -20,7 +20,7 @@ Name: glib2 %define _name glib -Version: 2.31.18 +Version: 2.31.20 Release: 0 # FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib # FIXME: find out if tapsets should really be in devel package or in main package @@ -121,14 +121,16 @@ %package devel #' -Requires: %{name} = %{version} pkg-config glibc-devel +Requires: %{name} = %{version} +Requires: glibc-devel +Requires: pkg-config # Now require the subpackages too Requires: glib2-tools = %{version} +Requires: libgio-2_0-0 = %{version} Requires: libglib-2_0-0 = %{version} Requires: libgmodule-2_0-0 = %{version} -Requires: libgio-2_0-0 = %{version} -Requires: libgthread-2_0-0 = %{version} Requires: libgobject-2_0-0 = %{version} +Requires: libgthread-2_0-0 = %{version} # Required by gdbus-codegen Requires: python-xml Provides: glib2-doc = 2.19.6 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glade for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package glade for openSUSE:Factory checked in at 2012-03-19 09:55:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glade (Old) and /work/SRC/openSUSE:Factory/.glade.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glade", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/glade/glade.changes 2012-02-28 19:22:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glade.new/glade.changes 2012-03-19 09:55:56.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 17:41:13 UTC 2012 - dimstar(a)opensuse.org + +- Add glade-sig-activation.patch: Emit a signal to notify signal + activation. Anjuta 3.3.91 makes use of this signal. + +------------------------------------------------------------------- New: ---- glade-sig-activation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glade.spec ++++++ --- /var/tmp/diff_new_pack.EWrc51/_old 2012-03-19 09:55:58.000000000 +0100 +++ /var/tmp/diff_new_pack.EWrc51/_new 2012-03-19 09:55:58.000000000 +0100 @@ -24,6 +24,8 @@ Group: Development/Tools/GUI Builders Url: http://glade.gnome.org/ Source: http://download.gnome.org/sources/glade/3.11/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM glade-sig-activation.patch bgo#669272 dimstar(a)opensuse.org -- Emit a signal to notify signal activation +Patch0: glade-sig-activation.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel @@ -75,6 +77,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure --disable-static --with-pic\ ++++++ glade-sig-activation.patch ++++++ >From 3e3f341a1cf922cc26806462fbbcba5659548a3e Mon Sep 17 00:00:00 2001 From: Marco Diego Aurélio Mesquita <marcodiegomesquita(a)gmail.com> Date: Fri, 17 Feb 2012 21:20:27 +0000 Subject: Fixed bug 669272 "Emit a signal to notify signal activation" --- diff --git a/gladeui/glade-signal-editor.c b/gladeui/glade-signal-editor.c index 31848f4..6647336 100644 --- a/gladeui/glade-signal-editor.c +++ b/gladeui/glade-signal-editor.c @@ -68,6 +68,14 @@ struct _GladeSignalEditorPrivate GtkCellRenderer* renderer_userdata; }; +enum +{ + SIGNAL_ACTIVATED, + LAST_SIGNAL +}; + +static guint glade_signal_editor_signals[LAST_SIGNAL] = { 0 }; + /* Utils */ static gboolean glade_signal_is_dummy (GladeSignal *signal) @@ -762,6 +770,43 @@ glade_signal_editor_devhelp_cell_data_func (GtkTreeViewColumn *column, } } +GladeWidget* +glade_signal_editor_get_widget (GladeSignalEditor *editor) +{ + g_return_val_if_fail (GLADE_IS_SIGNAL_EDITOR(editor), NULL); + return editor->priv->widget; +} + +static void +glade_signal_editor_signal_activate (GtkTreeView *tree_view, + GtkTreePath *path, + GtkTreeViewColumn *column, + GladeSignalEditor *editor) + +{ + GladeSignalEditor* self = GLADE_SIGNAL_EDITOR(editor); + if (self->priv->widget == NULL || column != self->priv->column_name) + return; + + GladeSignal *signal = NULL; + GtkTreeIter iter; + gtk_tree_model_get_iter (self->priv->model, + &iter, + path); + gtk_tree_model_get (self->priv->model, &iter, + GLADE_SIGNAL_COLUMN_SIGNAL, &signal, + -1); + + if(glade_signal_is_dummy (signal)) + return; + + g_signal_emit (editor, glade_signal_editor_signals[SIGNAL_ACTIVATED], + 0, signal, NULL); + + g_object_unref (signal); + return; +} + static void glade_signal_editor_init (GladeSignalEditor *self) { @@ -776,6 +821,10 @@ glade_signal_editor_init (GladeSignalEditor *self) /* Create signal tree */ priv->signal_tree = gtk_tree_view_new (); + g_signal_connect (G_OBJECT (priv->signal_tree), "row-activated", + G_CALLBACK (glade_signal_editor_signal_activate), + self); + /* Create columns */ /* Signal name */ priv->column_name = gtk_tree_view_column_new (); @@ -963,4 +1012,20 @@ glade_signal_editor_class_init (GladeSignalEditorClass *klass) object_class->dispose = glade_signal_editor_dispose; g_type_class_add_private (klass, sizeof (GladeSignalEditorPrivate)); + + /** + * GladeSignalEditor::signal-activated: + * @signal_editor: the object which received the signal + * + * Emitted when a item is activated in the GladeInspector. + */ + glade_signal_editor_signals[SIGNAL_ACTIVATED] = + g_signal_new ("signal-activated", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GLADE_TYPE_SIGNAL /* Signal data formatted string */ + ); } diff --git a/gladeui/glade-signal-editor.h b/gladeui/glade-signal-editor.h index 1e92a66..558e3d2 100644 --- a/gladeui/glade-signal-editor.h +++ b/gladeui/glade-signal-editor.h @@ -45,6 +45,7 @@ GladeSignalEditor *glade_signal_editor_new (void); void glade_signal_editor_construct_signals_list (GladeSignalEditor *editor); void glade_signal_editor_load_widget (GladeSignalEditor *editor, GladeWidget *widget); +GladeWidget *glade_signal_editor_get_widget (GladeSignalEditor *editor); void glade_signal_editor_enable_dnd (GladeSignalEditor *editor, gboolean enabled); -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gjs for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gjs for openSUSE:Factory checked in at 2012-03-19 09:55:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gjs (Old) and /work/SRC/openSUSE:Factory/.gjs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gjs", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gjs/gjs.changes 2012-01-26 14:18:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gjs.new/gjs.changes 2012-03-19 09:55:54.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Mar 5 15:44:07 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.31.20: + + Represent GTypes as a new boxed wrapper type + + Add "system" module + + Introduce meta classes + + object: + - Implement gobject inheritance + - Add support for glib properties + - Add support for signals + - Add support for interfaces + + Support callbacks that accept array arguments + + Various gjs_parse_args() improvements + + Several other code changes. +- Add gjs-fix-build.patch: fix code that cannot build. + +------------------------------------------------------------------- Old: ---- gjs-1.31.10.tar.xz New: ---- gjs-1.31.20.tar.xz gjs-fix-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjs.spec ++++++ --- /var/tmp/diff_new_pack.TAVNkm/_old 2012-03-19 09:55:55.000000000 +0100 +++ /var/tmp/diff_new_pack.TAVNkm/_new 2012-03-19 09:55:55.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gjs -Version: 1.31.10 +Version: 1.31.20 Release: 0 # FIXME: find out if tapsets should really be in devel package or in main package Summary: JavaScript bindings based on gobject-introspection and Mozilla @@ -24,6 +25,8 @@ Group: Development/Libraries/GNOME Url: http://live.gnome.org/Gjs Source: http://download.gnome.org/sources/gjs/1.31/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gjs-fix-build.patch bgo#671390 vuntz(a)opensuse.org -- Fix code that cannot build +Patch0: gjs-fix-build.patch BuildRequires: gcc-c++ BuildRequires: python BuildRequires: readline-devel @@ -74,6 +77,7 @@ %prep %setup -q +%patch0 -p1 %build %configure \ ++++++ gjs-fix-build.patch ++++++ commit 4eaaa63f4b325f2476f90de52fea44dccd3bbc76 Author: Vincent Untz <vuntz(a)gnome.org> Date: Mon Mar 5 17:40:52 2012 +0100 object: Fix build https://bugzilla.gnome.org/show_bug.cgi?id=671390 diff --git a/gi/object.c b/gi/object.c index 17c70b4..825c61f 100644 --- a/gi/object.c +++ b/gi/object.c @@ -1027,7 +1027,7 @@ object_instance_finalize(JSContext *context, TRACE(GJS_OBJECT_PROXY_FINALIZE(priv, priv->gobj, priv->info ? g_base_info_get_namespace ( (GIBaseInfo*) priv->info) : "", - priv->info ? g_base_info_get_name ( (GIBaseInfo*) priv->info) ) : g_type_name(priv->gtype)); + priv->info ? g_base_info_get_name ( (GIBaseInfo*) priv->info) : g_type_name(priv->gtype))); if (priv->gobj) { if (G_UNLIKELY (priv->gobj->ref_count <= 0)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gconf2 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gconf2 for openSUSE:Factory checked in at 2012-03-19 09:54:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gconf2 (Old) and /work/SRC/openSUSE:Factory/.gconf2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gconf2", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gconf2/gconf2.changes 2012-03-01 07:24:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gconf2.new/gconf2.changes 2012-03-19 09:55:12.000000000 +0100 @@ -1,0 +2,21 @@ +Sun Mar 11 12:45:26 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 3.2.5: + + Fix an obvious memory error from the last release. + +------------------------------------------------------------------- +Thu Mar 8 18:26:16 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 3.2.4: + + Don't migrate vendor settings to the user's dconf database + (bgo#671581). + + Store daemon data in XDG_RUNTIME_DIR (bgo#652289). + + Don't crash during sync if gconfd shutting down (bgo#670033). + + D-Bus backend: Add GCONF_DEFAULT_SOURCE_PATH support + (bgo#664031). + + Don't attempt to migrate settings with non-existent schemas. + + Update the GIO cache after 'make uninstall' (fixes 'make + distcheck'). +- Drop gconf2-fix-crash-sync-dbus.patch, fixed upstream. + +------------------------------------------------------------------- Old: ---- GConf-3.2.3.tar.bz2 gconf2-fix-crash-sync-shutdown.patch New: ---- GConf-3.2.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2.spec ++++++ --- /var/tmp/diff_new_pack.lyfbla/_old 2012-03-19 09:55:18.000000000 +0100 +++ /var/tmp/diff_new_pack.lyfbla/_new 2012-03-19 09:55:18.000000000 +0100 @@ -28,12 +28,12 @@ BuildRequires: update-desktop-files Url: http://www.gnome.org/ %define _name GConf -Version: 3.2.3 +Version: 3.2.5 Release: 0 Summary: GNOME Configuration Database System License: GPL-2.0+ ; LGPL-2.1+ Group: System/GUI/GNOME -Source: http://download.gnome.org/sources/GConf/3.2/%{_name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/GConf/3.2/%{_name}-%{version}.tar.xz # Generic tool, not upstreamed: Source1: gconftool-rebuild # RPM specific macros: @@ -47,8 +47,6 @@ Patch4: gconf2-sabayon.patch # PATCH-FIX-OPENSUSE gconf2-pk-default-path.patch vuntz(a)novell.com -- Use the right gconf path for the defaults in the pk helper Patch5: gconf2-pk-default-path.patch -# PATCH-FIX-UPSTREAM gconf2-fix-crash-sync-dbus.patch bgo#670033 fcrozat(a)suse.com -- Fix crash during sync if gconfd is shutting down -Patch6: gconf2-fix-crash-sync-shutdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang = %{version} @@ -111,7 +109,6 @@ %patch3 %patch4 %patch5 -p1 -%patch6 -p1 cp -a %{S:1} %{S:2} . %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution-data-server for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package evolution-data-server for openSUSE:Factory checked in at 2012-03-19 09:53:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-data-server (Old) and /work/SRC/openSUSE:Factory/.evolution-data-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-data-server", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-data-server/evolution-data-server.changes 2012-02-28 19:21:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution-data-server.new/evolution-data-server.changes 2012-03-19 09:53:43.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Mar 6 09:35:59 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Manual Refresh on a CalDAV calendar does not work + + Provide at least some NSPR error text, rather than cryptic + error code + + Various other code changes. + + Bugs fixed: bgo#610988, bgo#658742, bgo#663224, bgo#668639, + bgo#670887, bgo#670938. + + Updated translations. + +------------------------------------------------------------------- Old: ---- evolution-data-server-3.3.90.tar.xz New: ---- evolution-data-server-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.HKBulD/_old 2012-03-19 09:53:45.000000000 +0100 +++ /var/tmp/diff_new_pack.HKBulD/_new 2012-03-19 09:53:45.000000000 +0100 @@ -32,7 +32,7 @@ Name: evolution-data-server %define _evo_version 3.4 -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Evolution Data Server License: LGPL-2.1+ @@ -63,12 +63,12 @@ BuildRequires: mozilla-nss-devel BuildRequires: nss-shared-helper-devel BuildRequires: python-devel -BuildRequires: pkgconfig(goa-1.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(oauth) BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream BuildRequires: vala +BuildRequires: pkgconfig(goa-1.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(oauth) # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz %if %USE_EVOLDAP -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dconf for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package dconf for openSUSE:Factory checked in at 2012-03-19 09:53:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dconf (Old) and /work/SRC/openSUSE:Factory/.dconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dconf", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dconf/dconf.changes 2012-02-16 16:12:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dconf.new/dconf.changes 2012-03-19 09:53:28.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Mar 8 17:02:29 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.11.6: + + new DCONF_BLAME mode for debugging spurious dconf writes at + login + + stop hardcoding the assumption that there will be exactly one + user database followed by zero or more system databases + + allow DCONF_PROFILE to specify a profile file by absolute path + + dbus-1: fix multiple-key change notifications + + autogen.sh can now be called from out of tree + +------------------------------------------------------------------- Old: ---- dconf-0.11.5.tar.xz New: ---- dconf-0.11.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dconf.spec ++++++ --- /var/tmp/diff_new_pack.E8o78l/_old 2012-03-19 09:53:31.000000000 +0100 +++ /var/tmp/diff_new_pack.E8o78l/_new 2012-03-19 09:53:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: dconf -Version: 0.11.5 +Version: 0.11.6 Release: 0 Summary: Simple key-based configuration system License: LGPL-2.1+ @@ -30,7 +30,7 @@ BuildRequires: update-desktop-files BuildRequires: vala >= 0.15.1 BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(gio-2.0) >= 2.29.90 +BuildRequires: pkgconfig(gio-2.0) >= 2.31.18 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libxml-2.0) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit at-spi2-core for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package at-spi2-core for openSUSE:Factory checked in at 2012-03-19 09:53:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at-spi2-core (Old) and /work/SRC/openSUSE:Factory/.at-spi2-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "at-spi2-core", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/at-spi2-core/at-spi2-core.changes 2012-02-28 19:20:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.at-spi2-core.new/at-spi2-core.changes 2012-03-19 09:53:07.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Mar 6 08:26:46 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.3.91: + + Invalid states when receiving a focus event (bgo#663992). + + Fix atspi_table_get_row_column_extents_at_index. + + Expect a signed in tfor GetIndexInParent, per the spec. + + Send key events to listeners assumed to be hung, but don't + block. + + Reduce the method call timeout slightly, so that it will be + lower than the keystroke listener timeout. + + Don't cache data for transient objects. + + Enable caching on a call to atspi_accessible_set_cache_mask, + even if atspi_event_main() hasn't been called. + +------------------------------------------------------------------- Old: ---- at-spi2-core-2.3.90.tar.xz New: ---- at-spi2-core-2.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-core.spec ++++++ --- /var/tmp/diff_new_pack.6ZCtvH/_old 2012-03-19 09:53:11.000000000 +0100 +++ /var/tmp/diff_new_pack.6ZCtvH/_new 2012-03-19 09:53:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: at-spi2-core -Version: 2.3.90 +Version: 2.3.91 Release: 0 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation License: GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit atk for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package atk for openSUSE:Factory checked in at 2012-03-19 09:52:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atk (Old) and /work/SRC/openSUSE:Factory/.atk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "atk", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/atk/atk.changes 2012-01-06 11:43:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.atk.new/atk.changes 2012-03-19 09:52:48.000000000 +0100 @@ -1,0 +2,21 @@ +Sun Mar 11 18:49:43 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.3.93: + + Revert "Using abstract atk_object_get_name to check + accessible-name notification" change made on 2.3.91. Related + to bmo#733712 + +------------------------------------------------------------------- +Tue Mar 6 08:03:00 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.3.91: + + bgo#665549: add sanity-check of atk_text_get_text + + bgo#668441: atk_action_get_keybinding docs are confusing and + need updating + + Using abstract atk_object_get_name to check accessible-name + notification + + Updated translations. +- Remove xz BuildRequires now that it comes for free in the build + system. + +------------------------------------------------------------------- Old: ---- atk-2.3.3.tar.xz New: ---- atk-2.3.93.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atk.spec ++++++ --- /var/tmp/diff_new_pack.mT5ZN5/_old 2012-03-19 09:52:50.000000000 +0100 +++ /var/tmp/diff_new_pack.mT5ZN5/_new 2012-03-19 09:52:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package atk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: atk Summary: An Accessibility ToolKit License: LGPL-2.1+ Group: System/Libraries -Version: 2.3.3 +Version: 2.3.93 Release: 0 Url: http://www.gtk.org/ Source: http://download.gnome.org/sources/atk/2.3/%{name}-%{version}.tar.xz @@ -29,8 +30,6 @@ BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: translation-update-upstream -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common BuildRequires: gtk-doc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit blocxx for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package blocxx for openSUSE:Factory checked in at 2012-03-19 09:51:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blocxx (Old) and /work/SRC/openSUSE:Factory/.blocxx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blocxx", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/blocxx/blocxx.changes 2012-02-16 16:10:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.blocxx.new/blocxx.changes 2012-03-19 09:52:22.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 19:22:32 UTC 2012 - dimstar(a)opensuse.org + +- Add blocxx-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- blocxx-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blocxx.spec ++++++ --- /var/tmp/diff_new_pack.nPehqs/_old 2012-03-19 09:52:24.000000000 +0100 +++ /var/tmp/diff_new_pack.nPehqs/_new 2012-03-19 09:52:24.000000000 +0100 @@ -37,6 +37,7 @@ Patch7: %{name}-2.1.0-catch-gcc45-bug_is_pod.diff Patch8: %{name}-2.1.0-std-ptrdiff.diff Patch9: blockcxx-openssl.patch +Patch10: blocxx-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: gcc-c++ @@ -57,7 +58,8 @@ Summary: BloCXX--C++ Framework for Application Development Group: Development/Libraries/C and C++ Requires: libblocxx6 = %{version} -Requires: libstdc++-devel pcre-devel +Requires: libstdc++-devel +Requires: pcre-devel %if 0%{?suse_version} >= 1030 Requires: libopenssl-devel %else @@ -103,6 +105,7 @@ %patch7 -p0 %patch8 -p0 %patch9 +%patch10 -p1 %build @@ -154,7 +157,7 @@ # # run testsuites %if !0%{?qemu_user_space_build:1} -make check %{?_smp_mflags} +#make check %{?_smp_mflags} %endif # ++++++ blocxx-gcc47.patch ++++++ Index: blocxx-2.1.0/src/blocxx/COWReference.hpp =================================================================== --- blocxx-2.1.0.orig/src/blocxx/COWReference.hpp +++ blocxx-2.1.0/src/blocxx/COWReference.hpp @@ -41,6 +41,7 @@ #include "blocxx/COWReferenceBase.hpp" #include "blocxx/ReferenceHelpers.hpp" #include "blocxx/SafeBool.hpp" +#include "vector.hpp" namespace BLOCXX_NAMESPACE { Index: blocxx-2.1.0/src/blocxx/FileSystem.hpp =================================================================== --- blocxx-2.1.0.orig/src/blocxx/FileSystem.hpp +++ blocxx-2.1.0/src/blocxx/FileSystem.hpp @@ -45,6 +45,7 @@ #include "blocxx/Exception.hpp" #include "blocxx/CommonFwd.hpp" #include "blocxx/String.hpp" +#include <unistd.h> #ifdef BLOCXX_ENABLE_TEST_HOOKS #include "blocxx/GlobalPtr.hpp" #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-libyui for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package yast2-libyui for openSUSE:Factory checked in at 2012-03-19 09:51:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-libyui (Old) and /work/SRC/openSUSE:Factory/.yast2-libyui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-libyui", Maintainer is "TGoettlicher(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-libyui/yast2-libyui.changes 2011-12-15 16:08:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-libyui.new/yast2-libyui.changes 2012-03-19 09:52:20.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 16 10:56:18 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc#722325: untranslated rpm groups +- Version: 2.21.3 + +------------------------------------------------------------------- Old: ---- yast2-libyui-2.21.2.tar.bz2 New: ---- yast2-libyui-2.21.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-libyui.spec ++++++ --- /var/tmp/diff_new_pack.fJNvaQ/_old 2012-03-19 09:52:22.000000000 +0100 +++ /var/tmp/diff_new_pack.fJNvaQ/_new 2012-03-19 09:52:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-libyui # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild + + Name: yast2-libyui -Version: 2.21.2 +Version: 2.21.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-libyui-%{version}.tar.bz2 +Group: System/YaST +License: GPL-2.0+ Source1: yast2-libyui-rpmlintrc BuildRequires: gcc-c++ @@ -30,8 +35,7 @@ # autodocs + docbook docs BuildRequires: doxygen -BuildRequires: docbook-xsl-stylesheets -BuildRequires: libxslt +BuildRequires: docbook-xsl-stylesheets libxslt BuildRequires: sgml-skel Conflicts: yast2-core < 2.16.38 @@ -39,8 +43,6 @@ BuildRequires: boost-devel Summary: YaST2 - User Interface Engine -License: GPL-2.0+ -Group: System/YaST Provides: %{_libdir}/libyui.so.4.0.0 %description @@ -53,9 +55,9 @@ %package devel Requires: yast2-libyui = %version +Group: Development/Libraries Summary: YaST2 - User Interface Engine -Group: Development/Libraries Requires: glibc-devel Requires: libstdc++-devel ++++++ yast2-libyui-2.21.2.tar.bz2 -> yast2-libyui-2.21.3.tar.bz2 ++++++ ++++ 16286 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 aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2012-03-19 09:51:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2012-03-14 14:12:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2012-03-19 09:52:18.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 13:58:24 UTC 2012 - werner(a)suse.de + +- Try to fix several bash completion bug caused by fix for bug #725657 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/profile.d/complete.bash new/aaa_base/files/etc/profile.d/complete.bash --- old/aaa_base/files/etc/profile.d/complete.bash 2012-03-13 17:09:23.000000000 +0100 +++ new/aaa_base/files/etc/profile.d/complete.bash 2012-03-15 14:56:59.000000000 +0100 @@ -9,14 +9,10 @@ _def="-o default -o bashdefault" _dir="-o nospace -o dirnames -o plusdirs" -_file="-o nospace -o dirnames" +_file="-o nospace -o filenames" +_mkdr="-o nospace -o dirnames" _nosp="-o nospace" -# -# bnc#725657 -# -shopt -s direxpand 2> /dev/null || true - # Escape file and directory names, add slash to directories if needed. # Escaping could be done by the option 'filenames' but this fails # e.g. on variable expansion like $HO<TAB> @@ -51,8 +47,9 @@ if test -d "$x" then compopt -o plusdirs - else compopt +o nospace + else + compopt -o nospace fi fi @@ -87,7 +84,7 @@ for x in ${CDPATH//:/$'\n'}; do o=${#COMPREPLY[@]} - for s in $(compgen -d $x/$c); do + for s in $(compgen -d +o plusdirs $x/$c); do if [[ (($sym == on && -h $s) || ($dir == on && ! -h $s)) && ! -d ${s#$x/} ]] ; then s="${s}/" fi @@ -179,7 +176,7 @@ let isdir++ eval COMPREPLY=$${COMPREPLY[@]}$ fi ;; - \~*/*) COMPREPLY=($(compgen -d $s -- "${c}")) + \~*/*) COMPREPLY=($(compgen -d $s +o plusdirs -- "${c}")) if ((${#COMPREPLY[@]} > 0)) ; then compopt +o plusdirs let isdir++ @@ -191,7 +188,7 @@ fi ;; *\:*) if [[ $COMP_WORDBREAKS =~ : ]] ; then x=${c%"${c##*[^\\]:}"} - COMPREPLY=($(compgen -d $s -- "${c}")) + COMPREPLY=($(compgen -d $s +o plusdirs -- "${c}")) COMPREPLY=(${COMPREPLY[@]#"$x"}) ((${#COMPREPLY[@]} == 0)) || let isdir++ fi @@ -220,7 +217,7 @@ complete ${_def} ${_dir} -F _cd_ cd fi complete ${_def} ${_dir} -F _cd_ rmdir pushd chroot chrootx -complete ${_def} ${_file} -F _cd_ mkdir +complete ${_def} ${_mkdr} -F _cd_ mkdir # General expanding shell function _exp_ () @@ -421,7 +418,7 @@ COMPREPLY=($(compgen -W "${COMPREPLY[*]}" -- "$c")) ;; -s|e|-se) COMPREPLY=($(compgen -f -- "$c")) ;; -c|-x) COMPREPLY=($(compgen -f -- "$c")) ;; - -d) COMPREPLY=($(compgen -d ${_nosp} -- "$c")) ;; + -d) COMPREPLY=($(compgen -d ${_nosp} +o plusdirs -- "$c")) ;; *) if test -z "$c"; then COMPREPLY=($(command ps axho comm,pid |\ @@ -508,13 +505,13 @@ --) COMPREPLY=($ol) ;; -?) COMPREPLY=($c) ;; \./*) - COMPREPLY=($(compgen -f -d -X '\./.*' -- $c)) ;; + COMPREPLY=($(compgen -f -d -X '\./.*' +o plusdirs -- $c)) ;; [0-9n]|[0-9n]p) COMPREPLY=($c) ;; *) case "$o" in -l|--local-file) - COMPREPLY=($(compgen -f -d -X '.*' -- $c)) ;; + COMPREPLY=($(compgen -f -d -X '.*' +o plusdirs -- $c)) ;; [0-9n]|[0-9n]p) s=$(eval echo {${m}}$o/) if type -p sed &> /dev/null ; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Class-Load-XS for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package perl-Class-Load-XS for openSUSE:Factory checked in at 2012-03-19 09:50:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Class-Load-XS (Old) and /work/SRC/openSUSE:Factory/.perl-Class-Load-XS.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Class-Load-XS", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Class-Load-XS/perl-Class-Load-XS.changes 2012-02-16 16:21:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Class-Load-XS.new/perl-Class-Load-XS.changes 2012-03-19 09:52:14.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 6 17:44:41 CET 2012 - ro(a)suse.de + +- fix build on code11 + +------------------------------------------------------------------- New: ---- perl-old_module_build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-Load-XS.spec ++++++ --- /var/tmp/diff_new_pack.B5XVOh/_old 2012-03-19 09:52:17.000000000 +0100 +++ /var/tmp/diff_new_pack.B5XVOh/_new 2012-03-19 09:52:17.000000000 +0100 @@ -25,6 +25,7 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Class-Load-XS/ Source: http://www.cpan.org/authors/id/D/DR/DROLSKY/%{cpan_name}-%{version}.tar.gz +Patch0: perl-old_module_build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros @@ -48,6 +49,13 @@ %prep %setup -q -n %{cpan_name}-%{version} +%if 0%{?suse_version} <= 1110 +for i in `find lib t -type f` ; do + sed -i -e "s@^\s*use\s\s*Module::Build@use lib '%{perl_vendorlib}';\nuse Module::Build@" $i + sed -i -e "s@^\s*use\s\s*Test::More@use lib '%{perl_vendorlib}';\nuse Test::More@" $i +done +%patch0 +%endif %build %{__perl} Build.PL installdirs=vendor optimize="%{optflags}" ++++++ perl-old_module_build.patch ++++++ --- Build.PL +++ Build.PL @@ -2,13 +2,13 @@ use strict; use warnings; -use Module::Build 0.3601; +use Module::Build; my %module_build_args = ( "build_requires" => { "Class::Load" => 0, - "Module::Build" => "0.3601", + "Module::Build" => "0.280801", "Module::Implementation" => "0.04", "Test::Fatal" => 0, "Test::More" => "0.88", -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-File-Remove for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package perl-File-Remove for openSUSE:Factory checked in at 2012-03-19 09:50:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-File-Remove (Old) and /work/SRC/openSUSE:Factory/.perl-File-Remove.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-File-Remove", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-File-Remove/perl-File-Remove.changes 2011-11-21 12:39:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-File-Remove.new/perl-File-Remove.changes 2012-03-19 09:52:12.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 6 17:49:07 CET 2012 - ro(a)suse.de + +- fix build on sle11 + +------------------------------------------------------------------- Old: ---- perl-File-Remove-old_File-Spec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-Remove.spec ++++++ --- /var/tmp/diff_new_pack.pYFVGE/_old 2012-03-19 09:52:14.000000000 +0100 +++ /var/tmp/diff_new_pack.pYFVGE/_new 2012-03-19 09:52:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-File-Remove # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,15 @@ # - Name: perl-File-Remove Version: 1.51 -Release: 5 -License: GPL-1.0+ or Artistic-1.0 +Release: 0 %define cpan_name File-Remove Summary: Remove files and directories -Url: http://search.cpan.org/dist/File-Remove/ +License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/File-Remove/ Source: http://www.cpan.org/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz -Patch1: perl-File-Remove-old_File-Spec.patch BuildRequires: perl(Cwd) >= 3.27.01 BuildRequires: perl(File::Spec) >= 3.27.01 %if 0%{?suse_version} <= 1110 @@ -53,8 +51,10 @@ %prep %setup -q -n %{cpan_name}-%{version} %if 0%{?suse_version} <= 1110 -%patch1 -p1 -sed -i "s|__vendorperl__|%{perl_vendorlib}|g" lib/File/Remove.pm t/*.t +for i in `find lib t -type f` ; do + sed -i -e "s@^\s*use\s\s*File::Spec@use lib '%{perl_vendorlib}';\nuse File::Spec@" $i + sed -i -e "s@^\s*use\s\s*Test::More@use lib '%{perl_vendorlib}';\nuse Test::More@" $i +done %endif %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-03-19 09:50:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt4", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-02-28 19:24:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-03-19 09:52:03.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 15 09:09:10 UTC 2012 - aj(a)suse.de + +- Fix build with gcc 4.7 (patch qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch + from Fedora). + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: ---- qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.BjB8ra/_old 2012-03-19 09:52:12.000000000 +0100 +++ /var/tmp/diff_new_pack.BjB8ra/_new 2012-03-19 09:52:12.000000000 +0100 @@ -14,6 +14,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # nodebuginfo @@ -92,6 +93,7 @@ Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff +Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -146,6 +148,7 @@ %patch128 %patch131 -p1 %patch132 +%patch133 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.BjB8ra/_old 2012-03-19 09:52:12.000000000 +0100 +++ /var/tmp/diff_new_pack.BjB8ra/_new 2012-03-19 09:52:12.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: libqt4 BuildRequires: Mesa-devel BuildRequires: alsa-devel @@ -108,6 +109,7 @@ Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff +Patch133: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -162,6 +164,7 @@ %patch128 %patch131 -p1 %patch132 +%patch133 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch ++++++ diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h --- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100 +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100 @@ -57,9 +57,7 @@ namespace JSC { class JSGlobalObject : public JSVariableObject { protected: - using JSVariableObject::JSVariableObjectData; - - struct JSGlobalObjectData : public JSVariableObjectData { + struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { // We use an explicit destructor function pointer instead of a // virtual destructor because we want to avoid adding a vtable // pointer to this struct. Adding a vtable pointer would force the diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h --- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100 +++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100 @@ -32,8 +32,7 @@ namespace JSC{ class JSStaticScopeObject : public JSVariableObject { protected: - using JSVariableObject::JSVariableObjectData; - struct JSStaticScopeObjectData : public JSVariableObjectData { + struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { JSStaticScopeObjectData() : JSVariableObjectData(&symbolTable, &registerStore + 1) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqca2 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libqca2 for openSUSE:Factory checked in at 2012-03-19 09:50:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca2 (Old) and /work/SRC/openSUSE:Factory/.libqca2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqca2", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2012-03-12 08:53:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2012-03-19 09:52:00.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 09:03:35 UTC 2012 - aj(a)suse.de + +- Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- qca-2.0.3-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca2.spec ++++++ --- /var/tmp/diff_new_pack.k1J2zD/_old 2012-03-19 09:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.k1J2zD/_new 2012-03-19 09:52:03.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: libqca2 BuildRequires: cmake BuildRequires: cyrus-sasl-devel @@ -57,6 +58,7 @@ Patch0: fix-qt-check.diff Patch1: r928413.diff Patch2: disable-insecure-ssl.diff +Patch3: qca-2.0.3-gcc47.patch Requires: gpg2 >= 2.0.0 %requires_eq libqt4 @@ -194,6 +196,7 @@ cd ../../.. %setup -D -q -n qca-%{tar_version} %patch1 +%patch3 %build # I confess this is ugly.. ++++++ qca-2.0.3-gcc47.patch ++++++ --- ./src/botantools/botan/botan/secmem.h.orig 2012-01-07 20:09:35.427999593 +0100 +++ ./src/botantools/botan/botan/secmem.h 2012-01-07 20:09:52.540001422 +0100 @@ -214,11 +214,11 @@ SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); } SecureVector(const T in[], u32bit n) - { MemoryRegion<T>::init(true); set(in, n); } + { MemoryRegion<T>::init(true); this->set(in, n); } SecureVector(const MemoryRegion<T>& in) - { MemoryRegion<T>::init(true); set(in); } + { MemoryRegion<T>::init(true); this->set(in); } SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2) - { MemoryRegion<T>::init(true); set(in1); append(in2); } + { MemoryRegion<T>::init(true); this->set(in1); append(in2); } }; /************************************************* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgcj47 for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package libgcj47 for openSUSE:Factory checked in at 2012-03-19 09:39:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgcj47 (Old) and /work/SRC/openSUSE:Factory/.libgcj47.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgcj47", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package="gcc47" cicount="copy" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc47-testresults for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package gcc47-testresults for openSUSE:Factory checked in at 2012-03-19 09:38:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc47-testresults (Old) and /work/SRC/openSUSE:Factory/.gcc47-testresults.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc47-testresults", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package="gcc47" cicount="copy" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cross-armv7el-gcc-icecream-backend for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package cross-armv7el-gcc-icecream-backend for openSUSE:Factory checked in at 2012-03-19 09:37:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cross-armv7el-gcc-icecream-backend (Old) and /work/SRC/openSUSE:Factory/.cross-armv7el-gcc-icecream-backend.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cross-armv7el-gcc-icecream-backend", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package="gcc46" cicount="copy" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cross-armv5el-gcc-icecream-backend for openSUSE:Factory
by root＠hilbert.suse.de 19 Mar '12

19 Mar '12

Hello community, here is the log from the commit of package cross-armv5el-gcc-icecream-backend for openSUSE:Factory checked in at 2012-03-19 09:37:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cross-armv5el-gcc-icecream-backend (Old) and /work/SRC/openSUSE:Factory/.cross-armv5el-gcc-icecream-backend.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cross-armv5el-gcc-icecream-backend", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package="gcc46" cicount="copy" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-qt-pkg for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory checked in at 2012-03-17 13:23:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-qt-pkg (Old) and /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-qt-pkg", Maintainer is "TGoettlicher(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-qt-pkg/yast2-qt-pkg.changes 2012-03-07 13:46:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new/yast2-qt-pkg.changes 2012-03-17 13:23:45.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 16 11:02:43 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc#722325: untranslated rpm groups +- Version: 2.21.20 + +------------------------------------------------------------------- Old: ---- yast2-qt-pkg-2.21.19.tar.bz2 New: ---- yast2-qt-pkg-2.21.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.UGlfrP/_old 2012-03-17 13:23:49.000000000 +0100 +++ /var/tmp/diff_new_pack.UGlfrP/_new 2012-03-17 13:23:49.000000000 +0100 @@ -18,11 +18,11 @@ Name: yast2-qt-pkg -Version: 2.21.19 +Version: 2.21.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-pkg-2.21.19.tar.bz2 +Source0: yast2-qt-pkg-2.21.20.tar.bz2 Group: System/YaST License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel ++++++ yast2-qt-pkg-2.21.19.tar.bz2 -> yast2-qt-pkg-2.21.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.19/VERSION.cmake new/yast2-qt-pkg-2.21.20/VERSION.cmake --- old/yast2-qt-pkg-2.21.19/VERSION.cmake 2012-03-06 14:38:07.000000000 +0100 +++ new/yast2-qt-pkg-2.21.20/VERSION.cmake 2012-03-16 11:02:56.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "19") +SET(VERSION_PATCH "20") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.19/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.21.20/package/yast2-qt-pkg.changes --- old/yast2-qt-pkg-2.21.19/package/yast2-qt-pkg.changes 2012-03-06 14:38:07.000000000 +0100 +++ new/yast2-qt-pkg-2.21.20/package/yast2-qt-pkg.changes 2012-03-16 11:02:56.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 16 11:02:43 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc#722325: untranslated rpm groups +- Version: 2.21.20 + +------------------------------------------------------------------- Tue Mar 6 14:36:45 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc#691572: Formatting Package Descriptions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.19/src/YQPkgRpmGroupTagsFilterView.cc new/yast2-qt-pkg-2.21.20/src/YQPkgRpmGroupTagsFilterView.cc --- old/yast2-qt-pkg-2.21.19/src/YQPkgRpmGroupTagsFilterView.cc 2012-03-06 14:38:07.000000000 +0100 +++ new/yast2-qt-pkg-2.21.20/src/YQPkgRpmGroupTagsFilterView.cc 2012-03-16 11:02:56.000000000 +0100 @@ -80,8 +80,6 @@ { _rpmGroupsTree = new YRpmGroupsTree(); Q_CHECK_PTR( _rpmGroupsTree ); - _rpmGroupsTree->setTextdomain("qt-pkg"); - fillRpmGroupsTree(); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-nfs-server for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package yast2-nfs-server for openSUSE:Factory checked in at 2012-03-17 13:23:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-server (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-nfs-server", Maintainer is "mvidner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-server/yast2-nfs-server.changes 2011-11-07 14:35:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-server.new/yast2-nfs-server.changes 2012-03-17 13:23:34.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 16 08:49:43 UTC 2012 - mfilka(a)suse.com + +- Fixed testsuites +- 2.21.3 + +------------------------------------------------------------------- Old: ---- yast2-nfs-server-2.21.2.tar.bz2 New: ---- yast2-nfs-server-2.21.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-server.spec ++++++ --- /var/tmp/diff_new_pack.sbGfNc/_old 2012-03-17 13:23:36.000000000 +0100 +++ /var/tmp/diff_new_pack.sbGfNc/_new 2012-03-17 13:23:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-nfs-server # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: yast2-nfs-server -Version: 2.21.2 +Version: 2.21.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,7 +62,6 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works ++++++ yast2-nfs-server-2.21.2.tar.bz2 -> yast2-nfs-server-2.21.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-2.21.2/VERSION new/yast2-nfs-server-2.21.3/VERSION --- old/yast2-nfs-server-2.21.2/VERSION 2011-11-03 13:48:19.000000000 +0100 +++ new/yast2-nfs-server-2.21.3/VERSION 2012-03-16 09:54:33.000000000 +0100 @@ -1 +1 @@ -2.21.2 +2.21.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-2.21.2/configure new/yast2-nfs-server-2.21.3/configure --- old/yast2-nfs-server-2.21.2/configure 2011-11-03 13:45:29.000000000 +0100 +++ new/yast2-nfs-server-2.21.3/configure 2012-03-16 09:12:58.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-nfs-server 2.21.1. +# Generated by GNU Autoconf 2.68 for yast2-nfs-server 2.21.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-nfs-server' PACKAGE_TARNAME='yast2-nfs-server' -PACKAGE_VERSION='2.21.1' -PACKAGE_STRING='yast2-nfs-server 2.21.1' +PACKAGE_VERSION='2.21.2' +PACKAGE_STRING='yast2-nfs-server 2.21.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1231,7 +1231,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-nfs-server 2.21.1 to adapt to many kinds of systems. +\`configure' configures yast2-nfs-server 2.21.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-nfs-server 2.21.1:";; + short | recursive ) echo "Configuration of yast2-nfs-server 2.21.2:";; esac cat <<\_ACEOF @@ -1383,7 +1383,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-nfs-server configure 2.21.1 +yast2-nfs-server configure 2.21.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1400,7 +1400,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-nfs-server $as_me 2.21.1, which was +It was created by yast2-nfs-server $as_me 2.21.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2330,7 +2330,7 @@ # Define the identity of the package. PACKAGE='yast2-nfs-server' - VERSION='2.21.1' + VERSION='2.21.2' cat >>confdefs.h <<_ACEOF @@ -2452,7 +2452,7 @@ -VERSION="2.21.1" +VERSION="2.21.2" RPMNAME="yast2-nfs-server" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -3471,7 +3471,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-nfs-server $as_me 2.21.1, which was +This file was extended by yast2-nfs-server $as_me 2.21.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3524,7 +3524,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-nfs-server config.status 2.21.1 +yast2-nfs-server config.status 2.21.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-2.21.2/configure.in new/yast2-nfs-server-2.21.3/configure.in --- old/yast2-nfs-server-2.21.2/configure.in 2011-11-03 13:45:26.000000000 +0100 +++ new/yast2-nfs-server-2.21.3/configure.in 2012-03-16 09:12:54.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-nfs-server dnl -dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-nfs-server, 2.21.1, http://bugs.opensuse.org/, yast2-nfs-server) +AC_INIT(yast2-nfs-server, 2.21.2, http://bugs.opensuse.org/, yast2-nfs-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.1" +VERSION="2.21.2" RPMNAME="yast2-nfs-server" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-2.21.2/testsuite/tests/readwrite-unfsd.ycp new/yast2-nfs-server-2.21.3/testsuite/tests/readwrite-unfsd.ycp --- old/yast2-nfs-server-2.21.2/testsuite/tests/readwrite-unfsd.ycp 2011-11-01 13:19:51.000000000 +0100 +++ new/yast2-nfs-server-2.21.3/testsuite/tests/readwrite-unfsd.ycp 2012-03-16 09:53:44.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: readwrite-unfsd.ycp 51773 2008-10-02 09:10:04Z mvidner $ + * $Id: readwrite-unfsd.ycp 67640 2012-03-16 08:53:05Z mfilka $ */ { // testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp @@ -80,6 +80,7 @@ ], "target": $[ "dir": nil, // pretend none exist + "stat": $[ "dummy": true], ] ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-2.21.2/testsuite/tests/readwrite.ycp new/yast2-nfs-server-2.21.3/testsuite/tests/readwrite.ycp --- old/yast2-nfs-server-2.21.2/testsuite/tests/readwrite.ycp 2011-11-01 13:19:51.000000000 +0100 +++ new/yast2-nfs-server-2.21.3/testsuite/tests/readwrite.ycp 2012-03-16 09:53:44.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: readwrite.ycp 51773 2008-10-02 09:10:04Z mvidner $ + * $Id: readwrite.ycp 67640 2012-03-16 08:53:05Z mfilka $ */ { // testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp @@ -80,6 +80,7 @@ ], "target": $[ "dir": nil, // pretend none exist + "stat": $[ "dummy": true], ] ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-2.21.2/testsuite/tests/readwrite2.ycp new/yast2-nfs-server-2.21.3/testsuite/tests/readwrite2.ycp --- old/yast2-nfs-server-2.21.2/testsuite/tests/readwrite2.ycp 2011-11-01 13:19:51.000000000 +0100 +++ new/yast2-nfs-server-2.21.3/testsuite/tests/readwrite2.ycp 2012-03-16 09:53:44.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: readwrite2.ycp 51773 2008-10-02 09:10:04Z mvidner $ + * $Id: readwrite2.ycp 67640 2012-03-16 08:53:05Z mfilka $ */ { // testedfiles: NfsServer.ycp Service.ycp Report.ycp Testsuite.ycp @@ -79,6 +79,7 @@ ], "target": $[ "dir": nil, // pretend none exist + "stat": $[ "dummy": true], ] ]; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit trousers for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package trousers for openSUSE:Factory checked in at 2012-03-17 13:23:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trousers (Old) and /work/SRC/openSUSE:Factory/.trousers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "trousers", Maintainer is "meissner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/trousers/trousers.changes 2011-11-22 17:49:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.trousers.new/trousers.changes 2012-03-17 13:23:31.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 13 08:30:18 UTC 2012 - cfarrell(a)suse.com + +- license update: CPL-1.0 + SPDX format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trousers.spec ++++++ --- /var/tmp/diff_new_pack.J38CuZ/_old 2012-03-17 13:23:32.000000000 +0100 +++ /var/tmp/diff_new_pack.J38CuZ/_new 2012-03-17 13:23:32.000000000 +0100 @@ -20,7 +20,7 @@ Name: trousers Url: http://trousers.sourceforge.net/ -License: Other uncritical OpenSource License +License: CPL-1.0 Group: Productivity/Security Version: 0.3.7 Release: 1 @@ -42,7 +42,7 @@ system. It is a character device file major 10 minor 224, 0600 tss:tss. %package devel -License: Other uncritical OpenSource License +License: CPL-1.0 Group: Development/Libraries/C and C++ AutoReqProv: on Summary: TSS (TCG Software Stack) access daemon for a TPM chip @@ -59,7 +59,7 @@ system. It is a character device file major 10 minor 224, 0600 tss:tss. %package -n libtspi1 -License: CPL (Common Public License) v1 +License: CPL-1.0 Group: Productivity/Security AutoReqProv: on Summary: TSS (TCG Software Stack) access daemon for a TPM chip -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2012-03-17 13:23:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2012-01-04 07:31:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2012-03-17 13:23:20.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Mar 15 10:56:40 CET 2012 - aschnell(a)suse.de + +- added missing includes for gcc 4.7 + +------------------------------------------------------------------- +Tue Mar 06 11:37:34 CET 2012 - aschnell(a)suse.de + +- allow to disable background comparison (bnc#726122) +- 0.0.10 + +------------------------------------------------------------------- +Fri Mar 02 16:25:26 CET 2012 - aschnell(a)suse.de + +- added option --command to snapper create +- 0.0.9 + +------------------------------------------------------------------- +Fri Feb 24 19:21:15 CET 2012 - aschnell(a)suse.de + +- allow to compile without blocxx + +------------------------------------------------------------------- Old: ---- snapper-0.0.8.tar.bz2 New: ---- no-readonly.diff snapper-0.0.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.fovMms/_old 2012-03-17 13:23:22.000000000 +0100 +++ /var/tmp/diff_new_pack.fovMms/_new 2012-03-17 13:23:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package snapper # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,27 @@ Name: snapper -Version: 0.0.8 +Version: 0.0.10 Release: 0 License: GPL-2.0 Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 +Patch1: no-readonly.diff Prefix: /usr -BuildRequires: boost-devel doxygen gcc-c++ libblocxx-devel libtool libxml2-devel +BuildRequires: boost-devel doxygen gcc-c++ libtool libxml2-devel BuildRequires: python-devel swig +%if 0%{?suse_version} +BuildRequires: libblocxx-devel +%if 0%{?suse_version} >= 1210 BuildRequires: libzypp(plugin:commit) +%endif +%endif Requires: libsnapper1 = %version +%if 0%{?suse_version} Recommends: cron logrotate snapper-zypp-plugin Supplements: btrfsprogs +%endif Summary: Tool for filesystem snapshot management Url: http://en.opensuse.org/Portal:Snapper @@ -43,6 +51,9 @@ %prep %setup -n snapper-%{version} +%if (0%{?suse_version} && 0%{?suse_version} < 1210) || (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel_version} && 0%{?rhel_version} < 700) || (0%{?centos_version} && 0%{?centos_version} < 700) || (0%{?mdkversion} && 0%{?mdkversion} < 201200) +%patch1 +%endif %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -60,6 +71,12 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" +%if 0%{?suse_version} +install -D data/sysconfig.snapper $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.snapper +%else +install -D data/sysconfig.snapper $RPM_BUILD_ROOT/etc/sysconfig/snapper +%endif + %{find_lang} snapper rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libsnapper.a @@ -80,7 +97,9 @@ Summary: Library for filesystem snapshot management Group: System/Libraries Requires: diffutils util-linux +%if 0%{?suse_version} PreReq: %fillup_prereq +%endif %description -n libsnapper1 This package contains libsnapper, a library for filesystem snapshot management. @@ -101,21 +120,30 @@ %doc %dir %{prefix}/share/doc/packages/snapper %doc %{prefix}/share/doc/packages/snapper/AUTHORS %doc %{prefix}/share/doc/packages/snapper/COPYING +%if 0%{?suse_version} /var/adm/fillup-templates/sysconfig.snapper +%else +%config(noreplace) %{_sysconfdir}/sysconfig/snapper +%endif %dir %{prefix}/lib/snapper %dir %{prefix}/lib/snapper/bin %{prefix}/lib/snapper/bin/compare-dirs %post -n libsnapper1 /sbin/ldconfig +%if 0%{?suse_version} %{fillup_only -n snapper} +%endif %postun -n libsnapper1 /sbin/ldconfig %package -n libsnapper-devel Requires: libsnapper1 = %version -Requires: gcc-c++ libstdc++-devel boost-devel blocxx-devel libxml2-devel +Requires: gcc-c++ libstdc++-devel boost-devel libxml2-devel +%if 0%{?suse_version} +Requires: blocxx-devel +%endif Summary: Header files and documentation for libsnapper Group: Development/Languages/C and C++ @@ -164,6 +192,11 @@ %files -n snapper-zypp-plugin %defattr(-,root,root) +%if 0%{?suse_version} < 1210 +%dir /usr/lib/zypp +%dir /usr/lib/zypp/plugins +%dir /usr/lib/zypp/plugins/commit +%endif /usr/lib/zypp/plugins/commit/snapper.py %changelog ++++++ no-readonly.diff ++++++ --- snapper/Filesystem.cc +++ snapper/Filesystem.cc @@ -96,7 +96,7 @@ void Btrfs::createSnapshot(unsigned int num) const { - SystemCmd cmd(BTRFSBIN " subvolume snapshot -r " + quote(subvolume) + " " + + SystemCmd cmd(BTRFSBIN " subvolume snapshot " + quote(subvolume) + " " + quote(snapshotDir(num))); if (cmd.retcode() != 0) throw CreateSnapshotFailedException(); ++++++ snapper-0.0.8.tar.bz2 -> snapper-0.0.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/Makefile.in new/snapper-0.0.10/Makefile.in --- old/snapper-0.0.8/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -172,6 +172,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/VERSION new/snapper-0.0.10/VERSION --- old/snapper-0.0.8/VERSION 2011-11-24 13:55:35.000000000 +0100 +++ new/snapper-0.0.10/VERSION 2012-03-06 17:23:43.000000000 +0100 @@ -1 +1 @@ -0.0.8 +0.0.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/bindings/Makefile.in new/snapper-0.0.10/bindings/Makefile.in --- old/snapper-0.0.8/bindings/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/bindings/Makefile.in 2012-03-15 11:00:30.000000000 +0100 @@ -132,6 +132,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/bindings/python/Makefile.in new/snapper-0.0.10/bindings/python/Makefile.in --- old/snapper-0.0.8/bindings/python/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/bindings/python/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -150,6 +150,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = $(top_builddir)/snapper/libsnapper.la LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/config.h.in new/snapper-0.0.10/config.h.in --- old/snapper-0.0.8/config.h.in 2011-12-23 15:36:23.000000000 +0100 +++ new/snapper-0.0.10/config.h.in 2012-03-15 11:00:30.000000000 +0100 @@ -6,6 +6,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define if you have libblocxx */ +#undef HAVE_LIBBLOCXX + /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/configure new/snapper-0.0.10/configure --- old/snapper-0.0.8/configure 2011-12-23 15:36:23.000000000 +0100 +++ new/snapper-0.0.10/configure 2012-03-15 11:00:29.000000000 +0100 @@ -758,6 +758,7 @@ LIBVERSION_MAJOR AM_BACKSLASH AM_DEFAULT_VERBOSITY +LIBBLOCXX pkgpyexecdir pyexecdir pkgpythondir @@ -4963,13 +4964,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4966: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4967: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4969: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4970: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4972: output\"" >&5) + (eval echo "\"\$as_me:4973: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6175,7 +6176,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6178 "configure"' > conftest.$ac_ext + echo '#line 6179 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8197,11 +8198,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8200: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8201: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8204: \$? = $ac_status" >&5 + echo "$as_me:8205: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8536,11 +8537,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8539: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8540: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8543: \$? = $ac_status" >&5 + echo "$as_me:8544: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8641,11 +8642,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8644: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8645: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8648: \$? = $ac_status" >&5 + echo "$as_me:8649: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8696,11 +8697,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8699: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8700: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8703: \$? = $ac_status" >&5 + echo "$as_me:8704: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11064,7 +11065,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11067 "configure" +#line 11068 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11160,7 +11161,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11163 "configure" +#line 11164 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13116,11 +13117,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13119: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13120: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13123: \$? = $ac_status" >&5 + echo "$as_me:13124: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13215,11 +13216,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13218: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13219: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13222: \$? = $ac_status" >&5 + echo "$as_me:13223: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13267,11 +13268,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13270: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13271: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13274: \$? = $ac_status" >&5 + echo "$as_me:13275: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14397,6 +14398,45 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lblocxx" >&5 +$as_echo_n "checking for main in -lblocxx... " >&6; } +if ${ac_cv_lib_blocxx_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lblocxx $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_blocxx_main=yes +else + ac_cv_lib_blocxx_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blocxx_main" >&5 +$as_echo "$ac_cv_lib_blocxx_main" >&6; } +if test "x$ac_cv_lib_blocxx_main" = xyes; then : + LIBBLOCXX="-lblocxx" + + +$as_echo "#define HAVE_LIBBLOCXX 1" >>confdefs.h + +fi + + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/configure.in new/snapper-0.0.10/configure.in --- old/snapper-0.0.8/configure.in 2011-11-24 13:54:31.000000000 +0100 +++ new/snapper-0.0.10/configure.in 2012-02-27 15:34:47.000000000 +0100 @@ -25,6 +25,12 @@ AC_PREFIX_DEFAULT(/usr) +dnl Check for blocxx +AC_CHECK_LIB(blocxx, main, + AC_SUBST([LIBBLOCXX], ["-lblocxx"]) + AC_DEFINE([HAVE_LIBBLOCXX], [1], + [Define if you have libblocxx])) + dnl Automake 1.11 enables silent compilation dnl Disable it by "configure --disable-silent-rules" or "make V=1" m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/data/Makefile.am new/snapper-0.0.10/data/Makefile.am --- old/snapper-0.0.8/data/Makefile.am 2011-11-11 14:34:04.000000000 +0100 +++ new/snapper-0.0.10/data/Makefile.am 2012-02-27 17:23:04.000000000 +0100 @@ -2,9 +2,7 @@ # Makefile.am for snapper/data # -fillup_DATA = sysconfig.snapper - -EXTRA_DIST = $(fillup_DATA) base.txt x11.txt snapper.logrotate default-config +EXTRA_DIST = sysconfig.snapper base.txt x11.txt snapper.logrotate default-config install-data-local: install -D -m 644 snapper.logrotate $(DESTDIR)/etc/logrotate.d/snapper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/data/Makefile.in new/snapper-0.0.10/data/Makefile.in --- old/snapper-0.0.8/data/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/data/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -18,7 +18,6 @@ # # Makefile.am for snapper/data # - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -56,29 +55,6 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(fillupdir)" -DATA = $(fillup_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -116,6 +92,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -209,8 +186,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -fillup_DATA = sysconfig.snapper -EXTRA_DIST = $(fillup_DATA) base.txt x11.txt snapper.logrotate default-config +EXTRA_DIST = sysconfig.snapper base.txt x11.txt snapper.logrotate default-config all: all-am .SUFFIXES: @@ -250,26 +226,6 @@ clean-libtool: -rm -rf .libs _libs -install-fillupDATA: $(fillup_DATA) - @$(NORMAL_INSTALL) - test -z "$(fillupdir)" || $(MKDIR_P) "$(DESTDIR)$(fillupdir)" - @list='$(fillup_DATA)'; test -n "$(fillupdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(fillupdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(fillupdir)" || exit $$?; \ - done - -uninstall-fillupDATA: - @$(NORMAL_UNINSTALL) - @list='$(fillup_DATA)'; test -n "$(fillupdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(fillupdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(fillupdir)" && rm -f $$files tags: TAGS TAGS: @@ -309,11 +265,8 @@ done check-am: all-am check: check-am -all-am: Makefile $(DATA) +all-am: Makefile installdirs: - for dir in "$(DESTDIR)$(fillupdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -359,7 +312,7 @@ info-am: -install-data-am: install-data-local install-fillupDATA +install-data-am: install-data-local install-dvi: install-dvi-am @@ -403,7 +356,7 @@ ps-am: -uninstall-am: uninstall-fillupDATA +uninstall-am: .MAKE: install-am install-strip @@ -411,13 +364,13 @@ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-fillupDATA \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-fillupDATA + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am install-data-local: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/data/default-config new/snapper-0.0.10/data/default-config --- old/snapper-0.0.8/data/default-config 2011-11-11 14:34:04.000000000 +0100 +++ new/snapper-0.0.10/data/default-config 2012-03-06 17:23:43.000000000 +0100 @@ -5,6 +5,10 @@ # filesystem type FSTYPE="btrfs" +# start comparing pre- and post-snapshot in background after creating +# post-snapshot +BACKGROUND_COMPARISON="yes" + # run daily number cleanup NUMBER_CLEANUP="yes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/doc/Makefile.in new/snapper-0.0.10/doc/Makefile.in --- old/snapper-0.0.8/doc/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/doc/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -118,6 +118,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/doc/snapper.8 new/snapper-0.0.10/doc/snapper.8 --- old/snapper-0.0.8/doc/snapper.8 2011-12-23 15:36:29.000000000 +0100 +++ new/snapper-0.0.10/doc/snapper.8 2012-03-15 11:00:39.000000000 +0100 @@ -1,4 +1,4 @@ -.TH "snapper" "8" 0.0.8 "snapper" "System Tools" +.TH "snapper" "8" 0.0.10 "snapper" "System Tools" .SH "NAME" .LP snapper - Command\-line program for filesystem snapshot management @@ -157,6 +157,9 @@ Set userdata for the snapshot. The key-value pairs must be seperated by comma and the key and value must be seperated by an equal sign, e.g. requestid=42,user=arthur. +.TP +\fI\-\-command\fR <command> +Create a pre and post snapshot and run command in between. .TP .B modify [options] <number> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/doc/snapper.8.in new/snapper-0.0.10/doc/snapper.8.in --- old/snapper-0.0.8/doc/snapper.8.in 2011-12-23 15:19:14.000000000 +0100 +++ new/snapper-0.0.10/doc/snapper.8.in 2012-03-06 17:23:43.000000000 +0100 @@ -157,6 +157,9 @@ Set userdata for the snapshot. The key-value pairs must be seperated by comma and the key and value must be seperated by an equal sign, e.g. requestid=42,user=arthur. +.TP +\fI\-\-command\fR <command> +Create a pre and post snapshot and run command in between. .TP .B modify [options] <number> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/examples/Makefile.in new/snapper-0.0.10/examples/Makefile.in --- old/snapper-0.0.8/examples/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/examples/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -149,6 +149,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/po/Makefile.in new/snapper-0.0.10/po/Makefile.in --- old/snapper-0.0.8/po/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/po/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -92,6 +92,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/scripts/Makefile.in new/snapper-0.0.10/scripts/Makefile.in --- old/snapper-0.0.8/scripts/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/scripts/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -92,6 +92,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/snapper/AsciiFile.cc new/snapper-0.0.10/snapper/AsciiFile.cc --- old/snapper-0.0.8/snapper/AsciiFile.cc 2011-11-11 14:34:04.000000000 +0100 +++ new/snapper-0.0.10/snapper/AsciiFile.cc 2012-03-06 17:23:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2011] Novell, Inc. + * Copyright (c) [2004-2012] Novell, Inc. * * All Rights Reserved. * @@ -150,6 +150,25 @@ void + SysconfigFile::setValue(const string& key, bool value) + { + setValue(key, value ? "yes" : "no"); + } + + + bool + SysconfigFile::getValue(const string& key, bool& value) const + { + string tmp; + if (!getValue(key, tmp)) + return false; + + value = tmp == "yes"; + return true; + } + + + void SysconfigFile::setValue(const string& key, const string& value) { string line = key + "=\"" + value + "\""; @@ -190,8 +209,6 @@ bool SysconfigFile::getValue(const string& key, vector<string>& values) const { - values.clear(); - string tmp; if (!getValue(key, tmp)) return false; @@ -200,6 +217,8 @@ if (!tmp.empty()) boost::split(values, tmp, boost::is_any_of(" \t"), boost::token_compress_on); + else + values.clear(); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/snapper/AsciiFile.h new/snapper-0.0.10/snapper/AsciiFile.h --- old/snapper-0.0.8/snapper/AsciiFile.h 2011-11-11 14:34:04.000000000 +0100 +++ new/snapper-0.0.10/snapper/AsciiFile.h 2012-03-06 17:23:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2011] Novell, Inc. + * Copyright (c) [2004-2012] Novell, Inc. * * All Rights Reserved. * @@ -91,6 +91,9 @@ SysconfigFile(const string& name) : AsciiFile(name), modified(false) {} ~SysconfigFile() { if (modified) save(); } + void setValue(const string& key, bool value); + bool getValue(const string& key, bool& value) const; + void setValue(const string& key, const string& value); bool getValue(const string& key, string& value) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/snapper/Filesystem.cc new/snapper-0.0.10/snapper/Filesystem.cc --- old/snapper-0.0.8/snapper/Filesystem.cc 2011-12-23 15:17:30.000000000 +0100 +++ new/snapper-0.0.10/snapper/Filesystem.cc 2012-03-15 11:00:15.000000000 +0100 @@ -24,6 +24,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <errno.h> +#include <unistd.h> #include <mntent.h> #include "snapper/Log.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/snapper/Log.cc new/snapper-0.0.10/snapper/Log.cc --- old/snapper-0.0.8/snapper/Log.cc 2011-11-11 14:34:04.000000000 +0100 +++ new/snapper-0.0.10/snapper/Log.cc 2012-03-15 11:00:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2011] Novell, Inc. + * Copyright (c) [2004-2012] Novell, Inc. * * All Rights Reserved. * @@ -21,28 +21,45 @@ #include <pwd.h> -#include <string> +#include <unistd.h> +#include <sys/types.h> #include <libxml/tree.h> +#include <string> + +#include "config.h" +#ifdef HAVE_LIBBLOCXX #include <blocxx/AppenderLogger.hpp> #include <blocxx/FileAppender.hpp> #include <blocxx/Logger.hpp> #include <blocxx/LogMessage.hpp> +#endif #include "snapper/Log.h" +#include "snapper/AppUtil.h" namespace snapper { using namespace std; - using namespace blocxx; +#ifdef HAVE_LIBBLOCXX + + using namespace blocxx; static const String component = "libsnapper"; +#else + + string filename; + +#endif + void createLogger(const string& name, const string& logpath, const string& logfile) { +#ifdef HAVE_LIBBLOCXX + if (logpath != "NULL" && logfile != "NULL") { String nm = name.c_str(); @@ -84,12 +101,20 @@ LogAppender::setDefaultLogAppender(logApp); } + +#else + + filename = logpath + "/" + logfile; + +#endif } bool testLogLevel(LogLevel level) { +#ifdef HAVE_LIBBLOCXX + ELogLevel curLevel = LogAppender::getCurrentLogAppender()->getLogLevel(); switch (level) @@ -105,6 +130,12 @@ default: return curLevel >= E_FATAL_ERROR_LEVEL; } + +#else + + return level != DEBUG; + +#endif } @@ -130,6 +161,8 @@ logStreamClose(LogLevel level, const char* file, unsigned line, const char* func, ostringstream* stream) { +#ifdef HAVE_LIBBLOCXX + ELogLevel curLevel = LogAppender::getCurrentLogAppender()->getLogLevel(); String category; @@ -179,6 +212,36 @@ } } +#else + + static const char* ln[4] = { "DEB", "MIL", "WAR", "ERR" }; + + string prefix = sformat("%s %s libsnapper(%d) %s(%s):%d", datetime(time(0), false, true).c_str(), + ln[level], getpid(), file, func, line); + + FILE* f = fopen(filename.c_str(), "a"); + + string tmp = stream->str(); + + string::size_type pos1 = 0; + + while (true) + { + string::size_type pos2 = tmp.find('\n', pos1); + + if (pos2 != string::npos || pos1 != tmp.length()) + fprintf(f, "%s - %s\n", prefix.c_str(), tmp.substr(pos1, pos2 - pos1).c_str()); + + if (pos2 == string::npos) + break; + + pos1 = pos2 + 1; + } + + fclose(f); + +#endif + delete stream; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/snapper/Makefile.am new/snapper-0.0.10/snapper/Makefile.am --- old/snapper-0.0.8/snapper/Makefile.am 2011-11-11 14:34:04.000000000 +0100 +++ new/snapper-0.0.10/snapper/Makefile.am 2012-02-27 15:34:47.000000000 +0100 @@ -2,7 +2,7 @@ # Makefile.am for snapper/snapper # -AM_CXXFLAGS = -D_FILE_OFFSET_BITS=64 +AM_CXXFLAGS = -D_FILE_OFFSET_BITS=64 -I/usr/include/libxml2 lib_LTLIBRARIES = libsnapper.la @@ -27,7 +27,7 @@ SnapperDefines.h libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@ -libsnapper_la_LIBADD = -lblocxx -lxml2 +libsnapper_la_LIBADD = @LIBBLOCXX@ -lxml2 -lz -lm pkgincludedir = $(includedir)/snapper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/snapper/Makefile.in new/snapper-0.0.10/snapper/Makefile.in --- old/snapper-0.0.8/snapper/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/snapper/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -170,6 +170,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -263,7 +264,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CXXFLAGS = -D_FILE_OFFSET_BITS=64 +AM_CXXFLAGS = -D_FILE_OFFSET_BITS=64 -I/usr/include/libxml2 lib_LTLIBRARIES = libsnapper.la libsnapper_la_SOURCES = \ Factory.cc Factory.h \ @@ -286,7 +287,7 @@ SnapperDefines.h libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@ -libsnapper_la_LIBADD = -lblocxx -lxml2 +libsnapper_la_LIBADD = @LIBBLOCXX@ -lxml2 -lz -lm pkginclude_HEADERS = \ Factory.h \ Snapper.h \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/snapper/Snapper.cc new/snapper-0.0.10/snapper/Snapper.cc --- old/snapper-0.0.8/snapper/Snapper.cc 2011-12-23 15:12:04.000000000 +0100 +++ new/snapper-0.0.10/snapper/Snapper.cc 2012-03-06 17:23:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Novell, Inc. + * Copyright (c) [2011-2012] Novell, Inc. * * All Rights Reserved. * @@ -28,6 +28,7 @@ #include <boost/algorithm/string.hpp> #include "config.h" + #include "snapper/Snapper.h" #include "snapper/Comparison.h" #include "snapper/AppUtil.h" @@ -177,6 +178,11 @@ if (snapshot2 == snapshots.end() || snapshot2->isCurrent()) throw IllegalSnapshotException(); + bool background_comparison = true; + config->getValue("BACKGROUND_COMPARISON", background_comparison); + if (!background_comparison) + return; + y2mil("num1:" << snapshot1->getNum() << " num2:" << snapshot2->getNum()); if (!snapshot1->isCurrent()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/snapper.spec.in new/snapper-0.0.10/snapper.spec.in --- old/snapper-0.0.8/snapper.spec.in 2011-12-21 17:20:53.000000000 +0100 +++ new/snapper-0.0.10/snapper.spec.in 2012-02-29 18:38:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package snapper # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,13 +23,21 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 +Patch1: no-readonly.diff Prefix: /usr -BuildRequires: boost-devel doxygen gcc-c++ libblocxx-devel libtool libxml2-devel +BuildRequires: boost-devel doxygen gcc-c++ libtool libxml2-devel BuildRequires: python-devel swig +%if 0%{?suse_version} +BuildRequires: libblocxx-devel +%if 0%{?suse_version} >= 1210 BuildRequires: libzypp(plugin:commit) +%endif +%endif Requires: libsnapper@LIBVERSION_MAJOR@ = %version +%if 0%{?suse_version} Recommends: cron logrotate snapper-zypp-plugin Supplements: btrfsprogs +%endif Summary: Tool for filesystem snapshot management Url: http://en.opensuse.org/Portal:Snapper @@ -42,6 +50,9 @@ %prep %setup -n snapper-%{version} +%if (0%{?suse_version} && 0%{?suse_version} < 1210) || (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel_version} && 0%{?rhel_version} < 700) || (0%{?centos_version} && 0%{?centos_version} < 700) || (0%{?mdkversion} && 0%{?mdkversion} < 201200) +%patch1 +%endif %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -59,6 +70,12 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" +%if 0%{?suse_version} +install -D data/sysconfig.snapper $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.snapper +%else +install -D data/sysconfig.snapper $RPM_BUILD_ROOT/etc/sysconfig/snapper +%endif + %{find_lang} snapper rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libsnapper.a @@ -79,7 +96,9 @@ Summary: Library for filesystem snapshot management Group: System/Libraries Requires: diffutils util-linux +%if 0%{?suse_version} PreReq: %fillup_prereq +%endif %description -n libsnapper@LIBVERSION_MAJOR@ This package contains libsnapper, a library for filesystem snapshot management. @@ -100,21 +119,30 @@ %doc %dir %{prefix}/share/doc/packages/snapper %doc %{prefix}/share/doc/packages/snapper/AUTHORS %doc %{prefix}/share/doc/packages/snapper/COPYING +%if 0%{?suse_version} /var/adm/fillup-templates/sysconfig.snapper +%else +%config(noreplace) %{_sysconfdir}/sysconfig/snapper +%endif %dir %{prefix}/lib/snapper %dir %{prefix}/lib/snapper/bin %{prefix}/lib/snapper/bin/compare-dirs %post -n libsnapper@LIBVERSION_MAJOR@ /sbin/ldconfig +%if 0%{?suse_version} %{fillup_only -n snapper} +%endif %postun -n libsnapper@LIBVERSION_MAJOR@ /sbin/ldconfig %package -n libsnapper-devel Requires: libsnapper@LIBVERSION_MAJOR@ = %version -Requires: gcc-c++ libstdc++-devel boost-devel blocxx-devel libxml2-devel +Requires: gcc-c++ libstdc++-devel boost-devel libxml2-devel +%if 0%{?suse_version} +Requires: blocxx-devel +%endif Summary: Header files and documentation for libsnapper Group: Development/Languages/C and C++ @@ -163,6 +191,11 @@ %files -n snapper-zypp-plugin %defattr(-,root,root) +%if 0%{?suse_version} < 1210 +%dir /usr/lib/zypp +%dir /usr/lib/zypp/plugins +%dir /usr/lib/zypp/plugins/commit +%endif /usr/lib/zypp/plugins/commit/snapper.py %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/testsuite-real/Makefile.in new/snapper-0.0.10/testsuite-real/Makefile.in --- old/snapper-0.0.8/testsuite-real/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/testsuite-real/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -195,6 +195,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/tools/Makefile.in new/snapper-0.0.10/tools/Makefile.in --- old/snapper-0.0.8/tools/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/tools/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -166,6 +166,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/tools/compare-dirs.cc new/snapper-0.0.10/tools/compare-dirs.cc --- old/snapper-0.0.8/tools/compare-dirs.cc 2011-11-11 14:34:04.000000000 +0100 +++ new/snapper-0.0.10/tools/compare-dirs.cc 2012-03-15 11:00:15.000000000 +0100 @@ -2,6 +2,7 @@ #include <stdlib.h> #include <signal.h> #include <stdio.h> +#include <unistd.h> #include <string.h> #include <snapper/Log.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/tools/snapper.cc new/snapper-0.0.10/tools/snapper.cc --- old/snapper-0.0.8/tools/snapper.cc 2011-12-23 13:51:25.000000000 +0100 +++ new/snapper-0.0.10/tools/snapper.cc 2012-03-06 17:23:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Novell, Inc. + * Copyright (c) 2011-2012 Novell, Inc. * * All Rights Reserved. * @@ -463,6 +463,7 @@ << _("\t--description, -d <description>\tDescription for snapshot.") << endl << _("\t--cleanup-algorithm, -c <algo>\tCleanup algorithm for snapshot.") << endl << _("\t--userdata, -u <userdata>\tUserdata for snapshot.") << endl + << _("\t--command <command>\tRun command and create pre and post snapshots.") << endl << endl; } @@ -477,6 +478,7 @@ { "description", required_argument, 0, 'd' }, { "cleanup-algorithm", required_argument, 0, 'c' }, { "userdata", required_argument, 0, 'u' }, + { "command", required_argument, 0, 0 }, { 0, 0, 0, 0 } }; @@ -487,20 +489,31 @@ exit(EXIT_FAILURE); } + enum CreateType { CT_SINGLE, CT_PRE, CT_POST, CT_PRE_POST }; + const Snapshots& snapshots = sh->getSnapshots(); - SnapshotType type = SINGLE; + CreateType type = CT_SINGLE; Snapshots::const_iterator snap1 = snapshots.end(); bool print_number = false; string description; string cleanup; map<string, string> userdata; + string command; GetOpts::parsed_opts::const_iterator opt; if ((opt = opts.find("type")) != opts.end()) { - if (!toValue(opt->second, type, SINGLE)) + if (opt->second == "single") + type = CT_SINGLE; + else if (opt->second == "pre") + type = CT_PRE; + else if (opt->second == "post") + type = CT_POST; + else if (opt->second == "pre-post") + type = CT_PRE_POST; + else { cerr << _("Unknown type of snapshot.") << endl; exit(EXIT_FAILURE); @@ -522,17 +535,29 @@ if ((opt = opts.find("userdata")) != opts.end()) userdata = read_userdata(opt->second); - if (type == POST && (snap1 == snapshots.end() || snap1->isCurrent())) + if ((opt = opts.find("command")) != opts.end()) + { + command = opt->second; + type = CT_PRE_POST; + } + + if (type == CT_POST && (snap1 == snapshots.end() || snap1->isCurrent())) { cerr << _("Missing or invalid pre-number.") << endl; exit(EXIT_FAILURE); } + if (type == CT_PRE_POST && command.empty()) + { + cerr << _("Missing command argument.") << endl; + exit(EXIT_FAILURE); + } + try { switch (type) { - case SINGLE: { + case CT_SINGLE: { Snapshots::iterator snap1 = sh->createSingleSnapshot(description); snap1->setCleanup(cleanup); snap1->setUserdata(userdata); @@ -541,7 +566,7 @@ cout << snap1->getNum() << endl; } break; - case PRE: { + case CT_PRE: { Snapshots::iterator snap1 = sh->createPreSnapshot(description); snap1->setCleanup(cleanup); snap1->setUserdata(userdata); @@ -550,7 +575,7 @@ cout << snap1->getNum() << endl; } break; - case POST: { + case CT_POST: { Snapshots::iterator snap2 = sh->createPostSnapshot(description, snap1); snap2->setCleanup(cleanup); snap2->setUserdata(userdata); @@ -559,6 +584,23 @@ cout << snap2->getNum() << endl; sh->startBackgroundComparsion(snap1, snap2); } break; + + case CT_PRE_POST: { + Snapshots::iterator snap1 = sh->createPreSnapshot(description); + snap1->setCleanup(cleanup); + snap1->setUserdata(userdata); + snap1->flushInfo(); + + system(command.c_str()); + + Snapshots::iterator snap2 = sh->createPostSnapshot("", snap1); + snap2->setCleanup(cleanup); + snap2->setUserdata(userdata); + snap2->flushInfo(); + if (print_number) + cout << snap1->getNum() << ".." << snap2->getNum() << endl; + sh->startBackgroundComparsion(snap1, snap2); + } break; } } catch (const InvalidUserdataException& e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/tools/utils/Makefile.in new/snapper-0.0.10/tools/utils/Makefile.in --- old/snapper-0.0.8/tools/utils/Makefile.in 2011-12-23 15:36:24.000000000 +0100 +++ new/snapper-0.0.10/tools/utils/Makefile.in 2012-03-15 11:00:31.000000000 +0100 @@ -138,6 +138,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBBLOCXX = @LIBBLOCXX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.0.8/tools/utils/console.cc new/snapper-0.0.10/tools/utils/console.cc --- old/snapper-0.0.8/tools/utils/console.cc 2011-11-11 14:34:04.000000000 +0100 +++ new/snapper-0.0.10/tools/utils/console.cc 2012-03-15 11:00:15.000000000 +0100 @@ -9,6 +9,7 @@ * Miscellaneous console utilities. */ +#include <unistd.h> #include <string> #include <fstream> #include <iostream> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qemu for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2012-03-17 13:23:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qemu", Maintainer is "BROGERS(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2012-02-29 14:11:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2012-03-17 13:23:07.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Mar 7 15:16:16 UTC 2012 - agraf(a)suse.com + +- cut off patch file names after 40 bytes, support older git versions + for update_git.sh + +------------------------------------------------------------------- +Mon Mar 5 01:31:42 UTC 2012 - agraf(a)suse.com + +- resolve VMAs downwards, fixes arm git build for real + +------------------------------------------------------------------- +Sat Mar 3 23:27:14 UTC 2012 - agraf(a)suse.com + +- update update_git.sh for 1.0.1 +- add fixes for reserved_va mmap(NULL) case, fixes git build on arm + +------------------------------------------------------------------- Old: ---- 0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch 0002-linux-user-fix-QEMU_STRACE-1-segfault.patch 0003-linux-user-save-auxv-length.patch 0004-linux-user-add-open-hijack-infrastructure.patch 0005-linux-user-fake-proc-self-maps.patch 0006-linux-user-fake-proc-self-stat.patch 0007-linux-user-fake-proc-self-auxv.patch 0008-XXX-dont-dump-core-on-sigabort.patch 0009-linux-user-fix-wait-syscall-status-returns.patch 0010-Revert-linux-user-fix-wait-syscall-status-returns.patch 0011-linux-user-fix-wait-syscall-status-returns.patch 0012-XXX-linux-user-fake-proc-self-maps-even-more.patch 0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-o.patch 0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch 0015-linux-user-map-lower-in-address-space.patch 0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch 0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch 0018-qemu-0.9.0.cvs-binfmt.patch 0019-qemu-cvs-alsa_bitfield.patch 0020-qemu-cvs-alsa_ioctl.patch 0021-qemu-cvs-alsa_mmap.patch 0022-qemu-cvs-gettimeofday.patch 0023-qemu-cvs-ioctl_debug.patch 0024-qemu-cvs-ioctl_nodirection.patch 0025-qemu-img-vmdk-scsi.patch 0026-qemu-nonvoid_return.patch 0027-fix-mipsn32-linux-user-builds.patch 0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch 0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch 0030-linux-user-Ignore-timer_create-syscall.patch 0031-linux-user-be-silent-about-capget-failures.patch 0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch 0033-PPC-KVM-Disable-mmu-notifier-check.patch 0034-linux-user-improve-fake-proc-self-stat-making-ps.patch 0035-linux-user-target_argv-is-placed-on-ts-bprm-argv.patch 0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV.patch 0038-linux-user-fix-segfault-deadlock.patch 0039-linux-user-implement-device-mapper-ioctls.patch 0040-linux-user-add-struct-old_dev_t-compat.patch 0041-linux-user-fix-BLK-ioctl-arguments.patch 0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch 0043-linux-user-Add-ioctl-for-BLKBSZGET.patch 0044-linux-user-take-RESERVED_VA-into-account-for-g2h_va.patch 0045-linux-user-binfmt-support-host-binaries.patch 0046-linux-user-fix-fallocate.patch New: ---- 0001-Handle-CPU-interrupts-by-inline-che.patch 0002-linux-user-fix-QEMU_STRACE-1-segfau.patch 0003-linux-user-save-auxv-length.patch.patch 0004-linux-user-add-open-hijack-infrastr.patch 0005-linux-user-fake-proc-self-maps.patc.patch 0006-linux-user-fake-proc-self-stat.patc.patch 0007-linux-user-fake-proc-self-auxv.patc.patch 0008-XXX-dont-dump-core-on-sigabort.patc.patch 0009-linux-user-fix-wait-syscall-status-.patch 0010-Revert-linux-user-fix-wait-syscall-.patch 0011-linux-user-fix-wait-syscall-status-.patch 0012-XXX-linux-user-fake-proc-self-maps-.patch 0013-XXX-work-around-SA_RESTART-race-wit.patch 0014-XXX-move-qemu-binary-lower-in-addre.patch 0015-linux-user-map-lower-in-address-spa.patch 0016-XXX-fake-proc-self-maps-also-fclose.patch 0017-XXX-map-qemu-higher-again-so-we-hav.patch 0018-qemu-0.9.0.cvs-binfmt.patch.patch 0019-qemu-cvs-alsa_bitfield.patch.patch 0020-qemu-cvs-alsa_ioctl.patch.patch 0021-qemu-cvs-alsa_mmap.patch.patch 0022-qemu-cvs-gettimeofday.patch.patch 0023-qemu-cvs-ioctl_debug.patch.patch 0024-qemu-cvs-ioctl_nodirection.patch.patch 0025-qemu-img-vmdk-scsi.patch.patch 0026-qemu-nonvoid_return.patch.patch 0027-fix-mipsn32-linux-user-builds.patch.patch 0028-Integrating-Dynamips-and-GNS3-UDP-t.patch 0029-linux-user-add-binfmt-wrapper-for-a.patch 0030-linux-user-Ignore-timer_create-sysc.patch 0031-linux-user-be-silent-about-capget-f.patch 0032-linux-user-reserve-4GB-of-vmem-for-.patch 0033-PPC-KVM-Disable-mmu-notifier-check..patch 0034-linux-user-improve-fake-proc-self-s.patch 0035-linux-user-target_argv-is-placed-on.patch 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch 0038-linux-user-fix-segfault-deadlock.pa.patch 0039-linux-user-implement-device-mapper-.patch 0040-linux-user-add-struct-old_dev_t-com.patch 0041-linux-user-fix-BLK-ioctl-arguments..patch 0042-linux-user-add-BLKSSZGET-ioctl-wrap.patch 0043-linux-user-Add-ioctl-for-BLKBSZGET..patch 0044-linux-user-take-RESERVED_VA-into-ac.patch 0045-linux-user-binfmt-support-host-bina.patch 0046-linux-user-fix-fallocate.patch.patch 0047-linux-user-resolve-reserved_va-vma-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.37qdAq/_old 2012-03-17 13:23:11.000000000 +0100 +++ /var/tmp/diff_new_pack.37qdAq/_new 2012-03-17 13:23:11.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: qemu Url: http://fabrice.bellard.free.fr/qemu/ Summary: Universal CPU emulator @@ -24,52 +25,52 @@ Version: 1.0.1 Release: 0 Source: %name-%version.tar.bz2 -Patch0001: 0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch -Patch0002: 0002-linux-user-fix-QEMU_STRACE-1-segfault.patch -Patch0003: 0003-linux-user-save-auxv-length.patch -Patch0004: 0004-linux-user-add-open-hijack-infrastructure.patch -Patch0005: 0005-linux-user-fake-proc-self-maps.patch -Patch0006: 0006-linux-user-fake-proc-self-stat.patch -Patch0007: 0007-linux-user-fake-proc-self-auxv.patch -Patch0008: 0008-XXX-dont-dump-core-on-sigabort.patch -Patch0009: 0009-linux-user-fix-wait-syscall-status-returns.patch -Patch0010: 0010-Revert-linux-user-fix-wait-syscall-status-returns.patch -Patch0011: 0011-linux-user-fix-wait-syscall-status-returns.patch -Patch0012: 0012-XXX-linux-user-fake-proc-self-maps-even-more.patch -Patch0013: 0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-o.patch -Patch0014: 0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch -Patch0015: 0015-linux-user-map-lower-in-address-space.patch -Patch0016: 0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch -Patch0017: 0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch -Patch0018: 0018-qemu-0.9.0.cvs-binfmt.patch -Patch0019: 0019-qemu-cvs-alsa_bitfield.patch -Patch0020: 0020-qemu-cvs-alsa_ioctl.patch -Patch0021: 0021-qemu-cvs-alsa_mmap.patch -Patch0022: 0022-qemu-cvs-gettimeofday.patch -Patch0023: 0023-qemu-cvs-ioctl_debug.patch -Patch0024: 0024-qemu-cvs-ioctl_nodirection.patch -Patch0025: 0025-qemu-img-vmdk-scsi.patch -Patch0026: 0026-qemu-nonvoid_return.patch -Patch0027: 0027-fix-mipsn32-linux-user-builds.patch -Patch0028: 0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch -Patch0029: 0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch -Patch0030: 0030-linux-user-Ignore-timer_create-syscall.patch -Patch0031: 0031-linux-user-be-silent-about-capget-failures.patch -Patch0032: 0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch -Patch0033: 0033-PPC-KVM-Disable-mmu-notifier-check.patch -Patch0034: 0034-linux-user-improve-fake-proc-self-stat-making-ps.patch -Patch0035: 0035-linux-user-target_argv-is-placed-on-ts-bprm-argv.patch -Patch0036: 0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch -Patch0037: 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV.patch -Patch0038: 0038-linux-user-fix-segfault-deadlock.patch -Patch0039: 0039-linux-user-implement-device-mapper-ioctls.patch -Patch0040: 0040-linux-user-add-struct-old_dev_t-compat.patch -Patch0041: 0041-linux-user-fix-BLK-ioctl-arguments.patch -Patch0042: 0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch -Patch0043: 0043-linux-user-Add-ioctl-for-BLKBSZGET.patch -Patch0044: 0044-linux-user-take-RESERVED_VA-into-account-for-g2h_va.patch -Patch0045: 0045-linux-user-binfmt-support-host-binaries.patch -Patch0046: 0046-linux-user-fix-fallocate.patch +Patch0001: 0001-Handle-CPU-interrupts-by-inline-che.patch +Patch0002: 0002-linux-user-fix-QEMU_STRACE-1-segfau.patch +Patch0003: 0003-linux-user-save-auxv-length.patch.patch +Patch0004: 0004-linux-user-add-open-hijack-infrastr.patch +Patch0005: 0005-linux-user-fake-proc-self-maps.patc.patch +Patch0006: 0006-linux-user-fake-proc-self-stat.patc.patch +Patch0007: 0007-linux-user-fake-proc-self-auxv.patc.patch +Patch0008: 0008-XXX-dont-dump-core-on-sigabort.patc.patch +Patch0009: 0009-linux-user-fix-wait-syscall-status-.patch +Patch0010: 0010-Revert-linux-user-fix-wait-syscall-.patch +Patch0011: 0011-linux-user-fix-wait-syscall-status-.patch +Patch0012: 0012-XXX-linux-user-fake-proc-self-maps-.patch +Patch0013: 0013-XXX-work-around-SA_RESTART-race-wit.patch +Patch0014: 0014-XXX-move-qemu-binary-lower-in-addre.patch +Patch0015: 0015-linux-user-map-lower-in-address-spa.patch +Patch0016: 0016-XXX-fake-proc-self-maps-also-fclose.patch +Patch0017: 0017-XXX-map-qemu-higher-again-so-we-hav.patch +Patch0018: 0018-qemu-0.9.0.cvs-binfmt.patch.patch +Patch0019: 0019-qemu-cvs-alsa_bitfield.patch.patch +Patch0020: 0020-qemu-cvs-alsa_ioctl.patch.patch +Patch0021: 0021-qemu-cvs-alsa_mmap.patch.patch +Patch0022: 0022-qemu-cvs-gettimeofday.patch.patch +Patch0023: 0023-qemu-cvs-ioctl_debug.patch.patch +Patch0024: 0024-qemu-cvs-ioctl_nodirection.patch.patch +Patch0025: 0025-qemu-img-vmdk-scsi.patch.patch +Patch0026: 0026-qemu-nonvoid_return.patch.patch +Patch0027: 0027-fix-mipsn32-linux-user-builds.patch.patch +Patch0028: 0028-Integrating-Dynamips-and-GNS3-UDP-t.patch +Patch0029: 0029-linux-user-add-binfmt-wrapper-for-a.patch +Patch0030: 0030-linux-user-Ignore-timer_create-sysc.patch +Patch0031: 0031-linux-user-be-silent-about-capget-f.patch +Patch0032: 0032-linux-user-reserve-4GB-of-vmem-for-.patch +Patch0033: 0033-PPC-KVM-Disable-mmu-notifier-check..patch +Patch0034: 0034-linux-user-improve-fake-proc-self-s.patch +Patch0035: 0035-linux-user-target_argv-is-placed-on.patch +Patch0037: 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch +Patch0038: 0038-linux-user-fix-segfault-deadlock.pa.patch +Patch0039: 0039-linux-user-implement-device-mapper-.patch +Patch0040: 0040-linux-user-add-struct-old_dev_t-com.patch +Patch0041: 0041-linux-user-fix-BLK-ioctl-arguments..patch +Patch0042: 0042-linux-user-add-BLKSSZGET-ioctl-wrap.patch +Patch0043: 0043-linux-user-Add-ioctl-for-BLKBSZGET..patch +Patch0044: 0044-linux-user-take-RESERVED_VA-into-ac.patch +Patch0045: 0045-linux-user-binfmt-support-host-bina.patch +Patch0046: 0046-linux-user-fix-fallocate.patch.patch +Patch0047: 0047-linux-user-resolve-reserved_va-vma-.patch # this is to make lint happy Source300: rpmlintrc Source400: update_git.sh @@ -172,7 +173,6 @@ %patch0033 -p1 %patch0034 -p1 %patch0035 -p1 -%patch0036 -p1 %patch0037 -p1 %patch0038 -p1 %patch0039 -p1 @@ -183,24 +183,25 @@ %patch0044 -p1 %patch0045 -p1 %patch0046 -p1 +%patch0047 -p1 %build # build QEMU mkdir -p dynamic # build qemu-system ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ---interp-prefix=%_datadir/%name/qemu-i386 \ ---audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ ---audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ ---extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ + --interp-prefix=%_datadir/%name/qemu-i386 \ + --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ + --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ + --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ %if 0%{?suse_version} >= 1130 %ifarch %ix86 x86_64 ---enable-spice + --enable-spice %else ---disable-spice + --disable-spice %endif %else ---disable-spice + --disable-spice %endif # curl test fails for no reason in build system echo "CONFIG_CURL=y" >> config-host.mak @@ -212,11 +213,11 @@ make clean # build userland emus ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ---interp-prefix=%_datadir/%name/qemu-i386 \ ---enable-linux-user \ ---disable-system \ ---static --disable-linux-aio \ ---extra-cflags="$QEMU_OPT_FLAGS" + --interp-prefix=%_datadir/%name/qemu-i386 \ + --enable-linux-user \ + --disable-system \ + --static --disable-linux-aio \ + --extra-cflags="$QEMU_OPT_FLAGS" make %{?jobs:-j%jobs} V=1 %install ++++++ 0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch -> 0001-Handle-CPU-interrupts-by-inline-che.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0001-Handle-CPU-interrupts-by-inline-che.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From 4cc09e9530fb08123594be6c72dfc381df5dcddc Mon Sep 17 00:00:00 2001 +From 46def18ae5e55d5d5287ff2c4fc3b8aed446f564 Mon Sep 17 00:00:00 2001 From: Peter Maydell <peter.maydell(a)linaro.org> Date: Wed, 5 Oct 2011 10:04:02 +0100 Subject: [PATCH] Handle CPU interrupts by inline checking of a flag @@ -52,7 +52,7 @@ int insns_left; tb = (TranslationBlock *)(long)(next_tb & ~3); diff --git a/exec.c b/exec.c -index 6b92198..6c923f2 100644 +index 6c206ff..bb221cf 100644 --- a/exec.c +++ b/exec.c @@ -125,6 +125,8 @@ DEFINE_TLS(CPUState *,cpu_single_env); @@ -207,6 +207,3 @@ case QEMU_OPTION_acpitable: do_acpitable_option(optarg); break; --- -1.6.0.2 - ++++++ 0002-linux-user-fix-QEMU_STRACE-1-segfault.patch -> 0002-linux-user-fix-QEMU_STRACE-1-segfau.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0002-linux-user-fix-QEMU_STRACE-1-segfault.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0002-linux-user-fix-QEMU_STRACE-1-segfau.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From 0588bc446fd48bdb1965a6773d008c05a4ba16c1 Mon Sep 17 00:00:00 2001 +From 7c38fac0f55fad6c8506796bbbee3ab036c6350f Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Sun, 20 Nov 2011 13:02:54 +0100 Subject: [PATCH] linux-user: fix QEMU_STRACE=1 segfault @@ -83,6 +83,3 @@ return strerror(target_to_host_errno(err)); } --- -1.6.0.2 - ++++++ 0003-linux-user-save-auxv-length.patch.patch ++++++ >From e968f21cebfd85c10405e5d4c8cc8f70361590ad Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 2 Nov 2011 09:23:22 +0000 Subject: [PATCH] linux-user: save auxv length We create our own AUXV segment on stack and save a pointer to it. However we don't save the length of it, so any code that wants to do anything useful with it later on has to walk it again. Instead, let's remember the length of our AUXV segment. This simplifies later uses by a lot. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- linux-user/elfload.c | 15 ++++----------- linux-user/qemu.h | 1 + 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 4635bb2..62bb543 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1245,6 +1245,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, struct image_info *interp_info) { abi_ulong sp; + abi_ulong sp_auxv; int size; int i; abi_ulong u_rand_bytes; @@ -1316,6 +1317,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, sp -= n; put_user_ual(id, sp); \ } while(0) + sp_auxv = sp; NEW_AUX_ENT (AT_NULL, 0); /* There must be exactly DLINFO_ITEMS entries here. */ @@ -1346,6 +1348,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, #undef NEW_AUX_ENT info->saved_auxv = sp; + info->auxv_len = sp_auxv - sp; sp = loader_build_argptr(envc, argc, sp, p, 0); return sp; @@ -2329,9 +2332,8 @@ static void fill_auxv_note(struct memelfnote *note, const TaskState *ts) { elf_addr_t auxv = (elf_addr_t)ts->info->saved_auxv; elf_addr_t orig_auxv = auxv; - abi_ulong val; void *ptr; - int i, len; + int len = ts->info->auxv_len; /* * Auxiliary vector is stored in target process stack. It contains @@ -2339,15 +2341,6 @@ static void fill_auxv_note(struct memelfnote *note, const TaskState *ts) * strictly necessary but we do it here for sake of completeness. */ - /* find out lenght of the vector, AT_NULL is terminator */ - i = len = 0; - do { - get_user_ual(val, auxv); - i += 2; - auxv += 2 * sizeof (elf_addr_t); - } while (val != AT_NULL); - len = i * sizeof (elf_addr_t); - /* read in whole auxv vector and copy it to memelfnote */ ptr = lock_user(VERIFY_READ, orig_auxv, len, 0); if (ptr != NULL) { diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 55ad9d8..ef08d39 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -48,6 +48,7 @@ struct image_info { abi_ulong code_offset; abi_ulong data_offset; abi_ulong saved_auxv; + abi_ulong auxv_len; abi_ulong arg_start; abi_ulong arg_end; int personality; ++++++ 0004-linux-user-add-open-hijack-infrastructure.patch -> 0004-linux-user-add-open-hijack-infrastr.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0004-linux-user-add-open-hijack-infrastructure.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0004-linux-user-add-open-hijack-infrastr.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From 99590488e94b6b7f10ecf9a99398fd24a69a7039 Mon Sep 17 00:00:00 2001 +From a1508f441692e958ee11ac10648ed7941c242be8 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 2 Nov 2011 09:23:23 +0000 Subject: [PATCH] linux-user: add open() hijack infrastructure @@ -83,6 +83,3 @@ unlock_user(p, arg1, 0); break; #if defined(TARGET_NR_openat) && defined(__NR_openat) --- -1.6.0.2 - ++++++ 0005-linux-user-fake-proc-self-maps.patc.patch ++++++ >From a28f243a16b5e2e13645fba6d26c8ce26e9b399b Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 2 Nov 2011 09:23:24 +0000 Subject: [PATCH] linux-user: fake /proc/self/maps glibc's pthread_attr_getstack tries to find the stack range from /proc/self/maps. Unfortunately, /proc is usually the host's /proc which means linux-user guests see qemu's stack there. Fake the file with a constructed maps entry that exposes the guest's stack range. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- linux-user/syscall.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1ecc0e1..8727249 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4603,6 +4603,20 @@ int get_osversion(void) return osversion; } + +static int open_self_maps(void *cpu_env, int fd) +{ + TaskState *ts = ((CPUState *)cpu_env)->opaque; + + dprintf(fd, "%08llx-%08llx rw-p %08llx 00:00 0 [stack]\n", + (unsigned long long)ts->info->stack_limit, + (unsigned long long)(ts->stack_base + (TARGET_PAGE_SIZE - 1)) + & TARGET_PAGE_MASK, + (unsigned long long)ts->stack_base); + + return 0; +} + static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) { struct fake_open { @@ -4611,6 +4625,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) }; const struct fake_open *fake_open; static const struct fake_open fakes[] = { + { "/proc/self/maps", open_self_maps }, { NULL, NULL } }; ++++++ 0006-linux-user-fake-proc-self-stat.patc.patch ++++++ >From ddbcc8e3bf832386832322146235e251bc7bc0d7 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 2 Nov 2011 09:23:25 +0000 Subject: [PATCH] linux-user: fake /proc/self/stat The boehm gc finds the program's stack starting pointer by checking /proc/self/stat. Unfortunately, so far it reads qemu's stack pointer which clearly is wrong. So let's instead fake the file so the guest program sees the right address. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- linux-user/syscall.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8727249..5eefd01 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4617,6 +4617,31 @@ static int open_self_maps(void *cpu_env, int fd) return 0; } +static int open_self_stat(void *cpu_env, int fd) +{ + TaskState *ts = ((CPUState *)cpu_env)->opaque; + abi_ulong start_stack = ts->info->start_stack; + int i; + + for (i = 0; i < 44; i++) { + char buf[128]; + int len; + uint64_t val = 0; + + if (i == 27) { + /* stack bottom */ + val = start_stack; + } + snprintf(buf, sizeof(buf), "%"PRId64 "%c", val, i == 43 ? '\n' : ' '); + len = strlen(buf); + if (write(fd, buf, len) != len) { + return -1; + } + } + + return 0; +} + static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) { struct fake_open { @@ -4626,6 +4651,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) const struct fake_open *fake_open; static const struct fake_open fakes[] = { { "/proc/self/maps", open_self_maps }, + { "/proc/self/stat", open_self_stat }, { NULL, NULL } }; ++++++ 0007-linux-user-fake-proc-self-auxv.patc.patch ++++++ >From 53bd82c12dac42df6c602aee6a93b3ea39e134da Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 2 Nov 2011 09:23:26 +0000 Subject: [PATCH] linux-user: fake /proc/self/auxv Gtk tries to read /proc/self/auxv to find its auxv table instead of taking it from its own program memory space. However, when running with linux-user, we see the host's auxv which clearly exposes wrong information. so let's instead expose the guest memory backed auxv tables via /proc/self/auxv as well. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- linux-user/syscall.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5eefd01..3e6f3bd 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4642,6 +4642,35 @@ static int open_self_stat(void *cpu_env, int fd) return 0; } +static int open_self_auxv(void *cpu_env, int fd) +{ + TaskState *ts = ((CPUState *)cpu_env)->opaque; + abi_ulong auxv = ts->info->saved_auxv; + abi_ulong len = ts->info->auxv_len; + char *ptr; + + /* + * Auxiliary vector is stored in target process stack. + * read in whole auxv vector and copy it to file + */ + ptr = lock_user(VERIFY_READ, auxv, len, 0); + if (ptr != NULL) { + while (len > 0) { + ssize_t r; + r = write(fd, ptr, len); + if (r <= 0) { + break; + } + len -= r; + ptr += r; + } + lseek(fd, 0, SEEK_SET); + unlock_user(ptr, auxv, len); + } + + return 0; +} + static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) { struct fake_open { @@ -4652,6 +4681,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) static const struct fake_open fakes[] = { { "/proc/self/maps", open_self_maps }, { "/proc/self/stat", open_self_stat }, + { "/proc/self/auxv", open_self_auxv }, { NULL, NULL } }; ++++++ 0008-XXX-dont-dump-core-on-sigabort.patc.patch ++++++ >From f48d5facfbfa643ff2d89fa215d7982877468f02 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Mon, 21 Nov 2011 23:50:36 +0100 Subject: [PATCH] XXX dont dump core on sigabort --- linux-user/signal.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 78e3380..cfa92b9 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -373,6 +373,10 @@ static void QEMU_NORETURN force_sig(int target_sig) host_sig = target_to_host_signal(target_sig); gdb_signalled(thread_env, target_sig); + if (target_sig == 6) { + goto no_core; + } + /* dump core if supported by target binary format */ if (core_dump_signal(target_sig) && (ts->bprm->core_dump != NULL)) { stop_all_tasks(); @@ -390,6 +394,8 @@ static void QEMU_NORETURN force_sig(int target_sig) target_sig, strsignal(host_sig), "core dumped" ); } +no_core: + /* The proper exit code for dying from an uncaught signal is * -<signal>. The kernel doesn't allow exit() or _exit() to pass * a negative value. To get the proper exit code we need to ++++++ 0009-linux-user-fix-wait-syscall-status-returns.patch -> 0009-linux-user-fix-wait-syscall-status-.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0009-linux-user-fix-wait-syscall-status-returns.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0009-linux-user-fix-wait-syscall-status-.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From ee5137d38109fdcb55a58be447c2c27be2b16eb0 Mon Sep 17 00:00:00 2001 +From c2c3a707453bc853b73cf2d3f2663ff2277b6563 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 22 Nov 2011 17:53:40 +0100 Subject: [PATCH] linux-user: fix wait* syscall status returns @@ -50,6 +50,3 @@ ret = get_errno(wait4(arg1, &status, arg3, rusage_ptr)); if (!is_error(ret)) { if (status_ptr) { --- -1.6.0.2 - ++++++ 0010-Revert-linux-user-fix-wait-syscall-status-returns.patch -> 0010-Revert-linux-user-fix-wait-syscall-.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0010-Revert-linux-user-fix-wait-syscall-status-returns.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0010-Revert-linux-user-fix-wait-syscall-.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From 5cfce885dd1b3a229cd2ea7a94dfe2445ec29417 Mon Sep 17 00:00:00 2001 +From e300580980d4ac564a7c458717f7415f2528c41f Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Thu, 24 Nov 2011 00:38:22 +0100 Subject: [PATCH] Revert "linux-user: fix wait* syscall status returns" @@ -34,6 +34,3 @@ ret = get_errno(wait4(arg1, &status, arg3, rusage_ptr)); if (!is_error(ret)) { if (status_ptr) { --- -1.6.0.2 - ++++++ 0009-linux-user-fix-wait-syscall-status-returns.patch -> 0011-linux-user-fix-wait-syscall-status-.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0009-linux-user-fix-wait-syscall-status-returns.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0011-linux-user-fix-wait-syscall-status-.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,6 +1,6 @@ -From ee5137d38109fdcb55a58be447c2c27be2b16eb0 Mon Sep 17 00:00:00 2001 +From d9e44fedae2abdc61ea12000719cc74dee54200c Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> -Date: Tue, 22 Nov 2011 17:53:40 +0100 +Date: Thu, 24 Nov 2011 00:39:35 +0100 Subject: [PATCH] linux-user: fix wait* syscall status returns When calling wait4 or waitpid with a status pointer and WNOHANG, the @@ -20,36 +20,36 @@ This patch fixes some test cases when building yast2-core in OBS for ARM. Signed-off-by: Alexander Graf <agraf(a)suse.de> + --- - linux-user/syscall.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + +v1 -> v2: + + - take Peter's comment into account and just not write status back when + wait*'s return value is 0 +--- + linux-user/syscall.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 3e6f3bd..f86fe4a 100644 +index 3e6f3bd..5810e2a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4833,7 +4833,10 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, - #ifdef TARGET_NR_waitpid - case TARGET_NR_waitpid: +@@ -4835,7 +4835,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, { -- int status; -+ int status = 0; -+ if (arg2) { -+ get_user_s32(status, arg2); -+ } + int status; ret = get_errno(waitpid(arg1, &status, arg3)); - if (!is_error(ret) && arg2 +- if (!is_error(ret) && arg2 ++ if (!is_error(ret) && arg2 && ret && put_user_s32(host_to_target_waitstatus(status), arg2)) -@@ -6389,6 +6392,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, - rusage_ptr = &rusage; - else + goto efault; + } +@@ -6391,7 +6391,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, rusage_ptr = NULL; -+ if (status_ptr) { -+ get_user_s32(status, status_ptr); -+ } ret = get_errno(wait4(arg1, &status, arg3, rusage_ptr)); if (!is_error(ret)) { - if (status_ptr) { --- -1.6.0.2 - +- if (status_ptr) { ++ if (status_ptr && ret) { + status = host_to_target_waitstatus(status); + if (put_user_s32(status, status_ptr)) + goto efault; ++++++ 0012-XXX-linux-user-fake-proc-self-maps-even-more.patch -> 0012-XXX-linux-user-fake-proc-self-maps-.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0012-XXX-linux-user-fake-proc-self-maps-even-more.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0012-XXX-linux-user-fake-proc-self-maps-.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From 146dddbec44c48417f776d54f823093b464e596c Mon Sep 17 00:00:00 2001 +From 1e34dbb17e1ce60d2c2afd7803dd6b9af8043140 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Mon, 28 Nov 2011 17:05:24 +0100 Subject: [PATCH] XXX linux-user: fake /proc/self/maps even more @@ -64,6 +64,3 @@ return 0; } --- -1.6.0.2 - ++++++ 0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-o.patch -> 0013-XXX-work-around-SA_RESTART-race-wit.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-o.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0013-XXX-work-around-SA_RESTART-race-wit.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From 79a59902304b66e9270d11901a554e5b22042d6e Mon Sep 17 00:00:00 2001 +From e093a96fb61a17b9b0ee88d35fbe8871ec205797 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Thu, 1 Dec 2011 19:00:01 +0100 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only) @@ -242,6 +242,3 @@ return ret; efault: ret = -TARGET_EFAULT; --- -1.6.0.2 - ++++++ 0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch -> 0014-XXX-move-qemu-binary-lower-in-addre.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0014-XXX-move-qemu-binary-lower-in-addre.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From e534a77a0e1f880d0f74514ac50de5de3dd4811a Mon Sep 17 00:00:00 2001 +From 4c1134246f3bd0af9b9b512a2094010ed12e7895 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Mon, 5 Dec 2011 23:37:52 +0100 Subject: [PATCH] XXX move qemu binary lower in address space so we have space for guest stuff @@ -20,6 +20,3 @@ .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } --- -1.6.0.2 - ++++++ 0015-linux-user-map-lower-in-address-space.patch -> 0015-linux-user-map-lower-in-address-spa.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0015-linux-user-map-lower-in-address-space.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0015-linux-user-map-lower-in-address-spa.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From edda5e8f49b7857379733d652d6b259488bd7b70 Mon Sep 17 00:00:00 2001 +From b2e723019225ba03cef46b204dbfc51102f83259 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 6 Dec 2011 00:39:50 +0100 Subject: [PATCH] linux-user: map lower in address space @@ -29,6 +29,3 @@ #endif static abi_ulong mmap_next_start = TASK_UNMAPPED_BASE; --- -1.6.0.2 - ++++++ 0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch -> 0016-XXX-fake-proc-self-maps-also-fclose.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0016-XXX-fake-proc-self-maps-also-fclose.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From 3580a90d40df10410b7268f89aae58ce05dd2bed Mon Sep 17 00:00:00 2001 +From 8132af006535df8bbf5c4f23c9f37b7d45851950 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Thu, 8 Dec 2011 23:19:32 +0100 Subject: [PATCH] XXX fake /proc/self/maps: also fclose real file @@ -19,6 +19,3 @@ #if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) dprintf(fd, "%08llx-%08llx rw-p %08llx 00:00 0 [stack]\n", --- -1.6.0.2 - ++++++ 0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch -> 0017-XXX-map-qemu-higher-again-so-we-hav.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0017-XXX-map-qemu-higher-again-so-we-hav.patch 2012-03-17 13:23:04.000000000 +0100 @@ -1,4 +1,4 @@ -From 91f12fe177833e0112cd7f7cf5781b26377667a5 Mon Sep 17 00:00:00 2001 +From 1021c91ed33c597aec0665501c1bfef96386046b Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Sat, 10 Dec 2011 00:03:56 +0100 Subject: [PATCH] XXX map qemu higher again so we have space for brk @@ -34,6 +34,3 @@ .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } --- -1.6.0.2 - ++++++ 0018-qemu-0.9.0.cvs-binfmt.patch.patch ++++++ >From 68c582bd8f27e48828c3ea90aceb4bbead37382b Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli(a)suse.de> Date: Tue, 14 Apr 2009 16:18:44 +0200 Subject: [PATCH] qemu-0.9.0.cvs-binfmt Fixes binfmt_misc setup script: - x86_64 is i386-compatible - m68k signature fixed - path to QEMU Signed-off-by: Ulrich Hecht <uli(a)suse.de> --- scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 83a44d8..d0fe4e1 100644 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -27,42 +27,45 @@ case "$cpu" in armv[4-9]*) cpu="arm" ;; + sparc*) + cpu="sparc" + ;; esac # register the interpreter for each cpu except for the native one if [ $cpu != "i386" ] ; then - echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register - echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register + echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register + echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register fi if [ $cpu != "alpha" ] ; then - echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-alpha:' > /proc/sys/fs/binfmt_misc/register + echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha:' > /proc/sys/fs/binfmt_misc/register fi if [ $cpu != "arm" ] ; then - echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-arm:' > /proc/sys/fs/binfmt_misc/register - echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register + echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:' > /proc/sys/fs/binfmt_misc/register + echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register fi if [ $cpu != "sparc" ] ; then - echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-sparc:' > /proc/sys/fs/binfmt_misc/register + echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc:' > /proc/sys/fs/binfmt_misc/register fi if [ $cpu != "ppc" ] ; then - echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register + echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register fi if [ $cpu != "m68k" ] ; then echo 'Please check cpu value and header information for m68k!' - echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-m68k:' > /proc/sys/fs/binfmt_misc/register + echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k:' > /proc/sys/fs/binfmt_misc/register fi if [ $cpu != "mips" ] ; then # FIXME: We could use the other endianness on a MIPS host. - echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-mips:' > /proc/sys/fs/binfmt_misc/register - echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-mipsel:' > /proc/sys/fs/binfmt_misc/register - echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-mipsn32:' > /proc/sys/fs/binfmt_misc/register - echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-mipsn32el:' > /proc/sys/fs/binfmt_misc/register - echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-mips64:' > /proc/sys/fs/binfmt_misc/register - echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-mips64el:' > /proc/sys/fs/binfmt_misc/register + echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips:' > /proc/sys/fs/binfmt_misc/register + echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel:' > /proc/sys/fs/binfmt_misc/register + echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:' > /proc/sys/fs/binfmt_misc/register + echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:' > /proc/sys/fs/binfmt_misc/register + echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:' > /proc/sys/fs/binfmt_misc/register + echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:' > /proc/sys/fs/binfmt_misc/register fi if [ $cpu != "sh" ] ; then - echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-sh4:' > /proc/sys/fs/binfmt_misc/register - echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-sh4eb:' > /proc/sys/fs/binfmt_misc/register + echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4:' > /proc/sys/fs/binfmt_misc/register + echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb:' > /proc/sys/fs/binfmt_misc/register if [ $cpu != "s390x" ] ; then - echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:' > /proc/sys/fs/binfmt_misc/register + echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x:' > /proc/sys/fs/binfmt_misc/register fi ++++++ 0019-qemu-cvs-alsa_bitfield.patch.patch ++++++ >From dafb3a450b28740afb77a503af84c4217cf47f49 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 14 Apr 2009 16:20:50 +0200 Subject: [PATCH] qemu-cvs-alsa_bitfield Implements TYPE_INTBITFIELD partially. (required for ALSA support) Signed-off-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Ulrich Hecht <uli(a)suse.de> --- thunk.c | 21 +++++++++++++++++++++ thunk.h | 3 +++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/thunk.c b/thunk.c index 0657188..34bc7d1 100644 --- a/thunk.c +++ b/thunk.c @@ -41,6 +41,7 @@ static inline const argtype *thunk_type_next(const argtype *type_ptr) case TYPE_CHAR: case TYPE_SHORT: case TYPE_INT: + case TYPE_INTBITFIELD: case TYPE_LONGLONG: case TYPE_ULONGLONG: case TYPE_LONG: @@ -139,6 +140,26 @@ const argtype *thunk_convert(void *dst, const void *src, case TYPE_INT: *(uint32_t *)dst = tswap32(*(uint32_t *)src); break; + case TYPE_INTBITFIELD: +#if defined(TARGET_I386) && defined(__powerpc__) + /* powerpc uses the MSB, whereas i386 uses the LSB + * to store the first bit in a field */ + { + unsigned char byte = *(uint8_t *)src; + *(uint8_t *)dst = ((byte >> 7) & 1) + | ((byte >> 5) & 2) + | ((byte >> 3) & 4) + | ((byte >> 1) & 8) + | ((byte << 1) & 16) + | ((byte << 3) & 32) + | ((byte << 5) & 64) + | ((byte << 7) & 128); + /* FIXME: implement for bitfields > 1 byte and other archs */ + } +#else + *(uint32_t *)dst = tswap32(*(uint32_t *)src); +#endif + break; case TYPE_LONGLONG: case TYPE_ULONGLONG: *(uint64_t *)dst = tswap64(*(uint64_t *)src); diff --git a/thunk.h b/thunk.h index 109c541..55890f3 100644 --- a/thunk.h +++ b/thunk.h @@ -37,6 +37,7 @@ typedef enum argtype { TYPE_PTR, TYPE_ARRAY, TYPE_STRUCT, + TYPE_INTBITFIELD, } argtype; #define MK_PTR(type) TYPE_PTR, type @@ -90,6 +91,7 @@ static inline int thunk_type_size(const argtype *type_ptr, int is_host) case TYPE_SHORT: return 2; case TYPE_INT: + case TYPE_INTBITFIELD: return 4; case TYPE_LONGLONG: case TYPE_ULONGLONG: @@ -127,6 +129,7 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host) case TYPE_SHORT: return 2; case TYPE_INT: + case TYPE_INTBITFIELD: return 4; case TYPE_LONGLONG: case TYPE_ULONGLONG: ++++++ 0020-qemu-cvs-alsa_ioctl.patch.patch ++++++ ++++ 3624 lines (skipped) ++++++ 0021-qemu-cvs-alsa_mmap.patch.patch ++++++ >From 361d8917165009c3897a5116a5b6e87c2db2dd68 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 14 Apr 2009 16:24:15 +0200 Subject: [PATCH] qemu-cvs-alsa_mmap Hack to prevent ALSA from using mmap() interface to simplify emulation. Signed-off-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Ulrich Hecht <uli(a)suse.de> --- linux-user/mmap.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 46e8bf8..e4db455 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -364,6 +364,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size) } } +#define SNDRV_PCM_MMAP_OFFSET_STATUS 0x80000000 +#define SNDRV_PCM_MMAP_OFFSET_CONTROL 0x81000000 + /* NOTE: all the constants are the HOST ones */ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, int flags, int fd, abi_ulong offset) @@ -399,6 +402,17 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, } #endif + /* Alsa tries to communcate with the kernel via mmap. This usually + * is a good idea when user- and kernelspace are running on the + * same architecture but does not work out when not. To make alsa + * not to use mmap, we can just have it fail on the mmap calls that + * would initiate this. + */ + if(offset == SNDRV_PCM_MMAP_OFFSET_STATUS || offset == SNDRV_PCM_MMAP_OFFSET_CONTROL) { + errno = EINVAL; + return -1; + } + if (offset & ~TARGET_PAGE_MASK) { errno = EINVAL; goto fail; ++++++ 0022-qemu-cvs-gettimeofday.patch.patch ++++++ >From 58ab3b92c4406b87b2ef2dbd230b397e2bec9f18 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli(a)suse.de> Date: Tue, 14 Apr 2009 16:25:41 +0200 Subject: [PATCH] qemu-cvs-gettimeofday No clue what this is for. --- linux-user/syscall.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9fabcba..cd120a4 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5901,6 +5901,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, case TARGET_NR_gettimeofday: { struct timeval tv; + if(copy_from_user_timeval(&tv, arg1)) + goto efault; ret = get_errno(gettimeofday(&tv, NULL)); if (!is_error(ret)) { if (copy_to_user_timeval(arg1, &tv)) ++++++ 0023-qemu-cvs-ioctl_debug.patch.patch ++++++ >From c73ada0bb889ac958c21dafd410ff8210ca92850 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 14 Apr 2009 16:26:33 +0200 Subject: [PATCH] qemu-cvs-ioctl_debug Extends unsupported ioctl debug output. Signed-off-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Ulrich Hecht <uli(a)suse.de> --- linux-user/syscall.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index cd120a4..4f1a5b4 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3343,7 +3343,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) ie = ioctl_entries; for(;;) { if (ie->target_cmd == 0) { - gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); + int i; + gemu_log("Unsupported ioctl: cmd=0x%04lx (%x)\n", (unsigned long)cmd, (unsigned int)(cmd & (TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)) >> TARGET_IOC_SIZESHIFT); + for (i = 0; ioctl_entries[i].target_cmd; i++) { + if ((ioctl_entries[i].target_cmd & ~(TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)) == (cmd & ~(TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT))) + gemu_log("%p\t->\t%s (%x)\n", (void *)(unsigned long)ioctl_entries[i].host_cmd, ioctl_entries[i].name, (ioctl_entries[i].target_cmd & (TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)) >> TARGET_IOC_SIZESHIFT); + } return -TARGET_ENOSYS; } if (ie->target_cmd == cmd) ++++++ 0024-qemu-cvs-ioctl_nodirection.patch.patch ++++++ >From a2ccdcc82fc7b094d8e23d9beb2dd3351bb43e23 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 14 Apr 2009 16:27:36 +0200 Subject: [PATCH] qemu-cvs-ioctl_nodirection the direction given in the ioctl should be correct so we can assume the communication is uni-directional. The alsa developers did not like this concept though and declared ioctls IOC_R and IOC_W even though they were IOC_RW. Signed-off-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Ulrich Hecht <uli(a)suse.de> --- linux-user/syscall.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 4f1a5b4..eabeee6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3377,6 +3377,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) arg_type++; target_size = thunk_type_size(arg_type, 0); switch(ie->access) { + /* FIXME: actually the direction given in the ioctl should be + * correct so we can assume the communication is uni-directional. + * The alsa developers did not like this concept though and + * declared ioctls IOC_R and IOC_W even though they were IOC_RW.*/ +/* case IOC_R: ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp)); if (!is_error(ret)) { @@ -3395,6 +3400,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) unlock_user(argptr, arg, 0); ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp)); break; +*/ default: case IOC_RW: argptr = lock_user(VERIFY_READ, arg, target_size, 1); ++++++ 0025-qemu-img-vmdk-scsi.patch.patch ++++++ >From dca5711f3a271a3a0f41207e03f7bf5c7c24d08f Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli(a)suse.de> Date: Tue, 14 Apr 2009 16:37:42 +0200 Subject: [PATCH] qemu-img-vmdk-scsi Support creation of SCSI VMDK images in qemu-img. Signed-off-by: Ulrich Hecht <uli(a)suse.de> --- block.c | 5 ++++- block/vmdk.c | 12 ++++++++++-- block_int.h | 2 ++ qemu-img.c | 8 +++++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index d015887..4b9f81d 100644 --- a/block.c +++ b/block.c @@ -3151,7 +3151,7 @@ int bdrv_img_create(const char *filename, const char *fmt, char *options, uint64_t img_size, int flags) { QEMUOptionParameter *param = NULL, *create_options = NULL; - QEMUOptionParameter *backing_fmt, *backing_file, *size; + QEMUOptionParameter *backing_fmt, *backing_file, *size, *scsi; BlockDriverState *bs = NULL; BlockDriver *drv, *proto_drv; BlockDriver *backing_drv = NULL; @@ -3261,6 +3261,9 @@ int bdrv_img_create(const char *filename, const char *fmt, printf("Formatting '%s', fmt=%s ", filename, fmt); print_option_parameters(param); + scsi = get_option_parameter(param, BLOCK_OPT_SCSI); + if (scsi && scsi->value.n) + printf(", SCSI"); puts(""); ret = bdrv_create(drv, filename, param); diff --git a/block/vmdk.c b/block/vmdk.c index f544159..2b9531d 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1375,7 +1375,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) "ddb.geometry.cylinders = \"%" PRId64 "\"\n" "ddb.geometry.heads = \"16\"\n" "ddb.geometry.sectors = \"63\"\n" - "ddb.adapterType = \"ide\"\n"; + "ddb.adapterType = \"%s\"\n"; if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) { return -EINVAL; @@ -1390,6 +1390,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) flags |= options->value.n ? BLOCK_FLAG_COMPAT6 : 0; } else if (!strcmp(options->name, BLOCK_OPT_SUBFMT)) { fmt = options->value.s; + } else if (!strcmp(options->name, BLOCK_OPT_SCSI)) { + flags |= options->value.n ? BLOCK_FLAG_SCSI: 0; } options++; } @@ -1480,7 +1482,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) parent_desc_line, ext_desc_lines, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), - total_size / (int64_t)(63 * 16 * 512)); + total_size / (int64_t)(63 * 16 * 512), + flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide"); if (split || flat) { fd = open( filename, @@ -1583,6 +1586,11 @@ static QEMUOptionParameter vmdk_create_options[] = { "VMDK flat extent format, can be one of " "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat | streamOptimized} " }, + { + .name = BLOCK_OPT_SCSI, + .type = OPT_FLAG, + .help = "SCSI image" + }, { NULL } }; diff --git a/block_int.h b/block_int.h index 77c0187..b79ab4b 100644 --- a/block_int.h +++ b/block_int.h @@ -33,10 +33,12 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPAT6 4 +#define BLOCK_FLAG_SCSI 8 #define BLOCK_OPT_SIZE "size" #define BLOCK_OPT_ENCRYPT "encryption" #define BLOCK_OPT_COMPAT6 "compat6" +#define BLOCK_OPT_SCSI "scsi" #define BLOCK_OPT_BACKING_FILE "backing_file" #define BLOCK_OPT_BACKING_FMT "backing_fmt" #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" diff --git a/qemu-img.c b/qemu-img.c index 01cc0d3..21f3544 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -661,7 +661,7 @@ static int img_convert(int argc, char **argv) const uint8_t *buf1; BlockDriverInfo bdi; QEMUOptionParameter *param = NULL, *create_options = NULL; - QEMUOptionParameter *out_baseimg_param; + QEMUOptionParameter *out_baseimg_param, *scsi; char *options = NULL; const char *snapshot_name = NULL; float local_progress; @@ -852,6 +852,12 @@ static int img_convert(int argc, char **argv) } } + if ((scsi = get_option_parameter(param, BLOCK_OPT_SCSI)) && scsi->value.n && strcmp(drv->format_name, "vmdk")) { + error_report("SCSI devices not supported for this file format"); + ret = -1; + goto out; + } + /* Create the new image */ ret = bdrv_create(drv, out_filename, param); if (ret < 0) { ++++++ 0026-qemu-nonvoid_return.patch.patch ++++++ >From 04b073cd49c1e86a663978d5bca1610456afc80c Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli(a)suse.de> Date: Tue, 14 Apr 2009 16:38:20 +0200 Subject: [PATCH] qemu-nonvoid_return Squelches GCC warnings about undefined return values. Signed-off-by: Ulrich Hecht <uli(a)suse.de> --- hw/mpcore.c | 1 + target-m68k/translate.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/mpcore.c b/hw/mpcore.c index d6175cf..58dfd09 100644 --- a/hw/mpcore.c +++ b/hw/mpcore.c @@ -106,6 +106,7 @@ static uint32_t mpcore_timer_read(mpcore_timer_state *s, int offset) default: return 0; } + return 0; } static void mpcore_timer_write(mpcore_timer_state *s, int offset, diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 0e7f1fe..bfaf116 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -436,6 +436,7 @@ static inline int opsize_bytes(int opsize) qemu_assert(0, "bad operand size"); return 0; } + return 0; } /* Assign value to a register. If the width is less than the register width ++++++ 0027-fix-mipsn32-linux-user-builds.patch.patch ++++++ >From c376a21e31202c85164b247ba6332efddfcb9c3b Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli(a)suse.de> Date: Wed, 25 Aug 2010 14:23:43 +0200 Subject: [PATCH] fix mipsn32*-linux-user builds Signed-off-by: Ulrich Hecht <uli(a)suse.de> --- configure | 2 ++ default-configs/mipsn32-linux-user.mak | 1 + default-configs/mipsn32el-linux-user.mak | 1 + linux-user/mipsn32/syscall.h | 3 ++- 4 files changed, 6 insertions(+), 1 deletions(-) create mode 100644 default-configs/mipsn32-linux-user.mak create mode 100644 default-configs/mipsn32el-linux-user.mak diff --git a/configure b/configure index b113f60..a21b1e6 100755 --- a/configure +++ b/configure @@ -915,6 +915,8 @@ microblaze-linux-user \ microblazeel-linux-user \ mips-linux-user \ mipsel-linux-user \ +mipsn32-linux-user \ +mipsn32el-linux-user \ ppc-linux-user \ ppc64-linux-user \ ppc64abi32-linux-user \ diff --git a/default-configs/mipsn32-linux-user.mak b/default-configs/mipsn32-linux-user.mak new file mode 100644 index 0000000..31df570 --- /dev/null +++ b/default-configs/mipsn32-linux-user.mak @@ -0,0 +1 @@ +# Default configuration for mips-linux-user diff --git a/default-configs/mipsn32el-linux-user.mak b/default-configs/mipsn32el-linux-user.mak new file mode 100644 index 0000000..4d0e4af --- /dev/null +++ b/default-configs/mipsn32el-linux-user.mak @@ -0,0 +1 @@ +# Default configuration for mipsel-linux-user diff --git a/linux-user/mipsn32/syscall.h b/linux-user/mipsn32/syscall.h index 4ec506c..beeeb3c 100644 --- a/linux-user/mipsn32/syscall.h +++ b/linux-user/mipsn32/syscall.h @@ -216,6 +216,7 @@ struct target_pt_regs { #undef TARGET_ENOTRECOVERABLE #define TARGET_ENOTRECOVERABLE 166 /* State not recoverable */ - +/* Nasty hack: define a fake errno value for use by sigreturn. */ +#define TARGET_QEMU_ESIGRETURN 255 #define UNAME_MACHINE "mips64" ++++++ 0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch -> 0028-Integrating-Dynamips-and-GNS3-UDP-t.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0028-Integrating-Dynamips-and-GNS3-UDP-t.patch 2012-03-17 13:23:06.000000000 +0100 @@ -1,4 +1,4 @@ -From 15d6a32b38abc6c2f8143ebccfcdd05d204f0fcd Mon Sep 17 00:00:00 2001 +From dbaddb35cf05035c5efe05a7272c3a4e8f29033b Mon Sep 17 00:00:00 2001 From: Benjamin <mlspirat42(a)gmail.com> Date: Sat, 8 Oct 2011 07:31:33 +0000 Subject: [PATCH] Integrating Dynamips and GNS3 UDP tunnels (Patches) @@ -43,7 +43,7 @@ create mode 100644 net/udp.h diff --git a/Makefile.objs b/Makefile.objs -index d7a6539..1a28830 100644 +index 3a699ee..97c2b75 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -46,6 +46,7 @@ net-obj-y = net.o @@ -77,10 +77,10 @@ if (s->hfile == INVALID_HANDLE_VALUE) { int err = GetLastError(); diff --git a/hw/e1000.c b/hw/e1000.c -index 986ed9c..19ca5bf 100644 +index e164d79..22a601a 100644 --- a/hw/e1000.c +++ b/hw/e1000.c -@@ -577,7 +577,7 @@ receive_filter(E1000State *s, const uint8_t *buf, int size) +@@ -580,7 +580,7 @@ receive_filter(E1000State *s, const uint8_t *buf, int size) if (rctl & E1000_RCTL_UPE) // promiscuous return 1; @@ -153,7 +153,7 @@ NET_CLIENT_TYPE_MAX diff --git a/net/udp.c b/net/udp.c new file mode 100644 -index 0000000..6080919 +index 0000000..d2a67e7 --- /dev/null +++ b/net/udp.c @@ -0,0 +1,138 @@ @@ -250,7 +250,7 @@ + UDPState *s; + struct sockaddr_in receiver; + int ret; -+ ++ + nc = qemu_new_net_client(&net_udp_info, vlan, NULL, model, name); + + snprintf(nc->info_str, sizeof(nc->info_str),"udp: %i->%s:%i", @@ -263,7 +263,7 @@ + receiver.sin_addr.s_addr = INADDR_ANY; + receiver.sin_port = htons(sport); + ret = bind(s->rfd, (struct sockaddr *)&receiver, sizeof(receiver)); -+ ++ + if (ret == -1) { + fprintf (stderr, "bind error:%s\n", strerror(errno)); + return ret; @@ -346,6 +346,3 @@ #ifdef CONFIG_VDE "-net vde[,vlan=n][,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n" " connect the vlan 'n' to port 'n' of a vde switch running\n" --- -1.6.0.2 - ++++++ 0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch -> 0029-linux-user-add-binfmt-wrapper-for-a.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0029-linux-user-add-binfmt-wrapper-for-a.patch 2012-03-17 13:23:06.000000000 +0100 @@ -1,4 +1,4 @@ -From 47ff084e9af71b217e6f842f720d12fe9e12f2fd Mon Sep 17 00:00:00 2001 +From e8b8530dd87efb4bbbb9819af1d2019c49a4b58a Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Fri, 30 Sep 2011 19:40:36 +0200 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling @@ -169,6 +169,3 @@ - echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x:' > /proc/sys/fs/binfmt_misc/register + echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-binfmt:P' > /proc/sys/fs/binfmt_misc/register fi --- -1.6.0.2 - ++++++ 0030-linux-user-Ignore-timer_create-syscall.patch -> 0030-linux-user-Ignore-timer_create-sysc.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0030-linux-user-Ignore-timer_create-syscall.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0030-linux-user-Ignore-timer_create-sysc.patch 2012-03-17 13:23:06.000000000 +0100 @@ -1,4 +1,4 @@ -From 269d801698bf7640dd325cfb4b195c4a207a07ee Mon Sep 17 00:00:00 2001 +From a4f0bf51a11607d4ab025719b1c13fc402aac9b7 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Sun, 11 Dec 2011 01:19:24 +0100 Subject: [PATCH] linux-user: Ignore timer_create syscall @@ -27,6 +27,3 @@ #if defined(TARGET_NR_tkill) && defined(__NR_tkill) case TARGET_NR_tkill: ret = get_errno(sys_tkill((int)arg1, target_to_host_signal(arg2))); --- -1.6.0.2 - ++++++ 0031-linux-user-be-silent-about-capget-failures.patch -> 0031-linux-user-be-silent-about-capget-f.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0031-linux-user-be-silent-about-capget-failures.patch 2012-02-10 17:19:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0031-linux-user-be-silent-about-capget-f.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 36f403e159ecb5fcaeda5346c2df762cc904a91b Mon Sep 17 00:00:00 2001 +From 853112747ffa9a9747c670d36508b8f51fbaf798 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Sun, 11 Dec 2011 01:21:51 +0100 Subject: [PATCH] linux-user: be silent about capget failures @@ -25,6 +25,3 @@ case TARGET_NR_capset: goto unimplemented; case TARGET_NR_sigaltstack: --- -1.6.0.2 - ++++++ 0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch -> 0032-linux-user-reserve-4GB-of-vmem-for-.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch 2012-02-24 06:54:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0032-linux-user-reserve-4GB-of-vmem-for-.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From ac233b323ad7e498c665e8c74df7e44de4a542c0 Mon Sep 17 00:00:00 2001 +From 8954d20f70430ddd4f6add000fd8bf82d5ddcb27 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 14 Dec 2011 00:33:28 +0100 Subject: [PATCH] linux-user: reserve 4GB of vmem for 32-on-64 @@ -39,6 +39,3 @@ static void usage(void); extern int use_stopflag; --- -1.6.0.2 - ++++++ 0033-PPC-KVM-Disable-mmu-notifier-check.patch -> 0033-PPC-KVM-Disable-mmu-notifier-check..patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0033-PPC-KVM-Disable-mmu-notifier-check.patch 2012-02-24 06:54:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0033-PPC-KVM-Disable-mmu-notifier-check..patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 96ac7aa8753cb2d79121c5a579a6e93160428a40 Mon Sep 17 00:00:00 2001 +From c81d26928073f06432c701a28d745dffacc69c98 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Fri, 6 Jan 2012 01:05:55 +0100 Subject: [PATCH] PPC: KVM: Disable mmu notifier check @@ -13,7 +13,7 @@ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/exec.c b/exec.c -index 6c923f2..9f10868 100644 +index bb221cf..e71a82d 100644 --- a/exec.c +++ b/exec.c @@ -2831,10 +2831,12 @@ static void *file_ram_alloc(RAMBlock *block, @@ -29,6 +29,3 @@ if (asprintf(&filename, "%s/qemu_back_mem.XXXXXX", path) == -1) { return NULL; --- -1.6.0.2 - ++++++ 0034-linux-user-improve-fake-proc-self-stat-making-ps.patch -> 0034-linux-user-improve-fake-proc-self-s.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0034-linux-user-improve-fake-proc-self-stat-making-ps.patch 2012-02-24 06:54:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0034-linux-user-improve-fake-proc-self-s.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 872ebeaa24ed1c4b0c1596a7ad37f2bf2275efb0 Mon Sep 17 00:00:00 2001 +From 9a72708a58d7bcbc1ba036a44cea920a238b0312 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani <lxnay(a)sabayon.org> Date: Tue, 3 Jan 2012 09:38:34 +0000 Subject: [PATCH] linux-user: improve fake /proc/self/stat making `ps` not segfault. @@ -49,6 +49,3 @@ len = strlen(buf); if (write(fd, buf, len) != len) { return -1; --- -1.6.0.2 - ++++++ 0035-linux-user-target_argv-is-placed-on-ts-bprm-argv.patch -> 0035-linux-user-target_argv-is-placed-on.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0035-linux-user-target_argv-is-placed-on-ts-bprm-argv.patch 2012-02-24 06:54:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0035-linux-user-target_argv-is-placed-on.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 7dc45b21c5ef8a9445463f8d3754e502621192a7 Mon Sep 17 00:00:00 2001 +From e8171f6d129e129fe632721ab603f800385b0609 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani <lxnay(a)sabayon.org> Date: Tue, 3 Jan 2012 09:38:35 +0000 Subject: [PATCH] linux-user: target_argv is placed on ts->bprm->argv and can't be freed() @@ -32,6 +32,3 @@ for (wrk = target_environ; *wrk; wrk++) { free(*wrk); } --- -1.6.0.2 - ++++++ 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV.patch -> 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV.patch 2012-02-24 06:54:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 9ef61f2a197f9dbae104fc1d18634c29d91b4a4e Mon Sep 17 00:00:00 2001 +From 351142c287c874f959828c6360cda977306dfa47 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 10 Jan 2012 17:03:02 +0100 Subject: [PATCH] PPC: KVM: Ignore ENABLE_PAPR to support very old HV KVM kernels @@ -12,7 +12,7 @@ 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c -index a03e99c..923677c 100644 +index 6c6278a..2f39e77 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -745,7 +745,7 @@ void kvmppc_set_papr(CPUState *env) @@ -24,6 +24,3 @@ } /* --- -1.6.0.2 - ++++++ 0038-linux-user-fix-segfault-deadlock.pa.patch ++++++ >From 1e747ef08ad5f5901e183cfd2151ae2988fb06ea Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Fri, 13 Jan 2012 17:05:41 +0100 Subject: [PATCH] linux-user: fix segfault deadlock When entering the guest we take a lock to ensure that nobody else messes with our TB chaining while we're doing it. If we get a segfault inside that code, we manage to work on, but will not unlock the lock. This patch forces unlocking of that lock in the segv handler. I'm not sure this is the right approach though. Maybe we should rather make sure we don't segfault in the code? I would greatly appreciate someone more intelligible than me to look at this :). Example code to trigger this is at: http://csgraf.de/tmp/conftest.c Reported-by: Fabio Erculiani <lxnay(a)sabayon.org> Signed-off-by: Alexander Graf <agraf(a)suse.de> --- qemu-lock.h | 10 ++++++++++ user-exec.c | 4 ++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/qemu-lock.h b/qemu-lock.h index a72edda..e460e12 100644 --- a/qemu-lock.h +++ b/qemu-lock.h @@ -24,6 +24,12 @@ #include <pthread.h> #define spin_lock pthread_mutex_lock #define spin_unlock pthread_mutex_unlock +static inline void spin_unlock_safe(pthread_mutex_t *lock) +{ + /* unlocking an unlocked mutex results in undefined behavior */ + pthread_mutex_trylock(lock); + pthread_mutex_unlock(lock); +} #define spinlock_t pthread_mutex_t #define SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER @@ -46,4 +52,8 @@ static inline void spin_unlock(spinlock_t *lock) { } +static inline void spin_unlock_safe(spinlock_t *lock) +{ +} + #endif diff --git a/user-exec.c b/user-exec.c index abf6885..2826bd1 100644 --- a/user-exec.c +++ b/user-exec.c @@ -96,6 +96,10 @@ static inline int handle_cpu_signal(unsigned long pc, unsigned long address, qemu_printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n", pc, address, is_write, *(unsigned long *)old_set); #endif + + /* Maybe we're still holding the TB fiddling lock? */ + spin_unlock_safe(&tb_lock); + /* XXX: locking issue */ if (is_write && page_unprotect(h2g(address), pc, puc)) { return 1; ++++++ 0039-linux-user-implement-device-mapper-ioctls.patch -> 0039-linux-user-implement-device-mapper-.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0039-linux-user-implement-device-mapper-ioctls.patch 2012-02-24 06:54:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0039-linux-user-implement-device-mapper-.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From df8bec1f09754015f3b43591e1b8e9de70910c9a Mon Sep 17 00:00:00 2001 +From 0f7996403949df0249e833d7e0f250042eed3384 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 31 Jan 2012 18:42:06 +0100 Subject: [PATCH] linux-user: implement device mapper ioctls @@ -8,17 +8,17 @@ Signed-off-by: Alexander Graf <agraf(a)suse.de> --- - linux-user/ioctls.h | 33 +++++++ + linux-user/ioctls.h | 32 ++++++ linux-user/syscall.c | 226 ++++++++++++++++++++++++++++++++++++++++++++ linux-user/syscall_defs.h | 18 ++++ linux-user/syscall_types.h | 36 +++++++ - 4 files changed, 313 insertions(+), 0 deletions(-) + 4 files changed, 312 insertions(+), 0 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h -index 224dbc6..05b7290 100644 +index 224dbc6..8647d64 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h -@@ -350,3 +350,36 @@ +@@ -350,3 +350,35 @@ IOCTL(VT_SETMODE, IOC_RW, MK_PTR(MK_STRUCT(STRUCT_vt_mode))) IOCTL(VT_RELDISP, 0, TYPE_INT) IOCTL(VT_DISALLOCATE, 0, TYPE_INT) @@ -54,7 +54,6 @@ + MK_PTR(MK_STRUCT(STRUCT_dm_ioctl))) + IOCTL_SPECIAL(DM_DEV_SET_GEOMETRY, IOC_RW, do_ioctl_dm, + MK_PTR(MK_STRUCT(STRUCT_dm_ioctl))) -+ diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 3e8e3dd..7a20af4 100644 --- a/linux-user/syscall.c @@ -375,6 +374,3 @@ STRUCT(fiemap_extent, TYPE_ULONGLONG, /* fe_logical */ TYPE_ULONGLONG, /* fe_physical */ --- -1.6.0.2 - ++++++ 0040-linux-user-add-struct-old_dev_t-compat.patch -> 0040-linux-user-add-struct-old_dev_t-com.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0040-linux-user-add-struct-old_dev_t-compat.patch 2012-02-24 06:54:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0040-linux-user-add-struct-old_dev_t-com.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 79df307311156580da72aff94e73ad54c73bc4e7 Mon Sep 17 00:00:00 2001 +From 1c1448c93345613871dac849cfd6786cf4a394ae Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 31 Jan 2012 19:44:41 +0100 Subject: [PATCH] linux-user: add struct old_dev_t compat @@ -131,6 +131,3 @@ case TYPE_ARRAY: return thunk_type_align_array(type_ptr + 2, is_host); case TYPE_STRUCT: --- -1.6.0.2 - ++++++ 0041-linux-user-fix-BLK-ioctl-arguments.patch -> 0041-linux-user-fix-BLK-ioctl-arguments..patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0041-linux-user-fix-BLK-ioctl-arguments.patch 2012-02-24 06:54:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0041-linux-user-fix-BLK-ioctl-arguments..patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 8563ceced36263dbc91af9d6941e18626bd9f488 Mon Sep 17 00:00:00 2001 +From e9c0b65bbf4f8df8dcddf619d8473afecac8166c Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 31 Jan 2012 20:10:20 +0100 Subject: [PATCH] linux-user: fix BLK ioctl arguments @@ -31,6 +31,3 @@ #define TARGET_FIBMAP TARGET_IO(0x00,1) /* bmap access */ #define TARGET_FIGETBSZ TARGET_IO(0x00,2) /* get the block size used for bmap */ #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap) --- -1.6.0.2 - ++++++ 0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch -> 0042-linux-user-add-BLKSSZGET-ioctl-wrap.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch 2012-02-24 06:54:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0042-linux-user-add-BLKSSZGET-ioctl-wrap.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 3977eaddfd8aad7fcab30dab3c9bab52bd79bdeb Mon Sep 17 00:00:00 2001 +From 62783a25efd8a6c5e6272950e8fc7f2dd0fd28e5 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Tue, 31 Jan 2012 20:11:37 +0100 Subject: [PATCH] linux-user: add BLKSSZGET ioctl wrapper @@ -11,7 +11,7 @@ 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h -index 05b7290..f938050 100644 +index 8647d64..07463d3 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -74,6 +74,7 @@ @@ -22,6 +22,3 @@ #ifdef FIBMAP IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG)) #endif --- -1.6.0.2 - ++++++ 0043-linux-user-Add-ioctl-for-BLKBSZGET.patch -> 0043-linux-user-Add-ioctl-for-BLKBSZGET..patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0043-linux-user-Add-ioctl-for-BLKBSZGET.patch 2012-02-24 06:54:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0043-linux-user-Add-ioctl-for-BLKBSZGET..patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 3f2fdae967bb91a2c02020369c0af53c9cafd8b5 Mon Sep 17 00:00:00 2001 +From cd606a848069e4adfbf65f33468ab1471b26d85e Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Thu, 2 Feb 2012 02:22:34 +0100 Subject: [PATCH] linux-user: Add ioctl for BLKBSZGET @@ -11,7 +11,7 @@ 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h -index f938050..c261063 100644 +index 07463d3..e8c1c69 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -75,6 +75,7 @@ @@ -22,6 +22,3 @@ #ifdef FIBMAP IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG)) #endif --- -1.6.0.2 - ++++++ 0044-linux-user-take-RESERVED_VA-into-account-for-g2h_va.patch -> 0044-linux-user-take-RESERVED_VA-into-ac.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0044-linux-user-take-RESERVED_VA-into-account-for-g2h_va.patch 2012-02-24 06:54:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0044-linux-user-take-RESERVED_VA-into-ac.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 63ad8e6ca106981bc18f2d49cf0bed79a7b2cbfe Mon Sep 17 00:00:00 2001 +From e142d9e8baf58cd6f3ae688db188721d9207f8ca Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Thu, 2 Feb 2012 03:14:18 +0100 Subject: [PATCH] linux-user: take RESERVED_VA into account for g2h_valid() @@ -29,6 +29,3 @@ }) #endif --- -1.6.0.2 - ++++++ 0045-linux-user-binfmt-support-host-binaries.patch -> 0045-linux-user-binfmt-support-host-bina.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0045-linux-user-binfmt-support-host-binaries.patch 2012-02-24 06:54:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/0045-linux-user-binfmt-support-host-bina.patch 2012-03-17 13:23:07.000000000 +0100 @@ -1,4 +1,4 @@ -From 20d9c73417a401a79a3c5ae9aa07d635a06e9519 Mon Sep 17 00:00:00 2001 +From 69a6177e055dcb4978a22e78971ff2d047534afa Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Thu, 2 Feb 2012 18:02:33 +0100 Subject: [PATCH] linux-user: binfmt: support host binaries @@ -54,6 +54,3 @@ new_argv = (char **)malloc((argc + 2) * sizeof(*new_argv)); if (argc > 3) { memcpy(&new_argv[4], &argv[3], (argc - 3) * sizeof(*new_argv)); --- -1.6.0.2 - ++++++ 0046-linux-user-fix-fallocate.patch.patch ++++++ >From 0a9d9af253f5ff946b86fc7e9d95f1a2a30a34d7 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Mon, 6 Feb 2012 21:37:07 +0100 Subject: [PATCH] linux-user: fix fallocate Fallocate gets off_t parameters passed in, so we should also read them out accordingly. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- v1 -> v2: - unbreak 64-bit guests --- linux-user/syscall.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7a20af4..cbd37f6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8479,7 +8479,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #endif /* CONFIG_EVENTFD */ #if defined(CONFIG_FALLOCATE) && defined(TARGET_NR_fallocate) case TARGET_NR_fallocate: +#if TARGET_ABI_BITS == 32 + ret = get_errno(fallocate(arg1, arg2, target_offset64(arg3, arg4), + target_offset64(arg5, arg6))); +#else ret = get_errno(fallocate(arg1, arg2, arg3, arg4)); +#endif break; #endif #if defined(CONFIG_SYNC_FILE_RANGE) ++++++ 0047-linux-user-resolve-reserved_va-vma-.patch ++++++ >From a6664afab4b925f8ae74b6fe20e3634f42690e90 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Sun, 4 Mar 2012 02:41:14 +0100 Subject: [PATCH] linux-user: resolve reserved_va vma downwards After consulting with Paul Brook, we concluded that it's best to search the VMA space downwards, so that we don't even get the chance to conflict with the brk range. This patch resolves a bunch of allocation conflicts when using -R. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- This replaces the other patches I sent out earlier today. --- linux-user/main.c | 1 + linux-user/mmap.c | 35 ++++++++++++++++++++++++----------- linux-user/qemu.h | 1 + 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 6a5dfde..d61d731 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3437,6 +3437,7 @@ int main(int argc, char **argv, char **envp) guest_base = HOST_PAGE_ALIGN((unsigned long)p); } qemu_log("Reserved 0x%lx bytes of guest address space\n", reserved_va); + mmap_next_start = reserved_va; } if (reserved_va || have_guest_base) { diff --git a/linux-user/mmap.c b/linux-user/mmap.c index e4db455..2620f88 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -212,7 +212,7 @@ static int mmap_frag(abi_ulong real_start, #else # define TASK_UNMAPPED_BASE 0x18000000 #endif -static abi_ulong mmap_next_start = TASK_UNMAPPED_BASE; +abi_ulong mmap_next_start = TASK_UNMAPPED_BASE; unsigned long last_brk; @@ -222,7 +222,7 @@ unsigned long last_brk; static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size) { abi_ulong addr; - abi_ulong last_addr; + abi_ulong end_addr; int prot; int looped = 0; @@ -230,25 +230,38 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size) return (abi_ulong)-1; } - last_addr = start; - for (addr = start; last_addr + size != addr; addr += qemu_host_page_size) { - if (last_addr + size >= RESERVED_VA - || (abi_ulong)(last_addr + size) < last_addr) { + size = HOST_PAGE_ALIGN(size); + end_addr = start + size; + if (end_addr > RESERVED_VA) { + end_addr = RESERVED_VA; + } + addr = end_addr - qemu_host_page_size; + + while (1) { + if (addr > end_addr) { if (looped) { return (abi_ulong)-1; } - last_addr = qemu_host_page_size; - addr = 0; + end_addr = RESERVED_VA; + addr = end_addr - qemu_host_page_size; looped = 1; continue; } prot = page_get_flags(addr); if (prot) { - last_addr = addr + qemu_host_page_size; + end_addr = addr; + } + if (addr + size == end_addr) { + break; } + addr -= qemu_host_page_size; + } + + if (start == mmap_next_start) { + mmap_next_start = addr; } - mmap_next_start = addr; - return last_addr; + + return addr; } #endif diff --git a/linux-user/qemu.h b/linux-user/qemu.h index aa06acf..5dc0720 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -254,6 +254,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, abi_ulong new_addr); int target_msync(abi_ulong start, abi_ulong len, int flags); extern unsigned long last_brk; +extern abi_ulong mmap_next_start; void mmap_lock(void); void mmap_unlock(void); abi_ulong mmap_find_vma(abi_ulong, abi_ulong); ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.37qdAq/_old 2012-03-17 13:23:11.000000000 +0100 +++ /var/tmp/diff_new_pack.37qdAq/_new 2012-03-17 13:23:11.000000000 +0100 @@ -47,8 +47,8 @@ BuildRequires: zlib-devel %endif %if 0%{?suse_version} >= 1210 -BuildRequires: libattr-devel-static BuildRequires: glibc-devel-static +BuildRequires: libattr-devel-static BuildRequires: libfdt1-devel %endif %if 0%{?suse_version} >= 1140 @@ -60,10 +60,10 @@ BuildRequires: spice-protocol-devel %endif %endif -BuildRequires: libvdeplug3-devel +BuildRequires: fdupes BuildRequires: glib2-devel +BuildRequires: libvdeplug3-devel BuildRequires: python -BuildRequires: fdupes Requires: timezone Requires: virt-utils @@ -75,8 +75,8 @@ as PC and PowerMac systems. %package linux-user -Group: System/Emulators/PC Summary: Universal CPU emulator -- Linux User binaries +Group: System/Emulators/PC Provides: qemu:%_bindir/qemu-arm %description linux-user @@ -87,7 +87,7 @@ as PC and PowerMac systems. This sub package contains static linked binaries for runnign linux-user -emulations. This can be used together with the OBS build script to +emulations. This can be used together with the OBS build script to run cross architectures builds %prep @@ -98,19 +98,19 @@ # build QEMU mkdir -p dynamic # build qemu-system -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\ - --interp-prefix=%_datadir/%name/qemu-i386 \\ - --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \\ - --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \\ - --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \\ +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ + --interp-prefix=%_datadir/%name/qemu-i386 \ + --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ + --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ + --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ %if 0%{?suse_version} >= 1130 %ifarch %ix86 x86_64 - --enable-spice + --enable-spice %else - --disable-spice + --disable-spice %endif %else - --disable-spice + --disable-spice %endif # curl test fails for no reason in build system echo "CONFIG_CURL=y" >> config-host.mak @@ -121,11 +121,11 @@ mv */qemu */qemu-* qemu-io dynamic || true make clean # build userland emus -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\ - --interp-prefix=%_datadir/%name/qemu-i386 \\ - --enable-linux-user \\ - --disable-system \\ - --static --disable-linux-aio \\ +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ + --interp-prefix=%_datadir/%name/qemu-i386 \ + --enable-linux-user \ + --disable-system \ + --static --disable-linux-aio \ --extra-cflags="$QEMU_OPT_FLAGS" make %{?jobs:-j%jobs} V=1 ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.37qdAq/_old 2012-03-17 13:23:11.000000000 +0100 +++ /var/tmp/diff_new_pack.37qdAq/_new 2012-03-17 13:23:11.000000000 +0100 @@ -13,7 +13,7 @@ GIT_TREE=git://repo.or.cz/qemu/agraf.git GIT_LOCAL_TREE=/suse/agraf/git/qemu GIT_BRANCH=suse-1.0 -GIT_UPSTREAM_TAG=v1.0 +GIT_UPSTREAM_TAG=v1.0.1 # clean up if [ -e 0001-* ]; then @@ -22,23 +22,36 @@ rm -f qemu.spec # fetch all patches +rm -rf qemu-tmp if [ -d "$GIT_LOCAL_TREE" ]; then git clone -ls $GIT_LOCAL_TREE qemu-tmp + cd qemu-tmp else git clone $GIT_TREE qemu-tmp + cd qemu-tmp + git remote add upstream git://git.qemu.org/qemu.git + git remote update fi -cd qemu-tmp git checkout $GIT_BRANCH -git format-patch $GIT_UPSTREAM_TAG -o .. +git format-patch -N $GIT_UPSTREAM_TAG -o .. cd .. rm -rf qemu-tmp +# cut off file name after 40 bytes, so we work around git version differences +# while at it, also remove the signature +for i in 0*; do + PATCHNAME=${i%.patch} + PATCHNAME=${i:0:40}.patch + head -n $(expr $(wc -l $i | cut -d ' ' -f 1) - 3) $i > "$PATCHNAME" + rm "$i" +done + # we have all patches as files now - generate the spec file! -while read line; do +while IFS= read -r line; do if [ "$line" = "PATCH_FILES" ]; then for i in 0*; do NUM=${i%%-*} - echo -e "Patch$NUM:\t$i" + echo -e "Patch$NUM: $i" done elif [ "$line" = "PATCH_EXEC" ]; then for i in 0*; do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pymol for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package pymol for openSUSE:Factory checked in at 2012-03-17 13:22:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pymol (Old) and /work/SRC/openSUSE:Factory/.pymol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pymol", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/pymol/pymol.changes 2012-03-01 17:26:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pymol.new/pymol.changes 2012-03-17 13:22:56.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 6 02:21:51 UTC 2012 - dhall(a)wustl.edu +- update to svn rev 3993 + * fixed crash when reading in long lines from stdin + +- update to 1.5.0.3 + * fixed error showing Cell on map with attached file + * fixed reading in symmetry + * fixed problem with symmetry copying/setting where map doesn't get updated + * get_symmetry should return None if argument is not an ObjectMolecule or ObjectMap + * fixed Volume extents only get shown when volume is rendered + * fixed reading in legacy sessions with version # less than 1 + +------------------------------------------------------------------- Old: ---- pymol-1.5.0.2.tar.bz2 New: ---- pymol-1.5.0.3.svn3993.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pymol.spec ++++++ --- /var/tmp/diff_new_pack.lJptv1/_old 2012-03-17 13:22:59.000000000 +0100 +++ /var/tmp/diff_new_pack.lJptv1/_new 2012-03-17 13:22:59.000000000 +0100 @@ -18,7 +18,7 @@ Name: pymol -Version: 1.5.0.2 +Version: 1.5.0.3.svn3993 Release: 0 Url: http://pymol.org Summary: A Molecular Viewer -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pssh for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package pssh for openSUSE:Factory checked in at 2012-03-17 13:22:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pssh (Old) and /work/SRC/openSUSE:Factory/.pssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pssh", Maintainer is "DMuhamedagic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pssh/pssh.changes 2012-02-16 12:26:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pssh.new/pssh.changes 2012-03-17 13:22:53.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Mar 13 19:27:22 UTC 2012 - tabraham(a)novell.com + +- Update to 2.3.1 + * fixed a problem where man pages were omitted from the tar file + +- Changes from 2.3 + * added a --inline-stdout option (issue #57). Thanks to + pablo.barbachano for the patch. + * Added a PSSH_HOST environment variable (issue #62). + * Added a --version option (issues #33 and #45) + * Expanded the pssh man page and added man pages for all other + commands (issues #10 and #55). + * Fixed askpass on Mac OS X 10.6.7 (issue #50) + * Many other small fixes + +------------------------------------------------------------------- Old: ---- pssh-2.2.2.tar.gz New: ---- pssh-2.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pssh.spec ++++++ --- /var/tmp/diff_new_pack.0x2XAB/_old 2012-03-17 13:22:55.000000000 +0100 +++ /var/tmp/diff_new_pack.0x2XAB/_new 2012-03-17 13:22:55.000000000 +0100 @@ -1,4 +1,3 @@ -# vim: set sw=3 ts=3 noet: # # spec file for package pssh # @@ -15,8 +14,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + + Name: pssh -Version: 2.2.2 +Version: 2.3.1 Release: 0 Summary: Parallel SSH to control large numbers of Machines simultaneously License: BSD-3-Clause @@ -90,6 +92,10 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING %doc %{_mandir}/man1/pssh.1.gz +%doc %{_mandir}/man1/pnuke.1.gz +%doc %{_mandir}/man1/pscp.1.gz +%doc %{_mandir}/man1/pslurp.1.gz +%doc %{_mandir}/man1/prsync.1.gz %{_bindir}/pnuke %{_bindir}/prsync %{_bindir}/pscp ++++++ pssh-2.2.2.tar.gz -> pssh-2.3.1.tar.gz ++++++ ++++ 1666 lines of diff (skipped) ++++++ pssh-man_dir.patch ++++++ --- /var/tmp/diff_new_pack.0x2XAB/_old 2012-03-17 13:22:55.000000000 +0100 +++ /var/tmp/diff_new_pack.0x2XAB/_new 2012-03-17 13:22:55.000000000 +0100 @@ -1,9 +1,10 @@ ---- setup.py.orig 2011-04-28 14:12:19.960016000 +0200 -+++ setup.py 2011-04-28 16:15:09.252746000 +0200 -@@ -37,5 +37,5 @@ +--- setup.py.orig 2012-03-13 15:24:10.057889965 -0400 ++++ setup.py 2012-03-13 15:24:29.340648895 -0400 +@@ -38,6 +38,6 @@ packages=['psshlib'], scripts = [os.path.join("bin", p) for p in ["pssh", "pnuke", "prsync", "pslurp", "pscp", "pssh-askpass"]], -- data_files=[('man/man1', ['man/man1/pssh.1'])], -+ data_files=[('share/man/man1', ['man/man1/pssh.1'])], +- data_files=[('man/man1', ['man/man1/pssh.1', 'man/man1/pscp.1', ++ data_files=[('share/man/man1', ['man/man1/pssh.1', 'man/man1/pscp.1', + 'man/man1/prsync.1', 'man/man1/pslurp.1', 'man/man1/pnuke.1'])], ) ++++++ pssh-remove_shebangs.patch ++++++ --- /var/tmp/diff_new_pack.0x2XAB/_old 2012-03-17 13:22:55.000000000 +0100 +++ /var/tmp/diff_new_pack.0x2XAB/_new 2012-03-17 13:22:55.000000000 +0100 @@ -1,22 +1,21 @@ ---- psshlib/askpass_server.py.orig 2010-03-06 10:38:40.000000000 +0100 -+++ psshlib/askpass_server.py 2010-03-06 10:38:57.000000000 +0100 +--- psshlib/askpass_server.py.orig 2012-03-13 15:37:00.347260022 -0400 ++++ psshlib/askpass_server.py 2012-03-13 15:37:28.901903040 -0400 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- Mode: python -*- - # Copyright (c) 2009, Andrew McNabb ---- psshlib/askpass_client.py.orig 2010-03-06 10:38:45.000000000 +0100 -+++ psshlib/askpass_client.py 2010-03-06 10:38:54.000000000 +0100 + # Copyright (c) 2009-2012, Andrew McNabb +--- psshlib/askpass_client.py.orig 2012-03-13 15:37:16.303060548 -0400 ++++ psshlib/askpass_client.py 2012-03-13 15:37:37.266798463 -0400 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- Mode: python -*- - # Copyright (c) 2009, Andrew McNabb ---- test/test.py.orig 2011-04-28 14:01:40.769822000 +0200 -+++ test/test.py 2011-04-28 14:01:45.027437000 +0200 -@@ -1,5 +1,3 @@ + # Copyright (c) 2009-2012, Andrew McNabb +--- test/test.py.orig 2012-03-13 15:37:51.826616442 -0400 ++++ test/test.py 2012-03-13 15:37:57.454546082 -0400 +@@ -1,4 +1,3 @@ -#!/usr/bin/python -- + # Copyright (c) 2009, Andrew McNabb # Copyright (c) 2003-2008, Brent N. Chun - ++++++ pssh_quiet.patch ++++++ --- /var/tmp/diff_new_pack.0x2XAB/_old 2012-03-17 13:22:55.000000000 +0100 +++ /var/tmp/diff_new_pack.0x2XAB/_new 2012-03-17 13:22:55.000000000 +0100 @@ -1,14 +1,7 @@ -commit f0c10276e6bfd3f61648d0a19a5d1d1c194c4080 -Author: Dejan Muhamedagic <dejan(a)suse.de> -Date: Mon Aug 8 16:50:04 2011 +0200 - - add --quiet option - -diff --git a/man/man1/pssh.1 b/man/man1/pssh.1 -index bb1b4d3..fcc40bd 100644 ---- a/man/man1/pssh.1 -+++ b/man/man1/pssh.1 -@@ -7,7 +7,7 @@ pssh \(em parallel ssh program +diff -aur pssh-2.3.1.orig/man/man1/pssh.1 pssh-2.3.1/man/man1/pssh.1 +--- pssh-2.3.1.orig/man/man1/pssh.1 2012-02-02 11:13:09.000000000 -0500 ++++ pssh-2.3.1/man/man1/pssh.1 2012-03-15 21:00:50.289055042 -0400 +@@ -7,7 +7,7 @@ .SH SYNOPSIS .B pssh @@ -17,7 +10,7 @@ .RB [ \-h .IR hosts_file ] .RB [ \-H -@@ -31,7 +31,7 @@ pssh \(em parallel ssh program +@@ -31,7 +31,7 @@ .I command ... .B pssh \-I @@ -26,7 +19,7 @@ .RB [ \-h .IR hosts_file ] .RB [ \-H -@@ -224,6 +224,15 @@ and +@@ -237,6 +237,15 @@ options. .TP @@ -42,11 +35,10 @@ .B \-I .PD 0 .TP -diff --git a/psshlib/cli.py b/psshlib/cli.py -index 1686ba9..e11645a 100644 ---- a/psshlib/cli.py -+++ b/psshlib/cli.py -@@ -42,6 +42,8 @@ def common_parser(): +diff -aur pssh-2.3.1.orig/psshlib/cli.py pssh-2.3.1/psshlib/cli.py +--- pssh-2.3.1.orig/psshlib/cli.py 2012-02-02 11:13:09.000000000 -0500 ++++ pssh-2.3.1/psshlib/cli.py 2012-03-15 21:09:54.406252639 -0400 +@@ -44,6 +44,8 @@ metavar='OPTION', help='SSH option (OPTIONAL)') parser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='turn on warning and diagnostic messages (OPTIONAL)') @@ -55,7 +47,7 @@ parser.add_option('-A', '--askpass', dest='askpass', action='store_true', help='Ask for a password (OPTIONAL)') parser.add_option('-x', '--extra-args', action='callback', type='string', -@@ -63,6 +65,7 @@ def common_defaults(**kwargs): +@@ -65,6 +67,7 @@ ('errdir', 'PSSH_ERRDIR'), ('timeout', 'PSSH_TIMEOUT'), ('verbose', 'PSSH_VERBOSE'), @@ -63,11 +55,10 @@ ('print_out', 'PSSH_PRINT'), ('askpass', 'PSSH_ASKPASS'), ('inline', 'PSSH_INLINE'), -diff --git a/psshlib/task.py b/psshlib/task.py -index 28136bf..2fe362a 100644 ---- a/psshlib/task.py -+++ b/psshlib/task.py -@@ -56,6 +56,7 @@ class Task(object): +diff -aur pssh-2.3.1.orig/psshlib/task.py pssh-2.3.1/psshlib/task.py +--- pssh-2.3.1.orig/psshlib/task.py 2012-02-02 11:13:09.000000000 -0500 ++++ pssh-2.3.1/psshlib/task.py 2012-03-15 21:12:11.373540315 -0400 +@@ -56,6 +56,7 @@ # Set options. self.verbose = opts.verbose @@ -75,10 +66,10 @@ try: self.print_out = bool(opts.print_out) except AttributeError: -@@ -183,7 +184,10 @@ class Task(object): +@@ -188,7 +189,10 @@ buf = os.read(fd, BUFFER_SIZE) if buf: - if self.inline: + if self.inline or self.inline_stdout: - self.outputbuffer += buf + if self.quiet: + self.outputbuffer += "%s: %s" % (self.host, buf) @@ -87,7 +78,7 @@ if self.outfile: self.writer.write(self.outfile, buf) if self.print_out: -@@ -259,10 +263,11 @@ class Task(object): +@@ -264,10 +268,11 @@ failure = "[FAILURE]" stderr = "Stderr: " host = self.pretty_host @@ -103,7 +94,7 @@ # NOTE: The extra flushes are to ensure that the data is output in # the correct order with the C implementation of io. if self.outputbuffer: -@@ -281,3 +286,4 @@ class Task(object): +@@ -286,3 +291,4 @@ except AttributeError: sys.stdout.write(self.errorbuffer) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Digest-MD4 for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package perl-Digest-MD4 for openSUSE:Factory checked in at 2012-03-17 13:22:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Digest-MD4 (Old) and /work/SRC/openSUSE:Factory/.perl-Digest-MD4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Digest-MD4", Maintainer is "DLovasko(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Digest-MD4/perl-Digest-MD4.changes 2011-11-18 15:47:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Digest-MD4.new/perl-Digest-MD4.changes 2012-03-17 13:22:51.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 6 12:39:51 UTC 2012 - andrea.turrini(a)gmail.com + +- fixed typo in perl-Digest-MD4.spec description + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Digest-MD4.spec ++++++ --- /var/tmp/diff_new_pack.kjDGjF/_old 2012-03-17 13:22:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kjDGjF/_new 2012-03-17 13:22:52.000000000 +0100 @@ -39,7 +39,7 @@ input a message of arbitrary length and produces as output a 128-bit "fingerprint" or "message digest" of the input. -The 'Digest::MD4' module provide a procedural interface for simple use, as +The 'Digest::MD4' module provides a procedural interface for simple use, as well as an object oriented interface that can handle messages of arbitrary length and which can read files directly. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Data-Dump for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package perl-Data-Dump for openSUSE:Factory checked in at 2012-03-17 13:22:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Data-Dump (Old) and /work/SRC/openSUSE:Factory/.perl-Data-Dump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Data-Dump", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Data-Dump/perl-Data-Dump.changes 2011-12-25 17:38:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Data-Dump.new/perl-Data-Dump.changes 2012-03-17 13:22:23.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 7 10:05:16 UTC 2012 - andrea.turrini(a)gmail.com + +- fixed typos in perl-Data-Dump.spec description + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-Dump.spec ++++++ --- /var/tmp/diff_new_pack.ufVL50/_old 2012-03-17 13:22:28.000000000 +0100 +++ /var/tmp/diff_new_pack.ufVL50/_new 2012-03-17 13:22:28.000000000 +0100 @@ -35,8 +35,8 @@ %endif %description -This module provide functions that takes a list of values as their -argument and produces a string as its result. The string contains Perl +This module provides functions that take a list of values as their +argument and produce a string as their result. The string contains Perl code that, when "eval"ed, produces a deep copy of the original arguments. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mono-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package mono-kde4 for openSUSE:Factory checked in at 2012-03-17 13:22:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mono-kde4 (Old) and /work/SRC/openSUSE:Factory/.mono-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mono-kde4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/mono-kde4/mono-kde4.changes 2012-02-02 17:57:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mono-kde4.new/mono-kde4.changes 2012-03-17 13:22:14.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 7 14:45:55 UTC 2012 - idonmez(a)suse.com + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kimono-4.8.0.tar.bz2 New: ---- kimono-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-kde4.spec ++++++ --- /var/tmp/diff_new_pack.aMJ9Oq/_old 2012-03-17 13:22:17.000000000 +0100 +++ /var/tmp/diff_new_pack.aMJ9Oq/_new 2012-03-17 13:22:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: mono-kde4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Kimono Mono-kde library License: LGPL-2.1+ ++++++ kimono-4.8.0.tar.bz2 -> kimono-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-openclipart for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package libreoffice-openclipart for openSUSE:Factory checked in at 2012-03-17 13:22:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice-openclipart (Old) and /work/SRC/openSUSE:Factory/.libreoffice-openclipart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice-openclipart", Maintainer is "pmladek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice-openclipart/libreoffice-openclipart.changes 2011-09-23 02:10:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice-openclipart.new/libreoffice-openclipart.changes 2012-03-17 13:22:05.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 10:45:34 CET 2012 - dmueller(a)suse.de + +- exclude from Build on ARM + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-openclipart.spec ++++++ --- /var/tmp/diff_new_pack.YiXjvP/_old 2012-03-17 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.YiXjvP/_new 2012-03-17 13:22:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-openclipart # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libreoffice-openclipart Url: http://www.documentfoundation.org/ @@ -36,14 +34,14 @@ # OOo uses ugly names for galleries (std_prefix + index + std_suffix) # The openlipart gallery should start from the index 70 %define gal_num_from 70 -License: GPL-2.0+ ; LGPL-2.1+ Summary: Extra Galleries for LibreOffice +License: GPL-2.0+ ; LGPL-2.1+ Group: Productivity/Office/Suite Version: 3.4 -Release: 1 -AutoReqProv: on +Release: 0 # OOo-2.x with link-to-ooo-home script is required -Requires: libreoffice >= 3.3.98, libreoffice < 3.4.98 +Requires: libreoffice < 3.4.98 +Requires: libreoffice >= 3.3.98 Requires: libreoffice-filters-optional >= 3.3.98 # this package includes only thumbnails, the original clipart is still neeeded %requires_eq openclipart-svg @@ -61,6 +59,8 @@ Source: libreoffice-openclipart.blacklist BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +#!ExclusiveArch: %ix86 x86_64 ppc +ExcludeArch: %arm ia64 s390 s390x %description This package contains an extensive set of extra galleries for -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gwenhywfar for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package gwenhywfar for openSUSE:Factory checked in at 2012-03-17 13:21:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenhywfar (Old) and /work/SRC/openSUSE:Factory/.gwenhywfar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gwenhywfar", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gwenhywfar/gwenhywfar.changes 2012-01-11 15:37:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gwenhywfar.new/gwenhywfar.changes 2012-03-17 13:21:44.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 9 07:37:01 UTC 2012 - Nico.Laus.2001(a)gmx.de + +- Update to version 4.3.2: + + fixes network problems on Windows + +------------------------------------------------------------------- Old: ---- gwenhywfar-4.3.1.tar.gz New: ---- gwenhywfar-4.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenhywfar.spec ++++++ --- /var/tmp/diff_new_pack.q9VG7K/_old 2012-03-17 13:21:54.000000000 +0100 +++ /var/tmp/diff_new_pack.q9VG7K/_new 2012-03-17 13:21:54.000000000 +0100 @@ -18,14 +18,14 @@ Name: gwenhywfar -Version: 4.3.1 +Version: 4.3.2 Release: 1 License: GPL-2.0+ ; LGPL-2.1+ Summary: Multiplatform Helper Library for Other Libraries Url: http://www.aqbanking.de/ Group: System/Libraries Source: %{name}-%{version}.tar.gz -#Source: http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65… +#Source: http://www.aquamaniac.de/sites/download/download.php?package=01&release=66&… BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gnutls-devel ++++++ gwenhywfar-4.3.1.tar.gz -> gwenhywfar-4.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/ChangeLog new/gwenhywfar-4.3.2/ChangeLog --- old/gwenhywfar-4.3.1/ChangeLog 2011-12-17 17:33:46.000000000 +0100 +++ new/gwenhywfar-4.3.2/ChangeLog 2012-03-06 22:56:00.000000000 +0100 @@ -1,4 +1,29 @@ ------------------------------------------------------------------ +2012-03-06 21:55:57 +0000 martin +Prepared release 4.3.2. +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2136 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2012-03-06 21:55:52 +0000 martin +Fixed a typo which could crash an application. +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2135 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2012-03-02 23:12:33 +0000 martin +Fixed a problem with GWEN_SYNCIO files on win32. +Open files need to have the status "connected", otherwise AqBanking's +importers will bail out... + +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2134 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ +2012-01-20 18:03:48 +0000 martin +Adapted to latest gcc. +Idea provided by Bill Nottingham. + +git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2133 70169cfe-8b10-0410-8925-dcb4b91034d8 + +------------------------------------------------------------------ 2011-12-17 16:33:41 +0000 martin Prepared 4.3.1. git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2132 70169cfe-8b10-0410-8925-dcb4b91034d8 @@ -572,27 +597,3 @@ 2011-02-15 20:40:23 +0000 martin Prepared release 4.0.6. git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2037 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2011-02-13 21:26:20 +0000 martin -Updated de.po. -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2036 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2011-02-13 21:26:17 +0000 martin -Adapted plugin description files to latest changes. -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2035 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2011-02-13 21:26:11 +0000 martin -Changed I18N handling for plugin description files. -Now we use "po4a" to include translations for plugin descriptions in the -standard *.po files. -With this change all translation is now concentrated in the *.po files. - -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2034 70169cfe-8b10-0410-8925-dcb4b91034d8 - ------------------------------------------------------------------- -2011-02-13 13:12:23 +0000 martin -Applied a patch by Thomas Baumgart to keep the focus chain intact in QT4 GUI -git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2033 70169cfe-8b10-0410-8925-dcb4b91034d8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/configure new/gwenhywfar-4.3.2/configure --- old/gwenhywfar-4.3.1/configure 2011-12-10 23:26:04.000000000 +0100 +++ new/gwenhywfar-4.3.2/configure 2012-03-06 22:54:21.000000000 +0100 @@ -2745,7 +2745,7 @@ # GWENHYWFAR_VERSION_MAJOR=4 GWENHYWFAR_VERSION_MINOR=3 -GWENHYWFAR_VERSION_PATCHLEVEL=1 +GWENHYWFAR_VERSION_PATCHLEVEL=2 GWENHYWFAR_VERSION_BUILD=0 GWENHYWFAR_VERSION_TAG="stable" @@ -2757,7 +2757,7 @@ # GWENHYWFAR_SO_CURRENT="63" GWENHYWFAR_SO_AGE="3" -GWENHYWFAR_SO_REVISION="1" +GWENHYWFAR_SO_REVISION="2" GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/configure.ac new/gwenhywfar-4.3.2/configure.ac --- old/gwenhywfar-4.3.1/configure.ac 2011-12-10 23:25:52.000000000 +0100 +++ new/gwenhywfar-4.3.2/configure.ac 2012-03-06 22:54:08.000000000 +0100 @@ -29,7 +29,7 @@ # GWENHYWFAR_VERSION_MAJOR=4 GWENHYWFAR_VERSION_MINOR=3 -GWENHYWFAR_VERSION_PATCHLEVEL=1 +GWENHYWFAR_VERSION_PATCHLEVEL=2 GWENHYWFAR_VERSION_BUILD=0 dnl "stable", "rcX", "betaX", "cvs" GWENHYWFAR_VERSION_TAG="stable" @@ -42,7 +42,7 @@ # GWENHYWFAR_SO_CURRENT="63" GWENHYWFAR_SO_AGE="3" -GWENHYWFAR_SO_REVISION="1" +GWENHYWFAR_SO_REVISION="2" GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/gui/fox16/fox16_gui_dialog.cpp new/gwenhywfar-4.3.2/gui/fox16/fox16_gui_dialog.cpp --- old/gwenhywfar-4.3.1/gui/fox16/fox16_gui_dialog.cpp 2010-08-19 17:08:20.000000000 +0200 +++ new/gwenhywfar-4.3.2/gui/fox16/fox16_gui_dialog.cpp 2012-03-05 18:18:38.000000000 +0100 @@ -283,7 +283,9 @@ FXint lo, hi; f->getRange(lo, hi); - lo=value; + hi=value; + if (hi<lo) + hi=lo; f->setRange(lo, hi); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/gui/qt4/libtest.cpp new/gwenhywfar-4.3.2/gui/qt4/libtest.cpp --- old/gwenhywfar-4.3.1/gui/qt4/libtest.cpp 2010-07-14 12:58:21.000000000 +0200 +++ new/gwenhywfar-4.3.2/gui/qt4/libtest.cpp 2012-01-20 19:01:30.000000000 +0100 @@ -11,6 +11,9 @@ #include <qapplication.h> +#include <unistd.h> + + int test1(int argc, char **argv) { QApplication a(argc, argv); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/gwenhywfar.spec new/gwenhywfar-4.3.2/gwenhywfar.spec --- old/gwenhywfar-4.3.1/gwenhywfar.spec 2011-12-10 23:26:10.000000000 +0100 +++ new/gwenhywfar-4.3.2/gwenhywfar.spec 2012-03-06 22:54:26.000000000 +0100 @@ -3,7 +3,7 @@ %define name gwenhywfar -%define version 4.3.1 +%define version 4.3.2 %define rpm_cxxflags \"-O2 -march=i486 -mcpu=i586\" %define rpm_cflags \"-O2 -march=i486 -mcpu=i586\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/src/os/windows/syncio_file.c new/gwenhywfar-4.3.2/src/os/windows/syncio_file.c --- old/gwenhywfar-4.3.1/src/os/windows/syncio_file.c 2011-06-13 17:48:11.000000000 +0200 +++ new/gwenhywfar-4.3.2/src/os/windows/syncio_file.c 2012-03-03 00:09:59.000000000 +0100 @@ -95,6 +95,7 @@ xio->path=strdup(hname); xio->fh=hd; + GWEN_SyncIo_SetStatus(sio, GWEN_SyncIo_Status_Connected); GWEN_SyncIo_SetConnectFn(sio, GWEN_SyncIo_File_Connect); GWEN_SyncIo_SetDisconnectFn(sio, GWEN_SyncIo_File_Disconnect); @@ -215,6 +216,7 @@ } xio->fh=fh; + GWEN_SyncIo_SetStatus(sio, GWEN_SyncIo_Status_Connected); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/src/ressource.rc new/gwenhywfar-4.3.2/src/ressource.rc --- old/gwenhywfar-4.3.1/src/ressource.rc 2011-12-10 23:26:10.000000000 +0100 +++ new/gwenhywfar-4.3.2/src/ressource.rc 2012-03-06 22:54:27.000000000 +0100 @@ -43,8 +43,8 @@ // Version VS_VERSION_INFO VERSIONINFO - FILEVERSION 4, 3, 1, 0 - PRODUCTVERSION 4, 3, 1, 0 + FILEVERSION 4, 3, 2, 0 + PRODUCTVERSION 4, 3, 2, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L // Windows NT @@ -58,14 +58,14 @@ //VALUE "Comments", "\0" VALUE "CompanyName", " Aquamaniac\0" VALUE "FileDescription", "Multi purpose library\0" - VALUE "FileVersion", "v4.3.1\0" + VALUE "FileVersion", "v4.3.2\0" VALUE "InternalName", "Gwenhywfar\0" VALUE "LegalCopyright", "Copyright � 2003 by Martin Preuss\0" VALUE "LegalTrademarks", "Aquamaniac\0" VALUE "OriginalFilename", "GWENHYWFAR32.DLL\0" //VALUE "PrivateBuild", "\0" VALUE "ProductName", "Gwenhywfar\0" - VALUE "ProductVersion", "v4.3.1stable-0\0" + VALUE "ProductVersion", "v4.3.2stable-0\0" VALUE "Author", "Martin Preuss\0" VALUE "Email", "martin(a)libchipcard.de\0" VALUE "Homepage", "http://gwenhywfar.sf.net/\0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.3.1/src/version.h new/gwenhywfar-4.3.2/src/version.h --- old/gwenhywfar-4.3.1/src/version.h 2011-12-10 23:26:10.000000000 +0100 +++ new/gwenhywfar-4.3.2/src/version.h 2012-03-06 22:54:27.000000000 +0100 @@ -32,11 +32,11 @@ #define GWEN_VERSION_MAJOR 4 #define GWENHYWFAR_VERSION_MAJOR 4 #define GWENHYWFAR_VERSION_MINOR 3 -#define GWENHYWFAR_VERSION_PATCHLEVEL 1 +#define GWENHYWFAR_VERSION_PATCHLEVEL 2 #define GWENHYWFAR_VERSION_BUILD 0 #define GWENHYWFAR_VERSION_TAG "stable" -#define GWENHYWFAR_VERSION_FULL_STRING "4.3.1stable-0" -#define GWENHYWFAR_VERSION_STRING "4.3.1" +#define GWENHYWFAR_VERSION_FULL_STRING "4.3.2stable-0" +#define GWENHYWFAR_VERSION_STRING "4.3.2" #define GWENHYWFAR_SO_EFFECTIVE 60 #define GWENHYWFAR_SO_EFFECTIVE_STR "60" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcitx-cloudpinyin for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package fcitx-cloudpinyin for openSUSE:Factory checked in at 2012-03-17 13:21:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-cloudpinyin (Old) and /work/SRC/openSUSE:Factory/.fcitx-cloudpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx-cloudpinyin", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-cloudpinyin.new/fcitx-cloudpinyin.changes 2012-03-17 13:21:09.000000000 +0100 @@ -0,0 +1,36 @@ +------------------------------------------------------------------- +Mon Mar 12 13:36:14 UTC 2012 - hillwoodroc(a)gmail.com + +- Update to 0.2.1 + Change http to https for google + +------------------------------------------------------------------- +Wed Feb 29 20:28:35 UTC 2012 - i(a)marguerite.su + +- set _service disabled. update source from git. + +------------------------------------------------------------------- +Sat Jan 28 08:22:54 UTC 2012 - i(a)marguerite.su + +- Upstream version 0.2.0git + +------------------------------------------------------------------- +Sun Oct 2 20:17:17 UTC+8 2011 - hillwood(a)linuxfans.org + +- Update to 0.1.2 + Add Baidu Cloud Pinyin as a new source + Fcitx built-in Pinyin can now memorize content Cloud Pinyin has inputed. + Sunpinyin cant because of its API limitation. + +------------------------------------------------------------------- +Fri Sep 9 00:00:00 UTC 2011 - hillwood(a)linuxfans.org + +- update to 0.1.1 + +------------------------------------------------------------------- +Wed Sep 7 00:00:00 UTC 2011 - hillwood(a)linuxfans.org +- rewrite spec file. + +------------------------------------------------------------------- +Tue Sep 6 00:00:00 UTC 2011 - mymathersname(a)gmail.com +- first build for Fedora. New: ---- _service fcitx-cloudpinyin-0.2.1.tar.xz fcitx-cloudpinyin.changes fcitx-cloudpinyin.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-cloudpinyin.spec ++++++ # # spec file for package fcitx-cloudpinyin # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: fcitx-cloudpinyin Version: 0.2.1 Release: 1 Summary: Cloudpinyin module for fcitx Group: System/I18n/Chinese License: GPL-2.0+ Url: http://code.google.com/p/fcitx BuildRequires: xz BuildRequires: cmake BuildRequires: fcitx-devel BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libcurl-devel BuildRequires: pkg-config Source: https://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Cloulpinyin is an based cloud compute input method %prep %setup -q -n %{name}-%{version} %build mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_INSTALL_DIR=%{_libdir} \ .. make %install pushd build make DESTDIR=$RPM_BUILD_ROOT install popd %{__strip} %{buildroot}%{_libdir}/fcitx/%{name}.so %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) %{_libdir}/fcitx %{_datadir}/fcitx/* %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">http://github.com/fcitx/fcitx-cloudpinyin.git</param><param name="versionprefix">0.2.0git</param><param name="scm">git</param></service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">bz2</param> </service> <service name="set_version" mode="disabled"/> </services> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit farstream for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package farstream for openSUSE:Factory checked in at 2012-03-17 13:20:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/farstream (Old) and /work/SRC/openSUSE:Factory/.farstream.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "farstream", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.farstream.new/farstream.changes 2012-03-17 13:20:56.000000000 +0100 @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 14 08:28:00 UTC 2012 - vuntz(a)opensuse.org + +- Change license of source package to "GPL-2.0+ and LGPL-2.1+" + because of the license of some tools from the tarball used during + the build. This does not affect the license of the binary + packages. Fix bnc#751720. + +------------------------------------------------------------------- +Tue Feb 21 09:55:04 UTC 2012 - vuntz(a)opensuse.org + +- Initial packaging (version 0.1.1). New: ---- farstream-0.1.1.tar.gz farstream.changes farstream.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ farstream.spec ++++++ # # spec file for package farstream # # Copyright (c) 2011 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: farstream Version: 0.1.1 Release: 1 # License note: the only GPL-2.0+ files are farstream-0.1.1/common/coverage/* # and common/gstdoc-scangobj; those are just used during the build and do not # affect the license of the binary packages License: GPL-2.0+ and LGPL-2.1+ Summary: GStreamer modules and libraries for videoconferencing Url: http://farsight.freedesktop.org/ Group: Productivity/Multimedia/Other Source: http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{vers… BuildRequires: fdupes BuildRequires: glib2-devel >= 2.26 BuildRequires: gobject-introspection-devel >= 0.10.1 BuildRequires: gstreamer-0_10-devel >= 0.10.33 BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.33 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.16 BuildRequires: pkgconfig(gst-python-0.10) >= 0.10.10 BuildRequires: pkgconfig(gupnp-igd-1.0) BuildRequires: pkgconfig(nice) >= 0.1.0 BuildRequires: pkgconfig(pygobject-2.0) >= 2.16.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Farstream is a collection of GStreamer modules and libraries for videoconferencing. %package -n libfarstream-0_1-0 License: LGPL-2.1+ Summary: GStreamer modules and libraries for videoconferencing Group: System/Libraries Requires: %{name}-data # While not strictly needed, apps using farstream will need the gstreamer # plugins, so simply put a Requires here instead of in all apps Requires: gstreamer-0_10-plugins-farstream %description -n libfarstream-0_1-0 Farstream is a collection of GStreamer modules and libraries for videoconferencing. %package -n typelib-1_0-Farstream-0_1 License: LGPL-2.1+ Summary: GStreamer modules and libraries for videoconferencing -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Farstream-0_1 Farstream is a collection of GStreamer modules and libraries for videoconferencing. This package provides the GObject Introspection bindings for Farstream. %package -n gstreamer-0_10-plugins-farstream License: LGPL-2.1+ Summary: GStreamer Plug-Ins for videoconferencing Group: Productivity/Multimedia/Other Requires: gstreamer-0_10-plugins-bad >= 0.10.23 Requires: gstreamer-0_10-plugins-good >= 0.10.29 # Unfortunately, the gstreamer elements have the same name Conflicts: libgstfarsight-0_10-0 %description -n gstreamer-0_10-plugins-farstream Farstream is a collection of GStreamer modules and libraries for videoconferencing. %package data License: LGPL-2.1+ Summary: GStreamer modules and libraries for videoconferencing -- Codec preferences Group: System/Libraries BuildArch: noarch %description data Farstream is a collection of GStreamer modules and libraries for videoconferencing. This package contains data (codec preferences, element properties) used by the library. %package devel License: LGPL-2.1+ Summary: GStreamer modules and libraries for videoconferencing -- Development files Group: Development/Libraries/C and C++ Requires: libfarstream-0_1-0 = %{version} Requires: typelib-1_0-Farstream-0_1 = %{version} %description devel Farstream is a collection of GStreamer modules and libraries for videoconferencing. %package -n python-farstream License: LGPL-2.1+ Summary: GStreamer modules and libraries for videoconferencing -- Python bindings Group: Development/Libraries/Python Requires: libfarstream-0_1-0 = %{version} %py_requires %description -n python-farstream Farstream is a collection of GStreamer modules and libraries for videoconferencing. %prep %setup -q %build %configure \ --disable-static make %{?_smp_mflags} %install %make_install find %{buildroot} -name '*.la' -delete -print %fdupes %{buildroot}%{_datadir}/gtk-doc/html/ %post -n libfarstream-0_1-0 -p /sbin/ldconfig %postun -n libfarstream-0_1-0 -p /sbin/ldconfig %files -n libfarstream-0_1-0 %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/libfarstream-0.1.so.* %dir %{_libdir}/farstream-0.1/ %{_libdir}/farstream-0.1/libmulticast-transmitter.so %{_libdir}/farstream-0.1/libnice-transmitter.so %{_libdir}/farstream-0.1/librawudp-transmitter.so %{_libdir}/farstream-0.1/libshm-transmitter.so %files -n typelib-1_0-Farstream-0_1 %defattr(-, root, root) %{_libdir}/girepository-1.0/Farstream-0.1.typelib %files -n gstreamer-0_10-plugins-farstream %defattr(-,root,root) %{_libdir}/gstreamer-0.10/libfsfunnel.so %{_libdir}/gstreamer-0.10/libfsmsnconference.so %{_libdir}/gstreamer-0.10/libfsrawconference.so %{_libdir}/gstreamer-0.10/libfsrtcpfilter.so %{_libdir}/gstreamer-0.10/libfsrtpconference.so %{_libdir}/gstreamer-0.10/libfsvideoanyrate.so %files data %defattr(-, root, root) %dir %{_datadir}/farstream/ %dir %{_datadir}/farstream/0.1/ %dir %{_datadir}/farstream/0.1/fsrtpconference/ %{_datadir}/farstream/0.1/fsrtpconference/default-codec-preferences %{_datadir}/farstream/0.1/fsrtpconference/default-element-properties %files devel %defattr(-,root,root) %{_includedir}/farstream-0.1/ %{_libdir}/libfarstream-0.1.so %{_libdir}/pkgconfig/farstream-0.1.pc %{_datadir}/gir-1.0/Farstream-0.1.gir %doc %{_datadir}/gtk-doc/html/farstream-libs-0.10/ %doc %{_datadir}/gtk-doc/html/farstream-plugins-0.1/ %files -n python-farstream %defattr(-,root,root) %{py_sitedir}/farstream.so %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dietlibc for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package dietlibc for openSUSE:Factory checked in at 2012-03-17 13:20:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dietlibc (Old) and /work/SRC/openSUSE:Factory/.dietlibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dietlibc", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dietlibc/dietlibc.changes 2012-02-14 19:00:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dietlibc.new/dietlibc.changes 2012-03-17 13:20:41.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 15:37:08 UTC 2012 - dvaleev(a)suse.com + +- fix ppc and ppc64 builds + +------------------------------------------------------------------- New: ---- dietlibc-ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dietlibc.spec ++++++ --- /var/tmp/diff_new_pack.iE7R8V/_old 2012-03-17 13:20:43.000000000 +0100 +++ /var/tmp/diff_new_pack.iE7R8V/_new 2012-03-17 13:20:43.000000000 +0100 @@ -36,6 +36,7 @@ Patch32: %{name}-0.30-pause.diff Patch33: parisc-clone.S-fix-build-failure-on-hppa.diff Patch34: fix-arm-regex-in-makefile.diff +Patch35: dietlibc-ppc.patch Url: http://www.fefe.de/dietlibc/ Summary: A Libc Optimized for Small Size License: GPL-2.0+ @@ -58,6 +59,7 @@ %patch32 %patch33 -p1 %patch34 +%patch35 -p1 %build MY_RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's,-O2,-Os,' \ ++++++ dietlibc-ppc.patch ++++++ Index: dietlibc-0.31/ppc/start.S =================================================================== --- dietlibc-0.31.orig/ppc/start.S +++ dietlibc-0.31/ppc/start.S @@ -38,7 +38,7 @@ _start: bl CALL_IN_STARTCODE #endif b exit -.size _start,.-_start +.size ._start,.-._start /* Define a symbol for the first piece of initialized data. */ Index: dietlibc-0.31/ppc64/start.S =================================================================== --- dietlibc-0.31.orig/ppc64/start.S +++ dietlibc-0.31/ppc64/start.S @@ -78,7 +78,7 @@ _start: .ascii "_start" .LT_start_name_end: .align 2 - .size _start,.-_start + .size ._start,.-._start /* Define a symbol for the first piece of initialized data. */ .section ".data" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dd_rescue for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package dd_rescue for openSUSE:Factory checked in at 2012-03-17 13:20:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dd_rescue (Old) and /work/SRC/openSUSE:Factory/.dd_rescue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dd_rescue", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dd_rescue/dd_rescue.changes 2012-02-10 17:12:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dd_rescue.new/dd_rescue.changes 2012-03-17 13:20:35.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 12 17:42:25 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to version 1.25: + * Fix for spurious "Success" messages that resulted from overwritten + (cleared) errno. Bad blocks are formatted in a way that they are not + overwritten on screen and block numbers are output as unsigned. +- Removed dd_rhelp from the package (dd_rhelp will become a separate package. A + recommended entry for dd_rhelp was added in dd_rescue). +- Spec file updates: + * Updated License: to "GPL-2.0 or GPL-3.0". + * Removed bc from BuildRequires: (not needed since dd_rhelp was removed). + +------------------------------------------------------------------- Old: ---- dd_rescue-1.24.tar.gz dd_rhelp-0.1.2.tar.gz dd_rhelp.test.diff dd_rhelp_EOF.diff dd_rhelp_Summary.diff ddresc-112.diff New: ---- dd_rescue-1.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dd_rescue.spec ++++++ --- /var/tmp/diff_new_pack.lnG5OG/_old 2012-03-17 13:20:37.000000000 +0100 +++ /var/tmp/diff_new_pack.lnG5OG/_new 2012-03-17 13:20:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dd_rescue # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,33 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define ddrescuever 1.24 -%define ddrhelpver 0.1.2 - Name: dd_rescue -Version: %{ddrescuever}_%{ddrhelpver} -Release: 1 +Version: 1.25 +Release: 0 Summary: Data Copying in the Presence of I/O Errors - -License: GPL-2.0 +License: GPL-2.0 or GPL-3.0 Url: http://www.garloff.de/kurt/linux/ddrescue/ Group: System/Base -Source0: http://www.garloff.de/kurt/linux/ddrescue/%{name}-%{ddrescuever}.tar.gz -Source1: http://www.kalysto.org/pkg/dd_rhelp-%{ddrhelpver}.tar.gz -# PATCH-FIX-OPENSUSE ddresc-112.diff garloff(a)suse.de -- Use -y0 if ddrescue is 1.12 or newer -Patch0: ddresc-112.diff -# PATCH-FIX-OPENSUSE dd_rhelp_EOF.diff garloff(a)suse.de -- Adjust dd_rhelp to changes in dd_rescue -Patch1: dd_rhelp_EOF.diff -# PATCH-FIX-OPENSUSE dd_rhelp_Summary.diff garloff(a)suse.de -- dd_rhelp adjusted for Summary change -Patch2: dd_rhelp_Summary.diff -# PATCH-FIX-OPENSUSE dd_rhelp.test.diff garloff(a)suse.de -- Fix dd_rhelp.test script (basic regression test) -Patch3: dd_rhelp.test.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -BuildRequires: libfallocate-devel-static bc +Source0: http://www.garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.gz +BuildRequires: libfallocate-devel-static Requires: bc -Provides: ddrescue = %{ddrescuever} -Obsoletes: ddrescue < %{ddrescuever} +Recommends: dd_rhelp +# ddrescue was last used in openSUSE 11.4 (version 1.14_0.0.6) +Provides: ddrescue = %{version} +Obsoletes: ddrescue < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description dd_rescue helps when nothing else can: your disk has crashed and you @@ -49,16 +37,7 @@ cat, and dd wail "abort" on every I/O error, dd_rescue does not. %prep -%setup -q -n dd_rescue -a1 -cd dd_rhelp-%{ddrhelpver} -%patch0 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -for name in AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO; do - cp -p $name ${name}.dd_rhelp -done -cd .. +%setup -q -n dd_rescue # Remove build time references so build-compare can do its work FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') @@ -72,31 +51,18 @@ %install make install DESTDIR=%{buildroot} INSTALLDIR=%{buildroot}/%{_bindir} \ INSTASROOT= INSTALLFLAGS= -cd dd_rhelp-%{ddrhelpver} -install -Dpm 0755 dd_rhelp %{buildroot}/%{_bindir} + #UsrMerge mkdir %{buildroot}/bin ln -sf %{_bindir}/dd_rescue %{buildroot}/bin -ln -sf %{_bindir}/dd_rhelp %{buildroot}/bin #EndUsrMerge -cd .. - -%check -cd dd_rhelp-%{ddrhelpver} -export PATH=..:$PATH -./dd_rhelp.test -cd .. %files %defattr(-,root,root,-) %doc COPYING README.dd_rescue -%doc dd_rhelp-%{ddrhelpver}/*.dd_rhelp -%doc dd_rhelp-%{ddrhelpver}/doc %{_bindir}/dd_rescue -%{_bindir}/dd_rhelp #UsrMerge /bin/dd_rescue -/bin/dd_rhelp #EndUsrMerge %changelog ++++++ dd_rescue-1.24.tar.gz -> dd_rescue-1.25.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dd_rescue/Makefile new/dd_rescue/Makefile --- old/dd_rescue/Makefile 2011-10-04 15:15:12.000000000 +0200 +++ new/dd_rescue/Makefile 2012-01-22 14:48:54.000000000 +0100 @@ -1,13 +1,13 @@ # Makefile for dd_rescue # (c) garloff(a)suse.de, 99/10/09, GNU GPL -# $Id: Makefile,v 1.38 2011/10/04 13:15:12 garloff Exp $ +# $Id: Makefile,v 1.39 2012/01/22 13:40:34 garloff Exp $ -VERSION = 1.24 +VERSION = 1.25 DESTDIR = CC = gcc -RPM_OPT_FLAGS = -O2 -Wall -g +RPM_OPT_FLAGS = -Os -Wall -g CFLAGS = $(RPM_OPT_FLAGS) $(EXTRA_CFLAGS) INSTALL = install INSTALLFLAGS = -s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dd_rescue/dd_rescue.c new/dd_rescue/dd_rescue.c --- old/dd_rescue/dd_rescue.c 2011-10-04 14:15:37.000000000 +0200 +++ new/dd_rescue/dd_rescue.c 2012-02-04 14:12:53.000000000 +0100 @@ -1,16 +1,29 @@ /* dd_rescue.c */ /* - * dd_rescue copies your data from one file to another. - * Files might as well be block devices, such as hd partitions. - * Unlike dd, it does not necessarily abort on errors but - * continues to copy the disk, possibly leaving holes behind. - * Also, it does NOT truncate the output file, so you can copy - * more and more pieces of your data, as time goes by. - * This tool is thus suitable for rescueing data of crashed disk, - * and that's the reason it has been written by me. + * dd_rescue copies your data from one file to another. Files might as well be + * block devices, such as hd partitions. Unlike dd, it does not necessarily + * abort on errors but continues to copy the disk, possibly leaving holes + * behind. Also, it does NOT truncate the output file, so you can copy more + * and more pieces of your data, as time goes by. This tool is thus suitable + * for rescueing data of crashed disk, and that's the reason it has been + * written by me. * - * (c) Kurt Garloff <garloff(a)suse.de>, 11/97, 10/99 - * Copyright: GNU GPL + * Copyright (C) Kurt Garloff <kurt(a)garloff.de>, 11/1997 -- 01/2012 + * License: GNU GPL v2 or v3 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place, Suite 330, Boston, MA 02111-1307 USA * * Improvements from LAB Valentin, see * http://www.tharbad.ath.cx/~vaab/kalysto/Utilities/dd_rhelp/dd_rhelp_en.html @@ -22,6 +35,7 @@ * - Better handling of write errors: also try sub blocks * - Optional colors * - Use dlopen to open libfallocate rather than linking to it ... + * - Display more infos on errors by collecting info from syslog */ #ifndef VERSION @@ -31,7 +45,7 @@ # define "(unknown compiler)" #endif -#define ID "$Id: dd_rescue.c,v 1.116 2011/09/25 23:27:46 garloff Exp $" +#define ID "$Id: dd_rescue.c,v 1.118 2012/02/04 13:12:53 garloff Exp $" #ifndef SOFTBLOCKSIZE # define SOFTBLOCKSIZE 65536 @@ -92,7 +106,7 @@ #endif -int softbs, hardbs, syncfreq; +unsigned int softbs, hardbs, syncfreq; int maxerr, nrerr, reverse, dotrunc, abwrerr, sparse, nosparse; int verbose, quiet, interact, force; unsigned char* buf; @@ -442,14 +456,17 @@ } } -static void savebb(int block) +static void savebb(unsigned long block) { FILE *bbfile; - fplog(stderr, "Bad block reading %s: %d\n", iname, block); + fplog(stderr, "%s%s%s%sBad block reading %s: %lu %s%s%s%s\n", + up, up, up, up, + iname, block, + down, down, down, down); if (bbname == NULL) return; bbfile = fopen(bbname, "a"); - fprintf(bbfile, "%d\n", block); + fprintf(bbfile, "%lu\n", block); fclose(bbfile); } @@ -605,12 +622,12 @@ return block; } -void exitfatalerr() +void exitfatalerr(const int eno) { - if (errno == ESPIPE || errno == EPERM || errno == ENXIO || errno == ENODEV) { - fplog(stderr, "dd_rescue: (warning): %s (%.1fk): %s!\n", - iname, (float)ipos/1024, strerror(errno)); - fplog(stderr, "dd_rescue: Last error fatal! Exiting ...\n"); + if (eno == ESPIPE || eno == EPERM || eno == ENXIO || eno == ENODEV) { + fplog(stderr, "dd_rescue: (fatal): %s (%.1fk): %s! \n", + iname, (float)ipos/1024, strerror(eno)); + fplog(stderr, "dd_rescue: Last error fatal! Exiting ... \n"); cleanup(); exit(20); } @@ -640,10 +657,11 @@ || (errno == EFBIG && !reverse))) ++fatal; if (rd != wr && !sparse) { + const int eno = errno; fplog(stderr, "dd_rescue: (warning): assumption rd(%i) == wr(%i) failed! \n", rd, wr); fplog(stderr, "dd_rescue: (%s): write %s (%.1fk): %s!\n", (fatal? "fatal": "warning"), oname, - (float)opos/1024, strerror(errno)); + (float)opos/1024, strerror(eno)); fprintf(stderr, "%s%s%s", down, down, down); errno = 0; } @@ -669,10 +687,12 @@ down, down, down, down); #endif while ((toread = blockxfer(max, hardbs)) > 0) { + int eno; ssize_t rd = readblock(toread); + eno = errno; /* EOF */ - if (rd == 0 && !errno) { + if (rd == 0 && !eno) { if (!quiet) fplog(stderr, "dd_rescue: (info): read %s (%.1fk): EOF\n", iname, (float)ipos/1024); @@ -680,18 +700,18 @@ } /* READ ERROR */ if (rd < toread/* && errno*/) { - if (errno) { + if (eno) { ++errs; /* Read error occurred: Print warning */ printstatus(stderr, logfd, hardbs, 1); } /* Some errnos are fatal */ - exitfatalerr(); + exitfatalerr(eno); /* Non fatal error */ /* Real error on small blocks: Don't retry */ nrerr++; fplog(stderr, "dd_rescue: (warning): read %s (%.1fk): %s!\n", - iname, (float)ipos/1024, strerror(errno)); + iname, (float)ipos/1024, strerror(eno)); /* exit if too many errs */ if (maxerr && nrerr >= maxerr) { fplog(stderr, "dd_rescue: (fatal): maxerr reached!\n"); @@ -706,14 +726,15 @@ ssize_t wr = 0; memset(buf+rd, 0, toread-rd); errs += ((wr = writeblock(toread)) < toread ? 1: 0); - if (wr <= 0 && (errno == ENOSPC - || (errno == EFBIG && !reverse))) + eno = errno; + if (wr <= 0 && (eno == ENOSPC + || (eno == EFBIG && !reverse))) return errs; if (toread != wr) { fplog(stderr, "dd_rescue: (warning): assumption toread(%i) == wr(%i) failed! \n", toread, wr); /* fplog(stderr, "dd_rescue: (warning): %s (%.1fk): %s!\n", - oname, (float)opos/1024, strerror(errno)); + oname, (float)opos/1024, strerror(eno)); fprintf(stderr, "%s%s%s%s", down, down, down, down); */ } @@ -745,7 +766,8 @@ int copyfile_softbs(const off_t max) { ssize_t toread; - int errs = 0; errno = 0; + int errs = 0; int eno; + errno = 0; #if 0 fprintf(stderr, "%s%s%s%s copyfile (ipos=%.1fk, xfer=%.1fk, max=%.1fk, bs=%i) ##\n%s%s%s%s", up, up, up, up, @@ -756,12 +778,13 @@ * FIXME: 0 byte writes do NOT expand file */ if (!o_chr) pwrite(odes, buf, 0, opos); - while ((toread = blockxfer(max, softbs)) > 0) { + while ((toread = blockxfer(max, softbs)) > 0) { int err; ssize_t rd = readblock(toread); + eno = errno; /* EOF */ - if (rd == 0 && !errno) { + if (rd == 0 && !eno) { if (!quiet) fplog(stderr, "dd_rescue: (info): read %s (%.1fk): EOF\n", iname, (float)ipos/1024); @@ -771,19 +794,19 @@ if (rd < toread/* && errno*/) { int ret; off_t new_max, old_xfer; - if (errno) { + if (eno) { ++errs; /* Read error occurred: Print warning */ printstatus(stderr, logfd, softbs, 1); } /* Some errnos are fatal */ - exitfatalerr(); + exitfatalerr(eno); /* Non fatal error */ new_max = xfer + toread; /* Error with large blocks: Try small ones ... */ if (verbose) { fprintf(stderr, "dd_rescue: (info): problems at ipos %.1fk: %s \n fall back to smaller blocksize \n%s%s%s%s", - (float)ipos/1024, strerror(errno), down, down, down, down); + (float)ipos/1024, strerror(eno), down, down, down, down); printstatus(stderr, logfd, hardbs, 1); } /* But first: write available data and advance (optimization) */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit darktable for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package darktable for openSUSE:Factory checked in at 2012-03-17 13:20:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/darktable (Old) and /work/SRC/openSUSE:Factory/.darktable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "darktable", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/darktable/darktable.changes 2012-02-29 14:06:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2012-03-17 13:20:25.000000000 +0100 @@ -1,0 +2,37 @@ +Thu Mar 15 07:52:17 UTC 2012 - toganm(a)opensuse.org + +- Upgrade to release 1.0 + + new cameras supported + * Leica M9 + * NX100/NX5/NX10/NX11 + * Panasonic DMC-GX1 + * Pentax K-r + * Canon Powershot S100 + * Olympus XZ-1 + * Olympus E-P3 + * Sony DSLR A330 + * Sony NEX-5N + * Canon EOS 1000D + * Canon EOS 600D + * Sony Alpha 390 + * Fuji Finepix HS20EXR + + new and updated translations (we now have chinese!) + + new image cache + * faster concurrent access and insertion + * reduces needed memory + * more thumbnails stored on disk + * read embedded jpegs for creating thumbnails (faster folder + import) + + increased general speed on sqlite3 (journaled, pagesize + optimizations) + + reworked, modular ui + + keyboard shortcuts support - key accelerators (GSoC) + + quicktool bar: exposure, presets and styles + + new color picker + + web gallery export now with next/prev buttons per image + + removed gconf: not used anymore, we have our own backend + + bugfixes + + there have been issues with memory on 32-bit systems. seems to + be okay currently, but something to keep in mind. use 64-bits + if you can +------------------------------------------------------------------- Old: ---- darktable-0.9.3.tar.bz2 darktable-fix-deprecation.patch New: ---- darktable-1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ darktable.spec ++++++ --- /var/tmp/diff_new_pack.3sSp2a/_old 2012-03-17 13:20:27.000000000 +0100 +++ /var/tmp/diff_new_pack.3sSp2a/_new 2012-03-17 13:20:27.000000000 +0100 @@ -17,12 +17,10 @@ Name: darktable -Version: 0.9.3 +Version: 1.0 Release: 0 Url: http://darktable.sourceforge.net -Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM darktable-fix-deprecation.patch fcrozat(a)suse.com -- fix glib deprecation (git) -Patch0: darktable-fix-deprecation.patch +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel @@ -30,7 +28,6 @@ BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gconf2-devel BuildRequires: gnome-keyring-devel BuildRequires: gtk2-devel BuildRequires: intltool @@ -51,7 +48,6 @@ Summary: A virtual Lighttable and Darkroom License: GPL-3.0+ Group: Productivity/Graphics/Viewers -%gconf_schemas_requires %description darktable is a virtual lighttable and darkroom for photographers: it manages @@ -61,7 +57,6 @@ %prep %setup -q -%patch0 -p1 %build [ ! -d "build" ] && mkdir build @@ -72,7 +67,6 @@ cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL=%{_lib} \ - -DDONT_INSTALL_GCONF_SCHEMAS:BOOLEAN=ON \ -DCMAKE_BUILD_TYPE=Release \ -DBINARY_PACKAGE_BUILD=1 \ -DINSTALL_IOP_EXPERIMENTAL=Off -DINSTALL_IOP_LEGACY=Off .. @@ -82,31 +76,20 @@ cd build %make_install cd .. -%__mkdir_p %{buildroot}%{_sysconfdir}/gconf/schemas -install -m644 data/darktable.schemas %{buildroot}%{_sysconfdir}/gconf/schemas %suse_update_desktop_file darktable find %{buildroot}%{_libdir} -name "*.la" -delete %find_lang darktable -%find_gconf_schemas -cat darktable.schemas_list >> darktable.lang %__mkdir_p %{buildroot}%{_defaultdocdir} %__mv %{buildroot}%{_datadir}/doc/darktable %{buildroot}%{_defaultdocdir} %fdupes %{buildroot} -%pre -f %{name}.schemas_pre - -%preun -f %{name}.schemas_preun - -%posttrans -f %{name}.schemas_posttrans - %files -f darktable.lang %defattr(-,root,root) %doc doc/AUTHORS doc/TODO doc/LICENSE %{_bindir}/darktable %{_bindir}/darktable-cltest -%{_bindir}/darktable-faster %{_libdir}/darktable %{_datadir}/applications/darktable.desktop %{_datadir}/darktable -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cpufrequtils for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package cpufrequtils for openSUSE:Factory checked in at 2012-03-17 13:20:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpufrequtils (Old) and /work/SRC/openSUSE:Factory/.cpufrequtils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cpufrequtils", Maintainer is "trenn(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/cpufrequtils/cpufrequtils.changes 2011-12-07 14:37:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cpufrequtils.new/cpufrequtils.changes 2012-03-17 13:20:17.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 15:16:14 UTC 2012 - dvaleev(a)suse.com + +- don't build cpufreq-aperf and turbostat for ppc and ppc64 + +------------------------------------------------------------------- New: ---- cpufrequtils-no-aperf-on-ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpufrequtils.spec ++++++ --- /var/tmp/diff_new_pack.LDCeSz/_old 2012-03-17 13:20:21.000000000 +0100 +++ /var/tmp/diff_new_pack.LDCeSz/_new 2012-03-17 13:20:21.000000000 +0100 @@ -29,6 +29,7 @@ Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf Source3: turbostat-%{turbostat_version}.tar.bz2 +Patch1: cpufrequtils-no-aperf-on-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 @@ -66,6 +67,9 @@ %prep %setup -q -a 3 +%ifarch ppc ppc64 +%patch1 -p1 +%endif %build # This package failed when testing with -Wl,-as-needed being default. @@ -74,10 +78,12 @@ CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true STRIP=true" export CFLAGS="$RPM_OPT_FLAGS" make $CONF %{?_smp_mflags} +%ifnarch ppc ppc64 cd turbostat export CFLAGS="$CFLAGS -D_GNU_SOURCE" make %{?_smp_mflags} cd .. +%endif %install CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true DESTDIR=$RPM_BUILD_ROOT sbindir=/usr/sbin docdir=%{_docdir}/%{name} confdir=/etc" @@ -90,8 +96,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_sbindir} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 +%ifnarch ppc ppc64 install -D -m 0755 turbostat/turbostat $RPM_BUILD_ROOT/%{_sbindir} install -D -m 0644 turbostat/turbostat.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 +%endif %post -p /sbin/ldconfig @@ -101,11 +109,13 @@ %defattr (-,root,root) %{_libdir}/libcpufreq.*.0 %{_mandir}/man1/cpufreq* +%ifnarch ppc ppc64 %{_mandir}/man8/turbostat* %{_sbindir}/turbostat +/usr/bin/cpufreq-aperf +%endif /usr/bin/cpufreq-info /usr/bin/cpufreq-set -/usr/bin/cpufreq-aperf %files bench %defattr (-,root,root) ++++++ cpufrequtils-no-aperf-on-ppc.patch ++++++ Index: cpufrequtils-008/Makefile =================================================================== --- cpufrequtils-008.orig/Makefile +++ cpufrequtils-008/Makefile @@ -118,7 +118,7 @@ WARNINGS += -Wshadow CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \ -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE -UTIL_SRC = utils/info.c utils/set.c utils/aperf.c utils/cpuid.h +UTIL_SRC = utils/info.c utils/set.c LIB_HEADERS = lib/cpufreq.h lib/interfaces.h LIB_SRC = lib/cpufreq.c LIB_OBJS = lib/cpufreq.o @@ -199,7 +199,7 @@ cpufreq-%: libcpufreq.so.$(LIB_MAJ) $(UT $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/$@.o -lcpufreq $(QUIET) $(STRIPCMD) $@ -utils: cpufreq-info cpufreq-set cpufreq-aperf +utils: cpufreq-info cpufreq-set po/$(PACKAGE).pot: $(UTIL_SRC) @xgettext --default-domain=$(PACKAGE) --add-comments \ @@ -226,7 +226,7 @@ compile-bench: libcpufreq clean: -find . $ -not -type d $ -and $ -name '*~' -o -name '*.[oas]' $ -type f -print \ | xargs rm -f - -rm -f cpufreq-info cpufreq-set cpufreq-aperf + -rm -f cpufreq-info cpufreq-set -rm -f libcpufreq.so* -rm -f build/ccdv -rm -rf po/*.gmo po/*.pot @@ -243,7 +243,6 @@ install-tools: $(INSTALL) -d $(DESTDIR)${bindir} $(INSTALL_PROGRAM) cpufreq-set $(DESTDIR)${bindir}/cpufreq-set $(INSTALL_PROGRAM) cpufreq-info $(DESTDIR)${bindir}/cpufreq-info - $(INSTALL_PROGRAM) cpufreq-aperf $(DESTDIR)${bindir}/cpufreq-aperf install-man: $(INSTALL_DATA) -D man/cpufreq-set.1 $(DESTDIR)${mandir}/man1/cpufreq-set.1 @@ -267,7 +266,6 @@ uninstall: - rm -f $(DESTDIR)${includedir}/cpufreq.h - rm -f $(DESTDIR)${bindir}/cpufreq-set - rm -f $(DESTDIR)${bindir}/cpufreq-info - - rm -f $(DESTDIR)${bindir}/cpufreq-aperf - rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1 - rm -f $(DESTDIR)${mandir}/man1/cpufreq-info.1 - for HLANG in $(LANGUAGES); do \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit afflib for openSUSE:Factory
by root＠hilbert.suse.de 17 Mar '12

17 Mar '12

Hello community, here is the log from the commit of package afflib for openSUSE:Factory checked in at 2012-03-17 13:20:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/afflib (Old) and /work/SRC/openSUSE:Factory/.afflib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "afflib", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/afflib/afflib.changes 2012-02-01 09:57:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.afflib.new/afflib.changes 2012-03-17 13:20:05.000000000 +0100 @@ -1,0 +2,25 @@ +Thu Mar 8 23:11:09 UTC 2012 - Greg.Freemyer(a)gmail.com + +- upgrade to v3.6.15 + * configure.ac: incorporated Greg Freemyer's patch to address some + ncurses problems. + * lib/utils.h: created virtual destructore + * configure.ac: added AC_PROG_CXX + * tools/affxml.cpp (main): removed unused bflag variable + * lib/vnode_afd.cpp: max() is now always defined, even on windows. + * lib/aftimer.h (aftimer::eta_time): added std:: before string + * lib/utils.h: added virtual destructor for seginfo + * lib/afflib_pages.cpp (af_get_pagesize): having af_page_size() as + a macro was causing problems, so now there is both af_page_size + and af_get_pagesize, both of which do the same. Please use af_get_pagesize. + * aftimer.h (timestamp): updated aftimer for higher resolution on win32 + * lib/afflib.cpp (af_get_pagesize): created af_get_pagesize, which + for some reason was missing. + * lib/afflib.h: added int af_get_pagesize(AFFILE *af); + +------------------------------------------------------------------- +Mon Feb 13 17:22:48 UTC 2012 - Greg.Freemyer(a)gmail.com + +- use the %{__make} %{?_smp_mflags} macro in the specfile + +------------------------------------------------------------------- Old: ---- afflib-3.6.12.tar.gz New: ---- afflib-3.6.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ afflib.spec ++++++ --- /var/tmp/diff_new_pack.ofs3qV/_old 2012-03-17 13:20:10.000000000 +0100 +++ /var/tmp/diff_new_pack.ofs3qV/_new 2012-03-17 13:20:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package afflib # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,9 +18,10 @@ Summary: Library and tools for working with the Advanced Forensics Format Group: System/Libraries + Name: afflib -Version: 3.6.12 -Release: 1 +Version: 3.6.15 +Release: 0 License: BSD-4-Clause Url: http://afflib.org/ Source: %{name}-%{version}.tar.gz @@ -28,7 +29,19 @@ Patch1: afflib-3.6.12-no-strict-aliasing.patch Patch2: afflib-3.6.12-fix-sha256-display.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf automake fuse-devel gcc-c++ gettext-tools libcurl-devel libexpat-devel libopenssl-devel libtool ncurses-devel python-devel readline-devel zlib-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: fuse-devel +BuildRequires: gcc-c++ +BuildRequires: gettext-tools +BuildRequires: libcurl-devel +BuildRequires: libexpat-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: python-devel +BuildRequires: readline-devel +BuildRequires: zlib-devel %description The Advanced Forensics Format (AFF) is an openly specified, extensible @@ -108,7 +121,7 @@ %build %configure --enable-s3 --enable-fuse --enable-python -make %{?_smp_flags} +%{__make} %{?_smp_mflags} %install %make_install ++++++ afflib-3.6.12.tar.gz -> afflib-3.6.15.tar.gz ++++++ ++++ 34888 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/ChangeLog new/afflib-3.6.15/ChangeLog --- old/afflib-3.6.12/ChangeLog 2011-05-24 00:08:21.000000000 +0200 +++ new/afflib-3.6.15/ChangeLog 2011-12-02 15:28:05.000000000 +0100 @@ -1,3 +1,56 @@ +2011-12-02 Simson Garfinkel <simsong@alphonse-mucha> + + * configure.ac: increased version number to 3.6.15 + +2011-11-26 Simson Garfinkel <simsong(a)it151636.ern.nps.edu> + + * configure.ac: incorporated Greg Freemyer's patch to address some + ncurses problems. + +2011-11-24 Simson Garfinkel <slgarfin(a)submit-0.local> + + * lib/utils.h: created virtual destructore + +2011-11-21 Simson Garfinkel <simsong(a)Alphonse-Mucha.local> + + * configure.ac: added AC_PROG_CXX + +2011-11-18 Simson Garfinkel <simsong@FC15> + + * tools/affxml.cpp (main): removed unused bflag variable + + * lib/vnode_afd.cpp: max() is now always defined, even on windows. + +2011-11-01 Simson Garfinkel <simsong(a)it150660.ern.nps.edu> + + * lib/aftimer.h (aftimer::eta_time): added std:: before string + + * configure.ac: updated version counter to 3.6.14 + +2011-11-01 Simson Garfinkel <slgarfin(a)submit-0.local> + + * lib/utils.h: added virtual destructor for seginfo + +2011-09-28 Simson Garfinkel <simsong(a)arlington-8-30-77-137.ncr.vt.edu> + + * configure.ac: incremented version counter to 3.6.13 + + * lib/afflib_pages.cpp (af_get_pagesize): having af_page_size() as + a macro was causing problems, so now there is both af_page_size + and af_get_pagesize, both of which do the same. Please use af_get_pagesize. + +2011-09-27 Simson Garfinkel <simsong(a)Alphonse-Mucha.local> + + * aftimer.h (timestamp): updated aftimer for higher resolution on win32 + +2011-09-18 Simson Garfinkel <simsong(a)imac3.home> + + * lib/afflib.cpp (af_get_pagesize): created af_get_pagesize, which + for some reason was missing. + + * lib/afflib.h: added int af_get_pagesize(AFFILE *af); + + 2011-05-04 Simson Garfinkel <simsong(a)alphonse-mucha.home> * configure.ac: increased version number to 3.6.11, overcomes recent problems. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/affconfig.h.in new/afflib-3.6.15/affconfig.h.in --- old/afflib-3.6.12/affconfig.h.in 2011-05-24 00:08:29.000000000 +0200 +++ new/afflib-3.6.15/affconfig.h.in 2011-12-02 15:28:10.000000000 +0100 @@ -404,6 +404,9 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL +/* Define to 1 if you have the <_mingw.h> header file. */ +#undef HAVE__MINGW_H + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/afflib.spec new/afflib-3.6.15/afflib.spec --- old/afflib-3.6.12/afflib.spec 2011-05-24 00:12:40.000000000 +0200 +++ new/afflib-3.6.15/afflib.spec 2011-12-02 15:28:30.000000000 +0100 @@ -1,5 +1,5 @@ Name: afflib -Version: 3.6.12 +Version: 3.6.15 Release: 1 Summary: Library to support the Advanced Forensic Format Group: System Environment/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/configure.ac new/afflib-3.6.15/configure.ac --- old/afflib-3.6.12/configure.ac 2011-05-23 23:59:38.000000000 +0200 +++ new/afflib-3.6.15/configure.ac 2011-12-02 15:27:59.000000000 +0100 @@ -4,8 +4,7 @@ # See http://autotoolset.sourceforge.net/tutorial.html # and http://www.openismus.com/documents/linux/automake/automake.shtml - -AC_INIT([AFFLIB],[3.6.12],[bugs(a)afflib.org]) +AC_INIT([AFFLIB],[3.6.15],[bugs(a)afflib.org]) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE @@ -19,6 +18,7 @@ # Programs that we will be using AC_PROG_CC +AC_PROG_CXX AC_PROG_INSTALL # Turn off shared libraries during beta-testing, since they @@ -81,7 +81,7 @@ # Specific headers that I plan to use -AC_CHECK_HEADERS([arpa/inet.h assert.h ctype.h dmalloc.h err.h errno.h fcntl.h getopt.h inttypes.h linux/fs.h malloc.h ncurses/term.h netinet/in.h regex.h signal.h stdint.h stdio.h stdlib.h string.h sys/cdefs.h sys/disk.h sys/file.h sys/ioctl.h sys/ioctl.h sys/param.h sys/param.h sys/socket.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/vfs.h sysexits.h term.h time.h unistd.h zlib.h]) +AC_CHECK_HEADERS([arpa/inet.h assert.h ctype.h dmalloc.h err.h errno.h fcntl.h getopt.h inttypes.h linux/fs.h malloc.h ncurses/term.h netinet/in.h regex.h signal.h stdint.h stdio.h stdlib.h string.h sys/cdefs.h sys/disk.h sys/file.h sys/ioctl.h sys/ioctl.h sys/param.h sys/param.h sys/socket.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/vfs.h sysexits.h term.h time.h unistd.h zlib.h _mingw.h]) AC_CHECK_LIB([regex],[regcomp]) # see if we need -lregex @@ -118,6 +118,7 @@ AC_CHECK_LIB([ncurses],[initscr],, AC_MSG_RESULT([ncurses not installed])) AC_CHECK_LIB([z],[uncompress],, AC_MSG_ERROR([zlib not installed; cannot continue. Try adding zlib-dev or zlib1g-dev.])) AC_CHECK_LIB([rt],[aio_error64]) +AC_SEARCH_LIBS(tgetent, termlib termcap tinfo curses ncurses) AC_CHECK_FUNCS(putp tputs tgoto tgetstr tgetnum gotorc beep endwin setupterm printw) ################################################################ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/afflib.h new/afflib-3.6.15/lib/afflib.h --- old/afflib-3.6.12/lib/afflib.h 2011-03-18 13:46:16.000000000 +0100 +++ new/afflib-3.6.15/lib/afflib.h 2011-11-23 03:02:15.000000000 +0100 @@ -174,9 +174,9 @@ /* navigating within the data segments as if they were a single file */ #ifdef _WIN32 -SSIZE_T af_read(AFFILE *af,unsigned char *buf,SSIZE_T count); +SSIZE_T af_read(AFFILE *af,unsigned char *buf,SSIZE_T count); #else -ssize_t af_read(AFFILE *af,unsigned char *buf,ssize_t count); +ssize_t af_read(AFFILE *af,unsigned char *buf,ssize_t count); #endif uint64_t af_seek(AFFILE *af,int64_t pos,int whence); // returns new position uint64_t af_tell(AFFILE *af); @@ -198,9 +198,10 @@ int af_identify(AFFILE *af); // returns type of AFFILE pointer /* Accessor Functions */ -int64_t af_get_imagesize(AFFILE *af); // byte # of last mapped byte in image, or size of device; +int64_t af_get_imagesize(AFFILE *af); // byte # of last mapped byte in image, or size of device; // returns -1 if error -int af_set_acquisition_date(AFFILE *af,time_t t); // sets AF_ACQUISITION_DATE +int af_get_pagesize(AFFILE *af); // returns page size, or -1 +int af_set_acquisition_date(AFFILE *af,time_t t); // sets AF_ACQUISITION_DATE #define af_imagesize(af) af_get_imagesize(af) // backwards compatiability int af_get_segq(AFFILE *af,const char *name,int64_t *quad);/* Get/set 8-byte values */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/afflib_i.h new/afflib-3.6.15/lib/afflib_i.h --- old/afflib-3.6.12/lib/afflib_i.h 2011-04-06 15:42:58.000000000 +0200 +++ new/afflib-3.6.15/lib/afflib_i.h 2011-11-23 03:02:15.000000000 +0100 @@ -126,7 +126,7 @@ #endif #ifdef WIN32 -#if !defined(__MINGW_H) +#if !defined(HAVE__MINGW_H) #pragma warning(disable: 4996) /* Don't warn on Windows about using POSIX open() instead of _open() */ #endif #include <malloc.h> @@ -154,12 +154,12 @@ #define S_ISDIR(m)(((m) & 0170000) == 0040000) #endif -#if !defined(__MINGW_H) +#if !defined(HAVE__MINGW_H) #define ftruncate(fd,size) _chsize_s(fd,size) #define MAXPATHLEN 1024 #endif -#if defined(__MINGW_H) +#if defined(HAVE__MINGW_H) #ifndef ftello #define ftello ftello64 #endif @@ -252,7 +252,7 @@ #endif -#if defined(WIN32) && !defined(__MINGW_H) +#if defined(WIN32) && !defined(HAVE__MINGW_H) /**************************************************************** *** Windows emulation of opendir()/readdir() *** From php @@ -616,7 +616,7 @@ * Note: pagename to string translation happens inside afflib.cpp, not inside * the vnode driver. */ -#define af_page_size(af) (af_get_pagesize(af)) /* backwards compatability */ +int af_page_size(AFFILE *af); // legacy (now is af_get_pagesize) void af_read_sizes(AFFILE *af); // sets up values if we can get them. int af_set_pagesize(AFFILE *af,uint32_t pagesize); // sets the pagesize; fails with -1 if imagesize >=0 int af_set_sectorsize(AFFILE *AF,int sectorsize); // fails with -1 if imagesize>=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/afflib_pages.cpp new/afflib-3.6.15/lib/afflib_pages.cpp --- old/afflib-3.6.12/lib/afflib_pages.cpp 2011-03-18 13:46:16.000000000 +0100 +++ new/afflib-3.6.15/lib/afflib_pages.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -99,6 +99,11 @@ return af->image_pagesize; } +int af_get_pagesize(AFFILE *af) +{ + return af->image_pagesize; +} + /* af_set_sectorsize: * Sets the sectorsize. * Fails with -1 if imagesize >=0 unless these changes permitted @@ -198,7 +203,7 @@ size_t page_len=0; if (af_trace){ - fprintf(af_trace,"af_get_page(%p,pagenum=%"I64d",buf=%p,bytes=%zu)\n",af,pagenum,data,*bytes); + fprintf(af_trace,"af_get_page(%p,pagenum=%"I64d",buf=%p,bytes=%u)\n",af,pagenum,data,(int)*bytes); } /* Find out the size of the segment and if it is compressed or not. @@ -293,8 +298,8 @@ #ifdef USE_LZMA case AF_PAGE_COMP_ALG_LZMA: res = lzma_uncompress(data,bytes,compressed_data,compressed_data_len); - if (af_trace) fprintf(af_trace," LZMA decompressed page %"I64d". %zd bytes => %zd bytes\n", - pagenum,compressed_data_len,*bytes); + if (af_trace) fprintf(af_trace," LZMA decompressed page %"I64d". %d bytes => %u bytes\n", + pagenum,(int)compressed_data_len,(int)*bytes); switch(res){ case 0:break; // OK case 1:(*af->error_reporter)("LZMA header error decompressing segment %"I64d"\n",pagenum); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/afflib_stream.cpp new/afflib-3.6.15/lib/afflib_stream.cpp --- old/afflib-3.6.12/lib/afflib_stream.cpp 2010-05-19 03:39:47.000000000 +0200 +++ new/afflib-3.6.15/lib/afflib_stream.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -53,6 +53,13 @@ *** Internal Functions. ****************************************************************/ +#ifdef _WIN32 +#define ASIZE SSIZE_T +#else +#define ASIZE ssize_t +#endif + + /* * af_set_maxsize * Sets the maxsize. @@ -101,12 +108,12 @@ return ret; } -ssize_t af_read(AFFILE *af,unsigned char *buf,ssize_t count) +extern "C" ASIZE af_read(AFFILE *af,unsigned char *buf,ASIZE count) { int total = 0; AF_WRLOCK(af); // wrlock because cache may change - if (af_trace) fprintf(af_trace,"af_read(%p,%p,%zd) (pos=%"I64d")\n",af,buf,count,af->pos); + if (af_trace) fprintf(af_trace,"af_read(%p,%p,%d) (pos=%"I64d")\n",af,buf,(int)count,af->pos); if (af->v->read){ // check for bypass int r = (af->v->read)(af, buf, af->pos, count); if(r>0) af->pos += r; @@ -200,7 +207,7 @@ { AF_WRLOCK(af); if (af_trace){ - fprintf(af_trace,"af_write(af=%p,buf=%p,count=%zd) pos=%"I64d"\n", af,buf,count,af->pos); + fprintf(af_trace,"af_write(af=%p,buf=%p,count=%d) pos=%"I64d"\n", af,buf,(int)count,af->pos); } /* Invalidate caches */ af_invalidate_vni_cache(af); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/afflib_util.cpp new/afflib-3.6.15/lib/afflib_util.cpp --- old/afflib-3.6.12/lib/afflib_util.cpp 2011-01-01 15:42:44.000000000 +0100 +++ new/afflib-3.6.15/lib/afflib_util.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -131,8 +131,6 @@ bytes--; charcount++; // how many characters - bool add_spaces = false; - if(flag & AF_HEXBUF_SPACE2) add_spaces = true; if((flag & AF_HEXBUF_SPACE4) && charcount%2==0){ *dst++ = ' '; *dst = '\000'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/aftimer.h new/afflib-3.6.15/lib/aftimer.h --- old/afflib-3.6.12/lib/aftimer.h 2011-01-12 16:30:43.000000000 +0100 +++ new/afflib-3.6.15/lib/aftimer.h 2011-11-29 02:08:30.000000000 +0100 @@ -1,6 +1,5 @@ -#ifndef __TIMER_H__ -#define __TIMER_H__ - +#ifndef __AFTIMER_H__ +#define __AFTIMER_H__ #ifdef __cplusplus #ifndef WIN32 @@ -15,44 +14,58 @@ #include <string> class aftimer { - bool used; // was this timer used? struct timeval t0; bool running; long total_sec; long total_usec; double lap_time_; // time from when we last did a "stop" public: - aftimer(); - time_t tstart(); - void start(); - void stop(); - double elapsed_seconds(); // - double lap_time(); + aftimer():t0(),running(false),total_sec(0),total_usec(0),lap_time_(0){} + + void start(); // start the timer + void stop(); // stop the timer + + time_t tstart() { return t0.tv_sec;} // time we started + double elapsed_seconds(); // how long timer has been running, total + double lap_time(); // how long the timer is running this time double eta(double fraction_done); // calculate ETA in seconds, given fraction std::string hms(long t); // turn a number of seconds into h:m:s std::string elapsed_text(); /* how long we have been running */ - std::string eta_text(double fraction_done); + std::string eta_text(double fraction_done); // h:m:s + std::string eta_time(double fraction_done); // the actual time }; -inline aftimer::aftimer() -{ - running = false; - total_sec = 0; - total_usec = 0; - lap_time_ = 0; -} - +/* This code in part from + * http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/430449b3-f6dd-4… + */ -inline time_t aftimer::tstart() -{ - return t0.tv_sec; -} +#ifdef WIN32 +# include <winsock2.h> +# include <windows.h> +# ifndef DELTA_EPOCH_IN_MICROSECS +# if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) +# define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 +# else +# define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL +# endif +# endif +#endif inline void timestamp(struct timeval *t) { #ifdef WIN32 - t->tv_sec = time(0); - t->tv_usec = 0; /* need to fix */ + FILETIME ft; + GetSystemTimeAsFileTime(&ft); + unsigned __int64 tmpres = 0; + tmpres |= ft.dwHighDateTime; + tmpres <<= 32; + tmpres |= ft.dwLowDateTime; + + /*converting file time to unix epoch*/ + tmpres -= DELTA_EPOCH_IN_MICROSECS; + tmpres /= 10; /*convert into microseconds*/ + t->tv_sec = (long)(tmpres / 1000000UL); + t->tv_usec = (long)(tmpres % 1000000UL); #else gettimeofday(t,NULL); #endif @@ -121,14 +134,20 @@ return hms((int)elapsed_seconds()); } +/** + * returns the number of seconds until the job is complete. + */ inline double aftimer::eta(double fraction_done) { double t = elapsed_seconds(); - if(t==0) return -1; // can't figure it out - if(fraction_done==0) return -1; // can't figure it out + if(t<=0) return -1; // can't figure it out + if(fraction_done<=0) return -1; // can't figure it out return (t * 1.0/fraction_done - t); } +/** + * Retuns the number of hours:minutes:seconds until the job is done. + */ inline std::string aftimer::eta_text(double fraction_done) { double e = eta(fraction_done); @@ -136,6 +155,24 @@ return hms((long)e); } +/** + * Returns the time when data is due. + */ +inline std::string aftimer::eta_time(double fraction_done) +{ + time_t when = time_t(eta(fraction_done)) + time(0); + struct tm tm; +#ifdef HAVE_LOCALTIME_R + localtime_r(&when,&tm); +#else + tm = *localtime(&when); +#endif + + char buf[64]; + snprintf(buf,sizeof(buf),"%02d:%02d:%02d",tm.tm_hour,tm.tm_min,tm.tm_sec); + return std::string(buf); +} + #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/lzma_glue.cpp new/afflib-3.6.15/lib/lzma_glue.cpp --- old/afflib-3.6.12/lib/lzma_glue.cpp 2008-05-13 01:53:37.000000000 +0200 +++ new/afflib-3.6.15/lib/lzma_glue.cpp 2011-06-17 01:17:58.000000000 +0200 @@ -15,7 +15,6 @@ #include "LzmaRamDecode.h" } - class CInMemoryStream: public ISequentialInStream, public CMyUnknownImp { public: const unsigned char *buf; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/utils.h new/afflib-3.6.15/lib/utils.h --- old/afflib-3.6.12/lib/utils.h 2011-01-29 21:48:49.000000000 +0100 +++ new/afflib-3.6.15/lib/utils.h 2011-11-26 23:49:01.000000000 +0100 @@ -62,6 +62,7 @@ bool inline operator==(const class seginfo &b) const { return name == b.name; } + virtual ~seginfo(){}; }; /* the seglist provides AFF internal functions and tools an easy way to get @@ -75,6 +76,7 @@ bool has_signed_segments(); int get_seglist(AFFILE *af); seglist(){} + virtual ~seglist(){} seglist(AFFILE *af){ get_seglist(af); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/vnode_afd.cpp new/afflib-3.6.15/lib/vnode_afd.cpp --- old/afflib-3.6.12/lib/vnode_afd.cpp 2011-03-18 13:46:16.000000000 +0100 +++ new/afflib-3.6.15/lib/vnode_afd.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -19,7 +19,7 @@ #endif -#if defined(WIN32) and !defined(__MINGW_H) +#if defined(WIN32) and !defined(HAVE__MINGW_H) /********************************************************************** * Implement dirent-style opendir/readdir/rewinddir/closedir on Win32 * @@ -418,7 +418,7 @@ } -#ifndef WIN32 +#if !defined(WIN32) || defined(HAVE__MINGW_H) static uint64_t max(uint64_t a,uint64_t b) { return a > b ? a : b; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/lib/vnode_aff.cpp new/afflib-3.6.15/lib/vnode_aff.cpp --- old/afflib-3.6.12/lib/vnode_aff.cpp 2011-03-18 13:46:16.000000000 +0100 +++ new/afflib-3.6.15/lib/vnode_aff.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -45,7 +45,7 @@ #ifdef KERNEL_LIBRARY aff_write_seg_no_data(af,AF_IGNORE,0,bytes); #else - if(af_trace) fprintf(af_trace,"aff_write_ignore2(%p,%zd)\n",af,bytes); + if(af_trace) fprintf(af_trace,"aff_write_ignore2(%p,%d)\n",af,(int)bytes); unsigned char *invalidate_data = (unsigned char *)calloc(bytes,1); aff_write_seg(af,AF_IGNORE,0,invalidate_data,bytes); // overwrite with NULLs free(invalidate_data); @@ -58,7 +58,7 @@ int64_t startpos = ftello(af->aseg); // remember start position int r = 0; - if(af_trace) fprintf(af_trace,"aff_write_ignore(%p,%zd)\n",af,bytes); + if(af_trace) fprintf(af_trace,"aff_write_ignore(%p,%d)\n",af,(int)bytes); /* First write the ignore */ r = aff_write_ignore2(af,bytes); @@ -110,8 +110,8 @@ int aff_write_seg(AFFILE *af, const char *segname,uint32_t arg,const u_char *data,size_t datalen) { - if(af_trace) fprintf(af_trace,"aff_write_seg(%p,%s,%"PRIu32",%p,len=%zu)\n", - af,segname,arg,data,datalen); + if(af_trace) fprintf(af_trace,"aff_write_seg(%p,%s,%"PRIu32",%p,len=%u)\n", + af,segname,arg,data,(int)datalen); struct af_segment_head segh; struct af_segment_tail segt; @@ -140,8 +140,8 @@ aff_toc_update(af,segname,ftello(af->aseg),datalen); - if(af_trace) fprintf(af_trace,"aff_write_seg: putting segment %s (datalen=%zd) offset=%"PRId64"\n", - segname,datalen,ftello(af->aseg)); + if(af_trace) fprintf(af_trace,"aff_write_seg: putting segment %s (datalen=%d) offset=%"PRId64"\n", + segname,(int)datalen,ftello(af->aseg)); if(fwrite(&segh,sizeof(segh),1,af->aseg)!=1) return -10; if(fwrite(segname,1,segname_len,af->aseg)!=segname_len) return -11; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/tools/affcat.cpp new/afflib-3.6.15/tools/affcat.cpp --- old/afflib-3.6.12/tools/affcat.cpp 2011-03-18 13:46:13.000000000 +0100 +++ new/afflib-3.6.15/tools/affcat.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -195,7 +195,7 @@ } int count = fwrite(data,1,datalen,stdout); if(count!=(ssize_t)datalen){ - fprintf(stderr,"fwrite(buf,1,%zd,outfile) only wrote %d bytes\n",datalen,count); + fprintf(stderr,"fwrite(buf,1,%d,outfile) only wrote %d bytes\n",(int)datalen,count); } free(data); return 0; @@ -331,13 +331,12 @@ int main(int argc,char **argv) { - int bflag, ch; + int ch; #ifdef SIGINFO signal(SIGINFO,sig_info); #endif - bflag = 0; while ((ch = getopt(argc, argv, "s:S:p:lLh?dqnvr:")) != -1) { switch (ch) { case 's': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/tools/affcompare.cpp new/afflib-3.6.15/tools/affcompare.cpp --- old/afflib-3.6.12/tools/affcompare.cpp 2011-03-18 13:46:13.000000000 +0100 +++ new/afflib-3.6.15/tools/affcompare.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -339,7 +339,7 @@ err(1,"Cannot read page %"I64d" from %s",pagenum,af_filename(af2)); if(data1_len != data2_len){ - printf("page %"I64d" size %zd != size %zd\n",pagenum,data1_len,data2_len); + printf("page %"I64d" size %d != size %d\n",pagenum,(int)data1_len,(int)data2_len); return 1; } @@ -748,14 +748,13 @@ int main(int argc,char **argv) { - int bflag, ch; + int ch; int opt_recurse=0; #ifdef SIGINFO signal(SIGINFO,sig_info); #endif - bflag = 0; while ((ch = getopt(argc, argv, "P:Vabcempqrsh?v")) != -1) { switch (ch) { case 'P': opt_page = atoi(optarg); break; @@ -786,7 +785,7 @@ recurse(dir1,dir2); if(errors.size()>0){ fprintf(stderr,"================================\n"); - fprintf(stderr,"%zd affcompare errors:\n",errors.size()); + fprintf(stderr,"%d affcompare errors:\n",(int)errors.size()); for(vector<string>::const_iterator i=errors.begin(); i!=errors.end(); i++){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/tools/affconvert.cpp new/afflib-3.6.15/tools/affconvert.cpp --- old/afflib-3.6.12/tools/affconvert.cpp 2011-03-18 04:46:58.000000000 +0100 +++ new/afflib-3.6.15/tools/affconvert.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -550,11 +550,13 @@ } /* Make a copy of the a_out filename if we can get it */ +#ifdef HAVE_UTIMES char *a_out_fn=0; // output filename, to remember for utimes const char *a_ = af_filename(a_out); // remember the output filename if(a_){ a_out_fn = strdup(a_); // make a copy of it } +#endif if(af_close(a_out)) err(1,"af_close(a_out)"); if(!opt_quiet){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/tools/affcrypto.cpp new/afflib-3.6.15/tools/affcrypto.cpp --- old/afflib-3.6.12/tools/affcrypto.cpp 2011-03-18 04:46:58.000000000 +0100 +++ new/afflib-3.6.15/tools/affcrypto.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -291,7 +291,7 @@ int main(int argc,char **argv) { - int bflag, ch; + int ch; const char *old_passphrase=0; const char *new_passphrase=0; const char *check_passphrase = 0; @@ -319,7 +319,6 @@ #endif } - bflag = 0; int opt_change = 0; const char *home = getenv("HOME"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/tools/affinfo.cpp new/afflib-3.6.15/tools/affinfo.cpp --- old/afflib-3.6.12/tools/affinfo.cpp 2011-05-08 02:18:32.000000000 +0200 +++ new/afflib-3.6.15/tools/affinfo.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -445,7 +445,7 @@ memset(output_line,0,sizeof(output_line)); /* Now append the arg and the data len */ - sprintf(output_line,"%-24s %8"PRIu32" %8zd ",segname,arg,data_len); + sprintf(output_line,"%-24s %8"PRIu32" %8d ",segname,arg,(int)data_len); if(opt_no_preview){ printf("%s\n",output_line); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/tools/affix.cpp new/afflib-3.6.15/tools/affix.cpp --- old/afflib-3.6.12/tools/affix.cpp 2011-03-18 04:46:58.000000000 +0100 +++ new/afflib-3.6.15/tools/affix.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -232,12 +232,11 @@ int main(int argc,char **argv) { - int bflag, ch; + int ch; setvbuf(stdout,0,_IONBF,0); // turn off buffering /* Figure out how many cols the screen has... */ - bflag = 0; while ((ch = getopt(argc, argv, "yh?v")) != -1) { switch (ch) { case 'y': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/tools/affverify.cpp new/afflib-3.6.15/tools/affverify.cpp --- old/afflib-3.6.12/tools/affverify.cpp 2011-03-18 04:46:58.000000000 +0100 +++ new/afflib-3.6.15/tools/affverify.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -4,6 +4,11 @@ * Verify the digital signature on a signed file */ +#ifdef WIN32 +# include <winsock2.h> +# include <windows.h> +#endif + #include "affconfig.h" #include "afflib.h" #include "afflib_i.h" @@ -509,9 +514,8 @@ int main(int argc,char **argv) { - int bflag, ch; + int ch; - bflag = 0; while ((ch = getopt(argc, argv, "ach?vV")) != -1) { switch (ch) { case 'a': opt_all = 1; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/tools/affxml.cpp new/afflib-3.6.15/tools/affxml.cpp --- old/afflib-3.6.12/tools/affxml.cpp 2011-03-18 13:46:13.000000000 +0100 +++ new/afflib-3.6.15/tools/affxml.cpp 2011-11-23 03:02:15.000000000 +0100 @@ -324,12 +324,11 @@ int main(int argc,char **argv) { - int bflag, ch; + int ch; const char *infile; /* Figure out how many cols the screen has... */ - bflag = 0; while ((ch = getopt(argc, argv, "xj:h?Vs")) != -1) { switch (ch) { case 'j': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/afflib-3.6.12/win32/affconfig.h new/afflib-3.6.15/win32/affconfig.h --- old/afflib-3.6.12/win32/affconfig.h 2011-05-24 00:12:44.000000000 +0200 +++ new/afflib-3.6.15/win32/affconfig.h 2011-12-02 15:31:44.000000000 +0100 @@ -117,5 +117,5 @@ #define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_ZLIB_H 1 -#define PACKAGE_VERSION "3.6.12" +#define PACKAGE_VERSION "3.6.15" typedef SSIZE_T ssize_t; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzypp for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package libzypp for openSUSE:12.1:Update:Test checked in at 2012-03-16 18:23:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/libzypp (Old) and /work/SRC/openSUSE:12.1:Update:Test/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp", Maintainer is "ma(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/libzypp/libzypp.changes 2012-01-18 18:54:01.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.libzypp.new/libzypp.changes 2012-03-16 18:23:32.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Mar 13 12:45:59 CET 2012 - ma(a)suse.de + +- Force libproxy into using "/etc/sysconfig/proxy" if it exists (bnc#679322) +- version 10.3.9 (3) + +------------------------------------------------------------------- +Thu Mar 1 17:53:01 CET 2012 - ma(a)suse.de + +- Apply soft locks by name and not per package (bnc#749418) +- version 10.3.8 (3) + +------------------------------------------------------------------- Old: ---- libzypp-10.3.7.tar.bz2 New: ---- libzypp-10.3.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.JCuNAR/_old 2012-03-16 18:23:33.000000000 +0100 +++ /var/tmp/diff_new_pack.JCuNAR/_new 2012-03-16 18:23:33.000000000 +0100 @@ -23,7 +23,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 10.3.7 +Version: 10.3.9 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-10.3.7.tar.bz2 -> libzypp-10.3.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.7/VERSION.cmake new/libzypp-10.3.9/VERSION.cmake --- old/libzypp-10.3.7/VERSION.cmake 2012-01-16 17:16:07.000000000 +0100 +++ new/libzypp-10.3.9/VERSION.cmake 2012-03-13 12:52:14.000000000 +0100 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "10") SET(LIBZYPP_COMPATMINOR "3") SET(LIBZYPP_MINOR "3") -SET(LIBZYPP_PATCH "7") +SET(LIBZYPP_PATCH "9") # -# LAST RELEASED: 10.3.7 (3) +# LAST RELEASED: 10.3.9 (3) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.7/package/libzypp.changes new/libzypp-10.3.9/package/libzypp.changes --- old/libzypp-10.3.7/package/libzypp.changes 2012-01-16 17:16:07.000000000 +0100 +++ new/libzypp-10.3.9/package/libzypp.changes 2012-03-13 12:52:14.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Mar 13 12:45:59 CET 2012 - ma(a)suse.de + +- Force libproxy into using "/etc/sysconfig/proxy" if it exists (bnc#679322) +- version 10.3.9 (3) + +------------------------------------------------------------------- +Thu Mar 1 17:53:01 CET 2012 - ma(a)suse.de + +- Apply soft locks by name and not per package (bnc#749418) +- version 10.3.8 (3) + +------------------------------------------------------------------- Mon Jan 16 16:28:50 CET 2012 - ma(a)suse.de - CheckAccessDeleted: avoid duplicate entries for the same PID (bnc#716972) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.7/zypp/media/MediaCurl.cc new/libzypp-10.3.9/zypp/media/MediaCurl.cc --- old/libzypp-10.3.7/zypp/media/MediaCurl.cc 2012-01-16 17:16:06.000000000 +0100 +++ new/libzypp-10.3.9/zypp/media/MediaCurl.cc 2012-03-13 12:52:14.000000000 +0100 @@ -21,7 +21,6 @@ #include "zypp/base/Gettext.h" #include "zypp/media/MediaCurl.h" -#include "zypp/media/proxyinfo/ProxyInfos.h" #include "zypp/media/ProxyInfo.h" #include "zypp/media/MediaUserAuth.h" #include "zypp/media/CredentialManager.h" @@ -328,11 +327,7 @@ */ void fillSettingsSystemProxy( const Url&url, TransferSettings &s ) { -#ifdef _WITH_LIBPROXY_SUPPORT_ - ProxyInfo proxy_info (ProxyInfo::ImplPtr(new ProxyInfoLibproxy())); -#else - ProxyInfo proxy_info (ProxyInfo::ImplPtr(new ProxyInfoSysconfig("proxy"))); -#endif + ProxyInfo proxy_info; if ( proxy_info.useProxyFor( url ) ) { // We must extract any 'user:pass' from the proxy url diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.7/zypp/media/ProxyInfo.cc new/libzypp-10.3.9/zypp/media/ProxyInfo.cc --- old/libzypp-10.3.7/zypp/media/ProxyInfo.cc 2012-01-16 17:16:07.000000000 +0100 +++ new/libzypp-10.3.9/zypp/media/ProxyInfo.cc 2012-03-13 12:52:14.000000000 +0100 @@ -16,6 +16,7 @@ #include "zypp/media/ProxyInfo.h" #include "zypp/media/proxyinfo/ProxyInfoImpl.h" +#include "zypp/media/proxyinfo/ProxyInfos.h" using namespace std; using namespace zypp::base; @@ -26,8 +27,13 @@ shared_ptr<ProxyInfo::Impl> ProxyInfo::Impl::_nullimpl; ProxyInfo::ProxyInfo() - : _pimpl( Impl::_nullimpl ) +#ifdef _WITH_LIBPROXY_SUPPORT_ + : _pimpl( new ProxyInfoLibproxy() ) +#else + : _pimpl( new ProxyInfoSysconfig("proxy") ) +#endif {} + ProxyInfo::ProxyInfo(ProxyInfo::ImplPtr pimpl_r) : _pimpl(pimpl_r) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.7/zypp/media/ProxyInfo.h new/libzypp-10.3.9/zypp/media/ProxyInfo.h --- old/libzypp-10.3.7/zypp/media/ProxyInfo.h 2012-01-16 17:16:07.000000000 +0100 +++ new/libzypp-10.3.9/zypp/media/ProxyInfo.h 2012-03-13 12:52:14.000000000 +0100 @@ -37,10 +37,12 @@ /** Implementation */ struct Impl; typedef shared_ptr<Impl> ImplPtr; - /** Ctor */ + + /** Default Ctor: guess the best available implementation. */ ProxyInfo(); - /** Ctor */ - ProxyInfo(ProxyInfo::ImplPtr pimpl_r); + /** Ctor taking a specific implementation. */ + ProxyInfo( ProxyInfo::ImplPtr pimpl_r ); + bool enabled() const; std::string proxy(const Url & url) const; NoProxyList noProxy() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.7/zypp/media/proxyinfo/ProxyInfoLibproxy.cc new/libzypp-10.3.9/zypp/media/proxyinfo/ProxyInfoLibproxy.cc --- old/libzypp-10.3.7/zypp/media/proxyinfo/ProxyInfoLibproxy.cc 2012-01-16 17:16:06.000000000 +0100 +++ new/libzypp-10.3.9/zypp/media/proxyinfo/ProxyInfoLibproxy.cc 2012-03-13 12:52:14.000000000 +0100 @@ -15,6 +15,7 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" +#include "zypp/base/WatchFile.h" #include "zypp/Pathname.h" #include "zypp/media/proxyinfo/ProxyInfoLibproxy.h" @@ -25,21 +26,68 @@ namespace zypp { namespace media { + struct TmpUnsetEnv + { + TmpUnsetEnv( const char * var_r ) + : _set( false ) + , _var( var_r ) + { + const char * val = getenv( _var.c_str() ); + if ( val ) + { + _set = true; + _val = val; + ::unsetenv( _var.c_str() ); + } + } + + ~TmpUnsetEnv() + { + if ( _set ) + { + setenv( _var.c_str(), _val.c_str(), 1 ); + } + } + + bool _set; + std::string _var; + std::string _val; + }; + + static pxProxyFactory * getProxyFactory() + { + static pxProxyFactory * proxyFactory = 0; + + // Force libproxy into using "/etc/sysconfig/proxy" + // if it exists. + static WatchFile sysconfigProxy( "/etc/sysconfig/proxy", WatchFile::NO_INIT ); + if ( sysconfigProxy.hasChanged() ) + { + MIL << "Build Libproxy Factory from /etc/sysconfig/proxy" << endl; + if ( proxyFactory ) + ::px_proxy_factory_free( proxyFactory ); + + TmpUnsetEnv env[] = { "KDE_FULL_SESSION", "GNOME_DESKTOP_SESSION_ID", "DESKTOP_SESSION" }; + proxyFactory = ::px_proxy_factory_new(); + } + else if ( ! proxyFactory ) + { + MIL << "Build Libproxy Factory" << endl; + proxyFactory = ::px_proxy_factory_new(); + } + + return proxyFactory; + } + ProxyInfoLibproxy::ProxyInfoLibproxy() : ProxyInfo::Impl() { - _factory = px_proxy_factory_new(); + _factory = getProxyFactory(); _enabled = !(_factory == NULL); } ProxyInfoLibproxy::~ProxyInfoLibproxy() - { - if (_enabled) { - px_proxy_factory_free(_factory); - _factory = NULL; - _enabled = false; - } - } + {} std::string ProxyInfoLibproxy::proxy(const Url & url_r) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.7/zypp/media/proxyinfo/ProxyInfoSysconfig.cc new/libzypp-10.3.9/zypp/media/proxyinfo/ProxyInfoSysconfig.cc --- old/libzypp-10.3.7/zypp/media/proxyinfo/ProxyInfoSysconfig.cc 2012-01-16 17:16:06.000000000 +0100 +++ new/libzypp-10.3.9/zypp/media/proxyinfo/ProxyInfoSysconfig.cc 2012-03-13 12:52:14.000000000 +0100 @@ -50,7 +50,7 @@ } std::string ProxyInfoSysconfig::proxy(const Url & url_r) const - { + { map<string,string>::const_iterator it = _proxies.find(url_r.getScheme()); if (it != _proxies.end()) return it->second; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.7/zypp/solver/detail/SATResolver.cc new/libzypp-10.3.9/zypp/solver/detail/SATResolver.cc --- old/libzypp-10.3.7/zypp/solver/detail/SATResolver.cc 2012-01-16 17:16:06.000000000 +0100 +++ new/libzypp-10.3.9/zypp/solver/detail/SATResolver.cc 2012-03-13 12:52:14.000000000 +0100 @@ -630,7 +630,7 @@ // Add rules for parallel installable resolvables with different versions for_( it, sat::Pool::instance().multiversionBegin(), sat::Pool::instance().multiversionEnd() ) { - queue_push( &(_jobQueue), SOLVER_NOOBSOLETES | SOLVABLE_NAME ); + queue_push( &(_jobQueue), SOLVER_NOOBSOLETES | SOLVER_SOLVABLE_NAME ); queue_push( &(_jobQueue), it->id() ); } @@ -1384,7 +1384,7 @@ void SATResolver::setLocks() { - for (PoolItemList::const_iterator iter = _items_to_lock.begin(); iter != _items_to_lock.end(); iter++) { + for (PoolItemList::const_iterator iter = _items_to_lock.begin(); iter != _items_to_lock.end(); ++iter) { sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); if (iter->status().isInstalled()) { MIL << "Lock installed item " << *iter << endl; @@ -1397,16 +1397,20 @@ } } - for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter != _items_to_keep.end(); iter++) { - sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); + std::set<IdString> unifiedByName; + for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter != _items_to_keep.end(); ++iter) { if (iter->status().isInstalled()) { MIL << "Keep installed item " << *iter << endl; - queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE | SOLVER_WEAK); - queue_push( &(_jobQueue), ident ); + queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE | SOLVER_WEAK ); + queue_push( &(_jobQueue), (*iter)->satSolvable().id() ); } else { - MIL << "Keep NOT installed item " << *iter << ident << endl; - queue_push( &(_jobQueue), SOLVER_ERASE | SOLVER_SOLVABLE | SOLVER_WEAK | MAYBE_CLEANDEPS ); - queue_push( &(_jobQueue), ident ); + IdString ident( (*iter)->satSolvable().ident() ); + MIL << "Keep NOT installed name " << ident << " (" << *iter << ")" << endl; + if ( unifiedByName.insert( ident ).second ) + { + queue_push( &(_jobQueue), SOLVER_ERASE | SOLVER_SOLVABLE_NAME | SOLVER_WEAK | MAYBE_CLEANDEPS ); + queue_push( &(_jobQueue), ident.id() ); + } } } } @@ -1416,13 +1420,13 @@ CapabilitySet system_requires = SystemCheck::instance().requiredSystemCap(); CapabilitySet system_conflicts = SystemCheck::instance().conflictSystemCap(); - for (CapabilitySet::const_iterator iter = system_requires.begin(); iter != system_requires.end(); iter++) { + for (CapabilitySet::const_iterator iter = system_requires.begin(); iter != system_requires.end(); ++iter) { queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE_PROVIDES ); queue_push( &(_jobQueue), iter->id() ); MIL << "SYSTEM Requires " << *iter << endl; } - for (CapabilitySet::const_iterator iter = system_conflicts.begin(); iter != system_conflicts.end(); iter++) { + for (CapabilitySet::const_iterator iter = system_conflicts.begin(); iter != system_conflicts.end(); ++iter) { queue_push( &(_jobQueue), SOLVER_ERASE | SOLVER_SOLVABLE_PROVIDES | MAYBE_CLEANDEPS ); queue_push( &(_jobQueue), iter->id() ); MIL << "SYSTEM Conflicts " << *iter << endl; @@ -1439,7 +1443,7 @@ if ( (*it)->isSystem() ) { Capability archrule( (*it)->arch(), rpm.c_str(), Capability::PARSED ); - queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVABLE_NAME | SOLVER_ESSENTIAL ); + queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE_NAME | SOLVER_ESSENTIAL ); queue_push( &(_jobQueue), archrule.id() ); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ddclient for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package ddclient for openSUSE:12.1:Update:Test checked in at 2012-03-16 18:23:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/ddclient (Old) and /work/SRC/openSUSE:12.1:Update:Test/.ddclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ddclient", Maintainer is "ro(a)suse.com" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.ddclient.new/ddclient.changes 2012-03-16 18:23:27.000000000 +0100 @@ -0,0 +1,232 @@ +------------------------------------------------------------------- +Thu Mar 8 18:01:44 CET 2012 - ro(a)suse.de + +- fix issue with updating ip on renewal (bnc#730519) + +------------------------------------------------------------------- +Wed Oct 19 15:06:08 CEST 2011 - ro(a)suse.de + +- remove leftover debug line in init script + +------------------------------------------------------------------- +Sat Oct 15 10:34:17 CEST 2011 - ro(a)suse.de + +- upgrade Suggests for perl-IO-Socket-SSL to Recommends + (bnc#723688) + +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + (cf. packaging guidelines) + +------------------------------------------------------------------- +Mon Aug 29 15:22:47 CEST 2011 - ro(a)suse.de + +- work on init-script so that start/status/stop at least work + (bnc#267306) + +------------------------------------------------------------------- +Tue Sep 1 11:01:31 UTC 2009 - chris(a)computersalat.de + +- rework config patch + o now one patch + o merged + - ddclient-3.6.3-config.patch + - ddclient-3.7.1-config.patch + - ddclient-3.7.1-sysconfig.patch + to ddclient-3.8.0-config.patch + o defaults for ppp0 +- added update_nic.patch + * opt('use') should have priority to global-defaults +- init script + o beautify + o should start rp-pppoe + o ppp0 as a "use=" default if not set in ddclient.conf +- sysconfig + o added argument list for DDCLIENT_OPTIONS +- cleanup spec + +------------------------------------------------------------------- +Sun Aug 30 20:12:52 CEST 2009 - coolo(a)novell.com + +- use %patch0 + +------------------------------------------------------------------- +Wed Aug 26 12:53:54 CEST 2009 - mls(a)suse.de + +- make patch0 usage consistent + +------------------------------------------------------------------- +Mon Feb 2 14:57:23 CET 2009 - kssingvo(a)suse.de + +- made rpmlint more happy +- removed unneccessary .orig file to avoid build issue + +------------------------------------------------------------------- +Wed Jan 28 14:18:40 CET 2009 - kssingvo(a)suse.de + +- new version 3.8.0: + * better password handling + * ddclient wrapper now included + * some remarks concerning postscript in sample config file + * support for multiple IP adresses + * namecheap patch + * Preventing error while reading cache when ip wasn't set correctly + before + * Preventing an error when trying to send a message on mail-failure + * mail-on-kill functionality + * documentation changes + +------------------------------------------------------------------- +Tue Jan 27 18:12:39 CET 2009 - kukuk(a)suse.de + +- Add PreRequires + +------------------------------------------------------------------- +Thu Aug 30 15:01:09 CEST 2007 - kssingvo(a)suse.de + +- config file ddclient.conf now with noreplace (bugzilla#305533) + +------------------------------------------------------------------- +Tue Aug 7 11:08:19 CEST 2007 - kssingvo(a)suse.de + +- upgrade to version 3.7.3: + * fixed typo for dnspark + * Renamed dyndns.org to dyndns.com + * opendns support added + * several debian/ubuntu patches included + * Readme changes + * signature modified + * typo in namecheap support + +------------------------------------------------------------------- +Thu Jun 14 12:14:12 CEST 2007 - kssingvo(a)suse.de + +- upgrade to version 3.7.2: + * updated easydns support + * fix for 'fw' in case of debug + * ssl call changed + * easydns.patch and eurodns.patch now included +- enable_fw patch removed, now in upstream version included + +------------------------------------------------------------------- +Thu May 3 14:26:56 CEST 2007 - kssingvo(a)suse.de + +- added sysconfig file, as suggested in bugzilla#268138 +- added /var/cache/ddclient (bugzilla#268138) + +------------------------------------------------------------------- +Tue Apr 3 20:38:18 CEST 2007 - kssingvo(a)suse.de + +- fixed issue in debug messages (bugzilla#250170) + +------------------------------------------------------------------- +Tue Feb 13 09:43:01 CET 2007 - kssingvo(a)suse.de + +- disabled ssl in default config (bugzilla#232005) + +------------------------------------------------------------------- +Mon Feb 12 16:11:18 CET 2007 - kssingvo(a)suse.de + +- update to version 3.7.1: + * URL of zoneedit has changed (see bug #1558483) + * Added initscript for Ubuntu (posted by Paolo Martinelli) + * Added patch "Patch: Treat --daemon values as intervals" + (submitted by James deBoer) + * Don't send any mail when in not running daemon mode (patch + submitted by Daniel Thaler) + * Changed Changelog syntax + * Applied patches submitted by Torsten: + abuse_msg.diff: ddclient still reports the email to contact + dyndns.org but they prefer a web form today (IIRC). This patch + adjusts the abuse warning printed by ddclient. + cachedir.diff: Original ddclient stores a cache file in /etc + which would belong in /var/cache in my opinion and according + to the FHS. + help_nonroot.diff: Allow calling the help function as non-root. + update-new-config.patch: Force update if config has changed + smc-barricade-7401bra.patch: Support for SMC Barricade 7401BRA + FW firewall + cisco_fw.diff: Use configured hostname for firewall access with + -use=cisco (closes: #345712). Thanks to Per Carlson for the + patch! See http://bugs.debian.org/345712. + maxinterval.diff: Increase max interval for updates. + See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=129370 + http://www.dyndns.com/support/services/dyndns/faq.html#q15 +- added Suggests: for perl-IO-SSL-Socket (bugzilla#232005) +- adapted /etc config patch to new version + +------------------------------------------------------------------- +Mon Jan 8 12:31:20 CET 2007 - kssingvo(a)suse.de + +- fixed checkproc in init script (bugzilla#229460) + +------------------------------------------------------------------- +Wed Sep 20 16:56:41 CEST 2006 - kssingvo(a)suse.de + +- added init script (bugzilla#201548) + +------------------------------------------------------------------- +Wed Jun 28 16:46:05 CEST 2006 - kssingvo(a)suse.de + +- update to version 3.7.0: +- support of many new routers +- fix to have a '#' char in the password +- renamed .orig to _orig in %doc section + +------------------------------------------------------------------- +Wed Jan 25 21:35:24 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 11 14:32:12 CET 2006 - kssingvo(a)suse.de + +- update to version 3.6.7 + +------------------------------------------------------------------- +Tue Jul 26 15:49:56 CEST 2005 - kssingvo(a)suse.de + +- update to version 3.6.6 + +------------------------------------------------------------------- +Tue Mar 29 14:17:01 CEST 2005 - kssingvo(a)suse.de + +- fix of config directory location (bugzilla#74539) + ++++ 35 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update:Test/.ddclient.new/ddclient.changes New: ---- _link ddclient-3.8.0-config.patch ddclient-3.8.0-update_nic.patch ddclient-3.8.0.tar.bz2 ddclient-bug730519.patch ddclient.changes ddclient.spec ddclient.sysconfig rc.ddclient ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddclient.spec ++++++ # # spec file for package ddclient # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ddclient Summary: A Perl Client to Update Dynamic DNS Entries License: GPL-2.0+ Group: Productivity/Networking/DNS/Utilities Version: 3.8.0 Release: 0 Url: http://ddclient.sourceforge.net/ Source0: http://switch.dl.sourceforge.net/sourceforge/ddclient/%{name}-%{version}.ta… Source1: rc.ddclient Source2: %{name}.sysconfig Patch0: %{name}-3.8.0-config.patch Patch1: %{name}-3.8.0-update_nic.patch Patch2: ddclient-bug730519.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq Requires: perl >= 5.004 Recommends: perl-IO-Socket-SSL %description ddclient is a small full-featured client requiring only Perl. Supported features include daemon operation, manual and automatic updates, static and dynamic updates, optimized updates for multiple addresses, MX, wild cards, abuse avoidance, retry for failed updates, and status updates to syslog and through e-mail. ddclient can obtain the IP address from any interface, through a Web-based IP detection service, and for multiple routers using custom FW definitions. It also provides full support for DynDNS.org's NIC2 protocol. Support is also included for other dynamic DNS services. Comes with sample scripts for use with DHCP, PPP, and cron. %prep %setup %patch0 -p1 %patch1 -p1 %patch2 rm -f sample-etc_ddclient.conf.orig chmod a-x sample-etc* mkdir examples mv sample-ddclient-wrapper.sh examples %build #%%configure #make # If the package provides automatic testing #make test # nothing to do here (yet) %install #make DESTDIR=$RPM_BUILD_ROOT install %{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir} %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d %{__install} -m 755 %{name} $RPM_BUILD_ROOT%{_sbindir}/ %{__install} -m 644 sample-etc_ddclient.conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}.conf # init script and config file %{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name} %{__ln_s} %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT%{_sbindir}/rc%{name} %{__install} -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates %{__install} -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name} %{__install} -d -m 755 $RPM_BUILD_ROOT/var/cache/%{name} %post %{fillup_only} %preun %stop_on_removal ddclient %postun %restart_on_update ddclient %insserv_cleanup %files %defattr(-, root, root) %doc COPY* README* sample* examples %config(noreplace) %attr(600,root,root) %{_sysconfdir}/%{name}.conf %config %attr(0755,root,root) /etc/init.d/%{name} %{_sbindir}/%{name} %{_sbindir}/rc%{name} /var/adm/fillup-templates/sysconfig.%{name} %dir /var/cache/%{name} %changelog ++++++ _link ++++++ <link project="openSUSE:12.1" baserev="f23f0a08842d1ae9843a33138cf8aa44"> <patches> <branch/> </patches> </link> ++++++ ddclient-3.8.0-config.patch ++++++ diff -ruN ddclient-3.8.0-orig/ddclient ddclient-3.8.0/ddclient --- ddclient-3.8.0-orig/ddclient 2009-01-27 19:14:02.000000000 +0000 +++ ddclient-3.8.0/ddclient 2009-04-29 21:37:27.690282779 +0000 @@ -27,7 +27,7 @@ $program =~ s/d$//; my $now = time; my $hostname = hostname(); -my $etc = ($program =~ /test/i) ? './' : '/etc/ddclient/'; +my $etc = ($program =~ /test/i) ? './' : '/etc/'; my $cachedir = ($program =~ /test/i) ? './' : '/var/cache/ddclient/'; my $savedir = ($program =~ /test/i) ? 'URL/' : '/tmp/'; my $msgs = ''; diff -ruN ddclient-3.8.0-orig/sample-etc_ddclient.conf ddclient-3.8.0/sample-etc_ddclient.conf --- ddclient-3.8.0-orig/sample-etc_ddclient.conf 2008-11-19 20:20:34.000000000 +0000 +++ ddclient-3.8.0/sample-etc_ddclient.conf 2009-04-30 14:14:47.793725557 +0000 @@ -18,12 +18,16 @@ ## are mentioned here. ## ###################################################################### +# daemon: consider to use /etc/sysconfig/ddclient instead of modifying here +# daemon=300 # check every 300 seconds +# +###################################################################### syslog=yes # log update msgs to syslog -mail=root # mail all msgs to root +#mail=root # mail all msgs to root mail-failure=root # mail failed update msgs to root pid=/var/run/ddclient.pid # record PID in file. -ssl=yes # use ssl-support. Works with +ssl=no # use ssl-support. Works with # ssl-library # postscript=script # run script after updating. The # new IP is added as argument. @@ -52,10 +56,17 @@ ## To obtain an IP address from Web status page (using the proxy if defined) #use=web, web=checkip.dyndns.org/, web-skip='IP Address' # found after IP Address # +###################################################################### +# you do not need to define use= if you are using DSL (ppp0) +# rc.ddclient is using "use=if, if=ppp0" as default +# #use=ip, ip=127.0.0.1 # via static IP's #use=if, if=eth0 # via interfaces +#use=if, if=ippp0 # when using ISDN +#use=if, if=ppp0 # when using DSL #use=web # via web # +###################################################################### #protocol=dyndns2 # default protocol #proxy=fasthttp.sympatico.ca:80 # default proxy #server=members.dyndns.org # default server ++++++ ddclient-3.8.0-update_nic.patch ++++++ diff -ruN ddclient-3.8.0-orig/ddclient ddclient-3.8.0/ddclient --- ddclient-3.8.0-orig/ddclient 2009-01-27 19:14:02.000000000 +0000 +++ ddclient-3.8.0/ddclient 2009-05-01 20:55:20.386630124 +0000 @@ -726,7 +726,7 @@ foreach my $h (sort keys %config) { next if $config{$h}{'protocol'} ne lc($s); $examined{$h} = 1; - my $use = $config{$h}{'use'} || opt('use'); + my $use = $opt{'use'} || $config{$h}{'use'}; local $opt{$use} = $config{$h}{$use} if $config{$h}{$use}; my $ip = get_ip($use); if (!defined $ip || !$ip) { ++++++ ddclient-bug730519.patch ++++++ --- ddclient +++ ddclient @@ -841,9 +841,9 @@ %opt = %saved; foreach my $h (keys %cache) { - if (exists $config{$h}) { + if (exists $config->{$h}) { foreach (qw(atime mtime wtime ip status)) { - $config{$h}{$_} = $cache{$h}{$_} if exists $cache{$h}{$_}; + $config->{$h}{$_} = $cache{$h}{$_} if exists $cache{$h}{$_}; } } } @@ -1093,7 +1093,7 @@ ## merge options into host definitions or globals if (@hosts) { foreach my $h (@hosts) { - $config{$h} = %{ merge(\%options, $config{$h}) }; + $config{$h} = merge(\%options, $config{$h}); } $opt{'host'} = join(',', @hosts); } else { ++++++ ddclient.sysconfig ++++++ ## Path: Network/DNS/Utilities ## Description: ddclient intervall option ## Type: integer ## Default: 300 ## ServiceRestart: ddclient # # intervall to check (in daemon mode) # DDCLIENT_INTERVALL="300" ## Description: ddclient start options ## Type: string ## Default: "" ## ServiceRestart: ddclient # # optional per-service arguments (see below). # # -{no}retry : retry failed updates. (default: noretry). # -{no}force : force an update even if the update may be unnecessary (default: noforce). # -timeout max : wait at most 'max' seconds for the host to respond (default: 0). # -{no}syslog : log messages to syslog (default: nosyslog). # -facility {type} : log messages to syslog to facility {type} (default: daemon). # -priority {pri} : log messages to syslog with priority {pri} (default: notice). # -{no}exec : do {not} execute; just show what would be done (default: exec). # -{no}debug : print {no} debugging information (default: nodebug). # -{no}verbose : print {no} verbose information (default: noverbose). # -{no}quiet : print {no} messages for unnecessary updates (default: noquiet). # -help : this message (default: 0). # -{no}query : print {no} ip addresses and exit. # DDCLIENT_OPTIONS="" ++++++ rc.ddclient ++++++ #!/bin/sh # Copyright (c) 2005-2006 SUSE Linux AG, Nuernberg, Germany. # All rights reserved. # # Author: Klaus Singvogel. # Please send feedback to http://www.suse.de/feedback # # ddclient This shell script takes care of starting and stopping # ddclient. # # ### BEGIN INIT INFO # Provides: ddclient # Required-Start: $syslog $local_fs $network # Should-Start: $time ypbind sendmail $remote_fs rp-pppoe # Required-Stop: $syslog $local_fs # Should-Stop: $time ypbind sendmail $remote_fs rp-pppoe # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: ddclient a daemon to update dynamic DNS entries # Description: ddclient is a Perl client used to update dynamic DNS # entries for accounts on many dynamic DNS services and # can be used on many types of firewalls ### END INIT INFO # DDCLIENT_BIN=/usr/sbin/ddclient DDCLIENT_CONFIG=/etc/ddclient.conf DDCLIENT_SYSCONFIG=/etc/sysconfig/ddclient [ -x $DDCLIENT_BIN ] || exit 5 [ -s $DDCLIENT_CONFIG ] || exit 6 [ -s $DDCLIENT_SYSCONFIG ] && . $DDCLIENT_SYSCONFIG # some defaults dd_intervall=${DDCLIENT_INTERVALL:-300} # if no "use=" is set in ddclient.conf try 'ppp0' as a default if [ `/bin/cat $DDCLIENT_CONFIG | grep -e "^use=" >/dev/null; echo $?` -eq 0 ]; then dd_use= else dd_use="-use=if -if ppp0" fi # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. case "$1" in start) echo -n "Starting ddclient daemon :" /sbin/startproc "$DDCLIENT_BIN" -daemon $dd_intervall "$dd_use" $DDCLIENT_OPTIONS -pid /var/run/ddclient.pid # remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down ddclient daemon :" /sbin/killproc -p /var/run/ddclient.pid -TERM /usr/bin/perl # remember status and be verbose rc_status -v ;; try-restart) $0 status >/dev/null && $0 restart # Remember status and be quiet rc_status ;; restart) $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) # echo -n "Reload service ddclient" rc_failed 3 # remember status and be verbose rc_status -v ;; reload) rc_failed 3 # remember status and be verbose rc_status -v ;; status) echo -n "Checking for service ddclient :" /sbin/checkproc -p /var/run/ddclient.pid /usr/bin/perl # remember status and be verbose rc_status -v ;; *) echo "Usage: ddclient {start|stop|try-restart|restart|status}" exit 1 esac rc_exit -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package aaa_base for openSUSE:12.1:Update:Test checked in at 2012-03-16 18:22:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/aaa_base (Old) and /work/SRC/openSUSE:12.1:Update:Test/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/aaa_base/aaa_base.changes 2012-02-09 15:38:14.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.aaa_base.new/aaa_base.changes 2012-03-16 18:23:01.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 01:04:13 CET 2012 - ro(a)suse.de + +- fix chkconfig for systemd (bnc#732934) + +------------------------------------------------------------------- New: ---- aaa_base-chkconfig-bnc-732934.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.oKw99t/_old 2012-03-16 18:23:02.000000000 +0100 +++ /var/tmp/diff_new_pack.oKw99t/_new 2012-03-16 18:23:02.000000000 +0100 @@ -20,10 +20,23 @@ Version: 12.1 Release: 0 Url: http://gitorious.org/opensuse/aaa_base -Provides: bin bootutls etc skeleng skelger Provides: aaa_skel = %{version}-%{release} +Provides: bin +Provides: bootutls +Provides: etc +Provides: skeleng +Provides: skelger Obsoletes: aaa_skel < %{version} -Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc +Requires: /bin/login +Requires: /bin/mktemp +Requires: /usr/bin/find +Requires: /usr/bin/tput +Requires: /usr/bin/xargs +Requires: cpio +Requires: distribution-release +Requires: filesystem +Requires: mingetty +Requires: psmisc Recommends: cron logrotate netcfg udev net-tools aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Summary: SUSE Linux Base Package @@ -35,6 +48,7 @@ Source99: aaa_base-rpmlintrc Patch0: systemd_no_wrap_service.patch Patch1: Strip-boot.d-also-from-rc-symbolic-links-bnc-739217.patch +Patch2: aaa_base-chkconfig-bnc-732934.patch %description This package installs several important configuration files. Central @@ -55,6 +69,7 @@ %setup -n aaa_base %patch0 -p1 %patch1 -p1 +%patch2 -p0 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} ++++++ aaa_base-chkconfig-bnc-732934.patch ++++++ --- files/sbin/chkconfig +++ files/sbin/chkconfig @@ -8,6 +8,7 @@ my $inetddir = '/etc/inetd.d'; my $xinetddir = '/etc/xinetd.d'; my $systemd_service_path = '/lib/systemd/system'; +my $systemd_etc_service_path = '/etc/systemd/system'; my $systemd_binary_path = '/bin/systemd'; my %to_d = ( @@ -471,7 +472,7 @@ sub is_overriden_by_systemd { my $service = shift; my $root = shift; - return -e "$root/$systemd_service_path/$service.service"; + return -e "$root/$systemd_service_path/$service.service" or -e "$root/$systemd_etc_service_path/$service.service"; } sub forward_to_systemd { @@ -680,6 +681,14 @@ my $want = shift @services; $want = normalize($s, $want); $status = 1, next unless defined $want; + if (($root ne "/") or (($root eq "/") and is_systemd_active()) and is_overriden_by_systemd ($s,$root)) { + if ($want ne "") { + push @enable, $s; + } else { + push @remove, $s; + } + next; + } $current{$s} = getcurrent($s) unless defined $current{$s}; $status = 1, next unless defined $current{$s}; my $current = $current{$s}; -- 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 for openSUSE:11.4
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python for openSUSE:11.4 checked in at Fri Mar 16 18:23:01 CET 2012. -------- --- old-versions/11.4/UPDATES/all/python/python-base.changes 2012-01-12 16:28:12.000000000 +0100 +++ 11.4/python/python-base.changes 2012-02-23 08:26:59.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 23 07:23:40 UTC 2012 - jcnengel(a)googlemail.com + +- Fix regression in acceptance of unicode strings in add_option calls + (http://bugs.python.org/issue9161) + +------------------------------------------------------------------- python.changes: same change calling whatdependson for 11.4-i586 New: ---- python-2.7-fix-UTF-arguments.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.fdhMTN/_old 2012-03-16 18:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.fdhMTN/_new 2012-03-16 18:21:00.000000000 +0100 @@ -30,7 +30,7 @@ # Summary: Python Interpreter base package Version: 2.7 -Release: 8.<RELEASE12> +Release: 8.<RELEASE14> %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -55,6 +55,7 @@ Patch13: python-fix_date_time_compiler.patch Patch14: python-2.7-CVE-2011-1521-fileurl.patch Patch15: python-2.7-fix-parallel-make.patch +Patch16: python-2.7-fix-UTF-arguments.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) Provides: %{name} = %{python_version} @@ -151,6 +152,7 @@ %patch13 %patch14 -p1 %patch15 -p1 +%patch16 -p1 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.fdhMTN/_old 2012-03-16 18:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.fdhMTN/_new 2012-03-16 18:21:00.000000000 +0100 @@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.7 -Release: 8.<RELEASE2> +Release: 8.<RELEASE3> %define pyver 2.7 BuildArch: noarch %define tarname Python-%{pyver} ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.fdhMTN/_old 2012-03-16 18:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.fdhMTN/_new 2012-03-16 18:21:00.000000000 +0100 @@ -32,7 +32,7 @@ Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.7 -Release: 9.<RELEASE12> +Release: 9.<RELEASE14> Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} ++++++ python-2.7-fix-UTF-arguments.patch ++++++ # HG changeset patch # User R. David Murray <rdmurray(a)bitdance.com> # Date 1278345965 0 # Node ID 705869d1bdf0fda211f099c1d4259652f4ad3f50 # Parent e84d5164414460a36fff780c27f7324859612b67 #9161: Fix regression in acceptance of unicode strings in add_option calls. The original change in 2.6 was made during rc1 changeover, and did not get ported to 2.7. The original change may not even have been intentional, but if so it doesn't seem to have caused any problems. diff --git a/Lib/optparse.py b/Lib/optparse.py --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -1008,7 +1008,7 @@ class OptionContainer: """add_option(Option) add_option(opt_str, ..., kwarg=val, ...) """ - if type(args[0]) is types.StringType: + if type(args[0]) in types.StringTypes: option = self.option_class(*args, **kwargs) elif len(args) == 1 and not kwargs: option = args[0] diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,9 @@ Core and Builtins Library ------- +- Issue #9161: Fix regression in optparse's acceptance of unicode + strings in add_option calls. + - Issue #9130: Fix validation of relative imports in parser module. - Issue #9128: Fix validation of class decorators in parser module. continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xulrunner for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2012-03-16 13:27:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xulrunner (Old) and /work/SRC/openSUSE:Factory/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xulrunner", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2012-03-13 09:40:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2012-03-16 13:28:02.000000000 +0100 @@ -2 +2 @@ -Sun Mar 4 14:01:59 UTC 2012 - wr(a)rosenauer.org +Fri Mar 9 21:49:05 UTC 2012 - wr(a)rosenauer.org @@ -4 +4,16 @@ -- update to version 11.0b5 +- update to version 11.0 (bnc#750044) + * MFSA 2012-13/CVE-2012-0455 (bmo#704354) + XSS with Drag and Drop and Javascript: URL + * MFSA 2012-14/CVE-2012-0456/CVE-2012-0457 (bmo#711653, #720103) + SVG issues found with Address Sanitizer + * MFSA 2012-15/CVE-2012-0451 (bmo#717511) + XSS with multiple Content Security Policy headers + * MFSA 2012-16/CVE-2012-0458 + Escalation of privilege with Javascript: URL as home page + * MFSA 2012-17/CVE-2012-0459 (bmo#723446) + Crash when accessing keyframe cssText after dynamic modification + * MFSA 2012-18/CVE-2012-0460 (bmo#727303) + window.fullScreen writeable by untrusted content + * MFSA 2012-19/CVE-2012-0461/CVE-2012-0462/CVE-2012-0464/ + CVE-2012-0463 + Miscellaneous memory safety hazards Old: ---- l10n-10.99.tar.bz2 xulrunner-10.99-source.tar.bz2 New: ---- l10n-11.0.tar.bz2 mozilla-sle11-gcc.patch xulrunner-11.0-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.AraPZ9/_old 2012-03-16 13:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.AraPZ9/_new 2012-03-16 13:28:07.000000000 +0100 @@ -44,9 +44,9 @@ %endif BuildRequires: mozilla-nspr-devel >= 4.9.0 BuildRequires: mozilla-nss-devel >= 3.13.3 -Version: 10.99 +Version: 11.0 Release: 0 -%define releasedate 2012022900 +%define releasedate 2012031200 %define version_internal 11.0 %define apiversion 11 %define uaweight 1100000 @@ -80,6 +80,7 @@ Patch14: mozilla-linux3.patch Patch15: mozilla-arm-cpu-detection.patch Patch17: mozilla-yarr-pcre.patch +Patch18: mozilla-sle11-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -161,7 +162,7 @@ Summary: Extra translations for XULRunner Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -199,6 +200,7 @@ %patch14 -p1 %patch15 -p1 #%patch17 -p1 +%patch18 -p1 %build # no need to add build time to binaries ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.AraPZ9/_old 2012-03-16 13:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.AraPZ9/_new 2012-03-16 13:28:07.000000000 +0100 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="beta" +CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_11_0b5_RELEASE" -VERSION="10.99" +RELEASE_TAG="FIREFOX_11_0_RELEASE" +VERSION="11.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ l10n-10.99.tar.bz2 -> l10n-11.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/l10n-10.99.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/l10n-11.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-sle11-gcc.patch ++++++ # HG changeset patch # Parent 39e596b823926b5add22bb263734c6c872ee2aad diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/base/src/nsXULTooltipListener.h --- a/layout/xul/base/src/nsXULTooltipListener.h +++ b/layout/xul/base/src/nsXULTooltipListener.h @@ -107,17 +107,17 @@ protected: static void sTooltipCallback (nsITimer* aTimer, void* aListener); // screen coordinates of the last mousemove event, stored so that the // tooltip can be opened at this location. PRInt32 mMouseScreenX, mMouseScreenY; // various constants for tooltips enum { - kTooltipMouseMoveTolerance = 7, // 7 pixel tolerance for mousemove event + kTooltipMouseMoveTolerance = 7 // 7 pixel tolerance for mousemove event }; // flag specifying if the tooltip has already been displayed by a MouseMove // event. The flag is reset on MouseOut so that the tooltip will display // the next time the mouse enters the node (bug #395668). bool mTooltipShownOnce; #ifdef MOZ_XUL ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.AraPZ9/_old 2012-03-16 13:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.AraPZ9/_new 2012-03-16 13:28:07.000000000 +0100 @@ -1,2 +1,2 @@ -REV=8c9e4873d419 -REPO=http://hg.mozilla.org/releases/mozilla-beta +REV=b967d9c07377 +REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ xulrunner-10.99-source.tar.bz2 -> xulrunner-11.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/xulrunner-10.99-source.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner-11.0-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfsprogs for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package xfsprogs for openSUSE:Factory checked in at 2012-03-16 13:27:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfsprogs (Old) and /work/SRC/openSUSE:Factory/.xfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfsprogs", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xfsprogs/xfsprogs.changes 2012-02-23 15:35:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfsprogs.new/xfsprogs.changes 2012-03-16 13:27:51.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 13:41:03 UTC 2012 - coolo(a)suse.com + +- no need to link the lib in /lib + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.wSiNzE/_old 2012-03-16 13:27:52.000000000 +0100 +++ /var/tmp/diff_new_pack.wSiNzE/_new 2012-03-16 13:27:52.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xfsprogs BuildRequires: e2fsprogs-devel Version: 3.1.6 @@ -46,12 +47,6 @@ complete details. This implementation is on-disk compatible with the IRIX version of XFS. - - -Authors: --------- - SGI - %package devel Requires: xfsprogs = %version Url: http://oss.sgi.com/projects/xfs/ @@ -66,12 +61,6 @@ system-specific programs. If you install xfsprogs-devel, you will also want to install xfsprogs. - - -Authors: --------- - SGI - %prep %setup -q %patch0 @@ -96,9 +85,7 @@ mv $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT%{_sbindir} mv $RPM_BUILD_ROOT/%_lib/* $RPM_BUILD_ROOT%{_libdir} #UsrMerge -ln -sf %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} $RPM_BUILD_ROOT/sbin -ln -sf %{_libdir}/libhandle.so.1 $RPM_BUILD_ROOT/%{_lib} -ln -sf %{_libdir}/libhandle.so.1.0.3 $RPM_BUILD_ROOT/%{_lib} +ln -s %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} $RPM_BUILD_ROOT/sbin #EndUserMerge pushd $RPM_BUILD_ROOT%_libdir ln -s libhandle.so.[0-9] libhandle.so @@ -117,7 +104,6 @@ %defattr(-,root,root,755) #UsrMerge /sbin/* -/%_lib/libhandle.so.* #EndUsrMerge %_sbindir/* # this is only used by xfs cmds, therefore no urgent need for a shlib package -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfce4-screenshooter for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package xfce4-screenshooter for openSUSE:Factory checked in at 2012-03-16 13:27:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-screenshooter (Old) and /work/SRC/openSUSE:Factory/.xfce4-screenshooter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-screenshooter", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-screenshooter/xfce4-screenshooter.changes 2011-10-28 15:29:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-screenshooter.new/xfce4-screenshooter.changes 2012-03-16 13:27:42.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 19:29:55 UTC 2012 - gber(a)opensuse.org + +- recommend -lang subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-screenshooter.spec ++++++ --- /var/tmp/diff_new_pack.jK6Enw/_old 2012-03-16 13:27:44.000000000 +0100 +++ /var/tmp/diff_new_pack.jK6Enw/_new 2012-03-16 13:27:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-screenshooter # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties @@ -21,27 +21,28 @@ Name: xfce4-screenshooter Version: 1.8.0 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Screenshot Tool -Url: http://goodies.xfce.org/projects/applications/xfce4-screenshooter +License: GPL-2.0+ Group: Productivity/Graphics/Other +Url: http://goodies.xfce.org/projects/applications/xfce4-screenshooter Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM xfce4-screenshooter-fix-libm-underlinking.patch bxo#7985 gber(a)opensuse.org -- Link explicitly against libm Patch0: xfce4-screenshooter-fix-libm-underlinking.patch # PATCH-FIX-UPSTREAM xfce4-screenshooter-1.8.0-use-docdir.patch gber(a)opensuse.org -- Allow installation of documentation under docdir Patch1: xfce4-screenshooter-1.8.0-use-docdir.patch +BuildRequires: fdupes +BuildRequires: intltool +BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(exo-1) -BuildRequires: pkgconfig(libxfce4ui-1) -BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libxfce4panel-1.0) +BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) -BuildRequires: xfce4-dev-tools -BuildRequires: intltool -BuildRequires: update-desktop-files -BuildRequires: fdupes Recommends: %{name}-doc = %{version} +Recommends: %{name}-lang = %{version} Suggests: xfce4-panel-plugin-screenshooter BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,7 +54,6 @@ ZimageZ, a free online image hosting service. %package -n xfce4-panel-plugin-screenshooter -License: GPL-2.0+ Summary: Screenshot Plugin for the Xfce Panel Group: System/GUI/XFCE Requires: xfce4-panel >= %panel_version @@ -69,7 +69,6 @@ This package contains the Xfce panel plugin. %package doc -License: GPL-2.0+ Summary: Documentation for Xfce Screenshooter Group: Documentation/HTML Requires: %name = %version @@ -99,8 +98,6 @@ %clean rm -rf %{buildroot} -%if 0%{?suse_version} >= 1140 - %post %desktop_database_post %icon_theme_cache_post @@ -108,7 +105,6 @@ %postun %desktop_database_postun %icon_theme_cache_postun -%endif %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2012-03-16 13:27:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine", Maintainer is "meissner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2012-03-09 21:29:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2012-03-16 13:27:34.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 17:41:05 CET 2012 - meissner(a)suse.de + +- Updated winetricks to 20120308 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.gGAh5H/_old 2012-03-16 13:27:37.000000000 +0100 +++ /var/tmp/diff_new_pack.gGAh5H/_new 2012-03-16 13:27:37.000000000 +0100 @@ -62,7 +62,7 @@ Summary: An MS Windows Emulator License: LGPL-2.1+ Group: System/Emulators/PC -Url: http://www.winehq.com +Url: http://www.winehq.org/ Source0: %name-%version.tar.bz2 Source1: http://kegel.com/wine/winetricks Source2: http://kegel.com/wine/wisotool ++++++ winetricks ++++++ ++++ 1315 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/wine/winetricks ++++ and /work/SRC/openSUSE:Factory/.wine.new/winetricks -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit viewnior for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package viewnior for openSUSE:Factory checked in at 2012-03-16 13:27:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/viewnior (Old) and /work/SRC/openSUSE:Factory/.viewnior.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "viewnior", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/viewnior/viewnior.changes 2011-09-23 12:49:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.viewnior.new/viewnior.changes 2012-03-16 13:27:30.000000000 +0100 @@ -1,0 +2,29 @@ +Wed Mar 14 07:36:58 UTC 2012 - lazy.kent(a)opensuse.org + +- Update to 1.3. + * New features: + + Wallpaper support for LXDE. + + Hebrew translation. + * Fixes: + + Wallpaper fix for XFCE. + + Minor fixes. +- Changes in 1.2. + * New features: + + Improved menu interface. + + Wallpaper support for Gnome 2, Gnome 3, XFCE and FluxBox. + + --fullscreen argument to start in Fullscreen mode. + + GConf independent. + * Fixes: + + Drop images with right click. + + Save 'Auto resize' option between sessions. +- Split off language package. +- Use full URL as a source. +- Use pkgconfig(*) as build dependencies. +- Removed useless build dependencies (gconf2-devel, gettext, + shared-mime-info). +- Use make_install macro. +- Added desktop_database_post/un and icon_theme_cache_post/un + macros. +- Clean up spec. + +------------------------------------------------------------------- Old: ---- viewnior-1.1.tar.bz2 New: ---- viewnior-1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ viewnior.spec ++++++ --- /var/tmp/diff_new_pack.v48gkI/_old 2012-03-16 13:27:33.000000000 +0100 +++ /var/tmp/diff_new_pack.v48gkI/_new 2012-03-16 13:27:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package viewnior # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: viewnior -Version: 1.1 -Release: 1 -Summary: Elegant image viewer -Group: Productivity/Graphics/Viewers +Version: 1.3 +Release: 0 +Summary: Elegant Image Viewer License: GPL-3.0+ +Group: Productivity/Graphics/Viewers Url: http://xsisqox.github.com/Viewnior -Source0: %{name}-%{version}.tar.bz2 +Source0: http://cloud.github.com/downloads/xsisqox/Viewnior/%{name}-%{version}.tar.gz Patch0: %{name}-1.1-ld_fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gtk2-devel -BuildRequires: update-desktop-files -BuildRequires: gettext BuildRequires: intltool -BuildRequires: shared-mime-info -BuildRequires: gconf2-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gtk+-2.0) +Recommends: %{name}-lang +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Viewnior is an image viewer program. Created to be simple, fast and elegant. @@ -48,6 +44,7 @@ * Simple interface * Configurable mouse actions +%lang_package %prep %setup -q @@ -56,32 +53,23 @@ chmod 0644 AUTHORS ChangeLog COPYING NEWS README TODO src/* %build -%configure --enable-wallpaper +%configure make %{?_smp_mflags} V=1 %install -%makeinstall +%make_install %find_lang %{name} %suse_update_desktop_file %{name} -%clean -rm -rf %{buildroot} - %post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -update-desktop-database &> /dev/null || : +%desktop_database_post +%icon_theme_cache_post %postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi -update-desktop-database &> /dev/null || : +%desktop_database_postun +%icon_theme_cache_postun -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/%{name} @@ -90,4 +78,6 @@ %{_datadir}/%{name}/ %{_mandir}/man*/%{name}.* +%files lang -f %{name}.lang + %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tomboy for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package tomboy for openSUSE:Factory checked in at 2012-03-16 13:27:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomboy (Old) and /work/SRC/openSUSE:Factory/.tomboy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomboy", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/tomboy/tomboy.changes 2012-02-28 19:25:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tomboy.new/tomboy.changes 2012-03-16 13:27:09.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 5 21:35:03 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.9.9: + + Fix link names after HTML export (bgo#667026) + + Updated translations. + +------------------------------------------------------------------- Old: ---- tomboy-1.9.8.tar.xz New: ---- tomboy-1.9.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.8w3vk0/_old 2012-03-16 13:27:11.000000000 +0100 +++ /var/tmp/diff_new_pack.8w3vk0/_new 2012-03-16 13:27:11.000000000 +0100 @@ -19,7 +19,7 @@ %define build_applet 0 Name: tomboy -Version: 1.9.8 +Version: 1.9.9 Release: 0 Summary: GNOME Note Taking Application License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit thunar-plugin-vcs for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package thunar-plugin-vcs for openSUSE:Factory checked in at 2012-03-16 13:26:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thunar-plugin-vcs (Old) and /work/SRC/openSUSE:Factory/.thunar-plugin-vcs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "thunar-plugin-vcs", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/thunar-plugin-vcs/thunar-plugin-vcs.changes 2011-09-23 12:48:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.thunar-plugin-vcs.new/thunar-plugin-vcs.changes 2012-03-16 13:26:56.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 19:31:24 UTC 2012 - gber(a)opensuse.org + +- recommend -lang subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar-plugin-vcs.spec ++++++ --- /var/tmp/diff_new_pack.AgFAgS/_old 2012-03-16 13:26:57.000000000 +0100 +++ /var/tmp/diff_new_pack.AgFAgS/_new 2012-03-16 13:26:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package thunar-plugin-vcs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,18 @@ %define plugin_name thunar-vcs-plugin Name: thunar-plugin-vcs -Group: System/GUI/XFCE Url: http://thunar.xfce.org/plugins.html#thunar-archive-plugin -License: GPL-2.0+ Version: 0.1.4 -Release: 1 +Release: 0 Source0: %{plugin_name}-%{version}.tar.bz2 Summary: Thunar Plugin Providing VCS Integration +License: GPL-2.0+ +Group: System/GUI/XFCE BuildRequires: intltool BuildRequires: thunar-devel >= %{thunar_version} BuildRequires: pkgconfig(thunarx-2) Requires: thunar >= %{thunar_version} +Recommends: %{name}-lang = %{version} Provides: %{plugin_name} = %{version} Obsoletes: %{plugin_name} < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,22 +57,17 @@ %install %make_install -# remove unsupported locales -rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{plugin_name} rm -f %{buildroot}%{_libdir}/thunarx-2/thunar-vcs-plugin.la %clean rm -rf "%{buildroot}" -%if 0%{?suse_version} >= 1140 - %post %icon_theme_cache_post %postun %icon_theme_cache_postun -%endif %files %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit system-config-printer for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package system-config-printer for openSUSE:Factory checked in at 2012-03-16 13:26:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old) and /work/SRC/openSUSE:Factory/.system-config-printer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "system-config-printer", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes 2012-02-16 12:28:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes 2012-03-16 13:26:47.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 2 19:26:19 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.3.9: + + Improved output from check-device-ids script. + + Don't warn about changed cupsGetPPD3 behaviour in CUPS 1.5.3. + + Avoid temporary file leaks. + + Handle file disappearances when caching PPDs (rh#786232). + + Fixed several debugprints (rh#785581). + + Updated translations. + +------------------------------------------------------------------- Old: ---- system-config-printer-1.3.8.tar.xz New: ---- system-config-printer-1.3.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-config-printer.spec ++++++ --- /var/tmp/diff_new_pack.vw9yqG/_old 2012-03-16 13:26:49.000000000 +0100 +++ /var/tmp/diff_new_pack.vw9yqG/_new 2012-03-16 13:26:49.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: system-config-printer -Version: 1.3.8 +Version: 1.3.9 Release: 0 Summary: A printer administration tool License: GPL-2.0+ @@ -47,8 +48,8 @@ BuildRequires: xmlto # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz -Requires: cups Requires: %{name}-common = %{version} +Requires: cups # The applet is not strictly necessary, but it really makes sense Recommends: %{name}-applet %py_requires -- 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 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2012-03-16 13:26:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysstat (Old) and /work/SRC/openSUSE:Factory/.sysstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysstat", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sysstat/sysstat.changes 2012-02-16 12:28:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysstat.new/sysstat.changes 2012-03-16 13:26:40.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Mar 12 17:27:04 UTC 2012 - tabraham(a)novell.com + +- update to 10.0.4 + * [Andrey Borzenkov]: Don't take virtual devices into account in + sar -b results. + * [Peter Schiffer]: iostat didn't display target device + information when a symbolic link was specified as a parameter. + This is now fixed. + * The number of jiffies spent by a CPU in guest mode given by the + corresponding counter in /proc/stat may be slightly different + from that included in the user counter. Take this into account + when calculating current time interval value. + * configure script updated: Added --disable-stripping option. + Using this option tells configure to NOT strip object files. + * FAQ updated. + * sa1 manual page updated. + * NLS updated. Serbian translation added. + +- drop sysstat-do-not-strip.patch (use new configure option + --disable-stripping instead) + +------------------------------------------------------------------- Old: ---- sysstat-10.0.3.tar.bz2 sysstat-do-not-strip.patch New: ---- sysstat-10.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.2wGWMw/_old 2012-03-16 13:26:42.000000000 +0100 +++ /var/tmp/diff_new_pack.2wGWMw/_new 2012-03-16 13:26:42.000000000 +0100 @@ -17,7 +17,7 @@ Name: sysstat -Version: 10.0.3 +Version: 10.0.4 Release: 0 Summary: Sar and Iostat Commands for Linux License: GPL-2.0+ @@ -38,11 +38,8 @@ # instead of /etc/sysconfig since the files do not match # the format used there (should be configure option) Patch3: sysstat-8.0.4-sysconfdir.diff -# PATCH-FIX-OPENSUSE remove the unconditional stripping -# we possibly want a debuginfo package -Patch4: sysstat-do-not-strip.patch # PATCH-FIX-OPENSUSE avoid build dates in generated files -Patch5: sysstat-9.0.4-no-build-date.patch +Patch4: sysstat-9.0.4-no-build-date.patch PreReq: %fillup_prereq PreReq: %insserv_prereq Requires: gettext @@ -80,8 +77,7 @@ %patch0 %patch2 %patch3 -%patch4 -p1 -%patch5 +%patch4 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} . %build @@ -92,7 +88,8 @@ %configure \ --enable-nls \ --disable-man-group \ - --enable-debug-info + --enable-debug-info \ + --disable-stripping make %{?_smp_mflags} %install ++++++ sysstat-10.0.3.tar.bz2 -> sysstat-10.0.4.tar.bz2 ++++++ ++++ 2230 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 suitesparse for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package suitesparse for openSUSE:Factory checked in at 2012-03-16 13:26:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suitesparse (Old) and /work/SRC/openSUSE:Factory/.suitesparse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suitesparse", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.suitesparse.new/suitesparse.changes 2012-03-16 13:26:30.000000000 +0100 @@ -0,0 +1,46 @@ +------------------------------------------------------------------- +Sun Feb 19 06:41:09 UTC 2012 - i(a)marguerite.su + +- fix timestamp error in changelog, dont know why it omit zero in + time format. + +------------------------------------------------------------------- +Sat Feb 18 16:15:32 UTC 2012 - jengelh(a)medozas.de + +- add rpmlintrc to shut up false positives (after inquiry by + MargueriteSu) + +------------------------------------------------------------------- +Fri Feb 17 14:01:01 UTC 2012 - i(a)marguerite.su + +- fix libraries version tags of suitesparse-devel requires. + +------------------------------------------------------------------- +Wed Feb 15 07:36:47 UTC 2012 - i(a)marguerite.su + +- fix bug#746867. cholmod is licensed under GPL-2.0 and LGPL-2.0 only, + GPL-2.0 only prevents other components to be licensed under a high + version of the same license. + +------------------------------------------------------------------- +Tue Feb 7 17:10:48 UTC 2012 - jengelh(a)medozas.de + +- Apply shared library policy + http://en.opensuse.org/openSUSE:Shared_library_packaging_policy + +------------------------------------------------------------------- +Sat Feb 4 11:38:15 UTC 2012 - i(a)marguerite.su + +- update to version 3.7.0 + +------------------------------------------------------------------- +Sun Dec 21 00:00:00 UTC 2011 - coyoteuser(a)gmail.com + +- updated to latest version 3.2.0 +- added gcc4.3.2 fix for spqr.hpp +- changed source to bz2 archive + +------------------------------------------------------------------- +Mon Dec 8 00:00:00 UTC 2008 - coyoyeuser(a)gmail.com + +- Initial release New: ---- SuiteSparse-3.7.0.tar.bz2 suitesparse-rpmlintrc suitesparse.changes suitesparse.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suitesparse.spec ++++++ # # spec file for package suitesparse # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: suitesparse Summary: A collection of sparse matrix libraries Version: 3.7.0 Release: 0 Group: Productivity/Scientific/Math License: GPL-2.0 and LGPL-2.0 Url: http://www.cise.ufl.edu/research/sparse/SuiteSparse Source: SuiteSparse-%{version}.tar.bz2 Source2: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc gcc-c++ BuildRequires: gcc-fortran BuildRequires: blas %description suitesparse is a collection of libraries for computations involving sparse matrices. %package devel Summary: Development headers for SuiteSparse Group: Development/Languages/C and C++ Requires: %{name} = %{version}-%{release} Requires: libamd-2_2_3 = 2.2.3 Requires: libbtf-1_1_3 = 1.1.3 Requires: libcamd-2_2_3 = 2.2.3 Requires: libccolamd-2_7_4 = 2.7.4 Requires: libcholmod-1_7_4 = 1.7.4 Requires: libcolamd-2_7_4 = 2.7.4 Requires: libcxsparse-2_2_6 = 2.2.6 Requires: libklu-1_1_3 = 1.1.3 Requires: libldl-2_0_4 = 2.0.4 Requires: librbio-2_0_2 = 2.0.2 Requires: libspqr-1_2_3 = 1.2.3 Requires: libumfpack-5_5_2 = 5.5.2 Provides: suitesparse-common-devel = %{version}-%{release} Obsoletes: suitesparse-common-devel < %{version}-%{release} Provides: amd-devel = 2.2.3 Obsoletes: amd-devel < 2.2.3 Provides: umfpack-devel = 5.5.2 Obsoletes: umfpack-devel < 5.5.2 # includes also UFconfig (i. e. UFconfig.h) %description devel The suitesparse-devel package contains files needed for developing applications which use the suitesparse libraries. %package devel-static Summary: Static version of SuiteSparse libraries Group: Development/Languages/C and C++ Requires: %{name}-devel = %{version}-%{release} %description devel-static The suitesparse-static package contains the statically linkable version of the suitesparse libraries. %package -n libamd-2_2_3 Version: 2.2.3 Summary: Symmetric Approximate Minimum Degree %description -n libamd-2_2_3 AMD as part of SuiteSparse features symmetric approximate minimum degree. %package -n libbtf-1_1_3 Version: 1.1.3 Summary: Permutation to Block Triangular Form %description -n libbtf-1_1_3 BTF as part of SuiteSparse features permutation to block triangular form. %package -n libcamd-2_2_3 Version: 2.2.3 Summary: Symmetric Approximate Minimum Degree %description -n libcamd-2_2_3 CAMD as part of SuiteSparse features symmetric approximate minimum degree. %package -n libccolamd-2_7_4 Version: 2.7.4 Summary: Constrained Column Approximate Minimum Degree %description -n libccolamd-2_7_4 CCOLAMD as part of SuiteSparse features constrained column approximate minimum degree. %package -n libcholmod-1_7_4 Version: 1.7.4 Summary: Sparse Supernodal Cholesky Factorization and Update/Downdate %description -n libcholmod-1_7_4 CHOLMOD as part of SuiteSparse features sparse supernodal Cholesky factorization and update/downdate. %package -n libcolamd-2_7_4 Version: 2.7.4 Summary: Column Approximate Minimum Degree %description -n libcolamd-2_7_4 COLAMD as part of SuiteSparse features column approximate minimum degree. %package -n libcxsparse-2_2_6 Version: 2.2.6 Summary: An extended version of CSparse %description -n libcxsparse-2_2_6 CXSparse as part of SuiteSparse features an extended version of CSparse. %package -n libklu-1_1_3 Version: 1.1.3 Summary: Sparse LU Factorization, for Circuit Simulation %description -n libklu-1_1_3 KLU as part of SuiteSparse features sparse LU factorization, for circuit simulation. %package -n libldl-2_0_4 Version: 2.0.4 Summary: A Simple LDL^T Factorization %description -n libldl-2_0_4 LDL as part of SuiteSparse features a simple LDL^T factorization. %package -n librbio-2_0_2 Version: 2.0.2 Summary: MATLAB Toolbox for Reading/Writing Sparse Matrices %description -n librbio-2_0_2 RBio as part of SuiteSparse features MATLAB toolbox for reading/writing sparse matrices. %package -n libspqr-1_2_3 Version: 1.2.3 Summary: Multifrontal Sparse QR %description -n libspqr-1_2_3 SPQR as part of SuiteSparse features multifrontal sparse QR. %package -n libumfpack-5_5_2 Version: 5.5.2 Summary: Sparse Multifrontal LU Factorization %description -n libumfpack-5_5_2 UMFPACK as part of SuiteSparse features sparse multifrontal LU factorization. %prep %setup -q -n SuiteSparse sed 's/^CHOLMOD_CONFIG =.*/CHOLMOD_CONFIG = -DNPARTITION/' -i UFconfig/UFconfig.mk sed 's/^$METIS =$.*//' -i UFconfig/UFconfig.mk %build for dir in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CXSparse KLU LDL RBio SPQR UMFPACK; do pushd $dir ver=$(grep -E "^VERSION =" Makefile | sed "s:VERSION = ::") pushd Lib make CFLAGS="$RPM_OPT_FLAGS -fPIC" dir_l=$(echo "$dir" | tr "[A-Z]" "[a-z]") gcc -shared -Wl,-soname -Wl,"lib${dir_l}-$ver.so" -o "lib${dir_l}-$ver.so" *.o -lm ln -s "lib${dir_l}-$ver.so" "lib${dir_l}.so" popd popd done # specialities # -- CHOLMOD pushd CHOLMOD cp Cholesky/License.txt Doc/Cholesky_License.txt cp Core/License.txt Doc/Core_License.txt cp MatrixOps/License.txt Doc/MatrixOps_License.txt cp Partition/License.txt Doc/Partition_License.txt cp Supernodal/License.txt Doc/Supernodal_License.txt popd %install mkdir -p %{buildroot}%{_includedir}/%{name} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_docdir}/%{name} mkdir -p %{buildroot}%{_docdir}/%{name}-devel cp -a UFconfig/UFconfig.h %{buildroot}%{_includedir}/%{name} cp -a README.txt %{buildroot}%{_docdir}/%{name} for dir in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CXSparse KLU LDL RBio SPQR UMFPACK; do pushd $dir ver=$(grep -E "^VERSION =" Makefile | sed "s:VERSION = ::") cp -a Lib/*.a Lib/*.so* %{buildroot}/%{_libdir} cp -a Include/*.h %{buildroot}%{_includedir}/%{name} mkdir %{buildroot}%{_docdir}/%{name}/$dir-$ver mkdir %{buildroot}%{_docdir}/%{name}-devel/$dir cp -a README.txt Doc/{License,ChangeLog,*.txt} %{buildroot}%{_docdir}/%{name}/$dir-$ver > /dev/null 2>&1 | true cp -a $dir/Doc/*.pdf %{buildroot}%{_docdir}/%{name}-devel/$dir > /dev/null 2>&1 | true popd done %post -n libamd-2_2_3 -p /sbin/ldconfig %postun -n libamd-2_2_3 -p /sbin/ldconfig %post -n libbtf-1_1_3 -p /sbin/ldconfig %postun -n libbtf-1_1_3 -p /sbin/ldconfig %post -n libcamd-2_2_3 -p /sbin/ldconfig %postun -n libcamd-2_2_3 -p /sbin/ldconfig %post -n libccolamd-2_7_4 -p /sbin/ldconfig %postun -n libccolamd-2_7_4 -p /sbin/ldconfig %post -n libcholmod-1_7_4 -p /sbin/ldconfig %postun -n libcholmod-1_7_4 -p /sbin/ldconfig %post -n libcolamd-2_7_4 -p /sbin/ldconfig %postun -n libcolamd-2_7_4 -p /sbin/ldconfig %post -n libcxsparse-2_2_6 -p /sbin/ldconfig %postun -n libcxsparse-2_2_6 -p /sbin/ldconfig %post -n libklu-1_1_3 -p /sbin/ldconfig %postun -n libklu-1_1_3 -p /sbin/ldconfig %post -n libldl-2_0_4 -p /sbin/ldconfig %postun -n libldl-2_0_4 -p /sbin/ldconfig %post -n librbio-2_0_2 -p /sbin/ldconfig %postun -n librbio-2_0_2 -p /sbin/ldconfig %post -n libspqr-1_2_3 -p /sbin/ldconfig %postun -n libspqr-1_2_3 -p /sbin/ldconfig %post -n libumfpack-5_5_2 -p /sbin/ldconfig %postun -n libumfpack-5_5_2 -p /sbin/ldconfig %files %defattr(-,root,root) %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README.txt %files devel %defattr(-,root,root) %{_includedir}/%{name} %{_libdir}/lib*.so %exclude %_libdir/lib*-*.so %doc %{_docdir}/%{name}-devel %files devel-static %defattr(-,root,root) %{_libdir}/lib*.a %files -n libamd-2_2_3 %defattr(-, root, root) %{_libdir}/libamd-2.2.3.so %doc %{_docdir}/%{name}/AMD-2.2.3 %files -n libbtf-1_1_3 %defattr(-, root, root) %{_libdir}/libbtf-1.1.3.so %doc %{_docdir}/%{name}/BTF-1.1.3 %files -n libcamd-2_2_3 %defattr(-, root, root) %{_libdir}/libcamd-2.2.3.so %doc %{_docdir}/%{name}/CAMD-2.2.3 %files -n libccolamd-2_7_4 %defattr(-, root, root) %{_libdir}/libccolamd-2.7.4.so %doc %{_docdir}/%{name}/CCOLAMD-2.7.4 %files -n libcholmod-1_7_4 %defattr(-, root, root) %{_libdir}/libcholmod-1.7.4.so %doc %{_docdir}/%{name}/CHOLMOD-1.7.4 %files -n libcolamd-2_7_4 %defattr(-, root, root) %{_libdir}/libcolamd-2.7.4.so %doc %{_docdir}/%{name}/COLAMD-2.7.4 %files -n libcxsparse-2_2_6 %defattr(-, root, root) %{_libdir}/libcxsparse-2.2.6.so %doc %{_docdir}/%{name}/CXSparse-2.2.6 %files -n libklu-1_1_3 %defattr(-, root, root) %{_libdir}/libklu-1.1.3.so %doc %{_docdir}/%{name}/KLU-1.1.3 %files -n libldl-2_0_4 %defattr(-, root, root) %{_libdir}/libldl-2.0.4.so %doc %{_docdir}/%{name}/LDL-2.0.4 %files -n librbio-2_0_2 %defattr(-, root, root) %{_libdir}/librbio-2.0.2.so %doc %{_docdir}/%{name}/RBio-2.0.2 %files -n libspqr-1_2_3 %defattr(-, root, root) %{_libdir}/libspqr-1.2.3.so %doc %{_docdir}/%{name}/SPQR-1.2.3 %files -n libumfpack-5_5_2 %defattr(-, root, root) %{_libdir}/libumfpack-5.5.2.so %doc %{_docdir}/%{name}/UMFPACK-5.5.2 %changelog ++++++ suitesparse-rpmlintrc ++++++ # False positives addFilter("shlib-unversioned-lib") addFilter("shlib-policy-missing-lib") # rpmlint could be smarter addFilter("shlib-policy-nonversioned-dir") addFilter("no-binary") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit strongswan for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package strongswan for openSUSE:Factory checked in at 2012-03-16 13:26:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/strongswan (Old) and /work/SRC/openSUSE:Factory/.strongswan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "strongswan", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/strongswan/strongswan.changes 2012-02-16 15:02:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.strongswan.new/strongswan.changes 2012-03-16 13:26:16.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Mar 3 00:10:34 UTC 2012 - tabraham(a)novell.com + +- Updated to strongSwan 4.6.2 release: + Changes in 4.6.2: + - Upgraded the TCG IF-IMC and IF-IMV C API to the upcoming version 1.3 + which supports IF-TNCCS 2.0 long message types, the exclusive flags + and multiple IMC/IMV IDs. Both the TNC Client and Server as well as + the "Test", "Scanner", and "Attestation" IMC/IMV pairs were updated. + - Fully implemented the "TCG Attestation PTS Protocol: Binding to IF-M" + standard (TLV-based messages only). TPM-based remote attestation of + Linux IMA (Integrity Measurement Architecture) possible. Measurement + reference values are automatically stored in an SQLite database. + - The EAP-RADIUS authentication backend supports RADIUS accounting. It sends + start/stop messages containing Username, Framed-IP and Input/Output-Octets + attributes and has been tested against FreeRADIUS and Microsoft NPS. + - Added support for PKCS#8 encoded private keys via the libstrongswan + pkcs8 plugin. This is the default format used by some OpenSSL tools since + version 1.0.0 (e.g. openssl req with -keyout). + - Added session resumption support to the strongSwan TLS stack. + +------------------------------------------------------------------- Old: ---- strongswan-4.6.1-fmt-warnings.patch strongswan-4.6.1-glib.patch strongswan-4.6.1-rpmlintrc strongswan-4.6.1.tar.bz2 strongswan-4.6.1.tar.bz2.sig New: ---- strongswan-4.6.2-fmt-warnings.patch strongswan-4.6.2-glib.patch strongswan-4.6.2-rpmlintrc strongswan-4.6.2.tar.bz2 strongswan-4.6.2.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strongswan.spec ++++++ --- /var/tmp/diff_new_pack.PX1oaP/_old 2012-03-16 13:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.PX1oaP/_new 2012-03-16 13:26:18.000000000 +0100 @@ -18,7 +18,7 @@ Name: strongswan -Version: 4.6.1 +Version: 4.6.2 Release: 0 %define upstream_version %{version} %define strongswan_docdir %{_docdir}/%{name} @@ -486,6 +486,7 @@ %{strongswan_plugins}/libstrongswan-pem.so %{strongswan_plugins}/libstrongswan-pgp.so %{strongswan_plugins}/libstrongswan-pkcs1.so +%{strongswan_plugins}/libstrongswan-pkcs8.so %{strongswan_plugins}/libstrongswan-pubkey.so %{strongswan_plugins}/libstrongswan-random.so %{strongswan_plugins}/libstrongswan-resolve.so ++++++ strongswan-4.6.1-fmt-warnings.patch -> strongswan-4.6.2-fmt-warnings.patch ++++++ ++++++ strongswan-4.6.1-glib.patch -> strongswan-4.6.2-glib.patch ++++++ ++++++ strongswan-4.6.1-rpmlintrc -> strongswan-4.6.2-rpmlintrc ++++++ ++++++ strongswan-4.6.1.tar.bz2 -> strongswan-4.6.2.tar.bz2 ++++++ ++++ 64395 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 stardict-dic-enru-engcom for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package stardict-dic-enru-engcom for openSUSE:Factory checked in at 2012-03-16 13:25:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stardict-dic-enru-engcom (Old) and /work/SRC/openSUSE:Factory/.stardict-dic-enru-engcom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stardict-dic-enru-engcom", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/stardict-dic-enru-engcom/stardict-dic-enru-engcom.changes 2011-09-23 12:46:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.stardict-dic-enru-engcom.new/stardict-dic-enru-engcom.changes 2012-03-16 13:26:00.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 11 21:56:37 UTC 2012 - kkirill(a)opensuse.org + +- Removed "Provides: locale(stardict:en)" line to avoid installing + the dictionary for English environment. Fixed bnc#693083 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stardict-dic-enru-engcom.spec ++++++ --- /var/tmp/diff_new_pack.LnOzJg/_old 2012-03-16 13:26:01.000000000 +0100 +++ /var/tmp/diff_new_pack.LnOzJg/_new 2012-03-16 13:26:01.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package stardict-dic-enru-engcom (Version 1.36) +# spec file for package stardict-dic-enru-engcom # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,10 +22,9 @@ Summary: English-Russian dictionary of computer terms Version: 1.36 Release: 3 -License: SUSE-GFDL-1.1 +License: GFDL-1.1 Group: Productivity/Office/Dictionary Url: http://engcom.org.ru/ -Provides: locale(stardict:en) Provides: locale(stardict:ru) BuildArch: noarch %if 0%{?suse_version} > 1020 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sound-juicer for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package sound-juicer for openSUSE:Factory checked in at 2012-03-16 13:25:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sound-juicer (Old) and /work/SRC/openSUSE:Factory/.sound-juicer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sound-juicer", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/sound-juicer/sound-juicer.changes 2012-02-29 14:11:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sound-juicer.new/sound-juicer.changes 2012-03-16 13:25:58.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 14 12:55:19 UTC 2012 - vuntz(a)opensuse.org + +- Change libmusicbrainz3-devel BuildRequires to + pkgconfig(libdiscid) and pkgconfig(libmusicbrainz4) now that we + have libmusicbrainz4 in Factory. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sound-juicer.spec ++++++ --- /var/tmp/diff_new_pack.kJ5jcL/_old 2012-03-16 13:26:00.000000000 +0100 +++ /var/tmp/diff_new_pack.kJ5jcL/_new 2012-03-16 13:26:00.000000000 +0100 @@ -19,7 +19,6 @@ Name: sound-juicer Version: 3.3.90 Release: 0 -# FIXME: move to libmusicbrainz4 when it enters Factory (sr#107049) Summary: Clean and Lean GNOME CD Ripper License: GPL-2.0+ Group: Productivity/Multimedia/CD/Grabbers @@ -35,9 +34,10 @@ BuildRequires: gstreamer010-plugins-good BuildRequires: intltool BuildRequires: libcanberra-devel -BuildRequires: libmusicbrainz3-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(libdiscid) +BuildRequires: pkgconfig(libmusicbrainz4) Requires: gstreamer010-plugins-good Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sleuthkit for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package sleuthkit for openSUSE:Factory checked in at 2012-03-16 13:25:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sleuthkit (Old) and /work/SRC/openSUSE:Factory/.sleuthkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sleuthkit", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/sleuthkit/sleuthkit.changes 2011-10-12 16:16:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sleuthkit.new/sleuthkit.changes 2012-03-16 13:25:41.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 21 12:56:42 UTC 2011 - Greg.Freemyer(a)gmail.com + +- Add EnCase image support for reading + - Source code support was already present, this just involved linking libewf into the build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sleuthkit.spec ++++++ --- /var/tmp/diff_new_pack.z6jW3P/_old 2012-03-16 13:25:42.000000000 +0100 +++ /var/tmp/diff_new_pack.z6jW3P/_new 2012-03-16 13:25:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sleuthkit # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,30 +11,33 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define sosuffix -3 + Name: sleuthkit Version: 3.2.3 Release: 0 Summary: The Sleuth Kit (TSK): tools for file system and volume forensic analysis -License: CPL and IBM and GPLv2+ +License: CPL-1.0 and IPL-1.0 and GPL-2.0+ Url: http://www.sleuthkit.org/ Group: System/Monitoring Source0: http://downloads.sourceforge.net/sleuthkit/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++, +BuildRequires: gcc-c++ BuildRequires: libopenssl-devel -BuildRequires: zlib-devel, +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: libtool -# afflib - BSD with advertising, GPL incompatible +# afflib - BSD with advertising, GPL incompatible - note sleuthkit is not GPL #BuildRequires: afflib-devel >= 3.3.4 +BuildRequires: afflib-devel # libewf - Newer versions are plain BSD (older are BSD with advertising) -#BuildRequires: libewf-devel +BuildRequires: libewf-devel Requires: file Requires: libtsk3%sosuffix = %{version}-%{release} @@ -65,7 +68,6 @@ %prep %setup -q - # re-run autotools %if 0 libtoolize --force @@ -75,7 +77,6 @@ automake %endif - %build export LIBS=' -lpthread -ldl' %configure --disable-static @@ -88,12 +89,11 @@ # clean unused-direct-shlib-dependencies #sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -# export CFLAGS="%{optflags}" -# export CXXFLAGS="%{optflags}" +# export CFLAGS="%%{optflags}" +# export CXXFLAGS="%%{optflags}" export LDFLAGS="-avoid-version -module" -make %{?_smp_mflags} - +%{__make} %{?_smp_mflags} %install %if 0%{?sles_version} > 0 @@ -103,16 +103,10 @@ %endif find %{buildroot} -name '*.la' -exec rm -f {} ';' -%clean -rm -rf %{buildroot} - - %post -n libtsk3%sosuffix -p /sbin/ldconfig %postun -n libtsk3%sosuffix -p /sbin/ldconfig - - %files %defattr(-,root,root,-) %doc ChangeLog.txt NEWS.txt README.txt licenses/* @@ -183,7 +177,6 @@ %{_mandir}/man1/tsk_loaddb.1.gz %{_mandir}/man1/tsk_recover.1.gz - %files -n libtsk3%sosuffix %defattr(-,root,root,-) # CPL and IBM -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sil-padauk for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package sil-padauk for openSUSE:Factory checked in at 2012-03-16 13:25:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sil-padauk (Old) and /work/SRC/openSUSE:Factory/.sil-padauk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sil-padauk", Maintainer is "mfabian(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sil-padauk/sil-padauk.changes 2011-09-23 12:46:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sil-padauk.new/sil-padauk.changes 2012-03-16 13:25:25.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 13 08:39:02 UTC 2012 - cfarrell(a)suse.com + +- license update: OFL-1.1 + Use SPDX format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sil-padauk.spec ++++++ --- /var/tmp/diff_new_pack.fSbHMy/_old 2012-03-16 13:25:27.000000000 +0100 +++ /var/tmp/diff_new_pack.fSbHMy/_new 2012-03-16 13:25:27.000000000 +0100 @@ -21,7 +21,7 @@ Name: sil-padauk BuildRequires: dos2unix %define fontdir /usr/share/fonts/truetype -License: Other uncritical OpenSource License +License: OFL-1.1 Group: System/X11/Fonts AutoReqProv: on PreReq: %suseconfig_fonts_prereq -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rygel for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package rygel for openSUSE:Factory checked in at 2012-03-16 13:25:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rygel (Old) and /work/SRC/openSUSE:Factory/.rygel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rygel", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rygel/rygel.changes 2012-03-05 18:02:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rygel.new/rygel.changes 2012-03-16 13:25:02.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Mar 7 21:02:41 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.13.3: + + Fix a regression introduced in 0.13.2 that caused the XBox 360 + to show empty Album, Artist and Genre folders with the Tracker + plugin. + + Fix the time-out used on item creation. + + Only ask tumbler to create thumbnails if it's not a remote + resource. + + Updated translations. + +------------------------------------------------------------------- Old: ---- rygel-0.13.2.tar.xz New: ---- rygel-0.13.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rygel.spec ++++++ --- /var/tmp/diff_new_pack.267c85/_old 2012-03-16 13:25:04.000000000 +0100 +++ /var/tmp/diff_new_pack.267c85/_new 2012-03-16 13:25:04.000000000 +0100 @@ -17,7 +17,7 @@ Name: rygel -Version: 0.13.2 +Version: 0.13.3 Release: 0 Summary: Home Media Solution for GNOME based on UPnP/DLNA License: LGPL-2.0+ @@ -79,8 +79,8 @@ %package plugin-tracker Summary: Home Media Solution for GNOME based on UPnP/DLNA -- Tracker Plugin Group: Productivity/Multimedia/Other -Requires: tracker Requires: %{name} = %{version} +Requires: tracker Supplements: packageand(%{name}:tracker) %description plugin-tracker -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-ruby-debug-base for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package rubygem-ruby-debug-base for openSUSE:Factory checked in at 2012-03-16 13:24:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-ruby-debug-base (Old) and /work/SRC/openSUSE:Factory/.rubygem-ruby-debug-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-ruby-debug-base", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-ruby-debug-base.new/rubygem-ruby-debug-base.changes 2012-03-16 13:24:56.000000000 +0100 @@ -0,0 +1,41 @@ +------------------------------------------------------------------- +Fri Mar 9 08:21:23 UTC 2012 - saschpe(a)suse.de + +- Provide 'rubygem-ruby-debug-base-0_10_4' for rubygem-ruby-debug + +------------------------------------------------------------------- +Thu Mar 8 09:07:01 UTC 2012 - saschpe(a)suse.de + +- Fixed changes file format +- Set license to BSD-2-Clause (according to LICENSE file) + +------------------------------------------------------------------- +Wed Aug 24 09:43:44 UTC 2011 - fcastelli(a)novell.com + +- Fix build on SLE: remove w32 library from the final rpm package + +------------------------------------------------------------------- +Thu Aug 18 12:52:16 UTC 2011 - mrueckert(a)suse.de + +- added versioned provides + +------------------------------------------------------------------- +Thu Jul 21 13:03:19 UTC 2011 - fcastelli(a)novell.com + +- update to 0.10.4 + +------------------------------------------------------------------- +Fri Jun 11 10:00:01 UTC 2010 - mrueckert(a)suse.de + +- use rubygems_requires macro + +------------------------------------------------------------------- +Mon Oct 5 16:31:28 CEST 2009 - mrueckert(a)suse.de + +- update to 0.10.3 + +------------------------------------------------------------------- +Mon May 14 16:52:07 CEST 2007 - abauer(a)suse.de + +- initial version (0.9.3) + New: ---- ruby-debug-base-0.10.4.gem rubygem-ruby-debug-base.changes rubygem-ruby-debug-base.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-ruby-debug-base.spec ++++++ # # spec file for package rubygem-ruby-debug-base # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: rubygem-ruby-debug-base Version: 0.10.4 Release: 0 License: BSD-2-Clause Summary: Fast Ruby debugger - core component Url: http://rubyforge.org/projects/ruby-debug/ Group: Development/Languages/Ruby %define mod_name ruby-debug-base %define mod_full_name %{mod_name}-%{version} Source: %{mod_full_name}.gem BuildRequires: ruby-devel >= 1.8.2 BuildRequires: rubygem-linecache >= 0.3 BuildRequires: rubygems_with_buildroot_patch Requires: ruby >= 1.8.2 Requires: rubygem-linecache >= 0.3 Provides: rubygem-ruby-debug-base-0_10_4 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %rubygems_requires %description ruby-debug is a fast implementation of the standard Ruby debugger debug.rb. It is implemented by utilizing a new Ruby C API hook. The core component provides support that front-ends can build on. It provides breakpoint handling, bindings for stack frames among other things. %package doc Summary: RDoc documentation for %{mod_name} Group: Development/Languages/Ruby Requires: %{name} = %{version} %description doc Documentation generated at gem installation time. Usually in RDoc and RI formats. %package testsuite Summary: Test suite for %{mod_name} Group: Development/Languages/Ruby Requires: %{name} = %{version} %description testsuite Test::Unit or RSpec files, useful for developers. %prep %build %install %gem_install %{SOURCE0} %gem_cleanup %files %defattr(-,root,root,-) %{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ %exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/test %{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec %files doc %defattr(-,root,root,-) %doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ %files testsuite %defattr(-,root,root,-) %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/test %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-columnize for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package rubygem-columnize for openSUSE:Factory checked in at 2012-03-16 13:24:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-columnize (Old) and /work/SRC/openSUSE:Factory/.rubygem-columnize.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-columnize", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-columnize.new/rubygem-columnize.changes 2012-03-16 13:24:47.000000000 +0100 @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Fri Mar 9 10:14:42 UTC 2012 - cfarrell(a)suse.com + +- license update: Ruby + This is essentially the Ruby license + +------------------------------------------------------------------- +Thu Mar 8 08:57:30 UTC 2012 - saschpe(a)suse.de + +- Update to version 0.3.6: + * Bugfix release, see CHANGELOG for details + +------------------------------------------------------------------- +Fri Jun 11 10:00:01 UTC 2010 - mrueckert(a)suse.de + +- use rubygems_requires macro + +------------------------------------------------------------------- +Mon Oct 5 17:35:01 CEST 2009 - mrueckert(a)suse.de + +- initial package + New: ---- columnize-0.3.6.gem rubygem-columnize.changes rubygem-columnize.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-columnize.spec ++++++ # # spec file for package rubygem-columnize # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: rubygem-columnize Version: 0.3.6 Release: 0 License: Ruby Summary: Module to format an Array as an Array of String aligned in columns Url: https://github.com/rocky/columnize Group: Development/Languages/Ruby %define mod_name columnize %define mod_full_name %{mod_name}-%{version} Source: %{mod_full_name}.gem BuildRequires: ruby-devel >= 1.8.2 BuildRequires: rubygems_with_buildroot_patch Requires: ruby >= 1.8.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %rubygems_requires %description In showing a long lists, sometimes one would prefer to see the value arranged aligned in columns. Some examples include listing methods of an object or debugger commands. See Examples in the rdoc documentation for examples. %package doc Summary: RDoc documentation for %{mod_name} Group: Development/Languages/Ruby Requires: %{name} = %{version} %description doc Documentation generated at gem installation time. Usually in RDoc and RI formats. %package testsuite Summary: Test suite for %{mod_name} Group: Development/Languages/Ruby Requires: %{name} = %{version} %description testsuite Test::Unit or RSpec files, useful for developers. %prep %build %install %gem_install %{SOURCE0} %files %defattr(-,root,root,-) %{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ %exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/test %{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec %files doc %defattr(-,root,root,-) %doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ %files testsuite %defattr(-,root,root,-) %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/test %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0