[Glibc-bsd-commits] r1457 - in trunk/web/patches: . debian-only
Robert Millan
rmh at costa.debian.org
Wed Apr 19 09:53:16 UTC 2006
Author: rmh
Date: 2006-04-19 09:53:16 +0000 (Wed, 19 Apr 2006)
New Revision: 1457
Removed:
trunk/web/patches/debian-only/parted_debian.diff
Modified:
trunk/web/patches/parted.diff
Log:
Delete parted_debian.diff (merged in svn), and fix ioctl detection in parted.diff.
Deleted: trunk/web/patches/debian-only/parted_debian.diff
===================================================================
--- trunk/web/patches/debian-only/parted_debian.diff 2006-04-19 09:22:13 UTC (rev 1456)
+++ trunk/web/patches/debian-only/parted_debian.diff 2006-04-19 09:53:16 UTC (rev 1457)
@@ -1,28 +0,0 @@
-
-Author: rmh
-Status: in BTS
-
-diff -Nur parted-1.6.25.1.old/debian/control parted-1.6.25.1/debian/control
---- parted-1.6.25.1.old/debian/control 2006-04-18 20:42:06.000000000 +0200
-+++ parted-1.6.25.1/debian/control 2006-04-18 20:42:45.000000000 +0200
-@@ -4,7 +4,7 @@
- Maintainer: Parted Maintainer Team <parted-maintainers at lists.alioth.debian.org>
- Uploaders: Sven Luther <luther at debian.org>, Otavio Salvador <otavio at debian.org>
- Standards-Version: 3.6.2
--Build-Depends: debhelper (>= 4.2.0), dpatch, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, uuid-dev, gettext, texinfo (>= 4.2), debianutils (>= 1.13.1), autoconf, automake1.8, libtool
-+Build-Depends: debhelper (>= 4.2.0), dpatch, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, uuid-dev, gettext, texinfo (>= 4.2), debianutils (>= 1.13.1), autoconf, automake1.8, libtool, libgeom-dev [kfreebsd-i386 kfreebsd-amd64]
-
- Package: parted
- Architecture: any
-diff -Nur parted-1.6.25.1.old/debian/control.in parted-1.6.25.1/debian/control.in
---- parted-1.6.25.1.old/debian/control.in 2006-04-18 20:42:06.000000000 +0200
-+++ parted-1.6.25.1/debian/control.in 2006-04-18 20:42:45.000000000 +0200
-@@ -4,7 +4,7 @@
- Maintainer: Parted Maintainer Team <parted-maintainers at lists.alioth.debian.org>
- Uploaders: Sven Luther <luther at debian.org>, Otavio Salvador <otavio at debian.org>
- Standards-Version: 3.6.2
--Build-Depends: debhelper (>= 4.2.0), dpatch, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, uuid-dev, gettext, texinfo (>= 4.2), debianutils (>= 1.13.1), autoconf, automake1.8, libtool
-+Build-Depends: debhelper (>= 4.2.0), dpatch, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, uuid-dev, gettext, texinfo (>= 4.2), debianutils (>= 1.13.1), autoconf, automake1.8, libtool, libgeom-dev [kfreebsd-i386 kfreebsd-amd64]
-
- Package: parted at BINPKGVER@
- Architecture: any
Modified: trunk/web/patches/parted.diff
===================================================================
--- trunk/web/patches/parted.diff 2006-04-19 09:22:13 UTC (rev 1456)
+++ trunk/web/patches/parted.diff 2006-04-19 09:53:16 UTC (rev 1457)
@@ -4,7 +4,7 @@
diff -Nur parted-1.6.25.1.old/configure.in parted-1.6.25.1/configure.in
--- parted-1.6.25.1.old/configure.in 2005-11-11 13:35:53.000000000 +0100
-+++ parted-1.6.25.1/configure.in 2006-04-18 20:42:45.000000000 +0200
++++ parted-1.6.25.1/configure.in 2006-04-19 11:50:12.000000000 +0200
@@ -46,6 +46,8 @@
case "$host_os" in
linux*) OS=linux ;;
@@ -54,7 +54,7 @@
if test "$OS" = linux; then
diff -Nur parted-1.6.25.1.old/include/parted/Makefile.am parted-1.6.25.1/include/parted/Makefile.am
--- parted-1.6.25.1.old/include/parted/Makefile.am 2005-11-11 13:32:28.000000000 +0100
-+++ parted-1.6.25.1/include/parted/Makefile.am 2006-04-18 20:42:45.000000000 +0200
++++ parted-1.6.25.1/include/parted/Makefile.am 2006-04-19 11:50:12.000000000 +0200
@@ -1,6 +1,7 @@
partedincludedir = $(includedir)/parted
partedinclude_HEADERS = gnu.h \
@@ -65,7 +65,7 @@
device.h \
diff -Nur parted-1.6.25.1.old/include/parted/freebsd.h parted-1.6.25.1/include/parted/freebsd.h
--- parted-1.6.25.1.old/include/parted/freebsd.h 1970-01-01 01:00:00.000000000 +0100
-+++ parted-1.6.25.1/include/parted/freebsd.h 2006-04-18 20:44:08.000000000 +0200
++++ parted-1.6.25.1/include/parted/freebsd.h 2006-04-19 11:50:12.000000000 +0200
@@ -0,0 +1,37 @@
+/*
+ libparted - a library for manipulating disk partitions
@@ -106,7 +106,7 @@
+
diff -Nur parted-1.6.25.1.old/libparted/Makefile.am parted-1.6.25.1/libparted/Makefile.am
--- parted-1.6.25.1.old/libparted/Makefile.am 2005-11-11 13:35:53.000000000 +0100
-+++ parted-1.6.25.1/libparted/Makefile.am 2006-04-18 20:43:29.000000000 +0200
++++ parted-1.6.25.1/libparted/Makefile.am 2006-04-19 11:50:12.000000000 +0200
@@ -47,7 +47,8 @@
@OS at .c
@@ -119,7 +119,7 @@
@OS_LIBS@ \
diff -Nur parted-1.6.25.1.old/libparted/disk_bsd.c parted-1.6.25.1/libparted/disk_bsd.c
--- parted-1.6.25.1.old/libparted/disk_bsd.c 2005-11-11 13:35:53.000000000 +0100
-+++ parted-1.6.25.1/libparted/disk_bsd.c 2006-04-18 20:42:45.000000000 +0200
++++ parted-1.6.25.1/libparted/disk_bsd.c 2006-04-19 11:50:12.000000000 +0200
@@ -24,6 +24,8 @@
#include <string.h>
@@ -131,7 +131,7 @@
#include <parted/endian.h>
diff -Nur parted-1.6.25.1.old/libparted/disk_sun.c parted-1.6.25.1/libparted/disk_sun.c
--- parted-1.6.25.1.old/libparted/disk_sun.c 2005-11-11 13:35:53.000000000 +0100
-+++ parted-1.6.25.1/libparted/disk_sun.c 2006-04-18 20:42:45.000000000 +0200
++++ parted-1.6.25.1/libparted/disk_sun.c 2006-04-19 11:50:12.000000000 +0200
@@ -24,6 +24,8 @@
#include <string.h>
@@ -143,8 +143,8 @@
#include <parted/endian.h>
diff -Nur parted-1.6.25.1.old/libparted/freebsd.c parted-1.6.25.1/libparted/freebsd.c
--- parted-1.6.25.1.old/libparted/freebsd.c 1970-01-01 01:00:00.000000000 +0100
-+++ parted-1.6.25.1/libparted/freebsd.c 2006-04-18 20:44:08.000000000 +0200
-@@ -0,0 +1,1009 @@
++++ parted-1.6.25.1/libparted/freebsd.c 2006-04-19 11:51:06.000000000 +0200
+@@ -0,0 +1,1017 @@
+/*
+ libparted - a library for manipulating disk partitions
+ Copyright (C) 1999 - 2005 Free Software Foundation, Inc.
@@ -312,7 +312,9 @@
+{
+ FreeBSDSpecific* arch_specific = FREEBSD_SPECIFIC (dev);
+ struct stat dev_stat;
++#ifdef IOCATAGPARM
+ struct ata_params ap;
++#endif
+
+ if (!_device_stat (dev, &dev_stat))
+ return 0;
@@ -332,7 +334,8 @@
+ = dev->length / (63 * 255)
+ / (dev->sector_size / PED_SECTOR_SIZE);
+
-+ if (0) /* disabled for 5.x compat by rmh -- if (ioctl (arch_specific->fd, IOCATAGPARM, &ap) == 0) */ {
++#ifdef IOCATAGPARM
++ if (ioctl (arch_specific->fd, IOCATAGPARM, &ap) == 0) {
+ dev->hw_geom.sectors = ap.sectors;
+ dev->hw_geom.heads = ap.heads;
+ dev->hw_geom.cylinders = ap.cylinders; /* XXX */
@@ -340,9 +343,9 @@
+/* = dev->length / (dev->hw_geom.heads */
+/* * dev->hw_geom.sectors) */
+/* / (dev->sector_size / PED_SECTOR_SIZE); */
-+ } else {
++ } else
++#endif
+ dev->hw_geom = dev->bios_geom;
-+ }
+
+ return 1;
+}
@@ -369,7 +372,9 @@
+{
+ FreeBSDSpecific* arch_specific = FREEBSD_SPECIFIC(dev);
+ struct stat dev_stat;
++#ifdef IOCATAGPARM
+ struct ata_params ap;
++#endif
+ PedExceptionOption ex_status;
+ char vendor_buf[64];
+
@@ -379,7 +384,13 @@
+ if (!ped_device_open (dev))
+ goto error;
+
-+ if (1) /* disabled for 5.x compat by rmh -- if (ioctl (arch_specific->fd, IOCATAGPARM, &ap) == -1) */ {
++#ifdef IOCATAGPARM
++ if (ioctl (arch_specific->fd, IOCATAGPARM, &ap) != -1) {
++ snprintf(vendor_buf, 64, "%s/%s", ap.model, ap.revision);
++ dev->model = strip_name (vendor_buf);
++ } else
++#endif
++ {
+ ex_status = ped_exception_throw (
+ PED_EXCEPTION_WARNING,
+ PED_EXCEPTION_IGNORE_CANCEL,
@@ -394,9 +405,6 @@
+ case PED_EXCEPTION_IGNORE:
+ dev->model = strdup(_("IDE"));
+ }
-+ } else {
-+ snprintf(vendor_buf, 64, "%s/%s", ap.model, ap.revision);
-+ dev->model = strip_name (vendor_buf);
+ }
+
+ if (!_device_probe_geometry (dev))
@@ -1156,7 +1164,7 @@
+};
diff -Nur parted-1.6.25.1.old/libparted/fs_xfs/platform_defs.h parted-1.6.25.1/libparted/fs_xfs/platform_defs.h
--- parted-1.6.25.1.old/libparted/fs_xfs/platform_defs.h 2005-11-11 13:34:47.000000000 +0100
-+++ parted-1.6.25.1/libparted/fs_xfs/platform_defs.h 2006-04-18 20:42:45.000000000 +0200
++++ parted-1.6.25.1/libparted/fs_xfs/platform_defs.h 2006-04-19 11:50:12.000000000 +0200
@@ -35,10 +35,16 @@
#ifndef __XFS_PLATFORM_DEFS_H__
#define __XFS_PLATFORM_DEFS_H__
@@ -1177,7 +1185,7 @@
#include <string.h>
diff -Nur parted-1.6.25.1.old/libparted/libparted.c parted-1.6.25.1/libparted/libparted.c
--- parted-1.6.25.1.old/libparted/libparted.c 2005-11-11 13:35:53.000000000 +0100
-+++ parted-1.6.25.1/libparted/libparted.c 2006-04-18 20:42:45.000000000 +0200
++++ parted-1.6.25.1/libparted/libparted.c 2006-04-19 11:50:12.000000000 +0200
@@ -24,6 +24,8 @@
#ifdef linux
More information about the Glibc-bsd-commits
mailing list