commit libstorage for openSUSE:12.3
Hello community, here is the log from the commit of package libstorage for openSUSE:12.3 checked in at 2013-02-22 16:53:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/libstorage (Old) and /work/SRC/openSUSE:12.3/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/libstorage/libstorage.changes 2013-02-21 10:42:22.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.libstorage.new/libstorage.changes 2013-02-22 16:53:56.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 21 18:51:42 CET 2013 - fehr@suse.de + +- version 2.23.7 +- fix bug with creation of encrypted LVM on S390 (bnc#804598) +- add y2log entries for source md5sum and source modify date + +------------------------------------------------------------------- Old: ---- libstorage-2.23.6.tar.bz2 New: ---- libstorage-2.23.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.MnJSOI/_old 2013-02-22 16:53:57.000000000 +0100 +++ /var/tmp/diff_new_pack.MnJSOI/_new 2013-02-22 16:53:57.000000000 +0100 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.23.6 +Version: 2.23.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.23.6.tar.bz2 -> libstorage-2.23.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/VERSION new/libstorage-2.23.7/VERSION --- old/libstorage-2.23.6/VERSION 2013-02-20 19:02:41.000000000 +0100 +++ new/libstorage-2.23.7/VERSION 2013-02-21 16:25:43.000000000 +0100 @@ -1 +1 @@ -2.23.6 +2.23.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/libstorage.spec.in new/libstorage-2.23.7/libstorage.spec.in --- old/libstorage-2.23.6/libstorage.spec.in 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.7/libstorage.spec.in 2013-02-21 16:06:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libstorage # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/storage/Dasd.cc new/libstorage-2.23.7/storage/Dasd.cc --- old/libstorage-2.23.6/storage/Dasd.cc 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.7/storage/Dasd.cc 2013-02-21 19:11:32.000000000 +0100 @@ -415,7 +415,17 @@ { ConstVolPair p = volPair(stageIncrease); if( !p.empty() ) - vol.push_back( &(*(p.begin())) ); + { + ConstVolIterator i = p.begin(); + vol.push_back( &(*i) ); + ++i; + while( i!=p.end() ) + { + if( i->needExtend()||i->needCrsetup() ) + vol.push_back( &(*i) ); + ++i; + } + } } else Disk::getToCommit( stage, col, vol ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/storage/Makefile.am new/libstorage-2.23.7/storage/Makefile.am --- old/libstorage-2.23.6/storage/Makefile.am 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.7/storage/Makefile.am 2013-02-21 16:25:43.000000000 +0100 @@ -63,7 +63,8 @@ FilterIterator.h ListListIterator.h \ DerefIterator.h IterPair.h \ Region.cc Region.h \ - StorageTmpl.h StorageDefines.h + StorageTmpl.h StorageDefines.h \ + gen_md5sum.cc gen_md5sum.h libstorage_la_LDFLAGS = -version-info @LIBVERSION_INFO@ libstorage_la_LIBADD = -lxml2 @@ -71,8 +72,15 @@ $(srcdir)/gen_pathlist.cc: StorageDefines.h grep BIN $< | sed -e "/PARTEDCMD/d" -e "s/^[^ ]*[ ]\+//" -e "s/ .*/,/" >$@ +$(srcdir)/gen_md5sum.cc: $(filter-out gen_md5sum.cc,$(libstorage_la_SOURCES)) + ./create_md5sum_date_file $(filter-out gen_md5sum.cc,$(libstorage_la_SOURCES)) + BUILT_SOURCES = gen_pathlist.cc +noinst_SCRIPTS = create_md5sum_date_file generate_md5_sources + +EXTRA_DIST = $(noinst_SCRIPTS) + pkgincludedir = $(includedir)/storage pkginclude_HEADERS = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/storage/Makefile.in new/libstorage-2.23.7/storage/Makefile.in --- old/libstorage-2.23.6/storage/Makefile.in 2013-02-20 19:03:06.000000000 +0100 +++ new/libstorage-2.23.7/storage/Makefile.in 2013-02-21 19:11:59.000000000 +0100 @@ -19,6 +19,7 @@ # + VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -106,7 +107,7 @@ ArchInfo.lo AsciiFile.lo XmlFile.lo SystemInfo.lo ProcParts.lo \ Blkid.lo Lsscsi.lo Parted.lo Dasdview.lo ProcMounts.lo \ ProcMdstat.lo EtcFstab.lo EtcMdadm.lo Geometry.lo AppUtil.lo \ - Enum.lo Lock.lo StorageTypes.lo Region.lo + Enum.lo Lock.lo StorageTypes.lo Region.lo gen_md5sum.lo libstorage_la_OBJECTS = $(am_libstorage_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -115,6 +116,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(libstorage_la_LDFLAGS) $(LDFLAGS) \ -o $@ +SCRIPTS = $(noinst_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -371,11 +373,14 @@ FilterIterator.h ListListIterator.h \ DerefIterator.h IterPair.h \ Region.cc Region.h \ - StorageTmpl.h StorageDefines.h + StorageTmpl.h StorageDefines.h \ + gen_md5sum.cc gen_md5sum.h libstorage_la_LDFLAGS = -version-info @LIBVERSION_INFO@ libstorage_la_LIBADD = -lxml2 BUILT_SOURCES = gen_pathlist.cc +noinst_SCRIPTS = create_md5sum_date_file generate_md5_sources +EXTRA_DIST = $(noinst_SCRIPTS) pkginclude_HEADERS = \ StorageVersion.h \ StorageInterface.h \ @@ -517,6 +522,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TmpfsCo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Volume.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlFile.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_md5sum.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -665,7 +671,7 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -794,6 +800,9 @@ $(srcdir)/gen_pathlist.cc: StorageDefines.h grep BIN $< | sed -e "/PARTEDCMD/d" -e "s/^[^ ]*[ ]\+//" -e "s/ .*/,/" >$@ +$(srcdir)/gen_md5sum.cc: $(filter-out gen_md5sum.cc,$(libstorage_la_SOURCES)) + ./create_md5sum_date_file $(filter-out gen_md5sum.cc,$(libstorage_la_SOURCES)) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/storage/Storage.cc new/libstorage-2.23.7/storage/Storage.cc --- old/libstorage-2.23.6/storage/Storage.cc 2013-02-20 18:26:33.000000000 +0100 +++ new/libstorage-2.23.7/storage/Storage.cc 2013-02-21 16:25:43.000000000 +0100 @@ -56,6 +56,7 @@ #include "storage/EtcMdadm.h" #include "storage/AsciiFile.h" #include "storage/StorageDefines.h" +#include "storage/gen_md5sum.h" namespace storage @@ -104,6 +105,8 @@ { y2mil("constructed Storage with " << env); y2mil("libstorage version " VERSION); + y2mil("libstorage source md5sum:" << GetSourceMd5() ); + y2mil("libstorage source moddate:" << GetSourceDate() ); atexit( clean_tmpdir ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/storage/create_md5sum_date_file new/libstorage-2.23.7/storage/create_md5sum_date_file --- old/libstorage-2.23.6/storage/create_md5sum_date_file 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.23.7/storage/create_md5sum_date_file 2013-02-21 16:25:43.000000000 +0100 @@ -0,0 +1,16 @@ +#/bin/bash +GEN=gen_md5sum.cc +MD5_CUR=`./generate_md5_sources` +MD5_SAV=`grep SOURCES_MD5SUM $GEN 2>/dev/null | sed -e "s/^.*SOURCES_MD5SUM//" -e "s/[ ]\+//"` +if [ "$MD5_CUR" != "$MD5_SAV" ] +then + echo "#define SOURCES_MD5SUM \"$MD5_CUR\"" > $GEN + echo "#define SOURCES_MD5_DATE \"" `date` "\"" >> $GEN + echo "namespace storage" >> $GEN + echo "{" >> $GEN + echo "const char* GetSourceMd5() { return SOURCES_MD5SUM; }" >> $GEN + echo "const char* GetSourceDate() { return SOURCES_MD5_DATE; }" >> $GEN + echo "}" >> $GEN +else + touch $GEN +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/storage/gen_md5sum.cc new/libstorage-2.23.7/storage/gen_md5sum.cc --- old/libstorage-2.23.6/storage/gen_md5sum.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.23.7/storage/gen_md5sum.cc 2013-02-21 19:17:13.000000000 +0100 @@ -0,0 +1,7 @@ +#define SOURCES_MD5SUM "66906e7171bb8538b582a4361d69826e" +#define SOURCES_MD5_DATE " Thu Feb 21 19:17:13 CET 2013 " +namespace storage +{ +const char* GetSourceMd5() { return SOURCES_MD5SUM; } +const char* GetSourceDate() { return SOURCES_MD5_DATE; } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/storage/gen_md5sum.h new/libstorage-2.23.7/storage/gen_md5sum.h --- old/libstorage-2.23.6/storage/gen_md5sum.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.23.7/storage/gen_md5sum.h 2013-02-21 16:25:43.000000000 +0100 @@ -0,0 +1,10 @@ +#ifndef GEN_MD5SUM_H +#define GEN_MD5SUM_H + +namespace storage +{ +const char* GetSourceMd5(); +const char* GetSourceDate(); +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.6/storage/generate_md5_sources new/libstorage-2.23.7/storage/generate_md5_sources --- old/libstorage-2.23.6/storage/generate_md5_sources 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.23.7/storage/generate_md5_sources 2013-02-21 16:25:43.000000000 +0100 @@ -0,0 +1,5 @@ +#/bin/bash +LIST=$* +[ -z "$1" ] && LIST=`ls *.cc *.h | grep -v "gen.*.cc"` +LIST=`echo $LIST | tr " " "\n" | sort` +cat $LIST | md5sum | sed "s/ .*//"
participants (1)
-
root@hilbert.suse.de