diff options
| author | taca <taca> | 2009-08-11 15:44:14 +0000 |
|---|---|---|
| committer | taca <taca> | 2009-08-11 15:44:14 +0000 |
| commit | 22efeeb67049dcb31ad4e1c47bc78e98c87034e9 (patch) | |
| tree | 1f7ff999e199d6b6a95ddcdb9244902f08e228b4 /sysutils/cdrdao | |
| parent | 75c574743065f14ab3cb1c6c33b996225dde6426 (diff) | |
| download | pkgsrc-22efeeb67049dcb31ad4e1c47bc78e98c87034e9.tar.gz | |
Add patches to avoid conflict with getline(3).
Diffstat (limited to 'sysutils/cdrdao')
| -rw-r--r-- | sysutils/cdrdao/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/cdrdao/patches/patch-aq | 15 | ||||
| -rw-r--r-- | sysutils/cdrdao/patches/patch-ar | 15 | ||||
| -rw-r--r-- | sysutils/cdrdao/patches/patch-as | 15 |
4 files changed, 49 insertions, 1 deletions
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo index bec9620160f..4368668a417 100644 --- a/sysutils/cdrdao/distinfo +++ b/sysutils/cdrdao/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2007/10/30 19:01:29 drochner Exp $ +$NetBSD: distinfo,v 1.20 2009/08/11 15:44:14 taca Exp $ SHA1 (cdrdao-1.2.2.tar.bz2) = 2699e56e00342c1fa2a3815ed02418fe964b276b RMD160 (cdrdao-1.2.2.tar.bz2) = c537c535a4106655f89f7cfa5895ffcb5b9464e2 @@ -17,3 +17,6 @@ SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643 SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17 SHA1 (patch-ap) = 800b4a1237c788e1b99cd1b79c53c0aab2e653f6 +SHA1 (patch-aq) = f984313e7ff141cee289cc78a9679fc5d9a160aa +SHA1 (patch-ar) = 20cc6521c62d9c273999604c1cabbf023e31804b +SHA1 (patch-as) = 95818ecbcfaf7a2799292bbb5acbcf5100f42b81 diff --git a/sysutils/cdrdao/patches/patch-aq b/sysutils/cdrdao/patches/patch-aq new file mode 100644 index 00000000000..3deb1f9a524 --- /dev/null +++ b/sysutils/cdrdao/patches/patch-aq @@ -0,0 +1,15 @@ +$NetBSD: patch-aq,v 1.1 2009/08/11 15:44:14 taca Exp $ + +Avoid confliction with getline(3). + +--- scsilib/include/schily.h.orig 2004-03-05 09:30:40.000000000 +0900 ++++ scsilib/include/schily.h +@@ -187,7 +187,7 @@ extern char *fillbytes __PR((void *, int + extern char *findbytes __PR((const void *, int, char)); + extern int findline __PR((const char *, char, const char *, + int, char **, int)); +-extern int getline __PR((char *, int)); ++extern int get_line __PR((char *, int)); + extern int getstr __PR((char *, int)); + extern int breakline __PR((char *, char, char **, int)); + extern int getallargs __PR((int *, char * const**, const char *, ...)); diff --git a/sysutils/cdrdao/patches/patch-ar b/sysutils/cdrdao/patches/patch-ar new file mode 100644 index 00000000000..4766488cf3b --- /dev/null +++ b/sysutils/cdrdao/patches/patch-ar @@ -0,0 +1,15 @@ +$NetBSD: patch-ar,v 1.1 2009/08/11 15:44:14 taca Exp $ + +Avoid confliction with getline(3). + +--- scsilib/libscg/scsitransp.c.orig 2004-06-18 05:20:27.000000000 +0900 ++++ scsilib/libscg/scsitransp.c +@@ -323,7 +323,7 @@ scg_yes(msg) + + js_printf("%s", msg); + flush(); +- if (getline(okbuf, sizeof (okbuf)) == EOF) ++ if (get_line(okbuf, sizeof (okbuf)) == EOF) + exit(EX_BAD); + if (streql(okbuf, "y") || streql(okbuf, "yes") || + streql(okbuf, "Y") || streql(okbuf, "YES")) diff --git a/sysutils/cdrdao/patches/patch-as b/sysutils/cdrdao/patches/patch-as new file mode 100644 index 00000000000..42d92be8c62 --- /dev/null +++ b/sysutils/cdrdao/patches/patch-as @@ -0,0 +1,15 @@ +$NetBSD: patch-as,v 1.1 2009/08/11 15:44:14 taca Exp $ + +Avoid confliction with getline(3). + +--- scsilib/libschily/stdio/fgetline.c.orig 2004-08-08 20:02:05.000000000 +0900 ++++ scsilib/libschily/stdio/fgetline.c +@@ -64,7 +64,7 @@ fgetline(f, buf, len) + } + + EXPORT int +-getline(buf, len) ++get_line(buf, len) + char *buf; + int len; + { |