Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package parted for openSUSE:Factory checked
in at 2022-06-25 10:23:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/parted (Old)
and /work/SRC/openSUSE:Factory/.parted.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "parted"
Sat Jun 25 10:23:46 2022 rev:139 rq:984783 version:3.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/parted/parted.changes 2022-06-03
14:16:38.897315077 +0200
+++ /work/SRC/openSUSE:Factory/.parted.new.1548/parted.changes 2022-06-25
10:23:49.450636230 +0200
@@ -1,0 +2,12 @@
+Thu Jun 23 07:34:55 CEST 2022 - aschn...@suse.com
+
+- drop type flag (SUSE specific) to fix bsc#1190847
+ refreshed patches:
+ - parted-mac.patch
+ - tests-adapt-to-SUSE.patch
+ drop patches:
+ - parted-type.patch
+ - parted-type-accept-hex.patch
+ - parted-json-no-type-flag.patch
+
+-------------------------------------------------------------------
Old:
----
parted-json-no-type-flag.patch
parted-type-accept-hex.patch
parted-type.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ parted.spec ++++++
--- /var/tmp/diff_new_pack.qfURvu/_old 2022-06-25 10:23:50.330637486 +0200
+++ /var/tmp/diff_new_pack.qfURvu/_new 2022-06-25 10:23:50.334637492 +0200
@@ -39,7 +39,6 @@
#PATCH-FEATURE-SUSE more-reliable-informing-the-kernel.patch bnc#657360
petr.u...@suse.cz
Patch13: more-reliable-informing-the-kernel.patch
Patch14: dummy-bootcode-only-for-x86.patch
-Patch15: parted-type.patch
Patch16: parted-mac.patch
Patch17: libparted-use-BLKRRPART-for-DASD.patch.patch
Patch18: libparted-make-BLKRRPART-more-robust.patch
@@ -59,7 +58,6 @@
Patch32: parted-fix-resizepart-and-rm-command.patch
Patch33: libparted-use-BLKRRPART-only-when-needed.patch
Patch34: libparted-canonicalize-dev-md-paths.patch
-Patch35: parted-json-no-type-flag.patch
# bsc#1168756
Patch36: libparted-linux-pmem-path.patch
# bsc#1164260
@@ -67,7 +65,6 @@
Patch38: direct-handling-of-partition-type-id-and-uuid.patch
Patch39: type-command.patch
# bsc#1164907
-Patch64: parted-type-accept-hex.patch
# Fatresize
Patch100: parted-fatresize-autoconf.patch
Patch101: fatresize-fix-getting-dev-name.patch
@@ -143,7 +140,6 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
@@ -160,12 +156,10 @@
%patch32 -p1
%patch33 -p1
%patch34 -p1
-%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
-%patch64 -p1
%patch100 -p1
%patch101 -p1
%patch156 -p1
++++++ parted-mac.patch ++++++
--- /var/tmp/diff_new_pack.qfURvu/_old 2022-06-25 10:23:50.434637634 +0200
+++ /var/tmp/diff_new_pack.qfURvu/_new 2022-06-25 10:23:50.438637640 +0200
@@ -152,30 +152,30 @@
===================================================================
--- parted-3.3.orig/parted/parted.c
+++ parted-3.3/parted/parted.c
-@@ -929,6 +929,7 @@ static char*
+@@ -946,6 +946,7 @@
+ static char*
partition_print_flags (PedPartition const *part)
{
- int xtype;
-+ const char* sysname;
- char *res = xstrdup ("");
- if (!part)
- return res;
-@@ -961,6 +962,17 @@ partition_print_flags (PedPartition cons
- }
++ const char* sysname;
+ char *res = xstrdup ("");
+ if (!part)
+ return res;
+@@ -967,6 +968,17 @@
}
+ }
-+ sysname = ped_partition_get_system_name( part );
-+ if (sysname) {
-+ char tmpstr[21];
-+ snprintf(tmpstr, sizeof(tmpstr) - 1, "type=%s", sysname);
-+ size_t new_len = res_buf_len + strlen(sep) + strlen(tmpstr);
-+ res = xrealloc(res, new_len);
-+ stpcpy (stpcpy (res + res_buf_len - 1, sep), tmpstr);
-+ res_buf_len = new_len;
-+ sep = ", ";
-+ }
++ sysname = ped_partition_get_system_name( part );
++ if (sysname) {
++ char tmpstr[21];
++ snprintf(tmpstr, sizeof(tmpstr) - 1, "type=%s", sysname);
++ size_t new_len = res_buf_len + strlen(sep) + strlen(tmpstr);
++ res = xrealloc(res, new_len);
++ stpcpy (stpcpy (res + res_buf_len - 1, sep), tmpstr);
++ res_buf_len = new_len;
++ sep = ", ";
++ }
+
- return res;
+ return res;
}
++++++ tests-adapt-to-SUSE.patch ++++++
--- /var/tmp/diff_new_pack.qfURvu/_old 2022-06-25 10:23:50.470637686 +0200
+++ /var/tmp/diff_new_pack.qfURvu/_new 2022-06-25 10:23:50.474637692 +0200
@@ -11,86 +11,6 @@
Tests: t6001, t6002, t6004, t6005
For: libparted-partition-naming.patch
---
-Index: parted-3.3/tests/t2200-dos-label-recog.sh
-===================================================================
---- parted-3.3.orig/tests/t2200-dos-label-recog.sh
-+++ parted-3.3/tests/t2200-dos-label-recog.sh
-@@ -45,7 +45,7 @@ printf FAT | dd bs=1c seek=82 count=3 of
- # print the partition table
- parted -m -s $dev unit s p > out || fail=1
- tail -2 out > k && mv k out || fail=1
--printf "1:2048s:4095s:2048s:::;\n2:4096s:8191s:4096s:::;\n" > exp || fail=1
-+printf "1:2048s:4095s:2048s:::type=83;\n2:4096s:8191s:4096s:::type=83;\n" >
exp || fail=1
-
- compare exp out || fail=1
-
-Index: parted-3.3/tests/t2310-dos-extended-2-sector-min-offset.sh
-===================================================================
---- parted-3.3.orig/tests/t2310-dos-extended-2-sector-min-offset.sh
-+++ parted-3.3/tests/t2310-dos-extended-2-sector-min-offset.sh
-@@ -33,8 +33,8 @@ p5=${scsi_dev}5
- cat <<EOF > exp || framework_failure
- BYT;
- $scsi_dev:$((2048*512/$ss))s:scsi:$ss:$ss:msdos:Linux scsi_debug:;
--1:64s:128s:65s:::lba;
--5:65s:128s:64s:::;
-+1:64s:128s:65s:::lba, type=0f;
-+5:65s:128s:64s:::type=83;
- EOF
-
- # Create a DOS label with an extended partition starting at sector 64.
-Index: parted-3.3/tests/t3200-resize-partition.sh
-===================================================================
---- parted-3.3.orig/tests/t3200-resize-partition.sh
-+++ parted-3.3/tests/t3200-resize-partition.sh
-@@ -75,7 +75,7 @@ compare /dev/null err || fail=1
- parted -m -s $dev u s p > out 2>&1 || fail=1
-
- sed -n 3p out > k && mv k out || fail=1
--printf "1:$default_start:$new_end:3073s:ext2::$ms;\n" > exp || fail=1
-+printf "1:$default_start:$new_end:3073s:ext2::type=83;\n" > exp || fail=1
- compare exp out || fail=1
-
- umount "${dev}1" || fail=1
-Index: parted-3.3/tests/t3300-palo-prep.sh
-===================================================================
---- parted-3.3.orig/tests/t3300-palo-prep.sh
-+++ parted-3.3/tests/t3300-palo-prep.sh
-@@ -20,9 +20,9 @@
- ss=$sector_size_
-
- cat > exp <<EOF || framework_failure
--1:2048s:4095s:2048s:ext2::lba, palo;
--1:2048s:4095s:2048s:ext2::lba, prep;
--1:2048s:4095s:2048s:ext2::lba, palo;
-+1:2048s:4095s:2048s:ext2::lba, palo, type=f0;
-+1:2048s:4095s:2048s:ext2::lba, prep, type=41;
-+1:2048s:4095s:2048s:ext2::lba, palo, type=f0;
- EOF
-
- dev=dev-file
-@@ -37,7 +37,7 @@ parted -m -s $dev mklabel msdos \
- set 1 palo on u s print \
- > out 2> err || fail=1
-
--grep -E '^1:2048s:4095s:2048s:ext2::lba, p...;$' out > k; mv k out
-+grep -E '^1:2048s:4095s:2048s:ext2::lba, p..., type=..;$' out > k; mv k out
-
- compare exp out || fail=1
-
-Index: parted-3.3/tests/t4100-msdos-starting-sector.sh
-===================================================================
---- parted-3.3.orig/tests/t4100-msdos-starting-sector.sh
-+++ parted-3.3/tests/t4100-msdos-starting-sector.sh
-@@ -56,7 +56,7 @@ cat <<EOF > exp || fail=1
- BYT;
- path:${N}s:file:$ss:$ss:msdos::;
- 1:32s:2047s:2016s:free;
--1:2048s:4095s:2048s:::;
-+1:2048s:4095s:2048s:::type=83;
- EOF
-
- # create a partition at the end of the label
Index: parted-3.3/tests/t6001-psep.sh
===================================================================
--- parted-3.3.orig/tests/t6001-psep.sh
@@ -164,30 +84,6 @@
done
Exit $fail
-Index: parted-3.3/tests/t0283-overlap-partitions.sh
-===================================================================
---- parted-3.3.orig/tests/t0283-overlap-partitions.sh
-+++ parted-3.3/tests/t0283-overlap-partitions.sh
-@@ -54,8 +54,8 @@ Partition Table: msdos
- Disk Flags:
-
- Number Start End Size Type File system Flags
-- 1 1049kB 5243kB 4194kB primary
-- 2 5242kB 8000kB 2758kB primary
-+ 1 1049kB 5243kB 4194kB primary type=83
-+ 2 5242kB 8000kB 2758kB primary type=83
-
- (parted) rm
- Partition number? 2
-@@ -94,7 +94,7 @@ Partition Table: msdos
- Disk Flags:
-
- Number Start End Size Type File system Flags
-- 1 1049kB 5243kB 4194kB primary
-+ 1 1049kB 5243kB 4194kB primary type=83
-
- (parted) rm
- Partition number? 1
Index: parted-3.3/tests/t6002-dm-busy.sh
===================================================================
--- parted-3.3.orig/tests/t6002-dm-busy.sh
@@ -223,57 +119,4 @@
# Removal of unmounted partition must succeed.
parted -s "$dev" rm 1 > /dev/null 2>&1 || fail=1
-@@ -84,7 +84,7 @@ sed "s,^$dev,DEV," out > k; mv k out
- cat <<EOF >> exp || fail=1
- BYT;
- DEV:${n}s:dm:512:512:msdos:Linux device-mapper (linear):;
--2:1001s:200000s:199000s:fat32::lba;
-+2:1001s:200000s:199000s:fat32::lba, type=0c;
- EOF
-
- compare exp out || fail=1
-Index: parted-3.3/tests/t9042-dos-partition-limit.sh
-===================================================================
---- parted-3.3.orig/tests/t9042-dos-partition-limit.sh
-+++ parted-3.3/tests/t9042-dos-partition-limit.sh
-@@ -41,7 +41,7 @@ scsi_dev=$(cat dev-name)
- n=$((n_MiB * sectors_per_MiB))
- printf '%s\n' "BYT;" \
- "$scsi_dev:${n}s:scsi:$ss:$ss:msdos:Linux scsi_debug:;" \
-- "1:$((start-2))s:$((n-1))s:$((n-start+2))s:::lba;" \
-+ "1:$((start-2))s:$((n-1))s:$((n-start+2))s:::lba, type=0f;" \
- > exp || fail=1
-
- parted -s -a min $scsi_dev mklabel msdos mkpart extended $((start-2))s 100%
|| fail=1
-@@ -51,7 +51,7 @@ i=1
- while :; do
- end=$((start + partition_sectors - 2))
- parted -s -a min $scsi_dev mkpart logical ${start}s ${end}s || fail=1
-- printf "$((i+4)):${start}s:${end}s:$((end-start+1))s:::;\n" >> exp
-+ printf "$((i+4)):${start}s:${end}s:$((end-start+1))s:::type=83;\n" >> exp
- test $i = $((n_partitions - 1)) && break
- start=$((start + partition_sectors))
- i=$((i+1))
-Index: parted-3.3/tests/t4100-msdos-partition-limits.sh
-===================================================================
---- parted-3.3.orig/tests/t4100-msdos-partition-limits.sh
-+++ parted-3.3/tests/t4100-msdos-partition-limits.sh
-@@ -81,7 +81,7 @@ do_mkpart $n $end || fail=1
- # print the result
- parted -s $dev unit s p > out 2>&1 || fail=1
- sed -n "/^ *1 *$n/s/ */ /gp" out|sed "s/ *\$//" > k && mv k out || fail=1
--echo " 1 ${n}s ${end}s 4294967295s primary" > exp || fail=1
-+echo " 1 ${n}s ${end}s 4294967295s primary type=83" > exp || fail=1
- compare exp out || fail=1
-
- # a partition length of exactly 2^32 sectors provokes failure.
-@@ -121,7 +121,7 @@ Partition Table: $table_type
- Disk Flags:
-
- Number Start End Size Type File system Flags
-- 1 4294967295s 4294968294s 1000s primary
-+ 1 4294967295s 4294968294s 1000s primary type=83
-
- EOF
-
