Date: Friday, January 20, 2017 @ 22:26:28
Author: jgc
Revision: 287038
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cdrdao/repos/extra-i686/PKGBUILD
(from rev 287037, cdrdao/trunk/PKGBUILD)
cdrdao/repos/extra-i686/cdrdao-1.2.3-autoconf-update.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
cdrdao/repos/extra-i686/cdrdao-1.2.3-format_security.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-format_security.patch)
cdrdao/repos/extra-i686/cdrdao-1.2.3-k3b.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
cdrdao/repos/extra-i686/cdrdao-1.2.3-narrowing.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-narrowing.patch)
cdrdao/repos/extra-i686/cdrdao-1.2.3-stat.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-stat.patch)
cdrdao/repos/extra-x86_64/PKGBUILD
(from rev 287037, cdrdao/trunk/PKGBUILD)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-format_security.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-format_security.patch)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-narrowing.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-narrowing.patch)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-stat.patch
(from rev 287037, cdrdao/trunk/cdrdao-1.2.3-stat.patch)
Deleted:
cdrdao/repos/extra-i686/PKGBUILD
cdrdao/repos/extra-i686/cdrdao-1.2.3-autoconf-update.patch
cdrdao/repos/extra-i686/cdrdao-1.2.3-k3b.patch
cdrdao/repos/extra-i686/cdrdao-1.2.3-stat.patch
cdrdao/repos/extra-x86_64/PKGBUILD
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-stat.patch
-------------------------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++
/cdrdao-1.2.3-autoconf-update.patch | 104 ++++++++++++++++++++++
/cdrdao-1.2.3-k3b.patch | 22 ++++
/cdrdao-1.2.3-stat.patch | 26 +++++
extra-i686/PKGBUILD | 65 -------------
extra-i686/cdrdao-1.2.3-autoconf-update.patch | 52 -----------
extra-i686/cdrdao-1.2.3-format_security.patch | 57 ++++++++++++
extra-i686/cdrdao-1.2.3-k3b.patch | 11 --
extra-i686/cdrdao-1.2.3-narrowing.patch | 24 +++++
extra-i686/cdrdao-1.2.3-stat.patch | 13 --
extra-x86_64/PKGBUILD | 65 -------------
extra-x86_64/cdrdao-1.2.3-autoconf-update.patch | 52 -----------
extra-x86_64/cdrdao-1.2.3-format_security.patch | 57 ++++++++++++
extra-x86_64/cdrdao-1.2.3-k3b.patch | 11 --
extra-x86_64/cdrdao-1.2.3-narrowing.patch | 24 +++++
extra-x86_64/cdrdao-1.2.3-stat.patch | 13 --
16 files changed, 414 insertions(+), 282 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-01-20 22:26:21 UTC (rev 287037)
+++ extra-i686/PKGBUILD 2017-01-20 22:26:28 UTC (rev 287038)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Daniel J Griffiths <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: dorphell <[email protected]>
-
-pkgbase=('cdrdao')
-pkgname=('cdrdao' 'gcdmaster')
-pkgver=1.2.3
-pkgrel=9
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://cdrdao.sourceforge.net/";
-makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
-source=("http://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')
-md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
- '8e53dfc174f7c0882194caa05e68b85e'
- '696f6ca01e1eeb9b6a5be88e535d9398'
- '0fce05542ebad283f36fa1c4d62992a0')
-
-prepare() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch"
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch"
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
-
- find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} +
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- CXXFLAGS+=' -std=c++11 -Wno-narrowing'
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --with-xdao --with-lame \
- --with-ogg-support --with-mp3-support
- make
-}
-
-package_cdrdao() {
- pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
- depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- for dir in trackdb utils paranoia dao
- do
- make -C ${dir} DESTDIR="${pkgdir}" install
- done
-}
-
-package_gcdmaster() {
- pkgdesc='GUI frontend for creating audio CDs using cdrdao'
- depends=('libgnomeuimm' "cdrdao=${pkgver}")
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
DESTDIR="${pkgdir}" install
-
- mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
- rmdir "${pkgdir}/etc"
-}
Copied: cdrdao/repos/extra-i686/PKGBUILD (from rev 287037,
cdrdao/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-01-20 22:26:28 UTC (rev 287038)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Daniel J Griffiths <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: dorphell <[email protected]>
+
+pkgname=cdrdao
+pkgver=1.2.3
+pkgrel=10
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://cdrdao.sourceforge.net/";
+pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
+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'
+ '2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74'
+ '6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0'
+ 'ca89b7c56a376d5a9574c5757f0d372236a895334f81867ff5e1703806565bbc'
+ '7909a3ad290d45fd2db5059025bf219be7b77af60050a409a3dc2a41a4859fe3'
+ '6222e307ebabe5149f88d64ef2cee7bf2a44588b9022babb7071bb87c224cae6')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ 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() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --without-xdao --with-lame \
+ --with-ogg-support --with-mp3-support
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/cdrdao-1.2.3-autoconf-update.patch
===================================================================
--- extra-i686/cdrdao-1.2.3-autoconf-update.patch 2017-01-20 22:26:21 UTC
(rev 287037)
+++ extra-i686/cdrdao-1.2.3-autoconf-update.patch 2017-01-20 22:26:28 UTC
(rev 287038)
@@ -1,52 +0,0 @@
---- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100
-+++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200
-@@ -1,5 +1,49 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install
schemas
-+dnl (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+ fi
-+
-+ AC_ARG_WITH([gconf-source],
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+ [Config database for installing schema files.]),
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema
installation])
-+
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ fi
-+
-+ AC_ARG_WITH([gconf-schema-file-dir],
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+ [Directory for installing schema files.]),
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema
files])
-+
-+ AC_ARG_ENABLE(schemas-install,
-+ AC_HELP_STRING([--disable-schemas-install],
-+ [Disable the schemas installation]),
-+ [case ${enableval} in
-+ yes|no) ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install])
;;
-+ esac])
-+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" !=
no])
-+])
- # Configure paths for GTK--
- # Erik Andersen 30 May 1998
- # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
-
- dnl Check and configure include and link paths for lame library
Copied: cdrdao/repos/extra-i686/cdrdao-1.2.3-autoconf-update.patch (from rev
287037, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
===================================================================
--- extra-i686/cdrdao-1.2.3-autoconf-update.patch
(rev 0)
+++ extra-i686/cdrdao-1.2.3-autoconf-update.patch 2017-01-20 22:26:28 UTC
(rev 287038)
@@ -0,0 +1,52 @@
+--- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100
++++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200
+@@ -1,5 +1,49 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install
schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema
installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema
files])
++
++ AC_ARG_ENABLE(schemas-install,
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install])
;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" !=
no])
++])
+ # Configure paths for GTK--
+ # Erik Andersen 30 May 1998
+ # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+
+ dnl Check and configure include and link paths for lame library
Copied: cdrdao/repos/extra-i686/cdrdao-1.2.3-format_security.patch (from rev
287037, cdrdao/trunk/cdrdao-1.2.3-format_security.patch)
===================================================================
--- extra-i686/cdrdao-1.2.3-format_security.patch
(rev 0)
+++ extra-i686/cdrdao-1.2.3-format_security.patch 2017-01-20 22:26:28 UTC
(rev 287038)
@@ -0,0 +1,57 @@
+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: extra-i686/cdrdao-1.2.3-k3b.patch
===================================================================
--- extra-i686/cdrdao-1.2.3-k3b.patch 2017-01-20 22:26:21 UTC (rev 287037)
+++ extra-i686/cdrdao-1.2.3-k3b.patch 2017-01-20 22:26:28 UTC (rev 287038)
@@ -1,11 +0,0 @@
---- cdrdao/dao/main.cc~ 2009-04-16 15:34:27.000000000 +0200
-+++ cdrdao/dao/main.cc 2009-04-16 15:34:38.000000000 +0200
-@@ -207,7 +207,7 @@
-
- static void printVersion()
- {
-- log_message(2, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
-+ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
- VERSION);
-
- std::list<std::string> list;
Copied: cdrdao/repos/extra-i686/cdrdao-1.2.3-k3b.patch (from rev 287037,
cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
===================================================================
--- extra-i686/cdrdao-1.2.3-k3b.patch (rev 0)
+++ extra-i686/cdrdao-1.2.3-k3b.patch 2017-01-20 22:26:28 UTC (rev 287038)
@@ -0,0 +1,11 @@
+--- cdrdao/dao/main.cc~ 2009-04-16 15:34:27.000000000 +0200
++++ cdrdao/dao/main.cc 2009-04-16 15:34:38.000000000 +0200
+@@ -207,7 +207,7 @@
+
+ static void printVersion()
+ {
+- log_message(2, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
++ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
+ VERSION);
+
+ std::list<std::string> list;
Copied: cdrdao/repos/extra-i686/cdrdao-1.2.3-narrowing.patch (from rev 287037,
cdrdao/trunk/cdrdao-1.2.3-narrowing.patch)
===================================================================
--- extra-i686/cdrdao-1.2.3-narrowing.patch (rev 0)
+++ extra-i686/cdrdao-1.2.3-narrowing.patch 2017-01-20 22:26:28 UTC (rev
287038)
@@ -0,0 +1,24 @@
+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: extra-i686/cdrdao-1.2.3-stat.patch
===================================================================
--- extra-i686/cdrdao-1.2.3-stat.patch 2017-01-20 22:26:21 UTC (rev 287037)
+++ extra-i686/cdrdao-1.2.3-stat.patch 2017-01-20 22:26:28 UTC (rev 287038)
@@ -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>
Copied: cdrdao/repos/extra-i686/cdrdao-1.2.3-stat.patch (from rev 287037,
cdrdao/trunk/cdrdao-1.2.3-stat.patch)
===================================================================
--- extra-i686/cdrdao-1.2.3-stat.patch (rev 0)
+++ extra-i686/cdrdao-1.2.3-stat.patch 2017-01-20 22:26:28 UTC (rev 287038)
@@ -0,0 +1,13 @@
+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>
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-01-20 22:26:21 UTC (rev 287037)
+++ extra-x86_64/PKGBUILD 2017-01-20 22:26:28 UTC (rev 287038)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Daniel J Griffiths <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: dorphell <[email protected]>
-
-pkgbase=('cdrdao')
-pkgname=('cdrdao' 'gcdmaster')
-pkgver=1.2.3
-pkgrel=9
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://cdrdao.sourceforge.net/";
-makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
-source=("http://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')
-md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
- '8e53dfc174f7c0882194caa05e68b85e'
- '696f6ca01e1eeb9b6a5be88e535d9398'
- '0fce05542ebad283f36fa1c4d62992a0')
-
-prepare() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch"
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch"
- patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
-
- find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} +
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- CXXFLAGS+=' -std=c++11 -Wno-narrowing'
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --with-xdao --with-lame \
- --with-ogg-support --with-mp3-support
- make
-}
-
-package_cdrdao() {
- pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
- depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- for dir in trackdb utils paranoia dao
- do
- make -C ${dir} DESTDIR="${pkgdir}" install
- done
-}
-
-package_gcdmaster() {
- pkgdesc='GUI frontend for creating audio CDs using cdrdao'
- depends=('libgnomeuimm' "cdrdao=${pkgver}")
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
DESTDIR="${pkgdir}" install
-
- mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
- rmdir "${pkgdir}/etc"
-}
Copied: cdrdao/repos/extra-x86_64/PKGBUILD (from rev 287037,
cdrdao/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-01-20 22:26:28 UTC (rev 287038)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Daniel J Griffiths <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: dorphell <[email protected]>
+
+pkgname=cdrdao
+pkgver=1.2.3
+pkgrel=10
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://cdrdao.sourceforge.net/";
+pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
+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'
+ '2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74'
+ '6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0'
+ 'ca89b7c56a376d5a9574c5757f0d372236a895334f81867ff5e1703806565bbc'
+ '7909a3ad290d45fd2db5059025bf219be7b77af60050a409a3dc2a41a4859fe3'
+ '6222e307ebabe5149f88d64ef2cee7bf2a44588b9022babb7071bb87c224cae6')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ 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() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --without-xdao --with-lame \
+ --with-ogg-support --with-mp3-support
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2017-01-20 22:26:21 UTC
(rev 287037)
+++ extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2017-01-20 22:26:28 UTC
(rev 287038)
@@ -1,52 +0,0 @@
---- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100
-+++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200
-@@ -1,5 +1,49 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install
schemas
-+dnl (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+ fi
-+
-+ AC_ARG_WITH([gconf-source],
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+ [Config database for installing schema files.]),
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema
installation])
-+
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ fi
-+
-+ AC_ARG_WITH([gconf-schema-file-dir],
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+ [Directory for installing schema files.]),
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema
files])
-+
-+ AC_ARG_ENABLE(schemas-install,
-+ AC_HELP_STRING([--disable-schemas-install],
-+ [Disable the schemas installation]),
-+ [case ${enableval} in
-+ yes|no) ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install])
;;
-+ esac])
-+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" !=
no])
-+])
- # Configure paths for GTK--
- # Erik Andersen 30 May 1998
- # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
-
- dnl Check and configure include and link paths for lame library
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch (from rev
287037, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
(rev 0)
+++ extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2017-01-20 22:26:28 UTC
(rev 287038)
@@ -0,0 +1,52 @@
+--- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100
++++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200
+@@ -1,5 +1,49 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install
schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema
installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema
files])
++
++ AC_ARG_ENABLE(schemas-install,
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install])
;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" !=
no])
++])
+ # Configure paths for GTK--
+ # Erik Andersen 30 May 1998
+ # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+
+ dnl Check and configure include and link paths for lame library
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-format_security.patch (from rev
287037, cdrdao/trunk/cdrdao-1.2.3-format_security.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-format_security.patch
(rev 0)
+++ extra-x86_64/cdrdao-1.2.3-format_security.patch 2017-01-20 22:26:28 UTC
(rev 287038)
@@ -0,0 +1,57 @@
+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: extra-x86_64/cdrdao-1.2.3-k3b.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-k3b.patch 2017-01-20 22:26:21 UTC (rev 287037)
+++ extra-x86_64/cdrdao-1.2.3-k3b.patch 2017-01-20 22:26:28 UTC (rev 287038)
@@ -1,11 +0,0 @@
---- cdrdao/dao/main.cc~ 2009-04-16 15:34:27.000000000 +0200
-+++ cdrdao/dao/main.cc 2009-04-16 15:34:38.000000000 +0200
-@@ -207,7 +207,7 @@
-
- static void printVersion()
- {
-- log_message(2, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
-+ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
- VERSION);
-
- std::list<std::string> list;
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch (from rev 287037,
cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-k3b.patch (rev 0)
+++ extra-x86_64/cdrdao-1.2.3-k3b.patch 2017-01-20 22:26:28 UTC (rev 287038)
@@ -0,0 +1,11 @@
+--- cdrdao/dao/main.cc~ 2009-04-16 15:34:27.000000000 +0200
++++ cdrdao/dao/main.cc 2009-04-16 15:34:38.000000000 +0200
+@@ -207,7 +207,7 @@
+
+ static void printVersion()
+ {
+- log_message(2, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
++ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <[email protected]>",
+ VERSION);
+
+ std::list<std::string> list;
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-narrowing.patch (from rev
287037, cdrdao/trunk/cdrdao-1.2.3-narrowing.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-narrowing.patch (rev 0)
+++ extra-x86_64/cdrdao-1.2.3-narrowing.patch 2017-01-20 22:26:28 UTC (rev
287038)
@@ -0,0 +1,24 @@
+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: extra-x86_64/cdrdao-1.2.3-stat.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-stat.patch 2017-01-20 22:26:21 UTC (rev
287037)
+++ extra-x86_64/cdrdao-1.2.3-stat.patch 2017-01-20 22:26:28 UTC (rev
287038)
@@ -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>
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-stat.patch (from rev 287037,
cdrdao/trunk/cdrdao-1.2.3-stat.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-stat.patch (rev 0)
+++ extra-x86_64/cdrdao-1.2.3-stat.patch 2017-01-20 22:26:28 UTC (rev
287038)
@@ -0,0 +1,13 @@
+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>
