Hello community, here is the log from the commit of package util-linux checked in at Tue Mar 28 18:31:50 CEST 2006. -------- --- /work/SRC/all/BASE/util-linux/util-linux.changes 2006-03-21 11:36:03.000000000 +0100 +++ /work/src/done/STABLE/util-linux/util-linux.changes 2006-03-28 17:54:13.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 17:53:46 CEST 2006 - hvogel@suse.de + +- more fixes for the fdiskwrap patch [#160822] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.vuGkKO/_old 2006-03-28 18:30:10.000000000 +0200 +++ /var/tmp/diff_new_pack.vuGkKO/_new 2006-03-28 18:30:10.000000000 +0200 @@ -20,7 +20,7 @@ Group: System/Base Autoreqprov: on Version: 2.12r -Release: 21 +Release: 23 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-%version.tar.bz2 Source2: nologin.c @@ -577,6 +577,8 @@ %endif %changelog -n util-linux +* Tue Mar 28 2006 - hvogel@suse.de +- more fixes for the fdiskwrap patch [#160822] * Tue Mar 21 2006 - okir@suse.de - Update nfs(5) manpage to document security flavors [#159368] * Mon Mar 20 2006 - hvogel@suse.de ++++++ util-linux-2.12r-fdiskwrap.patch ++++++ --- /var/tmp/diff_new_pack.vuGkKO/_old 2006-03-28 18:30:11.000000000 +0200 +++ /var/tmp/diff_new_pack.vuGkKO/_new 2006-03-28 18:30:11.000000000 +0200 @@ -83,9 +83,11 @@ static void -seek_sector(int fd, unsigned int secno) { +- long long offset = (long long) secno * sector_size; +- if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1) +seek_sector(int fd, unsigned long long secno) { - long long offset = (long long) secno * sector_size; - if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1) ++ off_t offset = (off_t) secno * sector_size; ++ if (lseek(fd, offset, SEEK_SET) == (off_t) -1) fatal(unable_to_seek); } @@ -140,7 +142,41 @@ if (doext) { p = ptes[i].ext_pointer; -@@ -1799,7 +1798,7 @@ +@@ -1546,7 +1545,7 @@ + else + printf(_("\nDisk %s: %ld.%ld GB, %lld bytes\n"), + disk_device, megabytes/1000, (megabytes/100)%10, bytes); +- printf(_("%d heads, %d sectors/track, %d cylinders"), ++ printf(_("%d heads, %Ld sectors/track, %d cylinders"), + heads, sectors, cylinders); + if (units_per_sector == 1) + printf(_(", total %llu sectors"), +@@ -1778,20 +1777,21 @@ + struct partition *p; + int i; + +- printf(_("\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"), ++ printf(_("\nDisk %s: %d heads, %Ld sectors, %d cylinders\n\n"), + disk_device, heads, sectors, cylinders); + printf(_("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n")); + for (i = 0 ; i < partitions; i++) { + pe = &ptes[i]; + p = (extend ? pe->ext_pointer : pe->part_table); + if (p != NULL) { +- printf("%2d %02x%4d%4d%5d%4d%4d%5d%11u%11u %02x\n", ++ printf("%2d %02x%4d%4d%5d%4d%4d%5d%11lu%11lu %02x\n", + i + 1, p->boot_ind, p->head, + sector(p->sector), + cylinder(p->sector, p->cyl), p->end_head, + sector(p->end_sector), + cylinder(p->end_sector, p->end_cyl), +- get_start_sect(p), get_nr_sects(p), p->sys_ind); ++ (unsigned long) get_start_sect(p), ++ (unsigned long) get_nr_sects(p), p->sys_ind); + if (p->sys_ind) + check_consistency(p, i); + } +@@ -1799,7 +1799,7 @@ } static void @@ -149,7 +185,16 @@ int i; struct pte *pe = &ptes[0]; struct partition *p; -@@ -1845,8 +1844,8 @@ +@@ -1832,7 +1832,7 @@ + n, h + 1, heads); + if (real_s >= sectors) + fprintf(stderr, _("Partition %d: sector %d greater than " +- "maximum %d\n"), n, s, sectors); ++ "maximum %Ld\n"), n, s, sectors); + if (real_c >= cylinders) + fprintf(stderr, _("Partitions %d: cylinder %d greater than " + "maximum %d\n"), n, real_c + 1, cylinders); +@@ -1845,8 +1845,8 @@ static void verify(void) { int i, j; @@ -160,7 +205,7 @@ struct partition *p; if (warn_geometry()) -@@ -1890,7 +1889,7 @@ +@@ -1890,7 +1890,7 @@ if (extended_offset) { struct pte *pex = &ptes[ext_index]; @@ -169,7 +214,18 @@ get_nr_sects(pex->part_table) - 1; for (i = 4; i < partitions; i++) { -@@ -1923,7 +1922,7 @@ +@@ -1909,8 +1909,8 @@ + } + + if (total > total_number_of_sectors) +- printf(_("Total allocated sectors %d greater than the maximum " +- "%lld\n"), total, total_number_of_sectors); ++ printf(_("Total allocated sectors %ld greater than the maximum" ++ " %lld\n"), total, total_number_of_sectors); + else if (total < total_number_of_sectors) + printf(_("%lld unallocated sectors\n"), + total_number_of_sectors - total); +@@ -1923,7 +1923,7 @@ struct partition *p = ptes[n].part_table; struct partition *q = ptes[ext_index].part_table; long long llimit; @@ -178,7 +234,16 @@ first[partitions], last[partitions]; if (p && p->sys_ind) { -@@ -2228,14 +2227,14 @@ +@@ -1969,7 +1969,7 @@ + if (start > limit) + break; + if (start >= temp+units_per_sector && read) { +- printf(_("Sector %d is already allocated\n"), temp); ++ printf(_("Sector %llu is already allocated\n"), temp); + temp = start; + read = 0; + } +@@ -2228,14 +2228,14 @@ #define MAX_PER_LINE 16 static void @@ -223,6 +288,41 @@ extern int show_begin; extern int aix_label; extern char *partition_type(unsigned char type); +--- util-linux-2.12r/fdisk/fdiskmaclabel.h ++++ util-linux-2.12r/fdisk/fdiskmaclabel.h +@@ -25,9 +25,10 @@ + + /* fdisk.c */ + #define maclabel ((mac_partition *)MBRbuffer) +-extern char MBRbuffer[MAX_SECTOR_SIZE]; ++extern unsigned char MBRbuffer[MAX_SECTOR_SIZE]; + extern char changed[MAXIMUM_PARTS]; +-extern unsigned int heads, sectors, cylinders; ++extern unsigned int heads, cylinders; ++extern unsigned long long sectors; + extern int show_begin; + extern int mac_label; + extern char *partition_type(unsigned char type); +--- util-linux-2.12r/fdisk/fdisksgilabel.c ++++ util-linux-2.12r/fdisk/fdisksgilabel.c +@@ -197,7 +197,7 @@ + w = strlen(disk_device); + + if (xtra) { +- printf(_("\nDisk %s (SGI disk label): %d heads, %d sectors\n" ++ printf(_("\nDisk %s (SGI disk label): %d heads, %llu sectors\n" + "%d cylinders, %d physical cylinders\n" + "%d extra sects/cyl, interleave %d:1\n" + "%s\n" +@@ -211,7 +211,7 @@ + sector_size); + } else { + printf(_("\nDisk %s (SGI disk label): " +- "%d heads, %d sectors, %d cylinders\n" ++ "%d heads, %llu sectors, %d cylinders\n" + "Units = %s of %d * %d bytes\n\n"), + disk_device, heads, sectors, cylinders, + str_units(PLURAL), units_per_sector, --- util-linux-2.12r/fdisk/fdisksgilabel.h +++ util-linux-2.12r/fdisk/fdisksgilabel.h @@ -103,8 +103,9 @@ @@ -237,6 +337,35 @@ extern int show_begin; extern int sgi_label; extern char *partition_type(unsigned char type); +--- util-linux-2.12r/fdisk/fdisksunlabel.c ++++ util-linux-2.12r/fdisk/fdisksunlabel.c +@@ -349,7 +349,7 @@ + } + + snprintf(sunlabel->info, sizeof(sunlabel->info), +- "%s%s%s cyl %d alt %d hd %d sec %d", ++ "%s%s%s cyl %d alt %d hd %d sec %llu", + p ? p->vendor : "", (p && *p->vendor) ? " " : "", + p ? p->model + : (floppy ? _("3,5\" floppy") : _("Linux custom")), +@@ -656,7 +656,7 @@ + w = strlen(disk_device); + if (xtra) + printf( +- _("\nDisk %s (Sun disk label): %d heads, %d sectors, %d rpm\n" ++ _("\nDisk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n" + "%d cylinders, %d alternate cylinders, %d physical cylinders\n" + "%d extra sects/cyl, interleave %d:1\n" + "%s\n" +@@ -670,7 +670,7 @@ + str_units(PLURAL), units_per_sector); + else + printf( +- _("\nDisk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n" ++ _("\nDisk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n" + "Units = %s of %d * 512 bytes\n\n"), + disk_device, heads, sectors, cylinders, + str_units(PLURAL), units_per_sector); --- util-linux-2.12r/fdisk/fdisksunlabel.h +++ util-linux-2.12r/fdisk/fdisksunlabel.h @@ -37,8 +37,9 @@ @@ -251,18 +380,3 @@ extern int show_begin; extern int sun_label; extern char *partition_type(unsigned char type); ---- util-linux-2.12r/fdisk/fdiskmaclabel.h -+++ util-linux-2.12r/fdisk/fdiskmaclabel.h -@@ -25,9 +25,10 @@ - - /* fdisk.c */ - #define maclabel ((mac_partition *)MBRbuffer) --extern char MBRbuffer[MAX_SECTOR_SIZE]; -+extern unsigned char MBRbuffer[MAX_SECTOR_SIZE]; - extern char changed[MAXIMUM_PARTS]; --extern unsigned int heads, sectors, cylinders; -+extern unsigned int heads, cylinders; -+extern unsigned long long sectors; - extern int show_begin; - extern int mac_label; - extern char *partition_type(unsigned char type); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de