Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (c83dbe13e3f1cb72148f08f5720caa0e3f850b1a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (c83dbe13e3f1cb72148f08f5720caa0e3f850b1a)
  • Date: Mon, 25 Jan 2010 20:26:17 -0600

GIT changes to master grimoire by George Sherwood <george AT beernabeer.com>:

disk/cdrkit/DETAILS | 4
disk/cdrkit/HISTORY | 6 +
disk/cdrkit/PRE_BUILD | 3
disk/cdrkit/cdrkit-1.1.9-glibc-2.10.patch | 143
------------------------------
4 files changed, 8 insertions(+), 148 deletions(-)

New commits:
commit c83dbe13e3f1cb72148f08f5720caa0e3f850b1a
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

cdrkit: Updated to version 1.1.10. Removed incorporated patch.

diff --git a/disk/cdrkit/DETAILS b/disk/cdrkit/DETAILS
index 34ecb8a..c2c9f94 100755
--- a/disk/cdrkit/DETAILS
+++ b/disk/cdrkit/DETAILS
@@ -1,6 +1,6 @@
SPELL=cdrkit
- VERSION=1.1.9
-
SOURCE_HASH=sha512:c6d1fe04d384fda22cae009ca60b7aa7990797a6a552130953fb6c677f4989bb29dff4a086c5f720985c5913b7a58a8b5e604f717c0332182772c12dd3147451
+ VERSION=1.1.10
+
SOURCE_HASH=sha512:970091061f7ac6418ea93160ea2b1aabdd77fe1ab1351f45b1a198bcbcacf921b6b3c20ab23465f24dd9517f2e262590f6b6803d3207349fac55d4a523b79f82
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://cdrkit.org/releases/$SOURCE
diff --git a/disk/cdrkit/HISTORY b/disk/cdrkit/HISTORY
index 4b42ddc..1a22b18 100644
--- a/disk/cdrkit/HISTORY
+++ b/disk/cdrkit/HISTORY
@@ -1,3 +1,9 @@
+2010-01-25 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.1.10
+ * PRE_BUILD: Removed
+ * cdrkit-1.1.9-glibc-2.10.patch: Remvoved. Patch doens't apply
+ cleanly to this version and builds fine with glibc-2.11.1
+
2009-06-12 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, cdrkit-1.1.9-glibc-2.10.patch: added patch from gentoo

diff --git a/disk/cdrkit/PRE_BUILD b/disk/cdrkit/PRE_BUILD
deleted file mode 100755
index b64a185..0000000
--- a/disk/cdrkit/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/cdrkit-1.1.9-glibc-2.10.patch
diff --git a/disk/cdrkit/cdrkit-1.1.9-glibc-2.10.patch
b/disk/cdrkit/cdrkit-1.1.9-glibc-2.10.patch
deleted file mode 100644
index 9e2f508..0000000
--- a/disk/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);
- }



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (c83dbe13e3f1cb72148f08f5720caa0e3f850b1a), George Sherwood, 01/25/2010

Archive powered by MHonArc 2.6.24.

Top of Page