Hello community, here is the log from the commit of package scsirastools for openSUSE:Factory checked in at Tue Jun 16 18:24:35 CEST 2009. -------- --- scsirastools/scsirastools.changes 2008-08-22 22:53:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/scsirastools/scsirastools.changes 2009-06-16 07:51:57.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 16 07:51:28 CEST 2009 - coolo@novell.com + +- fix build with glibc 2.10 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- scsirastools-1.5.8-glibc210.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scsirastools.spec ++++++ --- /var/tmp/diff_new_pack.bqI466/_old 2009-06-16 18:24:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bqI466/_new 2009-06-16 18:24:25.000000000 +0200 @@ -1,8 +1,7 @@ # # spec file for package scsirastools (Version 1.5.8) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -#Copyright: intel +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +20,7 @@ Name: scsirastools Version: 1.5.8 -Release: 1 +Release: 8 License: BSD 3-Clause Group: Hardware/Other #Provides: @@ -32,6 +31,7 @@ Patch: %{name}-1.4.9-SuSE.diff Patch2: %{name}-install Patch3: %{name}-single-dev.diff +Patch4: %{name}-1.5.8-glibc210.diff Url: http://scsirastools.sourceforge.net/ #Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -79,6 +79,7 @@ #%patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build autoreconf -fi @@ -122,7 +123,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %changelog -* Sat Aug 23 2008 garloff@suse.de +* Tue Jun 16 2009 coolo@novell.com +- fix build with glibc 2.10 +* Fri Aug 22 2008 garloff@suse.de - Adapt init scripts (more needed) - Update to 1.5.8: * Various bug fixes @@ -154,10 +157,10 @@ alarms: mew tool, sets disk fault LEDs * Thu Mar 18 2004 garloff@suse.de - Fix permissions (#36336). -* Tue Feb 17 2004 garloff@suse.de +* Mon Feb 16 2004 garloff@suse.de - Update to scsirastools-1.4.4: * Various improvements to sgraidmon. -* Wed Oct 15 2003 garloff@suse.de +* Tue Oct 14 2003 garloff@suse.de - Update to scsirastools-1.4.3: * 64 bit cleanliness * Docu updates @@ -176,7 +179,7 @@ - Fix devfs detection. * Thu Apr 03 2003 garloff@suse.de - Include errno.h in getmd -* Thu Apr 03 2003 garloff@suse.de +* Wed Apr 02 2003 garloff@suse.de - Update to 1.3.9 which comes without the firmwares (whose license is unclear). * Wed Apr 02 2003 garloff@suse.de ++++++ scsirastools-1.5.8-glibc210.diff ++++++ Index: scsirastools-1.5.8/src/getmd.c =================================================================== --- scsirastools-1.5.8.orig/src/getmd.c +++ scsirastools-1.5.8/src/getmd.c @@ -81,7 +81,7 @@ static int findmatch(const char *buffer, } else return (-1); /*not found*/ } -static int getline(FILE * fd, char *buf, int len) +static int mygetline(FILE * fd, char *buf, int len) { int i; int ch; @@ -119,7 +119,7 @@ int getmd(char *devpattn, int sdevpattn, sraidstr = strlen(raidstr); strcpy(mdpart, "/dev/sda1"); /* default */ strcpy(rdev, "/dev/md0"); /* default */ - while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ + while ((rlen = mygetline(fd, buf, 80)) > 0) { /* process each line */ buf[rlen] = 0; /* stringify */ /* look for raiddev string */ i = findmatch(buf, rlen, raidstr, sraidstr, 0); Index: scsirastools-1.5.8/src/sgsubmon.c =================================================================== --- scsirastools-1.5.8.orig/src/sgsubmon.c +++ scsirastools-1.5.8/src/sgsubmon.c @@ -186,7 +186,7 @@ void dump_log(uchar * pbuf, int sz, char dump_buf(fd, pbuf,sz,tag,fshowascii); } -int getline(FILE * fd, char *buf, int len) +int mygetline(FILE * fd, char *buf, int len) { int i; int ch; Index: scsirastools-1.5.8/src/sgsubmon.h =================================================================== --- scsirastools-1.5.8.orig/src/sgsubmon.h +++ scsirastools-1.5.8/src/sgsubmon.h @@ -125,7 +125,7 @@ void itoh(uchar * chp, int len, char *st void dumpbufr(FILE * fdout, uchar * bufp, int mlen, char *hdr); void dump_buf(FILE * fdout, uchar * bufp, int mlen, char *hdr, char fascii); void dump_log(uchar * bufp, int mlen, char *hdr, char fascii); -int getline(FILE * fd, char *buf, int len) ; +int mygetline(FILE * fd, char *buf, int len) ; int findmatch(char *buffer,int sbuf, char *pattern,int spattern,char figncase); int fillstr(char *to, uchar *from,int len); int IsSATA(int idev); Index: scsirastools-1.5.8/src/sgraidmon.c =================================================================== --- scsirastools-1.5.8.orig/src/sgraidmon.c +++ scsirastools-1.5.8/src/sgraidmon.c @@ -330,7 +330,7 @@ getmd(char *devname, char *mddev, char * rdev[0] = 0; /* default rdev (mddev) */ strcpy(mdpart, "/dev/sdz1"); /* default mdpart */ foundit = 0; - while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ + while ((rlen = mygetline(fd, buf, 80)) > 0) { /* process each line */ buf[rlen] = 0; /* stringify */ /* check for comment */ if (buf[0] == '#') continue; @@ -392,7 +392,7 @@ int getnpart(void) if (fd == NULL) return (np); sraidstr = strlen(raidstr); sdevstr = strlen(devstr); - while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ + while ((rlen = mygetline(fd, buf, 80)) > 0) { /* process each line */ buf[rlen] = 0; /* stringify */ /* check for comment */ if (buf[0] == '#') continue; Index: scsirastools-1.5.8/src/sgsafte.c =================================================================== --- scsirastools-1.5.8.orig/src/sgsafte.c +++ scsirastools-1.5.8/src/sgsafte.c @@ -231,7 +231,7 @@ getmd(char *devname, char *mddev, char * rdev[0] = 0; /* default rdev (mddev) */ strcpy(mdpart, "/dev/sdz1"); /* default mdpart */ foundit = 0; - while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ + while ((rlen = mygetline(fd, buf, 80)) > 0) { /* process each line */ buf[rlen] = 0; /* stringify */ /* look for raiddev string */ i = findmatch(buf, rlen, raidstr, sraidstr, 0); @@ -284,7 +284,7 @@ int getnpart(void) fd = fopen(raidfile, "r"); if (fd == NULL) return (np); sraidstr = strlen(raidstr); - while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ + while ((rlen = mygetline(fd, buf, 80)) > 0) { /* process each line */ buf[rlen] = 0; /* stringify */ /* look for raiddev string */ i = findmatch(buf, rlen, raidstr, sraidstr, 0); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org