CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Thu, 15 Nov 2018 01:13:02 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Nov 15 01:13:02 UTC 2018

Modified Files:
        pkgsrc/sysutils/cdrdao: Makefile Makefile.common distinfo
        pkgsrc/sysutils/cdrdao/patches: patch-ah patch-ai patch-aj
            patch-xdao_SampleDisplay.cc
        pkgsrc/sysutils/gcdmaster: Makefile
Removed Files:
        pkgsrc/sysutils/cdrdao/patches: patch-aq patch-ar patch-as patch-aw
            patch-dao_CdrDriver.cc patch-dao_CdrDriver.h patch-xdao_CdDevice.cc
            patch-xdao_CdDevice.h

Log Message:
{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)


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/cdrdao/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/cdrdao/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/cdrdao/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/cdrdao/patches/patch-ah \
    pkgsrc/sysutils/cdrdao/patches/patch-aj
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/cdrdao/patches/patch-ai
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/cdrdao/patches/patch-aq \
    pkgsrc/sysutils/cdrdao/patches/patch-ar \
    pkgsrc/sysutils/cdrdao/patches/patch-as \
    pkgsrc/sysutils/cdrdao/patches/patch-dao_CdrDriver.cc \
    pkgsrc/sysutils/cdrdao/patches/patch-dao_CdrDriver.h \
    pkgsrc/sysutils/cdrdao/patches/patch-xdao_CdDevice.cc \
    pkgsrc/sysutils/cdrdao/patches/patch-xdao_CdDevice.h
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/cdrdao/patches/patch-aw
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc
cvs rdiff -u -r1.89 -r1.90 pkgsrc/sysutils/gcdmaster/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/cdrdao/Makefile
diff -u pkgsrc/sysutils/cdrdao/Makefile:1.36 pkgsrc/sysutils/cdrdao/Makefile:1.37
--- pkgsrc/sysutils/cdrdao/Makefile:1.36        Tue Dec 29 05:06:06 2015
+++ pkgsrc/sysutils/cdrdao/Makefile     Thu Nov 15 01:13:01 2018
@@ -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

Index: pkgsrc/sysutils/cdrdao/Makefile.common
diff -u pkgsrc/sysutils/cdrdao/Makefile.common:1.15 pkgsrc/sysutils/cdrdao/Makefile.common:1.16
--- pkgsrc/sysutils/cdrdao/Makefile.common:1.15 Thu Jun 16 12:58:07 2016
+++ pkgsrc/sysutils/cdrdao/Makefile.common      Thu Nov 15 01:13:01 2018
@@ -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 @@ COMMENT=              Records audio or data CD-Rs in
 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++

Index: pkgsrc/sysutils/cdrdao/distinfo
diff -u pkgsrc/sysutils/cdrdao/distinfo:1.29 pkgsrc/sysutils/cdrdao/distinfo:1.30
--- pkgsrc/sysutils/cdrdao/distinfo:1.29        Tue Feb 14 21:22:43 2017
+++ pkgsrc/sysutils/cdrdao/distinfo     Thu Nov 15 01:13:01 2018
@@ -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

Index: pkgsrc/sysutils/cdrdao/patches/patch-ah
diff -u pkgsrc/sysutils/cdrdao/patches/patch-ah:1.2 pkgsrc/sysutils/cdrdao/patches/patch-ah:1.3
--- pkgsrc/sysutils/cdrdao/patches/patch-ah:1.2 Sun Jan 10 05:39:30 2010
+++ pkgsrc/sysutils/cdrdao/patches/patch-ah     Thu Nov 15 01:13:02 2018
@@ -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;
Index: pkgsrc/sysutils/cdrdao/patches/patch-aj
diff -u pkgsrc/sysutils/cdrdao/patches/patch-aj:1.2 pkgsrc/sysutils/cdrdao/patches/patch-aj:1.3
--- pkgsrc/sysutils/cdrdao/patches/patch-aj:1.2 Sun Nov 22 21:05:18 2009
+++ pkgsrc/sysutils/cdrdao/patches/patch-aj     Thu Nov 15 01:13:02 2018
@@ -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>.
   */

Index: pkgsrc/sysutils/cdrdao/patches/patch-ai
diff -u pkgsrc/sysutils/cdrdao/patches/patch-ai:1.4 pkgsrc/sysutils/cdrdao/patches/patch-ai:1.5
--- pkgsrc/sysutils/cdrdao/patches/patch-ai:1.4 Sun Nov 22 21:05:18 2009
+++ pkgsrc/sysutils/cdrdao/patches/patch-ai     Thu Nov 15 01:13:02 2018
@@ -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 @@ $NetBSD: patch-ai,v 1.4 2009/11/22 21:05
              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
             ;;
  

Index: pkgsrc/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc
diff -u pkgsrc/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc:1.1 pkgsrc/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc:1.2
--- pkgsrc/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc:1.1      Tue Feb 14 21:22:43 2017
+++ pkgsrc/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc  Thu Nov 15 01:13:02 2018
@@ -1,25 +1,7 @@
-$NetBSD: patch-xdao_SampleDisplay.cc,v 1.1 2017/02/14 21:22:43 joerg Exp $
+$NetBSD: patch-xdao_SampleDisplay.cc,v 1.2 2018/11/15 01:13:02 markd Exp $
 
---- xdao/SampleDisplay.cc.orig 2017-02-09 17:06:36.365008002 +0000
-+++ xdao/SampleDisplay.cc
-@@ -768,7 +768,7 @@ bool SampleDisplay::handleLeaveEvent(Gdk
- void SampleDisplay::redraw(gint x, gint y, gint width, gint height,
-                          int drawMask)
- {
--  if (pixmap_ == 0)
-+  if (!pixmap_)
-     return;
- 
-   get_window()->draw_drawable(drawGc_, pixmap_, x, y, x, y, width, height);
-@@ -820,7 +820,7 @@ void SampleDisplay::updateSamples()
- 
-   Toc *toc = tocEdit_->toc();
- 
--  if (pixmap_ == 0)
-+  if (!pixmap_)
-     return;
- 
-   gint halfHeight = chanHeight_ / 2;
+--- gcdmaster/SampleDisplay.cc.orig    2017-02-09 17:06:36.365008002 +0000
++++ gcdmaster/SampleDisplay.cc
 @@ -1025,9 +1025,6 @@ void SampleDisplay::updateSamples()
  
        }
@@ -30,21 +12,3 @@ $NetBSD: patch-xdao_SampleDisplay.cc,v 1
        if (0 && (gint)di < sampleEndX_) {
          pos = sampleBuf[len -1].left() * halfHeight;
          pos /= SHRT_MAX;
-@@ -1084,7 +1081,7 @@ void SampleDisplay::updateSamples()
- 
- void SampleDisplay::drawCursor(gint x)
- {
--  if (pixmap_ == 0)
-+  if (!pixmap_)
-     return;
- 
-   if (x < sampleStartX_ || x > sampleEndX_)
-@@ -1118,7 +1115,7 @@ void SampleDisplay::drawTimeTick(gint x,
- {
-   char buf[50];
- 
--  if (pixmap_ == 0)
-+  if (!pixmap_)
-     return;
- 
-   unsigned long min = sample / (60 * 44100);

Index: pkgsrc/sysutils/gcdmaster/Makefile
diff -u pkgsrc/sysutils/gcdmaster/Makefile:1.89 pkgsrc/sysutils/gcdmaster/Makefile:1.90
--- pkgsrc/sysutils/gcdmaster/Makefile:1.89     Wed Nov 14 22:22:24 2018
+++ pkgsrc/sysutils/gcdmaster/Makefile  Thu Nov 15 01:13:02 2018
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2018/11/14 22:22:24 kleink Exp $
+# $NetBSD: Makefile,v 1.90 2018/11/15 01:13:02 markd Exp $
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
-PKGREVISION=   41
-
 PKGNAME=       gcdmaster-${CDRDAO_VER}
 COMMENT=       Gnome UI frontend to cdrdao
 
@@ -12,11 +10,11 @@ DEPENDS+=   cdrdao-${CDRDAO_VER}{,nb*}:../
 WRKSRC=                ${WRKDIR}/cdrdao-${CDRDAO_VER}
 
 CONFIGURE_ARGS+=       --without-posix-threads
-CONFIGURE_ARGS+=       --with-xdao
+CONFIGURE_ARGS+=       --with-gcdmaster
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/applications share/pixmaps
 USE_LANGUAGES+=                c++11
 USE_TOOLS+=            pkg-config
-INSTALL_DIRS=          xdao
+INSTALL_DIRS=          gcdmaster
 GCONF_SCHEMAS=         gcdmaster.schemas
 
 .include "../../devel/libsigc++/buildlink3.mk"

Prev by Date: CVS commit: pkgsrc/mk/platform
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/mk/platform
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index