From f8f434815f5fef15b7b14db143eb9af121cf8552 Mon Sep 17 00:00:00 2001 From: tnut Date: Thu, 24 Dec 2009 20:19:04 +0100 Subject: cdrkit, déplacé dans extra MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/cdrkit/.footprint | 49 ---------- base/cdrkit/.md5sum | 2 - base/cdrkit/Pkgfile | 37 -------- base/cdrkit/cdrkit-1.1.9-glibc-2.10.patch | 143 ----------------------------- extra/cdrkit/.md5sum | 1 + extra/cdrkit/Pkgfile | 6 +- extra/cdrkit/cdrkit-1.1.9-glibc-2.10.patch | 143 +++++++++++++++++++++++++++++ 7 files changed, 148 insertions(+), 233 deletions(-) delete mode 100644 base/cdrkit/.footprint delete mode 100644 base/cdrkit/.md5sum delete mode 100644 base/cdrkit/Pkgfile delete mode 100644 base/cdrkit/cdrkit-1.1.9-glibc-2.10.patch create mode 100644 extra/cdrkit/cdrkit-1.1.9-glibc-2.10.patch diff --git a/base/cdrkit/.footprint b/base/cdrkit/.footprint deleted file mode 100644 index ac842d712..000000000 --- a/base/cdrkit/.footprint +++ /dev/null @@ -1,49 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/cdda2mp3 -> cdda2ogg --rwxr-xr-x root/root usr/bin/cdda2ogg -lrwxrwxrwx root/root usr/bin/cdda2wav -> icedax --rwxr-xr-x root/root usr/bin/cdrecord --rwxr-xr-x root/root usr/bin/devdump --rwxr-xr-x root/root usr/bin/dirsplit -lrwxrwxrwx root/root usr/bin/dvdrecord -> cdrecord -lrwxrwxrwx root/root usr/bin/genisoimage -> mkisofs --rwxr-xr-x root/root usr/bin/icedax --rwxr-xr-x root/root usr/bin/isodebug --rwxr-xr-x root/root usr/bin/isodump --rwxr-xr-x root/root usr/bin/isoinfo --rwxr-xr-x root/root usr/bin/isovfy -lrwxrwxrwx root/root usr/bin/mkhybrid -> mkisofs --rwxr-xr-x root/root usr/bin/mkisofs --rwxr-xr-x root/root usr/bin/pitchplay -lrwxrwxrwx root/root usr/bin/readcd -> readom --rwxr-xr-x root/root usr/bin/readmult --rwxr-xr-x root/root usr/bin/readom -lrwxrwxrwx root/root usr/bin/wodim -> cdrecord -drwxr-xr-x root/root usr/sbin/ --rwxr-xr-x root/root usr/sbin/netscsid -lrwxrwxrwx root/root usr/sbin/rscsi -> netscsid -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/cdda2ogg.1.gz -lrwxrwxrwx root/root usr/share/man/man1/cdda2wav.1.gz -> icedax.1.gz -lrwxrwxrwx root/root usr/share/man/man1/cdrecord.1.gz -> wodim.1.gz --rw-r--r-- root/root usr/share/man/man1/devdump.1.gz --rw-r--r-- root/root usr/share/man/man1/dirsplit.1.gz --rw-r--r-- root/root usr/share/man/man1/genisoimage.1.gz --rw-r--r-- root/root usr/share/man/man1/icedax.1.gz --rw-r--r-- root/root usr/share/man/man1/isodebug.1.gz --rw-r--r-- root/root usr/share/man/man1/isodump.1.gz --rw-r--r-- root/root usr/share/man/man1/isoinfo.1.gz --rw-r--r-- root/root usr/share/man/man1/isovfy.1.gz --rw-r--r-- root/root usr/share/man/man1/list_audio_tracks.1.gz -lrwxrwxrwx root/root usr/share/man/man1/mkisofs.1.gz -> genisoimage.1.gz --rw-r--r-- root/root usr/share/man/man1/pitchplay.1.gz -lrwxrwxrwx root/root usr/share/man/man1/readcd.1.gz -> readom.1.gz --rw-r--r-- root/root usr/share/man/man1/readmult.1.gz --rw-r--r-- root/root usr/share/man/man1/readom.1.gz --rw-r--r-- root/root usr/share/man/man1/wodim.1.gz -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/genisoimagerc.5.gz -lrwxrwxrwx root/root usr/share/man/man5/mkisofsrc.5.gz -> genisoimagerc.5.gz diff --git a/base/cdrkit/.md5sum b/base/cdrkit/.md5sum deleted file mode 100644 index f14f2af6b..000000000 --- a/base/cdrkit/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -2e2c74b6b99e3043054fc5943710f3fc cdrkit-1.1.9-glibc-2.10.patch -cbc0647e5d85f0e8fb3a692ba1d42edd cdrkit-1.1.9.tar.gz diff --git a/base/cdrkit/Pkgfile b/base/cdrkit/Pkgfile deleted file mode 100644 index 1a58d2155..000000000 --- a/base/cdrkit/Pkgfile +++ /dev/null @@ -1,37 +0,0 @@ -# Description: Jeu de commande en ligne pour la manipulation des disques CD/DVD/BlueRay -# URL: http://cdrkit.org/ -# Maintainer: NuTyX core team -# Packager: thierryn1 at hispeed dot ch -# Depends on: cmake, libcap - -name=cdrkit -version=1.1.9 -release=1 -source=(http://cdrkit.org/releases/$name-$version.tar.gz\ - cdrkit-1.1.9-glibc-2.10.patch) - -build() { - cd $name-$version - patch -p1 -i $SRC/$name-$version-glibc-2.10.patch - # ./configure --prefix=/usr - make - make PREFIX=$PKG/usr install - cd $PKG/usr/bin - mv wodim cdrecord - ln -s cdrecord wodim - mv genisoimage mkisofs - ln -s mkisofs genisoimage - ln -s readom readcd - ln -s icedax cdda2wav - ln -s mkisofs mkhybrid - ln -s cdrecord dvdrecord - cd ../sbin - ln -s netscsid rscsi - cd ../share/man/man1 - ln -s icedax.1 cdda2wav.1 - ln -s readom.1 readcd.1 - ln -s wodim.1 cdrecord.1 - ln -s genisoimage.1 mkisofs.1 - cd ../man5 - ln -s genisoimagerc.5 mkisofsrc.5 -} diff --git a/base/cdrkit/cdrkit-1.1.9-glibc-2.10.patch b/base/cdrkit/cdrkit-1.1.9-glibc-2.10.patch deleted file mode 100644 index 9e2f5082a..000000000 --- a/base/cdrkit/cdrkit-1.1.9-glibc-2.10.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h ---- cdrkit-1.1.9.orig/include/schily.h 2006-11-25 01:20:20.000000000 +0100 -+++ cdrkit-1.1.9/include/schily.h 2009-03-11 20:31:53.000000000 +0100 -@@ -116,7 +116,7 @@ extern int fexecl(const char *, FILE *, - extern int fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...); - /* 6th arg not const, fexecv forces av[ac] = NULL */ - extern int fexecv(const char *, FILE *, FILE *, FILE *, int, char **); --extern int fexecve(const char *, FILE *, FILE *, FILE *, char * const *, -+extern int f_execve(const char *, FILE *, FILE *, FILE *, char * const *, - char * const *); - extern int fspawnv(FILE *, FILE *, FILE *, int, char * const *); - extern int fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...); -@@ -190,7 +190,7 @@ extern int schily_error(const char *, .. - extern char *fillbytes(void *, int, char); - extern char *findbytes(const void *, int, char); - extern int findline(const char *, char, const char *, int, char **, int); --extern int getline(char *, int); -+extern int get_line(char *, int); - extern int getstr(char *, int); - extern int breakline(char *, char, char **, int); - extern int getallargs(int *, char * const**, const char *, ...); -diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c ---- cdrkit-1.1.9.orig/librols/fexec.c 2008-02-25 12:14:07.000000000 +0100 -+++ cdrkit-1.1.9/librols/fexec.c 2009-03-11 20:31:53.000000000 +0100 -@@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist) - } while (p != NULL); - va_end(args); - -- ret = fexecve(name, in, out, err, av, env); -+ ret = f_execve(name, in, out, err, av, env); - if (av != xav) - free(av); - return (ret); -@@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av) - char *av[]; - { - av[ac] = NULL; /* force list to be null terminated */ -- return (fexecve(name, in, out, err, av, environ)); -+ return (f_execve(name, in, out, err, av, environ)); - } - - EXPORT int --fexecve(name, in, out, err, av, env) -+f_execve(name, in, out, err, av, env) - const char *name; - FILE *in, *out, *err; - char * const av[], * const env[]; -diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c ---- cdrkit-1.1.9.orig/librols/stdio/fgetline.c 2006-09-05 10:39:04.000000000 +0200 -+++ cdrkit-1.1.9/librols/stdio/fgetline.c 2009-03-11 20:31:53.000000000 +0100 -@@ -76,7 +76,7 @@ fgetline(f, buf, len) - } - - EXPORT int --getline(buf, len) -+get_line(buf, len) - char *buf; - int len; - { -diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c ---- cdrkit-1.1.9.orig/libusal/scsitransp.c 2008-02-25 12:14:07.000000000 +0100 -+++ cdrkit-1.1.9/libusal/scsitransp.c 2009-03-11 20:31:53.000000000 +0100 -@@ -301,7 +301,7 @@ usal_yes(char *msg) - - 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 -puNr cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c ---- cdrkit-1.1.9.orig/readom/io.c 2006-12-08 14:38:43.000000000 +0100 -+++ cdrkit-1.1.9/readom/io.c 2009-03-11 20:31:53.000000000 +0100 -@@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi - (*prt)(s, *lp, mini, maxi, dp); - flush(); - line[0] = '\0'; -- if (getline(line, 80) == EOF) -+ if (get_line(line, 80) == EOF) - exit(EX_BAD); - - linep = skipwhite(line); -@@ -178,7 +178,7 @@ again: - vprintf(form, args); - va_end(args); - flush(); -- if (getline(okbuf, sizeof(okbuf)) == EOF) -+ if (get_line(okbuf, sizeof(okbuf)) == EOF) - exit(EX_BAD); - if (okbuf[0] == '?') { - printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n"); -diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c ---- cdrkit-1.1.9.orig/readom/readom.c 2007-04-03 00:43:29.000000000 +0200 -+++ cdrkit-1.1.9/readom/readom.c 2009-03-11 20:31:53.000000000 +0100 -@@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp, - fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n", - usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); - fprintf(stderr, "Enter filename [%s]: ", defname); flush(); -- (void) getline(filename, sizeof (filename)); -+ (void) get_line(filename, sizeof (filename)); - } - - if (askrange) { -@@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp) - fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n", - usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); - fprintf(stderr, "Enter filename [%s]: ", defname); flush(); -- (void) getline(filename, sizeof (filename)); -+ (void) get_line(filename, sizeof (filename)); - fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n"); - - getlong("Enter starting sector for copy:", &addr, 0L, end-1); -diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c ---- cdrkit-1.1.9.orig/wodim/cue.c 2006-12-08 14:38:43.000000000 +0100 -+++ cdrkit-1.1.9/wodim/cue.c 2009-03-11 20:32:18.000000000 +0100 -@@ -253,7 +253,7 @@ static char *skipwhite(const char *s); - static char *peekword(void); - static char *lineend(void); - static char *markword(char *delim); --static char getdelim(void); -+static char get_delim(void); - static char *getnextitem(char *delim); - static char *neednextitem(char *delim); - static char *nextword(void); -@@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s - if (kp == NULL) - cueabort("Unknown filetype '%s'", word); - -- if (getdelim() == '/') { -+ if (get_delim() == '/') { - word = needitem(); - if (*astol(++word, &secsize) != '\0') - cueabort("Not a number '%s'", word); -@@ -1128,7 +1128,7 @@ linelen--; - } - - static char --getdelim() -+get_delim() - { - return (wordendc); - } diff --git a/extra/cdrkit/.md5sum b/extra/cdrkit/.md5sum index 99abd6fe1..f14f2af6b 100644 --- a/extra/cdrkit/.md5sum +++ b/extra/cdrkit/.md5sum @@ -1 +1,2 @@ +2e2c74b6b99e3043054fc5943710f3fc cdrkit-1.1.9-glibc-2.10.patch cbc0647e5d85f0e8fb3a692ba1d42edd cdrkit-1.1.9.tar.gz diff --git a/extra/cdrkit/Pkgfile b/extra/cdrkit/Pkgfile index f096a14ae..1a58d2155 100644 --- a/extra/cdrkit/Pkgfile +++ b/extra/cdrkit/Pkgfile @@ -2,15 +2,17 @@ # URL: http://cdrkit.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: libcap2 +# Depends on: cmake, libcap name=cdrkit version=1.1.9 release=1 -source=(http://cdrkit.org/releases/$name-$version.tar.gz) +source=(http://cdrkit.org/releases/$name-$version.tar.gz\ + cdrkit-1.1.9-glibc-2.10.patch) build() { cd $name-$version + patch -p1 -i $SRC/$name-$version-glibc-2.10.patch # ./configure --prefix=/usr make make PREFIX=$PKG/usr install diff --git a/extra/cdrkit/cdrkit-1.1.9-glibc-2.10.patch b/extra/cdrkit/cdrkit-1.1.9-glibc-2.10.patch new file mode 100644 index 000000000..9e2f5082a --- /dev/null +++ b/extra/cdrkit/cdrkit-1.1.9-glibc-2.10.patch @@ -0,0 +1,143 @@ +diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h +--- cdrkit-1.1.9.orig/include/schily.h 2006-11-25 01:20:20.000000000 +0100 ++++ cdrkit-1.1.9/include/schily.h 2009-03-11 20:31:53.000000000 +0100 +@@ -116,7 +116,7 @@ extern int fexecl(const char *, FILE *, + extern int fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...); + /* 6th arg not const, fexecv forces av[ac] = NULL */ + extern int fexecv(const char *, FILE *, FILE *, FILE *, int, char **); +-extern int fexecve(const char *, FILE *, FILE *, FILE *, char * const *, ++extern int f_execve(const char *, FILE *, FILE *, FILE *, char * const *, + char * const *); + extern int fspawnv(FILE *, FILE *, FILE *, int, char * const *); + extern int fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...); +@@ -190,7 +190,7 @@ extern int schily_error(const char *, .. + extern char *fillbytes(void *, int, char); + extern char *findbytes(const void *, int, char); + extern int findline(const char *, char, const char *, int, char **, int); +-extern int getline(char *, int); ++extern int get_line(char *, int); + extern int getstr(char *, int); + extern int breakline(char *, char, char **, int); + extern int getallargs(int *, char * const**, const char *, ...); +diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c +--- cdrkit-1.1.9.orig/librols/fexec.c 2008-02-25 12:14:07.000000000 +0100 ++++ cdrkit-1.1.9/librols/fexec.c 2009-03-11 20:31:53.000000000 +0100 +@@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist) + } while (p != NULL); + va_end(args); + +- ret = fexecve(name, in, out, err, av, env); ++ ret = f_execve(name, in, out, err, av, env); + if (av != xav) + free(av); + return (ret); +@@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av) + char *av[]; + { + av[ac] = NULL; /* force list to be null terminated */ +- return (fexecve(name, in, out, err, av, environ)); ++ return (f_execve(name, in, out, err, av, environ)); + } + + EXPORT int +-fexecve(name, in, out, err, av, env) ++f_execve(name, in, out, err, av, env) + const char *name; + FILE *in, *out, *err; + char * const av[], * const env[]; +diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c +--- cdrkit-1.1.9.orig/librols/stdio/fgetline.c 2006-09-05 10:39:04.000000000 +0200 ++++ cdrkit-1.1.9/librols/stdio/fgetline.c 2009-03-11 20:31:53.000000000 +0100 +@@ -76,7 +76,7 @@ fgetline(f, buf, len) + } + + EXPORT int +-getline(buf, len) ++get_line(buf, len) + char *buf; + int len; + { +diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c +--- cdrkit-1.1.9.orig/libusal/scsitransp.c 2008-02-25 12:14:07.000000000 +0100 ++++ cdrkit-1.1.9/libusal/scsitransp.c 2009-03-11 20:31:53.000000000 +0100 +@@ -301,7 +301,7 @@ usal_yes(char *msg) + + 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 -puNr cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c +--- cdrkit-1.1.9.orig/readom/io.c 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.9/readom/io.c 2009-03-11 20:31:53.000000000 +0100 +@@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi + (*prt)(s, *lp, mini, maxi, dp); + flush(); + line[0] = '\0'; +- if (getline(line, 80) == EOF) ++ if (get_line(line, 80) == EOF) + exit(EX_BAD); + + linep = skipwhite(line); +@@ -178,7 +178,7 @@ again: + vprintf(form, args); + va_end(args); + flush(); +- if (getline(okbuf, sizeof(okbuf)) == EOF) ++ if (get_line(okbuf, sizeof(okbuf)) == EOF) + exit(EX_BAD); + if (okbuf[0] == '?') { + printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n"); +diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c +--- cdrkit-1.1.9.orig/readom/readom.c 2007-04-03 00:43:29.000000000 +0200 ++++ cdrkit-1.1.9/readom/readom.c 2009-03-11 20:31:53.000000000 +0100 +@@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp, + fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n", + usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); + fprintf(stderr, "Enter filename [%s]: ", defname); flush(); +- (void) getline(filename, sizeof (filename)); ++ (void) get_line(filename, sizeof (filename)); + } + + if (askrange) { +@@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp) + fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n", + usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); + fprintf(stderr, "Enter filename [%s]: ", defname); flush(); +- (void) getline(filename, sizeof (filename)); ++ (void) get_line(filename, sizeof (filename)); + fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n"); + + getlong("Enter starting sector for copy:", &addr, 0L, end-1); +diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c +--- cdrkit-1.1.9.orig/wodim/cue.c 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.9/wodim/cue.c 2009-03-11 20:32:18.000000000 +0100 +@@ -253,7 +253,7 @@ static char *skipwhite(const char *s); + static char *peekword(void); + static char *lineend(void); + static char *markword(char *delim); +-static char getdelim(void); ++static char get_delim(void); + static char *getnextitem(char *delim); + static char *neednextitem(char *delim); + static char *nextword(void); +@@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s + if (kp == NULL) + cueabort("Unknown filetype '%s'", word); + +- if (getdelim() == '/') { ++ if (get_delim() == '/') { + word = needitem(); + if (*astol(++word, &secsize) != '\0') + cueabort("Not a number '%s'", word); +@@ -1128,7 +1128,7 @@ linelen--; + } + + static char +-getdelim() ++get_delim() + { + return (wordendc); + } -- cgit v1.2.3-54-g00ecf