Sat Jan 29 20:48:07 2011 UTC ()
Fix build with glibc2.12 - see gentoo bug 332237


(markd)
diff -r1.23 -r1.24 pkgsrc/sysutils/cdrdao/distinfo
diff -r1.4 -r1.5 pkgsrc/sysutils/cdrdao/patches/patch-ae
cvs diff -r1.23 -r1.24 pkgsrc/sysutils/cdrdao/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrdao/distinfo 2010/05/19 18:22:14 1.23
+++ pkgsrc/sysutils/cdrdao/distinfo 2011/01/29 20:48:07 1.24
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.23 2010/05/19 18:22:14 drochner Exp $ 1$NetBSD: distinfo,v 1.24 2011/01/29 20:48:07 markd Exp $
2 2
3SHA1 (cdrdao-1.2.3.tar.bz2) = 70d6547795a1342631c7ab56709fd1940c2aff9f 3SHA1 (cdrdao-1.2.3.tar.bz2) = 70d6547795a1342631c7ab56709fd1940c2aff9f
4RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523 4RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523
5Size (cdrdao-1.2.3.tar.bz2) = 1428695 bytes 5Size (cdrdao-1.2.3.tar.bz2) = 1428695 bytes
6SHA1 (patch-aa) = 9606723ae593981c6b98083990c2b17c1ace5dc2 6SHA1 (patch-aa) = 9606723ae593981c6b98083990c2b17c1ace5dc2
7SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f 7SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f
8SHA1 (patch-ad) = b2baa69007fce6637049b9cf6fd0b95ef94560e3 8SHA1 (patch-ad) = b2baa69007fce6637049b9cf6fd0b95ef94560e3
9SHA1 (patch-ae) = 3243fc8a0b81aa7ef49940c5fbadb70e094d16cf 9SHA1 (patch-ae) = 39bb65ebce0ab53675a34963f718d74083412cff
10SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca 10SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca
11SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a 11SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a
12SHA1 (patch-ah) = a1c82bed76fee272e4afffdcad0a7e5c101f235c 12SHA1 (patch-ah) = a1c82bed76fee272e4afffdcad0a7e5c101f235c
13SHA1 (patch-ai) = cf46de1a2d0d466bcdb30d9123f17de7c571d6b2 13SHA1 (patch-ai) = cf46de1a2d0d466bcdb30d9123f17de7c571d6b2
14SHA1 (patch-aj) = 16bd87d3217019a07af3441f0593db2496cd7279 14SHA1 (patch-aj) = 16bd87d3217019a07af3441f0593db2496cd7279
15SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643 15SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643
16SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc 16SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc
17SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17 17SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17
18SHA1 (patch-aq) = f984313e7ff141cee289cc78a9679fc5d9a160aa 18SHA1 (patch-aq) = f984313e7ff141cee289cc78a9679fc5d9a160aa
19SHA1 (patch-ar) = 20cc6521c62d9c273999604c1cabbf023e31804b 19SHA1 (patch-ar) = 20cc6521c62d9c273999604c1cabbf023e31804b
20SHA1 (patch-as) = 95818ecbcfaf7a2799292bbb5acbcf5100f42b81 20SHA1 (patch-as) = 95818ecbcfaf7a2799292bbb5acbcf5100f42b81
21SHA1 (patch-at) = c6379b51f2f81c73a0976d35c62555860b20168d 21SHA1 (patch-at) = c6379b51f2f81c73a0976d35c62555860b20168d
22SHA1 (patch-au) = dd8d9d6b73ea662ef3e936580082f9b733c6596c 22SHA1 (patch-au) = dd8d9d6b73ea662ef3e936580082f9b733c6596c
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/cdrdao/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrdao/patches/patch-ae 2009/11/22 21:05:18 1.4
+++ pkgsrc/sysutils/cdrdao/patches/patch-ae 2011/01/29 20:48:07 1.5
@@ -1,17 +1,27 @@ @@ -1,17 +1,27 @@
1$NetBSD: patch-ae,v 1.4 2009/11/22 21:05:18 drochner Exp $ 1$NetBSD: patch-ae,v 1.5 2011/01/29 20:48:07 markd Exp $
 2
 3Fix building with GLIBC 2.12 gentoo bug #332237
2 4
3--- dao/ScsiIf-linux.cc.orig 2009-09-28 12:12:03.000000000 +0200 5--- dao/ScsiIf-linux.cc.orig 2009-09-28 12:12:03.000000000 +0200
4+++ dao/ScsiIf-linux.cc 6+++ dao/ScsiIf-linux.cc
 7@@ -30,6 +30,7 @@
 8 #include <asm/param.h>
 9 #include <scsi/scsi.h>
 10 #include <scsi/sg.h>
 11+#include <sys/stat.h>
 12
 13 #include "ScsiIf.h"
 14 #include "sg_err.h"
5@@ -269,6 +269,12 @@ int ScsiIf::inquiry() 15@@ -269,6 +269,12 @@ int ScsiIf::inquiry()
6 for (i = 3; i >= 0 && revision_[i] == ' '; i--) { 16 for (i = 3; i >= 0 && revision_[i] == ' '; i--) {
7 revision_[i] = 0; 17 revision_[i] = 0;
8 } 18 }
9+ 19+
10+ if (vendor_[0] == 0) 20+ if (vendor_[0] == 0)
11+ strncpy(vendor_, "UNKNOWN", 8); 21+ strncpy(vendor_, "UNKNOWN", 8);
12+ 22+
13+ if (product_[0] == 0) 23+ if (product_[0] == 0)
14+ strncpy(product_, "UNKNOWN", 8); 24+ strncpy(product_, "UNKNOWN", 8);
15  25
16 return 0; 26 return 0;
17 } 27 }