wok-4.x rev 4249
Fix: patch cdrkit to build with glibc-2.10 (http://bugs.gentoo.org/270372)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri Sep 25 01:55:10 2009 +0200 (2009-09-25) |
parents | dcdbb5d3a57c |
children | 9d341fda40fe |
files | cdrkit/receipt cdrkit/stuff/cdrkit-1.1.9-glibc-2.10.patch |
line diff
1.1 --- a/cdrkit/receipt Fri Sep 25 01:14:41 2009 +0200 1.2 +++ b/cdrkit/receipt Fri Sep 25 01:55:10 2009 +0200 1.3 @@ -15,7 +15,8 @@ 1.4 compile_rules() 1.5 { 1.6 cd $src 1.7 - make 1.8 + patch -p1 < ../stuff/$PACKAGE-1.1.9-glibc-2.10.patch || exit 1 1.9 + make && 1.10 make install PREFIX=$PWD/_pkg/usr 1.11 } 1.12 1.13 @@ -26,10 +27,10 @@ 1.14 cp $_pkg/usr/bin/genisoimage $fs/usr/bin 1.15 cp $_pkg/usr/bin/wodim $fs/usr/bin 1.16 strip -s $fs/usr/bin/* 1.17 - 1.18 + 1.19 # Make symlinks for cdrtools compatibility 1.20 cd $fs/usr/bin 1.21 ln -s wodim cdrecord 1.22 - ln -s genisoimage mkisofs 1.23 - ln -s genisoimage mkhybrid 1.24 + ln -s genisoimage mkisofs 1.25 + ln -s genisoimage mkhybrid 1.26 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/cdrkit/stuff/cdrkit-1.1.9-glibc-2.10.patch Fri Sep 25 01:55:10 2009 +0200 2.3 @@ -0,0 +1,143 @@ 2.4 +diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h 2.5 +--- cdrkit-1.1.9.orig/include/schily.h 2006-11-25 01:20:20.000000000 +0100 2.6 ++++ cdrkit-1.1.9/include/schily.h 2009-03-11 20:31:53.000000000 +0100 2.7 +@@ -116,7 +116,7 @@ extern int fexecl(const char *, FILE *, 2.8 + extern int fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...); 2.9 + /* 6th arg not const, fexecv forces av[ac] = NULL */ 2.10 + extern int fexecv(const char *, FILE *, FILE *, FILE *, int, char **); 2.11 +-extern int fexecve(const char *, FILE *, FILE *, FILE *, char * const *, 2.12 ++extern int f_execve(const char *, FILE *, FILE *, FILE *, char * const *, 2.13 + char * const *); 2.14 + extern int fspawnv(FILE *, FILE *, FILE *, int, char * const *); 2.15 + extern int fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...); 2.16 +@@ -190,7 +190,7 @@ extern int schily_error(const char *, .. 2.17 + extern char *fillbytes(void *, int, char); 2.18 + extern char *findbytes(const void *, int, char); 2.19 + extern int findline(const char *, char, const char *, int, char **, int); 2.20 +-extern int getline(char *, int); 2.21 ++extern int get_line(char *, int); 2.22 + extern int getstr(char *, int); 2.23 + extern int breakline(char *, char, char **, int); 2.24 + extern int getallargs(int *, char * const**, const char *, ...); 2.25 +diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c 2.26 +--- cdrkit-1.1.9.orig/librols/fexec.c 2008-02-25 12:14:07.000000000 +0100 2.27 ++++ cdrkit-1.1.9/librols/fexec.c 2009-03-11 20:31:53.000000000 +0100 2.28 +@@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist) 2.29 + } while (p != NULL); 2.30 + va_end(args); 2.31 + 2.32 +- ret = fexecve(name, in, out, err, av, env); 2.33 ++ ret = f_execve(name, in, out, err, av, env); 2.34 + if (av != xav) 2.35 + free(av); 2.36 + return (ret); 2.37 +@@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av) 2.38 + char *av[]; 2.39 + { 2.40 + av[ac] = NULL; /* force list to be null terminated */ 2.41 +- return (fexecve(name, in, out, err, av, environ)); 2.42 ++ return (f_execve(name, in, out, err, av, environ)); 2.43 + } 2.44 + 2.45 + EXPORT int 2.46 +-fexecve(name, in, out, err, av, env) 2.47 ++f_execve(name, in, out, err, av, env) 2.48 + const char *name; 2.49 + FILE *in, *out, *err; 2.50 + char * const av[], * const env[]; 2.51 +diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c 2.52 +--- cdrkit-1.1.9.orig/librols/stdio/fgetline.c 2006-09-05 10:39:04.000000000 +0200 2.53 ++++ cdrkit-1.1.9/librols/stdio/fgetline.c 2009-03-11 20:31:53.000000000 +0100 2.54 +@@ -76,7 +76,7 @@ fgetline(f, buf, len) 2.55 + } 2.56 + 2.57 + EXPORT int 2.58 +-getline(buf, len) 2.59 ++get_line(buf, len) 2.60 + char *buf; 2.61 + int len; 2.62 + { 2.63 +diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c 2.64 +--- cdrkit-1.1.9.orig/libusal/scsitransp.c 2008-02-25 12:14:07.000000000 +0100 2.65 ++++ cdrkit-1.1.9/libusal/scsitransp.c 2009-03-11 20:31:53.000000000 +0100 2.66 +@@ -301,7 +301,7 @@ usal_yes(char *msg) 2.67 + 2.68 + printf("%s", msg); 2.69 + flush(); 2.70 +- if (getline(okbuf, sizeof (okbuf)) == EOF) 2.71 ++ if (get_line(okbuf, sizeof (okbuf)) == EOF) 2.72 + exit(EX_BAD); 2.73 + if (streql(okbuf, "y") || streql(okbuf, "yes") || 2.74 + streql(okbuf, "Y") || streql(okbuf, "YES")) 2.75 +diff -puNr cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c 2.76 +--- cdrkit-1.1.9.orig/readom/io.c 2006-12-08 14:38:43.000000000 +0100 2.77 ++++ cdrkit-1.1.9/readom/io.c 2009-03-11 20:31:53.000000000 +0100 2.78 +@@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi 2.79 + (*prt)(s, *lp, mini, maxi, dp); 2.80 + flush(); 2.81 + line[0] = '\0'; 2.82 +- if (getline(line, 80) == EOF) 2.83 ++ if (get_line(line, 80) == EOF) 2.84 + exit(EX_BAD); 2.85 + 2.86 + linep = skipwhite(line); 2.87 +@@ -178,7 +178,7 @@ again: 2.88 + vprintf(form, args); 2.89 + va_end(args); 2.90 + flush(); 2.91 +- if (getline(okbuf, sizeof(okbuf)) == EOF) 2.92 ++ if (get_line(okbuf, sizeof(okbuf)) == EOF) 2.93 + exit(EX_BAD); 2.94 + if (okbuf[0] == '?') { 2.95 + printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n"); 2.96 +diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c 2.97 +--- cdrkit-1.1.9.orig/readom/readom.c 2007-04-03 00:43:29.000000000 +0200 2.98 ++++ cdrkit-1.1.9/readom/readom.c 2009-03-11 20:31:53.000000000 +0100 2.99 +@@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp, 2.100 + fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n", 2.101 + usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); 2.102 + fprintf(stderr, "Enter filename [%s]: ", defname); flush(); 2.103 +- (void) getline(filename, sizeof (filename)); 2.104 ++ (void) get_line(filename, sizeof (filename)); 2.105 + } 2.106 + 2.107 + if (askrange) { 2.108 +@@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp) 2.109 + fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n", 2.110 + usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); 2.111 + fprintf(stderr, "Enter filename [%s]: ", defname); flush(); 2.112 +- (void) getline(filename, sizeof (filename)); 2.113 ++ (void) get_line(filename, sizeof (filename)); 2.114 + fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n"); 2.115 + 2.116 + getlong("Enter starting sector for copy:", &addr, 0L, end-1); 2.117 +diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c 2.118 +--- cdrkit-1.1.9.orig/wodim/cue.c 2006-12-08 14:38:43.000000000 +0100 2.119 ++++ cdrkit-1.1.9/wodim/cue.c 2009-03-11 20:32:18.000000000 +0100 2.120 +@@ -253,7 +253,7 @@ static char *skipwhite(const char *s); 2.121 + static char *peekword(void); 2.122 + static char *lineend(void); 2.123 + static char *markword(char *delim); 2.124 +-static char getdelim(void); 2.125 ++static char get_delim(void); 2.126 + static char *getnextitem(char *delim); 2.127 + static char *neednextitem(char *delim); 2.128 + static char *nextword(void); 2.129 +@@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s 2.130 + if (kp == NULL) 2.131 + cueabort("Unknown filetype '%s'", word); 2.132 + 2.133 +- if (getdelim() == '/') { 2.134 ++ if (get_delim() == '/') { 2.135 + word = needitem(); 2.136 + if (*astol(++word, &secsize) != '\0') 2.137 + cueabort("Not a number '%s'", word); 2.138 +@@ -1128,7 +1128,7 @@ linelen--; 2.139 + } 2.140 + 2.141 + static char 2.142 +-getdelim() 2.143 ++get_delim() 2.144 + { 2.145 + return (wordendc); 2.146 + }