Hello community, here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2019-08-28 16:02:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Wed Aug 28 16:02:43 2019 rev:62 rq:725927 version:4.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2019-08-19 20:58:33.904958120 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.7948/libstorage-ng.changes 2019-08-28 16:02:47.370788709 +0200 @@ -1,0 +2,64 @@ +Sun Aug 25 03:11:26 UTC 2019 - [email protected] + +- Translated using Weblate (Chinese (China)) +- 4.2.2 + +-------------------------------------------------------------------- +Fri Aug 23 11:00:42 UTC 2019 - [email protected] + +- merge gh#openSUSE/libstorage-ng#663 +- update packaging documentation +- 4.2.1 + +-------------------------------------------------------------------- +Fri Aug 23 09:38:32 UTC 2019 - [email protected] + +- merge gh#openSUSE/libstorage-ng#662 +- merge gh#openSUSE/libstorage-ng#661 +- Adapt Dockerfile for SLE-15-SP1 +- Translated using Weblate (Slovak) +- Translated using Weblate (Catalan) +- Translated using Weblate (Czech) +- Translated using Weblate (Japanese) +- Translated using Weblate (Arabic) +- Translated using Weblate (Chinese (China)) +- Translated using Weblate (Chinese (Taiwan)) +- Translated using Weblate (Dutch) +- Translated using Weblate (French) +- Translated using Weblate (German) +- Translated using Weblate (Hungarian) +- Translated using Weblate (Italian) +- Translated using Weblate (Korean) +- Translated using Weblate (Polish) +- Translated using Weblate (Russian) +- Translated using Weblate (Spanish) +- Translated using Weblate (Swedish) +- Translated using Weblate (Portuguese (Brazil)) +- Translated using Weblate (Finnish) +- Fix dectection of surrounding region (bsc#1146686) +- Bump lib version +- Fix surrounding detection +- Revert "Translated using Weblate (Catalan)" +- Revert "Translated using Weblate (Finnish)" +- Revert "Translated using Weblate (Dutch)" +- Revert "Translated using Weblate (Portuguese (Brazil))" +- Revert "Translated using Weblate (Swedish)" +- Revert "Translated using Weblate (Spanish)" +- Revert "Translated using Weblate (Russian)" +- Revert "Translated using Weblate (Polish)" +- Revert "Translated using Weblate (Korean)" +- Revert "Translated using Weblate (Italian)" +- Revert "Translated using Weblate (Hungarian)" +- Revert "Translated using Weblate (German)" +- Revert "Translated using Weblate (French)" +- Revert "Translated using Weblate (Chinese (Taiwan))" +- Revert "Translated using Weblate (Chinese (China))" +- Revert "Translated using Weblate (Arabic)" +- Revert "Translated using Weblate (Japanese)" +- Revert "Translated using Weblate (Czech)" +- Revert "Translated using Weblate (Slovak)" +- Revert "Adapt Dockerfile for SLE-15-SP1" +- Merge SLE-15-SP1 +- 4.2.0 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.1.145.tar.xz New: ---- libstorage-ng-4.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.VpyZtS/_old 2019-08-28 16:02:48.510788538 +0200 +++ /var/tmp/diff_new_pack.VpyZtS/_new 2019-08-28 16:02:48.514788537 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.1.145 +Version: 4.2.2 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.1.145.tar.xz -> libstorage-ng-4.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.145/LIBVERSION new/libstorage-ng-4.2.2/LIBVERSION --- old/libstorage-ng-4.1.145/LIBVERSION 2019-08-17 09:51:23.000000000 +0200 +++ new/libstorage-ng-4.2.2/LIBVERSION 2019-08-25 07:51:34.000000000 +0200 @@ -1 +1 @@ -1.15.0 +1.15.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.145/README.md new/libstorage-ng-4.2.2/README.md --- old/libstorage-ng-4.1.145/README.md 2019-08-17 09:51:23.000000000 +0200 +++ new/libstorage-ng-4.2.2/README.md 2019-08-25 07:51:34.000000000 +0200 @@ -98,19 +98,35 @@ Package versions are tracked by setting version tags in git. The last version digit is auto-increased with every OBS commit. -The version can always be set manually by setting an appropriate tag in git. +**The `VERSION` file is auto-generated from the latest git tag.** -> **Notes** -> -> 1. The `VERSION` file is auto-generated from the latest git tag. -> -> 2. The spec file template `libstorage-ng.spec.in` is **not** used. -Instead, the spec file from the OBS is used. +The version can be set manually by setting the appropriate tag in git. As +jenkins also sets version tags during the auto-submission process it is +needed to turn off the jenkins job temporarily. So, to set the version to a +specific number, follow these steps: + +1. disable the `libstorage-ng-master` project on the internal jenkins node +2. merge your latest changes +3. set desired version tag - **Don't forget to push tags!** +4. re-enable the `libstorage-ng-master` project +5. trigger new build (or wait) + +Remember, version tags should be `X.Y.Z` for master and `BRANCH-X.Y.Z` for other branches. For a more detailed description about the handling of version numbers and changelog entries look [here](https://github.com/openSUSE/linuxrc-devtools/blob/master/workflow.md). +Maintenance updates +------------------- + +Jenkins will auto-submit only the `master` branch. Other branches usually imply a maintenance update. + +To trigger updates for these branches, go to the `libstorage-ng-master` +project on our internal jenkins node. Choose `Build with Parameters` and +select the desired target. + + Package Versions ---------------- @@ -118,7 +134,8 @@ Currently this means -- 4.1.X for the `master` branch submitted to `Factory` and `SLE-15-SP1` +- 4.2.X for the `master` branch submitted to `Factory` and `SLE-15-SP2` +- 4.1.X for the `SLE-15-SP1` branch submitted to `SLE-15-SP1:Update` - 3.3.X for the `SLE-15-GA` branch submitted to `SLE-15:Update` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.145/VERSION new/libstorage-ng-4.2.2/VERSION --- old/libstorage-ng-4.1.145/VERSION 2019-08-17 09:51:23.000000000 +0200 +++ new/libstorage-ng-4.2.2/VERSION 2019-08-25 07:51:34.000000000 +0200 @@ -1 +1 @@ -4.1.145 +4.2.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.145/po/zh_CN.po new/libstorage-ng-4.2.2/po/zh_CN.po --- old/libstorage-ng-4.1.145/po/zh_CN.po 2019-08-17 09:51:23.000000000 +0200 +++ new/libstorage-ng-4.2.2/po/zh_CN.po 2019-08-25 07:51:34.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-06-06 14:56+0200\n" -"PO-Revision-Date: 2019-08-17 07:51+0000\n" +"PO-Revision-Date: 2019-08-25 05:51+0000\n" "Last-Translator: Marguerite Su <[email protected]>\n" "Language-Team: Chinese (China) <https://l10n.opensuse.org/projects/"; "libstorage/ng-master/zh_CN/>\n" @@ -1383,9 +1383,9 @@ #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda1), #. %2$s is replaced by size (e.g. 2 GiB) -#, fuzzy, c-format +#, c-format msgid "Deleting bcache cache set on %1$s (%2$s)" -msgstr "正在删除在 %1$s (%2$s) 上的 Bcache 缓存" +msgstr "正在删除 %1$s (%2$s) 上的 bcache 缓存集" #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.145/storage/Devices/PartitionImpl.cc new/libstorage-ng-4.2.2/storage/Devices/PartitionImpl.cc --- old/libstorage-ng-4.1.145/storage/Devices/PartitionImpl.cc 2019-08-17 09:51:23.000000000 +0200 +++ new/libstorage-ng-4.2.2/storage/Devices/PartitionImpl.cc 2019-08-25 07:51:34.000000000 +0200 @@ -583,7 +583,12 @@ Region tmp = partition_table->get_impl().get_usable_region(); - unsigned long long start = tmp.get_start(); + // None partition should start before the minimal MBR gap (by default, 1 MiB + // in MSDOS partition tables). But, in some cases, the first partition starts + // before 1 MiB (e.g., partitions for old Windows systems). For this reason, + // the start sector of the partition is considered when calculating the + // surrounding region. + unsigned long long start = min(get_region().get_start(), tmp.get_start()); unsigned long long end = tmp.get_end(); for (const Partition* partition : partitions) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.145/testsuite/partitions/surrounding.cc new/libstorage-ng-4.2.2/testsuite/partitions/surrounding.cc --- old/libstorage-ng-4.1.145/testsuite/partitions/surrounding.cc 2019-08-17 09:51:23.000000000 +0200 +++ new/libstorage-ng-4.2.2/testsuite/partitions/surrounding.cc 2019-08-25 07:51:34.000000000 +0200 @@ -90,3 +90,72 @@ BOOST_CHECK_EQUAL(surrounding_sda6.get_start(), 75 * spg + 128); BOOST_CHECK_EQUAL(surrounding_sda6.get_end(), 140 * spg - 1); } + + +BOOST_AUTO_TEST_CASE(test_msdos_partition_mbr_gap) +{ + set_logger(get_stdout_logger()); + + Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); + + Storage storage(environment); + + Devicegraph* devicegraph = storage.get_staging(); + + Disk* sda = Disk::create(devicegraph, "/dev/sda", Region(0, 10 * spg, 512)); + + PartitionTable* msdos = sda->create_partition_table(PtType::MSDOS); + + /* + * [------------- MBR gap ---------------][----------- rest -----------] + * [0 --------------][1024 --------------][2048 -----------------------] + * [ sda1 ][ sda2 ] + */ + Partition* sda1 = msdos->create_partition("/dev/sda1", Region(1024, 1024, 512), PartitionType::PRIMARY); + Partition* sda2 = msdos->create_partition("/dev/sda2", Region(2048, 1 * spg, 512), PartitionType::PRIMARY); + + Region surrounding_sda1 = sda1->get_unused_surrounding_region(); + BOOST_CHECK_EQUAL(surrounding_sda1.get_start(), 1024); + BOOST_CHECK_EQUAL(surrounding_sda1.get_end(), 2047); + + Region surrounding_sda2 = sda2->get_unused_surrounding_region(); + BOOST_CHECK_EQUAL(surrounding_sda2.get_start(), 2048); + BOOST_CHECK_EQUAL(surrounding_sda2.get_end(), 10 * spg - 1); +} + + +BOOST_AUTO_TEST_CASE(test_msdos_partitions_inside_mbr_gap) +{ + set_logger(get_stdout_logger()); + + Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); + + Storage storage(environment); + + Devicegraph* devicegraph = storage.get_staging(); + + Disk* sda = Disk::create(devicegraph, "/dev/sda", Region(0, 10 * spg, 512)); + + PartitionTable* msdos = sda->create_partition_table(PtType::MSDOS); + + /* + * [---------------- MBR gap ---------------][-------------- rest ---------------] + * [0 --][100 ----][200 ----][1000 ------][2000 ---------------------------------] + * [ sda1 ][ free ][ sda2 ][ sda3 ] + */ + Partition* sda1 = msdos->create_partition("/dev/sda1", Region(100, 100, 512), PartitionType::PRIMARY); + Partition* sda2 = msdos->create_partition("/dev/sda2", Region(1000, 1000, 512), PartitionType::PRIMARY); + Partition* sda3 = msdos->create_partition("/dev/sda2", Region(2000, 1 * spg, 512), PartitionType::PRIMARY); + + Region surrounding_sda1 = sda1->get_unused_surrounding_region(); + BOOST_CHECK_EQUAL(surrounding_sda1.get_start(), 100); + BOOST_CHECK_EQUAL(surrounding_sda1.get_end(), 999); + + Region surrounding_sda2 = sda2->get_unused_surrounding_region(); + BOOST_CHECK_EQUAL(surrounding_sda2.get_start(), 1000); + BOOST_CHECK_EQUAL(surrounding_sda2.get_end(), 1999); + + Region surrounding_sda3 = sda3->get_unused_surrounding_region(); + BOOST_CHECK_EQUAL(surrounding_sda3.get_start(), 2000); + BOOST_CHECK_EQUAL(surrounding_sda3.get_end(), 10 * spg - 1); +}
