October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2014-10-08 22:13:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2014-10-05 20:31:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-10-08 22:13:38.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 3 01:05:01 CEST 2014 - dsterba(a)suse.cz + +- add option --all-configs to snapper client, list snapshots from + all accessible configs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper-0.2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.4/client/snapper.cc new/snapper-0.2.4/client/snapper.cc --- old/snapper-0.2.4/client/snapper.cc 2014-10-02 15:46:25.000000000 +0200 +++ new/snapper-0.2.4/client/snapper.cc 2014-10-06 10:44:19.000000000 +0200 @@ -140,6 +140,32 @@ } +list<pair<string, string> > +enum_configs(DBus::Connection* conn) +{ + list<pair<string, string> > configs; + + if (no_dbus) + { + list<ConfigInfo> config_infos = Snapper::getConfigs(); + for (list<ConfigInfo>::const_iterator it = config_infos.begin(); it != config_infos.end(); ++it) + { + configs.push_back(make_pair(it->getConfigName(), it->getSubvolume())); + } + } + else + { + list<XConfigInfo> config_infos = command_list_xconfigs(*conn); + for (list<XConfigInfo>::const_iterator it = config_infos.begin(); it != config_infos.end(); ++it) + { + configs.push_back(make_pair(it->config_name, it->subvolume)); + } + } + + return configs; +} + + void command_list_configs(DBus::Connection* conn, Snapper* snapper) { @@ -157,27 +183,14 @@ header.add(_("Subvolume")); table.setHeader(header); - if (no_dbus) - { - list<ConfigInfo> config_infos = Snapper::getConfigs(); - for (list<ConfigInfo>::const_iterator it = config_infos.begin(); it != config_infos.end(); ++it) - { - TableRow row; - row.add(it->getConfigName()); - row.add(it->getSubvolume()); - table.add(row); - } - } - else + list<pair<string, string> > configs = enum_configs(conn); + + for (list<pair<string,string> >::iterator it = configs.begin(); it != configs.end(); ++it) { - list<XConfigInfo> config_infos = command_list_xconfigs(*conn); - for (list<XConfigInfo>::const_iterator it = config_infos.begin(); it != config_infos.end(); ++it) - { - TableRow row; - row.add(it->config_name); - row.add(it->subvolume); - table.add(row); - } + TableRow row; + row.add(it->first); + row.add(it->second); + table.add(row); } cout << table; @@ -381,15 +394,20 @@ << endl << _(" Options for 'list' command:") << endl << _("\t--type, -t <type>\t\tType of snapshots to list.") << endl + << _("\t--all-configs, -a\t\tList snapshots from all accessible configs.") << endl << endl; } +enum ListMode { LM_ALL, LM_SINGLE, LM_PRE_POST }; + +void list_from_one_config(DBus::Connection* conn, Snapper* snapper, string config_name, ListMode list_mode); void command_list(DBus::Connection* conn, Snapper* snapper) { const struct option options[] = { { "type", required_argument, 0, 't' }, + { "all-configs", no_argument, 0, 'a' }, { 0, 0, 0, 0 } }; @@ -400,7 +418,6 @@ exit(EXIT_FAILURE); } - enum ListMode { LM_ALL, LM_SINGLE, LM_PRE_POST }; ListMode list_mode = LM_ALL; GetOpts::parsed_opts::const_iterator opt; @@ -420,6 +437,29 @@ } } + list<pair<string, string> > configs; + if ((opt = opts.find("all-configs")) != opts.end()) + { + configs = enum_configs(conn); + } + else + { + configs.push_back(make_pair(config_name, "")); + } + + for (list<pair<string,string> >::iterator it = configs.begin(); it != configs.end(); ++it) + { + if (it != configs.begin()) + cout << endl; + + if (configs.size() > 1) + cout << "Config: " << it->first << ", subvolume: " << it->second << endl; + list_from_one_config(conn, snapper, it->first, list_mode); + } +} + +void list_from_one_config(DBus::Connection* conn, Snapper* snapper, string config_name, ListMode list_mode) +{ Table table; switch (list_mode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.4/doc/snapper.xml.in new/snapper-0.2.4/doc/snapper.xml.in --- old/snapper-0.2.4/doc/snapper.xml.in 2014-10-02 15:46:25.000000000 +0200 +++ new/snapper-0.2.4/doc/snapper.xml.in 2014-10-06 10:44:19.000000000 +0200 @@ -310,6 +310,12 @@ all, single and pre-post.</para> </listitem> </varlistentry> + <varlistentry> + <term><option>-a, --all-configs</option></term> + <listitem> + <para>List snapshots from all configs accessible by the user.</para> + </listitem> + </varlistentry> </variablelist> </listitem> </varlistentry> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-inetd for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package yast2-inetd for openSUSE:Factory checked in at 2014-10-08 22:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-inetd (Old) and /work/SRC/openSUSE:Factory/.yast2-inetd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-inetd" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-inetd/yast2-inetd.changes 2014-09-07 11:09:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-inetd.new/yast2-inetd.changes 2014-10-08 22:13:35.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 29 10:51:23 CEST 2014 - schubi(a)suse.de + +- Checking nil parameters (server,server_args) in GetServerBasename + before making a dup. (bnc#898745) +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-inetd-3.1.8.tar.bz2 New: ---- yast2-inetd-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-inetd.spec ++++++ --- /var/tmp/diff_new_pack.chXRAF/_old 2014-10-08 22:13:36.000000000 +0200 +++ /var/tmp/diff_new_pack.chXRAF/_new 2014-10-08 22:13:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 3.1.8 +Version: 3.1.9 Release: 0 Url: https://github.com/yast/yast-inetd ++++++ yast2-inetd-3.1.8.tar.bz2 -> yast2-inetd-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/MAINTAINER new/yast2-inetd-3.1.9/MAINTAINER --- old/yast2-inetd-3.1.8/MAINTAINER 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/MAINTAINER 2014-10-08 11:03:10.000000000 +0200 @@ -1 +1 @@ -YaST2 Maintainers <yast2-maintainers(a)suse.de> +Deprecated file. Use `osc maintainer yast2-inetd` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/package/yast2-inetd.changes new/yast2-inetd-3.1.9/package/yast2-inetd.changes --- old/yast2-inetd-3.1.8/package/yast2-inetd.changes 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/package/yast2-inetd.changes 2014-10-08 11:03:10.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 29 10:51:23 CEST 2014 - schubi(a)suse.de + +- Checking nil parameters (server,server_args) in GetServerBasename + before making a dup. (bnc#898745) +- 3.1.9 + +------------------------------------------------------------------- Thu Sep 4 12:21:02 UTC 2014 - mvidner(a)suse.com - Use a more flexible rubygem requirement syntax (bnc#895069) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/package/yast2-inetd.spec new/yast2-inetd-3.1.9/package/yast2-inetd.spec --- old/yast2-inetd-3.1.8/package/yast2-inetd.spec 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/package/yast2-inetd.spec 2014-10-08 11:03:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 3.1.8 +Version: 3.1.9 Release: 0 Url: https://github.com/yast/yast-inetd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/src/include/inetd/routines.rb new/yast2-inetd-3.1.9/src/include/inetd/routines.rb --- old/yast2-inetd-3.1.8/src/include/inetd/routines.rb 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/src/include/inetd/routines.rb 2014-10-08 11:03:10.000000000 +0200 @@ -81,18 +81,18 @@ # @param [String] server_args "server_args" field of a service # @return basename of the real server def GetServerBasename(server, server_args) - result = (server == TCPD_BINARY ? server_args : server).dup + arg = server == TCPD_BINARY ? server_args : server + return nil unless arg - # check nil - if result && !result.empty? - # find the server name - server_path = result.strip.split(/[ \t]/).first - result = File.basename(server_path) - end + arg = arg.dup # do we really modify arg??? - result + server_path = arg.strip.split(/[ \t]/).first + return server_path if !server_path || server_path.empty? + + File.basename(server_path) end + # Considers the maps as structs and tests # some of their fields for equality (conjunctively, short circuit). # @param [Hash] a one struct diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/test/inetd_test.rb new/yast2-inetd-3.1.9/test/inetd_test.rb --- old/yast2-inetd-3.1.8/test/inetd_test.rb 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/test/inetd_test.rb 2014-10-08 11:03:10.000000000 +0200 @@ -54,5 +54,96 @@ end end end + + context "GetServerBasename: return basename of the real server" do + + context "server binary is tcpd" do + let(:tcpd_name) { "/usr/sbin/tcpd" } + + context "server name is defined in server_args" do + it "returns server name from server_args" do + expect(Yast::Inetd.GetServerBasename(tcpd_name, "/usr/sbin/in.rlogin")).to eq("in.rlogin") + expect(Yast::Inetd.GetServerBasename(tcpd_name, "/usr/sbin/in.rlogin arg")).to eq("in.rlogin") + end + end + + context "server name is not defined in server_args" do + it "returns nil" do + expect(Yast::Inetd.GetServerBasename(tcpd_name, "")).to be_nil + expect(Yast::Inetd.GetServerBasename(tcpd_name, nil)).to be_nil + end + end + end + + context "server binary is not tcpd" do + let(:texecd_name) { "/usr/sbin/in.texecd" } + it "returns given server name" do + expect(Yast::Inetd.GetServerBasename(texecd_name, nil)).to eq("in.texecd") + expect(Yast::Inetd.GetServerBasename(texecd_name, "not interested")).to eq("in.texecd") + end + end + + context "server binary is nil" do + it "returns nil" do + expect(Yast::Inetd.GetServerBasename(nil, nil)).to be_nil + expect(Yast::Inetd.GetServerBasename(nil, "not interested")).to be_nil + end + end + end + + context "MergeAyProfile: Merges AY profile items into a target list (defaults or system)" do + it "Merging profiles" do + target = [ + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/time", + "protocol"=>"tcp", + "script"=>"time", + "service"=>"time" + } + ] + changes = [ + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/services", + "protocol"=>"tcp", + "script"=>"services", + "service"=>"services" }, + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/vnc", + "protocol"=>"tcp", + "script"=>"vnc", + "server"=>"/usr/bin/Xvnc", + "server_args"=>"-noreset -inetd -once -query localhost", + "service"=>"vnc1" }, + { "enabled"=>true, + "iid"=>"1:/etc/xinetd.d/time", + "protocol"=>"tcp", + "script"=>"time", + "service"=>"time" + } + ] + ret = [ + { "enabled"=>true, + "iid"=>"1:/etc/xinetd.d/time", + "protocol"=>"tcp", + "script"=>"time", + "service"=>"time", + "changed"=>true }, + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/services", + "protocol"=>"tcp", + "script"=>"services", + "service"=>"services" }, + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/vnc", + "protocol"=>"tcp", + "script"=>"vnc", + "server"=>"/usr/bin/Xvnc", + "server_args"=>"-noreset -inetd -once -query localhost", + "service"=>"vnc1" } + ] + expect(Yast::Inetd.MergeAyProfile(target, changes)).to eq(ret) + end + end + end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-10-08 22:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-05 20:31:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-10-08 22:13:33.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Oct 07 16:53:46 CEST 2014 - aschnell(a)suse.de + +- use xfs_repair instead of extinct xfs_check (bsc#899930) + +------------------------------------------------------------------- +Mon Oct 06 12:51:26 CEST 2014 - aschnell(a)suse.de + +- extended testsuite + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/Container.cc new/libstorage-2.25.18/storage/Container.cc --- old/libstorage-2.25.18/storage/Container.cc 2014-09-19 11:31:22.000000000 +0200 +++ new/libstorage-2.25.18/storage/Container.cc 2014-10-06 16:30:28.000000000 +0200 @@ -398,8 +398,6 @@ s << " readonly"; if (!c.uby.empty()) s << " usedby:" << c.uby; - if (!c.alt_names.empty()) - s << " alt_names:" << c.alt_names; return s; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/Device.cc new/libstorage-2.25.18/storage/Device.cc --- old/libstorage-2.25.18/storage/Device.cc 2014-03-26 18:08:49.000000000 +0100 +++ new/libstorage-2.25.18/storage/Device.cc 2014-10-06 16:30:28.000000000 +0200 @@ -234,6 +234,8 @@ s << " deleted"; if (d.silent) s << " silent"; + if (!d.alt_names.empty()) + s << " alt_names:" << d.alt_names; if (!d.userdata.empty()) s << " userdata:" << d.userdata; return s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/StorageDefines.h new/libstorage-2.25.18/storage/StorageDefines.h --- old/libstorage-2.25.18/storage/StorageDefines.h 2014-04-15 12:13:27.000000000 +0200 +++ new/libstorage-2.25.18/storage/StorageDefines.h 2014-10-08 09:30:57.000000000 +0200 @@ -104,7 +104,7 @@ #define FSCKEXT3BIN "/sbin/fsck.ext3" #define FSCKEXT4BIN "/sbin/fsck.ext4" #define FSCKJFSBIN "/sbin/fsck.jfs" -#define FSCKXFSBIN "/usr/sbin/xfs_check" +#define XFSREPAIRBIN "/usr/sbin/xfs_repair" #define FSCKREISERBIN "/sbin/reiserfsck" #define MKSWAPBIN "/sbin/mkswap" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/SystemInfo/CmdBlkid.h new/libstorage-2.25.18/storage/SystemInfo/CmdBlkid.h --- old/libstorage-2.25.18/storage/SystemInfo/CmdBlkid.h 2014-03-21 17:06:30.000000000 +0100 +++ new/libstorage-2.25.18/storage/SystemInfo/CmdBlkid.h 2014-10-08 09:30:57.000000000 +0200 @@ -20,8 +20,8 @@ */ -#ifndef BLKID_H -#define BLKID_H +#ifndef CMD_BLKID_H +#define CMD_BLKID_H #include <string> #include <map> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/SystemInfo/CmdDasdview.h new/libstorage-2.25.18/storage/SystemInfo/CmdDasdview.h --- old/libstorage-2.25.18/storage/SystemInfo/CmdDasdview.h 2014-03-21 17:06:30.000000000 +0100 +++ new/libstorage-2.25.18/storage/SystemInfo/CmdDasdview.h 2014-10-08 09:30:57.000000000 +0200 @@ -20,8 +20,8 @@ */ -#ifndef DASDVIEW_H -#define DASDVIEW_H +#ifndef CMD_DASDVIEW_H +#define CMD_DASDVIEW_H #include "storage/StorageInterface.h" #include "storage/Geometry.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/SystemInfo/CmdLsscsi.h new/libstorage-2.25.18/storage/SystemInfo/CmdLsscsi.h --- old/libstorage-2.25.18/storage/SystemInfo/CmdLsscsi.h 2014-03-21 17:06:30.000000000 +0100 +++ new/libstorage-2.25.18/storage/SystemInfo/CmdLsscsi.h 2014-10-08 09:30:58.000000000 +0200 @@ -20,8 +20,8 @@ */ -#ifndef LSSCSI_H -#define LSSCSI_H +#ifndef CMD_LSSCSI_H +#define CMD_LSSCSI_H #include <string> #include <map> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/SystemInfo/CmdParted.h new/libstorage-2.25.18/storage/SystemInfo/CmdParted.h --- old/libstorage-2.25.18/storage/SystemInfo/CmdParted.h 2014-09-22 16:59:15.000000000 +0200 +++ new/libstorage-2.25.18/storage/SystemInfo/CmdParted.h 2014-10-08 09:30:58.000000000 +0200 @@ -20,8 +20,8 @@ */ -#ifndef PARTED_H -#define PARTED_H +#ifndef CMD_PARTED_H +#define CMD_PARTED_H #include "storage/StorageInterface.h" #include "storage/Geometry.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/SystemInfo/DevAndSys.h new/libstorage-2.25.18/storage/SystemInfo/DevAndSys.h --- old/libstorage-2.25.18/storage/SystemInfo/DevAndSys.h 2014-03-21 17:06:30.000000000 +0100 +++ new/libstorage-2.25.18/storage/SystemInfo/DevAndSys.h 2014-10-08 09:30:58.000000000 +0200 @@ -20,8 +20,8 @@ */ -#ifndef DEV_H -#define DEV_H +#ifndef DEV_AND_SYS_H +#define DEV_AND_SYS_H #include <sys/types.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/Volume.cc new/libstorage-2.25.18/storage/Volume.cc --- old/libstorage-2.25.18/storage/Volume.cc 2014-09-09 12:28:47.000000000 +0200 +++ new/libstorage-2.25.18/storage/Volume.cc 2014-10-08 09:30:58.000000000 +0200 @@ -2173,7 +2173,14 @@ return( ret ); } -EncryptType Volume::detectEncryption() + + /* + * Detect encryption type by trying several encruption types and verifying + * that the filesystem specific check tool reports no error and mounting + * works. + */ + EncryptType + Volume::detectEncryption() { EncryptType ret = ENC_UNKNOWN; EncryptType save_enc = encryption; @@ -2246,7 +2253,8 @@ cmd = FSCKREISERBIN " --yes --check -q " + quote(use_dev); break; case XFS: - cmd = FSCKXFSBIN " " + quote(use_dev); + // xfs_repair is the check tool for xfs + cmd = XFSREPAIRBIN " -n " + quote(use_dev); break; case JFS: cmd = FSCKJFSBIN " -n " + quote(use_dev); @@ -3505,8 +3513,6 @@ { s << " dtxt:" << v.dtxt; } - if (!v.alt_names.empty()) - s << " alt_names:" << v.alt_names; if( v.encryption != storage::ENC_NONE || v.orig_encryption != storage::ENC_NONE ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/storage/gen_md5sum.cc new/libstorage-2.25.18/storage/gen_md5sum.cc --- old/libstorage-2.25.18/storage/gen_md5sum.cc 2014-10-02 18:19:59.000000000 +0200 +++ new/libstorage-2.25.18/storage/gen_md5sum.cc 2014-10-08 09:31:46.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "e723741977ba0153f4b233ba1db524dd" -#define SOURCES_MD5_DATE " Thu 2 Oct 18:19:59 CEST 2014 " +#define SOURCES_MD5SUM "e3023ae080c7f3e6c151d541f7efe0c1" +#define SOURCES_MD5_DATE " Wed 8 Oct 09:31:46 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/Makefile.am new/libstorage-2.25.18/testsuite/Makefile.am --- old/libstorage-2.25.18/testsuite/Makefile.am 2014-03-13 14:54:46.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/Makefile.am 2014-10-06 16:30:28.000000000 +0200 @@ -12,15 +12,16 @@ LDADD = ../storage/libstorage.la -noinst_PROGRAMS = backupstate1.single contvolinfo1.single disklabel1.single \ +noinst_PROGRAMS = alt-names1.single alt-names2.single \ + backupstate1.single contvolinfo1.single disklabel1.single \ format1.single freeinfo1.single fstab1.single fstab2.single \ fstab3.single fstab4.single fstab-add.single fstab-update.single \ fstab-remove.single fstab-ng-add.single fstab-ng-update.single \ fstab-ng-remove.single fstab-ng-find.single crypttab-add.single \ crypttab-remove.single \ humanstring1.single humanstring2.single \ - lvm_create.single lvm_create2.single lvm_extend.single \ - md_create.single partition1.single partitionname.single \ + lvm-create1.single lvm-create2.single lvm-extend.single \ + md-create.single partition1.single partitionname.single \ partition-slots1.single \ partitionprefix.single recursive1.single recursive2.single \ recursive3.single renumber1.single renumber2.single renumber3.single \ @@ -31,6 +32,8 @@ mdadm-examine.single parted.single proc-mdstat.single \ proc-mounts.single proc-parts.single vgdisplay.single vgs.single +alt_names1_single_SOURCES = alt-names1.cc common.h common.cc +alt_names2_single_SOURCES = alt-names2.cc common.h common.cc backupstate1_single_SOURCES = backupstate1.cc common.h common.cc contvolinfo1_single_SOURCES = contvolinfo1.cc common.h common.cc disklabel1_single_SOURCES = disklabel1.cc common.h common.cc @@ -51,10 +54,10 @@ crypttab_remove_single_SOURCES = crypttab-remove.cc common.h common.cc humanstring1_single_SOURCES = humanstring1.cc humanstring2_single_SOURCES = humanstring2.cc -lvm_create2_single_SOURCES = lvm_create2.cc common.h common.cc -lvm_create_single_SOURCES = lvm_create.cc common.h common.cc -lvm_extend_single_SOURCES = lvm_extend.cc common.h common.cc -md_create_single_SOURCES = md_create.cc common.h common.cc +lvm_create1_single_SOURCES = lvm-create1.cc common.h common.cc +lvm_create2_single_SOURCES = lvm-create2.cc common.h common.cc +lvm_extend_single_SOURCES = lvm-extend.cc common.h common.cc +md_create_single_SOURCES = md-create.cc common.h common.cc partition1_single_SOURCES = partition1.cc common.h common.cc partitionname_single_SOURCES = partitionname.cc common.cc partitionprefix_single_SOURCES = partitionprefix.cc common.cc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/Makefile.in new/libstorage-2.25.18/testsuite/Makefile.in --- old/libstorage-2.25.18/testsuite/Makefile.in 2014-10-02 18:56:02.000000000 +0200 +++ new/libstorage-2.25.18/testsuite/Makefile.in 2014-10-06 16:35:32.000000000 +0200 @@ -82,7 +82,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = backupstate1.single$(EXEEXT) \ +noinst_PROGRAMS = alt-names1.single$(EXEEXT) \ + alt-names2.single$(EXEEXT) backupstate1.single$(EXEEXT) \ contvolinfo1.single$(EXEEXT) disklabel1.single$(EXEEXT) \ format1.single$(EXEEXT) freeinfo1.single$(EXEEXT) \ fstab1.single$(EXEEXT) fstab2.single$(EXEEXT) \ @@ -93,8 +94,8 @@ fstab-ng-remove.single$(EXEEXT) fstab-ng-find.single$(EXEEXT) \ crypttab-add.single$(EXEEXT) crypttab-remove.single$(EXEEXT) \ humanstring1.single$(EXEEXT) humanstring2.single$(EXEEXT) \ - lvm_create.single$(EXEEXT) lvm_create2.single$(EXEEXT) \ - lvm_extend.single$(EXEEXT) md_create.single$(EXEEXT) \ + lvm-create1.single$(EXEEXT) lvm-create2.single$(EXEEXT) \ + lvm-extend.single$(EXEEXT) md-create.single$(EXEEXT) \ partition1.single$(EXEEXT) partitionname.single$(EXEEXT) \ partition-slots1.single$(EXEEXT) \ partitionprefix.single$(EXEEXT) recursive1.single$(EXEEXT) \ @@ -123,15 +124,23 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) +am_alt_names1_single_OBJECTS = alt-names1.$(OBJEXT) common.$(OBJEXT) +alt_names1_single_OBJECTS = $(am_alt_names1_single_OBJECTS) +alt_names1_single_LDADD = $(LDADD) +alt_names1_single_DEPENDENCIES = ../storage/libstorage.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +am_alt_names2_single_OBJECTS = alt-names2.$(OBJEXT) common.$(OBJEXT) +alt_names2_single_OBJECTS = $(am_alt_names2_single_OBJECTS) +alt_names2_single_LDADD = $(LDADD) +alt_names2_single_DEPENDENCIES = ../storage/libstorage.la am_backupstate1_single_OBJECTS = backupstate1.$(OBJEXT) \ common.$(OBJEXT) backupstate1_single_OBJECTS = $(am_backupstate1_single_OBJECTS) backupstate1_single_LDADD = $(LDADD) backupstate1_single_DEPENDENCIES = ../storage/libstorage.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = am_blkid_single_OBJECTS = blkid.$(OBJEXT) common.$(OBJEXT) blkid_single_OBJECTS = $(am_blkid_single_OBJECTS) blkid_single_LDADD = $(LDADD) @@ -246,19 +255,19 @@ lsscsi_single_OBJECTS = $(am_lsscsi_single_OBJECTS) lsscsi_single_LDADD = $(LDADD) lsscsi_single_DEPENDENCIES = ../storage/libstorage.la -am_lvm_create_single_OBJECTS = lvm_create.$(OBJEXT) common.$(OBJEXT) -lvm_create_single_OBJECTS = $(am_lvm_create_single_OBJECTS) -lvm_create_single_LDADD = $(LDADD) -lvm_create_single_DEPENDENCIES = ../storage/libstorage.la -am_lvm_create2_single_OBJECTS = lvm_create2.$(OBJEXT) common.$(OBJEXT) +am_lvm_create1_single_OBJECTS = lvm-create1.$(OBJEXT) common.$(OBJEXT) +lvm_create1_single_OBJECTS = $(am_lvm_create1_single_OBJECTS) +lvm_create1_single_LDADD = $(LDADD) +lvm_create1_single_DEPENDENCIES = ../storage/libstorage.la +am_lvm_create2_single_OBJECTS = lvm-create2.$(OBJEXT) common.$(OBJEXT) lvm_create2_single_OBJECTS = $(am_lvm_create2_single_OBJECTS) lvm_create2_single_LDADD = $(LDADD) lvm_create2_single_DEPENDENCIES = ../storage/libstorage.la -am_lvm_extend_single_OBJECTS = lvm_extend.$(OBJEXT) common.$(OBJEXT) +am_lvm_extend_single_OBJECTS = lvm-extend.$(OBJEXT) common.$(OBJEXT) lvm_extend_single_OBJECTS = $(am_lvm_extend_single_OBJECTS) lvm_extend_single_LDADD = $(LDADD) lvm_extend_single_DEPENDENCIES = ../storage/libstorage.la -am_md_create_single_OBJECTS = md_create.$(OBJEXT) common.$(OBJEXT) +am_md_create_single_OBJECTS = md-create.$(OBJEXT) common.$(OBJEXT) md_create_single_OBJECTS = $(am_md_create_single_OBJECTS) md_create_single_LDADD = $(LDADD) md_create_single_DEPENDENCIES = ../storage/libstorage.la @@ -412,7 +421,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(backupstate1_single_SOURCES) $(blkid_single_SOURCES) \ +SOURCES = $(alt_names1_single_SOURCES) $(alt_names2_single_SOURCES) \ + $(backupstate1_single_SOURCES) $(blkid_single_SOURCES) \ $(btrfs_single_SOURCES) $(contvolinfo1_single_SOURCES) \ $(cryptsetup_single_SOURCES) $(crypttab_add_single_SOURCES) \ $(crypttab_remove_single_SOURCES) $(dasdview_single_SOURCES) \ @@ -426,7 +436,7 @@ $(fstab1_single_SOURCES) $(fstab2_single_SOURCES) \ $(fstab3_single_SOURCES) $(fstab4_single_SOURCES) \ $(humanstring1_single_SOURCES) $(humanstring2_single_SOURCES) \ - $(lsscsi_single_SOURCES) $(lvm_create_single_SOURCES) \ + $(lsscsi_single_SOURCES) $(lvm_create1_single_SOURCES) \ $(lvm_create2_single_SOURCES) $(lvm_extend_single_SOURCES) \ $(md_create_single_SOURCES) $(mdadm_detail_single_SOURCES) \ $(mdadm_examine_single_SOURCES) $(parted_single_SOURCES) \ @@ -441,9 +451,11 @@ $(udevencode_single_SOURCES) $(usedby1_single_SOURCES) \ $(userdata1_single_SOURCES) $(uuid1_single_SOURCES) \ $(vgdisplay_single_SOURCES) $(vgs_single_SOURCES) -DIST_SOURCES = $(backupstate1_single_SOURCES) $(blkid_single_SOURCES) \ - $(btrfs_single_SOURCES) $(contvolinfo1_single_SOURCES) \ - $(cryptsetup_single_SOURCES) $(crypttab_add_single_SOURCES) \ +DIST_SOURCES = $(alt_names1_single_SOURCES) \ + $(alt_names2_single_SOURCES) $(backupstate1_single_SOURCES) \ + $(blkid_single_SOURCES) $(btrfs_single_SOURCES) \ + $(contvolinfo1_single_SOURCES) $(cryptsetup_single_SOURCES) \ + $(crypttab_add_single_SOURCES) \ $(crypttab_remove_single_SOURCES) $(dasdview_single_SOURCES) \ $(disklabel1_single_SOURCES) $(dmraid_single_SOURCES) \ $(dmsetup_info_single_SOURCES) $(format1_single_SOURCES) \ @@ -455,7 +467,7 @@ $(fstab1_single_SOURCES) $(fstab2_single_SOURCES) \ $(fstab3_single_SOURCES) $(fstab4_single_SOURCES) \ $(humanstring1_single_SOURCES) $(humanstring2_single_SOURCES) \ - $(lsscsi_single_SOURCES) $(lvm_create_single_SOURCES) \ + $(lsscsi_single_SOURCES) $(lvm_create1_single_SOURCES) \ $(lvm_create2_single_SOURCES) $(lvm_extend_single_SOURCES) \ $(md_create_single_SOURCES) $(mdadm_detail_single_SOURCES) \ $(mdadm_examine_single_SOURCES) $(parted_single_SOURCES) \ @@ -691,6 +703,8 @@ AUTOMAKE_OPTIONS = dejagnu INCLUDES = -I$(top_srcdir) LDADD = ../storage/libstorage.la +alt_names1_single_SOURCES = alt-names1.cc common.h common.cc +alt_names2_single_SOURCES = alt-names2.cc common.h common.cc backupstate1_single_SOURCES = backupstate1.cc common.h common.cc contvolinfo1_single_SOURCES = contvolinfo1.cc common.h common.cc disklabel1_single_SOURCES = disklabel1.cc common.h common.cc @@ -711,10 +725,10 @@ crypttab_remove_single_SOURCES = crypttab-remove.cc common.h common.cc humanstring1_single_SOURCES = humanstring1.cc humanstring2_single_SOURCES = humanstring2.cc -lvm_create2_single_SOURCES = lvm_create2.cc common.h common.cc -lvm_create_single_SOURCES = lvm_create.cc common.h common.cc -lvm_extend_single_SOURCES = lvm_extend.cc common.h common.cc -md_create_single_SOURCES = md_create.cc common.h common.cc +lvm_create1_single_SOURCES = lvm-create1.cc common.h common.cc +lvm_create2_single_SOURCES = lvm-create2.cc common.h common.cc +lvm_extend_single_SOURCES = lvm-extend.cc common.h common.cc +md_create_single_SOURCES = md-create.cc common.h common.cc partition1_single_SOURCES = partition1.cc common.h common.cc partitionname_single_SOURCES = partitionname.cc common.cc partitionprefix_single_SOURCES = partitionprefix.cc common.cc @@ -789,6 +803,14 @@ echo " rm -f" $$list; \ rm -f $$list +alt-names1.single$(EXEEXT): $(alt_names1_single_OBJECTS) $(alt_names1_single_DEPENDENCIES) $(EXTRA_alt_names1_single_DEPENDENCIES) + @rm -f alt-names1.single$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(alt_names1_single_OBJECTS) $(alt_names1_single_LDADD) $(LIBS) + +alt-names2.single$(EXEEXT): $(alt_names2_single_OBJECTS) $(alt_names2_single_DEPENDENCIES) $(EXTRA_alt_names2_single_DEPENDENCIES) + @rm -f alt-names2.single$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(alt_names2_single_OBJECTS) $(alt_names2_single_LDADD) $(LIBS) + backupstate1.single$(EXEEXT): $(backupstate1_single_OBJECTS) $(backupstate1_single_DEPENDENCIES) $(EXTRA_backupstate1_single_DEPENDENCIES) @rm -f backupstate1.single$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(backupstate1_single_OBJECTS) $(backupstate1_single_LDADD) $(LIBS) @@ -897,20 +919,20 @@ @rm -f lsscsi.single$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(lsscsi_single_OBJECTS) $(lsscsi_single_LDADD) $(LIBS) -lvm_create.single$(EXEEXT): $(lvm_create_single_OBJECTS) $(lvm_create_single_DEPENDENCIES) $(EXTRA_lvm_create_single_DEPENDENCIES) - @rm -f lvm_create.single$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(lvm_create_single_OBJECTS) $(lvm_create_single_LDADD) $(LIBS) +lvm-create1.single$(EXEEXT): $(lvm_create1_single_OBJECTS) $(lvm_create1_single_DEPENDENCIES) $(EXTRA_lvm_create1_single_DEPENDENCIES) + @rm -f lvm-create1.single$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(lvm_create1_single_OBJECTS) $(lvm_create1_single_LDADD) $(LIBS) -lvm_create2.single$(EXEEXT): $(lvm_create2_single_OBJECTS) $(lvm_create2_single_DEPENDENCIES) $(EXTRA_lvm_create2_single_DEPENDENCIES) - @rm -f lvm_create2.single$(EXEEXT) +lvm-create2.single$(EXEEXT): $(lvm_create2_single_OBJECTS) $(lvm_create2_single_DEPENDENCIES) $(EXTRA_lvm_create2_single_DEPENDENCIES) + @rm -f lvm-create2.single$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(lvm_create2_single_OBJECTS) $(lvm_create2_single_LDADD) $(LIBS) -lvm_extend.single$(EXEEXT): $(lvm_extend_single_OBJECTS) $(lvm_extend_single_DEPENDENCIES) $(EXTRA_lvm_extend_single_DEPENDENCIES) - @rm -f lvm_extend.single$(EXEEXT) +lvm-extend.single$(EXEEXT): $(lvm_extend_single_OBJECTS) $(lvm_extend_single_DEPENDENCIES) $(EXTRA_lvm_extend_single_DEPENDENCIES) + @rm -f lvm-extend.single$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(lvm_extend_single_OBJECTS) $(lvm_extend_single_LDADD) $(LIBS) -md_create.single$(EXEEXT): $(md_create_single_OBJECTS) $(md_create_single_DEPENDENCIES) $(EXTRA_md_create_single_DEPENDENCIES) - @rm -f md_create.single$(EXEEXT) +md-create.single$(EXEEXT): $(md_create_single_OBJECTS) $(md_create_single_DEPENDENCIES) $(EXTRA_md_create_single_DEPENDENCIES) + @rm -f md-create.single$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(md_create_single_OBJECTS) $(md_create_single_LDADD) $(LIBS) mdadm-detail.single$(EXEEXT): $(mdadm_detail_single_OBJECTS) $(mdadm_detail_single_DEPENDENCIES) $(EXTRA_mdadm_detail_single_DEPENDENCIES) @@ -1011,6 +1033,8 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt-names1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt-names2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backupstate1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blkid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btrfs.Po@am__quote@ @@ -1039,10 +1063,10 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/humanstring1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/humanstring2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsscsi.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm_create.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm_create2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm_extend.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md_create.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm-create1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm-create2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm-extend.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md-create.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdadm-detail.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdadm-examine.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parted.Po@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/alt-names1.cc new/libstorage-2.25.18/testsuite/alt-names1.cc --- old/libstorage-2.25.18/testsuite/alt-names1.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/alt-names1.cc 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,65 @@ + +#include <iostream> + +#include "common.h" + + +using namespace storage; +using namespace std; + + +void +test(StorageInterface* s, const string& device) +{ + VolumeInfo info; + cout << s->getVolume(device, info) << " " << device << " " << endl; +} + + +void +altNamesPartition() +{ + cout << "altNamesPartition" << endl; + + setup_system("thalassa"); + + StorageInterface* s = createStorageInterface(TestEnvironment()); + + test(s, "/dev/sda1"); + // test(s, "/dev/disk/by-label/BOOT"); // FIXME + + delete s; +} + + + +void +altNamesLogicalVolume() +{ + cout << "altNamesLogicalVolume" << endl; + + setup_system("thalassa"); + + StorageInterface* s = createStorageInterface(TestEnvironment()); + + test(s, "/dev/system/abuild"); + // test(s, "/dev/mapper/system-abuild"); // FIXME + // test(s, "/dev/dm-0"); // FIXME + // test(s, "/dev/disk/by-id/dm-name-system-abuild"); // FIXME + // test(s, "/dev/disk/by-label/ABUILD"); // FIXME + + delete s; +} + + +int +main() +{ + setup_logger(); + + altNamesPartition(); + + cout << endl; + + altNamesLogicalVolume(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/alt-names2.cc new/libstorage-2.25.18/testsuite/alt-names2.cc --- old/libstorage-2.25.18/testsuite/alt-names2.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/alt-names2.cc 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,86 @@ + +#include <iostream> + +#include "common.h" + + +using namespace storage; +using namespace std; + + +void +test(StorageInterface* s, const string& device) +{ + VolumeInfo info; + cout << s->getVolume(device, info) << " " << device << " " << endl; +} + + +void +altNamesPartition() +{ + cout << "altNamesPartition" << endl; + + setup_system("thalassa"); + + StorageInterface* s = createStorageInterface(TestEnvironment()); + + cout << s->destroyPartitionTable("/dev/sdc", "msdos") << endl; + + string device; + cout << s->createPartitionKb("/dev/sdc", PRIMARY, RegionInfo(0, 1024*1024), device) << endl; + cout << device << endl; + + // set label + cout << s->changeFormatVolume(device, true, EXT4) << endl; + cout << s->changeLabelVolume(device, "test-label") << endl; + + test(s, "/dev/sdc1"); + // test(s, "/dev/disk/by-label/test-label"); // FIXME + + delete s; +} + + + +void +altNamesLogicalVolume() +{ + cout << "altNamesLogicalVolume" << endl; + + setup_system("thalassa"); + + StorageInterface* s = createStorageInterface(TestEnvironment()); + + // create volume group + cout << s->createLvmVg("test-vg", 4, false, { "/dev/sdc1" }) << endl; + + // create logical volume + string device; + cout << s->createLvmLv("test-vg", "test-lv", 1024*1024, 1, device) << endl; + cout << device << endl; + + // set label + cout << s->changeFormatVolume(device, true, EXT4) << endl; + cout << s->changeLabelVolume(device, "test-label") << endl; + + test(s, "/dev/test-vg/test-lv"); + test(s, "/dev/mapper/test--vg-test--lv"); + // test(s, "/dev/disk/by-id/dm-name-test--vg-test--lv"); // FIXME + // test(s, "/dev/disk/by-label/test-label"); // FIXME + + delete s; +} + + +int +main() +{ + setup_logger(); + + altNamesPartition(); + + cout << endl; + + altNamesLogicalVolume(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/common.cc new/libstorage-2.25.18/testsuite/common.cc --- old/libstorage-2.25.18/testsuite/common.cc 2014-10-02 18:18:54.000000000 +0200 +++ new/libstorage-2.25.18/testsuite/common.cc 2014-10-06 16:30:28.000000000 +0200 @@ -47,8 +47,8 @@ { ofstream fstab("tmp/etc/fstab"); - for (list<string>::const_iterator it = lines.begin(); it != lines.end(); ++it) - fstab << *it << endl; + for (const string& line : lines) + fstab << line << endl; } @@ -57,8 +57,8 @@ { ofstream fstab("tmp/etc/crypttab"); - for (list<string>::const_iterator it = lines.begin(); it != lines.end(); ++it) - fstab << *it << endl; + for (const string& line : lines) + fstab << line << endl; } @@ -93,19 +93,18 @@ { deque<PartitionInfo> partitioninfos; s->getPartitionInfo(disk, partitioninfos); - for (deque<PartitionInfo>::iterator it = partitioninfos.begin(); - it != partitioninfos.end(); ++it) + for (const PartitionInfo& partitioninfo : partitioninfos) { - cout << it->v.name << ' '; - switch (it->partitionType) + cout << partitioninfo.v.name << ' '; + switch (partitioninfo.partitionType) { case PRIMARY: cout << "PRIMARY "; break; case EXTENDED: cout << "EXTENDED "; break; case LOGICAL: cout << "LOGICAL "; break; case PTYPE_ANY: cout << "ANY "; break; } - cout << Region(it->cylRegion) << ' '; - switch (it->v.fs) + cout << Region(partitioninfo.cylRegion) << ' '; + switch (partitioninfo.v.fs) { case FSUNKNOWN: cout << "UNKNOWN"; break; case REISERFS: cout << "REISERFS"; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/lvm-create1.cc new/libstorage-2.25.18/testsuite/lvm-create1.cc --- old/libstorage-2.25.18/testsuite/lvm-create1.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/lvm-create1.cc 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,82 @@ + +#include <iostream> +#include <sstream> + +#include "common.h" + + +using namespace storage; +using namespace std; + + +void createLvs(const string& vg, int n, const deque<string>& pvs) +{ + cout << "createLvs" << endl; + + StorageInterface* s = createStorageInterface(TestEnvironment()); + + /* create volume group with the above pvs */ + cout << s->createLvmVg( vg, 4, false, pvs ) << endl; + + /* create n logical volumes */ + int ret = 0; + for (int i = 0; i < n; ++i) + { + ostringstream name; + name << "volume" << i; + + string dev; + ret = s->createLvmLv( vg, name.str(), 100, 1, dev ); + } + cout << ret << endl; + + deque<LvmLvInfo> plist; + s->getLvmLvInfo( vg, plist ); + cout << plist.size() << endl; + + delete s; +} + + +void createExtendedLv(const string& vg, const string& dev) +{ + cout << "createExtendedLv" << endl; + + StorageInterface* s = createStorageInterface(TestEnvironment()); + + deque<string> devs; + devs.push_back(dev); // add extended partition + + /* create volume group with the extended partition */ + cout << s->createLvmVg( vg, 4, false, devs ) << endl; // FAILS + + delete s; +} + + +int +main() +{ + setup_logger(); + + /* + * Check that we can create a volume group from primary and logical + * partitons and 50 logical volumes. + */ + setup_system("thalassa"); + + deque<string> pvs; + pvs.push_back("/dev/sdc1"); + pvs.push_back("/dev/sdc2"); + pvs.push_back("/dev/sdc5"); + pvs.push_back("/dev/sdc6"); + createLvs("test", 50, pvs); + + /* + * Check that we cannot create a volume group out of an extended + * partition. + */ + setup_system("thalassa"); + + createExtendedLv("test", "/dev/sdc4"); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/lvm-create2.cc new/libstorage-2.25.18/testsuite/lvm-create2.cc --- old/libstorage-2.25.18/testsuite/lvm-create2.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/lvm-create2.cc 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,40 @@ + +#include <iostream> + +#include "common.h" + + +using namespace storage; +using namespace std; + + +int +main() +{ + setup_logger(); + + setup_system("thalassa"); + + StorageInterface* s = createStorageInterface(TestEnvironment()); + + string device; + deque<string> devices; + + /* create volume group "system" which does already exist */ + devices.clear(); + devices.push_back("/dev/sdb1"); + cout << s->createLvmVg("system", 4, false, devices) << endl; // FAILS + + /* create volume group "data" */ + devices.clear(); + devices.push_back("/dev/sdb1"); + cout << s->createLvmVg("data", 4, false, devices) << endl; + + /* create logical volume "swap" on "system" which does already exist */ + cout << s->createLvmLv("system", "swap", 2000, 1, device) << endl; // FAILS + + /* create logical volume "swap" on "data" */ + cout << s->createLvmLv("data", "swap", 2000, 1, device) << endl; + + delete s; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/lvm-extend.cc new/libstorage-2.25.18/testsuite/lvm-extend.cc --- old/libstorage-2.25.18/testsuite/lvm-extend.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/lvm-extend.cc 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,48 @@ + +#include <iostream> +#include <boost/algorithm/string.hpp> + +#include "common.h" + + +using namespace storage; +using namespace std; + + +void +extendVg(const string& vg, const deque<string>& pvs) +{ + cout << "extendVg" << endl; + + StorageInterface* s = createStorageInterface(TestEnvironment()); + + LvmVgInfo info; + cout << s->getLvmVgInfo(vg, info) << endl; + cout << boost::join(info.devices, " ") << endl; + + /* extend it by devs_extend given pvs */ + cout << s->extendLvmVg(vg, pvs) << endl; + + cout << s->getLvmVgInfo(vg, info) << endl; + cout << boost::join(info.devices, " ") << endl; + cout << boost::join(info.devices_add, " ") << endl; + + delete s; +} + + +int +main() +{ + setup_logger(); + + setup_system("thalassa"); + + deque<string> devs; + + /* + * Check that we can extend a volume group. + */ + devs.push_back("/dev/sdb1"); + extendVg("system", devs); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/lvm_create.cc new/libstorage-2.25.18/testsuite/lvm_create.cc --- old/libstorage-2.25.18/testsuite/lvm_create.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/lvm_create.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ - -#include <iostream> -#include <sstream> - -#include "common.h" - - -using namespace storage; -using namespace std; - - -void createLvs(const string& vg, int n, const deque<string>& pvs) -{ - cout << "createLvs" << endl; - - StorageInterface* s = createStorageInterface(TestEnvironment()); - - /* create volume group with the above pvs */ - cout << s->createLvmVg( vg, 4, false, pvs ) << endl; - - /* create n logical volumes */ - int ret = 0; - for ( int i = 0; i < n; i++ ) - { - ostringstream name; - name << "volume"; - name << i; - - string dev; - ret = s->createLvmLv( vg, name.str(), 100, 1, dev ); - } - cout << ret << endl; - - deque<LvmLvInfo> plist; - s->getLvmLvInfo( vg, plist ); - cout << plist.size() << endl; - - delete s; -} - - -void createExtendedLv(const string& vg, const string& dev) -{ - cout << "createExtendedLv" << endl; - - StorageInterface* s = createStorageInterface(TestEnvironment()); - - deque<string> devs; - devs.push_back(dev); // add extended partition - - /* create volume group with the extended partition */ - cout << s->createLvmVg( vg, 4, false, devs ) << endl; // FAILS - - delete s; -} - - -int -main() -{ - setup_logger(); - - /* - * Check that we can create a volume group from primary and logical - * partitons and 50 logical volumes. - */ - setup_system("thalassa"); - - deque<string> pvs; - pvs.push_back("/dev/sdc1"); - pvs.push_back("/dev/sdc2"); - pvs.push_back("/dev/sdc5"); - pvs.push_back("/dev/sdc6"); - createLvs("test", 50, pvs); - - /* - * Check that we cannot create a volume group out of an extended - * partition. - */ - setup_system("thalassa"); - - createExtendedLv("test", "/dev/sdc4"); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/lvm_create2.cc new/libstorage-2.25.18/testsuite/lvm_create2.cc --- old/libstorage-2.25.18/testsuite/lvm_create2.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/lvm_create2.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ - -#include <iostream> - -#include "common.h" - - -using namespace storage; -using namespace std; - - -int -main() -{ - setup_logger(); - - setup_system("thalassa"); - - StorageInterface* s = createStorageInterface(TestEnvironment()); - - string device; - deque<string> devices; - - /* create volume group "system" which does already exist */ - devices.clear(); - devices.push_back("/dev/sdb1"); - cout << s->createLvmVg("system", 4, false, devices) << endl; // FAILS - - /* create volume group "data" */ - devices.clear(); - devices.push_back("/dev/sdb1"); - cout << s->createLvmVg("data", 4, false, devices) << endl; - - /* create logical volume "swap" on "system" which does already exist */ - cout << s->createLvmLv("system", "swap", 2000, 1, device) << endl; // FAILS - - /* create logical volume "swap" on "data" */ - cout << s->createLvmLv("data", "swap", 2000, 1, device) << endl; - - delete s; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/lvm_extend.cc new/libstorage-2.25.18/testsuite/lvm_extend.cc --- old/libstorage-2.25.18/testsuite/lvm_extend.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/lvm_extend.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ - -#include <iostream> -#include <boost/algorithm/string.hpp> - -#include "common.h" - - -using namespace storage; -using namespace std; - - -void -extendVg(const string& vg, const deque<string>& pvs) -{ - cout << "extendVg" << endl; - - StorageInterface* s = createStorageInterface(TestEnvironment()); - - LvmVgInfo info; - cout << s->getLvmVgInfo(vg, info) << endl; - cout << boost::join(info.devices, " ") << endl; - - /* extend it by devs_extend given pvs */ - cout << s->extendLvmVg(vg, pvs) << endl; - - cout << s->getLvmVgInfo(vg, info) << endl; - cout << boost::join(info.devices, " ") << endl; - cout << boost::join(info.devices_add, " ") << endl; - - delete s; -} - - -int -main() -{ - setup_logger(); - - setup_system("thalassa"); - - deque<string> devs; - - /* - * Check that we can extend a volume group. - */ - devs.push_back("/dev/sdb1"); - extendVg("system", devs); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/md-create.cc new/libstorage-2.25.18/testsuite/md-create.cc --- old/libstorage-2.25.18/testsuite/md-create.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/md-create.cc 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,111 @@ + +#include <stdlib.h> +#include <iostream> + +#include "common.h" + + +using namespace storage; +using namespace std; + + +StorageInterface *s = 0; + + +void +print_md_info() +{ + deque<MdInfo> plist; + + s->getMdInfo(plist); + + for (const MdInfo& p : plist) + { + cout << ' ' << p.v.name << ' ' << p.v.device << ' ' << p.nr + << ' ' << p.type << ' ' << p.chunkSizeK << ' ' << p.v.sizeK; + } +} + + +void +createMD(MdType type, list<string> devs) +{ + s = createStorageInterface(TestEnvironment()); + + int ret = s->createMd("/dev/md0", type, devs, list<string>()); + if (ret == 0) + ret = s->checkMd("/dev/md0"); + + cout << "createMD: " << ret; + if (ret == 0) + print_md_info(); + cout << endl; + + delete s; +} + + +int +main() +{ + setup_logger(); + + setup_system("thalassa"); + + list<string> devs; + + /* + * Check that we _cannot_ create software raid devices with just one + * partition + */ + devs.push_back("/dev/sdc1"); + cout << "Devices: " << devs.size() << " ----------------------\n"; + createMD(RAID0, devs); // fails, too few devices + createMD(RAID1, devs); // fails, too few devices + createMD(RAID5, devs); // fails, too few devices + createMD(RAID6, devs); // fails, too few devices + createMD(RAID10, devs); // fails, too few devices + createMD(MULTIPATH, devs); // fails, too few devices + createMD(RAID_UNK, devs); // RAID_UNK always fails + + /* + * Check that this works for some raid levels with two devices + */ + devs.push_back("/dev/sdc2"); + cout << "Devices: " << devs.size() << " ----------------------\n"; + createMD(RAID0, devs); // works now + createMD(RAID1, devs); // works now + createMD(RAID5, devs); // fails, too few devices + createMD(RAID6, devs); // fails, too few devices + createMD(RAID10, devs); // works now + createMD(MULTIPATH, devs); // works now + createMD(RAID_UNK, devs); // RAID_UNK always fails + + /* + * RAID6 still fails + */ + devs.push_back("/dev/sdc3"); + cout << "Devices: " << devs.size() << " ----------------------\n"; + createMD(RAID5, devs); // works now + createMD(RAID6, devs); // fails, too few devices + + /* + * Everything works now + */ + devs.push_back("/dev/sdc5"); + cout << "Devices: " << devs.size() << " ----------------------\n"; + createMD(RAID6, devs); // works now + + /* + * Check that we can create a software raid device with partitions + * from different devices + */ + devs.push_back("/dev/sdb1"); + cout << "Devices: " << devs.size() << " ----------------------\n"; + createMD(RAID0, devs); + createMD(RAID1, devs); + createMD(RAID5, devs); + createMD(RAID6, devs); + createMD(RAID10, devs); + createMD(MULTIPATH, devs); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/md_create.cc new/libstorage-2.25.18/testsuite/md_create.cc --- old/libstorage-2.25.18/testsuite/md_create.cc 2014-07-07 18:23:18.000000000 +0200 +++ new/libstorage-2.25.18/testsuite/md_create.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ - -#include <stdlib.h> -#include <iostream> - -#include "common.h" - - -using namespace storage; -using namespace std; - - -StorageInterface *s = 0; - - -void -print_md_info() -{ - deque<MdInfo> plist; - - s->getMdInfo(plist); - - for (const MdInfo& p : plist) - { - cout << ' ' << p.v.name << ' ' << p.v.device << ' ' << p.nr - << ' ' << p.type << ' ' << p.chunkSizeK << ' ' << p.v.sizeK; - } -} - - -void -createMD(MdType type, list<string> devs) -{ - s = createStorageInterface(TestEnvironment()); - - int ret = s->createMd("/dev/md0", type, devs, list<string>()); - if (ret == 0) - ret = s->checkMd("/dev/md0"); - - cout << "createMD: " << ret; - if (ret == 0) - print_md_info(); - cout << endl; - - delete s; -} - - -int -main() -{ - setup_logger(); - - setup_system("thalassa"); - - list<string> devs; - - /* - * Check that we _cannot_ create software raid devices with just one - * partition - */ - devs.push_back("/dev/sdc1"); - cout << "Devices: " << devs.size() << " ----------------------\n"; - createMD(RAID0, devs); // fails, too few devices - createMD(RAID1, devs); // fails, too few devices - createMD(RAID5, devs); // fails, too few devices - createMD(RAID6, devs); // fails, too few devices - createMD(RAID10, devs); // fails, too few devices - createMD(MULTIPATH, devs); // fails, too few devices - createMD(RAID_UNK, devs); // RAID_UNK always fails - - /* - * Check that this works for some raid levels with two devices - */ - devs.push_back("/dev/sdc2"); - cout << "Devices: " << devs.size() << " ----------------------\n"; - createMD(RAID0, devs); // works now - createMD(RAID1, devs); // works now - createMD(RAID5, devs); // fails, too few devices - createMD(RAID6, devs); // fails, too few devices - createMD(RAID10, devs); // works now - createMD(MULTIPATH, devs); // works now - createMD(RAID_UNK, devs); // RAID_UNK always fails - - /* - * RAID6 still fails - */ - devs.push_back("/dev/sdc3"); - cout << "Devices: " << devs.size() << " ----------------------\n"; - createMD(RAID5, devs); // works now - createMD(RAID6, devs); // fails, too few devices - - /* - * Everything works now - */ - devs.push_back("/dev/sdc5"); - cout << "Devices: " << devs.size() << " ----------------------\n"; - createMD(RAID6, devs); // works now - - /* - * Check that we can create a software raid device with partitions - * from different devices - */ - devs.push_back("/dev/sdb1"); - cout << "Devices: " << devs.size() << " ----------------------\n"; - createMD(RAID0, devs); - createMD(RAID1, devs); - createMD(RAID5, devs); - createMD(RAID6, devs); - createMD(RAID10, devs); - createMD(MULTIPATH, devs); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/alt-names1.out new/libstorage-2.25.18/testsuite/single.out/alt-names1.out --- old/libstorage-2.25.18/testsuite/single.out/alt-names1.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/alt-names1.out 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,5 @@ +altNamesPartition +0 /dev/sda1 + +altNamesLogicalVolume +0 /dev/system/abuild diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/alt-names2.out new/libstorage-2.25.18/testsuite/single.out/alt-names2.out --- old/libstorage-2.25.18/testsuite/single.out/alt-names2.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/alt-names2.out 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,16 @@ +altNamesPartition +0 +0 +/dev/sdc1 +0 +0 +0 /dev/sdc1 + +altNamesLogicalVolume +0 +0 +/dev/test-vg/test-lv +0 +0 +0 /dev/test-vg/test-lv +0 /dev/mapper/test--vg-test--lv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/lvm-create1.out new/libstorage-2.25.18/testsuite/single.out/lvm-create1.out --- old/libstorage-2.25.18/testsuite/single.out/lvm-create1.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/lvm-create1.out 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,6 @@ +createLvs +0 +0 +50 +createExtendedLv +-4003 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/lvm-create2.out new/libstorage-2.25.18/testsuite/single.out/lvm-create2.out --- old/libstorage-2.25.18/testsuite/single.out/lvm-create2.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/lvm-create2.out 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,4 @@ +-2006 +0 +-4006 +0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/lvm-extend.out new/libstorage-2.25.18/testsuite/single.out/lvm-extend.out --- old/libstorage-2.25.18/testsuite/single.out/lvm-extend.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/lvm-extend.out 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,7 @@ +extendVg +0 +/dev/sda2 +0 +0 +/dev/sda2 +/dev/sdb1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/lvm_create.out new/libstorage-2.25.18/testsuite/single.out/lvm_create.out --- old/libstorage-2.25.18/testsuite/single.out/lvm_create.out 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/lvm_create.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -createLvs -0 -0 -50 -createExtendedLv --4003 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/lvm_create2.out new/libstorage-2.25.18/testsuite/single.out/lvm_create2.out --- old/libstorage-2.25.18/testsuite/single.out/lvm_create2.out 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/lvm_create2.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ --2006 -0 --4006 -0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/lvm_extend.out new/libstorage-2.25.18/testsuite/single.out/lvm_extend.out --- old/libstorage-2.25.18/testsuite/single.out/lvm_extend.out 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/lvm_extend.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -extendVg -0 -/dev/sda2 -0 -0 -/dev/sda2 -/dev/sdb1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/md-create.out new/libstorage-2.25.18/testsuite/single.out/md-create.out --- old/libstorage-2.25.18/testsuite/single.out/md-create.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/single.out/md-create.out 2014-10-06 16:30:28.000000000 +0200 @@ -0,0 +1,28 @@ +Devices: 1 ---------------------- +createMD: -6002 +createMD: -6002 +createMD: -6002 +createMD: -6002 +createMD: -6002 +createMD: -6002 +createMD: -6018 +Devices: 2 ---------------------- +createMD: 0 md0 /dev/md0 0 1 0 15735635 +createMD: 0 md0 /dev/md0 0 2 0 5253223 +createMD: -6002 +createMD: -6002 +createMD: 0 md0 /dev/md0 0 5 0 5253223 +createMD: 0 md0 /dev/md0 0 6 0 5253223 +createMD: -6018 +Devices: 3 ---------------------- +createMD: 0 md0 /dev/md0 0 3 0 10506446 +createMD: -6002 +Devices: 4 ---------------------- +createMD: 0 md0 /dev/md0 0 4 0 10506446 +Devices: 5 ---------------------- +createMD: 0 md0 /dev/md0 0 1 0 57689319 +createMD: 0 md0 /dev/md0 0 2 0 5253223 +createMD: 0 md0 /dev/md0 0 3 0 21012892 +createMD: 0 md0 /dev/md0 0 4 0 15759669 +createMD: 0 md0 /dev/md0 0 5 0 13133057 +createMD: 0 md0 /dev/md0 0 6 0 5253223 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.18/testsuite/single.out/md_create.out new/libstorage-2.25.18/testsuite/single.out/md_create.out --- old/libstorage-2.25.18/testsuite/single.out/md_create.out 2014-07-07 18:23:18.000000000 +0200 +++ new/libstorage-2.25.18/testsuite/single.out/md_create.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -Devices: 1 ---------------------- -createMD: -6002 -createMD: -6002 -createMD: -6002 -createMD: -6002 -createMD: -6002 -createMD: -6002 -createMD: -6018 -Devices: 2 ---------------------- -createMD: 0 md0 /dev/md0 0 1 0 15735635 -createMD: 0 md0 /dev/md0 0 2 0 5253223 -createMD: -6002 -createMD: -6002 -createMD: 0 md0 /dev/md0 0 5 0 5253223 -createMD: 0 md0 /dev/md0 0 6 0 5253223 -createMD: -6018 -Devices: 3 ---------------------- -createMD: 0 md0 /dev/md0 0 3 0 10506446 -createMD: -6002 -Devices: 4 ---------------------- -createMD: 0 md0 /dev/md0 0 4 0 10506446 -Devices: 5 ---------------------- -createMD: 0 md0 /dev/md0 0 1 0 57689319 -createMD: 0 md0 /dev/md0 0 2 0 5253223 -createMD: 0 md0 /dev/md0 0 3 0 21012892 -createMD: 0 md0 /dev/md0 0 4 0 15759669 -createMD: 0 md0 /dev/md0 0 5 0 13133057 -createMD: 0 md0 /dev/md0 0 6 0 5253223 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smartmontools for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package smartmontools for openSUSE:Factory checked in at 2014-10-08 22:13:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smartmontools (Old) and /work/SRC/openSUSE:Factory/.smartmontools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "smartmontools" Changes: -------- --- /work/SRC/openSUSE:Factory/smartmontools/smartmontools.changes 2014-09-09 18:59:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smartmontools.new/smartmontools.changes 2014-10-08 22:13:31.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Oct 7 22:55:04 CEST 2014 - sbrabec(a)suse.cz + +- Re-add /usr/sbin/rcsmards symlink (bnc#900099). +- Fix service restart in smartmontools.generate_smartd_opts.in + (bnc#900099). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smartmontools.spec ++++++ --- /var/tmp/diff_new_pack.kXOXfK/_old 2014-10-08 22:13:33.000000000 +0200 +++ /var/tmp/diff_new_pack.kXOXfK/_new 2014-10-08 22:13:33.000000000 +0200 @@ -120,7 +120,8 @@ --enable-savestates\ --enable-attributelog make %{?_smp_mflags} BUILD_INFO='"(SUSE RPM)"' -sed "s:@libdir@:%{_libdir}:g;s:@localstatedir@:%{_localstatedir}:g" <smartmontools.generate_smartd_opts.in >generate_smartd_opts +SERVICE=/usr/sbin/service +sed "s:@prefix@:%{_prefix}:g;s:@localstatedir@:%{_localstatedir}:g;s:@SERVICE@:$SERVICE:" <smartmontools.generate_smartd_opts.in >generate_smartd_opts %install %makeinstall @@ -143,6 +144,9 @@ EOF %if 0%{?suse_version} >= 1130 cp smartd.service %{buildroot}/%{_unitdir} +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsmartd +%else +ln -sf ../../etc/init.d/smartd %{buildroot}%{_sbindir}/rcsmartd %endif # INSTALL file is intended only for packagers. rm %{buildroot}%{_defaultdocdir}/%{name}/INSTALL @@ -182,7 +186,7 @@ %endif %if 0%{?suse_version} > 1140 -# Then generate initial %{_localstatedir}/lib/smartmontools/smartd_opts needed by smartd.service. +# Then generate initial %%{_localstatedir}/lib/smartmontools/smartd_opts needed by smartd.service. SMARTD_SKIP_INIT=1 %{_prefix}/lib/smartmontools/generate_smartd_opts %endif # No start by default here.. belongs to -presets packages ++++++ smartmontools.generate_smartd_opts.in ++++++ --- /var/tmp/diff_new_pack.kXOXfK/_old 2014-10-08 22:13:33.000000000 +0200 +++ /var/tmp/diff_new_pack.kXOXfK/_new 2014-10-08 22:13:33.000000000 +0200 @@ -37,11 +37,11 @@ mkdir -p @localstatedir@/lib/smartmontools -echo "# Generated by @libdir@/smartmontools/generate_smartd_opts +echo "# Generated by @prefix@/lib/smartmontools/generate_smartd_opts smartd_opts=\"$smartd_opts\"" >@localstatedir@/lib/smartmontools/smartd_opts # SMARTD_SKIP_INIT is used during installation. if test -z "$SMARTD_SKIP_INIT" ; then # Behavior of both "Command" and "ServiceRestart" is undefined. Restart service here. - /etc/init.d/smartd try-restart + @SERVICE@ smartd try-restart fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnuchess for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package gnuchess for openSUSE:Factory checked in at 2014-10-08 22:13:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuchess (Old) and /work/SRC/openSUSE:Factory/.gnuchess.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnuchess" Changes: -------- --- /work/SRC/openSUSE:Factory/gnuchess/gnuchess.changes 2012-11-06 16:05:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnuchess.new/gnuchess.changes 2014-10-08 22:13:28.000000000 +0200 @@ -1,0 +2,30 @@ +Sun Oct 5 23:09:57 UTC 2014 - andreas.stieger(a)gmx.de + +- gnuchess 6.1.2: + * CFLAGS replaced by CPPFLAGS in info. + * Fix for correct handling of castling moves. + * Include translations to other languages. +- includes changes from 6.1.1: + * Include translations to other languages. + * Minor corrections in translatable strings. + * Migrate frontend to C++. + * Use autoconf 2.69 and require it in configure.ac. + * Use automake 1.14. +- includes changes from 6.1.0: + * Add support for package internationalization based on gettext + * Include first translations provided by the Translation Team. + * Graphic mode, a new board shape based on the unicode characters + for chess. + * pgnreplay command, similar to pgnload, with the capability of + manually showing a saved game step by step and moving backwards + * Fix bug in setboard. + * Avoid using 100% CPU in UCI mode. + * Rename the small book.bin as smallbook.bin. +- includes changes from 6.0.3: + * Update to autoconf 2.69, automake 1.13 + * If in manual mode, keep it after undo. + * Remove some unused code. + * Avoid crashing when importing book_1.01.pgn +- licence is GPL-3.0+ + +------------------------------------------------------------------- Old: ---- gnuchess-6.0.2.tar.bz2 New: ---- gnuchess-6.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuchess.spec ++++++ --- /var/tmp/diff_new_pack.TxWhfj/_old 2014-10-08 22:13:31.000000000 +0200 +++ /var/tmp/diff_new_pack.TxWhfj/_new 2014-10-08 22:13:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnuchess # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: gnuchess -Version: 6.0.2 +Version: 6.1.2 Release: 0 Summary: GNU Chess Program -License: GPL-2.0+ +License: GPL-3.0+ Group: Amusements/Games/Board/Chess Url: http://www.gnu.org/software/chess/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://ftp.gnu.org/gnu/chess/%{name}-%{version}.tar.gz # WARNING: Don't forget to re-generate book.dat manually before submit! # Simply remove the source and build, updated book will be generated. Source1: book_1.02.pgn.bz2 @@ -35,12 +35,13 @@ BuildRequires: expect BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: gettext-devel BuildRequires: readline-devel Requires(post): info -Requires(preun):info +Requires(preun): info +Recommends: xboard Provides: chess_backend Provides: gchess -Recommends: xboard BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,12 +61,13 @@ %if 0%{?suse_version} > 1110 %make_install %else -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} %endif mkdir -p %{buildroot}%{_mandir}/man6 cp %{SOURCE4} %{buildroot}%{_mandir}/man6 # install xgnuchess install -m 755 %{SOURCE5} %{buildroot}/%{_bindir} +%find_lang %{name} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -77,7 +79,7 @@ fi fi -%files +%files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hyper-v for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package hyper-v for openSUSE:Factory checked in at 2014-10-08 22:13:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyper-v (Old) and /work/SRC/openSUSE:Factory/.hyper-v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hyper-v" Changes: -------- --- /work/SRC/openSUSE:Factory/hyper-v/hyper-v.changes 2014-07-13 14:05:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hyper-v.new/hyper-v.changes 2014-10-08 22:13:27.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 30 15:41:02 UTC 2014 - ohering(a)suse.de + +- vssdaemon: ignore the EBUSY on multiple freezing the same + partition (bnc#899204) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyper-v.tools.hv.hv_vss_daemon.c ++++++ --- /var/tmp/diff_new_pack.j9JF4P/_old 2014-10-08 22:13:28.000000000 +0200 +++ /var/tmp/diff_new_pack.j9JF4P/_new 2014-10-08 22:13:28.000000000 +0200 @@ -45,21 +45,39 @@ #endif -static int vss_do_freeze(char *dir, unsigned int cmd, char *fs_op) +/* Don't use syslog() in the function since that can cause write to disk */ +static int vss_do_freeze(char *dir, unsigned int cmd) { int ret, fd = open(dir, O_RDONLY); if (fd < 0) return 1; + ret = ioctl(fd, cmd, 0); - syslog(LOG_INFO, "VSS: %s of %s: %s\n", fs_op, dir, strerror(errno)); + + /* + * If a partition is mounted more than once, only the first + * FREEZE/THAW can succeed and the later ones will get + * EBUSY/EINVAL respectively: there could be 2 cases: + * 1) a user may mount the same partition to differnt directories + * by mistake or on purpose; + * 2) The subvolume of btrfs appears to have the same partition + * mounted more than once. + */ + if (ret) { + if ((cmd == FIFREEZE && errno == EBUSY) || + (cmd == FITHAW && errno == EINVAL)) { + close(fd); + return 0; + } + } + close(fd); return !!ret; } static int vss_operate(int operation) { - char *fs_op; char match[] = "/dev/"; FILE *mounts; struct mntent *ent; @@ -69,11 +87,9 @@ switch (operation) { case VSS_OP_FREEZE: cmd = FIFREEZE; - fs_op = "freeze"; break; case VSS_OP_THAW: cmd = FITHAW; - fs_op = "thaw"; break; default: return -1; @@ -94,15 +110,23 @@ root_seen = 1; continue; } - error |= vss_do_freeze(ent->mnt_dir, cmd, fs_op); + error |= vss_do_freeze(ent->mnt_dir, cmd); + if (error && operation == VSS_OP_FREEZE) + goto err; } endmntent(mounts); if (root_seen) { - error |= vss_do_freeze("/", cmd, fs_op); + error |= vss_do_freeze("/", cmd); + if (error && operation == VSS_OP_FREEZE) + goto err; } return error; +err: + endmntent(mounts); + vss_operate(VSS_OP_THAW); + return error; } static int netlink_send(int fd, struct cn_msg *msg) @@ -236,8 +260,16 @@ case VSS_OP_FREEZE: case VSS_OP_THAW: error = vss_operate(op); - if (error) + syslog(LOG_INFO, "VSS: op=%s: %s\n", + op == VSS_OP_FREEZE ? "FREEZE" : "THAW", + error ? "failed" : "succeeded"); + + if (error) { error = HV_E_FAIL; + syslog(LOG_ERR, "op=%d failed!", op); + syslog(LOG_ERR, "report it with these files:"); + syslog(LOG_ERR, "/etc/fstab and /proc/mounts"); + } break; default: syslog(LOG_ERR, "Illegal op:%d\n", op); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plotutils for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package plotutils for openSUSE:Factory checked in at 2014-10-08 22:13:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plotutils (Old) and /work/SRC/openSUSE:Factory/.plotutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plotutils" Changes: -------- --- /work/SRC/openSUSE:Factory/plotutils/plotutils.changes 2013-07-16 16:13:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plotutils.new/plotutils.changes 2014-10-08 22:13:25.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 6 17:39:33 UTC 2014 - crrodriguez(a)opensuse.org + +- Restrict xorg library requires to the mininum needed. +- BUild C++ bits with -fvisibility-inlines-hidden. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plotutils.spec ++++++ --- /var/tmp/diff_new_pack.qWIDOa/_old 2014-10-08 22:13:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qWIDOa/_new 2014-10-08 22:13:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package plotutils # -# 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 @@ -44,8 +44,15 @@ BuildRequires: gcc-c++ BuildRequires: libpng-devel BuildRequires: libtool +BuildRequires: pkgconfig +%if %suse_version < 1220 BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel +%else +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xt) +%endif %if %suse_version >= 1230 BuildRequires: gpg-offline %endif @@ -136,6 +143,7 @@ grep -rslE '(made by GNU Bison|A Bison parser, made from|"lex.yy.c")' . | xargs -r touch %build +export CXXFLAGS="%optflags -fvisibility-inlines-hidden" autoreconf -f -i %configure --with-pic\ --disable-static\ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icewm for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package icewm for openSUSE:Factory checked in at 2014-10-08 22:13:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icewm (Old) and /work/SRC/openSUSE:Factory/.icewm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icewm" Changes: -------- --- /work/SRC/openSUSE:Factory/icewm/icewm.changes 2014-04-14 06:43:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icewm.new/icewm.changes 2014-10-08 22:13:24.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 30 06:11:49 UTC 2014 - crrodriguez(a)opensuse.org + +- Do not use xorg-x11-devel, select only those packages needed + for build. +- Build c++ code with fvisibility-inlines-hidden to avoid + bloating the symbol table. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm.spec ++++++ --- /var/tmp/diff_new_pack.eflAdn/_old 2014-10-08 22:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.eflAdn/_new 2014-10-08 22:13:25.000000000 +0200 @@ -24,7 +24,14 @@ BuildRequires: gcc-c++ BuildRequires: update-alternatives BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xrandr) %if %{with gnome} BuildRequires: gnome-desktop-devel BuildRequires: libgnomeui-devel @@ -133,7 +140,7 @@ %build autoconf export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility-inlines-hidden" ./configure --without-debug \ --sysconfdir=/etc \ --with-cfgdir=/etc/icewm \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dbus-1 for openSUSE:Factory
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2014-10-08 22:13:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dbus-1" Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2014-09-19 13:56:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2014-10-08 22:13:22.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 30 08:20:50 UTC 2014 - fstrba(a)suse.com + +- Reformat the spec file using spec-cleaner + +------------------------------------------------------------------- dbus-1.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.NTgKWD/_old 2014-10-08 22:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.NTgKWD/_new 2014-10-08 22:13:23.000000000 +0200 @@ -17,37 +17,22 @@ %define with_systemd 1 -%bcond_without docs - -Name: dbus-1-x11 %define _name dbus %define _libname libdbus-1-3 -BuildRequires: pkgconfig(x11) -Url: http://dbus.freedesktop.org/ -Summary: D-Bus Message Bus System -License: GPL-2.0+ or AFL-2.1 -Group: System/Daemons -BuildRequires: audit-devel -BuildRequires: doxygen -BuildRequires: update-desktop-files -BuildRequires: xmlto - +%bcond_without docs +%bcond_without selinux # COMMON1-BEGIN # COMMON1-BEGIN - %if ! %{with_systemd} -%define _unitdir /usr/lib/systemd/system -%endif - -%if %{with_systemd} -BuildRequires: pkgconfig(libsystemd-daemon) -BuildRequires: pkgconfig(libsystemd-login) +%define _unitdir %{_libexecdir}/systemd/system %endif -BuildRequires: libexpat-devel -BuildRequires: libtool -BuildRequires: pkg-config +Name: dbus-1-x11 Version: 1.8.8 Release: 0 +Summary: D-Bus Message Bus System +License: GPL-2.0+ or AFL-2.1 +Group: System/Daemons +Url: http://dbus.freedesktop.org/ # Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source2: dbus-1.desktop @@ -56,12 +41,23 @@ Patch0: dbus-log-deny.patch # PATCH-FIX-OPENSUSE coolo(a)suse.de -- force a feature configure won't accept without x11 in buildrequires Patch1: dbus-do-autolaunch.patch -%bcond_without selinux +BuildRequires: audit-devel +BuildRequires: doxygen +BuildRequires: libcap-ng-devel +BuildRequires: libexpat-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: update-desktop-files +BuildRequires: xmlto +BuildRequires: pkgconfig(x11) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with_systemd} +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-login) +%endif %if %{with selinux} BuildRequires: libselinux-devel %endif -BuildRequires: libcap-ng-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END # COMMON1-END @@ -86,12 +82,15 @@ %package -n dbus-1 Summary: D-Bus Message Bus System Group: System/Daemons +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %{_sbindir}/groupadd +PreReq: %{_sbindir}/useradd +PreReq: permissions +Requires(post): %{_libname} = %{version} # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit %endif -PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd -Requires(post): %{_libname} = %{version} %description -n dbus-1 D-Bus is a message bus system, a simple way for applications to talk to @@ -104,7 +103,7 @@ %prep # COMMON2-BEGIN # COMMON2-BEGIN -%setup -n %{_name}-%{version} -q +%setup -q -n %{_name}-%{version} %patch0 -p1 %patch1 -p1 @@ -113,9 +112,9 @@ autoreconf -fi # We use -fpie/-pie for the whole build; this is the recommended way to harden # the build upstream, see discussion in fdo#46570 -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie" +export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie" export LDFLAGS="-pie" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +export CXXFLAGS="%{optflags} -fno-strict-aliasing" export V=1 %configure \ --disable-static \ @@ -140,6 +139,7 @@ --with-system-socket=/run/dbus/system_bus_socket \ --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} + %if %{with docs} doxygen -u && doxygen ./cleanup-man-pages.sh @@ -148,17 +148,17 @@ %install # COMMON2-END # COMMON2-END -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install %{?_smp_mflags} mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man1 -mkdir -p %{buildroot}/usr/sbin +mkdir -p %{buildroot}%{_prefix}/sbin mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir} mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus install -d %{buildroot}/run/dbus mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/ -install -m 0644 %SOURCE2 \ +install -m 0644 %{SOURCE2} \ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop mkdir -p %{buildroot}/%{_libdir}/pkgconfig mkdir -p %{buildroot}/lib/dbus-1/system-services @@ -180,15 +180,15 @@ # Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr # Currently required to make upower work together with systemd -mkdir -p %{buildroot}/usr/bin -ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send +mkdir -p %{buildroot}%{_prefix}/bin +ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send %verifyscript -n dbus-1 %verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper %pre -n dbus-1 -/usr/sbin/groupadd -r messagebus 2> /dev/null || : -/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : +%{_sbindir}/groupadd -r messagebus 2> /dev/null || : +%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : %post -n dbus-1 if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then @@ -228,7 +228,7 @@ /bin/dbus-daemon /bin/dbus-monitor /bin/dbus-send -/usr/bin/dbus-send +%{_bindir}/dbus-send /bin/dbus-uuidgen %{_mandir}/man1/dbus-cleanup-sockets.1.* %{_mandir}/man1/dbus-daemon.1.* @@ -242,7 +242,7 @@ %ghost /run/dbus %ghost %{_localstatedir}/lib/dbus/machine-id %if ! %{with_systemd} -%dir /usr/lib/systemd +%dir %{_libexecdir}/systemd %dir %{_unitdir} %endif %{_unitdir}/dbus.service ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.NTgKWD/_old 2014-10-08 22:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.NTgKWD/_new 2014-10-08 22:13:23.000000000 +0200 @@ -17,31 +17,21 @@ %define with_systemd 0 -%bcond_with docs - -Name: dbus-1 %define _name dbus %define _libname libdbus-1-3 -Url: http://dbus.freedesktop.org/ -Summary: D-Bus Message Bus System -License: GPL-2.0+ or AFL-2.1 -Group: System/Daemons - +%bcond_with docs +%bcond_without selinux # COMMON1-BEGIN - %if ! %{with_systemd} -%define _unitdir /usr/lib/systemd/system +%define _unitdir %{_libexecdir}/systemd/system %endif - -%if %{with_systemd} -BuildRequires: pkgconfig(libsystemd-daemon) -BuildRequires: pkgconfig(libsystemd-login) -%endif -BuildRequires: libexpat-devel -BuildRequires: libtool -BuildRequires: pkg-config +Name: dbus-1 Version: 1.8.8 Release: 0 +Summary: D-Bus Message Bus System +License: GPL-2.0+ or AFL-2.1 +Group: System/Daemons +Url: http://dbus.freedesktop.org/ # Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source2: dbus-1.desktop @@ -50,12 +40,18 @@ Patch0: dbus-log-deny.patch # PATCH-FIX-OPENSUSE coolo(a)suse.de -- force a feature configure won't accept without x11 in buildrequires Patch1: dbus-do-autolaunch.patch -%bcond_without selinux +BuildRequires: libcap-ng-devel +BuildRequires: libexpat-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with_systemd} +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-login) +%endif %if %{with selinux} BuildRequires: libselinux-devel %endif -BuildRequires: libcap-ng-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END %package -n %{_libname} @@ -95,7 +91,7 @@ %prep # COMMON2-BEGIN -%setup -n %{_name}-%{version} -q +%setup -q -n %{_name}-%{version} %patch0 -p1 %patch1 -p1 @@ -104,9 +100,9 @@ autoreconf -fi # We use -fpie/-pie for the whole build; this is the recommended way to harden # the build upstream, see discussion in fdo#46570 -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie" +export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie" export LDFLAGS="-pie" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +export CXXFLAGS="%{optflags} -fno-strict-aliasing" export V=1 %configure \ --disable-static \ @@ -131,6 +127,7 @@ --with-system-socket=/run/dbus/system_bus_socket \ --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} + %if %{with docs} doxygen -u && doxygen ./cleanup-man-pages.sh @@ -143,8 +140,8 @@ # devel stuff must not be in /lib mkdir -p %{buildroot}%{_libdir} -%{__ln_s} -v /%{_lib}/$(readlink $tdir/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so -%{__rm} -v $tdir/%{_lib}/lib%{name}.so +ln -s -v /%{_lib}/$(readlink $tdir/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so +rm -v $tdir/%{_lib}/lib%{name}.so mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/ mv -f $tdir/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/ rm -f $tdir/%{_lib}/*.la @@ -165,12 +162,13 @@ popd rm -rf $tdir -for i in /etc/dbus-1/session.d /etc/dbus-1/system.d \ - /usr/share/dbus-1/interfaces /usr/share/dbus-1/services /usr/share/dbus-1/system-services; do +for i in %{_sysconfdir}/dbus-1/session.d %{_sysconfdir}/dbus-1/system.d \ + %{_datadir}/dbus-1/interfaces %{_datadir}/dbus-1/services %{_datadir}/dbus-1/system-services; do mkdir -p %{buildroot}$i done %post -n %{_libname} -p /sbin/ldconfig + %postun -n %{_libname} -p /sbin/ldconfig %files -n %{_libname} ++++++ dbus-1-x11.spec.in ++++++ --- /var/tmp/diff_new_pack.NTgKWD/_old 2014-10-08 22:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.NTgKWD/_new 2014-10-08 22:13:23.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package dbus-1-x11 (Version 1.4.1) +# spec file for package dbus-1-x11.spec # -# 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,22 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define with_systemd 1 -%bcond_without docs -Name: dbus-1-x11 +%define with_systemd 1 %define _name dbus %define _libname libdbus-1-3 -BuildRequires: pkgconfig(x11) -Url: http://dbus.freedesktop.org/ -License: GPL2+ or AFL 2.1 -Group: System/Daemons +%bcond_without docs +Name: dbus-1-x11 Summary: D-Bus Message Bus System +License: GPL-2.0+ or AFL-2.1 +Group: System/Daemons +Url: http://dbus.freedesktop.org/ BuildRequires: audit-devel BuildRequires: doxygen BuildRequires: update-desktop-files BuildRequires: xmlto - +BuildRequires: pkgconfig(x11) # COMMON1-BEGIN # COMMON1-END @@ -55,12 +54,15 @@ %package -n dbus-1 Summary: D-Bus Message Bus System Group: System/Daemons +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %{_sbindir}/groupadd +PreReq: %{_sbindir}/useradd +PreReq: permissions +Requires(post): %{_libname} = %{version} # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit %endif -PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd -Requires(post): %{_libname} = %{version} %description -n dbus-1 D-Bus is a message bus system, a simple way for applications to talk to @@ -76,14 +78,14 @@ make DESTDIR=%{buildroot} install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man1 -mkdir -p %{buildroot}/usr/sbin +mkdir -p %{buildroot}%{_prefix}/sbin mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir} mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus install -d %{buildroot}/run/dbus mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/ -install -m 0644 %SOURCE2 \ +install -m 0644 %{SOURCE2} \ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop mkdir -p %{buildroot}/%{_libdir}/pkgconfig mkdir -p %{buildroot}/lib/dbus-1/system-services @@ -105,15 +107,15 @@ # Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr # Currently required to make upower work together with systemd -mkdir -p %{buildroot}/usr/bin -ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send +mkdir -p %{buildroot}%{_prefix}/bin +ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send %verifyscript -n dbus-1 %verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper %pre -n dbus-1 -/usr/sbin/groupadd -r messagebus 2> /dev/null || : -/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : +%{_sbindir}/groupadd -r messagebus 2> /dev/null || : +%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : %post -n dbus-1 if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then @@ -153,7 +155,7 @@ /bin/dbus-daemon /bin/dbus-monitor /bin/dbus-send -/usr/bin/dbus-send +%{_bindir}/dbus-send /bin/dbus-uuidgen %{_mandir}/man1/dbus-cleanup-sockets.1.* %{_mandir}/man1/dbus-daemon.1.* @@ -167,7 +169,7 @@ %ghost /run/dbus %ghost %{_localstatedir}/lib/dbus/machine-id %if ! %{with_systemd} -%dir /usr/lib/systemd +%dir %{_libexecdir}/systemd %dir %{_unitdir} %endif %{_unitdir}/dbus.service -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.3033 for openSUSE:13.1:Update
by root＠hilbert.suse.de 08 Oct '14

08 Oct '14

Hello community, here is the log from the commit of package patchinfo.3033 for openSUSE:13.1:Update checked in at 2014-10-08 12:14:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.3033 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.3033.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.3033" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <category>recommended</category> <rating>low</rating> <packager>vitezslav_cizek</packager> <summary>Fix a crash when removing an already removed handle.</summary> <description/> <issue tracker="bnc" id="897816"/> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0