diff options
| author | obache <obache> | 2011-01-10 06:12:16 +0000 |
|---|---|---|
| committer | obache <obache> | 2011-01-10 06:12:16 +0000 |
| commit | cb4ce1a1e93acd04bcc290b2ed3d36fbbd49fc4e (patch) | |
| tree | ba95f671190f76716c522dd8f5d7f170d46403f0 /sysutils | |
| parent | ad2f0c72f47af7d31e9073f5093ad4857e8d69a6 (diff) | |
| download | pkgsrc-cb4ce1a1e93acd04bcc290b2ed3d36fbbd49fc4e.tar.gz | |
Add an patch for DragonFly, based on PR#44348 by Tony Young.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/wipe/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/wipe/patches/patch-ai | 46 |
2 files changed, 48 insertions, 1 deletions
diff --git a/sysutils/wipe/distinfo b/sysutils/wipe/distinfo index e2b8e43cf95..8337e2b8b5e 100644 --- a/sysutils/wipe/distinfo +++ b/sysutils/wipe/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2010/01/27 20:37:48 joerg Exp $ +$NetBSD: distinfo,v 1.5 2011/01/10 06:12:16 obache Exp $ SHA1 (wipe-2.2.0.tar.bz2) = 4dd18f260ecd91b726336b2788fa33db04d6691a RMD160 (wipe-2.2.0.tar.bz2) = 5d1861bd893e01e94205a7ac2efadb1c756da700 @@ -11,3 +11,4 @@ SHA1 (patch-ae) = e1145c395a9b0999d7fbf8a4cb79f1dc89aa29e1 SHA1 (patch-af) = 23102dea6f821791d5b3bd2bb509c38ab6bf2a16 SHA1 (patch-ag) = fd61d6b065eb22cabb697f2df073a3b9efde26a9 SHA1 (patch-ah) = 4e5e65708282461161f3dd786b1012f8306dd849 +SHA1 (patch-ai) = 821f8bad164e2707fdab8fb2f44b1dde0ee82173 diff --git a/sysutils/wipe/patches/patch-ai b/sysutils/wipe/patches/patch-ai new file mode 100644 index 00000000000..2da2d0280ac --- /dev/null +++ b/sysutils/wipe/patches/patch-ai @@ -0,0 +1,46 @@ +$NetBSD: patch-ai,v 1.1 2011/01/10 06:12:16 obache Exp $ + +* DragonFly BSD's partinfo is not the standard BSD partinfo. + +--- blkdev.c.orig 2011-01-09 11:55:42.000000000 +0000 ++++ blkdev.c +@@ -44,10 +44,15 @@ + # endif + #endif + +-#ifdef HAVE_SYS_DISKLABEL_H ++#ifdef __DragonFly__ ++# include <sys/diskslice.h> ++# define BSD_BLKDEV ++#else ++#ifdef HAVE_SYS_DISKLABEL_H) + # include <sys/disklabel.h> + # define BSD_BLKDEV + #endif ++#endif + + #ifndef LINUX_BLKDEV + # ifndef BSD_BLKDEV +@@ -181,14 +186,20 @@ public int destroy_blkdev(struct file_s + options.sectors = tmp; + #endif + +-#ifdef BSD_BLKDEV ++#if defined(BSD_BLKDEV) ++# if defined(__DragonFly__) ++ options.sectors = pinfo.media_blocks; ++# else + options.sectors = pinfo.part->p_size; ++# endif + #endif + } + + if (options.sector_size == 0) + { +-#ifdef BSD_BLKDEV ++#if defined(__DragonFly__) ++ options.sector_size = pinfo.media_blocks; ++#elif defined(BSD_BLKDEV) + options.sector_size = pinfo.disklab->d_secsize; + #else + options.sector_size = SECTOR_SIZE; |