commit libstorage for openSUSE:Factory
Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-04-26 11:45:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-04-13 13:13:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-04-26 11:45:17.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Apr 22 13:55:01 CEST 2014 - aschnell@suse.de + +- moved lock file to /run/libstorage + +------------------------------------------------------------------- +Fri Apr 11 18:10:00 CEST 2014 - aschnell@suse.de + +- removed workaround for blkid file-system misdetection + (bnc#869359) +- 2.25.12 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.11.tar.bz2 New: ---- libstorage-2.25.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.fAqgBQ/_old 2014-04-26 11:45:18.000000000 +0200 +++ /var/tmp/diff_new_pack.fAqgBQ/_new 2014-04-26 11:45:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.11 +Version: 2.25.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 @@ -90,8 +90,8 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" -install -d -m 755 $RPM_BUILD_ROOT/var/run/libstorage -touch $RPM_BUILD_ROOT/var/run/libstorage/lock +install -d -m 755 $RPM_BUILD_ROOT/run/libstorage +touch $RPM_BUILD_ROOT/run/libstorage/lock %{find_lang} libstorage @@ -153,7 +153,7 @@ %files -n libstorage5 -f libstorage.lang %defattr(-,root,root) %{_libdir}/libstorage.so.* -%ghost /var/run/libstorage +%ghost /run/libstorage /var/adm/fillup-templates/sysconfig.storage-libstorage %doc %dir %{prefix}/share/doc/packages/libstorage %doc %{prefix}/share/doc/packages/libstorage/AUTHORS ++++++ libstorage-2.25.11.tar.bz2 -> libstorage-2.25.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/VERSION new/libstorage-2.25.12/VERSION --- old/libstorage-2.25.11/VERSION 2014-03-25 14:10:55.000000000 +0100 +++ new/libstorage-2.25.12/VERSION 2014-04-14 10:23:54.000000000 +0200 @@ -1 +1 @@ -2.25.11 +2.25.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/libstorage.spec.in new/libstorage-2.25.12/libstorage.spec.in --- old/libstorage-2.25.11/libstorage.spec.in 2014-04-08 14:04:19.000000000 +0200 +++ new/libstorage-2.25.12/libstorage.spec.in 2014-04-22 14:12:23.000000000 +0200 @@ -82,8 +82,8 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" -install -d -m 755 $RPM_BUILD_ROOT/var/run/libstorage -touch $RPM_BUILD_ROOT/var/run/libstorage/lock +install -d -m 755 $RPM_BUILD_ROOT/run/libstorage +touch $RPM_BUILD_ROOT/run/libstorage/lock %{find_lang} libstorage @@ -145,7 +145,7 @@ %files -n libstorage@LIBVERSION_MAJOR@ -f libstorage.lang %defattr(-,root,root) %{_libdir}/libstorage.so.* -%ghost /var/run/libstorage +%ghost /run/libstorage /var/adm/fillup-templates/sysconfig.storage-libstorage %doc %dir %{prefix}/share/doc/packages/libstorage %doc %{prefix}/share/doc/packages/libstorage/AUTHORS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/Lock.cc new/libstorage-2.25.12/storage/Lock.cc --- old/libstorage-2.25.11/storage/Lock.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.12/storage/Lock.cc 2014-04-22 14:12:23.000000000 +0200 @@ -33,6 +33,9 @@ #include "storage/Lock.h" +#define LOCKDIR "/run/libstorage" + + namespace storage { @@ -56,12 +59,12 @@ y2mil("getting " << (readonly ? "read-only" : "read-write") << " lock"); - if (mkdir("/var/run/libstorage", 0755) == -1 && errno != EEXIST) + if (mkdir(LOCKDIR, 0755) == -1 && errno != EEXIST) { y2err("creating directory for lock-file failed: " << strerror(errno)); } - fd = open("/var/run/libstorage/lock", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT | O_CLOEXEC, + fd = open(LOCKDIR "/lock", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); if (fd < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/Storage.cc new/libstorage-2.25.12/storage/Storage.cc --- old/libstorage-2.25.11/storage/Storage.cc 2014-03-21 17:06:30.000000000 +0100 +++ new/libstorage-2.25.12/storage/Storage.cc 2014-04-15 12:13:27.000000000 +0200 @@ -4310,7 +4310,6 @@ ret = co.addNfs(nfsDev, 0, opts, "", nfs4); if( instsys() ) { - SystemCmd c; string prog_name = RPCBINDBIN; //We don't have rpcbind (#423026, #427428) ... @@ -4321,8 +4320,9 @@ prog_name = PORTMAPBIN; } + SystemCmd c; c.execute( prog_name ); - c.execute( "/usr/sbin/rpc.statd" ); + c.execute(RPCSTATDBIN); } if( ret==0 && (ret=co.vBegin()->mount( mdir ))==0 ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/StorageDefines.h new/libstorage-2.25.12/storage/StorageDefines.h --- old/libstorage-2.25.11/storage/StorageDefines.h 2014-02-24 14:59:33.000000000 +0100 +++ new/libstorage-2.25.12/storage/StorageDefines.h 2014-04-15 12:13:27.000000000 +0200 @@ -84,6 +84,7 @@ #define GREPBIN "/usr/bin/grep" #define PORTMAPBIN "/sbin/portmap" #define RPCBINDBIN "/sbin/rpcbind" +#define RPCSTATDBIN "/usr/sbin/rpc.statd" #define NTFSRESIZEBIN "/usr/sbin/ntfsresize" #define XFSGROWFSBIN "/usr/sbin/xfs_growfs" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/SystemInfo/CmdBlkid.cc new/libstorage-2.25.12/storage/SystemInfo/CmdBlkid.cc --- old/libstorage-2.25.11/storage/SystemInfo/CmdBlkid.cc 2014-03-19 11:11:26.000000000 +0100 +++ new/libstorage-2.25.12/storage/SystemInfo/CmdBlkid.cc 2014-04-14 10:23:54.000000000 +0200 @@ -110,17 +110,6 @@ } } - i = m.find("SEC_TYPE"); - if (i != m.end()) - { - map<string, FsType>::const_iterator it2 = fs_table.find(i->second); - if (it2 != fs_table.end()) - { - entry.is_fs = true; - entry.fs_type = it2->second; - } - } - if (entry.is_fs) { i = m.find("UUID"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/gen_md5sum.cc new/libstorage-2.25.12/storage/gen_md5sum.cc --- old/libstorage-2.25.11/storage/gen_md5sum.cc 2014-04-08 14:05:38.000000000 +0200 +++ new/libstorage-2.25.12/storage/gen_md5sum.cc 2014-04-22 14:12:26.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "277120fc472f2cc939a01a797317df12" -#define SOURCES_MD5_DATE " Tue 8 Apr 14:05:38 CEST 2014 " +#define SOURCES_MD5SUM "ce93c2502ebd3b2b7021850a607862fa" +#define SOURCES_MD5_DATE " Tue 22 Apr 14:12:26 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/testsuite/single.out/blkid.out new/libstorage-2.25.12/testsuite/single.out/blkid.out --- old/libstorage-2.25.11/testsuite/single.out/blkid.out 2014-03-19 11:11:26.000000000 +0100 +++ new/libstorage-2.25.12/testsuite/single.out/blkid.out 2014-04-14 10:23:54.000000000 +0200 @@ -16,5 +16,5 @@ data[/dev/sda2] -> is_luks:true luks_uuid:f98def5a-6553-49a1-940d-df55a77d7d28 parse3 -data[/dev/dasda1] -> is_fs:true fs_type:ext2 fs_uuid:ab43b144-37e2-4e9c-8369-6df220f055b0 +data[/dev/dasda1] -> is_fs:true fs_type:ext4 fs_uuid:ab43b144-37e2-4e9c-8369-6df220f055b0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de