RE: pkg/44348: wipe-2.2.0 pkgsrc patch

["Tony Young" <rofflwaffls%gmail.com@localhost>]

The following reply was made to PR pkg/44348; it has been noted by GNATS.

From: "Tony Young" <rofflwaffls%gmail.com@localhost>
To: <gnats-bugs%NetBSD.org@localhost>
Cc: 
Subject: RE: pkg/44348: wipe-2.2.0 pkgsrc patch
Date: Mon, 10 Jan 2011 08:18:00 +1300

 This is a multipart message in MIME format.
 
 ------=_NextPart_000_0155_01CBB09E.E7C1CBF0
 Content-Type: text/plain;
        charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 
 > -----Original Message-----
 > From: OBATA Akio [mailto:obache%netbsd.org@localhost]
 > Sent: Monday, 10 January 2011 1:25 a.m.
 > To: pkg-manager%netbsd.org@localhost; gnats-admin%netbsd.org@localhost;
 pkgsrc-bugs%netbsd.org@localhost;
 > rofflwaffls%gmail.com@localhost
 > Subject: Re: pkg/44348: wipe-2.2.0 pkgsrc patch
 > 
 > The following reply was made to PR pkg/44348; it has been noted by GNATS.
 > 
 > From: "OBATA Akio" <obache%netbsd.org@localhost>
 > To: gnats-bugs%netbsd.org@localhost
 > Cc:
 > Subject: Re: pkg/44348: wipe-2.2.0 pkgsrc patch
 > Date: Sun, 09 Jan 2011 21:24:45 +0900
 > 
 >  On Sun, 09 Jan 2011 06:25:00 +0900, <rofflwaffls%gmail.com@localhost> wrote:
 > 
 >  >> Description:
 >  > wipe assumes DragonFlyBSD's partinfo to be the standard BSD partinfo,
 > which it isn't. This patch checks if we're compiling DragonFlyBSD and adds
 > the sys/diskslice.h header that defines partinfo, as well as checks for
 > DragonFlyBSD to sidestep around struct members that don't exist.
 > 
 >  I feel those members for DragonFly are:
 >     options.sectors = pinfo.media_blocks
 >     options.sector_size = pinfo.media_blksize
 > 
 >  --
 >  OBATA Akio / obache%NetBSD.org@localhost
 > 
 
 Hi again,
 
 There's a define for SECTOR_SIZE further down which seems to take effect,
 but in retrospect, I'm not sure how well it would work. Patch attached to
 use the recommended struct members.
 
 As for the tits package, I have no idea why that happened -- I can extract
 it fine. The tarball is attached, which I've verified is working.
 
 Thanks,
 Tony
 
 ------=_NextPart_000_0155_01CBB09E.E7C1CBF0
 Content-Type: application/octet-stream;
        name="blkdev.diff"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
        filename="blkdev.diff"
 
 --- blkdev.c.orig       2011-01-10 08:05:27 +1300=0A=
 +++ blkdev.c    2011-01-10 08:11:29 +1300=0A=
 @@ -55,6 +55,10 @@=0A=
  # endif=0A=
  #endif=0A=
  =0A=
 +#ifdef __DragonFly__=0A=
 +#include <sys/diskslice.h>=0A=
 +#endif=0A=
 +=0A=
  #include "std.h"=0A=
  #include "io.h"=0A=
  #include "main.h"=0A=
 @@ -181,15 +185,19 @@=0A=
        options.sectors =3D tmp;=0A=
  #endif=0A=
  =0A=
 -#ifdef BSD_BLKDEV=0A=
 +#if defined(BSD_BLKDEV) && !defined(__DragonFly__)=0A=
        options.sectors =3D pinfo.part->p_size;=0A=
 +#elif defined(__DragonFly__)=0A=
 +      options.sectors =3D pinfo.media_blocks;=0A=
  #endif=0A=
      }=0A=
  =0A=
    if (options.sector_size =3D=3D 0)=0A=
      {=0A=
 -#ifdef BSD_BLKDEV=0A=
 +#if defined(BSD_BLKDEV) && !defined(__DragonFly__)=0A=
        options.sector_size =3D pinfo.disklab->d_secsize;=0A=
 +#elif defined(__DragonFly__)=0A=
 +      options.sector_size =3D pinfo.media_blksize;=0A=
  #else=0A=
        options.sector_size =3D SECTOR_SIZE;=0A=
  #endif=0A=
 
 ------=_NextPart_000_0155_01CBB09E.E7C1CBF0
 Content-Type: application/octet-stream;
        name="tits.tar.gz"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
        filename="tits.tar.gz"
 
 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
 
 ------=_NextPart_000_0155_01CBB09E.E7C1CBF0--