diff --git a/cdrdao-1.2.3-format_security.patch b/cdrdao-1.2.3-format_security.patch deleted file mode 100644 index cba986c..0000000 --- a/cdrdao-1.2.3-format_security.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up wrk/pccts/antlr/fset2.c.wrk wrk/pccts/antlr/fset2.c ---- wrk/pccts/antlr/fset2.c.wrk 2013-12-05 11:33:33.561962126 +0100 -+++ wrk/pccts/antlr/fset2.c 2013-12-05 11:33:52.009105807 +0100 -@@ -2210,7 +2210,7 @@ void MR_backTraceReport() - if (p->ntype != nToken) continue; - tn=(TokNode *)p; - if (depth != 0) fprintf(stdout," "); -- fprintf(stdout,TerminalString(tn->token)); -+ fprintf(stdout,"%s",TerminalString(tn->token)); - depth++; - if (! MR_AmbAidMultiple) { - if (set_nil(tn->tset)) { -diff -up wrk/pccts/antlr/gen.c.wrk wrk/pccts/antlr/gen.c ---- wrk/pccts/antlr/gen.c.wrk 2013-12-05 11:26:36.384714088 +0100 -+++ wrk/pccts/antlr/gen.c 2013-12-05 11:29:41.894158536 +0100 -@@ -3866,7 +3866,7 @@ int file; - /* MR10 */ _gen(" * "); - /* MR10 */ for (i=0 ; i < Save_argc ; i++) { - /* MR10 */ _gen(" "); --/* MR10 */ _gen(Save_argv[i]); -+/* MR10 */ _gen1("%s",Save_argv[i]); - /* MR10 */ }; - _gen("\n"); - _gen(" *\n"); -diff -up wrk/pccts/antlr/lex.c.wrk wrk/pccts/antlr/lex.c ---- wrk/pccts/antlr/lex.c.wrk 2013-12-05 11:15:51.912722340 +0100 -+++ wrk/pccts/antlr/lex.c 2013-12-05 11:19:04.039210441 +0100 -@@ -706,7 +706,7 @@ FILE *output; - /* MR26 */ if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break; - /* MR26 */ } - /* MR26 */ } --/* MR26 */ fprintf(output,strBetween(pSymbol, t, pSeparator)); -+/* MR26 */ fprintf(output,"%s",strBetween(pSymbol, t, pSeparator)); - - *q = p; - return (*pSeparator == 0); -@@ -771,7 +771,7 @@ FILE *f; - &pValue, - &pSeparator, - &nest); -- fprintf(f,strBetween(pDataType, pSymbol, pSeparator)); -+ fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator)); - } - - /* check to see if string e is a word in string s */ -@@ -852,9 +852,9 @@ int i; - &pSeparator, - &nest); - fprintf(f,"\t"); -- fprintf(f,strBetween(pDataType, pSymbol, pSeparator)); -+ fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator)); - fprintf(f," "); -- fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator)); -+ fprintf(f,"%s",strBetween(pSymbol, pEqualSign, pSeparator)); - fprintf(f,";\n"); - } - fprintf(f,"};\n"); diff --git a/cdrdao-1.2.3-helpmansync.patch b/cdrdao-1.2.3-helpmansync.patch deleted file mode 100644 index 3c20088..0000000 --- a/cdrdao-1.2.3-helpmansync.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up cdrdao-1.2.3/dao/cdrdao.man.helpmansync cdrdao-1.2.3/dao/cdrdao.man ---- cdrdao-1.2.3/dao/cdrdao.man.helpmansync 2012-10-08 15:54:01.598543254 +0200 -+++ cdrdao-1.2.3/dao/cdrdao.man 2012-10-08 16:01:11.439957988 +0200 -@@ -3,7 +3,7 @@ - cdrdao \- reads and writes CDs in disc-at-once mode - .SH SYNOPSIS - .B cdrdao --.RB { show-toc|read-toc|read-cd|read-cddb|show-data|read-test|disk-info|msinfo|unlock|simulate|write|copy|blank } -+.RB { show-toc|toc-info|toc-size|read-toc|read-cd|read-cddb|show-data|read-test|disk-info|discid|msinfo|drive-info|unlock|scanbus|simulate|write|copy|blank } - .RB [ --device - .IR device ] - .RB [ --source-device -@@ -77,6 +77,12 @@ The first argument must be one of the fo - .BI show-toc - Print out a summary about what will be written to the CD-R. - .TP -+.BI toc-info -+Prints out short toc-file summary. -+.TP -+.BI toc-size -+Prints total number of blocks for toc. -+.TP - .BI read-toc - Analyze each track of the inserted CD and create a - .I toc-file -@@ -122,10 +128,16 @@ Shows information about the inserted CD- - it will also print the start of the last and current session which is - used by mkisofs to create an image for a second or higher session. - .TP -+.BI discid -+Prints out CDDB information. -+.TP - .BI msinfo - Shows information required for creating multi session disks with - mkisofs. The output is meant for processing by scripts. - .TP -+.BI drive-info -+Shows drive information. -+.TP - .BI unlock - Tries to unlock the recorder device after a failed write or simulation - run. If you cannot eject the CD after a cdrdao run try this command. -@@ -139,6 +151,9 @@ blanking operation. Use option - .BI --speed - to select another blanking speed. - .TP -+.BI scanbus -+Scan for devices. -+.TP - .BI simulate - Like - .BI write diff --git a/cdrdao-1.2.3-lame-3.100.patch b/cdrdao-1.2.3-lame-3.100.patch deleted file mode 100644 index c712de2..0000000 --- a/cdrdao-1.2.3-lame-3.100.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/utils/toc2mp3.cc -+++ b/utils/toc2mp3.cc -@@ -143,8 +143,8 @@ - - message(0, "LAME encoder version: %s", get_lame_version()); - message(0, "Supported bit rates: "); -- for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { -- message(0, "%d ", bitrate_table[1][i]); -+ for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) { -+ message(0, "%d ", lame_get_bitrate(1, i)); - } - message(0, ""); - } -@@ -238,8 +238,8 @@ - lame_global_flags *lf; - int bitrateOk = 0; - -- for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { -- if (bitrate == bitrate_table[1][i]) -+ for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) { -+ if (bitrate == lame_get_bitrate(1, i)) - bitrateOk = 1; - } - diff --git a/cdrdao-1.2.3-narrowing.patch b/cdrdao-1.2.3-narrowing.patch deleted file mode 100644 index 0637ee4..0000000 --- a/cdrdao-1.2.3-narrowing.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up wrk/dao/CdrDriver.cc.wrk wrk/dao/CdrDriver.cc ---- wrk/dao/CdrDriver.cc.wrk 2016-02-16 14:06:23.158392345 +0100 -+++ wrk/dao/CdrDriver.cc 2016-02-16 14:07:11.654597254 +0100 -@@ -495,7 +495,7 @@ unsigned char CdrDriver::syncPattern[12] - 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0 - }; - --char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; -+unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; - - - /* Maps a string to the corresponding driver option value -diff -up wrk/dao/CdrDriver.h.wrk wrk/dao/CdrDriver.h ---- wrk/dao/CdrDriver.h.wrk 2016-02-16 14:21:18.454174199 +0100 -+++ wrk/dao/CdrDriver.h 2016-02-16 14:21:42.381275268 +0100 -@@ -440,7 +440,7 @@ protected: - bool fullBurn_; - - static unsigned char syncPattern[12]; -- static char REMOTE_MSG_SYNC_[4]; -+ static unsigned char REMOTE_MSG_SYNC_[4]; - - static int speed2Mult(int); - static int mult2Speed(int); diff --git a/cdrdao-1.2.3.tar.gz b/cdrdao-1.2.3.tar.gz deleted file mode 100644 index 21072b4..0000000 Binary files a/cdrdao-1.2.3.tar.gz and /dev/null differ diff --git a/cdrdao-1.2.5.tar.gz b/cdrdao-1.2.5.tar.gz new file mode 100644 index 0000000..f583f66 Binary files /dev/null and b/cdrdao-1.2.5.tar.gz differ diff --git a/cdrdao.spec b/cdrdao.spec index daf43c3..eeacfb1 100644 --- a/cdrdao.spec +++ b/cdrdao.spec @@ -1,8 +1,8 @@ -%global bname rel_1_2_3 +%global bname rel_1_2_5 Summary: Records audio or data CD-Rs in disk-at-once (DAO) mode Name: cdrdao -Version: 1.2.3 -Release: 37 +Version: 1.2.5 +Release: 1 License: GPLv2+ URL: http://cdrdao.sourceforge.net/ Source0: https://github.com/cdrdao/%{name}/archive/%{bname}/%{name}-%{version}.tar.gz @@ -11,11 +11,6 @@ BuildRequires: gcc-c++ gcc libsigc++20-devel libao-devel BuildRequires: libvorbis-devel >= 1.0 libmad-devel BuildRequires: lame-devel autoconf GConf2-devel -Patch1: cdrdao-1.2.3-helpmansync.patch -Patch2: cdrdao-1.2.3-format_security.patch -Patch3: cdrdao-1.2.3-narrowing.patch -Patch4: cdrdao-1.2.3-lame-3.100.patch - %description Cdrdao records audio or data CD-Rs in disk-at-once (DAO) mode based on a textual description of the CD contents (toc-file). @@ -54,6 +49,9 @@ autoreconf -v -f -i -I. %{_mandir}/man1 %changelog +* Sun Apr 23 2023 xu_ping <707078654@qq.com> - 1.2.5-1 +- Upgrade package to 1.2.5 version. + * Thu Nov 26 2020 maminjie - 1.2.3-37 - switch Source0 to github and optimize patch file