Fri Feb 21 01:13:00 2014 UTC ()
Actually use my DIOCGDISKINFO ioctl implementation by regenerating configure.


(prlw1)
diff -r1.7 -r1.8 pkgsrc/sysutils/diskscrub/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/diskscrub/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/diskscrub/patches/patch-src_genrand.c
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/diskscrub/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/diskscrub/Makefile 2013/12/15 19:44:39 1.7
+++ pkgsrc/sysutils/diskscrub/Makefile 2014/02/21 01:13:00 1.8
@@ -1,18 +1,22 @@ @@ -1,18 +1,22 @@
1# $NetBSD: Makefile,v 1.7 2013/12/15 19:44:39 joerg Exp $ 1# $NetBSD: Makefile,v 1.8 2014/02/21 01:13:00 prlw1 Exp $
2# 
3 2
4DISTNAME= scrub-2.5.2 3DISTNAME= scrub-2.5.2
5PKGREVISION= 1 4PKGREVISION= 2
6CATEGORIES= sysutils 5CATEGORIES= sysutils
7MASTER_SITES= http://diskscrub.googlecode.com/files/ 6MASTER_SITES= http://diskscrub.googlecode.com/files/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= agc@NetBSD.org 9MAINTAINER= agc@NetBSD.org
11HOMEPAGE= http://code.google.com/p/diskscrub/ 10HOMEPAGE= http://code.google.com/p/diskscrub/
12COMMENT= Utility to overwrite disks and scrub the data on them 11COMMENT= Utility to overwrite disks and scrub the data on them
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
 15USE_LIBTOOL= yes
 16USE_TOOLS+= autoconf automake
16USE_TOOLS+= perl # this is purely for GNU configure (X_AC_META macro) 17USE_TOOLS+= perl # this is purely for GNU configure (X_AC_META macro)
17 18
 19pre-configure:
 20 cd ${WRKSRC} && sh autogen.sh
 21
18.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/diskscrub/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/diskscrub/distinfo 2013/12/15 19:44:39 1.3
+++ pkgsrc/sysutils/diskscrub/distinfo 2014/02/21 01:13:00 1.4
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.3 2013/12/15 19:44:39 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2014/02/21 01:13:00 prlw1 Exp $
2 2
3SHA1 (scrub-2.5.2.tar.bz2) = 863e5894e6acb3f922cb25f58e260f9c59b55c14 3SHA1 (scrub-2.5.2.tar.bz2) = 863e5894e6acb3f922cb25f58e260f9c59b55c14
4RMD160 (scrub-2.5.2.tar.bz2) = 852698810f401226608f6b1882191dc7bd2b47e4 4RMD160 (scrub-2.5.2.tar.bz2) = 852698810f401226608f6b1882191dc7bd2b47e4
5Size (scrub-2.5.2.tar.bz2) = 161468 bytes 5Size (scrub-2.5.2.tar.bz2) = 161468 bytes
6SHA1 (patch-configure.ac) = 929828e5c8ad340bfc4d6141aad45697d20fef20 6SHA1 (patch-configure.ac) = 929828e5c8ad340bfc4d6141aad45697d20fef20
7SHA1 (patch-src_Makefile.am) = 4bdd6a41a6fcdc72120d5a1ebd8a17f9d90881d6 7SHA1 (patch-src_Makefile.am) = 4bdd6a41a6fcdc72120d5a1ebd8a17f9d90881d6
8SHA1 (patch-src_genrand.c) = a047804b169517f5f328d13f7b0ad6fa751080d7 8SHA1 (patch-src_genrand.c) = 1440cce8bce8b7c9eba4fde44284f6a9f6277a41
9SHA1 (patch-src_getsize.c) = 221d201423b38a38486e4c91f4b9e28f6a1d0b52 9SHA1 (patch-src_getsize.c) = 221d201423b38a38486e4c91f4b9e28f6a1d0b52
10SHA1 (patch-test_Makefile.am) = ada26d5b518eb630ac7e6ba0d6a61ae5e3280157 10SHA1 (patch-test_Makefile.am) = ada26d5b518eb630ac7e6ba0d6a61ae5e3280157
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/diskscrub/patches/patch-src_genrand.c (expand / switch to unified diff)

--- pkgsrc/sysutils/diskscrub/patches/patch-src_genrand.c 2013/12/15 19:44:39 1.1
+++ pkgsrc/sysutils/diskscrub/patches/patch-src_genrand.c 2014/02/21 01:13:00 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-src_genrand.c,v 1.1 2013/12/15 19:44:39 joerg Exp $ 1$NetBSD: patch-src_genrand.c,v 1.2 2014/02/21 01:13:00 prlw1 Exp $
 2
 3Fix missing return value.
2 4
3--- src/genrand.c.orig 2013-12-15 13:03:04.000000000 +0000 5--- src/genrand.c.orig 2013-12-15 13:03:04.000000000 +0000
4+++ src/genrand.c 6+++ src/genrand.c
5@@ -106,7 +106,7 @@ genrandraw(unsigned char *buf, int bufle 7@@ -106,7 +106,7 @@ genrandraw(unsigned char *buf, int bufle
6 buf[n] = result; 8 buf[n] = result;
7 } 9 }
8 #endif 10 #endif
9- return; 11- return;
10+ return 0; 12+ return 0;
11 } 13 }
12 } 14 }
13  15