jcs.org
/usr/ports/mystuff
gptfdisk: update to 1.0.3
+17
-15
+1
-1
sysutils/gptfdisk/Makefile
+1
-1
sysutils/gptfdisk/Makefile
+2
-2
sysutils/gptfdisk/distinfo
+2
-2
sysutils/gptfdisk/distinfo
+9
-8
sysutils/gptfdisk/patches/patch-diskio-unix_cc
+9
-8
sysutils/gptfdisk/patches/patch-diskio-unix_cc
···
1
1
$OpenBSD$
2
-
--- diskio-unix.cc.orig Sun Oct 18 17:35:18 2015
3
-
+++ diskio-unix.cc Mon Nov 9 11:28:07 2015
2
+
Index: diskio-unix.cc
3
+
--- diskio-unix.cc.orig
4
+
+++ diskio-unix.cc
4
5
@@ -28,6 +28,10 @@
5
6
#ifdef __linux__
6
7
#include "linux/hdreg.h"
···
11
12
+#endif
12
13
13
14
#include <iostream>
14
-
15
-
@@ -138,6 +142,9 @@ int DiskIO::GetBlockSize(void) {
15
+
#include <fstream>
16
+
@@ -151,6 +155,9 @@ int DiskIO::GetBlockSize(void) {
16
17
#ifdef __sun__
17
18
struct dk_minfo minfo;
18
19
#endif
···
22
23
23
24
// If disk isn't open, try to open it....
24
25
if (!isOpen) {
25
-
@@ -156,6 +163,11 @@ int DiskIO::GetBlockSize(void) {
26
+
@@ -169,6 +176,11 @@ int DiskIO::GetBlockSize(void) {
26
27
#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
27
28
err = ioctl(fd, DIOCGSECTORSIZE, &blockSize);
28
29
#endif
···
34
35
#ifdef __linux__
35
36
err = ioctl(fd, BLKSSZGET, &blockSize);
36
37
#endif
37
-
@@ -248,6 +260,13 @@ int DiskIO::DiskSync(void) {
38
+
@@ -282,6 +294,13 @@ int DiskIO::DiskSync(void) {
38
39
<< "You should reboot or remove the drive.\n";
39
40
platformFound++;
40
41
#endif
···
48
49
#ifdef __linux__
49
50
sleep(1); // Theoretically unnecessary, but ioctl() fails sometimes if omitted....
50
51
fsync(fd);
51
-
@@ -396,6 +415,9 @@ uint64_t DiskIO::DiskSize(int *err) {
52
+
@@ -430,6 +449,9 @@ uint64_t DiskIO::DiskSize(int *err) {
52
53
#ifdef __sun__
53
54
struct dk_minfo minfo;
54
55
#endif
···
58
59
59
60
// If disk isn't open, try to open it....
60
61
if (!isOpen) {
61
-
@@ -423,6 +445,12 @@ uint64_t DiskIO::DiskSize(int *err) {
62
+
@@ -457,6 +479,12 @@ uint64_t DiskIO::DiskSize(int *err) {
62
63
long long b = GetBlockSize();
63
64
sectors = bytes / b;
64
65
platformFound++;
+4
-3
sysutils/gptfdisk/patches/patch-support_h
+4
-3
sysutils/gptfdisk/patches/patch-support_h
···
1
1
$OpenBSD$
2
-
--- support.h.orig Mon Nov 9 11:05:58 2015
3
-
+++ support.h Mon Nov 9 11:06:31 2015
2
+
Index: support.h
3
+
--- support.h.orig
4
+
+++ support.h
4
5
@@ -10,7 +10,7 @@
5
6
6
-
#define GPTFDISK_VERSION "1.0.1"
7
+
#define GPTFDISK_VERSION "1.0.3"
7
8
8
9
-#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
9
10
+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) || defined (__OpenBSD__)