pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils {cdrdao,gcdmaster}: update to 1.2.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/4d05bd6e1f8c
branches: trunk
changeset: 325336:4d05bd6e1f8c
user: markd <markd%pkgsrc.org@localhost>
date: Thu Nov 15 01:13:01 2018 +0000
description:
{cdrdao,gcdmaster}: update to 1.2.4
This is a maintenance release containing only minor bug, warning and
compilation fixes.
* Fixed autocon warnings (Denis Leroy)
* Ported to lame 3.100 (from Fedora)
* G++ compile fixes (Nick Bailey)
* Renamed xdao folder to gcdmaster (Denis Leroy)
* pccts format security patch (from Fedora)
* Fixed compile issues with glibc >= 2.12
* Gcdmaster segfault fix (Adrian Knoth)
* Prevent a FTBFS on kfreebsd (Christoph Egger)
* Also look in /etc/default/cdrdao config (Andrew Suffield)
* Fix printf format security issues (Frantisek Kluknavsky Fedora)
* Add missing options to man page (Honza Hor?k)
* CD_TEXT fix for HL-DT-ST (Kees Cook)
* Man page hyphen fixes (Markus Koschany)
* Some updates to the old scsilib smake files (Ubuntu patches)
diffstat:
sysutils/cdrdao/Makefile | 7 +--
sysutils/cdrdao/Makefile.common | 4 +-
sysutils/cdrdao/distinfo | 26 ++++--------
sysutils/cdrdao/patches/patch-ah | 10 +----
sysutils/cdrdao/patches/patch-ai | 24 ++++++------
sysutils/cdrdao/patches/patch-aj | 6 +-
sysutils/cdrdao/patches/patch-aq | 15 -------
sysutils/cdrdao/patches/patch-ar | 15 -------
sysutils/cdrdao/patches/patch-as | 15 -------
sysutils/cdrdao/patches/patch-aw | 20 ----------
sysutils/cdrdao/patches/patch-dao_CdrDriver.cc | 13 ------
sysutils/cdrdao/patches/patch-dao_CdrDriver.h | 13 ------
sysutils/cdrdao/patches/patch-xdao_CdDevice.cc | 13 ------
sysutils/cdrdao/patches/patch-xdao_CdDevice.h | 12 ------
sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc | 42 +-------------------
sysutils/gcdmaster/Makefile | 8 +--
16 files changed, 36 insertions(+), 207 deletions(-)
diffs (truncated from 402 to 300 lines):
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/Makefile
--- a/sysutils/cdrdao/Makefile Thu Nov 15 01:05:09 2018 +0000
+++ b/sysutils/cdrdao/Makefile Thu Nov 15 01:13:01 2018 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.36 2015/12/29 05:06:06 dholland Exp $
+# $NetBSD: Makefile,v 1.37 2018/11/15 01:13:01 markd Exp $
.include "../../sysutils/cdrdao/Makefile.common"
-PKGREVISION= 1
-
PKGNAME= cdrdao-${CDRDAO_VER}
COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
-CONFIGURE_ARGS+= --without-xdao
+CONFIGURE_ARGS+= --without-gcdmaster
+CONFIGURE_ARGS+= --without-lame
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
CONFIGURE_ARGS+= --without-posix-threads
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/Makefile.common
--- a/sysutils/cdrdao/Makefile.common Thu Nov 15 01:05:09 2018 +0000
+++ b/sysutils/cdrdao/Makefile.common Thu Nov 15 01:13:01 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2016/06/16 12:58:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2018/11/15 01:13:01 markd Exp $
#
# used by sysutils/cdrdao/Makefile
# used by sysutils/gcdmaster/Makefile
@@ -15,7 +15,7 @@
PATCHDIR= ${.CURDIR}/../../sysutils/cdrdao/patches
DISTINFO_FILE= ${.CURDIR}/../../sysutils/cdrdao/distinfo
-CDRDAO_VER= 1.2.3
+CDRDAO_VER= 1.2.4
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/distinfo
--- a/sysutils/cdrdao/distinfo Thu Nov 15 01:05:09 2018 +0000
+++ b/sysutils/cdrdao/distinfo Thu Nov 15 01:13:01 2018 +0000
@@ -1,31 +1,23 @@
-$NetBSD: distinfo,v 1.29 2017/02/14 21:22:43 joerg Exp $
+$NetBSD: distinfo,v 1.30 2018/11/15 01:13:01 markd Exp $
-SHA1 (cdrdao-1.2.3.tar.bz2) = 70d6547795a1342631c7ab56709fd1940c2aff9f
-RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523
-SHA512 (cdrdao-1.2.3.tar.bz2) = 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
-Size (cdrdao-1.2.3.tar.bz2) = 1428695 bytes
+SHA1 (cdrdao-1.2.4.tar.bz2) = 3adfbdefc73728a75c9ddc41160c9fe4139fb1e0
+RMD160 (cdrdao-1.2.4.tar.bz2) = 5124d440cd0ecc8d219caba3246d6d7aa246b6b7
+SHA512 (cdrdao-1.2.4.tar.bz2) = 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
+Size (cdrdao-1.2.4.tar.bz2) = 1442181 bytes
SHA1 (patch-aa) = 9606723ae593981c6b98083990c2b17c1ace5dc2
SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f
SHA1 (patch-ad) = b2baa69007fce6637049b9cf6fd0b95ef94560e3
SHA1 (patch-ae) = 39bb65ebce0ab53675a34963f718d74083412cff
SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca
SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a
-SHA1 (patch-ah) = a1c82bed76fee272e4afffdcad0a7e5c101f235c
-SHA1 (patch-ai) = cf46de1a2d0d466bcdb30d9123f17de7c571d6b2
-SHA1 (patch-aj) = 16bd87d3217019a07af3441f0593db2496cd7279
+SHA1 (patch-ah) = 7a7ff3361678b44f3def0e49afb2140cbac2b990
+SHA1 (patch-ai) = f2c4ad390b207a10f2a04193ff7a0c7ebef083c6
+SHA1 (patch-aj) = 6b39277142d561c54b01fa2c60b99244a71b4d0b
SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643
SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc
SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17
-SHA1 (patch-aq) = f984313e7ff141cee289cc78a9679fc5d9a160aa
-SHA1 (patch-ar) = 20cc6521c62d9c273999604c1cabbf023e31804b
-SHA1 (patch-as) = 95818ecbcfaf7a2799292bbb5acbcf5100f42b81
SHA1 (patch-at) = c6379b51f2f81c73a0976d35c62555860b20168d
SHA1 (patch-au) = dd8d9d6b73ea662ef3e936580082f9b733c6596c
SHA1 (patch-av) = 1053b438744ce9e64e0ab093679ed71fbce9a533
-SHA1 (patch-aw) = 152cc7d2f58b97ecbb766b9f3682884515a170a1
SHA1 (patch-ba) = b6b7ccae9edf1e816aac76a7d94b7bf67fc1671a
-SHA1 (patch-dao_CdrDriver.cc) = b618b4521d010f4153f73a9fab33d5ed56dfb651
-SHA1 (patch-dao_CdrDriver.h) = 71113a5d536aa8eba74e141e612c91e958dadda3
-SHA1 (patch-xdao_CdDevice.cc) = fb83427cef2fc0b7afdb526664f61863cd6bc715
-SHA1 (patch-xdao_CdDevice.h) = 11b9868cc54d2b926e5e588eb467f0941deb1208
-SHA1 (patch-xdao_SampleDisplay.cc) = edca89e680962d5a8add90d87f4ce9854c40d450
+SHA1 (patch-xdao_SampleDisplay.cc) = 6cb37169dea21a75e53b44e09e31f71cc1eb0fa8
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-ah
--- a/sysutils/cdrdao/patches/patch-ah Thu Nov 15 01:05:09 2018 +0000
+++ b/sysutils/cdrdao/patches/patch-ah Thu Nov 15 01:13:01 2018 +0000
@@ -1,15 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2010/01/10 05:39:30 obache Exp $
+$NetBSD: patch-ah,v 1.3 2018/11/15 01:13:02 markd Exp $
--- dao/ScsiIf-freebsd-cam.cc.orig 2007-12-29 12:26:33.000000000 +0000
+++ dao/ScsiIf-freebsd-cam.cc
-@@ -32,6 +32,7 @@
-
- #include "ScsiIf.h"
- #include "log.h"
-+#include "util.h"
-
- #define DEF_RETRY_COUNT 1
-
@@ -220,6 +221,12 @@ int ScsiIf::inquiry()
for (i = 3; i >= 0 && revision_[i] == ' '; i--)
revision_[i] = 0;
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-ai
--- a/sysutils/cdrdao/patches/patch-ai Thu Nov 15 01:05:09 2018 +0000
+++ b/sysutils/cdrdao/patches/patch-ai Thu Nov 15 01:13:01 2018 +0000
@@ -1,26 +1,26 @@
-$NetBSD: patch-ai,v 1.4 2009/11/22 21:05:18 drochner Exp $
+$NetBSD: patch-ai,v 1.5 2018/11/15 01:13:02 markd Exp $
---- configure.orig 2009-10-05 13:58:33.000000000 +0200
+--- configure.orig 2018-05-16 10:47:00.000000000 +0000
+++ configure
-@@ -10072,7 +10072,7 @@ if test "$scglib" = yes; then
+@@ -7436,7 +7436,7 @@ if test "$scglib" = yes; then
scsilib_objs="ScsiIf-lib.o"
case "$host" in
-- *-freebsd*)
-+ *-freebsd* | *-dragonfly*)
+- *-freebsd* | *-kfreebsd*-gnu)
++ *-freebsd* | *-kfreebsd*-gnu | *-dragonfly*)
scsilib_libs="$scsilib_libs -lcam"
;;
esac
-@@ -10090,7 +10090,7 @@ else
+@@ -7454,7 +7454,7 @@ else
scsilib_objs="ScsiIf-linux.o sg_err.o"
;;
-- *-freebsd*)
-+ *-freebsd* | *-dragonfly*)
+- *-freebsd* | *-kfreebsd*-gnu)
++ *-freebsd* | *-kfreebsd*-gnu | *-dragonfly*)
scsilib_libs="-lcam"
scsilib_objs="ScsiIf-freebsd-cam.o"
;;
-@@ -10130,7 +10130,7 @@ case "$host" in
+@@ -7492,7 +7492,7 @@ case "$host" in
esac
case "$host" in
@@ -29,12 +29,12 @@
if test "$use_pthreads" = yes; then
LDFLAGS="-pthread $LDFLAGS"
thread_libs=""
-@@ -10148,7 +10148,7 @@ _ACEOF
+@@ -7508,7 +7508,7 @@ $as_echo "#define _P1003_1B_VISIBLE 1" >
esac
case "$host" in
-- *-linux* | *-freebsd* | *-solaris*)
-+ *-linux* | *-freebsd* | *-solaris* | *-netbsd* | *-dragonfly*)
+- *-linux* | *-freebsd* | *-kfreebsd*-gnu | *-solaris*)
++ *-linux* | *-freebsd* | *-kfreebsd*-gnu | *-solaris* | *-netbsd* | *-dragonfly*)
sound_if_obj=SoundIF-ao.o
;;
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-aj
--- a/sysutils/cdrdao/patches/patch-aj Thu Nov 15 01:05:09 2018 +0000
+++ b/sysutils/cdrdao/patches/patch-aj Thu Nov 15 01:13:01 2018 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.2 2009/11/22 21:05:18 drochner Exp $
+$NetBSD: patch-aj,v 1.3 2018/11/15 01:13:02 markd Exp $
---- xdao/SoundIF-solaris.cc.orig 2007-12-29 13:31:54.000000000 +0100
-+++ xdao/SoundIF-solaris.cc
+--- gcdmaster/SoundIF-solaris.cc.orig 2007-12-29 13:31:54.000000000 +0100
++++ gcdmaster/SoundIF-solaris.cc
@@ -45,6 +45,7 @@
* Sound interface for Solaris. Thanks to Tobias Oetiker <oetiker%ee.ethz.ch@localhost>.
*/
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-aq
--- a/sysutils/cdrdao/patches/patch-aq Thu Nov 15 01:05:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2009/08/11 15:44:14 taca Exp $
-
-Avoid confliction with getline(3).
-
---- scsilib/include/schily.h.orig 2004-03-05 09:30:40.000000000 +0900
-+++ scsilib/include/schily.h
-@@ -187,7 +187,7 @@ extern char *fillbytes __PR((void *, int
- extern char *findbytes __PR((const void *, int, char));
- extern int findline __PR((const char *, char, const char *,
- int, char **, int));
--extern int getline __PR((char *, int));
-+extern int get_line __PR((char *, int));
- extern int getstr __PR((char *, int));
- extern int breakline __PR((char *, char, char **, int));
- extern int getallargs __PR((int *, char * const**, const char *, ...));
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-ar
--- a/sysutils/cdrdao/patches/patch-ar Thu Nov 15 01:05:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2009/08/11 15:44:14 taca Exp $
-
-Avoid confliction with getline(3).
-
---- scsilib/libscg/scsitransp.c.orig 2004-06-18 05:20:27.000000000 +0900
-+++ scsilib/libscg/scsitransp.c
-@@ -323,7 +323,7 @@ scg_yes(msg)
-
- js_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 -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-as
--- a/sysutils/cdrdao/patches/patch-as Thu Nov 15 01:05:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-as,v 1.1 2009/08/11 15:44:14 taca Exp $
-
-Avoid confliction with getline(3).
-
---- scsilib/libschily/stdio/fgetline.c.orig 2004-08-08 20:02:05.000000000 +0900
-+++ scsilib/libschily/stdio/fgetline.c
-@@ -64,7 +64,7 @@ fgetline(f, buf, len)
- }
-
- EXPORT int
--getline(buf, len)
-+get_line(buf, len)
- char *buf;
- int len;
- {
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-aw
--- a/sysutils/cdrdao/patches/patch-aw Thu Nov 15 01:05:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2011/07/08 18:18:16 drochner Exp $
-
---- xdao/SoundIF-ao.cc.orig 2005-04-22 02:01:49.000000000 +0000
-+++ xdao/SoundIF-ao.cc
-@@ -18,6 +18,7 @@
- */
-
- #include <ao/ao.h>
-+#include <string.h>
-
- #include "SoundIF.h"
- #include "Sample.h"
-@@ -37,6 +38,7 @@ SoundIF::SoundIF()
-
- impl_ = new SoundIFImpl;
- impl_->driverId = ao_default_driver_id();
-+ memset(&impl_->format, 0, sizeof(impl_->format));
- impl_->format.bits = 16;
- impl_->format.rate = 44100;
- impl_->format.channels = 2;
diff -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-dao_CdrDriver.cc
--- a/sysutils/cdrdao/patches/patch-dao_CdrDriver.cc Thu Nov 15 01:05:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-dao_CdrDriver.cc,v 1.1 2015/11/03 19:08:45 joerg Exp $
-
---- dao/CdrDriver.cc.orig 2015-11-03 11:23:52.000000000 +0000
-+++ dao/CdrDriver.cc
-@@ -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 -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-dao_CdrDriver.h
--- a/sysutils/cdrdao/patches/patch-dao_CdrDriver.h Thu Nov 15 01:05:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-dao_CdrDriver.h,v 1.1 2015/11/03 19:08:45 joerg Exp $
-
---- dao/CdrDriver.h.orig 2015-11-03 11:24:08.000000000 +0000
-+++ dao/CdrDriver.h
-@@ -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 -r 62c979812438 -r 4d05bd6e1f8c sysutils/cdrdao/patches/patch-xdao_CdDevice.cc
--- a/sysutils/cdrdao/patches/patch-xdao_CdDevice.cc Thu Nov 15 01:05:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-xdao_CdDevice.cc,v 1.1 2015/11/03 19:08:45 joerg Exp $
-
---- xdao/CdDevice.cc.orig 2015-11-03 11:26:42.000000000 +0000
-+++ xdao/CdDevice.cc
-@@ -255,7 +255,7 @@ int CdDevice::updateStatus()
-
- bool CdDevice::updateProgress(Glib::IOCondition cond, int fd)
- {
-- static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
Home |
Main Index |
Thread Index |
Old Index