openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2014
- 1 participants
- 1675 discussions
Hello community,
here is the log from the commit of package libsmraw for openSUSE:Factory checked in at 2014-09-28 19:54:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libsmraw (Old)
and /work/SRC/openSUSE:Factory/.libsmraw.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsmraw"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libsmraw/libsmraw.changes 2014-08-25 11:05:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libsmraw.new/libsmraw.changes 2014-09-28 19:54:25.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Sep 19 18:20:20 UTC 2014 - Greg.Freemyer(a)gmail.com
+
+- update to 20140817
+ * Worked on smrawmount
+- updated Source: field to have fullpath; removed DL_URL field
+
+-------------------------------------------------------------------
Old:
----
libsmraw-alpha-20140728.tar.gz
New:
----
libsmraw-alpha-20140817.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libsmraw.spec ++++++
--- /var/tmp/diff_new_pack.aNMusc/_old 2014-09-28 19:54:26.000000000 +0200
+++ /var/tmp/diff_new_pack.aNMusc/_new 2014-09-28 19:54:26.000000000 +0200
@@ -18,7 +18,7 @@
Name: libsmraw
%define lname libsmraw1
-%define timestamp 20140728
+%define timestamp 20140817
Version: 0~%timestamp
Release: 0
Summary: Library and tools to access the (split) RAW image format
@@ -27,8 +27,7 @@
Url: http://code.google.com/p/libsmraw/
#Git-Clone: http://code.google.com/p/libsmraw
-#DL-URL: https://googledrive.com/host/0B3fBvzttpiiSRml2cndCelp2R3M/libsmraw-alpha-20…
-Source: %name-alpha-%timestamp.tar.gz
+Source: https://googledrive.com/host/0B3fBvzttpiiSRml2cndCelp2R3M/libsmraw-alpha-20…
BuildRequires: pkg-config
BuildRequires: python-devel
BuildRequires: pkgconfig(fuse) >= 2.6
++++++ libsmraw-alpha-20140728.tar.gz -> libsmraw-alpha-20140817.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/ChangeLog new/libsmraw-20140817/ChangeLog
--- old/libsmraw-20140728/ChangeLog 2014-07-28 08:32:20.000000000 +0200
+++ new/libsmraw-20140817/ChangeLog 2014-08-17 11:32:31.000000000 +0200
@@ -28,6 +28,12 @@
* make sure certain values cannot be changed if writing/reading from raw files
* add glob test to msvscpp project
+20140817
+* updated msvscpp files - fixes for smraw.net
+
+20140801
+* Worked on smrawmount
+
20140728
* updated dependencies
* fixes for FreeBSD 8 compilation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/common/config.h new/libsmraw-20140817/common/config.h
--- old/libsmraw-20140728/common/config.h 2014-07-28 17:16:52.000000000 +0200
+++ new/libsmraw-20140817/common/config.h 2014-08-17 11:33:06.000000000 +0200
@@ -618,7 +618,7 @@
#define PACKAGE_NAME "libsmraw"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libsmraw 20140728"
+#define PACKAGE_STRING "libsmraw 20140817"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libsmraw"
@@ -627,7 +627,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "20140728"
+#define PACKAGE_VERSION "20140817"
/* The size of `off_t', as computed by sizeof. */
#define SIZEOF_OFF_T 8
@@ -651,7 +651,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "20140728"
+#define VERSION "20140817"
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/configure new/libsmraw-20140817/configure
--- old/libsmraw-20140728/configure 2014-07-28 19:56:35.000000000 +0200
+++ new/libsmraw-20140817/configure 2014-08-17 11:38:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libsmraw 20140728.
+# Generated by GNU Autoconf 2.69 for libsmraw 20140817.
#
# Report bugs to <joachim.metz(a)gmail.com>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='libsmraw'
PACKAGE_TARNAME='libsmraw'
-PACKAGE_VERSION='20140728'
-PACKAGE_STRING='libsmraw 20140728'
+PACKAGE_VERSION='20140817'
+PACKAGE_STRING='libsmraw 20140817'
PACKAGE_BUGREPORT='joachim.metz(a)gmail.com'
PACKAGE_URL=''
@@ -1632,7 +1632,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 libsmraw 20140728 to adapt to many kinds of systems.
+\`configure' configures libsmraw 20140817 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1702,7 +1702,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libsmraw 20140728:";;
+ short | recursive ) echo "Configuration of libsmraw 20140817:";;
esac
cat <<\_ACEOF
@@ -1960,7 +1960,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libsmraw configure 20140728
+libsmraw configure 20140817
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2612,7 +2612,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libsmraw $as_me 20140728, which was
+It was created by libsmraw $as_me 20140817, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3440,7 +3440,7 @@
# Define the identity of the package.
PACKAGE='libsmraw'
- VERSION='20140728'
+ VERSION='20140817'
cat >>confdefs.h <<_ACEOF
@@ -45250,7 +45250,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libsmraw $as_me 20140728, which was
+This file was extended by libsmraw $as_me 20140817, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -45316,7 +45316,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libsmraw config.status 20140728
+libsmraw config.status 20140817
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/configure.ac new/libsmraw-20140817/configure.ac
--- old/libsmraw-20140728/configure.ac 2014-07-28 08:00:48.000000000 +0200
+++ new/libsmraw-20140817/configure.ac 2014-08-17 11:31:45.000000000 +0200
@@ -2,7 +2,7 @@
AC_INIT(
[libsmraw],
- [20140728],
+ [20140817],
[joachim.metz(a)gmail.com])
AC_CONFIG_SRCDIR(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/dpkg/changelog new/libsmraw-20140817/dpkg/changelog
--- old/libsmraw-20140728/dpkg/changelog 2014-07-28 19:56:50.000000000 +0200
+++ new/libsmraw-20140817/dpkg/changelog 2014-08-17 11:38:34.000000000 +0200
@@ -1,5 +1,5 @@
-libsmraw (20140728-1) unstable; urgency=low
+libsmraw (20140817-1) unstable; urgency=low
* Auto-generated
- -- Joachim Metz <joachim.metz(a)gmail.com> Mon, 28 Jul 2014 19:56:49 +0200
+ -- Joachim Metz <joachim.metz(a)gmail.com> Sun, 17 Aug 2014 11:38:33 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/dpkg/copyright new/libsmraw-20140817/dpkg/copyright
--- old/libsmraw-20140728/dpkg/copyright 2014-07-28 19:56:50.000000000 +0200
+++ new/libsmraw-20140817/dpkg/copyright 2014-08-17 11:38:34.000000000 +0200
@@ -1,6 +1,6 @@
This work was packaged for Debian by:
- Joachim Metz <joachim.metz(a)gmail.com> on Mon, 28 Jul 2014 19:56:49 +0200
+ Joachim Metz <joachim.metz(a)gmail.com> on Sun, 17 Aug 2014 11:38:33 +0200
It was downloaded from http://code.google.com/p/libsmraw/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/include/libsmraw/definitions.h new/libsmraw-20140817/include/libsmraw/definitions.h
--- old/libsmraw-20140728/include/libsmraw/definitions.h 2014-07-28 19:56:50.000000000 +0200
+++ new/libsmraw-20140817/include/libsmraw/definitions.h 2014-08-17 11:38:34.000000000 +0200
@@ -24,11 +24,11 @@
#include <libsmraw/types.h>
-#define LIBSMRAW_VERSION 20140728
+#define LIBSMRAW_VERSION 20140817
/* The version string
*/
-#define LIBSMRAW_VERSION_STRING "20140728"
+#define LIBSMRAW_VERSION_STRING "20140817"
/* The access flags definitions
* bit 1 set to 1 for read access
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/libsmraw/libsmraw.rc new/libsmraw-20140817/libsmraw/libsmraw.rc
--- old/libsmraw-20140728/libsmraw/libsmraw.rc 2014-07-28 19:56:51.000000000 +0200
+++ new/libsmraw-20140817/libsmraw/libsmraw.rc 2014-08-17 11:38:34.000000000 +0200
@@ -22,12 +22,12 @@
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "Library to access the storage media (SM) (split) RAW format\0"
- VALUE "FileVersion", "20140728" "\0"
+ VALUE "FileVersion", "20140817" "\0"
VALUE "InternalName", "libsmraw.dll\0"
VALUE "LegalCopyright", "(c) 2010-2014, Joachim Metz <joachim.metz(a)gmail.com>\0"
VALUE "OriginalFilename", "libsmraw.dll\0"
VALUE "ProductName", "libsmraw\0"
- VALUE "ProductVersion", "20140728" "\0"
+ VALUE "ProductVersion", "20140817" "\0"
VALUE "Comments", "For more information visit http://code.google.com/p/libsmraw/\0"
END
END
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/libsmraw/libsmraw_definitions.h new/libsmraw-20140817/libsmraw/libsmraw_definitions.h
--- old/libsmraw-20140728/libsmraw/libsmraw_definitions.h 2014-07-28 19:56:50.000000000 +0200
+++ new/libsmraw-20140817/libsmraw/libsmraw_definitions.h 2014-08-17 11:38:34.000000000 +0200
@@ -35,11 +35,11 @@
#else
-#define LIBSMRAW_VERSION 20140728
+#define LIBSMRAW_VERSION 20140817
/* The version string
*/
-#define LIBSMRAW_VERSION_STRING "20140728"
+#define LIBSMRAW_VERSION_STRING "20140817"
/* The access flags definitions
* bit 1 set to 1 for read access
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/libsmraw.spec new/libsmraw-20140817/libsmraw.spec
--- old/libsmraw-20140728/libsmraw.spec 2014-07-28 19:56:51.000000000 +0200
+++ new/libsmraw-20140817/libsmraw.spec 2014-08-17 11:38:34.000000000 +0200
@@ -1,5 +1,5 @@
Name: libsmraw
-Version: 20140728
+Version: 20140817
Release: 1
Summary: Library to access the storage media (SM) (split) RAW format
Group: System Environment/Libraries
@@ -89,6 +89,6 @@
%{_libdir}/python*/site-packages/*.so
%changelog
-* Mon Jul 28 2014 Joachim Metz <joachim.metz(a)gmail.com> 20140728-1
+* Sun Aug 17 2014 Joachim Metz <joachim.metz(a)gmail.com> 20140817-1
- Auto-generated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/msvscpp/libbfio/libbfio.vcproj new/libsmraw-20140817/msvscpp/libbfio/libbfio.vcproj
--- old/libsmraw-20140728/msvscpp/libbfio/libbfio.vcproj 2014-07-28 17:53:11.000000000 +0200
+++ new/libsmraw-20140817/msvscpp/libbfio/libbfio.vcproj 2014-08-17 11:31:47.000000000 +0200
@@ -39,8 +39,8 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libuna;..\..\libcfile;..\..\libcpath"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO"
+ AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO"
RuntimeLibrary="2"
WarningLevel="4"
CompileAs="1"
@@ -101,8 +101,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libuna;..\..\libcfile;..\..\libcpath"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO"
+ AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO"
BasicRuntimeChecks="3"
SmallerTypeCheck="true"
RuntimeLibrary="3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/msvscpp/libsmraw.sln new/libsmraw-20140817/msvscpp/libsmraw.sln
--- old/libsmraw-20140728/msvscpp/libsmraw.sln 2014-07-28 17:53:11.000000000 +0200
+++ new/libsmraw-20140817/msvscpp/libsmraw.sln 2014-08-17 11:31:47.000000000 +0200
@@ -104,13 +104,16 @@
{8AFAA2C6-E025-4B45-B96F-A27D04C6115A} = {8AFAA2C6-E025-4B45-B96F-A27D04C6115A}
{B9332DC8-7594-47DF-80C1-38922E0F4DFB} = {B9332DC8-7594-47DF-80C1-38922E0F4DFB}
{CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89} = {CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89}
- {5304AD69-D449-4589-B2C9-E4607E56A51D} = {5304AD69-D449-4589-B2C9-E4607E56A51D}
+ {B86FB73A-4ACC-42DE-9545-586D93955B06} = {B86FB73A-4ACC-42DE-9545-586D93955B06}
{BC27FF34-C859-4A1A-95D6-FC89952E1910} = {BC27FF34-C859-4A1A-95D6-FC89952E1910}
{4C93BDD3-1804-47F3-9B34-F2DE0CAE1AE0} = {4C93BDD3-1804-47F3-9B34-F2DE0CAE1AE0}
{3FFB9C05-1145-45A7-9ADE-5C8D70FBD7CA} = {3FFB9C05-1145-45A7-9ADE-5C8D70FBD7CA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smraw.net", "smraw.net\smraw.net.vcproj", "{F4E520F8-316A-429E-963D-90D8A88DD33C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {8836FD13-C36B-47D3-A9DF-BB994FFA6039} = {8836FD13-C36B-47D3-A9DF-BB994FFA6039}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcfile", "libcfile\libcfile.vcproj", "{4C93BDD3-1804-47F3-9B34-F2DE0CAE1AE0}"
ProjectSection(ProjectDependencies) = postProject
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/pysmraw/setup.py new/libsmraw-20140817/pysmraw/setup.py
--- old/libsmraw-20140728/pysmraw/setup.py 2014-07-28 19:56:51.000000000 +0200
+++ new/libsmraw-20140817/pysmraw/setup.py 2014-08-17 11:38:34.000000000 +0200
@@ -26,10 +26,10 @@
LIBRARY_NAME = "libsmraw"
-LIBRARY_VERSION = "20140728"
+LIBRARY_VERSION = "20140817"
MODULE_NAME = "py%s" % (LIBRARY_NAME[3:])
# bdist_msi does not support the library version, neither a date as a version.
-MODULE_VERSION = "20140728.1"
+MODULE_VERSION = "20140817.1"
PROJECT_URL = "http://code.google.com/p/%s/" % (LIBRARY_NAME)
DIRECTORY_NAMES = [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/smrawtools/mount_handle.c new/libsmraw-20140817/smrawtools/mount_handle.c
--- old/libsmraw-20140728/smrawtools/mount_handle.c 2014-07-28 19:15:50.000000000 +0200
+++ new/libsmraw-20140817/smrawtools/mount_handle.c 2014-08-01 13:02:03.000000000 +0200
@@ -464,15 +464,15 @@
return( offset );
}
-/* Retrieves the media size of the input handle
+/* Retrieves the number of input handles
* Returns 1 if successful or -1 on error
*/
-int mount_handle_get_media_size(
+int mount_handle_get_number_of_input_handles(
mount_handle_t *mount_handle,
- size64_t *size,
+ int *number_of_input_handles,
libcerror_error_t **error )
{
- static char *function = "mount_handle_get_media_size";
+ static char *function = "mount_handle_get_number_of_input_handles";
if( mount_handle == NULL )
{
@@ -485,32 +485,31 @@
return( -1 );
}
- if( libsmraw_handle_get_media_size(
- mount_handle->input_handle,
- size,
- error ) != 1 )
+ if( number_of_input_handles == NULL )
{
libcerror_error_set(
error,
- LIBCERROR_ERROR_DOMAIN_RUNTIME,
- LIBCERROR_RUNTIME_ERROR_GET_FAILED,
- "%s: unable to retrieve media size from input handle.",
+ LIBCERROR_ERROR_DOMAIN_ARGUMENTS,
+ LIBCERROR_ARGUMENT_ERROR_INVALID_VALUE,
+ "%s: invalid number of input handles.",
function );
return( -1 );
}
+ *number_of_input_handles = 1;
+
return( 1 );
}
-/* Retrieves the number of input handles
+/* Retrieves the size of the input volume
* Returns 1 if successful or -1 on error
*/
-int mount_handle_get_number_of_input_handles(
+int mount_handle_get_size(
mount_handle_t *mount_handle,
- int *number_of_input_handles,
+ size64_t *size,
libcerror_error_t **error )
{
- static char *function = "mount_handle_get_number_of_input_handles";
+ static char *function = "mount_handle_get_size";
if( mount_handle == NULL )
{
@@ -523,19 +522,20 @@
return( -1 );
}
- if( number_of_input_handles == NULL )
+ if( libsmraw_handle_get_media_size(
+ mount_handle->input_handle,
+ size,
+ error ) != 1 )
{
libcerror_error_set(
error,
- LIBCERROR_ERROR_DOMAIN_ARGUMENTS,
- LIBCERROR_ARGUMENT_ERROR_INVALID_VALUE,
- "%s: invalid number of input handles.",
+ LIBCERROR_ERROR_DOMAIN_RUNTIME,
+ LIBCERROR_RUNTIME_ERROR_GET_FAILED,
+ "%s: unable to retrieve size from input handle.",
function );
return( -1 );
}
- *number_of_input_handles = 1;
-
return( 1 );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/smrawtools/mount_handle.h new/libsmraw-20140817/smrawtools/mount_handle.h
--- old/libsmraw-20140728/smrawtools/mount_handle.h 2014-07-28 19:15:50.000000000 +0200
+++ new/libsmraw-20140817/smrawtools/mount_handle.h 2014-08-01 13:00:52.000000000 +0200
@@ -81,14 +81,14 @@
int whence,
libcerror_error_t **error );
-int mount_handle_get_media_size(
+int mount_handle_get_number_of_input_handles(
mount_handle_t *mount_handle,
- size64_t *size,
+ int *number_of_input_handles,
libcerror_error_t **error );
-int mount_handle_get_number_of_input_handles(
+int mount_handle_get_size(
mount_handle_t *mount_handle,
- int *number_of_input_handles,
+ size64_t *size,
libcerror_error_t **error );
#if defined( __cplusplus )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/smrawtools/smrawmount.c new/libsmraw-20140817/smrawtools/smrawmount.c
--- old/libsmraw-20140728/smrawtools/smrawmount.c 2014-07-28 19:55:26.000000000 +0200
+++ new/libsmraw-20140817/smrawtools/smrawmount.c 2014-08-01 13:05:17.000000000 +0200
@@ -478,7 +478,7 @@
char *name,
size_t name_size,
struct stat *stat_info,
- libsmraw_handle_t *handle,
+ mount_handle_t *mount_handle,
uint8_t use_mount_time,
libcerror_error_t **error )
{
@@ -497,14 +497,14 @@
return( -1 );
}
- if( handle == NULL )
+ if( mount_handle == NULL )
{
number_of_sub_items = 1;
}
else
{
- if( libsmraw_handle_get_media_size(
- handle,
+ if( mount_handle_get_size(
+ mount_handle,
&media_size,
error ) != 1 )
{
@@ -566,7 +566,6 @@
return( 1 );
}
-
/* Reads a directory
* Returns 0 if successful or a negative errno value otherwise
*/
@@ -763,7 +762,7 @@
&( smrawmount_fuse_path[ 1 ] ),
string_index - 1,
stat_info,
- smrawmount_mount_handle->input_handle,
+ smrawmount_mount_handle,
1,
&error ) != 1 )
{
@@ -782,8 +781,6 @@
memory_free(
stat_info );
- stat_info = NULL;
-
return( 0 );
on_error:
@@ -911,8 +908,8 @@
goto on_error;
}
/* TODO add support for multiple input handles ? */
- if( libsmraw_handle_get_media_size(
- smrawmount_mount_handle->input_handle,
+ if( mount_handle_get_size(
+ smrawmount_mount_handle,
&media_size,
&error ) != 1 )
{
@@ -1469,7 +1466,7 @@
wchar_t *name,
size_t name_size,
WIN32_FIND_DATAW *find_data,
- libsmraw_handle_t *handle,
+ mount_handle_t *mount_handle,
uint8_t use_mount_time,
libcerror_error_t **error )
{
@@ -1510,14 +1507,14 @@
return( -1 );
}
- if( handle == NULL )
+ if( mount_handle == NULL )
{
number_of_sub_items = 1;
}
else
{
- if( libsmraw_handle_get_media_size(
- handle,
+ if( mount_handle_get_size(
+ mount_handle,
&media_size,
error ) != 1 )
{
@@ -1973,8 +1970,8 @@
goto on_error;
}
/* TODO add support for multiple input handles ? */
- if( libsmraw_handle_get_media_size(
- smrawmount_mount_handle->input_handle,
+ if( mount_handle_get_size(
+ smrawmount_mount_handle,
&media_size,
&error ) != 1 )
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libregf for openSUSE:Factory checked in at 2014-09-28 19:54:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libregf (Old)
and /work/SRC/openSUSE:Factory/.libregf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libregf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libregf/libregf.changes 2014-09-06 12:18:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libregf.new/libregf.changes 2014-09-28 19:54:24.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Sep 19 19:15:45 UTC 2014 - Greg.Freemyer(a)gmail.com
+
+- update to 20140905
+ * updated libfwsi version check
+ * bug fix in Python-bindings
+ * code clean
+- update Source field to fullpath - delete DL_URL field
+- use libcerror from external package
+
+-------------------------------------------------------------------
Old:
----
libregf-alpha-20140803.tar.gz
New:
----
libregf-alpha-20140905.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libregf.spec ++++++
--- /var/tmp/diff_new_pack.pa8SAF/_old 2014-09-28 19:54:24.000000000 +0200
+++ /var/tmp/diff_new_pack.pa8SAF/_new 2014-09-28 19:54:24.000000000 +0200
@@ -18,22 +18,21 @@
Name: libregf
%define lname libregf1
-%define timestamp 20140803
+%define timestamp 20140905
Version: 0~%timestamp
Release: 0
Summary: Library to access Windows REGF-type Registry files
License: LGPL-3.0+ and GFDL-1.3+
Group: Productivity/File utilities
Url: http://code.google.com/p/libregf/
-
-#DL-URL: https://googledrive.com/host/0B3fBvzttpiiSSC1yUDZpb3l0UHM/libregf-alpha-201…
-Source: %{name}-alpha-%timestamp.tar.gz
+Source: https://googledrive.com/host/0B3fBvzttpiiSSC1yUDZpb3l0UHM/libregf-alpha-201…
Source2: Windows_NT_Registry_File_(REGF)_format.pdf
BuildRequires: pkg-config
BuildRequires: python-devel
BuildRequires: pkgconfig(fuse) >= 2.6
BuildRequires: pkgconfig(libbfio) >= 20131003
BuildRequires: pkgconfig(libcdata) >= 20130904
+BuildRequires: pkgconfig(libcerror) >= 20140105
BuildRequires: pkgconfig(libcfile) >= 20130809
BuildRequires: pkgconfig(libclocale) >= 20130609
BuildRequires: pkgconfig(libcnotify) >= 20130609
@@ -42,16 +41,17 @@
BuildRequires: pkgconfig(libfdatetime) >= 20130317
BuildRequires: pkgconfig(libuna) >= 20130728
# Using these packages from factory causes build failures, so use the internal version instead
-# Verified 11/15/2013
-#BuildRequires: pkgconfig(libfguid) >= 20120426
-#BuildRequires: pkgconfig(libcerror) >= 20120425
-# These packages are not yet released by upstream as standalone packages
-#BuildRequires: pkgconfig(libcstring) >= 20120425
-#BuildRequires: pkgconfig(libcsystem) >= 20120425
+# Verified 9/19/2014
+#BuildRequires: pkgconfig(libfguid) >= 20140105
+# Using these packages (libf*) are released but are not stable per upstream
+# Verified 9/19/2014
#BuildRequires: pkgconfig(libfcache) >= 20120425
#BuildRequires: pkgconfig(libfdata) >= 20120425
#BuildRequires: pkgconfig(libfwnt) >= 20120426
#BuildRequires: pkgconfig(libfwsi) >= 20120426
+# These packages are not yet released by upstream as standalone packages
+#BuildRequires: pkgconfig(libcstring) >= 20120425
+#BuildRequires: pkgconfig(libcsystem) >= 20120425
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ libregf-alpha-20140803.tar.gz -> libregf-alpha-20140905.tar.gz ++++++
++++ 24967 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
Hello community,
here is the log from the commit of package libechonest for openSUSE:Factory checked in at 2014-09-28 19:54:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libechonest (Old)
and /work/SRC/openSUSE:Factory/.libechonest.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libechonest"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libechonest/libechonest.changes 2013-05-16 18:17:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libechonest.new/libechonest.changes 2014-09-28 19:54:22.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Sep 26 18:57:36 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 2.3.0
+ * Buildsystem fixes
+ * Qt5 build support
+- Don't build tests, they are useless here, and would drag in boost
+- Added baselibs.conf
+
+-------------------------------------------------------------------
Old:
----
libechonest-2.1.0.tar.bz2
New:
----
baselibs.conf
libechonest-2.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libechonest.spec ++++++
--- /var/tmp/diff_new_pack.YnPGFO/_old 2014-09-28 19:54:23.000000000 +0200
+++ /var/tmp/diff_new_pack.YnPGFO/_new 2014-09-28 19:54:23.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libechonest
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
%define _major_version 2
-%define _minor_version 1
+%define _minor_version 3
%define _patch_version 0
%define soname %{_major_version}_%{_minor_version}
@@ -29,7 +29,8 @@
BuildRequires: libqt4-devel
Version: %{_major_version}.%{_minor_version}.%{_patch_version}
Release: 0
-Source0: libechonest-%{version}.tar.bz2
+Source: libechonest-%{version}.tar.bz2
+Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: https://projects.kde.org/libechonest
@@ -67,6 +68,7 @@
export CXXFLAGS="%{optflags}"
export CFLAGS="%{optflags}"
cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DECHONEST_BUILD_TESTS=OFF \
%if "%{_lib}" == "lib64"
-DLIB_SUFFIX=64
%endif
++++++ baselibs.conf ++++++
libechonest2_3++++++ libechonest-2.1.0.tar.bz2 -> libechonest-2.3.0.tar.bz2 ++++++
++++ 4560 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
Hello community,
here is the log from the commit of package qbittorrent for openSUSE:Factory checked in at 2014-09-28 19:54:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qbittorrent (Old)
and /work/SRC/openSUSE:Factory/.qbittorrent.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qbittorrent"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qbittorrent/qbittorrent.changes 2014-03-25 13:27:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qbittorrent.new/qbittorrent.changes 2014-09-28 19:54:20.000000000 +0200
@@ -1,0 +2,52 @@
+Fri Sep 26 12:28:37 UTC 2014 - sor.alexei(a)meowr.ru
+
+- Update to 3.1.10:
+ + FEATURE: Allow disabling of OS cache. Closes #1699.
+ + FEATURE: Add 'Completed' column. Closes #1241.
+ + FEATURE: Added 'Ratio Limit' column. Closes #936.
+ + FEATURE: Add 'Open' and 'Open Containing Folder' entries in the content's right-click menu. Closes #1143.
+ + FEATURE: Don't listen on IPv6 address by default. Prevents network connectivity problems. Closes #1880.
+ + FEATURE: Added 'Shutdown now' button in shutdown confirmation dialog. Closes #969.
+ + FEATURE: Add peer port column to PeerListWidget. Closes #1650.
+ + COSMETIC: Fix weird ratio values when torrent was imported or downloaded history was lost due to crash.
+ + COSMETIC: Use 'μTP' instead of 'uTP'.
+ + COSMETIC: Show the loaded torrents in the transferlist when qBT is launched with a torrent/magnet and the AddNewTorrentDialog is showing. Closes #1564.
+ + COSMETIC: Don't mix finished/unifinished torrents when sorting by ETA. Closes #1688.
+ + COSMETIC: Sort finished torrents by completed date when sorting by queue number.
+ + COSMETIC: Right align numerical values in the transfer list. Partially revert 51a9a9aab. Closes #1903.
+ + COSMETIC: Don't display the Search Engine tab by default.
+ + WEBUI: Correctly save/load settings and other improvements
+ + WEBUI: Removed broken 'Report a bug' iframe. Closes #1343
+ + WEBUI: Removed broken 'Documentation'. Improves fix for #1343
+ + WEBUI: Removed essentially useless 'Visit website' iframe and changed it to a regular link. Improves fix for #1343
+ + BUGFIX: Fix RSS feed icon. The tmp file gets deleted in the feed destructor. Closes #1639
+ + BUGFIX: fix issue #1674: AddNewTorrentDialog is shown again and again even if checkbox "dont ask me again" is set
+ + BUGFIX: Don't show availability bar for magnet links
+ + BUGFIX: Fix crash when the selected torrent disappears from the transfer list. Closes #1661
+ + BUGFIX: Fix tracker announcing problem(hit-and-run) when many torrents are being active. Closes #1571
+ + BUGFIX: Count magnet links in the 'downloading' filter and make them prevent system inhibition. Closes #1558
+ + BUGFIX: Pick up updated plugins. Closes #1745.
+ + BUGFIX: Bring mainwindow in front when notification is clicked and other windows are in front.
+ + BUGFIX: Speedup torrent moving
+ + BUGFIX: Fix bug when moving a torrent before the previous move is completed
+ + BUGFIX: Add option to hibernate computer in Auto-Shutdown menu
+ + BUGFIX: Fix column resizing issues
+ + BUGFIX: Fix possible crashes. Closes #1814.
+ + BUGFIX: Limit max cache to 1800MiB for 32bits compiled binaries and to 4GiB for other. Closes #1698.
+ + BUGFIX: Don't localize double numbers in the webui. Closes #1525.
+ + BUGFIX: Don't shrink transferlist rows when scrolling horizontally. Closes #1613.
+ + BUGFIX: When qBT is launched with a magnet don't show it in the transferlist while the metadata are being loaded in the background.
+ + BUGFIX: Show disk space while retrieving metadata. Closes #1693.
+ + BUGFIX: Don't disable DHT/LSD/UPnP in the GUI when anonymous mode is enabled.
+ + BUGFIX: Possible fix for crash in RSS code. Closes #1901.
+ + BUGFIX: Fixed SMTP emailing code
+ + BUGFIX: Don't display the context menu in 'Content' and 'HTTP Sources' buttons when no torrent is selected. It prevents crashes. Closes #1906, #1900.
+ + BUGFIX: Don't translate file extensions. Closes #1907.
+ + BUGFIX: Fix available disk space label on single file torrents.
+ + BUGFIX: Show stalled downloads that are uploading under the 'Active' filter. Closes #1654."
+ + BUGFIX: fix import torrent with "Keep incomplete torrents in:" enabled (lojack5)
+ + BUGFIX: Send a spoofed user agent for the search engines(fixes some of them)
+ + BUGFIX: Support URLs that redirect to magnet links
+ + BUGFIX: Consider queued items before deciding to 'auto-shutdown on downloads completion'. Closes #1942.
+
+-------------------------------------------------------------------
@@ -204 +256 @@
- + BUGFIX: Respect 'don't show' torrent dialog in Search (sledgehammer999)
+ + BUGFIX: Respect 'don't show' torrent dialog in Search
@@ -207 +259 @@
- dialog (sledgehammer999)
+ dialog
@@ -211 +263 @@
- downloading (sledgehammer999)
+ downloading
@@ -218 +270 @@
- are many torrents(>100) (sledgehammer999)
+ are many torrents(>100)
Old:
----
_service
qbittorrent-3.1.9.tar.xz
New:
----
qbittorrent-3.1.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qbittorrent.spec ++++++
--- /var/tmp/diff_new_pack.oRnayH/_old 2014-09-28 19:54:21.000000000 +0200
+++ /var/tmp/diff_new_pack.oRnayH/_new 2014-09-28 19:54:21.000000000 +0200
@@ -18,13 +18,15 @@
Name: qbittorrent
-Version: 3.1.9
+%define _name qBittorrent
+Version: 3.1.10
Release: 0
Summary: A Bittorrent Client built with C++ / Qt4
License: GPL-2.0+
Group: Productivity/Networking/File-Sharing
-Url: http://www.qbittorrent.org/
-Source: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar…
+Url: http://qbittorrent.org/
+Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.xz
+
BuildRequires: boost-devel >= 1.35
BuildRequires: fdupes
BuildRequires: update-desktop-files
@@ -35,9 +37,9 @@
BuildRequires: pkgconfig(QtNetwork) >= 4.6
BuildRequires: pkgconfig(QtXml) >= 4.6
BuildRequires: pkgconfig(libtorrent-rasterbar) >= 0.14.4
-# For geolocalization
+# For geolocalization.
Requires: GeoIP
-# For search engines
+# For search engines.
Requires: python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -46,7 +48,6 @@
It aims to be as fast as possible and to provide multi-OS, unicode support.
%package nox
-
Summary: A Bittorrent Client built with C++, console version
Group: Productivity/Networking/File-Sharing
@@ -59,51 +60,48 @@
%build
echo -e "\n# openSUSE way optflags\nQMAKE_CFLAGS += %{optflags}\nQMAKE_CXXFLAGS += %{optflags}" >> unixconf.pri
-# build nox first
+# Build noX first.
mkdir nox && cd nox
../configure --prefix=%{_prefix} --disable-gui
cp conf.pri ../
make %{?_smp_mflags}
cd ../
-# build gui version
+# Build GUI version.
mkdir gui && cd gui
../configure --prefix=%{_prefix}
cp conf.pri ../
make %{?_smp_mflags}
%install
-# install nox version
+# Install noX version
cd nox && cp conf.pri ../ && cp conf.log ../ && cp Makefile ../ && sed -i '/STRIP/d' src/Makefile
make INSTALL_ROOT=%{buildroot} install
cd ../
-#install gui version
+# Install GUI version.
cd gui && cp conf.pri ../ && cp conf.log ../ && cp Makefile ../ && sed -i '/STRIP/d' src/Makefile
make INSTALL_ROOT=%{buildroot} install
-# update .desktop file
-%suse_update_desktop_file -r qBittorrent Network P2P
+# Update .desktop file.
+%suse_update_desktop_file -r %{_name} Network P2P
-# duplicate files warning resolving
+# Duplicate files warning resolving.
%fdupes -s %{buildroot}%{_datadir}
%files
%defattr(-,root,root)
-%doc AUTHORS Changelog COPYING NEWS README TODO
-%doc %{_mandir}/man1/qbittorrent.1.gz
-%{_bindir}/qbittorrent
-%dir %{_datadir}/icons/hicolor
-%dir %{_datadir}/icons/hicolor/*
-%dir %{_datadir}/icons/hicolor/*/apps
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/applications/qBittorrent.desktop
-%{_datadir}/pixmaps/qbittorrent.png
+%doc AUTHORS Changelog COPYING NEWS README.md TODO
+%doc %{_mandir}/man1/%{name}.1.gz
+%{_bindir}/%{name}
+%{_datadir}/applications/%{_name}.desktop
+%{_datadir}/icons/hicolor/
+%{_datadir}/pixmaps/%{name}.png
%files nox
%defattr(-,root,root)
-%doc AUTHORS Changelog COPYING NEWS README TODO
-%doc %{_mandir}/man1/qbittorrent-nox.1.gz
-%{_bindir}/qbittorrent-nox
+%doc AUTHORS Changelog COPYING NEWS README.md TODO
+%doc %{_mandir}/man1/%{name}-nox.1.gz
+%{_bindir}/%{name}-nox
%changelog
++++++ qbittorrent-3.1.9.tar.xz -> qbittorrent-3.1.10.tar.xz ++++++
++++ 158214 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
Hello community,
here is the log from the commit of package qtractor for openSUSE:Factory checked in at 2014-09-28 19:53:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtractor (Old)
and /work/SRC/openSUSE:Factory/.qtractor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtractor"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qtractor/qtractor.changes 2014-01-03 19:51:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qtractor.new/qtractor.changes 2014-09-28 19:54:18.000000000 +0200
@@ -1,0 +2,147 @@
+Fri Sep 26 10:54:44 UTC 2014 - ecsos(a)schirra.net
+
+- update to 0.6.3
+ * Make the mouse-wheel to scroll the plugin list views, when
+ not hovering a direct-access parameter slider.
+ * Mixer widget gets (un)dockable Inputs and Outputs panels,
+ also with their respective title captions.
+ * Plugin instantiation is now constrained as much to prevent
+ any audio channel output overriding.
+ * Existing plugin presets may now be selected right(-click)
+ from plugin list context-menu (ticket by Harry van Haaren,
+ thanks).
+ * So-called "painting" over multiple selected event values,
+ while on the MIDI clip editor view pane below the main
+ piano-roll (eg. note velocities, controller values, etc.)
+ is now split into two similar painting modes, whether the
+ sub-menu Edit/Select Mode/Edit Draw is set on (free-hand)
+ or off (linear).
+ * Drag-and-copy of plug-in instances across tracks or buses
+ (ie. cloning) now also copies the direct access parameter
+ setting (ticket by Holger Marzen, thanks).
+ * File/Save As... now prompts and suggests an incremental
+ backup name for existing sessions files.
+ * Zooming in/out increment is now augmented by whether shift
+ /ctrl keyboard modifiers are set (on a ticket request by
+ Holger Marzen, thanks).
+ * LV2 Time position event messages for plugin atom ports that
+ support it is now being implemented.
+ * Attempt to break extremely long audio file peak generation
+ on session close or program exit (as reported by EternalX,
+ thanks again).
+ * MIDI Controllers Hook and Invert properties are now properly
+ saved for tracks (after bug report by Nicola Pandini, thanks).
+ * A segmentation fault when closing with VST plugins open has
+ been hopefully fixed (after a patch by EternalX, thanks).
+ * Messages standard output capture has been slightly improved
+ as for non-blocking i/o, whenever available.
+ * Automation curve node editing has been slightly improved
+ in regard to time positioning and resolution.
+
+- changes from 0.6.2
+ * Prevent linear and spline automation curve modes for all
+ integer valued subjects. Also, make sure those values are
+ rounded to the nearest integer away from zero.
+ * Fixed save of LV2 Presets for plugins with state files.
+ * A man page has beed added (making up Gürkan Sengün's work
+ on debian, thanks).
+ * When moving plugins by eg. drag-and-dropping across tracks,
+ automation curves were being left behind, maybe leading to
+ unpredictable mistaken behavior. Hopefully, not anymore.
+ * Translations install directory change.
+ * Automation curves are now automatically re-adjusted to tempo
+ map node changes (after a ticket by Holger Marzen, thanks).
+ * Audio/MIDI files or plugins found missing on session load
+ are now subject for an explicit modal warning message and
+ prompt for an immediate session backup salvage.
+ * Changing instrument plugin programs is now an undo/redo-able
+ command operation, especially for DSSI but also for plugins
+ that come with the LV2 Programs interface extension support
+ (http://kxstudio.sourceforge.net/ns/lv2ext/programs).
+ * Drawing, selecting and/or resizing of MIDI note events that
+ extend across tempo/time-signature changes is now made a bit
+ more correctly over the MIDI clip editor (aka. piano-roll),
+ especially regarding to current snap-to-beat setting (after
+ an outstanding ticket by yubatake, thanks).
+ * Once again, audio frame/MIDI time drift correction has been
+ slightly refactored to improve MIDI input monitor and timing.
+ * Discrete automation curve node values may now be edited via
+ a numerical entry floating spin-box on double-click (as yet
+ another request by AutoStatic aka. Jeremy Jongepier, thanks).
+ * Pressing shift/ctrl keyboard modifiers while double-clicking
+ on a plugin list entry now briefly reverses the current View
+ /Options.../Plugins/Editor/Open plugin's editor (GUI) by
+ default option preference.
+ * Fixed an old crash lurker when switching output buses that
+ implied a change on the number of audio channels, while on
+ tracks that have (auto-)monitor turned on and at least one
+ active plugin in chain (yet another ticket by AutoStatic
+ aka. Jeremy Jongepier, thanks).
+ * MIDI Controller assignment (aka MIDI learn) and/or automation
+ of plugins (de)activation state has been added (as requested
+ by AutoStatic aka. Jeremy Jongepier, thanks).
+ * LV2 UI Idle and Show interfaces support added.
+ * Allow the build system to include an user specified LDFLAGS
+ (patch by Alessio Treglia aka. quadrispro, thanks).
+
+- changes from 0.6.1
+ * New user preference option added as View/Options.../Display
+ /Transport/Hold auto-scrolling (follow play-head) on edits
+ (after requests by Holger Marzen and Louigi Verona, thanks).
+ * All color chooser dialogs were missing proper titles.
+ * Audio peak file re-generation and clean-up has been hopefully
+ fixed and cache optimized (re. drawing audio clip waveforms).
+ * Fixed initial session snap-per-beat setting on main toolbar.
+ * Clip/Export...'ed files are now made persistent, no questions
+ asked (after a ticket by Oliver Kester, thanks).
+ * Portuguese (pt) translation added (by Esteban Viveros, thanks).
+
+- changes from 0.6.0
+ * New user option added: on whether to save plugins automation
+ values with higher resolution as possible, using 14-bit NRPN:
+ cf. View/Options.../Plugins/Experimental/High resolution
+ plugin automation (default=off).
+ * Generic native plugin dialogs now shows an additional "About"
+ last page where authorship credits are due.
+ * A new user preference option is now in place for whether to
+ use desktop environment's own native file requester/browser
+ dialogs (View/Options.../Display/Dialogs/Use native dialogs).
+ * A bit of slack have been introduced to put "Follow Playhead"
+ (aka. auto-scroll view mode) on hold, while doing in-flight
+ selection edit moves.
+ * Fixed some user interface related annoyances while on the MIDI
+ Controllers mappings (ie. View/Controllers...).
+ * Fixed port origin on MIDI RPN/NRPN 14-bit controllers input.
+ * A discretionary plug-in unique identifier have been devised for
+ when more than one from the same type are inserted on a bus or
+ track chain, avoiding destructive clashing of automation data.
+ * Horizontal scrolling shift+mouse-wheel direction now reversed.
+ * LV2 Dyn(amic)-manifest support is now optional (default=off);
+ cf. View/Options.../Plugins/Experimental/LV2 Dynamic Manifest
+ support).
+ * The following options, although decieved on View/Options... as
+ global configuration options, were always and still are proper
+ session instance properties: (JACK) Transport mode, MMC mode,
+ MMC device, MIDI SPP and MIDI Clock modes, are now shown there
+ reflecting the current open session state.
+ * A couple of run-time circumventions have been hacked in, both
+ strictly related to when NSM session management is in charge:
+ 1) the new session template feature is disabled (was aborting
+ initial NSM new client additions); 2) the native (as from the
+ desktop environment eg. KDE) file browser/requester dialogs are
+ disabled (were taking too long to list the current directory on
+ first time invocation).
+ * Update current automation/curve nodes selection while changing
+ horizontal (time axis) zoom levels.
+ * One liner's attempt to make it consistent behaviour on resizing
+ and moving multiple selected notes or events while on the MIDI
+ clip editor (aka. piano-roll; after a ticket request from Daniel
+ MacDonald aka. danboid, thanks).
+ * Introducing tiny quarter-note/crotchet/seminima/beat icon on all
+ snap-to-beat selection items get a new icon :).
+ * Corrected some audio buffering boundary conditions that were
+ causing dead-loops/freezes while merging some audio clips.
+ * Session auto-save period was chronically reduced to one third
+ of its user setting; non critical but fixed now.
+
+-------------------------------------------------------------------
Old:
----
qtractor-0.5.12.tar.gz
New:
----
qtractor-0.6.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtractor.spec ++++++
--- /var/tmp/diff_new_pack.tnPW3h/_old 2014-09-28 19:54:19.000000000 +0200
+++ /var/tmp/diff_new_pack.tnPW3h/_new 2014-09-28 19:54:19.000000000 +0200
@@ -17,7 +17,7 @@
Name: qtractor
-Version: 0.5.12
+Version: 0.6.3
Release: 0
Summary: An Audio/MIDI multi-track sequencer
License: GPL-2.0+
@@ -69,11 +69,11 @@
L="$PWD/%{name}.lang"
echo -n > "$L"
-pushd "%{buildroot}%{_datadir}/locale"
+pushd "%{buildroot}%{_datadir}/%{name}/translations"
/bin/ls -1 qtractor_*.qm | while read qm; do
l="${qm%.qm}"
l="${l##*_}"
- echo "%lang($l) %{_datadir}/locale/${qm}" >> "$L"
+ echo "%lang($l) %{_datadir}/%{name}/translations/${qm}" >> "$L"
done
popd
@@ -93,10 +93,13 @@
%files -f "%{name}.lang"
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/qtractor
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/translations
+%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/*/*/apps/%{name}.*
%{_datadir}/icons/*/*/mimetypes/application-x-%{name}-*.*
-%{_datadir}/mime/packages/qtractor.xml
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/man/man1/%{name}.1.gz
%changelog
++++++ qtractor-0.5.12.tar.gz -> qtractor-0.6.3.tar.gz ++++++
++++ 59385 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
Hello community,
here is the log from the commit of package percona-toolkit for openSUSE:Factory checked in at 2014-09-28 19:53:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/percona-toolkit (Old)
and /work/SRC/openSUSE:Factory/.percona-toolkit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "percona-toolkit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/percona-toolkit/percona-toolkit.changes 2014-08-11 10:08:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.percona-toolkit.new/percona-toolkit.changes 2014-09-28 19:54:16.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Sep 26 12:20:44 UTC 2014 - andreas.stieger(a)gmx.de
+
+- Percona Toolkit 2.2.11:
+ * Fixed bug: pt-query-digest doesn't report host details
+ * Fixed bug: pt-mysql-summary incorrectly tries to parse
+ key/value pairs in wsrep_provider_options resulting
+ in incomplete my.cnf information
+ * Fixed bug: pt-stalk should use SQL_NO_CACHE
+ * Fixed bug: pt-stalk handles mysql user password in awkward way
+ * Fixed bug: Various issues with tests
+ * Fixed bug: pt-summary problem parsing dmidecode output on some
+ machines
+ * Fixed bug: Typo in pt-variable-advisor
+
+-------------------------------------------------------------------
Old:
----
percona-toolkit-2.2.10.tar.gz
New:
----
percona-toolkit-2.2.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ percona-toolkit.spec ++++++
--- /var/tmp/diff_new_pack.KKOJbG/_old 2014-09-28 19:54:17.000000000 +0200
+++ /var/tmp/diff_new_pack.KKOJbG/_new 2014-09-28 19:54:17.000000000 +0200
@@ -17,13 +17,13 @@
Name: percona-toolkit
-Version: 2.2.10
+Version: 2.2.11
Release: 0
Summary: Advanced MySQL and system command-line tools
License: GPL-2.0
Group: Productivity/Databases/Tools
Url: https://www.percona.com/software/percona-toolkit/
-Source: https://www.percona.com/redir/downloads/%{name}/%{version}/tarball/%{name}-…
+Source: http://www.percona.com/downloads/%{name}/%{version}/%{name}-%{version}.tar.…
Source2: %{name}.conf
Patch0: percona-toolkit-2.2.x-disable-default-version-check.patch
Requires: perl(DBD::mysql) >= 1.0
++++++ percona-toolkit-2.2.10.tar.gz -> percona-toolkit-2.2.11.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/Changelog new/percona-toolkit-2.2.11/Changelog
--- old/percona-toolkit-2.2.10/Changelog 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/Changelog 2014-09-25 15:49:49.000000000 +0200
@@ -1,5 +1,15 @@
Changelog for Percona Toolkit
+v2.2.11 released 2014-09-26
+
+ * Fixed bug 1262456: pt-query-digest doesn't report host details
+ * Fixed bug 1264580: pt-mysql-summary incorrectly tries to parse key/value pairs in wsrep_provider_options resulting in incomplete my.cnf information
+ * Fixed bug 1318985: pt-stalk should use SQL_NO_CACHE
+ * Fixed bug 1348679: pt-stalk handles mysql user password in awkward way
+ * Fixed bug 1365085: Various issues with tests
+ * Fixed bug 1368379: pt-summary problem parsing dmidecode output on some machines
+ * Fixed bug 1303388: Typo in pt-variable-advisor
+
v2.2.10 released 2014-08-06
* Fixed bug 1287253: pt-table-checksum deadlock
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/Makefile.PL new/percona-toolkit-2.2.11/Makefile.PL
--- old/percona-toolkit-2.2.10/Makefile.PL 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/Makefile.PL 2014-09-25 15:49:49.000000000 +0200
@@ -2,7 +2,7 @@
WriteMakefile(
NAME => 'percona-toolkit',
- VERSION => '2.2.10',
+ VERSION => '2.2.11',
EXE_FILES => [ <bin/*> ],
MAN1PODS => {
'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-align new/percona-toolkit-2.2.11/bin/pt-align
--- old/percona-toolkit-2.2.10/bin/pt-align 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-align 2014-09-25 15:49:49.000000000 +0200
@@ -1323,6 +1323,6 @@
=head1 VERSION
-pt-align 2.2.10
+pt-align 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-archiver new/percona-toolkit-2.2.11/bin/pt-archiver
--- old/percona-toolkit-2.2.10/bin/pt-archiver 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-archiver 2014-09-25 15:49:49.000000000 +0200
@@ -43,7 +43,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -7892,6 +7892,6 @@
=head1 VERSION
-pt-archiver 2.2.10
+pt-archiver 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-config-diff new/percona-toolkit-2.2.11/bin/pt-config-diff
--- old/percona-toolkit-2.2.10/bin/pt-config-diff 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-config-diff 2014-09-25 15:49:49.000000000 +0200
@@ -43,7 +43,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -5733,6 +5733,6 @@
=head1 VERSION
-pt-config-diff 2.2.10
+pt-config-diff 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-deadlock-logger new/percona-toolkit-2.2.11/bin/pt-deadlock-logger
--- old/percona-toolkit-2.2.10/bin/pt-deadlock-logger 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-deadlock-logger 2014-09-25 15:49:49.000000000 +0200
@@ -42,7 +42,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -5523,6 +5523,6 @@
=head1 VERSION
-pt-deadlock-logger 2.2.10
+pt-deadlock-logger 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-diskstats new/percona-toolkit-2.2.11/bin/pt-diskstats
--- old/percona-toolkit-2.2.10/bin/pt-diskstats 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-diskstats 2014-09-25 15:49:49.000000000 +0200
@@ -38,7 +38,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -5579,6 +5579,6 @@
=head1 VERSION
-pt-diskstats 2.2.10
+pt-diskstats 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-duplicate-key-checker new/percona-toolkit-2.2.11/bin/pt-duplicate-key-checker
--- old/percona-toolkit-2.2.10/bin/pt-duplicate-key-checker 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-duplicate-key-checker 2014-09-25 15:49:49.000000000 +0200
@@ -39,7 +39,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -5600,6 +5600,6 @@
=head1 VERSION
-pt-duplicate-key-checker 2.2.10
+pt-duplicate-key-checker 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-fifo-split new/percona-toolkit-2.2.11/bin/pt-fifo-split
--- old/percona-toolkit-2.2.10/bin/pt-fifo-split 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-fifo-split 2014-09-25 15:49:49.000000000 +0200
@@ -1612,6 +1612,6 @@
=head1 VERSION
-pt-fifo-split 2.2.10
+pt-fifo-split 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-find new/percona-toolkit-2.2.11/bin/pt-find
--- old/percona-toolkit-2.2.10/bin/pt-find 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-find 2014-09-25 15:49:49.000000000 +0200
@@ -35,7 +35,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -4984,6 +4984,6 @@
=head1 VERSION
-pt-find 2.2.10
+pt-find 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-fingerprint new/percona-toolkit-2.2.11/bin/pt-fingerprint
--- old/percona-toolkit-2.2.10/bin/pt-fingerprint 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-fingerprint 2014-09-25 15:49:49.000000000 +0200
@@ -2203,6 +2203,6 @@
=head1 VERSION
-pt-fingerprint 2.2.10
+pt-fingerprint 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-fk-error-logger new/percona-toolkit-2.2.11/bin/pt-fk-error-logger
--- old/percona-toolkit-2.2.10/bin/pt-fk-error-logger 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-fk-error-logger 2014-09-25 15:49:49.000000000 +0200
@@ -37,7 +37,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -4509,6 +4509,6 @@
=head1 VERSION
-pt-fk-error-logger 2.2.10
+pt-fk-error-logger 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-heartbeat new/percona-toolkit-2.2.11/bin/pt-heartbeat
--- old/percona-toolkit-2.2.10/bin/pt-heartbeat 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-heartbeat 2014-09-25 15:49:49.000000000 +0200
@@ -38,7 +38,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -6192,6 +6192,6 @@
=head1 VERSION
-pt-heartbeat 2.2.10
+pt-heartbeat 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-index-usage new/percona-toolkit-2.2.11/bin/pt-index-usage
--- old/percona-toolkit-2.2.10/bin/pt-index-usage 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-index-usage 2014-09-25 15:49:49.000000000 +0200
@@ -45,7 +45,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -2845,6 +2845,7 @@
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+ $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
if ( $thread_id ) {
push @properties, 'Thread_id', $thread_id;
@@ -2857,6 +2858,7 @@
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+ $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
if ( $thread_id ) {
push @properties, 'Thread_id', $thread_id;
@@ -7546,6 +7548,6 @@
=head1 VERSION
-pt-index-usage 2.2.10
+pt-index-usage 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-ioprofile new/percona-toolkit-2.2.11/bin/pt-ioprofile
--- old/percona-toolkit-2.2.10/bin/pt-ioprofile 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-ioprofile 2014-09-25 15:49:49.000000000 +0200
@@ -1119,7 +1119,7 @@
=head1 VERSION
-pt-ioprofile 2.2.10
+pt-ioprofile 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-kill new/percona-toolkit-2.2.11/bin/pt-kill
--- old/percona-toolkit-2.2.10/bin/pt-kill 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-kill 2014-09-25 15:49:49.000000000 +0200
@@ -47,7 +47,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -8183,6 +8183,6 @@
=head1 VERSION
-pt-kill 2.2.10
+pt-kill 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-mext new/percona-toolkit-2.2.11/bin/pt-mext
--- old/percona-toolkit-2.2.10/bin/pt-mext 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-mext 2014-09-25 15:49:49.000000000 +0200
@@ -792,7 +792,7 @@
=head1 VERSION
-pt-mext 2.2.10
+pt-mext 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-mysql-summary new/percona-toolkit-2.2.11/bin/pt-mysql-summary
--- old/percona-toolkit-2.2.10/bin/pt-mysql-summary 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-mysql-summary 2014-09-25 15:49:49.000000000 +0200
@@ -1353,26 +1353,19 @@
[ -e "$file" ] || return
- awk '
- BEGIN {
- FS="="
- }
- /^[ \t]*[a-zA-Z[]/ {
- if (length($2)) {
- gsub(/^[ \t]*/, "", $1);
- gsub(/^[ \t]*/, "", $2);
- gsub(/[ \t]*$/, "", $1);
- gsub(/[ \t]*$/, "", $2);
- printf("%-35s = %s\n", $1, $2);
- }
- else if ( $0 ~ /\[/ ) {
- print "";
- print $1;
- }
- else {
- print $1;
- }
- }' "$file"
+ perl -n -l -e '
+ my $line = $_;
+ if ( $line =~ /^[ \t]*[a-zA-Z[]/ ) {
+ if ( $line=~/\s*(.*?)\s*=\s*(.*)\s*$/ ) {
+ printf("%-35s = %s\n", $1, $2)
+ }
+ elsif ( $line =~ /\s*\[/ ) {
+ print "\n$line"
+ } else {
+ print $line
+ }
+ }' "$file"
+
}
find_checkpoint_age() {
@@ -3090,7 +3083,7 @@
=head1 VERSION
-pt-mysql-summary 2.2.10
+pt-mysql-summary 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-online-schema-change new/percona-toolkit-2.2.11/bin/pt-online-schema-change
--- old/percona-toolkit-2.2.10/bin/pt-online-schema-change 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-online-schema-change 2014-09-25 15:49:49.000000000 +0200
@@ -54,7 +54,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -11563,6 +11563,6 @@
=head1 VERSION
-pt-online-schema-change 2.2.10
+pt-online-schema-change 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-pmp new/percona-toolkit-2.2.11/bin/pt-pmp
--- old/percona-toolkit-2.2.10/bin/pt-pmp 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-pmp 2014-09-25 15:49:49.000000000 +0200
@@ -889,7 +889,7 @@
=head1 VERSION
-pt-pmp 2.2.10
+pt-pmp 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-query-digest new/percona-toolkit-2.2.11/bin/pt-query-digest
--- old/percona-toolkit-2.2.10/bin/pt-query-digest 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-query-digest 2014-09-25 15:49:49.000000000 +0200
@@ -64,7 +64,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -5039,6 +5039,7 @@
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+ $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
if ( $thread_id ) {
push @properties, 'Thread_id', $thread_id;
@@ -5051,6 +5052,7 @@
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+ $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
if ( $thread_id ) {
push @properties, 'Thread_id', $thread_id;
@@ -16593,6 +16595,6 @@
=head1 VERSION
-pt-query-digest 2.2.10
+pt-query-digest 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-show-grants new/percona-toolkit-2.2.11/bin/pt-show-grants
--- old/percona-toolkit-2.2.10/bin/pt-show-grants 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-show-grants 2014-09-25 15:49:49.000000000 +0200
@@ -2406,6 +2406,6 @@
=head1 VERSION
-pt-show-grants 2.2.10
+pt-show-grants 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-sift new/percona-toolkit-2.2.11/bin/pt-sift
--- old/percona-toolkit-2.2.10/bin/pt-sift 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-sift 2014-09-25 15:49:49.000000000 +0200
@@ -1237,7 +1237,7 @@
=head1 VERSION
-pt-sift 2.2.10
+pt-sift 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-slave-delay new/percona-toolkit-2.2.11/bin/pt-slave-delay
--- old/percona-toolkit-2.2.10/bin/pt-slave-delay 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-slave-delay 2014-09-25 15:49:49.000000000 +0200
@@ -40,7 +40,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -4869,6 +4869,6 @@
=head1 VERSION
-pt-slave-delay 2.2.10
+pt-slave-delay 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-slave-find new/percona-toolkit-2.2.11/bin/pt-slave-find
--- old/percona-toolkit-2.2.10/bin/pt-slave-find 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-slave-find 2014-09-25 15:49:49.000000000 +0200
@@ -4334,6 +4334,6 @@
=head1 VERSION
-pt-slave-find 2.2.10
+pt-slave-find 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-slave-restart new/percona-toolkit-2.2.11/bin/pt-slave-restart
--- old/percona-toolkit-2.2.10/bin/pt-slave-restart 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-slave-restart 2014-09-25 15:49:49.000000000 +0200
@@ -41,7 +41,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -5937,6 +5937,6 @@
=head1 VERSION
-pt-slave-restart 2.2.10
+pt-slave-restart 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-stalk new/percona-toolkit-2.2.11/bin/pt-stalk
--- old/percona-toolkit-2.2.10/bin/pt-stalk 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-stalk 2014-09-25 15:49:49.000000000 +0200
@@ -1001,7 +1001,7 @@
}
lock_waits() {
- local sql1="SELECT
+ local sql1="SELECT SQL_NO_CACHE
CONCAT('thread ', b.trx_mysql_thread_id, ' from ', p.host) AS who_blocks,
IF(p.command = \"Sleep\", p.time, 0) AS idle_in_trx,
MAX(TIMESTAMPDIFF(SECOND, r.trx_wait_started, CURRENT_TIMESTAMP)) AS max_wait_time,
@@ -1013,7 +1013,7 @@
GROUP BY who_blocks ORDER BY num_waiters DESC\G"
$CMD_MYSQL $EXT_ARGV -e "$sql1"
- local sql2="SELECT
+ local sql2="SELECT SQL_NO_CACHE
r.trx_id AS waiting_trx_id,
r.trx_mysql_thread_id AS waiting_thread,
TIMESTAMPDIFF(SECOND, r.trx_wait_started, CURRENT_TIMESTAMP) AS wait_time,
@@ -1034,9 +1034,9 @@
}
transactions() {
- $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX\G"
- $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS\G"
- $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G"
+ $CMD_MYSQL $EXT_ARGV -e "SELECT SQL_NO_CACHE * FROM INFORMATION_SCHEMA.INNODB_TRX\G"
+ $CMD_MYSQL $EXT_ARGV -e "SELECT SQL_NO_CACHE * FROM INFORMATION_SCHEMA.INNODB_LOCKS\G"
+ $CMD_MYSQL $EXT_ARGV -e "SELECT SQL_NO_CACHE * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G"
}
innodb_status() {
@@ -1447,9 +1447,19 @@
exit 0
fi
+ # if ASK-PASS , request password on terminal without echoing. This will override --password
+ if [ -n "$OPT_ASK_PASS" ]; then
+ stty_orig=`stty -g` # save original terminal setting.
+ echo -n "Enter MySQL password: ";
+ stty -echo # turn-off echoing.
+ read OPT_PASSWORD # read the password
+ stty $stty_orig # restore terminal setting.
+ fi
+
MYSQL_ARGS="$(mysql_options)"
EXT_ARGV="$(arrange_mysql_options "$EXT_ARGV $MYSQL_ARGS")"
+
# Check that mysql and mysqladmin are in PATH. If not, we're
# already dead in the water, so don't bother with cmd line opts,
# just error and exit.
@@ -1650,6 +1660,10 @@
=over
+=item --ask-pass
+
+Prompt for a password when connecting to MySQL.
+
=item --collect
default: yes; negatable: yes
@@ -2211,7 +2225,7 @@
=head1 VERSION
-pt-stalk 2.2.10
+pt-stalk 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-summary new/percona-toolkit-2.2.11/bin/pt-summary
--- old/percona-toolkit-2.2.10/bin/pt-summary 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-summary 2014-09-25 15:49:49.000000000 +0200
@@ -1506,7 +1506,7 @@
-e 's/>/}/g' \
-e 's/[ \t]*\n/\n/g' \
"${file}" \
- | awk -F: '/Size|Type|Form.Factor|Type.Detail|[^ ]Locator/{printf("|%s", $2)}/Speed/{print "|" $2}' \
+ | awk -F: '/Size|Type|Form.Factor|Type.Detail|^[\t ]+Locator/{printf("|%s", $2)}/^[\t ]+Speed/{print "|" $2}' \
| sed -e 's/No Module Installed/{EMPTY}/' \
| sort \
| awk -F'|' '{printf(" %-9s %-8s %-17s %-13s %-13s %-8s\n", $4, $2, $7, $3, $5, $6);}'
@@ -2691,7 +2691,7 @@
=head1 VERSION
-pt-summary 2.2.10
+pt-summary 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-table-checksum new/percona-toolkit-2.2.11/bin/pt-table-checksum
--- old/percona-toolkit-2.2.10/bin/pt-table-checksum 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-table-checksum 2014-09-25 15:49:49.000000000 +0200
@@ -57,7 +57,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -12698,6 +12698,6 @@
=head1 VERSION
-pt-table-checksum 2.2.10
+pt-table-checksum 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-table-sync new/percona-toolkit-2.2.11/bin/pt-table-sync
--- old/percona-toolkit-2.2.10/bin/pt-table-sync 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-table-sync 2014-09-25 15:49:49.000000000 +0200
@@ -55,7 +55,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -12768,6 +12768,6 @@
=head1 VERSION
-pt-table-sync 2.2.10
+pt-table-sync 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-table-usage new/percona-toolkit-2.2.11/bin/pt-table-usage
--- old/percona-toolkit-2.2.10/bin/pt-table-usage 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-table-usage 2014-09-25 15:49:49.000000000 +0200
@@ -1629,6 +1629,7 @@
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+ $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
if ( $thread_id ) {
push @properties, 'Thread_id', $thread_id;
@@ -1641,6 +1642,7 @@
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+ $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
if ( $thread_id ) {
push @properties, 'Thread_id', $thread_id;
@@ -7561,6 +7563,6 @@
=head1 VERSION
-pt-table-usage 2.2.10
+pt-table-usage 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-upgrade new/percona-toolkit-2.2.11/bin/pt-upgrade
--- old/percona-toolkit-2.2.10/bin/pt-upgrade 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-upgrade 2014-09-25 15:49:49.000000000 +0200
@@ -61,7 +61,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -6610,6 +6610,7 @@
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+ $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
if ( $thread_id ) {
push @properties, 'Thread_id', $thread_id;
@@ -6622,6 +6623,7 @@
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+ $host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
if ( $thread_id ) {
push @properties, 'Thread_id', $thread_id;
@@ -11238,6 +11240,6 @@
=head1 VERSION
-pt-upgrade 2.2.10
+pt-upgrade 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-variable-advisor new/percona-toolkit-2.2.11/bin/pt-variable-advisor
--- old/percona-toolkit-2.2.10/bin/pt-variable-advisor 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-variable-advisor 2014-09-25 15:49:49.000000000 +0200
@@ -44,7 +44,7 @@
{
package Percona::Toolkit;
-our $VERSION = '2.2.10';
+our $VERSION = '2.2.11';
use strict;
use warnings FATAL => 'all';
@@ -3601,10 +3601,10 @@
},
},
{
- id => 'expire_log_days',
+ id => 'expire_logs_days',
code => sub {
my ( %args ) = @_;
- return _var_eq($args{variables}->{expire_log_days}, 0)
+ return _var_eq($args{variables}->{expire_logs_days}, 0)
&& _var_seq($args{variables}->{log_bin}, "ON");
},
},
@@ -5720,7 +5720,7 @@
Most applications should use the default REPEATABLE-READ transaction
isolation level, or in a few cases READ-COMMITTED.
-=item expire_log_days
+=item expire_logs_days
severity: warn
@@ -6138,6 +6138,6 @@
=head1 VERSION
-pt-variable-advisor 2.2.10
+pt-variable-advisor 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/bin/pt-visual-explain new/percona-toolkit-2.2.11/bin/pt-visual-explain
--- old/percona-toolkit-2.2.10/bin/pt-visual-explain 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/bin/pt-visual-explain 2014-09-25 15:49:49.000000000 +0200
@@ -3243,6 +3243,6 @@
=head1 VERSION
-pt-visual-explain 2.2.10
+pt-visual-explain 2.2.11
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/percona-toolkit-2.2.10/docs/percona-toolkit.pod new/percona-toolkit-2.2.11/docs/percona-toolkit.pod
--- old/percona-toolkit-2.2.10/docs/percona-toolkit.pod 2014-08-06 21:57:30.000000000 +0200
+++ new/percona-toolkit-2.2.11/docs/percona-toolkit.pod 2014-09-25 15:49:49.000000000 +0200
@@ -557,6 +557,6 @@
=head1 VERSION
-Percona Toolkit v2.2.10 released 2014-08-06
+Percona Toolkit v2.2.11 released 2014-09-25
=cut
++++++ percona-toolkit-2.2.x-disable-default-version-check.patch ++++++
--- /var/tmp/diff_new_pack.KKOJbG/_old 2014-09-28 19:54:17.000000000 +0200
+++ /var/tmp/diff_new_pack.KKOJbG/_new 2014-09-28 19:54:17.000000000 +0200
@@ -40,10 +40,10 @@
bin/pt-variable-advisor | 2 --
18 files changed, 36 deletions(-)
-Index: percona-toolkit-2.2.10/bin/pt-archiver
+Index: percona-toolkit-2.2.11/bin/pt-archiver
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-archiver 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-archiver 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-archiver
++++ percona-toolkit-2.2.11/bin/pt-archiver
@@ -7465,8 +7465,6 @@ Show version and exit.
=item --[no]version-check
@@ -53,10 +53,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-config-diff
+Index: percona-toolkit-2.2.11/bin/pt-config-diff
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-config-diff 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-config-diff 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-config-diff
++++ percona-toolkit-2.2.11/bin/pt-config-diff
@@ -5563,8 +5563,6 @@ Show version and exit.
=item --[no]version-check
@@ -66,10 +66,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-deadlock-logger
+Index: percona-toolkit-2.2.11/bin/pt-deadlock-logger
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-deadlock-logger 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-deadlock-logger 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-deadlock-logger
++++ percona-toolkit-2.2.11/bin/pt-deadlock-logger
@@ -5348,8 +5348,6 @@ Show version and exit.
=item --[no]version-check
@@ -79,10 +79,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-diskstats
+Index: percona-toolkit-2.2.11/bin/pt-diskstats
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-diskstats 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-diskstats 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-diskstats
++++ percona-toolkit-2.2.11/bin/pt-diskstats
@@ -5468,8 +5468,6 @@ Show version and exit.
=item --[no]version-check
@@ -92,10 +92,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-duplicate-key-checker
+Index: percona-toolkit-2.2.11/bin/pt-duplicate-key-checker
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-duplicate-key-checker 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-duplicate-key-checker 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-duplicate-key-checker
++++ percona-toolkit-2.2.11/bin/pt-duplicate-key-checker
@@ -5429,8 +5429,6 @@ Show version and exit.
=item --[no]version-check
@@ -105,10 +105,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-find
+Index: percona-toolkit-2.2.11/bin/pt-find
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-find 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-find 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-find
++++ percona-toolkit-2.2.11/bin/pt-find
@@ -4440,8 +4440,6 @@ Show version and exit.
=item --[no]version-check
@@ -118,10 +118,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-fk-error-logger
+Index: percona-toolkit-2.2.11/bin/pt-fk-error-logger
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-fk-error-logger 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-fk-error-logger 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-fk-error-logger
++++ percona-toolkit-2.2.11/bin/pt-fk-error-logger
@@ -4335,8 +4335,6 @@ Show version and exit.
=item --[no]version-check
@@ -131,10 +131,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-heartbeat
+Index: percona-toolkit-2.2.11/bin/pt-heartbeat
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-heartbeat 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-heartbeat 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-heartbeat
++++ percona-toolkit-2.2.11/bin/pt-heartbeat
@@ -6019,8 +6019,6 @@ Show version and exit.
=item --[no]version-check
@@ -144,11 +144,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-index-usage
+Index: percona-toolkit-2.2.11/bin/pt-index-usage
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-index-usage 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-index-usage 2014-08-10 15:15:27.000000000 +0100
-@@ -7375,8 +7375,6 @@ Show version and exit.
+--- percona-toolkit-2.2.11.orig/bin/pt-index-usage
++++ percona-toolkit-2.2.11/bin/pt-index-usage
+@@ -7377,8 +7377,6 @@ Show version and exit.
=item --[no]version-check
@@ -157,10 +157,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-kill
+Index: percona-toolkit-2.2.11/bin/pt-kill
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-kill 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-kill 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-kill
++++ percona-toolkit-2.2.11/bin/pt-kill
@@ -7640,8 +7640,6 @@ Show version and exit.
=item --[no]version-check
@@ -170,10 +170,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-online-schema-change
+Index: percona-toolkit-2.2.11/bin/pt-online-schema-change
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-online-schema-change 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-online-schema-change 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-online-schema-change
++++ percona-toolkit-2.2.11/bin/pt-online-schema-change
@@ -11328,8 +11328,6 @@ Show version and exit.
=item --[no]version-check
@@ -183,11 +183,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-query-digest
+Index: percona-toolkit-2.2.11/bin/pt-query-digest
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-query-digest 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-query-digest 2014-08-10 15:15:27.000000000 +0100
-@@ -16273,8 +16273,6 @@ Show version and exit.
+--- percona-toolkit-2.2.11.orig/bin/pt-query-digest
++++ percona-toolkit-2.2.11/bin/pt-query-digest
+@@ -16275,8 +16275,6 @@ Show version and exit.
=item --[no]version-check
@@ -196,10 +196,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-slave-delay
+Index: percona-toolkit-2.2.11/bin/pt-slave-delay
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-slave-delay 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-slave-delay 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-slave-delay
++++ percona-toolkit-2.2.11/bin/pt-slave-delay
@@ -4698,8 +4698,6 @@ Show version and exit.
=item --[no]version-check
@@ -209,10 +209,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-slave-restart
+Index: percona-toolkit-2.2.11/bin/pt-slave-restart
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-slave-restart 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-slave-restart 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-slave-restart
++++ percona-toolkit-2.2.11/bin/pt-slave-restart
@@ -5764,8 +5764,6 @@ Show version and exit.
=item --[no]version-check
@@ -222,10 +222,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-table-checksum
+Index: percona-toolkit-2.2.11/bin/pt-table-checksum
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-table-checksum 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-table-checksum 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-table-checksum
++++ percona-toolkit-2.2.11/bin/pt-table-checksum
@@ -12415,8 +12415,6 @@ Show version and exit.
=item --[no]version-check
@@ -235,10 +235,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-table-sync
+Index: percona-toolkit-2.2.11/bin/pt-table-sync
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-table-sync 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-table-sync 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-table-sync
++++ percona-toolkit-2.2.11/bin/pt-table-sync
@@ -12500,8 +12500,6 @@ Show version and exit.
=item --[no]version-check
@@ -248,11 +248,11 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-upgrade
+Index: percona-toolkit-2.2.11/bin/pt-upgrade
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-upgrade 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-upgrade 2014-08-10 15:15:27.000000000 +0100
-@@ -11031,8 +11031,6 @@ Show version and exit.
+--- percona-toolkit-2.2.11.orig/bin/pt-upgrade
++++ percona-toolkit-2.2.11/bin/pt-upgrade
+@@ -11033,8 +11033,6 @@ Show version and exit.
=item --[no]version-check
@@ -261,10 +261,10 @@
Check for the latest version of Percona Toolkit, MySQL, and other programs.
This is a standard "check for updates automatically" feature, with two
-Index: percona-toolkit-2.2.10/bin/pt-variable-advisor
+Index: percona-toolkit-2.2.11/bin/pt-variable-advisor
===================================================================
---- percona-toolkit-2.2.10.orig/bin/pt-variable-advisor 2014-08-06 20:57:30.000000000 +0100
-+++ percona-toolkit-2.2.10/bin/pt-variable-advisor 2014-08-10 15:15:27.000000000 +0100
+--- percona-toolkit-2.2.11.orig/bin/pt-variable-advisor
++++ percona-toolkit-2.2.11/bin/pt-variable-advisor
@@ -5968,8 +5968,6 @@ Show version and exit.
=item --[no]version-check
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-09-28 19:53:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-09-19 22:27:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-09-28 19:54:13.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Sep 26 10:18:39 UTC 2014 - kgronlund(a)suse.com
+
+- low: report: Sort list of nodes
+- low: ui_cluster: More informative error message
+- low: main: Replace getopt with optparse
+- high: parse: Allow empty attribute values in nvpairs (bnc#898625)
+- upstream cs: 2.1.0-82-ge8abd85
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.npnU5D/_old 2014-09-28 19:54:15.000000000 +0200
+++ /var/tmp/diff_new_pack.npnU5D/_new 2014-09-28 19:54:15.000000000 +0200
@@ -41,7 +41,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0+
Group: %{pkg_group}
-Version: 2.1+git71
+Version: 2.1+git82
Release: %{?crmsh_release}%{?dist}
Url: http://crmsh.github.io
Source0: crmsh.tar.bz2
++++++ crmsh.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cibconfig.py new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/modules/cibconfig.py 2014-09-26 12:07:07.000000000 +0200
@@ -499,7 +499,7 @@
Test objects for sanity. This is about semantics.
'''
rc = self.__check_unique_clash(set_obj_all)
- for obj in self.obj_set:
+ for obj in sorted(self.obj_set, key=lambda x: x.obj_id):
rc |= obj.check_sanity()
return rc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cibverify.py new/crmsh/modules/cibverify.py
--- old/crmsh/modules/cibverify.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/modules/cibverify.py 2014-09-26 12:07:07.000000000 +0200
@@ -35,9 +35,8 @@
def verify(cib):
rc, _, stderr = utils.get_stdout_stderr(cib_verify, cib)
for i, line in enumerate(line for line in stderr.split('\n') if line):
- line = _prettify(line, 0 if i == 0 else 7)
if i == 0:
- err_buf.error(line)
+ err_buf.error(_prettify(line, 0))
else:
- err_buf.writemsg(line)
+ err_buf.writemsg(_prettify(line, 7))
return rc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/constants.py new/crmsh/modules/constants.py
--- old/crmsh/modules/constants.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/modules/constants.py 2014-09-26 12:07:07.000000000 +0200
@@ -254,12 +254,6 @@
"simulate": "crm_simulate",
}
-ra_if = None # class interface to RA
-stonithd_metadata = None # stonithd meta data
-pe_metadata = None # PE meta data
-crmd_metadata = None # crmd meta data
-cib_metadata = None # cib meta data
-crm_properties_metadata = None # PE + crmd + cib meta data
meta_progs = ("crmd", "pengine", "stonithd", "cib")
# elide these properties from tab completion
crmd_metadata_do_not_complete = ("dc-version",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/main.py new/crmsh/modules/main.py
--- old/crmsh/modules/main.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/modules/main.py 2014-09-26 12:07:07.000000000 +0200
@@ -17,7 +17,6 @@
import sys
import os
-import getopt
import atexit
import random
@@ -92,76 +91,62 @@
return shadow
-def usage(rc):
- f = sys.stderr
- if rc == 0:
- f = sys.stdout
- print >> f, """Usage: crm [OPTIONS] [SUBCOMMAND ARGS...]
-
- -f, --file='FILE'::
- Load commands from the given file. If a dash `-` is used in place
- of a file name, `crm` will read commands from the shell standard
- input (`stdin`).
-
- -c, --cib='CIB'::
- Start the session using the given shadow CIB file.
- Equivalent to `cib use <CIB>`.
-
- -D, --display='OUTPUT_TYPE'::
- Choose one of the output options: plain, color, or
- uppercase. The default is color if the terminal emulation
- supports colors. Otherwise, plain is used.
-
- -F, --force::
- Make `crm` proceed with applying changes where it would normally
- ask the user to confirm before proceeding. This option is mainly
- useful in scripts, and should be used with care.
-
- -w, --wait::
- Make crm wait for the cluster transition to finish (for the
- changes to take effect) after each processed line.
-
- -H, --history='DIR|FILE'::
- The `history` commands can either work directly on the live
- cluster (default), or on a report generated by the `report`
- command. Use this option to specify a directory or file containing
- the previously generated report.
-
- -h, --help::
- Print help page.
-
- --version::
- Print crmsh version and build information (Mercurial Hg changeset
- hash).
-
- -d, --debug::
- Print verbose debugging information.
-
- -R, --regression-tests::
- Enables extra verbose trace logging used by the regression
- tests. Logs all external calls made by crmsh.
-
- --scriptdir='DIR'::
- Extra directory where crm looks for cluster scripts. Can be
- a semicolon-separated list of directories.
-
- Use crm without arguments for an interactive session.
- Supply one or more arguments for a "single-shot" use.
- Supply level name to start working at that level.
- Specify with -f a file which contains a script. Use '-' for
- standard input or use pipe/redirection.
-
- Examples:
-
- # crm -f stopapp2.txt
- # crm -w resource stop global_www
- # echo stop global_www | crm resource
- # crm configure property no-quorum-policy=ignore
- # crm ra info pengine
- # crm status
+def make_option_parser():
+ from optparse import OptionParser
+ parser = OptionParser(usage="""%prog [-h|--help] [OPTIONS] [SUBCOMMAND ARGS...]
+or %prog help SUBCOMMAND
+
+For a list of available subcommands, use %prog help.
+
+Use %prog without arguments for an interactive session.
+Call a subcommand directly for a "single-shot" use.
+Call %prog with a level name as argument to start an interactive
+session from that level.
+
+See the crm(8) man page or call %prog help for more details.""",
+ version="%prog " + config.CRM_VERSION)
+ parser.add_option("-f", "--file", dest="filename", metavar="FILE",
+ help="Load commands from the given file. If a dash (-) " +
+ "is used in place of a file name, crm will read commands " +
+ "from the shell standard input (stdin).")
+ parser.add_option("-c", "--cib", dest="cib", metavar="CIB",
+ help="Start the session using the given shadow CIB file. " +
+ "Equivalent to `cib use <CIB>`.")
+ parser.add_option("-D", "--display", dest="display", metavar="OUTPUT_TYPE",
+ help="Choose one of the output options: plain, color, or uppercase. " +
+ "The default is color if the terminal emulation supports colors, " +
+ "else plain.")
+ parser.add_option("-F", "--force", action="store_true", default=False, dest="force",
+ help="Make crm proceed with applying changes where it would normally " +
+ "ask the user to confirm before proceeding. This option is mainly useful " +
+ "in scripts, and should be used with care.")
+ parser.add_option("-w", "--wait", action="store_true", default=False, dest="wait",
+ help="Make crm wait for the cluster transition to finish " +
+ "(for the changes to take effect) after each processed line.")
+ parser.add_option("-H", "--history", dest="history", metavar="DIR|FILE",
+ help="The `history` commands can either work directly on the live " +
+ "cluster (default), or on a report generated by the `report` " +
+ "command. Use this option to specify a directory or file containing " +
+ "the previously generated report.")
+ parser.add_option("-d", "--debug", action="store_true", default=False, dest="debug",
+ help="Print verbose debugging information.")
+ parser.add_option("-R", "--regression-tests", action="store_true", default=False,
+ dest="regression_tests",
+ help="Enables extra verbose trace logging used by the regression " +
+ "tests. Logs all external calls made by crmsh.")
+ parser.add_option("--scriptdir", dest="scriptdir", metavar="DIR",
+ help="Extra directory where crm looks for cluster scripts. Can be " +
+ "a semicolon-separated list of directories.")
+ parser.add_option("-X", dest="profile", metavar="PROFILE",
+ help="Collect profiling data and save in PROFILE.")
+ return parser
+
+
+option_parser = make_option_parser()
- See the crm(8) man page or the crm help system for more details.
- """
+
+def usage(rc):
+ option_parser.print_usage(file=(sys.stderr if rc != 0 else sys.stdout))
sys.exit(rc)
@@ -200,9 +185,7 @@
return l
-def do_work(context, user_args):
- compatibility_setup()
-
+def handle_noninteractive_use(context, user_args):
if options.shadow:
if not context.run("cib use " + options.shadow):
return 1
@@ -228,7 +211,24 @@
err_buf.reset_lineno(-1)
else:
return 1
+ return None
+
+def render_prompt(context):
+ rendered_prompt = constants.prompt
+ if options.interactive and not options.batch:
+ # TODO: fix how color interacts with readline,
+ # seems the color prompt messes it up
+ promptstr = "crm(%s)%s# " % (cib_prompt(), context.prompt())
+ constants.prompt = promptstr
+ if clidisplay.colors_enabled():
+ rendered_prompt = term.render(clidisplay.prompt(promptstr))
+ else:
+ rendered_prompt = promptstr
+ return rendered_prompt
+
+
+def setup_context(context):
if options.input_file and options.input_file != "-":
try:
sys.stdin = open(options.input_file)
@@ -239,20 +239,19 @@
if options.interactive and not options.batch:
context.setup_readline()
+
+def do_work(context, user_args):
+ compatibility_setup()
+ rc = handle_noninteractive_use(context, user_args)
+ if rc is not None:
+ return rc
+
+ setup_context(context)
+
rc = 0
while True:
try:
- rendered_prompt = constants.prompt
- if options.interactive and not options.batch:
- # TODO: fix how color interacts with readline,
- # seems the color prompt messes it up
- promptstr = "crm(%s)%s# " % (cib_prompt(), context.prompt())
- constants.prompt = promptstr
- if clidisplay.colors_enabled():
- rendered_prompt = term.render(clidisplay.prompt(promptstr))
- else:
- rendered_prompt = promptstr
- inp = utils.multi_input(rendered_prompt)
+ inp = utils.multi_input(render_prompt(context))
if inp is None:
if options.interactive:
rc = 0
@@ -300,47 +299,20 @@
def parse_options():
- try:
- opts, user_args = getopt.getopt(
- sys.argv[1:],
- 'whdc:f:FX:RD:H:',
- ("wait", "version", "help", "debug",
- "cib=", "file=", "force", "profile=",
- "regression-tests", "display=", "history=",
- "scriptdir="))
- for o, p in opts:
- if o in ("-h", "--help"):
- usage(0)
- elif o == "--version":
- print >> sys.stdout, ("%s" % config.CRM_VERSION)
- sys.exit(0)
- elif o == "-d":
- config.core.debug = "yes"
- elif o == "-X":
- options.profile = p
- elif o == "-R":
- options.regression_tests = True
- elif o in ("-D", "--display"):
- config.color.style = p
- elif o in ("-F", "--force"):
- config.core.force = "yes"
- elif o in ("-f", "--file"):
- options.batch = True
- options.interactive = False
- err_buf.reset_lineno()
- options.input_file = p
- elif o in ("-H", "--history"):
- options.history = p
- elif o in ("-w", "--wait"):
- config.core.wait = "yes"
- elif o in ("-c", "--cib"):
- options.shadow = p
- elif o == "--scriptdir":
- options.scriptdir = p
- return user_args
- except getopt.GetoptError, msg:
- print msg
- usage(1)
+ opts, args = option_parser.parse_args()
+ config.core.debug = "yes" if opts.debug else config.core.debug
+ options.profile = opts.profile or options.profile
+ options.regression_tests = opts.regression_tests or options.regression_tests
+ config.color.style = opts.display or config.color.style
+ config.core.force = opts.force or config.core.force
+ if opts.filename:
+ err_buf.reset_lineno()
+ options.input_file, options.batch, options.interactive = opts.filename, True, False
+ options.history = opts.history or options.history
+ config.core.wait = opts.wait or config.core.wait
+ options.shadow = opts.cib or options.shadow
+ options.scriptdir = opts.scriptdir or options.scriptdir
+ return args
def profile_run(context, user_args):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/parse.py new/crmsh/modules/parse.py
--- old/crmsh/modules/parse.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/modules/parse.py 2014-09-26 12:07:07.000000000 +0200
@@ -37,15 +37,15 @@
class BaseParser(object):
- _NVPAIR_RE = re.compile(r'([^=(a)$][^=]*)=(.+)$')
- _NVPAIR_ID_RE = re.compile(r'\$([^:=]+)(?::(.+))?=(.+)$')
+ _NVPAIR_RE = re.compile(r'([^=(a)$][^=]*)=(.*)$')
+ _NVPAIR_ID_RE = re.compile(r'\$([^:=]+)(?::(.+))?=(.*)$')
_NVPAIR_REF_RE = re.compile(r'@([^:]+)(?::(.+))?$')
_IDENT_RE = re.compile(r'([a-z0-9_#$-][^=]*)$', re.IGNORECASE)
_DISPATCH_RE = re.compile(r'[a-z0-9_]+$', re.IGNORECASE)
_DESC_RE = re.compile(r'description=(.+)$', re.IGNORECASE)
_RESOURCE_RE = re.compile(r'([a-z_#$][^=]*)$', re.IGNORECASE)
_IDSPEC_RE = re.compile(r'(\$id-ref|\$id)=(.*)$', re.IGNORECASE)
- _ID_RE = re.compile(r'\$id=(.+)$', re.IGNORECASE)
+ _ID_RE = re.compile(r'\$id=(.*)$', re.IGNORECASE)
_ID_NEW_RE = re.compile(r'([\w-]+):$', re.IGNORECASE)
def can_parse(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ra.py new/crmsh/modules/ra.py
--- old/crmsh/modules/ra.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/modules/ra.py 2014-09-26 12:07:07.000000000 +0200
@@ -42,9 +42,6 @@
'''
Getting information from the resource agents.
'''
- def __init__(self):
- self.good = self.is_lrmd_accessible()
-
def lrmadmin(self, opts, xml=False):
'''
Get information directly from lrmd using lrmadmin.
@@ -84,9 +81,6 @@
'''
Getting information from the resource agents (direct).
'''
- def __init__(self):
- self.good = True
-
def meta(self, ra_class, ra_type, ra_provider):
l = []
if ra_class == "ocf":
@@ -162,9 +156,6 @@
'''
Getting information from the resource agents via new crm_resource.
'''
- def __init__(self):
- self.good = True
-
def crm_resource(self, opts):
'''
Get information from crm_resource.
@@ -210,8 +201,13 @@
return False
v_min = version.LooseVersion(minimum_glue)
v_this = version.LooseVersion(glue_ver)
- return v_this >= v_min or \
- (userdir.getuser() in ("root", config.path.crm_daemon_user))
+ if v_this < v_min:
+ return False
+ if userdir.getuser() not in ("root", config.path.crm_daemon_user):
+ return False
+ if not (is_program(lrmadmin_prog) and is_process("lrmd")):
+ return False
+ return utils.ext_cmd(">/dev/null 2>&1 %s -C" % lrmadmin_prog) == 0
def crm_resource_support():
@@ -219,19 +215,16 @@
return s != ""
+(a)utils.memoize
def ra_if():
- if constants.ra_if:
- return constants.ra_if
if crm_resource_support():
common_debug("Using crm_resource for agent discovery")
- constants.ra_if = RaCrmResource()
- elif can_use_lrmadmin():
+ return RaCrmResource()
+ if can_use_lrmadmin():
common_debug("Using lrmd for agent discovery")
- constants.ra_if = RaLrmd()
- if not constants.ra_if or not constants.ra_if.good:
- common_debug("Using OS for agent discovery")
- constants.ra_if = RaOS()
- return constants.ra_if
+ return RaLrmd()
+ common_debug("Using OS for agent discovery")
+ return RaOS()
def ra_classes():
@@ -288,43 +281,37 @@
return cache.store(id, list)
+(a)utils.memoize
def get_pe_meta():
- if not constants.pe_metadata:
- constants.pe_metadata = RAInfo("pengine", "metadata")
- return constants.pe_metadata
+ return RAInfo("pengine", "metadata")
+(a)utils.memoize
def get_crmd_meta():
- if not constants.crmd_metadata:
- constants.crmd_metadata = RAInfo("crmd", "metadata")
- constants.crmd_metadata.exclude_from_completion(
- constants.crmd_metadata_do_not_complete)
- return constants.crmd_metadata
+ info = RAInfo("crmd", "metadata")
+ info.exclude_from_completion(constants.crmd_metadata_do_not_complete)
+ return info
+(a)utils.memoize
def get_stonithd_meta():
- if not constants.stonithd_metadata:
- constants.stonithd_metadata = RAInfo("stonithd", "metadata")
- return constants.stonithd_metadata
+ return RAInfo("stonithd", "metadata")
+(a)utils.memoize
def get_cib_meta():
- if not constants.cib_metadata:
- constants.cib_metadata = RAInfo("cib", "metadata")
- return constants.cib_metadata
+ return RAInfo("cib", "metadata")
+(a)utils.memoize
def get_properties_meta():
- if not constants.crm_properties_metadata:
- get_pe_meta()
- get_crmd_meta()
- get_cib_meta()
- constants.crm_properties_metadata = copy.deepcopy(constants.crmd_metadata)
- constants.crm_properties_metadata.add_ra_params(constants.pe_metadata)
- constants.crm_properties_metadata.add_ra_params(constants.cib_metadata)
- return constants.crm_properties_metadata
+ meta = copy.deepcopy(get_crmd_meta())
+ meta.add_ra_params(get_pe_meta())
+ meta.add_ra_params(get_cib_meta())
+ return meta
+(a)utils.memoize
def get_properties_list():
try:
return get_properties_meta().params().keys()
@@ -336,13 +323,12 @@
'''
Do external program metadata.
'''
- l = []
if is_program(prog):
rc, l = stdout2list("%s metadata" % prog)
- if rc != 0:
- common_debug("%s metadata exited with code %d" % (prog, rc))
- l = []
- return l
+ if rc == 0:
+ return l
+ common_debug("%s metadata exited with code %d" % (prog, rc))
+ return []
def get_nodes_text(n, tag):
@@ -636,7 +622,7 @@
if self.ra_class == "stonith" and op in ("start", "stop"):
continue
if op not in self.actions():
- common_warn("%s: action %s not advertised in meta-data, it may not be supported by the RA" % (id, op))
+ common_warn("%s: action '%s' not found in Resource Agent meta-data" % (id, op))
rc |= 1
if "interval" in n_ops[op]:
v = n_ops[op]["interval"]
@@ -737,16 +723,14 @@
return s
def format_parameter(self, n):
- l = []
head = self.meta_param_head(n)
if not head:
self.error("no name attribute for parameter")
return ""
- l.append(head)
+ l = [head]
longdesc = get_nodes_text(n, "longdesc")
if longdesc:
- longdesc = self.ra_tab + longdesc.replace("\n", "\n" + self.ra_tab) + '\n'
- l.append(longdesc)
+ l.append(self.ra_tab + longdesc.replace("\n", "\n" + self.ra_tab) + '\n')
return '\n'.join(l)
def meta_parameter(self, param):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/report.py new/crmsh/modules/report.py
--- old/crmsh/modules/report.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/modules/report.py 2014-09-26 12:07:07.000000000 +0200
@@ -725,10 +725,10 @@
return pe_file.replace("%s/" % self.loc, "")
def get_nodes(self):
- return [os.path.basename(p)
- for p in os.listdir(self.loc)
- if os.path.isdir(os.path.join(self.loc, p)) and
- os.path.isfile(os.path.join(self.loc, p, "ha-log.txt"))]
+ return sorted([os.path.basename(p)
+ for p in os.listdir(self.loc)
+ if os.path.isdir(os.path.join(self.loc, p)) and
+ os.path.isfile(os.path.join(self.loc, p, "ha-log.txt"))])
def check_nodes(self):
'Verify if the nodes in cib match the nodes in the report.'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_cluster.py new/crmsh/modules/ui_cluster.py
--- old/crmsh/modules/ui_cluster.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/modules/ui_cluster.py 2014-09-26 12:07:07.000000000 +0200
@@ -157,7 +157,7 @@
'''
stack = utils.cluster_stack()
if not stack:
- err_buf.error("Cluster stack not detected!")
+ err_buf.error("No supported cluster stack found (tried heartbeat|openais|corosync)")
if utils.cluster_stack() == 'corosync':
print "Services:"
for svc in ["corosync", "pacemaker"]:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/confbasic.exp new/crmsh/test/testcases/confbasic.exp
--- old/crmsh/test/testcases/confbasic.exp 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/test/testcases/confbasic.exp 2014-09-26 12:07:07.000000000 +0200
@@ -56,8 +56,8 @@
.EXT crm_resource --show-metadata ocf:heartbeat:Delay
.EXT crm_resource --show-metadata ocf:pacemaker:Stateful
.EXT crm_resource --show-metadata ocf:heartbeat:Dummy
-.EXT pengine metadata
.EXT crmd metadata
+.EXT pengine metadata
.EXT cib metadata
.INP: show
node node1 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/newfeatures.exp new/crmsh/test/testcases/newfeatures.exp
--- old/crmsh/test/testcases/newfeatures.exp 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/test/testcases/newfeatures.exp 2014-09-26 12:07:07.000000000 +0200
@@ -37,8 +37,8 @@
.EXT crm_resource --show-metadata stonith:heartbeat:ssh
.EXT stonithd metadata
.EXT crm_resource --show-metadata ocf:heartbeat:Dummy
-.EXT pengine metadata
.EXT crmd metadata
+.EXT pengine metadata
.EXT cib metadata
.INP: commit
nvpair_ref: 'p0-state' None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/unittests/test_parse.py new/crmsh/test/unittests/test_parse.py
--- old/crmsh/test/unittests/test_parse.py 2014-09-19 12:38:36.000000000 +0200
+++ new/crmsh/test/unittests/test_parse.py 2014-09-26 12:07:07.000000000 +0200
@@ -148,6 +148,9 @@
out = self.parser.parse('primitive st stonith:ssh params hostlist=node1 meta target-role=Started op start requires=nothing timeout=60s op monitor interval=60m timeout=60s')
self.assertEqual(out.get('id'), 'st')
+ out = self.parser.parse('primitive st stonith:ssh params hostlist= meta')
+ self.assertEqual(out.get('id'), 'st')
+
out = self.parser.parse('primitive st stonith:null params hostlist=node1 meta description="some description here" op start requires=nothing op monitor interval=60m')
self.assertEqual(out.get('id'), 'st')
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xfce4-power-manager for openSUSE:Factory checked in at 2014-09-28 19:53:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old)
and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-power-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes 2014-09-17 17:27:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 2014-09-28 19:54:11.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Sep 26 10:01:57 UTC 2014 - gber(a)opensuse.org
+
+- update to version 1.4.1
+ - fix for panel icon not always updating depending on the
+ version of UPower in use.
+ - fix handle lid switch with loginD (Bug 11160) Fixed by Simon P.
+ - translation updates
+- remove obsolete xfce4-power-manager-fix-lid-switch-logic.patch
+
+-------------------------------------------------------------------
Old:
----
xfce4-power-manager-1.4.0.tar.bz2
xfce4-power-manager-fix-lid-switch-logic.patch
New:
----
xfce4-power-manager-1.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.tcnRpM/_old 2014-09-28 19:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.tcnRpM/_new 2014-09-28 19:54:12.000000000 +0200
@@ -19,7 +19,7 @@
%define panel_version 4.10.0
Name: xfce4-power-manager
-Version: 1.4.0
+Version: 1.4.1
Release: 0
Summary: Power Management for the Xfce Desktop Environment
License: GPL-2.0+
@@ -27,8 +27,6 @@
Url: http://goodies.xfce.org/projects/applications/xfce4-power-manager
Source0: %{name}-%{version}.tar.bz2
Source1: xfce4-power-manager.xml
-# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-lid-switch-logic.patch gber(a)opensuse.org -- Fix logic of the lid switch setting handling (backported from upstream git)
-Patch0: xfce4-power-manager-fix-lid-switch-logic.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: libxslt-tools
@@ -112,7 +110,6 @@
%prep
%setup -q
-%patch0 -p1
# xfce4-pm-helper is only needed on non-systemd systems
xsltproc --nonet - ./src/org.xfce.power.policy.in2 <<'EOF' \
++++++ xfce4-power-manager-1.4.0.tar.bz2 -> xfce4-power-manager-1.4.1.tar.bz2 ++++++
++++ 3695 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
Hello community,
here is the log from the commit of package libvdpau-va-gl for openSUSE:Factory checked in at 2014-09-28 19:53:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvdpau-va-gl (Old)
and /work/SRC/openSUSE:Factory/.libvdpau-va-gl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvdpau-va-gl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvdpau-va-gl/libvdpau-va-gl.changes 2014-04-09 13:14:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvdpau-va-gl.new/libvdpau-va-gl.changes 2014-09-28 19:54:09.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 25 18:37:25 UTC 2014 - sor.alexei(a)meowr.ru
+
+- Supplement xf86-video-intel as the only possible libvdpau there.
+- Usage of %cmake and %cmake_install macros.
+- Add baselibs.conf.
+- Remove incorrect usage of %ghost.
+
+-------------------------------------------------------------------
@@ -5 +13 @@
- the libraries
+ the libraries.
@@ -15 +23 @@
-- Fixes for /etc/profile.d/
+- Fixes for /etc/profile.d/.
@@ -21,3 +29,3 @@
- exist
-- Remove useless %files section
-- The profile script do not need to get executable bits;
+ exist.
+- Remove useless %files section.
+- The profile script do not need to get executable bits.
Old:
----
libvdpau-va-gl-0.3.4.tar.gz
New:
----
baselibs.conf
v0.3.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvdpau-va-gl.spec ++++++
--- /var/tmp/diff_new_pack.t3xHvV/_old 2014-09-28 19:54:10.000000000 +0200
+++ /var/tmp/diff_new_pack.t3xHvV/_new 2014-09-28 19:54:10.000000000 +0200
@@ -11,32 +11,34 @@
# 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 _libname libvdpau_va_gl
%define _sover 1
Name: libvdpau-va-gl
Version: 0.3.4
Release: 0
-License: LGPL-3.0+
Summary: VDPAU driver with OpenGL/VAAPI backend
-Url: https://github.com/i-rinat/libvdpau-va-gl
+License: LGPL-3.0+
Group: System/Libraries
-Source: %{name}-%{version}.tar.gz
+Url: https://github.com/i-rinat/libvdpau-va-gl
+Source: https://github.com/i-rinat/%{name}/archive/v%{version}.tar.gz
+
+Source1: baselibs.conf
-BuildRequires: pkg-config
BuildRequires: cmake
BuildRequires: gcc-c++
+BuildRequires: pkg-config
+BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libva-glx)
BuildRequires: pkgconfig(vdpau)
-BuildRequires: pkgconfig(gl)
-BuildRequires: pkgconfig(glu)
%description
Many applications can use VDPAU to accelerate portions of the video
@@ -51,6 +53,8 @@
%package -n %{_libname}%{_sover}
Summary: VDPAU driver with OpenGL/VAAPI backend
Group: System/Libraries
+Provides: %{_libname} = %{version}
+Supplements: xf86-video-intel
%description -n %{_libname}%{_sover}
Many applications can use VDPAU to accelerate portions of the video
@@ -64,32 +68,22 @@
%prep
%setup -q
+echo "export VDPAU_DRIVER='va_gl'" > %{name}.sh
+echo "setenv VDPAU_DRIVER 'va_gl'" > %{name}.csh
%build
-cmake . \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=release \
- -DCMAKE_C_FLAGS='%{optflags}' \
-%ifarch x86_64 aarch64 ppc64 ppc64p7 ppc64le
- -DLIB_SUFFIX=64 \
-%endif
- -DCMAKE_CXX_FLAGS='%{optflags}'
+%cmake -DLIB_INSTALL_DIR=%{_libdir}/vdpau
make %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d/
-cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh << EOF
-export VDPAU_DRIVER='va_gl'
-EOF
-cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh << EOF
-setenv VDPAU_DRIVER 'va_gl'
-EOF
+%cmake_install
+install -Dm 0644 %{name}.sh %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+install -Dm 0644 %{name}.csh %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
%files -n %{_libname}%{_sover}
%defattr(-,root,root)
-%doc ChangeLog COPYING README.md
-%ghost %{_sysconfdir}/profile.d/%{name}.*sh
+%doc ChangeLog COPYING
%{_libdir}/vdpau/
+%{_sysconfdir}/profile.d/%{name}.*sh
%changelog
++++++ baselibs.conf ++++++
libvdpau_va_gl
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gnumeric for openSUSE:Factory checked in at 2014-09-28 19:53:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnumeric (Old)
and /work/SRC/openSUSE:Factory/.gnumeric.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnumeric"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnumeric/gnumeric.changes 2014-07-17 17:31:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric.changes 2014-09-28 19:54:07.000000000 +0200
@@ -1,0 +2,17 @@
+Fri Sep 26 07:14:09 UTC 2014 - zaitor(a)opensuse.org
+
+- Update to version 1.12.18:
+ + Improve documentation (bgo#733466).
+ + Add warning dialog (bgo#733352).
+ + Fix rich text roundtrip through ODF (bgo#737039).
+ + Fix dialogs behavior in full screen mode (bgo#736395).
+ + Save axis format to xls (bgo#736656).
+ + Fix recent files dialog crasher (bgo#737261).
+ + Fix xls export problem (bgo#733771).
+ + Update WEEKDAY function.
+ + Fix xlsx export problem for strings (bgo#736202).
+ + Improve xlsx import of rich text.
+ + Text suite improvements.
+ + Fix minor ods rich text import problem.
+
+-------------------------------------------------------------------
Old:
----
gnumeric-1.12.17.tar.xz
New:
----
gnumeric-1.12.18.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnumeric.spec ++++++
--- /var/tmp/diff_new_pack.HRWbL9/_old 2014-09-28 19:54:08.000000000 +0200
+++ /var/tmp/diff_new_pack.HRWbL9/_new 2014-09-28 19:54:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: gnumeric
-Version: 1.12.17
+Version: 1.12.18
Release: 0
Summary: Spreadsheet Application
License: GPL-2.0 or GPL-3.0
++++++ gnumeric-1.12.17.tar.xz -> gnumeric-1.12.18.tar.xz ++++++
/work/SRC/openSUSE:Factory/gnumeric/gnumeric-1.12.17.tar.xz /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric-1.12.18.tar.xz differ: char 26, 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
Hello community,
here is the log from the commit of package goffice for openSUSE:Factory checked in at 2014-09-28 19:53:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/goffice (Old)
and /work/SRC/openSUSE:Factory/.goffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "goffice"
Changes:
--------
--- /work/SRC/openSUSE:Factory/goffice/goffice.changes 2014-07-17 17:31:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.goffice.new/goffice.changes 2014-09-28 19:54:00.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Sep 26 07:02:42 UTC 2014 - zaitor(a)opensuse.org
+
+- Update to version 0.10.18:
+ + Fix saving of color map names (bgo#735298).
+ + Fix grid line theme support (bgo#733403).
+ + Fix default ticks position.
+ + Fix font color theme support (deb#757611).
+ + Fix saving color maps when directory does not exists
+ (bgo#735008).
+ + Fix color maps loading (bgo#735007).
+ + Don't pass NULL to g_strtod() (bgo#735555).
+ + Work around gtk+ ABI break for colour selector (bgo#733350).
+
+-------------------------------------------------------------------
Old:
----
goffice-0.10.17.tar.xz
New:
----
goffice-0.10.18.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ goffice.spec ++++++
--- /var/tmp/diff_new_pack.zbg4X0/_old 2014-09-28 19:54:01.000000000 +0200
+++ /var/tmp/diff_new_pack.zbg4X0/_new 2014-09-28 19:54:01.000000000 +0200
@@ -17,7 +17,7 @@
Name: goffice
-Version: 0.10.17
+Version: 0.10.18
Release: 0
Summary: GLib/GTK+ Set of Document-Centric Objects and Utilities
License: GPL-2.0 or GPL-3.0
++++++ goffice-0.10.17.tar.xz -> goffice-0.10.18.tar.xz ++++++
++++ 12859 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
Hello community,
here is the log from the commit of package libmtp for openSUSE:Factory checked in at 2014-09-28 19:53:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmtp (Old)
and /work/SRC/openSUSE:Factory/.libmtp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmtp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmtp/libmtp.changes 2014-08-27 22:18:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libmtp.new/libmtp.changes 2014-09-28 19:53:58.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 25 08:02:46 UTC 2014 - schwab(a)suse.de
+
+- include-config-h.patch: always include "config.h" first
+
+-------------------------------------------------------------------
New:
----
include-config-h.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmtp.spec ++++++
--- /var/tmp/diff_new_pack.FZHmNK/_old 2014-09-28 19:54:00.000000000 +0200
+++ /var/tmp/diff_new_pack.FZHmNK/_new 2014-09-28 19:54:00.000000000 +0200
@@ -30,6 +30,7 @@
Release: 0
%define sonum 9
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}…
+Patch0: include-config-h.patch
# from git 1a2669c6df6c093aec38c0c99a21438d74ccdf33
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d }
@@ -77,6 +78,7 @@
%prep
%setup -q
+%patch0 -p1
%build
echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in
++++++ include-config-h.patch ++++++
Index: libmtp-1.1.7/src/util.c
===================================================================
--- libmtp-1.1.7.orig/src/util.c
+++ libmtp-1.1.7/src/util.c
@@ -34,6 +34,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
+#include "config.h"
#include "libmtp.h"
#include "util.h"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libcap1 for openSUSE:Factory checked in at 2014-09-28 19:53:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcap1 (Old)
and /work/SRC/openSUSE:Factory/.libcap1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcap1"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcap1/libcap1.changes 2011-10-04 18:13:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libcap1.new/libcap1.changes 2014-09-28 19:53:57.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 19 20:46:38 UTC 2014 - schwab(a)linux-m68k.org
+
+- feature-tests.patch: fix bogus uses of feature test macros
+
+-------------------------------------------------------------------
New:
----
feature-tests.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcap1.spec ++++++
--- /var/tmp/diff_new_pack.IvpSyK/_old 2014-09-28 19:53:58.000000000 +0200
+++ /var/tmp/diff_new_pack.IvpSyK/_new 2014-09-28 19:53:58.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcap1
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: libcap1
+Summary: Library for Capabilities (linux-privs) Support
License: BSD-3-Clause
Group: System/Libraries
-AutoReqProv: on
-Summary: Library for Capabilities (linux-privs) Support
Version: 1.10
-Release: 45
+Release: 0
Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/old/kernel-2.4/…
Source2: baselibs.conf
Patch: libcap-%{version}.diff
@@ -35,6 +32,7 @@
Patch6: libcap-invalid-free-fix.diff
Patch7: libcap-array-range-fix.diff
Patch8: libcap-no-version-check.diff
+Patch9: feature-tests.patch
#URL: http://www.kernel.org/
#Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -62,6 +60,7 @@
%patch6
%patch7
%patch8
+%patch9 -p1
%build
lib=%{_lib} make %{?_smp_mflags} LDFLAGS= COPTFLAG="$RPM_OPT_FLAGS" CC="%{__cc}"
++++++ feature-tests.patch ++++++
Index: libcap-1.10/doc/cap_get_proc.3
===================================================================
--- libcap-1.10.orig/doc/cap_get_proc.3
+++ libcap-1.10/doc/cap_get_proc.3
@@ -15,8 +15,6 @@ arbitrary processes
.br
.BI "int cap_set_proc(cap_t " cap_p );
.sp
-.B #undef _POSIX_SOURCE
-.br
.B #include <sys/capability.h>
.sp
.BI "cap_t capgetp(pid_t " pid ", cap_t " cap_d );
Index: libcap-1.10/doc/capget.2
===================================================================
--- libcap-1.10.orig/doc/capget.2
+++ libcap-1.10/doc/capget.2
@@ -6,8 +6,6 @@
.SH NAME
capget, capset \- set/get process capabilities
.SH SYNOPSIS
-.B #undef _POSIX_SOURCE
-.br
.B #include <sys/capability.h>
.sp
.BI "int capget(cap_user_header_t " header ", cap_user_data_t " data );
Index: libcap-1.10/libcap/include/sys/capability.h
===================================================================
--- libcap-1.10.orig/libcap/include/sys/capability.h
+++ libcap-1.10/libcap/include/sys/capability.h
@@ -92,20 +92,15 @@ cap_t cap_from_text(const char *);
char * cap_to_text(cap_t, ssize_t *);
/*
- * Linux capability system calls: defined in libcap but only available
- * if the following _POSIX_SOURCE is _undefined_
+ * Linux capability system calls: defined in libcap
*/
-#if !defined(_POSIX_SOURCE)
-
extern int capset(cap_user_header_t header, cap_user_data_t data);
extern int capget(cap_user_header_t header, const cap_user_data_t data);
extern int capgetp(pid_t pid, cap_t cap_d);
extern int capsetp(pid_t pid, cap_t cap_d);
extern char const *_cap_names[];
-#endif /* !defined(_POSIX_SOURCE) */
-
#ifdef __cplusplus
}
#endif
Index: libcap-1.10/progs/getpcaps.c
===================================================================
--- libcap-1.10.orig/progs/getpcaps.c
+++ libcap-1.10/progs/getpcaps.c
@@ -11,7 +11,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#undef _POSIX_SOURCE
#include <sys/capability.h>
static void usage(void)
Index: libcap-1.10/progs/setpcaps.c
===================================================================
--- libcap-1.10.orig/progs/setpcaps.c
+++ libcap-1.10/progs/setpcaps.c
@@ -11,7 +11,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#undef _POSIX_SOURCE
#include <sys/capability.h>
#include <unistd.h>
Index: libcap-1.10/progs/sucap.c
===================================================================
--- libcap-1.10.orig/progs/sucap.c
+++ libcap-1.10/progs/sucap.c
@@ -8,18 +8,18 @@
* privileges. All environment variables are inherited.
*/
+#define _BSD_SOURCE 1
#include <sys/types.h>
#include <errno.h>
#include <stdio.h>
-#undef _POSIX_SOURCE
#include <sys/capability.h>
#include <pwd.h>
-#define __USE_BSD
#include <grp.h>
#include <unistd.h>
#include <sys/wait.h>
#include <errno.h>
#include <string.h>
+#include <stdlib.h>
static void usage(void)
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package bash for openSUSE:Factory checked in at 2014-09-28 19:53:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bash (Old)
and /work/SRC/openSUSE:Factory/.bash.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bash/bash.changes 2014-07-19 11:04:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.bash.new/bash.changes 2014-09-28 19:53:55.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Sep 18 12:10:17 UTC 2014 - werner(a)suse.de
+
+- Add bash-4.2-CVE-2014-6271.patch
+ to fix CVE-2014-6271, the unexpected code execution with
+ environment variables (bnc#896776)
+
+-------------------------------------------------------------------
+Mon Sep 15 08:52:13 UTC 2014 - werner(a)suse.de
+
+- Add patch bash-4.2-error-getpwd.patch
+ which is the backport of the corrected german error message for
+ a failing getpwd (bnc#895475)
+
+-------------------------------------------------------------------
New:
----
bash-4.2-CVE-2014-6271.patch
bash-4.2-error-getpwd.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bash.spec ++++++
--- /var/tmp/diff_new_pack.qtz8JL/_old 2014-09-28 19:53:56.000000000 +0200
+++ /var/tmp/diff_new_pack.qtz8JL/_new 2014-09-28 19:53:56.000000000 +0200
@@ -93,10 +93,14 @@
Patch30: readline-6.2-destdir.patch
Patch31: readline-6.2-rltrace.patch
Patch40: bash-4.1-bash.bashrc.dif
+# PATCH-FIX-UPSTREAM bnc#895475 -- locale de_DE.utf8 has wrong translations
+Patch41: bash-4.2-error-getpwd.patch
Patch42: audit-patch
Patch43: audit-rl-patch
Patch46: man2html-no-timestamp.patch
Patch47: config-guess-sub-update.patch
+# PATCH-FIX-UPSTREAM bnc#895475 -- bnc#896776, CVE-2014-6271: unexpected code execution with environment variables
+Patch48: bash-4.2-CVE-2014-6271.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _incdir %{_includedir}
@@ -312,11 +316,13 @@
%patch26 -p0 -b .msgdy
%patch31 -p0 -b .tmp
%patch40 -p0 -b .bashrc
+%patch41 -p0 -b .errgetpwd
%if 0%suse_version >= 1100
%patch42 -p1 -b .audit
%endif
%patch46 -p0 -b .notimestamp
%patch47
+%patch48 -p2
%patch0 -p0 -b .0
pushd ../readline-%{rl_vers}%{extend}
for patch in ../readline-%{rl_vers}-patches/*; do
++++++ bash-4.2-CVE-2014-6271.patch ++++++
diff -ur a/bash/builtins/common.h b/bash/builtins/common.h
--- a/bash/builtins/common.h 2010-05-31 00:31:51.000000000 +0200
+++ b/bash/builtins/common.h 2014-09-16 21:36:20.139826595 +0200
@@ -33,6 +33,8 @@
#define SEVAL_RESETLINE 0x010
#define SEVAL_PARSEONLY 0x020
#define SEVAL_NOLONGJMP 0x040
+#define SEVAL_FUNCDEF 0x080 /* only allow function definitions */
+#define SEVAL_ONECMD 0x100 /* only allow a single command */
/* Flags for describe_command, shared between type.def and command.def */
#define CDESC_ALL 0x001 /* type -a */
diff -ur a/bash/builtins/evalstring.c b/bash/builtins/evalstring.c
--- a/bash/builtins/evalstring.c 2010-11-23 14:22:15.000000000 +0100
+++ b/bash/builtins/evalstring.c 2014-09-16 21:36:20.139826595 +0200
@@ -261,6 +261,14 @@
{
struct fd_bitmap *bitmap;
+ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
+ {
+ internal_warning ("%s: ignoring function definition attempt", from_file);
+ should_jump_to_top_level = 0;
+ last_result = last_command_exit_value = EX_BADUSAGE;
+ break;
+ }
+
bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
begin_unwind_frame ("pe_dispose");
add_unwind_protect (dispose_fd_bitmap, bitmap);
@@ -321,6 +329,9 @@
dispose_command (command);
dispose_fd_bitmap (bitmap);
discard_unwind_frame ("pe_dispose");
+
+ if (flags & SEVAL_ONECMD)
+ break;
}
}
else
diff -ur a/bash/variables.c b/bash/variables.c
--- a/bash/variables.c 2014-09-16 21:35:34.878850652 +0200
+++ b/bash/variables.c 2014-09-16 21:37:16.221034763 +0200
@@ -347,7 +347,11 @@
temp_string[char_index] = ' ';
strcpy (temp_string + char_index + 1, string);
- parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST);
+ /* Don't import function names that are invalid identifiers from the
+ environment, though we still allow them to be defined as shell
+ variables. */
+ if (legal_identifier (name))
+ parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
/* Ancient backwards compatibility. Old versions of bash exported
functions like name()=() {...} */
@@ -361,10 +365,6 @@
}
else
report_error (_("error importing function definition for `%s'"), name);
-
- /* ( */
- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
- name[char_index - 2] = '('; /* ) */
}
#if defined (ARRAY_VARS)
# if 0
++++++ bash-4.2-error-getpwd.patch ++++++
Backport of the corrected error message for a failing getpwd (bnc#895475)
---
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- po/de.po
+++ po/de.po 2014-09-15 08:46:03.482235134 +0000
@@ -267,7 +267,7 @@ msgstr "Fehler beim Ermitteln der Termin
#: builtins/common.c:563
#, c-format
msgid "%s: error retrieving current directory: %s: %s\n"
-msgstr "%s: Kann das nicht aktuelle Verzeichnis wiederfinden: %s: %s\n"
+msgstr "%s: Kann das aktuelle Verzeichnis nicht wiederfinden: %s: %s\n"
#: builtins/common.c:629 builtins/common.c:631
#, c-format
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pam_mount for openSUSE:Factory checked in at 2014-09-28 19:53:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam_mount (Old)
and /work/SRC/openSUSE:Factory/.pam_mount.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_mount"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pam_mount/pam_mount.changes 2013-09-13 14:45:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pam_mount.new/pam_mount.changes 2014-09-28 19:53:53.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Sep 23 16:51:52 UTC 2014 - jengelh(a)inai.de
+
+- Drop gpg-offline build-time requirement; this is now handled by
+ the local source validator
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam_mount.spec ++++++
--- /var/tmp/diff_new_pack.MwW07P/_old 2014-09-28 19:53:54.000000000 +0200
+++ /var/tmp/diff_new_pack.MwW07P/_new 2014-09-28 19:53:54.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pam_mount
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,9 +36,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
-%if 0%{?suse_version} >= 1230
-BuildRequires: gpg-offline
-%endif
BuildRequires: libtool
# LOOP64 support:
BuildRequires: linux-glibc-devel >= 2.6
@@ -55,16 +52,16 @@
BuildRequires: pkgconfig(libxml-2.0) >= 2.6
BuildRequires: pkgconfig(mount) >= 2.20
-Requires(post): coreutils, perl-XML-Writer, perl-XML-Parser
+Requires(post): coreutils
+Requires(post): perl-XML-Writer
+Requires(post): perl-XML-Parser
# -EBUSY bugs fixed (libdevmapper):
Requires: device-mapper >= 1.02.48
# for mount(8) and mount.cifs:
-Requires: util-linux
-Recommends: cifs-mount
Requires: fd0ssh
Requires: ofl
-# for fd0ssh and ofl:
-Suggests: hxtools >= 20090116
+Requires: util-linux
+Recommends: cifs-mount
%description
This module is aimed at environments with central file servers that a
@@ -101,7 +98,6 @@
and transparent use of the OS's crypto layer.
%prep
-%{?gpg_verify: %gpg_verify %{S:9}}
%setup -q
%patch -P 1 -p1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2014-09-28 19:53:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb (Old)
and /work/SRC/openSUSE:Factory/.mariadb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2014-09-12 15:25:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2014-09-28 19:53:48.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Sep 19 17:41:26 UTC 2014 - michal.hrusecky(a)opensuse.org
+
+- Get rid of error during update
+
+-------------------------------------------------------------------
+Tue Sep 16 06:37:15 UTC 2014 - michal.hrusecky(a)opensuse.org
+
+- Little polishing of rc script
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb.spec ++++++
--- /var/tmp/diff_new_pack.pzsjB3/_old 2014-09-28 19:53:50.000000000 +0200
+++ /var/tmp/diff_new_pack.pzsjB3/_new 2014-09-28 19:53:50.000000000 +0200
@@ -42,7 +42,7 @@
Group: Productivity/Databases/Servers
Version: 10.0.13
Release: 0
-%define srv_vers 5.6.17
+%define srv_vers 5.6.19
Url: https://www.mariadb.org
Source: mariadb-%{version}.tar.bz2
Source2: baselibs.conf
@@ -476,8 +476,8 @@
# start mysql again if it should run
if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d %{_rundir}/mysql/restart ]; then
[ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql start
- rmdir %{_rundir}/mysql/restart || :
- rmdir %{_rundir}/mysql || :
+ # Might not be there, so ignoring errors
+ rmdir %{_rundir}/mysql/restart 2> /dev/null || :
fi
# warn on first run
datadir="/var/lib/mysql"
++++++ configuration-tweaks.tar.bz2 ++++++
++++++ rc.mysql.systemd ++++++
--- /var/tmp/diff_new_pack.pzsjB3/_old 2014-09-28 19:53:50.000000000 +0200
+++ /var/tmp/diff_new_pack.pzsjB3/_new 2014-09-28 19:53:50.000000000 +0200
@@ -35,9 +35,9 @@
rc_check ()
{
_rc_status_ret=$?
- test "$_rc_status_ret" || _rc_status_ret=0
- test $_rc_status_ret -eq 0 || _rc_status=$_rc_status_ret
- test $_rc_status -eq 0 || _rc_status_all=$_rc_status
+ test "$_rc_status_ret" || _rc_status_ret=0
+ test 0$_rc_status_ret -eq 0 || _rc_status=$_rc_status_ret
+ test 0$_rc_status -eq 0 || _rc_status_all=$_rc_status
return 0$_rc_status_ret
}
@@ -45,21 +45,20 @@
{
rc_check
_rc_status_ret=$_rc_status
- local i
- for i ; do
- case "$i" in
- -v|-v[1-9]|-v[1-9][0-9])
- case "$_rc_status" in
- 0) echo "Everything is Ok" ;; # success
- *) echo "Something went wrong" ;; # failed
- esac
+ if [ "$1" ]; then
+ case "$1" in
+ -v|-v[1-9]|-v[1-9][0-9])
+ case "$_rc_status" in
+ 0) echo "Everything is Ok" ;; # success
+ *) echo "Something went wrong" ;; # failed
+ esac
- # reset _rc_status to 0 after verbose case
- _rc_status=0 ;;
- -r) rc_reset ;;
- *) echo "rc_status: Usage: [-v[<num>] [-r]]" 1>&2 ; return 0 ;;
- esac
- done
+ # reset _rc_status to 0 after verbose case
+ _rc_status=0 ;;
+ -r) rc_reset ;;
+ *) echo "rc_status: Usage: [-v[<num>] [-r]]" 1>&2 ; return 0 ;;
+ esac
+ fi
return $_rc_status_ret
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package perl for openSUSE:Factory checked in at 2014-09-28 19:53:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl (Old)
and /work/SRC/openSUSE:Factory/.perl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl/perl.changes 2014-07-19 11:04:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl.new/perl.changes 2014-09-28 19:53:45.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Sep 17 14:22:41 CEST 2014 - mls(a)suse.de
+
+- update to perl-5.20.1
+ * some performance improvements and bug fixes
+ * utf8, version, File::Copy, Exporter and other modules
+ have been updated
+- fix infinite recursion in Data::Dumper [bnc#896715]
+ new patch: DataDumper-no-infinite-recursion.diff
+
+-------------------------------------------------------------------
Old:
----
perl-5.20.0.tar.bz2
New:
----
DataDumper-no-infinite-recursion.diff
perl-5.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl.spec ++++++
--- /var/tmp/diff_new_pack.js1kl8/_old 2014-09-28 19:53:47.000000000 +0200
+++ /var/tmp/diff_new_pack.js1kl8/_new 2014-09-28 19:53:47.000000000 +0200
@@ -21,9 +21,9 @@
Summary: The Perl interpreter
License: Artistic-1.0 or GPL-2.0+
Group: Development/Languages/Perl
-Version: 5.20.0
+Version: 5.20.1
Release: 0
-%define pversion 5.20.0
+%define pversion 5.20.1
Url: http://www.perl.org/
Source: http://www.cpan.org/src/5.0/perl-%{version}.tar.bz2
Source1: %name-rpmlintrc
@@ -39,6 +39,7 @@
Patch8: skip_time_hires.patch
Patch9: perl-incfix.diff
Patch11: perl-5.18.2-overflow.diff
+Patch12: DataDumper-no-infinite-recursion.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: perl-base = %version
#PreReq: %fillup_prereq
@@ -55,8 +56,9 @@
%endif
Provides: perl-500
Provides: perl(:MODULE_COMPAT_%pversion)
-#%%global versionlist 5.20.0
+%global versionlist 5.20.0
Provides: perl-Filter-Simple = 0.91
+Provides: perl(:MODULE_COMPAT_5.20.0)
Obsoletes: perl-Filter-Simple < 0.91
Provides: perl-I18N-LangTags = 0.40
Obsoletes: perl-I18N-LangTags < 0.40
@@ -94,16 +96,16 @@
Provides: perl-ExtUtils-ParseXS = 3.24
Obsoletes: perl-CPAN-Meta <= 2.140640
Obsoletes: perl-CPAN-Meta-YAML <= 0.012
-Obsoletes: perl-ExtUtils-CBuilder <= 0.280216
+Obsoletes: perl-ExtUtils-CBuilder <= 0.280217
Obsoletes: perl-ExtUtils-ParseXS < 3.24
Obsoletes: perl-IO-Socket-IP <= 0.29
Obsoletes: perl-Parse-CPAN-Meta <= 1.4414
-Obsoletes: perl-PathTools <= 3.47
+Obsoletes: perl-PathTools <= 3.48
Obsoletes: perl-autodie <= 2.23
Provides: perl-Test-Harness = 3.30
Obsoletes: perl-Test-Harness < 3.30
-Provides: perl-version = 0.9908
-Obsoletes: perl-version < 0.9908
+Provides: perl-version = 0.9909
+Obsoletes: perl-version < 0.9909
%description
perl - Practical Extraction and Report Language
@@ -172,6 +174,7 @@
%endif
%patch9
%patch11
+%patch12
%build
cp -a lib savelib
++++++ DataDumper-no-infinite-recursion.diff ++++++
--- ./MANIFEST.orig 2014-09-14 11:30:59.000000000 +0000
+++ ./MANIFEST 2014-09-17 12:33:11.840499982 +0000
@@ -2994,6 +2994,7 @@ dist/Data-Dumper/t/perl-74170.t Regressi
dist/Data-Dumper/t/purity_deepcopy_maxdepth.t See if three Data::Dumper functions work
dist/Data-Dumper/t/qr.t See if Data::Dumper works with qr|/|
dist/Data-Dumper/t/quotekeys.t See if Data::Dumper::Quotekeys works
+dist/Data-Dumper/t/recurse.t See if Data::Dumper::Maxrecurse works
dist/Data-Dumper/t/seen.t See if Data::Dumper::Seen works
dist/Data-Dumper/t/sortkeys.t See if Data::Dumper::Sortkeys works
dist/Data-Dumper/t/sparseseen.t See if Data::Dumper::Sparseseen works
--- ./dist/Data-Dumper/Dumper.pm.orig 2014-09-14 11:31:01.000000000 +0000
+++ ./dist/Data-Dumper/Dumper.pm 2014-09-17 12:33:11.840499982 +0000
@@ -56,6 +56,7 @@ $Useperl = 0 unless defined $
$Sortkeys = 0 unless defined $Sortkeys;
$Deparse = 0 unless defined $Deparse;
$Sparseseen = 0 unless defined $Sparseseen;
+$Maxrecurse = 1000 unless defined $Maxrecurse;
#
# expects an arrayref of values to be dumped.
@@ -92,6 +93,7 @@ sub new {
'bless' => $Bless, # keyword to use for "bless"
# expdepth => $Expdepth, # cutoff depth for explicit dumping
maxdepth => $Maxdepth, # depth beyond which we give up
+ maxrecurse => $Maxrecurse, # depth beyond which we abort
useperl => $Useperl, # use the pure Perl implementation
sortkeys => $Sortkeys, # flag or filter for sorting hash keys
deparse => $Deparse, # use B::Deparse for coderefs
@@ -350,6 +352,12 @@ sub _dump {
return qq['$val'];
}
+ # avoid recursing infinitely [perl #122111]
+ if ($s->{maxrecurse} > 0
+ and $s->{level} >= $s->{maxrecurse}) {
+ die "Recursion limit of $s->{maxrecurse} exceeded";
+ }
+
# we have a blessed ref
my ($blesspad);
if ($realpack and !$no_bless) {
@@ -680,6 +688,11 @@ sub Maxdepth {
defined($v) ? (($s->{'maxdepth'} = $v), return $s) : $s->{'maxdepth'};
}
+sub Maxrecurse {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{'maxrecurse'} = $v), return $s) : $s->{'maxrecurse'};
+}
+
sub Useperl {
my($s, $v) = @_;
defined($v) ? (($s->{'useperl'} = $v), return $s) : $s->{'useperl'};
@@ -1105,6 +1118,16 @@ no maximum depth.
=item *
+$Data::Dumper::Maxrecurse I<or> $I<OBJ>->Maxrecurse(I<[NEWVAL]>)
+
+Can be set to a positive integer that specifies the depth beyond which
+recursion into a structure will throw an exception. This is intended
+as a security measure to prevent perl running out of stack space when
+dumping an excessively deep structure. Can be set to 0 to remove the
+limit. Default is 1000.
+
+=item *
+
$Data::Dumper::Useperl I<or> $I<OBJ>->Useperl(I<[NEWVAL]>)
Can be set to a boolean value which controls whether the pure Perl
--- ./dist/Data-Dumper/Dumper.xs.orig 2014-09-14 11:31:01.000000000 +0000
+++ ./dist/Data-Dumper/Dumper.xs 2014-09-17 12:34:36.236138989 +0000
@@ -28,7 +28,7 @@ static I32 DD_dump (pTHX_ SV *val, const
SV *pad, SV *xpad, SV *apad, SV *sep, SV *pair,
SV *freezer, SV *toaster,
I32 purity, I32 deepcopy, I32 quotekeys, SV *bless,
- I32 maxdepth, SV *sortkeys, int use_sparse_seen_hash, I32 useqq);
+ I32 maxdepth, SV *sortkeys, int use_sparse_seen_hash, I32 useqq, IV maxrecurse);
#ifndef HvNAME_get
#define HvNAME_get HvNAME
@@ -412,7 +412,7 @@ DD_dump(pTHX_ SV *val, const char *name,
AV *postav, I32 *levelp, I32 indent, SV *pad, SV *xpad,
SV *apad, SV *sep, SV *pair, SV *freezer, SV *toaster, I32 purity,
I32 deepcopy, I32 quotekeys, SV *bless, I32 maxdepth, SV *sortkeys,
- int use_sparse_seen_hash, I32 useqq)
+ int use_sparse_seen_hash, I32 useqq, IV maxrecurse)
{
char tmpbuf[128];
Size_t i;
@@ -589,6 +589,10 @@ DD_dump(pTHX_ SV *val, const char *name,
return 1;
}
+ if (maxrecurse > 0 && *levelp >= maxrecurse) {
+ croak("Recursion limit of %" IVdf " exceeded", maxrecurse);
+ }
+
if (realpack && !no_bless) { /* we have a blessed ref */
STRLEN blesslen;
const char * const blessstr = SvPV(bless, blesslen);
@@ -674,7 +678,8 @@ DD_dump(pTHX_ SV *val, const char *name,
DD_dump(aTHX_ ival, SvPVX_const(namesv), SvCUR(namesv), retval, seenhv,
postav, levelp, indent, pad, xpad, apad, sep, pair,
freezer, toaster, purity, deepcopy, quotekeys, bless,
- maxdepth, sortkeys, use_sparse_seen_hash, useqq);
+ maxdepth, sortkeys, use_sparse_seen_hash, useqq,
+ maxrecurse);
sv_catpvn(retval, ")}", 2);
} /* plain */
else {
@@ -682,7 +687,8 @@ DD_dump(pTHX_ SV *val, const char *name,
DD_dump(aTHX_ ival, SvPVX_const(namesv), SvCUR(namesv), retval, seenhv,
postav, levelp, indent, pad, xpad, apad, sep, pair,
freezer, toaster, purity, deepcopy, quotekeys, bless,
- maxdepth, sortkeys, use_sparse_seen_hash, useqq);
+ maxdepth, sortkeys, use_sparse_seen_hash, useqq,
+ maxrecurse);
}
SvREFCNT_dec(namesv);
}
@@ -694,7 +700,8 @@ DD_dump(pTHX_ SV *val, const char *name,
DD_dump(aTHX_ ival, SvPVX_const(namesv), SvCUR(namesv), retval, seenhv,
postav, levelp, indent, pad, xpad, apad, sep, pair,
freezer, toaster, purity, deepcopy, quotekeys, bless,
- maxdepth, sortkeys, use_sparse_seen_hash, useqq);
+ maxdepth, sortkeys, use_sparse_seen_hash, useqq,
+ maxrecurse);
SvREFCNT_dec(namesv);
}
else if (realtype == SVt_PVAV) {
@@ -767,7 +774,8 @@ DD_dump(pTHX_ SV *val, const char *name,
DD_dump(aTHX_ elem, iname, ilen, retval, seenhv, postav,
levelp, indent, pad, xpad, apad, sep, pair,
freezer, toaster, purity, deepcopy, quotekeys, bless,
- maxdepth, sortkeys, use_sparse_seen_hash, useqq);
+ maxdepth, sortkeys, use_sparse_seen_hash,
+ useqq, maxrecurse);
if (ix < ixmax)
sv_catpvn(retval, ",", 1);
}
@@ -970,7 +978,8 @@ DD_dump(pTHX_ SV *val, const char *name,
DD_dump(aTHX_ hval, SvPVX_const(sname), SvCUR(sname), retval, seenhv,
postav, levelp, indent, pad, xpad, newapad, sep, pair,
freezer, toaster, purity, deepcopy, quotekeys, bless,
- maxdepth, sortkeys, use_sparse_seen_hash, useqq);
+ maxdepth, sortkeys, use_sparse_seen_hash, useqq,
+ maxrecurse);
SvREFCNT_dec(sname);
Safefree(nkey_buffer);
if (indent >= 2)
@@ -1179,7 +1188,8 @@ DD_dump(pTHX_ SV *val, const char *name,
seenhv, postav, &nlevel, indent, pad, xpad,
newapad, sep, pair, freezer, toaster, purity,
deepcopy, quotekeys, bless, maxdepth,
- sortkeys, use_sparse_seen_hash, useqq);
+ sortkeys, use_sparse_seen_hash, useqq,
+ maxrecurse);
SvREFCNT_dec(e);
}
}
@@ -1269,6 +1279,7 @@ Data_Dumper_Dumpxs(href, ...)
SV *val, *name, *pad, *xpad, *apad, *sep, *pair, *varname;
SV *freezer, *toaster, *bless, *sortkeys;
I32 purity, deepcopy, quotekeys, maxdepth = 0;
+ IV maxrecurse = 1000;
char tmpbuf[1024];
I32 gimme = GIMME;
int use_sparse_seen_hash = 0;
@@ -1355,6 +1366,8 @@ Data_Dumper_Dumpxs(href, ...)
bless = *svp;
if ((svp = hv_fetch(hv, "maxdepth", 8, FALSE)))
maxdepth = SvIV(*svp);
+ if ((svp = hv_fetch(hv, "maxrecurse", 10, FALSE)))
+ maxrecurse = SvIV(*svp);
if ((svp = hv_fetch(hv, "sortkeys", 8, FALSE))) {
sortkeys = *svp;
if (! SvTRUE(sortkeys))
@@ -1434,7 +1447,8 @@ Data_Dumper_Dumpxs(href, ...)
DD_dump(aTHX_ val, SvPVX_const(name), SvCUR(name), valstr, seenhv,
postav, &level, indent, pad, xpad, newapad, sep, pair,
freezer, toaster, purity, deepcopy, quotekeys,
- bless, maxdepth, sortkeys, use_sparse_seen_hash, useqq);
+ bless, maxdepth, sortkeys, use_sparse_seen_hash,
+ useqq, maxrecurse);
SPAGAIN;
if (indent >= 2 && !terse)
--- ./dist/Data-Dumper/t/recurse.t.orig 2014-09-17 12:33:11.841499978 +0000
+++ ./dist/Data-Dumper/t/recurse.t 2014-09-17 12:33:11.841499978 +0000
@@ -0,0 +1,45 @@
+#!perl
+
+# Test the Maxrecurse option
+
+use strict;
+use Test::More tests => 32;
+use Data::Dumper;
+
+SKIP: {
+ skip "no XS available", 16
+ if $Data::Dumper::Useperl;
+ local $Data::Dumper::Useperl = 1;
+ test_recursion();
+}
+
+test_recursion();
+
+sub test_recursion {
+ my $pp = $Data::Dumper::Useperl ? "pure perl" : "XS";
+ $Data::Dumper::Purity = 1; # make sure this has no effect
+ $Data::Dumper::Indent = 0;
+ $Data::Dumper::Maxrecurse = 1;
+ is(eval { Dumper([]) }, '$VAR1 = [];', "$pp: maxrecurse 1, []");
+ is(eval { Dumper([[]]) }, undef, "$pp: maxrecurse 1, [[]]");
+ ok($@, "exception thrown");
+ is(eval { Dumper({}) }, '$VAR1 = {};', "$pp: maxrecurse 1, {}");
+ is(eval { Dumper({ a => 1 }) }, q($VAR1 = {'a' => 1};),
+ "$pp: maxrecurse 1, { a => 1 }");
+ is(eval { Dumper({ a => {} }) }, undef, "$pp: maxrecurse 1, { a => {} }");
+ ok($@, "exception thrown");
+ is(eval { Dumper(\1) }, "\$VAR1 = \\1;", "$pp: maxrecurse 1, \\1");
+ is(eval { Dumper(\\1) }, undef, "$pp: maxrecurse 1, \\1");
+ ok($@, "exception thrown");
+ $Data::Dumper::Maxrecurse = 3;
+ is(eval { Dumper(\1) }, "\$VAR1 = \\1;", "$pp: maxrecurse 3, \\1");
+ is(eval { Dumper(\(my $s = {})) }, "\$VAR1 = \\{};", "$pp: maxrecurse 3, \\{}");
+ is(eval { Dumper(\(my $s = { a => [] })) }, "\$VAR1 = \\{'a' => []};",
+ "$pp: maxrecurse 3, \\{ a => [] }");
+ is(eval { Dumper(\(my $s = { a => [{}] })) }, undef,
+ "$pp: maxrecurse 3, \\{ a => [{}] }");
+ ok($@, "exception thrown");
+ $Data::Dumper::Maxrecurse = 0;
+ is(eval { Dumper([[[[[]]]]]) }, q($VAR1 = [[[[[]]]]];),
+ "$pp: check Maxrecurse doesn't set limit to 0 recursion");
+}
++++++ perl-5.20.0.tar.bz2 -> perl-5.20.1.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/perl/perl-5.20.0.tar.bz2 /work/SRC/openSUSE:Factory/.perl.new/perl-5.20.1.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
Hello community,
here is the log from the commit of package coreutils for openSUSE:Factory checked in at 2014-09-28 19:53:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/coreutils (Old)
and /work/SRC/openSUSE:Factory/.coreutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coreutils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/coreutils/coreutils-testsuite.changes 2014-08-03 15:35:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.coreutils.new/coreutils-testsuite.changes 2014-09-28 19:53:43.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 18 18:04:37 CEST 2014 - pth(a)suse.de
+
+- Add coreutils-fix_false_du_failure_on_newer_xfs.patch that fixes a false
+ negative in the testsuite.
+- Add coreutils-disable_tests.patch to not run a tests that fail inside the OBS.
+- Add coreutils-test_without_valgrind.patch to not use valgrind in shuf-reservoir.
+
+-------------------------------------------------------------------
coreutils.changes: same change
New:
----
coreutils-disable_tests.patch
coreutils-fix_false_du_failure_on_newer_xfs.patch
coreutils-test_without_valgrind.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ coreutils-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.e4fupl/_old 2014-09-28 19:53:44.000000000 +0200
+++ /var/tmp/diff_new_pack.e4fupl/_new 2014-09-28 19:53:44.000000000 +0200
@@ -125,6 +125,11 @@
# Fixes a regression in chroot which did not chdir("/") in all cases.
Patch401: coreutils-chroot-perform-chdir-unless-skip-chdir.patch
+Patch416: coreutils-fix_false_du_failure_on_newer_xfs.patch
+
+Patch500: coreutils-disable_tests.patch
+Patch501: coreutils-test_without_valgrind.patch
+
# ================================================
%description
These are the GNU core utilities. This package is the union of
@@ -164,6 +169,9 @@
%patch303
%patch400
%patch401
+%patch416 -p1
+%patch500
+%patch501
#???## We need to statically link to gmp, otherwise we have a build loop
#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in
++++++ coreutils.spec ++++++
--- /var/tmp/diff_new_pack.e4fupl/_old 2014-09-28 19:53:44.000000000 +0200
+++ /var/tmp/diff_new_pack.e4fupl/_new 2014-09-28 19:53:44.000000000 +0200
@@ -125,6 +125,11 @@
# Fixes a regression in chroot which did not chdir("/") in all cases.
Patch401: coreutils-chroot-perform-chdir-unless-skip-chdir.patch
+Patch416: coreutils-fix_false_du_failure_on_newer_xfs.patch
+
+Patch500: coreutils-disable_tests.patch
+Patch501: coreutils-test_without_valgrind.patch
+
# ================================================
%description
These are the GNU core utilities. This package is the union of
@@ -164,6 +169,9 @@
%patch303
%patch400
%patch401
+%patch416 -p1
+%patch500
+%patch501
#???## We need to statically link to gmp, otherwise we have a build loop
#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in
++++++ coreutils-disable_tests.patch ++++++
---
gnulib-tests/gnulib.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: gnulib-tests/gnulib.mk
===================================================================
--- gnulib-tests/gnulib.mk.orig 2014-09-18 18:39:37.692580154 +0200
+++ gnulib-tests/gnulib.mk 2014-09-18 18:40:13.905127435 +0200
@@ -877,11 +877,11 @@ EXTRA_DIST += test-getloadavg.c signatur
## end gnulib module getloadavg-tests
## begin gnulib module getlogin-tests
-
-TESTS += test-getlogin
-check_PROGRAMS += test-getlogin
-EXTRA_DIST += test-getlogin.c signature.h macros.h
-
+#
+#TESTS += test-getlogin
+#check_PROGRAMS += test-getlogin
+#EXTRA_DIST += test-getlogin.c signature.h macros.h
+#
## end gnulib module getlogin-tests
## begin gnulib module getndelim2-tests
++++++ coreutils-fix_false_du_failure_on_newer_xfs.patch ++++++
>From coreutils-bounces+pth=suse.de(a)gnu.org Tue Sep 16 00:19:14 2014
Return-Path: <coreutils-bounces+pth=suse.de(a)gnu.org>
X-Original-To: pth(a)wotan.suse.de
Received: from relay1.suse.de (relay1.suse.de [149.44.160.133])
by wotan.suse.de (Postfix) with ESMTP id 9E7716283
for <pth(a)wotan.suse.de>; Tue, 16 Sep 2014 00:19:14 +0200 (CEST)
Received: by relay1.suse.de (Postfix)
id 9723D28DD; Tue, 16 Sep 2014 00:19:14 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
by relay1.suse.de (Postfix) with ESMTP id 91A4228D9
for <pth(a)suse.de>; Tue, 16 Sep 2014 00:19:14 +0200 (CEST)
X-Virus-Scanned: by amavisd-new at localhost
X-Spam-Flag: NO
X-Spam-Score: -5.868
X-Spam-Level:
X-Spam-Status: No, score=-5.868 tagged_above=-9999 required=5
tests=[BAYES_50=0.8, IS_MAILMAN_LIST=-1, RCVD_IN_DNSWL_HI=-5,
RP_MATCHES_RCVD=-0.668] autolearn=disabled
Received: from relay1.suse.de ([127.0.0.1])
by localhost (localhost [127.0.0.1]) (amavisd-new, port 10026)
with ESMTP id ChE53gAm38xF for <pth(a)suse.de>;
Tue, 16 Sep 2014 00:19:14 +0200 (CEST)
Received: from mx1.suse.de (cantor1.suse.de [195.135.220.2])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by relay1.suse.de (Postfix) with ESMTPS id 3DFCE2030
for <pth(a)suse.de>; Tue, 16 Sep 2014 00:19:14 +0200 (CEST)
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17])
(using TLSv1 with cipher AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.suse.de (Postfix) with ESMTPS id 14E56AAC5
for <pth(a)suse.de>; Tue, 16 Sep 2014 00:19:14 +0200 (CEST)
Received: from localhost ([::1]:34619 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <coreutils-bounces+pth=suse.de(a)gnu.org>)
id 1XTec5-00066K-6z
for pth(a)suse.de; Mon, 15 Sep 2014 18:19:13 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44002)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <mail(a)bernhard-voelker.de>) id 1XTebt-0005zb-Ea
for coreutils(a)gnu.org; Mon, 15 Sep 2014 18:19:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <mail(a)bernhard-voelker.de>) id 1XTebh-0006mb-A2
for coreutils(a)gnu.org; Mon, 15 Sep 2014 18:19:01 -0400
Received: from mout.kundenserver.de ([212.227.126.130]:61454)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from <mail(a)bernhard-voelker.de>) id 1XTebh-0006m4-1Y
for coreutils(a)gnu.org; Mon, 15 Sep 2014 18:18:49 -0400
Received: from blackice.site (pD957CBB4.dip0.t-ipconnect.de [217.87.203.180])
by mrelayeu.kundenserver.de (node=mreue007) with ESMTP (Nemesis)
id 0MY0P5-1Xnddz1jeR-00WkzE; Tue, 16 Sep 2014 00:18:44 +0200
From: Bernhard Voelker <mail(a)bernhard-voelker.de>
To: coreutils(a)gnu.org
Subject: [PATCH] tests: fix false du failure on newer XFS
Date: Tue, 16 Sep 2014 00:17:43 +0200
Message-Id: <1410819463-5423-1-git-send-email-mail(a)bernhard-voelker.de>
X-Mailer: git-send-email 1.8.4.5
X-Provags-ID: V02:K0:qhDLt5+dLDL9ZojGDjR2JCZUT99RsLhoiyP2U0vHUVe
6sFe6AEQdVdEBTcxwG3rxuMC20RiygA6M3jqShv8YrHI8aMVAd
eE8xJ/hJz3vHhN5RsbqbiGh6bGodZh6z/8pEPo4nIZfvFj5/Oy
IXHy4YysR6g0Ci11Fcpx0MH2q50tuGRgVct132icfAEbWFZM7o
//TkmA8XFocuHSW4d1dv6YXnnf1OA1QDsTHrc7TrX3NwqGqTzl
qIUlhT4OBcqPtunpPR5ty3yLNFY61T33c0Y4tB0LRpDgS7bbE7
Gk8SkMUBH447xJjIFByTt+DQk+mgpo1h1Eo2vUlIFXzNzZrdaV
BcRVj5v4GBKK1/e2y3rVH4VUBgbCZiJhb9TsicXKVwkF+Xejjb
mCtjMo7wyvEjtHeCr0aBNLE18yA2j8FEEI=
X-UI-Out-Filterresults: notjunk:1;
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic]
X-Received-From: 212.227.126.130
Cc: Bernhard Voelker <mail(a)bernhard-voelker.de>
X-BeenThere: coreutils(a)gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: GNU coreutils General Discussion <coreutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/coreutils>,
<mailto:coreutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/coreutils>
List-Post: <mailto:coreutils@gnu.org>
List-Help: <mailto:coreutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/coreutils>,
<mailto:coreutils-request@gnu.org?subject=subscribe>
Errors-To: coreutils-bounces+pth=suse.de(a)gnu.org
Sender: coreutils-bounces+pth=suse.de(a)gnu.org
Status: RO
Content-Length: 1239
Lines: 40
* tests/du/2g.sh: Similar to the fix for a dd test (see commit
v8.22-65-g7c03fe2), avoid speculative preallocation by creating
the 'big' file in one go instead of appending to it in the loop.
Remove debugging statements as the output with 'set -x' is
sufficient nowadays.
---
tests/du/2g.sh | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
Index: coreutils-8.22/tests/du/2g.sh
===================================================================
--- coreutils-8.22.orig/tests/du/2g.sh 2013-12-04 15:48:30.000000000 +0100
+++ coreutils-8.22/tests/du/2g.sh 2014-09-16 14:00:30.718944253 +0200
@@ -46,15 +46,14 @@ test $min_kb -lt $free_kb ||
big=big
rm -f $big
-test -t 1 || printf 'creating a 2GB file...\n'
-for i in $(seq 100); do
- # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration.
- printf %21474836s x >> $big || fail=1
- # On the final iteration, append the remaining 48 bytes.
- test $i = 100 && { printf %48s x >> $big || fail=1; }
- test -t 1 && printf 'creating a 2GB file: %d%% complete\r' $i
-done
-echo
+{
+ for i in $(seq 100); do
+ # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration.
+ printf %21474836s x || fail=1
+ done
+ # After the final iteration, append the remaining 48 bytes.
+ printf %48s x || fail=1
+} > $big || fail=1
du -k $big > out1 || fail=1
rm -f $big
++++++ coreutils-test_without_valgrind.patch ++++++
---
tests/misc/shuf-reservoir.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: tests/misc/shuf-reservoir.sh
===================================================================
--- tests/misc/shuf-reservoir.sh.orig 2013-12-09 14:40:46.000000000 +0100
+++ tests/misc/shuf-reservoir.sh 2014-09-18 18:30:07.752705383 +0200
@@ -37,8 +37,7 @@ run_shuf_n()
# Critical memory-related bugs will cause a segfault here
# (with varying numbers of input/output lines)
- seq "$INPUT_LINES" | valgrind --leak-check=$leaklevel --error-exitcode=1 \
- shuf -n "$OUTPUT_LINES" -o "out_${INPUT_LINES}_${OUTPUT_LINES}" || return 1
+ seq "$INPUT_LINES" | shuf -n "$OUTPUT_LINES" -o "out_${INPUT_LINES}_${OUTPUT_LINES}" || return 1
EXPECTED_LINES="$OUTPUT_LINES"
test "$INPUT_LINES" -lt "$OUTPUT_LINES" && EXPECTED_LINES="$INPUT_LINES"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in at 2014-09-28 19:53:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Changes:
--------
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2014-09-15 17:39:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-09-28 19:53:37.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Sep 18 13:40:43 CEST 2014 - mls(a)suse.de
+
+- update to rpm-4.12.0.1
+ * fixes archivesize being off a couple of bytes
+
+-------------------------------------------------------------------
+Tue Sep 16 13:55:09 CEST 2014 - mls(a)suse.de
+
+- update to rpm-4.12.0
+ * weakdeps support is now upstream
+ * new optional payload format to support files > 4GB
+ * lots of cleanups all over the codebase
+- dropped patches:
+ autodeps.diff, psm-errno.diff, exportoldtags.diff, pythondeps.diff,
+ newweakdeps.diff, findsupplements.diff, rpm-gst-provides.patch,
+ noposttrans.diff, fontprovides.diff
+
+-------------------------------------------------------------------
Old:
----
autodeps.diff
exportoldtags.diff
findsupplements.diff
fontprovides.diff
newweakdeps.diff
noposttrans.diff
psm-errno.diff
pythondeps.diff
rpm-4.11.3.tar.bz2
rpm-gst-provides.patch
New:
----
rpm-4.12.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-rpm.spec ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.000000000 +0200
@@ -17,7 +17,7 @@
Name: python3-rpm
-Version: 4.11.3
+Version: 4.12.0.1
Release: 0
Summary: Python Bindings for Manipulating RPM Packages
License: GPL-2.0+
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.000000000 +0200
@@ -17,7 +17,7 @@
Name: rpm-python
-Version: 4.11.3
+Version: 4.12.0.1
Release: 0
#!BuildIgnore: rpmlint-Factory
Summary: Python Bindings for Manipulating RPM Packages
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.000000000 +0200
@@ -47,9 +47,9 @@
Summary: The RPM Package Manager
License: GPL-2.0+
Group: System/Packages
-Version: 4.11.3
+Version: 4.12.0.1
Release: 0
-Source: http://rpm.org/releases/rpm-4.11.x/rpm-%{version}.tar.bz2
+Source: http://rpm.org/releases/rpm-4.12.x/rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source4: rpm-suse_macros
Source5: rpmsort
@@ -62,7 +62,6 @@
Patch1: beecrypt-4.1.2.diff
Patch2: db.diff
# quilt patches start here
-Patch10: newweakdeps.diff
Patch11: debugedit.diff
Patch13: ignore-auxv.diff
Patch12: localetag.diff
@@ -74,7 +73,6 @@
Patch19: rpmrctests.diff
Patch20: waitlock.diff
Patch21: suspendlock.diff
-Patch23: autodeps.diff
Patch24: brp.diff
Patch25: brpcompress.diff
Patch26: checkfilesnoinfodir.diff
@@ -112,9 +110,6 @@
Patch59: repackage-nomd5.diff
Patch60: safeugid.diff
Patch61: noprereqdeprec.diff
-Patch62: pythondeps.diff
-Patch63: fontprovides.diff
-Patch64: rpm-gst-provides.patch
Patch65: initscriptsprov.diff
Patch66: remove-translations.diff
Patch67: headeradddb.diff
@@ -122,7 +117,6 @@
Patch69: nobuildcolor.diff
Patch70: fileattrs.diff
Patch71: nomagiccheck.diff
-Patch72: findsupplements.diff
Patch73: assumeexec.diff
Patch74: mono-find-requires.diff
Patch75: rpm-deptracking.patch
@@ -130,13 +124,10 @@
Patch77: langnoc.diff
Patch78: headerchk2.diff
Patch79: helperenv.diff
-Patch80: psm-errno.diff
-Patch82: noposttrans.diff
Patch85: brp-compress-no-img.patch
Patch92: find-lang-python.patch
Patch93: weakdepscompat.diff
Patch94: checksepwarn.diff
-Patch95: exportoldtags.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -216,15 +207,15 @@
chmod -R u+w db/*
rm -f rpmdb/db.h
%patch -P 1 -P 2
-%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
-%patch -P 20 -P 21 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
+%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
+%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
%patch -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
%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 82 -P 85
-%patch -P 92 -P 93 -P 94 -P 95
+%patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69
+%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
+%patch -P 85
+%patch -P 92 -P 93 -P 94
%ifarch aarch64 ppc64le
%patch6464
@@ -271,6 +262,7 @@
--libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \
--with-vendor=suse \
--with-rundir=/run \
+--without-archive \
--with-selinux --with-internal-beecrypt \
--with-acl --with-cap --enable-shared %{?with_python: --enable-python} $BUILDTARGET
++++++ assumeexec.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.000000000 +0200
@@ -1,26 +1,26 @@
---- tools/elfdeps.c.orig 2013-01-30 15:33:12.000000000 +0000
-+++ tools/elfdeps.c 2013-07-12 12:21:47.000000000 +0000
-@@ -15,6 +15,7 @@
- int filter_private = 0;
- int soname_only = 0;
+--- ./tools/elfdeps.c.orig 2014-06-26 06:51:55.768815677 +0000
++++ ./tools/elfdeps.c 2014-08-04 13:02:16.981081591 +0000
+@@ -17,6 +17,7 @@ int soname_only = 0;
int fake_soname = 1;
+ int filter_soname = 1;
+ int require_interp = 0;
+int assume_exec = 0;
typedef struct elfInfo_s {
Elf *elf;
-@@ -235,7 +236,7 @@ static int processFile(const char *fn, i
+@@ -299,7 +300,7 @@ static int processFile(const char *fn, i
if (ehdr->e_type == ET_DYN || ehdr->e_type == ET_EXEC) {
ei->marker = mkmarker(ehdr);
ei->isDSO = (ehdr->e_type == ET_DYN);
- ei->isExec = (st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH));
+ ei->isExec = assume_exec || (st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH));
+ processProgHeaders(ei, ehdr);
processSections(ei);
- }
-@@ -292,6 +293,7 @@ int main(int argc, char *argv[])
- { "filter-private", 0, POPT_ARG_VAL, &filter_private, -1, NULL, NULL },
- { "soname-only", 0, POPT_ARG_VAL, &soname_only, -1, NULL, NULL },
+@@ -364,6 +365,7 @@ int main(int argc, char *argv[])
{ "no-fake-soname", 0, POPT_ARG_VAL, &fake_soname, 0, NULL, NULL },
+ { "no-filter-soname", 0, POPT_ARG_VAL, &filter_soname, 0, NULL, NULL },
+ { "require-interp", 0, POPT_ARG_VAL, &require_interp, -1, NULL, NULL },
+ { "assume-exec", 0, POPT_ARG_VAL, &assume_exec, -1, NULL, NULL },
POPT_AUTOHELP
POPT_TABLEEND
++++++ brp.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.000000000 +0200
@@ -1,6 +1,6 @@
---- ./scripts/Makefile.am.orig 2014-09-05 11:48:54.000000000 +0000
-+++ ./scripts/Makefile.am 2014-09-08 16:42:03.387071432 +0000
-@@ -26,6 +26,7 @@ rpmconfig_SCRIPTS = \
+--- ./scripts/Makefile.am.orig 2014-06-26 06:51:55.444816562 +0000
++++ ./scripts/Makefile.am 2014-08-04 12:33:14.213715432 +0000
+@@ -27,6 +27,7 @@ rpmconfig_SCRIPTS = \
appdata.prov \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
brp-strip brp-strip-comment-note brp-python-hardlink \
@@ -8,8 +8,8 @@
brp-strip-shared brp-strip-static-archive \
check-files check-prereqs \
check-buildroot check-rpaths check-rpaths-worker \
---- ./scripts/brp-strip-comment-note.orig 2012-11-07 12:55:24.000000000 +0000
-+++ ./scripts/brp-strip-comment-note 2014-09-08 16:42:03.387071432 +0000
+--- ./scripts/brp-strip-comment-note.orig 2014-06-26 06:51:55.455816533 +0000
++++ ./scripts/brp-strip-comment-note 2014-08-04 12:33:14.214715437 +0000
@@ -16,6 +16,8 @@ esac
# for already stripped elf files in the build root
for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
@@ -19,8 +19,8 @@
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do
note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
---- ./scripts/brp-strip.orig 2012-11-07 12:55:24.000000000 +0000
-+++ ./scripts/brp-strip 2014-09-08 16:42:03.388071423 +0000
+--- ./scripts/brp-strip.orig 2014-06-26 06:51:55.455816533 +0000
++++ ./scripts/brp-strip 2014-08-04 12:33:14.214715437 +0000
@@ -15,6 +15,7 @@ esac
for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
@@ -29,8 +29,8 @@
sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
$STRIP -g "$f" || :
done
---- ./scripts/brp-suse.orig 2014-09-08 16:42:03.388071423 +0000
-+++ ./scripts/brp-suse 2014-09-08 16:42:03.388071423 +0000
+--- ./scripts/brp-suse.orig 2014-08-04 12:33:14.214715437 +0000
++++ ./scripts/brp-suse 2014-08-04 12:33:14.214715437 +0000
@@ -0,0 +1,13 @@
+#! /bin/sh
+
++++++ buildidprov.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.000000000 +0200
@@ -9,30 +9,6 @@
zypper install -C "debuginfo(build-id) = c63cb23876c5fa85f36beaff58f8557e1bf22517"
---- ./autodeps/linux.prov.orig 2011-05-11 15:58:28.000000000 +0000
-+++ ./autodeps/linux.prov 2011-05-11 15:59:31.000000000 +0000
-@@ -5,6 +5,9 @@
- IFS=$'\n'
- filelist=($(cat))
-
-+debuginfolist=($(printf "%s\n" "${filelist[@]}" | grep "/usr/lib/debug/"))
-+filelist=($(printf "%s\n" "${filelist[@]}" | grep -v "/usr/lib/debug/"))
-+
- solist=($(printf "%s\n" "${filelist[@]}" | grep "\\.so" | grep -v "^/lib/ld.so" | \
- tr '\n' '\0' | xargs -0 -r file -L | grep "ELF.*shared object" | \
- cut -d: -f1))
-@@ -71,6 +74,11 @@ done | sort -u
- printf "%s\n" "${firmwarelist[@]}" | /usr/lib/rpm/firmware.prov | sort -u
-
- #
-+# --- debuginfo files
-+[ -x /usr/lib/rpm/debuginfo.prov -a -n "$debuginfolist" ] &&
-+ printf "%s\n" "${debuginfolist[@]}" | /usr/lib/rpm/debuginfo.prov | sort -u
-+
-+#
- # --- Mono exes/dlls
- : ${MONO_PREFIX=/usr}
- if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then
--- ./macros.in.orig 2011-05-11 15:59:08.000000000 +0000
+++ ./macros.in 2011-05-11 15:59:31.000000000 +0000
@@ -182,7 +182,8 @@
++++++ debugsubpkg.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.000000000 +0200
@@ -1,7 +1,7 @@
Create a debuginfo package for each subpackage.
---- ./build/files.c.orig 2014-08-18 12:37:19.151934240 +0000
-+++ ./build/files.c 2014-08-18 12:48:48.106395561 +0000
+--- ./build/files.c.orig 2014-06-30 08:47:13.928503700 +0000
++++ ./build/files.c 2014-09-17 11:03:25.001860575 +0000
@@ -21,6 +21,10 @@
#include <rpm/rpmlog.h>
#include <rpm/rpmbase64.h>
@@ -12,8 +12,8 @@
+
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
#include "misc/fts.h"
- #include "lib/cpio.h"
-@@ -2084,13 +2088,241 @@ exit:
+ #include "lib/rpmfi_internal.h" /* XXX fi->apath */
+@@ -2031,13 +2035,238 @@ exit:
return rc;
}
@@ -145,10 +145,10 @@
+
+ elf_version(EV_CURRENT);
+ a = headerGetString(pkg->header, RPMTAG_ARCH);
-+ if (strcmp(a, "noarch") != 0 && strcmp(a, "src") != 0 && strcmp(a, "nosrc") != 0)
++ if (strcmp(a, "noarch") != 0)
+ {
+ Package dbg;
-+ rpmfi fi = pkg->cpioList;
++ rpmfi fi = rpmfilesIter(pkg->cpioList, RPMFI_ITER_FWD);
+ char tmp[1024];
+ const char *name;
+ ARGV_t files = NULL;
@@ -156,23 +156,20 @@
+
+ /* Check if the current package has files with debug info
+ and record them. */
-+ fi = rpmfiInit (fi, 0);
-+ while (rpmfiNext (fi) >= 0)
++ fi = rpmfiInit(fi, 0);
++ while (rpmfiNext(fi) >= 0)
+ {
-+ const char *base;
+ int i;
-+ unsigned char *build_id;
++ unsigned char *build_id = NULL;
+ size_t build_id_size = 0;
+ struct stat sbuf;
+
-+ name = rpmfiFN (fi);
-+ /* Skip leading buildroot. */
-+ base = name + strlen (buildroot);
++ name = rpmfiFN(fi);
+ /* Pre-pend %buildroot/usr/lib/debug and append .debug. */
-+ snprintf (tmp, 1024, "%s/usr/lib/debug%s.debug",
-+ buildroot, base);
++ snprintf(tmp, 1024, "%s/usr/lib/debug%s.debug",
++ buildroot, name);
+ /* If that file exists we have debug information for it. */
-+ if (access (tmp, F_OK) != 0)
++ if (access(tmp, F_OK) != 0)
+ continue;
+
+ /* Append the file list preamble. */
@@ -182,17 +179,17 @@
+ argvAdd(&files, "%dir /usr/lib/debug");
+ }
+ /* Add the files main debug-info file. */
-+ snprintf (tmp, 1024, "/usr/lib/debug/%s.debug", base);
++ snprintf(tmp, 1024, "/usr/lib/debug/%s.debug", name);
+ argvAdd(&files, tmp);
+
++ snprintf(tmp, 1024, "%s%s", buildroot, name);
+ /* Do not bother to check build-ids for symbolic links.
+ We'll handle them for the link target. */
-+ if (lstat (name, &sbuf) == -1
-+ || S_ISLNK (sbuf.st_mode))
++ if (lstat(tmp, &sbuf) == -1 || S_ISLNK(sbuf.st_mode))
+ continue;
+
+ /* Try to gather the build-id from the binary. */
-+ if (getELFBuildId (name, &build_id, &build_id_size) == -1)
++ if (getELFBuildId(tmp, &build_id, &build_id_size) == -1)
+ continue;
+
+ /* If we see build-id links for the first time add the
@@ -202,15 +199,15 @@
+
+ /* From the build-id construct the two links pointing back
+ to the debug information file and the binary. */
-+ snprintf (tmp, 1024, "/usr/lib/debug/.build-id/%02x/",
++ snprintf(tmp, 1024, "/usr/lib/debug/.build-id/%02x/",
+ build_id[0]);
+ for (i = 1; i < build_id_size; ++i)
-+ sprintf (tmp + strlen (tmp), "%02x", build_id[i]);
++ sprintf(tmp + strlen(tmp), "%02x", build_id[i]);
+ argvAdd(&files, tmp);
-+ sprintf (tmp + strlen (tmp), ".debug");
++ sprintf(tmp + strlen(tmp), ".debug");
+ argvAdd(&files, tmp);
+
-+ free (build_id);
++ free(build_id);
+ }
+
+ /* If there are debuginfo files for this package add a
@@ -218,19 +215,19 @@
+ if (files)
+ {
+ dbg = newPackage(NULL, spec->pool, &spec->packages);
-+ headerNVR (pkg->header, &name, NULL, NULL);
++ headerNVR(pkg->header, &name, NULL, NULL);
+ /* Set name, summary and group. */
-+ snprintf (tmp, 1024, "%s-debuginfo", name);
++ snprintf(tmp, 1024, "%s-debuginfo", name);
+ headerPutString(dbg->header, RPMTAG_NAME, tmp);
-+ snprintf (tmp, 1024, "Debug information for package %s", name);
++ snprintf(tmp, 1024, "Debug information for package %s", name);
+ headerPutString(dbg->header, RPMTAG_SUMMARY, tmp);
-+ snprintf (tmp, 1024, "This package provides debug information for package %s.\n"
++ snprintf(tmp, 1024, "This package provides debug information for package %s.\n"
+ "Debug information is useful when developing applications that use this\n"
+ "package or when debugging this package.", name);
+ headerPutString(dbg->header, RPMTAG_DESCRIPTION, tmp);
+ headerPutString(dbg->header, RPMTAG_GROUP, "Development/Debug");
+ /* Inherit other tags from parent. */
-+ headerCopyTags (pkg->header, dbg->header, copyTagsForDebug);
++ headerCopyTags(pkg->header, dbg->header, copyTagsForDebug);
+
+ /* Add self-provides */
+ dbg->ds = rpmdsThis(dbg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL);
@@ -255,7 +252,7 @@
genSourceRpmName(spec);
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-@@ -2108,8 +2340,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r
+@@ -2055,8 +2284,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r
rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr);
free(nvr);
@@ -270,9 +267,9 @@
goto exit;
a = headerGetString(pkg->header, RPMTAG_ARCH);
---- ./build/parseSpec.c.orig 2014-08-18 12:44:49.564619395 +0000
-+++ ./build/parseSpec.c 2014-08-18 12:44:59.187569649 +0000
-@@ -503,7 +503,7 @@ static void initSourceHeader(rpmSpec spe
+--- ./build/parseSpec.c.orig 2014-09-17 11:00:45.295614365 +0000
++++ ./build/parseSpec.c 2014-09-17 11:01:56.371278963 +0000
+@@ -507,7 +507,7 @@ static void initSourceHeader(rpmSpec spe
}
/* Add extra provides to package. */
@@ -281,14 +278,14 @@
{
const char *arch, *name;
char *evr, *isaprov;
---- ./build/rpmbuild_internal.h.orig 2014-08-18 12:43:17.461092324 +0000
-+++ ./build/rpmbuild_internal.h 2014-08-18 12:44:25.578739914 +0000
-@@ -425,6 +425,13 @@ int addReqProv(Package pkg, rpmTagVal ta
- uint32_t index);
+--- ./build/rpmbuild_internal.h.orig 2014-08-18 06:59:55.487105642 +0000
++++ ./build/rpmbuild_internal.h 2014-09-17 11:01:45.138331580 +0000
+@@ -433,6 +433,13 @@ int addReqProv(Package pkg, rpmTagVal ta
+
/** \ingroup rpmbuild
+ * Add self-provides to package.
-+ * @param pkg package
++ * @param pkg package
+ */
+RPM_GNUC_INTERNAL
+void addPackageProvides(Package pkg);
@@ -297,8 +294,8 @@
* Add rpmlib feature dependency.
* @param pkg package
* @param feature rpm feature name (i.e. "rpmlib(Foo)" for feature Foo)
---- ./macros.in.orig 2014-08-18 12:37:19.206933957 +0000
-+++ ./macros.in 2014-08-18 12:37:30.648875217 +0000
+--- ./macros.in.orig 2014-09-17 11:00:45.299614345 +0000
++++ ./macros.in 2014-09-17 11:00:50.013592123 +0000
@@ -186,24 +186,10 @@
# Template for debug information sub-package.
%debug_package \
@@ -324,8 +321,8 @@
%description debugsource\
This package provides debug sources for package %{name}.\
Debug sources are useful when developing applications that use this\
---- ./scripts/find-debuginfo.sh.orig 2014-08-18 12:37:19.201933983 +0000
-+++ ./scripts/find-debuginfo.sh 2014-08-18 12:37:30.648875217 +0000
+--- ./scripts/find-debuginfo.sh.orig 2014-09-17 11:00:45.293614374 +0000
++++ ./scripts/find-debuginfo.sh 2014-09-17 11:00:50.014592113 +0000
@@ -149,6 +149,11 @@ debug_link()
# Provide .2, .3, ... symlinks to all filename instances of this build-id.
make_id_dup_link()
++++++ findksyms.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,7 +1,25 @@
SUSE specific kernel provides/requires scripts
---- scripts/find-provides.ksyms.orig 2013-07-12 14:08:40.000000000 +0000
-+++ scripts/find-provides.ksyms 2013-07-12 14:08:54.000000000 +0000
+--- ./scripts/Makefile.am.orig 2014-08-04 12:34:11.656463310 +0000
++++ ./scripts/Makefile.am 2014-08-04 12:34:15.063448350 +0000
+@@ -16,6 +16,7 @@ EXTRA_DIST = \
+ tcl.req tgpg vpkg-provides.sh \
+ find-requires find-provides \
+ find-requires.php find-provides.php \
++ find-requires.ksyms find-provides.ksyms \
+ find-php-provides find-php-requires \
+ mono-find-requires mono-find-provides \
+ ocaml-find-requires.sh ocaml-find-provides.sh \
+@@ -33,6 +34,7 @@ rpmconfig_SCRIPTS = \
+ check-buildroot check-rpaths check-rpaths-worker \
+ find-lang.sh find-requires find-provides \
+ perl.prov perl.req perldeps.pl pythondeps.sh osgideps.pl \
++ find-requires.ksyms find-provides.ksyms \
+ mono-find-requires mono-find-provides \
+ pkgconfigdeps.sh libtooldeps.sh \
+ ocaml-find-requires.sh ocaml-find-provides.sh \
+--- ./scripts/find-provides.ksyms.orig 2014-08-04 12:34:15.062448349 +0000
++++ ./scripts/find-provides.ksyms 2014-08-04 12:34:15.062448349 +0000
@@ -0,0 +1,17 @@
+#! /bin/bash
+
@@ -20,8 +38,8 @@
+ esac
+done \
+| sort -u
---- scripts/find-requires.ksyms.orig 2013-07-12 14:08:45.000000000 +0000
-+++ scripts/find-requires.ksyms 2013-07-12 14:08:33.000000000 +0000
+--- ./scripts/find-requires.ksyms.orig 2014-08-04 12:34:15.062448349 +0000
++++ ./scripts/find-requires.ksyms 2014-08-04 12:34:15.062448349 +0000
@@ -0,0 +1,15 @@
+#! /bin/bash
+
@@ -38,21 +56,3 @@
+ esac
+done \
+| sort -u
---- scripts/Makefile.am
-+++ scripts/Makefile.am
-@@ -15,6 +15,7 @@
- rpmdb_loadcvt rpm.daily rpm.log rpm.supp rpm2cpio.sh \
- tcl.req tgpg vpkg-provides.sh \
- find-requires.php find-provides.php \
-+ find-requires.ksyms find-provides.ksyms \
- find-php-provides find-php-requires \
- mono-find-requires mono-find-provides \
- ocaml-find-requires.sh ocaml-find-provides.sh \
-@@ -30,6 +31,7 @@
- check-buildroot check-rpaths check-rpaths-worker \
- find-lang.sh \
- perl.prov perl.req perldeps.pl pythondeps.sh osgideps.pl \
-+ find-requires.ksyms find-provides.ksyms \
- mono-find-requires mono-find-provides \
- pkgconfigdeps.sh libtooldeps.sh \
- ocaml-find-requires.sh ocaml-find-provides.sh \
++++++ firmware.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,27 +1,3 @@
-Index: autodeps/linux.prov
-===================================================================
---- autodeps/linux.prov.orig 2011-06-08 13:28:10.000000000 +0200
-+++ autodeps/linux.prov 2011-06-08 13:28:51.755445342 +0200
-@@ -11,6 +11,7 @@ solist=($(printf "%s\n" "${filelist[@]}"
- pythonlist=
- tcllist=
- monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
-+firmwarelist=($(printf "%s\n" "${filelist[@]}" | grep "/lib/firmware/"))
-
- #
- # --- Alpha does not mark 64bit dependencies
-@@ -59,6 +60,11 @@ done | sort -u
- printf "%s\n" "${tcllist[@]}" | /usr/lib/rpm/tcl.prov | sort -u
-
- #
-+# --- firmware files
-+[ -x /usr/lib/rpm/firmware.prov -a -n "$firmwarelist" ] &&
-+ printf "%s\n" "${firmwarelist[@]}" | /usr/lib/rpm/firmware.prov | sort -u
-+
-+#
- # --- Mono exes/dlls
- : ${MONO_PREFIX=/usr}
- if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then
Index: scripts/firmware.prov
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++++ helperenv.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,11 +1,11 @@
---- macros.in.orig 2012-04-18 13:48:07.000000000 +0000
-+++ macros.in 2012-04-18 13:47:41.000000000 +0000
-@@ -515,7 +515,7 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.ex
+--- ./macros.in.orig 2014-08-04 13:04:51.646383733 +0000
++++ ./macros.in 2014-08-04 13:04:54.687369977 +0000
+@@ -490,7 +490,7 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.ex
# %__myattr_exclude_magic exclude by magic regex
# %__myattr_exclude_path exclude by path regex
#
-%_fileattrsdir %{_rpmconfigdir}/fileattrs
+%_fileattrsdir %{__set_helper_env}%{_rpmconfigdir}/fileattrs
- #==============================================================================
- # ---- Database configuration macros.
+ # This macro defines how much space (in bytes) in package should be
+ # reserved for gpg signatures during building of a package. If this space is
++++++ ignore-auxv.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,10 +1,10 @@
---- ./lib/rpmrc.c.orig 2014-02-05 13:04:02.000000000 +0000
-+++ ./lib/rpmrc.c 2014-02-20 12:37:28.209816551 +0000
-@@ -83,10 +83,12 @@ struct rpmOption {
+--- ./lib/rpmrc.c.orig 2014-07-03 15:11:48.572096075 +0000
++++ ./lib/rpmrc.c 2014-09-17 12:04:27.330717791 +0000
+@@ -79,10 +79,12 @@ struct rpmOption {
int localize;
};
-+#if defined(__linux__) && defined(__powerpc__)
++#if defined(__linux__) && (defined(__powerpc__) || defined(__sparc__) || (defined(__arm__) && defined(__ARM_PCS_VFP)))
static struct rpmat_s {
const char *platform;
uint64_t hwcap;
@@ -13,21 +13,21 @@
typedef struct defaultEntry_s {
char * name;
-@@ -914,7 +916,7 @@ static int is_geode(void)
+@@ -936,7 +938,7 @@ static int is_geode(void)
#endif
-#if defined(__linux__)
-+#if defined(__linux__) && defined(__powerpc__)
++#if defined(__linux__) && (defined(__powerpc__) || defined(__sparc__) || (defined(__arm__) && defined(__ARM_PCS_VFP)))
/**
* Populate rpmat structure with auxv values
*/
-@@ -971,7 +973,7 @@ static void defaultMachine(const char **
+@@ -993,7 +995,7 @@ static void defaultMachine(rpmrcCtx ctx,
canonEntry canon;
int rc;
-#if defined(__linux__)
-+#if defined(__linux__) && defined(__powerpc__)
++#if defined(__linux__) && (defined(__powerpc__) || defined(__sparc__) || (defined(__arm__) && defined(__ARM_PCS_VFP)))
/* Populate rpmat struct with hw info */
read_auxv();
#endif
++++++ initscriptsprov.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,15 +1,3 @@
---- ./autodeps/linux.prov.orig 2014-02-20 12:52:34.012814948 +0000
-+++ ./autodeps/linux.prov 2014-02-20 12:52:40.088814937 +0000
-@@ -101,4 +101,9 @@ fi
- [ -x /usr/lib/rpm/gstreamer-provides ] &&
- printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/gstreamer-provides | sort -u
-
-+#
-+# --- Provides of sysvinit scripts
-+[ -x /usr/lib/rpm/sysvinitdeps.sh ] &&
-+ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/sysvinitdeps.sh -P | sort -u
-+
- exit 0
--- ./scripts/Makefile.am.orig 2014-02-20 12:52:33.971814948 +0000
+++ ./scripts/Makefile.am 2014-02-20 12:52:40.089814937 +0000
@@ -21,6 +21,7 @@ EXTRA_DIST = \
++++++ macrosin.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,5 +1,5 @@
---- ./macros.in.orig 2013-06-10 15:55:10.000000000 +0000
-+++ ./macros.in 2013-07-12 11:53:07.000000000 +0000
+--- ./macros.in.orig 2014-06-27 07:25:43.624470700 +0000
++++ ./macros.in 2014-08-04 12:38:02.067474055 +0000
@@ -185,22 +185,22 @@
# Template for debug information sub-package.
@@ -70,7 +70,7 @@
#
# Path to file attribute classifications for automatic dependency
-@@ -512,10 +519,10 @@ package or when debugging this package.\
+@@ -519,10 +526,10 @@ package or when debugging this package.\
# Misc BDB tuning options
%__dbi_other mp_mmapsize=128Mb mp_size=1Mb
@@ -83,7 +83,7 @@
#==============================================================================
# ---- GPG/PGP/PGP5 signature macros.
-@@ -816,7 +823,7 @@ package or when debugging this package.\
+@@ -823,7 +830,7 @@ package or when debugging this package.\
%_build_vendor %{_host_vendor}
%_build_os %{_host_os}
%_host @host@
@@ -92,7 +92,7 @@
%_host_cpu @host_cpu@
%_host_vendor @host_vendor@
%_host_os @host_os@
-@@ -980,6 +987,183 @@ done \
+@@ -991,6 +998,183 @@ done \
%python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))")
%python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")
@@ -276,18 +276,18 @@
#------------------------------------------------------------------------------
# arch macro for all Intel i?86 compatibile processors
# (Note: This macro (and it's analogues) will probably be obsoleted when
-@@ -990,7 +1174,9 @@ done \
+@@ -1001,7 +1185,9 @@ done \
#------------------------------------------------------------------------------
# arch macro for all supported ARM processors
--%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
-+%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl armv7l armv7hl
-+%arml armv3l armv4l armv5l armv5tel armv6l armv7l armv7hl
-+%armb armv4b armv5b armv5teb
+-%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
++%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
++%arml armv3l armv4l armv5l armv5tel armv6l armv7l armv7hl armv7hnl
++%armb armv4b armv5b armv5teb
#------------------------------------------------------------------------------
# arch macro for all supported Sparc processors
-@@ -1110,3 +1296,26 @@ end}
+@@ -1127,3 +1313,26 @@ end}
# \endverbatim
#*/
++++++ nameversioncompare.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,9 +1,9 @@
-Also compare the name and not only the version when checking if
+Also compare the name/arch and not only the version when checking if
two packages are the same. rh#104066
---- ./lib/depends.c.orig 2012-06-01 10:07:12.000000000 +0000
-+++ ./lib/depends.c 2012-06-01 10:16:13.000000000 +0000
-@@ -144,6 +144,24 @@ static int skipColor(rpm_color_t tscolor
+--- ./lib/depends.c.orig 2014-06-26 06:51:54.163820067 +0000
++++ ./lib/depends.c 2014-08-04 12:22:24.030575105 +0000
+@@ -158,6 +158,24 @@ static int skipColor(rpm_color_t tscolor
return tscolor && color && ocolor && !(color & ocolor);
}
@@ -26,16 +26,14 @@
+}
+
/* Add erase elements for older packages of same color (if any). */
- static int addUpgradeErasures(rpmts ts, rpm_color_t tscolor,
+ static int addSelfErasures(rpmts ts, rpm_color_t tscolor, int op,
rpmte p, rpm_color_t hcolor, Header h)
-@@ -157,8 +175,8 @@ static int addUpgradeErasures(rpmts ts,
+@@ -172,7 +190,7 @@ static int addSelfErasures(rpmts ts, rpm
if (skipColor(tscolor, hcolor, headerGetNumber(oh, RPMTAG_HEADERCOLOR)))
continue;
-- /* Skip packages that contain identical NEVR. */
-- if (rpmVersionCompare(h, oh) == 0)
-+ /* Skip packages that contain identical NEVRA. */
-+ if (rpmNameVersionCompare(h, oh) == 0)
- continue;
+- cmp = rpmVersionCompare(h, oh);
++ cmp = rpmNameVersionCompare(h, oh);
- if (removePackage(ts, oh, p)) {
+ /* On upgrade, skip packages that contain identical NEVR. */
+ if ((op == RPMTE_UPGRADE) && (cmp == 0))
++++++ platformin.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,7 +1,5 @@
-SUSE specific platform changes.
-
---- ./platform.in.orig 2014-09-05 11:49:01.000000000 +0000
-+++ ./platform.in 2014-09-08 16:43:35.250660580 +0000
+--- ./platform.in.orig 2014-06-26 06:51:54.822818260 +0000
++++ ./platform.in 2014-08-04 12:38:55.389245494 +0000
@@ -29,7 +29,7 @@
%_exec_prefix @exec_prefix@
%_bindir @bindir@
@@ -20,7 +18,7 @@
# Deprecated misspelling, present for backwards compatibility.
%_initrddir %{_initddir}
%_rundir @RUNDIR@
-@@ -79,3 +79,21 @@
+@@ -83,3 +83,21 @@
@apple@#
@apple@%_use_internal_dependency_generator 0
@apple@%__so dylib
++++++ repackage-nomd5.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:40.000000000 +0200
@@ -1,32 +1,18 @@
-Don't complain about a bad md5 sum for repackaged rpms.
-
---- ./lib/psm.c.orig 2013-07-12 12:05:15.000000000 +0000
-+++ ./lib/psm.c 2013-07-12 12:07:59.000000000 +0000
-@@ -813,12 +813,17 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg
- rpmpsmNotify(psm, RPMCALLBACK_INST_PROGRESS, 0);
-
- if (rpmfiFC(fi) > 0 && !(rpmtsFlags(ts) & RPMTRANS_FLAG_JUSTDB)) {
-+ rpmtransFlags oldtsflags;
- FD_t payload = rpmtePayload(psm->te);
- if (payload == NULL) {
- rc = RPMRC_FAIL;
- break;
- }
-
-+ oldtsflags = rpmtsFlags(ts);
-+ if (headerIsEntry(fi->h, RPMTAG_REMOVETID))
-+ (void) rpmtsSetFlags(ts, oldtsflags | RPMTRANS_FLAG_NOMD5);
-+
- fsmrc = rpmPackageFilesInstall(psm->ts, psm->te, psm->fi,
- payload, psm, &psm->failedFile);
-
-@@ -827,6 +832,9 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg
- rpmswAdd(rpmtsOp(psm->ts, RPMTS_OP_DIGEST),
- fdOp(payload, FDSTAT_DIGEST));
-
-+ if (headerIsEntry(fi->h, RPMTAG_REMOVETID))
-+ (void) rpmtsSetFlags(ts, oldtsflags);
-+
- Fclose(payload);
- }
+--- ./lib/psm.c.orig 2014-08-04 12:51:13.219051031 +0000
++++ ./lib/psm.c 2014-08-04 12:57:38.294335406 +0000
+@@ -673,8 +673,15 @@ static rpmRC rpmpsmUnpack(rpmpsm psm)
+ if (!(rpmtsFlags(psm->ts) & RPMTRANS_FLAG_JUSTDB)) {
+ if (rpmfilesFC(psm->files) > 0) {
++ rpmtransFlags oldtsflags = rpmtsFlags(psm->ts);
++ Header h = rpmteHeader(psm->te);
++ if (h && headerIsEntry(h, RPMTAG_REMOVETID))
++ (void) rpmtsSetFlags(psm->ts, oldtsflags | RPMTRANS_FLAG_NOMD5);
+ fsmrc = rpmPackageFilesInstall(psm->ts, psm->te, psm->files,
+ psm, &failedFile);
++ if (h && headerIsEntry(h, RPMTAG_REMOVETID))
++ (void) rpmtsSetFlags(psm->ts, oldtsflags);
++ headerFree(h);
+ saved_errno = errno;
+ }
+ }
++++++ rpm-4.11.3.tar.bz2 -> rpm-4.12.0.1.tar.bz2 ++++++
++++ 180222 lines of diff (skipped)
++++++ rpm-deptracking.patch ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:42.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:42.000000000 +0200
@@ -1,8 +1,6 @@
-Index: macros.in
-===================================================================
---- macros.in.orig 2011-12-09 13:21:58.078688958 +0100
-+++ macros.in 2011-12-09 13:21:58.502668839 +0100
-@@ -920,7 +920,8 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.ex
+--- ./macros.in.orig 2014-08-04 13:03:05.948860909 +0000
++++ ./macros.in 2014-08-04 13:03:24.830775270 +0000
+@@ -885,7 +885,8 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.ex
--localstatedir=%{_localstatedir} \\\
--sharedstatedir=%{_sharedstatedir} \\\
--mandir=%{_mandir} \\\
@@ -11,4 +9,4 @@
+ --disable-dependency-tracking
#------------------------------------------------------------------------------
- # The make install analogue of %configure for modern autotools:
+ # The "make" analogue, hiding the _smp_mflags magic from specs
++++++ rpmrc.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:42.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:42.000000000 +0200
@@ -1,5 +1,5 @@
---- ./rpmrc.in.orig 2014-09-05 11:47:15.000000000 +0000
-+++ ./rpmrc.in 2014-09-08 16:44:47.547337670 +0000
+--- ./rpmrc.in.orig 2014-06-27 07:25:43.624470700 +0000
++++ ./rpmrc.in 2014-08-04 12:44:21.192842515 +0000
@@ -12,16 +12,16 @@
# "fat" binary with both archs, for Darwin
optflags: fat -O2 -g -arch i386 -arch ppc
@@ -30,15 +30,15 @@
optflags: m68k -O2 -g -fomit-frame-pointer
--optflags: ppc -O2 -g -fsigned-char
--optflags: ppc8260 -O2 -g -fsigned-char
--optflags: ppc8560 -O2 -g -fsigned-char
--optflags: ppc32dy4 -O2 -g -fsigned-char
--optflags: ppciseries -O2 -g -fsigned-char
--optflags: ppcpseries -O2 -g -fsigned-char
--optflags: ppc64 -O2 -g -fsigned-char
--optflags: ppc64le -O2 -g -fsigned-char
--optflags: ppc64p7 -O3 -mtune=power7 -mcpu=power7 -g -fsigned-char
+-optflags: ppc -O2 -g
+-optflags: ppc8260 -O2 -g
+-optflags: ppc8560 -O2 -g
+-optflags: ppc32dy4 -O2 -g
+-optflags: ppciseries -O2 -g
+-optflags: ppcpseries -O2 -g
+-optflags: ppc64 -O2 -g
+-optflags: ppc64le -O2 -g
+-optflags: ppc64p7 -O3 -mtune=power7 -mcpu=power7 -g
+optflags: ppc -O2 -g -m32 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
+optflags: ppc8260 -O2 -g -m32
+optflags: ppc8560 -O2 -g -m32
@@ -54,17 +54,20 @@
optflags: hppa1.0 -O2 -g -mpa-risc-1-0
optflags: hppa1.1 -O2 -g -mpa-risc-1-0
optflags: hppa1.2 -O2 -g -mpa-risc-1-0
-@@ -67,7 +68,9 @@ optflags: armv4tl -O2 -g -march=armv4t
+@@ -67,10 +68,10 @@ optflags: armv4tl -O2 -g -march=armv4t
optflags: armv5tel -O2 -g -march=armv5te
optflags: armv5tejl -O2 -g -march=armv5te
optflags: armv6l -O2 -g -march=armv6
+-optflags: armv6hl -O2 -g -march=armv6 -mfloat-abi=hard -mfpu=vfp
+optflags: armv6hl -O2 -g -march=armv6 -mfloat-abi=hard -mabi=aapcs-linux
+
optflags: armv7l -O2 -g -march=armv7
+-optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mthumb -mabi=aapcs-linux
+ optflags: armv7hnl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon
optflags: m68k -O2 -g -fomit-frame-pointer
-
-@@ -79,8 +82,8 @@ optflags: atariclone -O2 -g -fomit-frame
+@@ -83,8 +84,8 @@ optflags: atariclone -O2 -g -fomit-frame
optflags: milan -O2 -g -fomit-frame-pointer
optflags: hades -O2 -g -fomit-frame-pointer
@@ -75,17 +78,7 @@
optflags: sh3 -O2 -g
optflags: sh4 -O2 -g -mieee
-@@ -184,7 +187,9 @@ arch_canon: armv4l: armv4l 12
- arch_canon: armv5tel: armv5tel 12
- arch_canon: armv5tejl: armv5tejl 12
- arch_canon: armv6l: armv6l 12
-+arch_canon: armv6hl: armv6hl 12
- arch_canon: armv7l: armv7l 12
-+arch_canon: armv7hl: armv7hl 12
-
- arch_canon: m68kmint: m68kmint 13
- arch_canon: atarist: m68kmint 13
-@@ -248,17 +253,17 @@ os_canon: MacOSX: macosx 21
+@@ -255,17 +256,17 @@ os_canon: MacOSX: macosx 21
#############################################################
# For a given uname().machine, the default build arch
@@ -111,17 +104,7 @@
buildarchtranslate: i486: i386
buildarchtranslate: i386: i386
-@@ -297,7 +302,9 @@ buildarchtranslate: armv4tl: armv4tl
- buildarchtranslate: armv5tel: armv5tel
- buildarchtranslate: armv5tejl: armv5tejl
- buildarchtranslate: armv6l: armv6l
-+buildarchtranslate: armv6hl: armv6hl
- buildarchtranslate: armv7l: armv7l
-+buildarchtranslate: armv7hl: armv7hl
-
- buildarchtranslate: m68k: m68k
-
-@@ -324,6 +331,15 @@ buildarchtranslate: sh4a: sh4
+@@ -334,6 +335,15 @@ buildarchtranslate: sh4a: sh4
buildarchtranslate: aarch64: aarch64
@@ -137,7 +120,7 @@
#############################################################
# Architecture compatibility
-@@ -381,14 +397,20 @@ arch_compat: mipsel: noarch
+@@ -391,14 +401,20 @@ arch_compat: mipsel: noarch
arch_compat: hppa2.0: hppa1.2
arch_compat: hppa1.2: hppa1.1
arch_compat: hppa1.1: hppa1.0
@@ -160,7 +143,7 @@
arch_compat: armv4tl: armv4l
arch_compat: armv4l: armv3l
arch_compat: armv3l: noarch
-@@ -407,7 +429,7 @@ arch_compat: i370: noarch
+@@ -420,7 +436,7 @@ arch_compat: i370: noarch
arch_compat: s390: noarch
arch_compat: s390x: s390 noarch
@@ -169,7 +152,7 @@
arch_compat: x86_64: amd64 em64t athlon noarch
arch_compat: amd64: x86_64 em64t athlon noarch
-@@ -492,12 +514,15 @@ buildarch_compat: ppc64le: noarch fat
+@@ -505,12 +521,15 @@ buildarch_compat: ppc64le: noarch fat
buildarch_compat: ppc64pseries: ppc64
buildarch_compat: ppc64iseries: ppc64
buildarch_compat: ppc64p7: ppc64
@@ -185,7 +168,7 @@
buildarch_compat: armv6l: armv5tejl
buildarch_compat: armv5tejl: armv5tel
buildarch_compat: armv5tel: armv4tl
-@@ -508,7 +533,8 @@ buildarch_compat: armv3l: noarch
+@@ -525,7 +544,8 @@ buildarch_compat: armv6hl: noarch
buildarch_compat: hppa2.0: hppa1.2
buildarch_compat: hppa1.2: hppa1.1
buildarch_compat: hppa1.1: hppa1.0
++++++ suspendlock.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:43.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:43.000000000 +0200
@@ -2,18 +2,18 @@
read access in scriptlets. Only needed for DB_PRIVATE (aka global)
locking.
---- ./lib/backend/db3.c.orig 2012-06-01 10:50:11.000000000 +0000
-+++ ./lib/backend/db3.c 2012-06-01 10:50:19.000000000 +0000
-@@ -628,3 +628,59 @@ int dbiOpen(rpmdb rdb, rpmDbiTagVal rpmt
-
+--- ./lib/backend/db3.c.orig 2014-08-04 12:25:29.288759808 +0000
++++ ./lib/backend/db3.c 2014-08-04 12:30:30.829430726 +0000
+@@ -625,6 +625,63 @@ static int dbiFlock(dbiIndex dbi, int mo
return rc;
}
-+
+
+int dbiSuspendDBLock(dbiIndex dbi, unsigned int flags)
+{
+ struct flock l;
+ int rc = 0;
+ int fdno = -1;
++ DB * db = dbi->dbi_db;
+
+ if (!dbi->dbi_lockdbfd)
+ return 0;
@@ -21,7 +21,7 @@
+ return 0;
+ if (_lockdbfd == 0)
+ return 0;
-+ if (!(dbi->dbi_db->fd(dbi->dbi_db, &fdno) == 0 && fdno >= 0))
++ if (!(db->fd(db, &fdno) == 0 && fdno >= 0))
+ return 1;
+ memset(&l, 0, sizeof(l));
+ l.l_whence = 0;
@@ -40,6 +40,7 @@
+ int rc = 0;
+ int tries;
+ int fdno = -1;
++ DB * db = dbi->dbi_db;
+
+ if (!dbi->dbi_lockdbfd)
+ return 0;
@@ -47,7 +48,7 @@
+ return 0;
+ if (_lockdbfd == 0)
+ return 0;
-+ if (!(dbi->dbi_db->fd(dbi->dbi_db, &fdno) == 0 && fdno >= 0))
++ if (!(db->fd(db, &fdno) == 0 && fdno >= 0))
+ return 1;
+ for (tries = 0; tries < 2; tries++) {
+ memset(&l, 0, sizeof(l));
@@ -64,9 +65,12 @@
+ return rc;
+}
+
---- ./lib/backend/dbi.h.orig 2012-03-20 08:07:25.000000000 +0000
-+++ ./lib/backend/dbi.h 2012-06-01 10:53:43.000000000 +0000
-@@ -90,6 +90,24 @@ struct dbiIndex_s {
+ int dbiOpen(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, int flags)
+ {
+ const char *dbhome = rpmdbHome(rdb);
+--- ./lib/backend/dbi.h.orig 2014-06-26 06:51:54.101820242 +0000
++++ ./lib/backend/dbi.h 2014-08-04 12:25:29.288759808 +0000
+@@ -92,6 +92,24 @@ struct dbiIndex_s {
extern "C" {
#endif
@@ -91,39 +95,39 @@
RPM_GNUC_INTERNAL
/* Globally enable/disable fsync in the backend */
---- ./lib/psm.c.orig 2012-06-01 10:50:11.000000000 +0000
-+++ ./lib/psm.c 2012-06-01 10:51:34.000000000 +0000
-@@ -419,10 +419,12 @@ static rpmRC runScript(rpmpsm psm, ARGV_
+--- ./lib/psm.c.orig 2014-08-04 12:25:29.289759769 +0000
++++ ./lib/psm.c 2014-08-04 12:27:04.230340235 +0000
+@@ -291,10 +291,12 @@ static rpmRC runScript(rpmts ts, rpmte t
if (sfd == NULL)
- sfd = rpmtsScriptFd(psm->ts);
+ sfd = rpmtsScriptFd(ts);
-+ rpmtsSuspendResumeDBLock(psm->ts, 0);
- rpmswEnter(rpmtsOp(psm->ts, RPMTS_OP_SCRIPTLETS), 0);
++ rpmtsSuspendResumeDBLock(ts, 0);
+ rpmswEnter(rpmtsOp(ts, RPMTS_OP_SCRIPTLETS), 0);
rc = rpmScriptRun(script, arg1, arg2, sfd,
- prefixes, warn_only, selinux);
- rpmswExit(rpmtsOp(psm->ts, RPMTS_OP_SCRIPTLETS), 0);
-+ rpmtsSuspendResumeDBLock(psm->ts, 1);
+ prefixes, warn_only, rpmtsPlugins(ts));
+ rpmswExit(rpmtsOp(ts, RPMTS_OP_SCRIPTLETS), 0);
++ rpmtsSuspendResumeDBLock(ts, 1);
/* Map warn-only errors to "notfound" for script stop callback */
stoprc = (rc != RPMRC_OK && warn_only) ? RPMRC_NOTFOUND : rc;
---- ./lib/rpmdb.c.orig 2012-06-01 10:50:11.000000000 +0000
-+++ ./lib/rpmdb.c 2012-06-01 10:50:19.000000000 +0000
-@@ -769,6 +769,12 @@ int rpmdbSync(rpmdb db)
- return dbiForeach(db->_dbi, dbiSync, 0);
+--- ./lib/rpmdb.c.orig 2014-08-04 12:25:15.106821818 +0000
++++ ./lib/rpmdb.c 2014-08-04 12:25:29.289759769 +0000
+@@ -475,6 +475,12 @@ exit:
+ return rc;
}
+int rpmdbSuspendResumeDBLock(rpmdb db, int mode)
+{
+ if (db == NULL) return 0;
-+ return dbiForeach(db->_dbi, mode ? dbiResumeDBLock : dbiSuspendDBLock, 0);
++ return dbiForeach(db->db_indexes, db->db_ndbi, mode ? dbiResumeDBLock : dbiSuspendDBLock, 0);
+}
+
static rpmdb newRpmdb(const char * root, const char * home,
int mode, int perms, int flags)
{
---- ./lib/rpmts.c.orig 2012-03-20 08:07:25.000000000 +0000
-+++ ./lib/rpmts.c 2012-06-01 10:50:19.000000000 +0000
-@@ -95,6 +95,11 @@ int rpmtsOpenDB(rpmts ts, int dbmode)
+--- ./lib/rpmts.c.orig 2014-06-26 06:51:54.653818721 +0000
++++ ./lib/rpmts.c 2014-08-04 12:25:29.289759769 +0000
+@@ -101,6 +101,11 @@ int rpmtsOpenDB(rpmts ts, int dbmode)
return rc;
}
@@ -134,10 +138,10 @@
+
int rpmtsInitDB(rpmts ts, int dbmode)
{
- rpmlock lock = rpmtsAcquireLock(ts);
---- ./lib/rpmts.h.orig 2012-03-20 08:07:25.000000000 +0000
-+++ ./lib/rpmts.h 2012-06-01 10:50:19.000000000 +0000
-@@ -423,6 +423,8 @@ rpmdb rpmtsGetRdb(rpmts ts);
+ rpmtxn txn = rpmtxnBegin(ts, RPMTXN_WRITE);
+--- ./lib/rpmts.h.orig 2014-06-26 06:51:54.655818716 +0000
++++ ./lib/rpmts.h 2014-08-04 12:25:29.290759730 +0000
+@@ -441,6 +441,8 @@ rpmdb rpmtsGetRdb(rpmts ts);
void * rpmtsNotify(rpmts ts, rpmte te,
rpmCallbackType what, rpm_loff_t amount, rpm_loff_t total);
++++++ taggedfileindex.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:43.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:43.000000000 +0200
@@ -1,8 +1,9 @@
This used to be the taggedfileindex patch, but it's gone.
The remaining part just strips off the tag.
---- ./lib/rpmdb.c.orig 2011-05-11 14:27:32.000000000 +0000
-+++ ./lib/rpmdb.c 2011-05-11 15:14:39.000000000 +0000
-@@ -257,6 +257,9 @@ static int dbt2set(dbiIndex dbi, DBT * d
+
+--- ./lib/backend/db3.c.orig 2014-08-04 12:45:25.907562115 +0000
++++ ./lib/backend/db3.c 2014-08-04 12:46:22.225318788 +0000
+@@ -833,6 +833,9 @@ static int dbt2set(dbiIndex dbi, DBT * d
_DBSWAP(hdrNum);
_DBSWAP(tagNum);
}
++++++ weakdepscompat.diff ++++++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:43.000000000 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:43.000000000 +0200
@@ -1,5 +1,5 @@
---- ./build/parsePreamble.c.orig 2014-02-25 14:14:15.892041649 +0000
-+++ ./build/parsePreamble.c 2014-02-25 14:14:26.237041631 +0000
+--- ./build/parsePreamble.c.orig 2014-08-04 13:10:07.530953406 +0000
++++ ./build/parsePreamble.c 2014-08-04 13:10:12.852929355 +0000
@@ -343,6 +343,7 @@ static struct tokenBits_s const installS
{ "verify", RPMSENSE_SCRIPT_VERIFY },
{ "pretrans", RPMSENSE_PRETRANS },
@@ -8,120 +8,3 @@
{ NULL, 0 }
};
---- ./build/rpmfc.c.orig 2014-02-25 14:14:15.904041649 +0000
-+++ ./build/rpmfc.c 2014-02-25 14:14:26.238041631 +0000
-@@ -1156,6 +1156,12 @@ static struct DepMsg_s depMsgs[] = {
- { "Obsoletes", { "%{?__find_obsoletes}", NULL, NULL, NULL },
- RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
- 0, -1 },
-+ { "Enhances", { "%{?__find_enhances}", NULL, NULL, NULL },
-+ RPMTAG_ENHANCENAME, RPMTAG_ENHANCEVERSION, RPMTAG_ENHANCEFLAGS,
-+ 0, -1 },
-+ { "Supplements", { "%{?__find_supplements}", NULL, NULL, NULL },
-+ RPMTAG_SUPPLEMENTNAME, RPMTAG_SUPPLEMENTVERSION, RPMTAG_SUPPLEMENTFLAGS,
-+ 0, -1 },
- { NULL, { NULL, NULL, NULL, NULL }, 0, 0, 0, 0, 0 }
- };
-
-@@ -1231,6 +1237,16 @@ static rpmRC rpmfcGenerateDependsHelper(
- if (!pkg->autoReq)
- continue;
- tagflags = RPMSENSE_FIND_REQUIRES;
-+ break;
-+ case RPMTAG_ENHANCENAME:
-+ if (!pkg->autoReq)
-+ continue;
-+ tagflags = RPMSENSE_FIND_REQUIRES;
-+ break;
-+ case RPMTAG_SUPPLEMENTNAME:
-+ if (!pkg->autoReq)
-+ continue;
-+ tagflags = RPMSENSE_FIND_REQUIRES;
- break;
- default:
- continue;
---- ./lib/rpmds.c.orig 2014-02-25 14:14:15.834041649 +0000
-+++ ./lib/rpmds.c 2014-02-25 14:14:47.963041593 +0000
-@@ -86,6 +86,14 @@ static int dsType(rpmTagVal tag,
- t = "Trigger";
- evr = RPMTAG_TRIGGERVERSION;
- f = RPMTAG_TRIGGERFLAGS;
-+ } else if (tag == RPMTAG_OLDSUGGESTSNAME) {
-+ t = "Oldsuggests";
-+ evr = RPMTAG_OLDSUGGESTSVERSION;
-+ f = RPMTAG_OLDSUGGESTSFLAGS;
-+ } else if (tag == RPMTAG_OLDENHANCESNAME) {
-+ t = "Oldenhances";
-+ evr = RPMTAG_OLDENHANCESVERSION;
-+ f = RPMTAG_OLDENHANCESFLAGS;
- } else {
- rc = 1;
- }
---- ./lib/tagexts.c.orig 2014-02-25 14:14:15.839041649 +0000
-+++ ./lib/tagexts.c 2014-02-25 14:18:53.707041158 +0000
-@@ -906,6 +906,34 @@ static int depnevrsTag(Header h, rpmtd t
- return (ndeps > 0);
- }
-
-+#define RPMSENSE_STRONG (1 << 27)
-+
-+static int depnevrsTagFiltered(Header h, rpmtd td, headerGetFlags hgflags,
-+ rpmTagVal tag, int strong)
-+{
-+ rpmds ds = rpmdsNew(h, tag, 0);
-+ int ndeps = rpmdsCount(ds);
-+
-+ if (ndeps > 0) {
-+ char **deps = xmalloc(sizeof(*deps) * ndeps);
-+ ndeps = 0;
-+ while (rpmdsNext(ds) >= 0) {
-+ if ((rpmdsFlags(ds) & RPMSENSE_STRONG) == (strong ? RPMSENSE_STRONG : 0))
-+ deps[ndeps++] = rpmdsNewDNEVR(NULL, ds);
-+ }
-+ if (ndeps) {
-+ td->data = deps;
-+ td->type = RPM_STRING_ARRAY_TYPE;
-+ td->count = ndeps;
-+ td->flags |= (RPMTD_ALLOCED | RPMTD_PTR_ALLOCED);
-+ } else {
-+ _free(deps);
-+ }
-+ }
-+ rpmdsFree(ds);
-+ return (ndeps > 0);
-+}
-+
- static int requirenevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
- {
- return depnevrsTag(h, td, hgflags, RPMTAG_REQUIRENAME);
-@@ -913,22 +941,26 @@ static int requirenevrsTag(Header h, rpm
-
- static int recommendnevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
- {
-- return depnevrsTag(h, td, hgflags, RPMTAG_RECOMMENDNAME);
-+ return depnevrsTag(h, td, hgflags, RPMTAG_RECOMMENDNAME) ||
-+ depnevrsTagFiltered(h, td, hgflags, RPMTAG_OLDSUGGESTSNAME, 1);
- }
-
- static int suggestnevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
- {
-- return depnevrsTag(h, td, hgflags, RPMTAG_SUGGESTNAME);
-+ return depnevrsTag(h, td, hgflags, RPMTAG_SUGGESTNAME) ||
-+ depnevrsTagFiltered(h, td, hgflags, RPMTAG_OLDSUGGESTSNAME, 0);
- }
-
- static int supplementnevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
- {
-- return depnevrsTag(h, td, hgflags, RPMTAG_SUPPLEMENTNAME);
-+ return depnevrsTag(h, td, hgflags, RPMTAG_SUPPLEMENTNAME) ||
-+ depnevrsTagFiltered(h, td, hgflags, RPMTAG_OLDENHANCESNAME, 1);
- }
-
- static int enhancenevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
- {
-- return depnevrsTag(h, td, hgflags, RPMTAG_ENHANCENAME);
-+ return depnevrsTag(h, td, hgflags, RPMTAG_ENHANCENAME) ||
-+ depnevrsTagFiltered(h, td, hgflags, RPMTAG_OLDENHANCESNAME, 0);
- }
-
- static int providenevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package valgrind for openSUSE:Factory checked in at 2014-09-28 19:53:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/valgrind (Old)
and /work/SRC/openSUSE:Factory/.valgrind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "valgrind"
Changes:
--------
--- /work/SRC/openSUSE:Factory/valgrind/valgrind.changes 2014-08-30 16:03:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.valgrind.new/valgrind.changes 2014-09-28 19:53:34.000000000 +0200
@@ -1,0 +2,25 @@
+Tue Sep 16 15:39:34 UTC 2014 - schwab(a)suse.de
+
+- glibc-2.19.patch: already upstream, so remove
+- Fix file list
+
+-------------------------------------------------------------------
+Tue Sep 16 15:27:20 UTC 2014 - dmueller(a)suse.com
+
+- update to 3.10.0:
+ * Support for the 64-bit ARM Architecture (AArch64 ARMv8). This port
+ is mostly complete, and is usable, but some SIMD instructions are as
+ yet unsupported.
+ * Support for little-endian variant of the 64-bit POWER architecture.
+ * Support for Android on MIPS32.
+ * Support for 64bit FPU on MIPS32 platforms.
+ * Both 32- and 64-bit executables are supported on MacOSX 10.8 and 10.9.
+ * Configuration for and running on Android targets has changed.
+ See README.android in the source tree for details.
+ - drop VEX-r2803.diff, VEX-r2808.diff, VEX-r2816.diff, VEX-r2858.diff,
+ VEX-r2904.diff, VEX-r2910.diff, VEX-r2914.diff, VEX-r2915.diff,
+ VEX-r2916.diff, aarch64-VEX-support.diff, aarch64-support.diff,
+ r13767.diff, r13770.diff, r14184.diff, r14238.diff, r14239.diff,
+ r14240.diff, r14246.diff, r2798.diff, valgrind-r13948.diff
+
+-------------------------------------------------------------------
Old:
----
VEX-r2803.diff
VEX-r2808.diff
VEX-r2816.diff
VEX-r2858.diff
VEX-r2904.diff
VEX-r2910.diff
VEX-r2914.diff
VEX-r2915.diff
VEX-r2916.diff
aarch64-VEX-support.diff
aarch64-support.diff
glibc-2.19.patch
r13767.diff
r13770.diff
r14184.diff
r14238.diff
r14239.diff
r14240.diff
r14246.diff
r2798.diff
valgrind-3.9.0.tar.bz2
valgrind-r13948.diff
New:
----
valgrind-3.10.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ valgrind.spec ++++++
--- /var/tmp/diff_new_pack.kTlLoN/_old 2014-09-28 19:53:36.000000000 +0200
+++ /var/tmp/diff_new_pack.kTlLoN/_new 2014-09-28 19:53:36.000000000 +0200
@@ -33,35 +33,13 @@
License: GPL-2.0+
Group: Development/Tools/Debuggers
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 3.9.0
+Version: 3.10.0
Release: 0
Source0: http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
# svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_5_0 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_5_BRANCH > 3_5_BRANCH.diff
# svn di svn://svn.valgrind.org/vex/tags/VEX_3_5_0 svn://svn.valgrind.org/vex/branches/VEX_3_5_BRANCH > VEX_3_5_BRANCH.diff
Patch1: jit-register-unregister.diff
Patch2: armv6-support.diff
-Patch3: r13767.diff
-Patch4: r13770.diff
-Patch5: glibc-2.19.patch
-Patch6: r2798.diff
-Patch7: aarch64-support.diff
-Patch8: aarch64-VEX-support.diff
-Patch9: VEX-r2858.diff
-Patch10: valgrind-r13948.diff
-# PPC64 LE support
-Patch11: r14184.diff
-Patch12: r14238.diff
-Patch13: r14239.diff
-Patch14: r14240.diff
-Patch15: r14246.diff
-Patch20: VEX-r2803.diff
-Patch21: VEX-r2808.diff
-Patch22: VEX-r2816.diff
-Patch23: VEX-r2904.diff
-Patch24: VEX-r2910.diff
-Patch25: VEX-r2914.diff
-Patch26: VEX-r2915.diff
-Patch27: VEX-r2916.diff
# during building the major version of glibc is built into the suppression file
%define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1)
%define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2)
@@ -156,45 +134,8 @@
%prep
%setup -q -n %{name}-%{version}
-%ifarch aarch64
-cd VEX
-%patch8
-cd ..
-%else
-%patch9
-%ifarch ppc64le
-# PPC64LE
-%patch20
-%patch21
-%patch22
-%patch23
-%patch24
-%patch25
-%patch26
-%patch27
-%endif
-%endif
%patch1
-%ifarch aarch64
-%patch7
-%else
%patch2
-%patch3
-%ifarch ppc64le
-%patch4
-%endif
-%patch5 -p1
-%patch6
-%patch10
-%ifarch ppc64le
-# PPC64LE
-%patch11
-%patch12
-%patch13
-%patch14
-%patch15
-%endif
-%endif
%build
%ifarch %arm
@@ -252,7 +193,7 @@
%_libdir/valgrind/*-ppc32-linux
%endif
%ifarch ppc64
-%_libdir/valgrind/*-ppc64-linux
+%_libdir/valgrind/*-ppc64be-linux
%endif
%ifarch ppc64le
%_libdir/valgrind/*-ppc64le-linux
++++++ valgrind-3.9.0.tar.bz2 -> valgrind-3.10.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/valgrind/valgrind-3.9.0.tar.bz2 /work/SRC/openSUSE:Factory/.valgrind.new/valgrind-3.10.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
Hello community,
here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2014-09-28 19:53:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/util-linux (Old)
and /work/SRC/openSUSE:Factory/.util-linux.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux"
Changes:
--------
--- /work/SRC/openSUSE:Factory/util-linux/python-libmount.changes 2014-09-07 11:11:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.util-linux.new/python-libmount.changes 2014-09-28 19:53:32.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 8 21:04:34 CEST 2014 - sbrabec(a)suse.cz
+
+- Install runuser and runuser-l PAM file
+ (runuser.pamd, bnc#892079).
+
+-------------------------------------------------------------------
util-linux-systemd.changes: same change
util-linux.changes: same change
New:
----
runuser.pamd
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-libmount.spec ++++++
--- /var/tmp/diff_new_pack.6YBZOn/_old 2014-09-28 19:53:33.000000000 +0200
+++ /var/tmp/diff_new_pack.6YBZOn/_new 2014-09-28 19:53:33.000000000 +0200
@@ -141,6 +141,7 @@
Source11: su.default
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.t…
Source13: %{_name}.keyring
+Source14: runuser.pamd
# TODO: split to separate package
Source40: klogconsole.tar.bz2
# XXX: Run a program in a new session and with controlling tty
@@ -626,6 +627,8 @@
install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf
install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
+install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser
+install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
%if %{with enable_su}
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
@@ -885,6 +888,8 @@
%config(noreplace) %{_sysconfdir}/blkid.conf
%config(noreplace) %{_sysconfdir}/pam.d/login
%config(noreplace) %{_sysconfdir}/pam.d/remote
+%config(noreplace) %{_sysconfdir}/pam.d/runuser
+%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l
util-linux-systemd.spec: same change
++++++ util-linux.spec ++++++
--- /var/tmp/diff_new_pack.6YBZOn/_old 2014-09-28 19:53:33.000000000 +0200
+++ /var/tmp/diff_new_pack.6YBZOn/_new 2014-09-28 19:53:33.000000000 +0200
@@ -141,6 +141,7 @@
Source11: su.default
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.t…
Source13: %{_name}.keyring
+Source14: runuser.pamd
# TODO: split to separate package
Source40: klogconsole.tar.bz2
# XXX: Run a program in a new session and with controlling tty
@@ -626,6 +627,8 @@
install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf
install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
+install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser
+install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
%if %{with enable_su}
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
@@ -885,6 +888,8 @@
%config(noreplace) %{_sysconfdir}/blkid.conf
%config(noreplace) %{_sysconfdir}/pam.d/login
%config(noreplace) %{_sysconfdir}/pam.d/remote
+%config(noreplace) %{_sysconfdir}/pam.d/runuser
+%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l
++++++ runuser.pamd ++++++
#%PAM-1.0
# Note that runuser requires only "session" setting (and for example "auth sufficient pam_rootok.so" dummy line).
auth sufficient pam_rootok.so
session include common-session
session optional pam_xauth.so
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2014-09-28 19:53:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp (Old)
and /work/SRC/openSUSE:Factory/.libzypp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2014-09-17 17:42:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-09-28 19:53:27.000000000 +0200
@@ -1,0 +2,53 @@
+Thu Sep 25 17:59:06 CEST 2014 - ma(a)suse.de
+
+- Trigger appdata plugin when system repos have changed (bnc#866257)
+- Protect against race when destructing globals
+- BuildRequire libsolv-tools as libsolv-devel no longer does
+- version 14.29.4 (29)
+
+-------------------------------------------------------------------
+Thu Sep 25 01:15:42 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue Sep 23 17:07:45 CEST 2014 - ma(a)suse.de
+
+- Fix computation of userinstalled items (bnc#897404)
+- version 14.29.3 (29)
+
+-------------------------------------------------------------------
+Tue Sep 23 10:55:08 CEST 2014 - ma(a)suse.de
+
+- Adapt to API changes in rpm.4.12
+- SLE-12 (suse_version 1315) uses it's own translations set
+ (bnc#897176)
+- version 14.29.2 (29)
+
+-------------------------------------------------------------------
+Sun Sep 21 01:13:25 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 18 15:47:50 CEST 2014 - ma(a)suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 18 15:47:34 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 18 15:46:11 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Wed Sep 17 13:18:23 CEST 2014 - ma(a)suse.de
+
+- adjust BuildRequires
+- version 14.29.1 (29)
+
+-------------------------------------------------------------------
@@ -3,0 +57,3 @@
+- DiskUsageCounter: Set growonly on detetcted snapshotting btrfs
+ partitions (bnc#896176)
+- DiskUsageCounter: Allow MountPoint to store fstype
Old:
----
libzypp-14.29.0.tar.bz2
New:
----
libzypp-14.29.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.ADVC7v/_old 2014-09-28 19:53:28.000000000 +0200
+++ /var/tmp/diff_new_pack.ADVC7v/_new 2014-09-28 19:53:28.000000000 +0200
@@ -23,7 +23,7 @@
Summary: Package, Patch, Pattern, and Product Management
License: GPL-2.0+
Group: System/Packages
-Version: 14.29.0
+Version: 14.29.4
Release: 0
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
@@ -32,6 +32,7 @@
# Features we provide (update doc/autoinclude/FeatureTest.doc):
Provides: libzypp(plugin) = 0
+Provides: libzypp(plugin:appdata) = 0
Provides: libzypp(plugin:commit) = 1
Provides: libzypp(plugin:services) = 0
Provides: libzypp(plugin:system) = 0
@@ -75,6 +76,7 @@
BuildRequires: libsolv-devel >= 0.6.5
%if 0%{?suse_version} >= 1100
+BuildRequires: libsolv-tools
%requires_eq libsolv-tools
%else
Requires: libsolv-tools
@@ -209,13 +211,20 @@
export CXXFLAGS="$RPM_OPT_FLAGS"
unset TRANSLATION_SET
unset EXTRA_CMAKE_OPTIONS
-# SLE11-* might want its own translation set:
-%if 0%{?suse_version} == 1110
+# Same codebase, but SLES may use it's own translation set.
+# suse_version
+# 1110 SLES11
+# 1315 SLES12
+%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
if [ -f ../po/sle-zypp-po.tar.bz ]; then
export TRANSLATION_SET=sle-zypp
- export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
fi
%endif
+# No libproxy on SLE11
+%if 0%{?suse_version} == 1110
+export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
+%endif
+
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DDOC_INSTALL_DIR=%{_docdir} \
-DLIB=%{_lib} \
@@ -252,6 +261,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/appdata
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/services
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system
++++++ libzypp-14.29.0.tar.bz2 -> libzypp-14.29.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/VERSION.cmake new/libzypp-14.29.4/VERSION.cmake
--- old/libzypp-14.29.0/VERSION.cmake 2014-09-16 10:49:10.000000000 +0200
+++ new/libzypp-14.29.4/VERSION.cmake 2014-09-25 18:01:10.000000000 +0200
@@ -61,8 +61,8 @@
SET(LIBZYPP_MAJOR "14")
SET(LIBZYPP_COMPATMINOR "29")
SET(LIBZYPP_MINOR "29")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "4")
#
-# LAST RELEASED: 14.29.0 (29)
+# LAST RELEASED: 14.29.4 (29)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/doc/autoinclude/Plugins.doc new/libzypp-14.29.4/doc/autoinclude/Plugins.doc
--- old/libzypp-14.29.0/doc/autoinclude/Plugins.doc 2014-07-01 11:30:28.000000000 +0200
+++ new/libzypp-14.29.4/doc/autoinclude/Plugins.doc 2014-09-25 18:01:10.000000000 +0200
@@ -83,6 +83,19 @@
\endverbatim
<HR><!-- ====================================================================== -->
+\section plugins-impl Developers: Implementation
+
+Plugins are implemented in the following classes:
+
+- \ref zypp::PluginScript (Plugin as an external program)
+- \ref zypp::PluginScriptException
+- \ref zypp::PluginFrame (Message for the stateful protocol)
+- \ref zypp::PluginFrameException
+- \ref zypp::repo::PluginServices (Finds Service plugins)
+
+The plugins default location is obtained from \ref zypp::ZConfig::pluginsPath()
+
+<HR><!-- ====================================================================== -->
\section plugin-toc Supported plugins
\subpage plugin-commit Escort installation of packages
@@ -91,6 +104,7 @@
\ref plugin-url-resolver
+\ref plugin-appdata
<HR><!-- ====================================================================== -->
\section plugin-services Service plugins
@@ -141,7 +155,7 @@
plugin:foo?param1=val1¶m2=val2
\endverbatim
-ZYpp tries to executa a plugin named foo (in /usr/lib/zypp/plugins/urlresolver) and calla it with the following protocol:
+ZYpp tries to executa a plugin named foo (in /usr/lib/zypp/plugins/urlresolver) and call it with the following protocol:
\verbatim
RESOLVEURL
@@ -187,16 +201,17 @@
In this example, the service plugin could have inmediately resolved the urls and returned http://realurl, but the url resolver allows also to add HTTP headers to the request.
<HR><!-- ====================================================================== -->
-\section plugins-impl Developers: Implementation
+\section plugin-appdata Appdata refresh plugins (repo change)
-Plugins are implemented in the following classes:
+Stateless plugins found in /usr/lib/zypp/plugins/appdata are called whenever any of the system repos has changed (added/removed/renamed/modified) or has been refreshed. Detailed information \b what exactly has changed is not available. (scripts are executed IFF euid is '0' and --root is not used). For every enabled system repo we pass alias type and metadata path on the commandline like this:
-- \ref zypp::PluginScript (Plugin as an external program)
-- \ref zypp::PluginScriptException
-- \ref zypp::PluginFrame (Message for the stateful protocol)
-- \ref zypp::PluginFrameException
-- \ref zypp::repo::PluginServices (Finds Service plugins)
+\verbatim
+ -R REPO_ALIAS -t REPO_TYPE -p REPO_METADATA_PATH -R NEXT_REPO....
+\endverbatim
-The plugins default location is obtained from \ref zypp::ZConfig::pluginsPath()
+\note REPO_TYPE can be e.g. "rpm-md", "yast2", "plaindir" or "NONE" indicating the repo was not yet probed.
+
+\note REPO_METADATA_PATH can be empty or a not existing directory, indicating valid metadata for the repo are not yet available.
+Scripts are executed 'fire and forget' whenever a RepoManager instance that performed changes goes out of scope. So it's up to the script to protect against concurrency.
*/
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/libzypp.spec.cmake new/libzypp-14.29.4/libzypp.spec.cmake
--- old/libzypp-14.29.0/libzypp.spec.cmake 2014-09-16 15:20:17.000000000 +0200
+++ new/libzypp-14.29.4/libzypp.spec.cmake 2014-09-25 18:01:10.000000000 +0200
@@ -32,6 +32,7 @@
# Features we provide (update doc/autoinclude/FeatureTest.doc):
Provides: libzypp(plugin) = 0
+Provides: libzypp(plugin:appdata) = 0
Provides: libzypp(plugin:commit) = 1
Provides: libzypp(plugin:services) = 0
Provides: libzypp(plugin:system) = 0
@@ -75,6 +76,7 @@
BuildRequires: libsolv-devel >= 0.6.5
%if 0%{?suse_version} >= 1100
+BuildRequires: libsolv-tools
%requires_eq libsolv-tools
%else
Requires: libsolv-tools
@@ -209,13 +211,20 @@
export CXXFLAGS="$RPM_OPT_FLAGS"
unset TRANSLATION_SET
unset EXTRA_CMAKE_OPTIONS
-# SLE11-* might want its own translation set:
-%if 0%{?suse_version} == 1110
+# Same codebase, but SLES may use it's own translation set.
+# suse_version
+# 1110 SLES11
+# 1315 SLES12
+%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
if [ -f ../po/sle-zypp-po.tar.bz ]; then
export TRANSLATION_SET=sle-zypp
- export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
fi
%endif
+# No libproxy on SLE11
+%if 0%{?suse_version} == 1110
+export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
+%endif
+
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DDOC_INSTALL_DIR=%{_docdir} \
-DLIB=%{_lib} \
@@ -252,6 +261,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/appdata
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/services
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/package/libzypp.changes new/libzypp-14.29.4/package/libzypp.changes
--- old/libzypp-14.29.0/package/libzypp.changes 2014-09-16 10:49:10.000000000 +0200
+++ new/libzypp-14.29.4/package/libzypp.changes 2014-09-25 18:01:10.000000000 +0200
@@ -1,6 +1,62 @@
-------------------------------------------------------------------
+Thu Sep 25 17:59:06 CEST 2014 - ma(a)suse.de
+
+- Trigger appdata plugin when system repos have changed (bnc#866257)
+- Protect against race when destructing globals
+- BuildRequire libsolv-tools as libsolv-devel no longer does
+- version 14.29.4 (29)
+
+-------------------------------------------------------------------
+Thu Sep 25 01:15:42 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue Sep 23 17:07:45 CEST 2014 - ma(a)suse.de
+
+- Fix computation of userinstalled items (bnc#897404)
+- version 14.29.3 (29)
+
+-------------------------------------------------------------------
+Tue Sep 23 10:55:08 CEST 2014 - ma(a)suse.de
+
+- Adapt to API changes in rpm.4.12
+- SLE-12 (suse_version 1315) uses it's own translations set
+ (bnc#897176)
+- version 14.29.2 (29)
+
+-------------------------------------------------------------------
+Sun Sep 21 01:13:25 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 18 15:47:50 CEST 2014 - ma(a)suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 18 15:47:34 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 18 15:46:11 CEST 2014 - ma(a)suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Wed Sep 17 13:18:23 CEST 2014 - ma(a)suse.de
+
+- adjust BuildRequires
+- version 14.29.1 (29)
+
+-------------------------------------------------------------------
Tue Sep 16 10:45:39 CEST 2014 - ma(a)suse.de
+- DiskUsageCounter: Set growonly on detetcted snapshotting btrfs
+ partitions (bnc#896176)
+- DiskUsageCounter: Allow MountPoint to store fstype
- DiskUsageCounter: Support setting 'growonly' partition hint
(bnc#896176)
- version 14.29.0 (29)
Files old/libzypp-14.29.0/po/sle-zypp-po.tar.bz2 and new/libzypp-14.29.4/po/sle-zypp-po.tar.bz2 differ
Files old/libzypp-14.29.0/po/zypp-po.tar.bz2 and new/libzypp-14.29.4/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/tests/sat/CMakeLists.txt new/libzypp-14.29.4/tests/sat/CMakeLists.txt
--- old/libzypp-14.29.0/tests/sat/CMakeLists.txt 2014-07-01 11:30:28.000000000 +0200
+++ new/libzypp-14.29.4/tests/sat/CMakeLists.txt 2014-09-23 17:08:59.000000000 +0200
@@ -6,6 +6,7 @@
IdString
LookupAttr
Pool
+ Queue
Map
Solvable
SolvParsing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/tests/sat/Queue_test.cc new/libzypp-14.29.4/tests/sat/Queue_test.cc
--- old/libzypp-14.29.0/tests/sat/Queue_test.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-14.29.4/tests/sat/Queue_test.cc 2014-09-23 17:08:59.000000000 +0200
@@ -0,0 +1,51 @@
+#include <stdio.h>
+#include <iostream>
+#include <boost/test/auto_unit_test.hpp>
+
+#include "zypp/base/LogTools.h"
+#include "zypp/base/Easy.h"
+#include "zypp/sat/Queue.h"
+
+
+#define BOOST_TEST_MODULE Queue
+
+using std::endl;
+using std::cout;
+using namespace zypp;
+using namespace boost::unit_test;
+
+
+BOOST_AUTO_TEST_CASE(basic)
+{
+ sat::Queue m;
+ BOOST_CHECK_EQUAL( m.empty(), true );
+ BOOST_CHECK_EQUAL( m.size(), 0 );
+ BOOST_CHECK_EQUAL( m.begin(), m.end() );
+ BOOST_CHECK( m == sat::Queue() );
+ BOOST_CHECK_EQUAL( m.first(), 0 );
+ BOOST_CHECK_EQUAL( m.last(), 0 );
+
+ m.push( 13 );
+ BOOST_CHECK_EQUAL( m.empty(), false );
+ BOOST_CHECK_EQUAL( m.size(), 1 );
+ BOOST_CHECK( m.begin() != m.end() );
+ BOOST_CHECK_EQUAL( m.begin()+1, m.end() );
+
+ BOOST_CHECK_EQUAL( m.first(), 13 );
+ BOOST_CHECK_EQUAL( m.last(), 13 );
+ BOOST_CHECK_EQUAL( m.at(0), 13 );
+ BOOST_CHECK_THROW( m.at(1), std::out_of_range );
+
+ BOOST_CHECK( m.contains(13) );
+ BOOST_CHECK( !m.contains(14) );
+
+ BOOST_CHECK_EQUAL( m.find(13), m.begin() );
+ BOOST_CHECK_EQUAL( m.find(14), m.end() );
+
+ m.pushUnique( 13 );
+ BOOST_CHECK_EQUAL( m.size(), 1 );
+ m.push( 13 );
+ BOOST_CHECK_EQUAL( m.size(), 2 );
+ m.remove( 13 );
+ BOOST_CHECK_EQUAL( m.size(), 0 );
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/zypp/ExternalProgram.cc new/libzypp-14.29.4/zypp/ExternalProgram.cc
--- old/libzypp-14.29.0/zypp/ExternalProgram.cc 2014-07-18 08:58:44.000000000 +0200
+++ new/libzypp-14.29.4/zypp/ExternalProgram.cc 2014-09-25 18:01:10.000000000 +0200
@@ -182,6 +182,7 @@
// retrieve options at beginning of arglist
const char * redirectStdin = nullptr; // <[file]
+ const char * redirectStdout = nullptr; // >[file]
const char * chdirTo = nullptr; // #/[path]
if ( root )
@@ -211,6 +212,13 @@
redirectStdin = "/dev/null";
break;
+ case '>':
+ strip = true;
+ redirectStdout = argv[0]+1;
+ if ( *redirectStdout == '\0' )
+ redirectStdout = "/dev/null";
+ break;
+
case '#':
strip = true;
if ( argv[0][1] == '/' ) // #/[path]
@@ -234,6 +242,8 @@
}
if ( redirectStdin )
cmdstr << " < '" << redirectStdin << "'";
+ if ( redirectStdout )
+ cmdstr << " > '" << redirectStdout << "'";
_command = cmdstr.str();
}
DBG << "Executing " << _command << endl;
@@ -301,6 +311,13 @@
dup2( inp_fd, 0 );
}
+ if ( redirectStdout )
+ {
+ ::close( 1 );
+ int inp_fd = open( redirectStdout, O_WRONLY|O_CREAT|O_APPEND, 0600 );
+ dup2( inp_fd, 1 );
+ }
+
// Handle stderr
if (stderr_disp == Discard_Stderr)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/zypp/ExternalProgram.h new/libzypp-14.29.4/zypp/ExternalProgram.h
--- old/libzypp-14.29.0/zypp/ExternalProgram.h 2014-07-18 08:58:44.000000000 +0200
+++ new/libzypp-14.29.4/zypp/ExternalProgram.h 2014-09-25 18:01:10.000000000 +0200
@@ -108,6 +108,10 @@
* const char* argv[] = { "</tmp/x", "cat", NULL };
* ExternalProgram prog( argv );
* \endcode
+ *
+ * Stdout redirection: If the \b 1st argument starts with a \b '>', the remaining
+ * part is treated as file opened for writing on standard output (or \c /dev/null
+ * if empty).
*/
ExternalProgram();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/zypp/RepoManager.cc new/libzypp-14.29.4/zypp/RepoManager.cc
--- old/libzypp-14.29.0/zypp/RepoManager.cc 2014-09-05 12:49:26.000000000 +0200
+++ new/libzypp-14.29.4/zypp/RepoManager.cc 2014-09-25 18:01:10.000000000 +0200
@@ -21,6 +21,7 @@
#include "zypp/base/InputStream.h"
#include "zypp/base/LogTools.h"
#include "zypp/base/Gettext.h"
+#include "zypp/base/DefaultIntegral.h"
#include "zypp/base/Function.h"
#include "zypp/base/Regex.h"
#include "zypp/PathInfo.h"
@@ -223,7 +224,7 @@
bool nonroot( geteuid() != 0 );
if ( nonroot && ! PathInfo(dir).userMayRX() )
{
- JobReport::warning( formatNAC(_("Cannot read repo directory ‘%1%’: Permission denied")) % dir );
+ JobReport::warning( formatNAC(_("Cannot read repo directory '%1%': Permission denied")) % dir );
}
else
{
@@ -241,7 +242,7 @@
{
if ( nonroot && ! PathInfo(*it).userMayR() )
{
- JobReport::warning( formatNAC(_("Cannot read repo file ‘%1%’: Permission denied")) % *it );
+ JobReport::warning( formatNAC(_("Cannot read repo file '%1%': Permission denied")) % *it );
}
else
{
@@ -441,19 +442,62 @@
init_knownRepositories();
}
+ ~Impl()
+ {
+ // trigger appdata refresh if some repos change
+ if ( _reposDirty && geteuid() == 0 && ( _options.rootDir.empty() || _options.rootDir == "/" ) )
+ {
+ try {
+ std::list<Pathname> entries;
+ filesystem::readdir( entries, _options.pluginsPath/"appdata", false );
+ if ( ! entries.empty() )
+ {
+ ExternalProgram::Arguments cmd;
+ cmd.push_back( "<" ); // discard stdin
+ cmd.push_back( ">" ); // discard stdout
+ cmd.push_back( "PROGRAM" ); // [2] - fix index below if changing!
+ for ( const auto & rinfo : repos() )
+ {
+ if ( ! rinfo.enabled() )
+ continue;
+ cmd.push_back( "-R" );
+ cmd.push_back( rinfo.alias() );
+ cmd.push_back( "-t" );
+ cmd.push_back( rinfo.type().asString() );
+ cmd.push_back( "-p" );
+ cmd.push_back( rinfo.metadataPath().asString() );
+ }
+
+ for_( it, entries.begin(), entries.end() )
+ {
+ PathInfo pi( *it );
+ //DBG << "/tmp/xx ->" << pi << endl;
+ if ( pi.isFile() && pi.userMayRX() )
+ {
+ // trigger plugin
+ cmd[2] = pi.asString(); // [2] - PROGRAM
+ ExternalProgram prog( cmd, ExternalProgram::Stderr_To_Stdout );
+ }
+ }
+ }
+ }
+ catch (...) {} // no throw in dtor
+ }
+ }
+
public:
- bool repoEmpty() const { return _repos.empty(); }
- RepoSizeType repoSize() const { return _repos.size(); }
- RepoConstIterator repoBegin() const { return _repos.begin(); }
- RepoConstIterator repoEnd() const { return _repos.end(); }
+ bool repoEmpty() const { return repos().empty(); }
+ RepoSizeType repoSize() const { return repos().size(); }
+ RepoConstIterator repoBegin() const { return repos().begin(); }
+ RepoConstIterator repoEnd() const { return repos().end(); }
bool hasRepo( const std::string & alias ) const
- { return foundAliasIn( alias, _repos ); }
+ { return foundAliasIn( alias, repos() ); }
RepoInfo getRepo( const std::string & alias ) const
{
- RepoConstIterator it( findAlias( alias, _repos ) );
- return it == _repos.end() ? RepoInfo::noRepo : *it;
+ RepoConstIterator it( findAlias( alias, repos() ) );
+ return it == repos().end() ? RepoInfo::noRepo : *it;
}
public:
@@ -558,8 +602,8 @@
void getRepositoriesInService( const std::string & alias, OutputIterator out ) const
{
MatchServiceAlias filter( alias );
- std::copy( boost::make_filter_iterator( filter, _repos.begin(), _repos.end() ),
- boost::make_filter_iterator( filter, _repos.end(), _repos.end() ),
+ std::copy( boost::make_filter_iterator( filter, repos().begin(), repos().end() ),
+ boost::make_filter_iterator( filter, repos().end(), repos().end() ),
out);
}
@@ -567,11 +611,16 @@
void init_knownServices();
void init_knownRepositories();
+ const RepoSet & repos() const { return _reposX; }
+ RepoSet & reposManip() { if ( ! _reposDirty ) _reposDirty = true; return _reposX; }
+
private:
RepoManagerOptions _options;
- RepoSet _repos;
+ RepoSet _reposX;
ServiceSet _services;
+ DefaultIntegral<bool,false> _reposDirty;
+
private:
friend Impl * rwcowClone<Impl>( const Impl * rhs );
/** clone for RWCOW_pointer */
@@ -703,7 +752,7 @@
// set the downloaded packages path for the repo
repoInfo.setPackagesPath( packagescache_path_for_repoinfo(_options, repoInfo) );
// remember it
- _repos.insert( repoInfo );
+ _reposX.insert( repoInfo ); // direct access via _reposX in ctor! no reposManip.
// detect orphaned repos belonging to a deleted service
const std::string & serviceAlias( repoInfo.service() );
@@ -1063,6 +1112,7 @@
// ok we have the metadata, now exchange
// the contents
filesystem::exchange( tmpdir.path(), mediarootpath );
+ reposManip(); // remember to trigger appdata refresh
// we are done.
return;
@@ -1454,7 +1504,7 @@
MIL << "Try adding repo " << info << endl;
RepoInfo tosave = info;
- if ( _repos.find(tosave) != _repos.end() )
+ if ( repos().find(tosave) != repos().end() )
ZYPP_THROW(RepoAlreadyExistsException(info));
// check the first url for now
@@ -1501,7 +1551,7 @@
oinfo.setMetadataPath( metadataPath( tosave ) );
oinfo.setPackagesPath( packagesPath( tosave ) );
}
- _repos.insert(tosave);
+ reposManip().insert(tosave);
progress.set(90);
@@ -1579,7 +1629,7 @@
MIL << "Saving " << (*it).alias() << endl;
it->setFilepath(repofile.asString());
it->dumpAsIniOn(file);
- _repos.insert(*it);
+ reposManip().insert(*it);
HistoryLog(_options.rootDir).addRepository(*it);
}
@@ -1663,7 +1713,7 @@
// now delete metadata (#301037)
cleanMetadata( todelete, mSubprogrcv );
cleanPackages( todelete, pSubprogrcv );
- _repos.erase(todelete);
+ reposManip().erase(todelete);
MIL << todelete.alias() << " sucessfully deleted." << endl;
HistoryLog(_options.rootDir).removeRepository(todelete);
return;
@@ -1723,8 +1773,8 @@
}
newinfo.setFilepath(toedit.filepath());
- _repos.erase(toedit);
- _repos.insert(newinfo);
+ reposManip().erase(toedit);
+ reposManip().insert(newinfo);
HistoryLog(_options.rootDir).modifyRepository(toedit, newinfo);
MIL << "repo " << alias << " modified" << endl;
}
@@ -1734,8 +1784,8 @@
RepoInfo RepoManager::Impl::getRepositoryInfo( const std::string & alias, const ProgressData::ReceiverFnc & progressrcv )
{
- RepoConstIterator it( findAlias( alias, _repos ) );
- if ( it != _repos.end() )
+ RepoConstIterator it( findAlias( alias, repos() ) );
+ if ( it != repos().end() )
return *it;
RepoInfo info;
info.setAlias( alias );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/zypp/repo/RepoType.cc new/libzypp-14.29.4/zypp/repo/RepoType.cc
--- old/libzypp-14.29.0/zypp/repo/RepoType.cc 2014-07-01 11:30:28.000000000 +0200
+++ new/libzypp-14.29.4/zypp/repo/RepoType.cc 2014-09-25 18:01:10.000000000 +0200
@@ -21,7 +21,7 @@
{
static NamedValue<RepoType::Type> & table()
{
- static NamedValue<RepoType::Type> _t;
+ static NamedValue<RepoType::Type> & _t( *new NamedValue<RepoType::Type> );
if ( _t.empty() )
{
_t( RepoType::RPMMD_e ) | "rpm-md" | "rpmmd"|"repomd"|"yum"|"up2date";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/zypp/sat/Queue.cc new/libzypp-14.29.4/zypp/sat/Queue.cc
--- old/libzypp-14.29.0/zypp/sat/Queue.cc 2014-07-01 11:30:28.000000000 +0200
+++ new/libzypp-14.29.4/zypp/sat/Queue.cc 2014-09-23 17:08:59.000000000 +0200
@@ -58,7 +58,7 @@
Queue::const_iterator Queue::find( value_type val_r ) const
{
for_( it, begin(), end() )
- if ( *it != val_r )
+ if ( *it == val_r )
return it;
return end();
}
@@ -96,11 +96,8 @@
void Queue::remove( value_type val_r )
{
- const_iterator it( find( val_r ) );
- if ( it != end() )
- {
+ for ( const_iterator it( find( val_r ) ); it != end(); it = find( val_r ) )
::queue_delete( _pimpl.get(), it - begin() );
- }
}
void Queue::push( value_type val_r )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/zypp/solver/detail/SATResolver.cc new/libzypp-14.29.4/zypp/solver/detail/SATResolver.cc
--- old/libzypp-14.29.0/zypp/solver/detail/SATResolver.cc 2014-07-11 13:45:16.000000000 +0200
+++ new/libzypp-14.29.4/zypp/solver/detail/SATResolver.cc 2014-09-17 13:33:09.000000000 +0200
@@ -57,6 +57,25 @@
/////////////////////////////////////////////////////////////////////////
namespace zypp
{ ///////////////////////////////////////////////////////////////////////
+
+ /////////////////////////////////////////////////////////////////////////
+ namespace env
+ {
+ inline bool HACKENV( const char * var_r, bool default_r )
+ {
+ bool ret = default_r;
+ const char * val = ::getenv( var_r );
+ if ( val )
+ {
+ ret = str::strToBool( val, default_r );
+ if ( ret != default_r )
+ INT << "HACKENV " << var_r << " = " << ret << endl;
+ }
+ return ret;
+ }
+ } // namespace env
+ /////////////////////////////////////////////////////////////////////////
+
///////////////////////////////////////////////////////////////////////
namespace solver
{ /////////////////////////////////////////////////////////////////////
@@ -112,20 +131,33 @@
{
os << "<resolver>" << endl;
if (_solv) {
- // os << " fixsystem = " << _solv->fixsystem << endl;
- // os << " updatesystem = " << _solv->updatesystem << endl;
- os << " allowdowngrade = " << solver_get_flag(_solv, SOLVER_FLAG_ALLOW_DOWNGRADE) << endl;
- os << " allowarchchange = " << solver_get_flag(_solv, SOLVER_FLAG_ALLOW_ARCHCHANGE) << endl;
- os << " allowvendorchange = " << solver_get_flag(_solv, SOLVER_FLAG_ALLOW_VENDORCHANGE) << endl;
- os << " allowuninstall = " << solver_get_flag(_solv, SOLVER_FLAG_ALLOW_UNINSTALL) << endl;
- os << " noupdateprovide = " << solver_get_flag(_solv, SOLVER_FLAG_NO_UPDATEPROVIDE) << endl;
- os << " dosplitprovides = " << solver_get_flag(_solv, SOLVER_FLAG_SPLITPROVIDES) << endl;
- os << " onlyRequires = " << solver_get_flag(_solv, SOLVER_FLAG_IGNORE_RECOMMENDED) << endl;
- os << " ignorealreadyrecommended = " << !solver_get_flag(_solv, SOLVER_FLAG_ADD_ALREADY_RECOMMENDED) << endl;
- os << " distupgrade = " << _distupgrade << endl;
- os << " distupgrade_removeunsupported = " << _distupgrade_removeunsupported << endl;
- os << " solveSrcPackages = " << _solveSrcPackages << endl;
- os << " cleandepsOnRemove = " << _cleandepsOnRemove << endl;
+#define OUTS(X) os << " " << #X << "\t= " << solver_get_flag(_solv, SOLVER_FLAG_##X) << endl
+ OUTS( ALLOW_DOWNGRADE );
+ OUTS( ALLOW_ARCHCHANGE );
+ OUTS( ALLOW_VENDORCHANGE );
+ OUTS( ALLOW_UNINSTALL );
+ OUTS( NO_UPDATEPROVIDE );
+ OUTS( SPLITPROVIDES );
+ OUTS( IGNORE_RECOMMENDED );
+ OUTS( ADD_ALREADY_RECOMMENDED );
+ OUTS( NO_INFARCHCHECK );
+ OUTS( ALLOW_NAMECHANGE );
+ OUTS( KEEP_EXPLICIT_OBSOLETES );
+ OUTS( BEST_OBEY_POLICY );
+ OUTS( NO_AUTOTARGET );
+ OUTS( DUP_ALLOW_DOWNGRADE );
+ OUTS( DUP_ALLOW_ARCHCHANGE );
+ OUTS( DUP_ALLOW_VENDORCHANGE );
+ OUTS( DUP_ALLOW_NAMECHANGE );
+ OUTS( KEEP_ORPHANS );
+ OUTS( BREAK_ORPHANS );
+ OUTS( FOCUS_INSTALLED );
+ OUTS( YUM_OBSOLETES );
+#undef OUTS
+ os << " distupgrade = " << _distupgrade << endl;
+ os << " distupgrade_removeunsupported = " << _distupgrade_removeunsupported << endl;
+ os << " solveSrcPackages = " << _solveSrcPackages << endl;
+ os << " cleandepsOnRemove = " << _cleandepsOnRemove << endl;
} else {
os << "<NULL>";
}
@@ -448,6 +480,13 @@
solver_set_flag(_solv, SOLVER_FLAG_NO_UPDATEPROVIDE, _noupdateprovide);
solver_set_flag(_solv, SOLVER_FLAG_IGNORE_RECOMMENDED, _onlyRequires);
+#define HACKENV(X,D) solver_set_flag(_solv, X, env::HACKENV( #X, D ) );
+ HACKENV( SOLVER_FLAG_DUP_ALLOW_DOWNGRADE, true );
+ HACKENV( SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE, true );
+ HACKENV( SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE,true );
+ HACKENV( SOLVER_FLAG_DUP_ALLOW_NAMECHANGE, true );
+#undef HACKENV
+
sat::Pool::instance().prepareForSolving();
// Solve !
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/zypp/target/rpm/librpm.h new/libzypp-14.29.4/zypp/target/rpm/librpm.h
--- old/libzypp-14.29.0/zypp/target/rpm/librpm.h 2014-07-01 11:30:28.000000000 +0200
+++ new/libzypp-14.29.4/zypp/target/rpm/librpm.h 2014-09-22 14:25:09.000000000 +0200
@@ -28,6 +28,7 @@
#include <rpm/rpmmacro.h>
#include <rpm/rpmdb.h>
#include <rpm/rpmts.h>
+#include <rpm/rpmfi.h>
#include <fcntl.h>
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.29.0/zypp/target/rpm/librpmDb.cc new/libzypp-14.29.4/zypp/target/rpm/librpmDb.cc
--- old/libzypp-14.29.0/zypp/target/rpm/librpmDb.cc 2014-07-01 11:30:28.000000000 +0200
+++ new/libzypp-14.29.4/zypp/target/rpm/librpmDb.cc 2014-09-22 14:25:09.000000000 +0200
@@ -679,7 +679,11 @@
if ( ! create( RPMDBI_PACKAGES ) )
return false;
#warning TESTCASE: rpmdbAppendIterator and (non)sequential access?
+#ifdef RPMFILEITERMAX // since rpm.4.12
+ ::rpmdbAppendIterator( _mi, (const unsigned *)&off_r, 1 );
+#else
::rpmdbAppendIterator( _mi, &off_r, 1 );
+#endif
return advance();
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package bash for openSUSE:13.1:Update checked in at 2014-09-26 18:03:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/bash (Old)
and /work/SRC/openSUSE:13.1:Update/.bash.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.khlL9a/_old 2014-09-26 18:03:07.000000000 +0200
+++ /var/tmp/diff_new_pack.khlL9a/_new 2014-09-26 18:03:07.000000000 +0200
@@ -1 +1 @@
-<link package='bash.3023' cicount='copy' />
+<link package='bash.3027' 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
Hello community,
here is the log from the commit of package bash for openSUSE:12.3:Update checked in at 2014-09-26 17:55:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/bash (Old)
and /work/SRC/openSUSE:12.3:Update/.bash.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.s088PD/_old 2014-09-26 17:55:18.000000000 +0200
+++ /var/tmp/diff_new_pack.s088PD/_new 2014-09-26 17:55:18.000000000 +0200
@@ -1 +1 @@
-<link package='bash.3023' cicount='copy' />
+<link package='bash.3029' 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
Hello community,
here is the log from the commit of package mozilla-nss for openSUSE:13.1:Update checked in at 2014-09-26 14:20:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/mozilla-nss (Old)
and /work/SRC/openSUSE:13.1:Update/.mozilla-nss.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-nss"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.7j4DRq/_old 2014-09-26 14:20:42.000000000 +0200
+++ /var/tmp/diff_new_pack.7j4DRq/_new 2014-09-26 14:20:42.000000000 +0200
@@ -1 +1 @@
-<link package='mozilla-nss.2982' cicount='copy' />
+<link package='mozilla-nss.3024' 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