| 1 |
ssuominen 09/08/05 19:50:07 |
| 2 |
|
| 3 |
Added: scsirastools-1.5.6-glibc-2.10.patch |
| 4 |
Log: |
| 5 |
Fix building with GLIBC 2.10+ wrt #278182. |
| 6 |
(Portage version: 2.2_rc36/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: scsirastools-1.5.6-glibc-2.10.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur scsirastools-1.5.6.orig/src/getmd.c scsirastools-1.5.6/src/getmd.c |
| 17 |
--- scsirastools-1.5.6.orig/src/getmd.c 2007-02-02 21:16:38.000000000 +0200 |
| 18 |
+++ scsirastools-1.5.6/src/getmd.c 2009-08-05 22:51:00.000000000 +0300 |
| 19 |
@@ -81,7 +81,7 @@ |
| 20 |
} else return (-1); /*not found*/ |
| 21 |
} |
| 22 |
|
| 23 |
-static int getline(FILE * fd, char *buf, int len) |
| 24 |
+static int get_line(FILE * fd, char *buf, int len) |
| 25 |
{ |
| 26 |
int i; |
| 27 |
int ch; |
| 28 |
@@ -119,7 +119,7 @@ |
| 29 |
sraidstr = strlen(raidstr); |
| 30 |
strcpy(mdpart, "/dev/sda1"); /* default */ |
| 31 |
strcpy(rdev, "/dev/md0"); /* default */ |
| 32 |
- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ |
| 33 |
+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ |
| 34 |
buf[rlen] = 0; /* stringify */ |
| 35 |
/* look for raiddev string */ |
| 36 |
i = findmatch(buf, rlen, raidstr, sraidstr, 0); |
| 37 |
diff -ur scsirastools-1.5.6.orig/src/sgraidmon.c scsirastools-1.5.6/src/sgraidmon.c |
| 38 |
--- scsirastools-1.5.6.orig/src/sgraidmon.c 2007-10-16 01:15:15.000000000 +0300 |
| 39 |
+++ scsirastools-1.5.6/src/sgraidmon.c 2009-08-05 22:51:00.000000000 +0300 |
| 40 |
@@ -330,7 +330,7 @@ |
| 41 |
rdev[0] = 0; /* default rdev (mddev) */ |
| 42 |
strcpy(mdpart, "/dev/sdz1"); /* default mdpart */ |
| 43 |
foundit = 0; |
| 44 |
- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ |
| 45 |
+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ |
| 46 |
buf[rlen] = 0; /* stringify */ |
| 47 |
/* check for comment */ |
| 48 |
if (buf[0] == '#') continue; |
| 49 |
@@ -392,7 +392,7 @@ |
| 50 |
if (fd == NULL) return (np); |
| 51 |
sraidstr = strlen(raidstr); |
| 52 |
sdevstr = strlen(devstr); |
| 53 |
- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ |
| 54 |
+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ |
| 55 |
buf[rlen] = 0; /* stringify */ |
| 56 |
/* check for comment */ |
| 57 |
if (buf[0] == '#') continue; |
| 58 |
diff -ur scsirastools-1.5.6.orig/src/sgsafte.c scsirastools-1.5.6/src/sgsafte.c |
| 59 |
--- scsirastools-1.5.6.orig/src/sgsafte.c 2007-09-13 00:45:29.000000000 +0300 |
| 60 |
+++ scsirastools-1.5.6/src/sgsafte.c 2009-08-05 22:51:00.000000000 +0300 |
| 61 |
@@ -231,7 +231,7 @@ |
| 62 |
rdev[0] = 0; /* default rdev (mddev) */ |
| 63 |
strcpy(mdpart, "/dev/sdz1"); /* default mdpart */ |
| 64 |
foundit = 0; |
| 65 |
- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ |
| 66 |
+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ |
| 67 |
buf[rlen] = 0; /* stringify */ |
| 68 |
/* look for raiddev string */ |
| 69 |
i = findmatch(buf, rlen, raidstr, sraidstr, 0); |
| 70 |
@@ -284,7 +284,7 @@ |
| 71 |
fd = fopen(raidfile, "r"); |
| 72 |
if (fd == NULL) return (np); |
| 73 |
sraidstr = strlen(raidstr); |
| 74 |
- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ |
| 75 |
+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ |
| 76 |
buf[rlen] = 0; /* stringify */ |
| 77 |
/* look for raiddev string */ |
| 78 |
i = findmatch(buf, rlen, raidstr, sraidstr, 0); |
| 79 |
diff -ur scsirastools-1.5.6.orig/src/sgsubmon.c scsirastools-1.5.6/src/sgsubmon.c |
| 80 |
--- scsirastools-1.5.6.orig/src/sgsubmon.c 2007-10-16 17:03:39.000000000 +0300 |
| 81 |
+++ scsirastools-1.5.6/src/sgsubmon.c 2009-08-05 22:51:00.000000000 +0300 |
| 82 |
@@ -159,7 +159,7 @@ |
| 83 |
return; |
| 84 |
} |
| 85 |
|
| 86 |
-int getline(FILE * fd, char *buf, int len) |
| 87 |
+int get_line(FILE * fd, char *buf, int len) |
| 88 |
{ |
| 89 |
int i; |
| 90 |
int ch; |
| 91 |
diff -ur scsirastools-1.5.6.orig/src/sgsubmon.h scsirastools-1.5.6/src/sgsubmon.h |
| 92 |
--- scsirastools-1.5.6.orig/src/sgsubmon.h 2007-09-13 00:38:28.000000000 +0300 |
| 93 |
+++ scsirastools-1.5.6/src/sgsubmon.h 2009-08-05 22:50:59.000000000 +0300 |
| 94 |
@@ -124,7 +124,7 @@ |
| 95 |
void itoh(uchar * chp, int len, char *str); |
| 96 |
void dumpbufr(FILE * fdout, uchar * bufp, int mlen, char *hdr); |
| 97 |
void dump_buf(FILE * fdout, uchar * bufp, int mlen, char *hdr, char fascii); |
| 98 |
-int getline(FILE * fd, char *buf, int len) ; |
| 99 |
+int get_line(FILE * fd, char *buf, int len) ; |
| 100 |
int findmatch(char *buffer,int sbuf, char *pattern,int spattern,char figncase); |
| 101 |
int fillstr(char *to, uchar *from,int len); |
| 102 |
int IsSATA(int idev); |
Archives