Date: Tuesday, November 13, 2018 @ 20:32:38 Author: jelle Revision: 339640
upgpkg: cdrdao 1.2.4-1 Remove fixed patches upstream. Modified: cdrdao/trunk/PKGBUILD Deleted: cdrdao/trunk/cdrdao-1.2.3-format_security.patch cdrdao/trunk/cdrdao-1.2.3-narrowing.patch cdrdao/trunk/cdrdao-1.2.3-stat.patch ------------------------------------+ PKGBUILD | 19 +++-------- cdrdao-1.2.3-format_security.patch | 57 ----------------------------------- cdrdao-1.2.3-narrowing.patch | 24 -------------- cdrdao-1.2.3-stat.patch | 13 ------- 4 files changed, 5 insertions(+), 108 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-11-13 19:43:53 UTC (rev 339639) +++ PKGBUILD 2018-11-13 20:32:38 UTC (rev 339640) @@ -3,8 +3,8 @@ # Contributor: dorphell <[email protected]> pkgname=cdrdao -pkgver=1.2.3 -pkgrel=10 +pkgver=1.2.4 +pkgrel=1 arch=('x86_64') license=('GPL') url="http://cdrdao.sourceforge.net/"; @@ -12,16 +12,10 @@ depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao') source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 cdrdao-1.2.3-autoconf-update.patch - cdrdao-1.2.3-k3b.patch - cdrdao-1.2.3-stat.patch - cdrdao-1.2.3-format_security.patch - cdrdao-1.2.3-narrowing.patch) -sha256sums=('8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e' + cdrdao-1.2.3-k3b.patch) +sha256sums=('358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4' '2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74' - '6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0' - 'ca89b7c56a376d5a9574c5757f0d372236a895334f81867ff5e1703806565bbc' - '7909a3ad290d45fd2db5059025bf219be7b77af60050a409a3dc2a41a4859fe3' - '6222e307ebabe5149f88d64ef2cee7bf2a44588b9022babb7071bb87c224cae6') + '6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0') prepare() { cd ${pkgname}-${pkgver} @@ -28,9 +22,6 @@ patch -Np1 -i ../cdrdao-1.2.3-autoconf-update.patch patch -Np1 -i ../cdrdao-1.2.3-k3b.patch - patch -Np1 -i ../cdrdao-1.2.3-stat.patch - patch -Np1 -i ../cdrdao-1.2.3-format_security.patch - patch -Np1 -i ../cdrdao-1.2.3-narrowing.patch } build() { Deleted: cdrdao-1.2.3-format_security.patch =================================================================== --- cdrdao-1.2.3-format_security.patch 2018-11-13 19:43:53 UTC (rev 339639) +++ cdrdao-1.2.3-format_security.patch 2018-11-13 20:32:38 UTC (rev 339640) @@ -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"); Deleted: cdrdao-1.2.3-narrowing.patch =================================================================== --- cdrdao-1.2.3-narrowing.patch 2018-11-13 19:43:53 UTC (rev 339639) +++ cdrdao-1.2.3-narrowing.patch 2018-11-13 20:32:38 UTC (rev 339640) @@ -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); Deleted: cdrdao-1.2.3-stat.patch =================================================================== --- cdrdao-1.2.3-stat.patch 2018-11-13 19:43:53 UTC (rev 339639) +++ cdrdao-1.2.3-stat.patch 2018-11-13 20:32:38 UTC (rev 339640) @@ -1,13 +0,0 @@ -diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc ---- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000 +0100 -+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100 -@@ -19,6 +19,9 @@ - - #include <config.h> - -+#include <sys/types.h> -+#include <sys/stat.h> -+ - #include <stdio.h> - #include <fcntl.h> - #include <unistd.h>
