From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-cdr/xcdroast/files/cdda2wav_version.patch | 54 ++++++++++++++++++++++ app-cdr/xcdroast/files/disable_version_check.patch | 11 +++++ .../xcdroast/files/fix_cddb_hidden_tracks.patch | 45 ++++++++++++++++++ app-cdr/xcdroast/files/format-security.patch | 11 +++++ app-cdr/xcdroast/files/io_compile.patch | 21 +++++++++ app-cdr/xcdroast/files/io_progressbar_fix.patch | 39 ++++++++++++++++ app-cdr/xcdroast/files/suid-perms.patch | 36 +++++++++++++++ 7 files changed, 217 insertions(+) create mode 100644 app-cdr/xcdroast/files/cdda2wav_version.patch create mode 100644 app-cdr/xcdroast/files/disable_version_check.patch create mode 100644 app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch create mode 100644 app-cdr/xcdroast/files/format-security.patch create mode 100644 app-cdr/xcdroast/files/io_compile.patch create mode 100644 app-cdr/xcdroast/files/io_progressbar_fix.patch create mode 100644 app-cdr/xcdroast/files/suid-perms.patch (limited to 'app-cdr/xcdroast/files') diff --git a/app-cdr/xcdroast/files/cdda2wav_version.patch b/app-cdr/xcdroast/files/cdda2wav_version.patch new file mode 100644 index 000000000000..cd001e0ee7bf --- /dev/null +++ b/app-cdr/xcdroast/files/cdda2wav_version.patch @@ -0,0 +1,54 @@ +diff -urNad xcdroast-0.98+0alpha16~/src/io.c xcdroast-0.98+0alpha16/src/io.c +--- xcdroast-0.98+0alpha16~/src/io.c 2008-08-21 15:11:40.000000000 +0200 ++++ xcdroast-0.98+0alpha16/src/io.c 2009-12-29 22:54:08.571188849 +0100 +@@ -10062,6 +10062,7 @@ + + gint check_version_cdda2wav(gchar *match, gchar *found) { + gchar line[MAXLINE]; ++gchar vline[MAXLINE]; + gchar ver[MAXLINE]; + FILE *fpin; + gchar *p; +@@ -10076,32 +10077,38 @@ + } + + strcpy(line,""); ++ strcpy(vline,""); + for (;;) { + if (fgets(line,MAXLINE,fpin) == NULL) + break; + dodebug(10,"got: %s",line); ++ ++ /* only get first line */ ++ if (strcmp(vline,"") == 0) { ++ strncpy(vline, line, MAXLINE); ++ } + } + + if (pclose(fpin) == -1) { + g_error("pclose error\n"); + } + +- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) { ++ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) { + /* failed to open - permission denied */ + return 2; + } + +- /* now line contains the version string of cdda2wav */ ++ /* now vline contains the version string of cdda2wav */ + /* try to extract the version number */ + +- p = strstr(line,"version"); ++ p = strstr(vline,"version"); + if (p != NULL) { + p = strtok(p+8, " _"); + if (p != NULL) { + strcpy(ver,p); + } + } else { +- p = strstr(line,"cdda2wav"); ++ p = strstr(vline,"cdda2wav"); + if (p != NULL) { + p = strtok(p+9, " "); + if (p != NULL) { diff --git a/app-cdr/xcdroast/files/disable_version_check.patch b/app-cdr/xcdroast/files/disable_version_check.patch new file mode 100644 index 000000000000..e72c4d0ddb36 --- /dev/null +++ b/app-cdr/xcdroast/files/disable_version_check.patch @@ -0,0 +1,11 @@ +--- a/src/init.c 2016-07-08 12:00:17.705356781 +0200 ++++ b/src/init.c 2016-07-08 12:02:35.914358133 +0200 +@@ -790,7 +790,7 @@ + debug = 0; + oldfontcode = 0; + *altdevscan = 1; +- no_versioncheck = 0; ++ no_versioncheck = 1; + support_ontheflyaudio = 0; + c_locale_is_utf8 = 0; + ignoreProDVD = 0; diff --git a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch new file mode 100644 index 000000000000..ca532f20d359 --- /dev/null +++ b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch @@ -0,0 +1,45 @@ +--- a/src/io.c ++++ b/src/io.c +@@ -2665,6 +2665,8 @@ + g_error("Unexpected output in cdda2wav toc-output\n"); + } + trackinfo[tocnr]->track_nr = atoi(p1); ++ if (trackinfo[tocnr]->track_nr == 0) ++ cdinfo.nr_tracks++; + trackinfo[tocnr]->isosize = -1; + + /* reststring into tmp2 - strip to remove leading spaces */ +@@ -8401,6 +8403,9 @@ + if (extract_quoted(tmp) != 0) + return; + ++ if (matchnr == 0 && trackinfo[matchnr]->track_nr == 0) ++ matchnr++; ++ + if (mode == 0) { + if (matchnr >= cdinfo.nr_tracks) { + g_warning("invalid track count from cddb-server\n"); +@@ -8482,14 +8487,20 @@ + + /* build of command line */ + if (mode == 0 || mode == 2) { ++ gint ntr = cdinfo.nr_tracks; ++ ++ if (ntr > 0 && trackinfo[0]->track_nr == 0) ++ ntr--; + g_snprintf(tmp,MAXLINE,"cddb query %s %d ", +- cdinfo.cddb_discid, cdinfo.nr_tracks); ++ cdinfo.cddb_discid, ntr); + for (i = 0; i < cdinfo.nr_tracks; i++) { ++ if (trackinfo[i]->track_nr == 0) ++ continue; + g_snprintf(tmp2,MAXLINE,"%d ", + trackinfo[i]->start_sec + 150); + strcat(tmp,tmp2); + } +- g_snprintf(tmp2,MAXLINE,"%d",cdinfo.total_size / 75); ++ g_snprintf(tmp2,MAXLINE,"%d",(cdinfo.leadout + 150) / 75); + strcat(tmp,tmp2); + } else { + /* get data from toc file */ + diff --git a/app-cdr/xcdroast/files/format-security.patch b/app-cdr/xcdroast/files/format-security.patch new file mode 100644 index 000000000000..9d01cf4f7758 --- /dev/null +++ b/app-cdr/xcdroast/files/format-security.patch @@ -0,0 +1,11 @@ +--- xcdroast-0.98alpha16/src/setup.c.orig 2008-08-21 12:07:18.000000000 +0400 ++++ xcdroast-0.98alpha16/src/setup.c 2016-07-09 11:26:54.724084818 +0300 +@@ -4468,7 +4468,7 @@ + if (!textonly) { + show_dialog(ICO_ERROR,tmp, T_OK, NULL, NULL, 0); + } else { +- g_warning(tmp); ++ g_warning("%s",tmp); + } + } + } diff --git a/app-cdr/xcdroast/files/io_compile.patch b/app-cdr/xcdroast/files/io_compile.patch new file mode 100644 index 000000000000..339523d42f75 --- /dev/null +++ b/app-cdr/xcdroast/files/io_compile.patch @@ -0,0 +1,21 @@ +--- a/src/io.c.org 2009-02-24 09:38:27.000000000 +0100 ++++ b/src/io.c 2009-02-24 09:45:18.000000000 +0100 +@@ -1903,7 +1903,8 @@ + } + + strcpy(str,""); +- fgets(str,MAXLINE,fpin); ++ if (fgets(str,MAXLINE,fpin) == NULL) ++ g_error("fgets error\n"); + + if (pclose(fpin) == -1) { + g_error("pclose error\n"); +@@ -4720,7 +4721,7 @@ + dolog(3, "Saving extended output to %s\n", fname); + + /* write to file */ +- fd = open(fname,O_WRONLY | O_CREAT); ++ fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); + if (fd < 0) { + g_warning("Can't open file %s for writing\n",fname); + return 1; diff --git a/app-cdr/xcdroast/files/io_progressbar_fix.patch b/app-cdr/xcdroast/files/io_progressbar_fix.patch new file mode 100644 index 000000000000..745af45d7e73 --- /dev/null +++ b/app-cdr/xcdroast/files/io_progressbar_fix.patch @@ -0,0 +1,39 @@ +--- a/src/io.c.last So. Jan 24 19:18:45 2010 ++++ b/src/io.c Fr. Jul 16 10:59:32 2010 +@@ -3202,6 +3202,8 @@ + close(fd2[1]); + } + ++ g_setenv("LC_ALL", "C", TRUE); ++ + /* startup child */ + if (execl("/bin/sh", "sh", "-c", cmd ,(void *)NULL) < 0) { + g_error("execl error\n"); +@@ -3402,6 +3404,8 @@ + close(fd3[1]); + } + ++ g_setenv("LC_ALL", "C", TRUE); ++ + /* startup child */ + if (execv(callpath,arglist) < 0) { + g_error("execv error\n"); +@@ -3506,6 +3510,8 @@ + close(pipefd[1]); + } + ++ g_setenv("LC_ALL", "C", TRUE); ++ + /* startup first child */ + if (execv(callpath,arglist) < 0) { + g_error("execv error\n"); +@@ -3568,6 +3574,8 @@ + close(fd3[1]); + } + ++ g_setenv("LC_ALL", "C", TRUE); ++ + /* startup second child */ + if (execv(callpath2,arglist2) < 0) { + g_error("execv error\n"); + diff --git a/app-cdr/xcdroast/files/suid-perms.patch b/app-cdr/xcdroast/files/suid-perms.patch new file mode 100644 index 000000000000..1c804bc1775c --- /dev/null +++ b/app-cdr/xcdroast/files/suid-perms.patch @@ -0,0 +1,36 @@ +diff -Naurd xcdroast-0.98alpha16.orig/doc/README.nonroot xcdroast-0.98alpha16/doc/README.nonroot +--- xcdroast-0.98alpha16.orig/doc/README.nonroot 2003-10-27 23:37:40.000000000 +0300 ++++ xcdroast-0.98alpha16/doc/README.nonroot 2016-07-07 21:32:35.006587826 +0300 +@@ -72,7 +72,7 @@ + Please change now to the corresponding directory and enter: + + chown root xcdrwrap +- chmod 4755 xcdrwrap ++ chmod 4711 xcdrwrap + + + Usage of the non-root-mode +diff -Naurd xcdroast-0.98alpha16.orig/src/init.c xcdroast-0.98alpha16/src/init.c +--- xcdroast-0.98alpha16.orig/src/init.c 2008-08-20 20:20:23.000000000 +0400 ++++ xcdroast-0.98alpha16/src/init.c 2016-07-07 21:32:35.006587826 +0300 +@@ -670,7 +670,7 @@ + + /* check file mode of wrapper */ + if (stat(tmp,&buf) == 0) { +- if (buf.st_mode != 0104755) { ++ if (buf.st_mode != 0104711) { + dodebug(3,"Note: %s wrong modes set (0%o)\n", tmp, buf.st_mode); + nofail = 0; + } +diff -Naurd xcdroast-0.98alpha16.orig/src/io.c xcdroast-0.98alpha16/src/io.c +--- xcdroast-0.98alpha16.orig/src/io.c 2008-08-21 17:11:40.000000000 +0400 ++++ xcdroast-0.98alpha16/src/io.c 2016-07-07 21:32:35.003587931 +0300 +@@ -10380,7 +10380,7 @@ + strcat(ret,tmp); + #endif + /* old nonroot mode - 2755 */ +- g_snprintf(tmp,MAXLINE,"%s 4755 %s\n", cmd_chmod, bin); ++ g_snprintf(tmp,MAXLINE,"%s 4711 %s\n", cmd_chmod, bin); + strcat(ret,tmp); + + -- cgit v1.2.3