CVS commit: pkgsrc/ham/fldigi

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Fri Jul 13 04:14:48 UTC 2018

Modified Files:
        pkgsrc/ham/fldigi: Makefile distinfo
Added Files:
        pkgsrc/ham/fldigi/patches: patch-src_rigcontrol_hamlib.cxx

Log Message:
ham/fldigi: fix crash loading hamlib

The c++ std::sort comparator was being used incorrectly


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/ham/fldigi/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/ham/fldigi/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx

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

Modified files:

Index: pkgsrc/ham/fldigi/Makefile
diff -u pkgsrc/ham/fldigi/Makefile:1.104 pkgsrc/ham/fldigi/Makefile:1.105
--- pkgsrc/ham/fldigi/Makefile:1.104    Fri Jul  6 15:06:47 2018
+++ pkgsrc/ham/fldigi/Makefile  Fri Jul 13 04:14:48 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2018/07/06 15:06:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.105 2018/07/13 04:14:48 dbj Exp $
 
 DISTNAME=      fldigi-4.0.16
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    ham
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fldigi/}
 

Index: pkgsrc/ham/fldigi/distinfo
diff -u pkgsrc/ham/fldigi/distinfo:1.64 pkgsrc/ham/fldigi/distinfo:1.65
--- pkgsrc/ham/fldigi/distinfo:1.64     Sun Feb 18 14:57:55 2018
+++ pkgsrc/ham/fldigi/distinfo  Fri Jul 13 04:14:48 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2018/02/18 14:57:55 mef Exp $
+$NetBSD: distinfo,v 1.65 2018/07/13 04:14:48 dbj Exp $
 
 SHA1 (fldigi-4.0.16.tar.gz) = 0933d28cafd6a4c0121a27946c877e88cca69130
 RMD160 (fldigi-4.0.16.tar.gz) = d8152033e7bd4aa3d5f507be8d443af87ec278b7
@@ -6,3 +6,4 @@ SHA512 (fldigi-4.0.16.tar.gz) = cb8eb7eb
 Size (fldigi-4.0.16.tar.gz) = 3727379 bytes
 SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60
 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
+SHA1 (patch-src_rigcontrol_hamlib.cxx) = 69c56c1acb756f2fd2d97d4022e714fad451233c

Added files:

Index: pkgsrc/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx
diff -u /dev/null pkgsrc/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx:1.1
--- /dev/null   Fri Jul 13 04:14:49 2018
+++ pkgsrc/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx   Fri Jul 13 04:14:48 2018
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_rigcontrol_hamlib.cxx,v 1.1 2018/07/13 04:14:48 dbj Exp $
+
+The C++ std::sort requires the comparator return false when items are equal
+
+--- src/rigcontrol/hamlib.cxx.orig     2017-11-08 12:41:13.000000000 +0000
++++ src/rigcontrol/hamlib.cxx
+@@ -582,10 +582,10 @@ static bool rig_cmp(const struct rig_cap
+       if (ret < 0) return true;
+       ret = strcasecmp(rig1->model_name, rig2->model_name);
+       if (ret > 0) return false;
+-      if (ret <= 0) return true;
+-      if (rig1->rig_model > rig2->rig_model)
+-              return false;
+-      return true;
++      if (ret < 0) return true;
++      if (rig1->rig_model < rig2->rig_model)
++              return true;
++      return false;
+ }
+ 
+ void hamlib_get_rigs(void)