CVS commit: pkgsrc/audio/mserv

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Mon Jun  6 12:12:47 UTC 2022

Modified Files:
        pkgsrc/audio/mserv: Makefile distinfo
        pkgsrc/audio/mserv/patches: patch-ab patch-af patch-ah patch-ai
            patch-aj

Log Message:
Fix handling of 64bit time_t on 32bit archs


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/audio/mserv/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/mserv/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/mserv/patches/patch-ab
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/mserv/patches/patch-af
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/mserv/patches/patch-ah
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/mserv/patches/patch-ai \
    pkgsrc/audio/mserv/patches/patch-aj

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

Modified files:

Index: pkgsrc/audio/mserv/Makefile
diff -u pkgsrc/audio/mserv/Makefile:1.48 pkgsrc/audio/mserv/Makefile:1.49
--- pkgsrc/audio/mserv/Makefile:1.48    Mon May 24 19:49:05 2021
+++ pkgsrc/audio/mserv/Makefile Mon Jun  6 12:12:47 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2021/05/24 19:49:05 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2022/06/06 12:12:47 martin Exp $
 
 DISTNAME=      mserv-0.35
-PKGREVISION=   23
+PKGREVISION=   24
 CATEGORIES=    audio
 #MASTER_SITES= http://www.mserv.org/download/
 

Index: pkgsrc/audio/mserv/distinfo
diff -u pkgsrc/audio/mserv/distinfo:1.24 pkgsrc/audio/mserv/distinfo:1.25
--- pkgsrc/audio/mserv/distinfo:1.24    Tue Oct 26 09:59:16 2021
+++ pkgsrc/audio/mserv/distinfo Mon Jun  6 12:12:47 2022
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.24 2021/10/26 09:59:16 nia Exp $
+$NetBSD: distinfo,v 1.25 2022/06/06 12:12:47 martin Exp $
 
 BLAKE2s (mserv-0.35.tar.gz) = 15632e1699de751d1abb8383a88d5750b664a579bed43b11e39e4a5114c54750
 SHA512 (mserv-0.35.tar.gz) = a79340fc6ea02cf14dd0c223cf0d9feb5805b9e88d3dc1f4c854edbd9b8fe98c60b89c10555aa4214e153b17452c088dfde7700a5357a2c1a43c22af5d44255f
 Size (mserv-0.35.tar.gz) = 280299 bytes
 SHA1 (patch-aa) = 3756e6b338ad8501daa258237868e9ef2d96cb49
-SHA1 (patch-ab) = 91d6840eae30182343db97d3f67d23d0c423dbe7
+SHA1 (patch-ab) = 9af5228184a77db548baebb7f5a2cc640ec1ccf7
 SHA1 (patch-ac) = 068b14b4a8a0ce4dcb19e0cd28fc6a7296f86dad
 SHA1 (patch-ad) = 105edf313c2101f0961aab8a94022a5a0d07eb22
 SHA1 (patch-ae) = c0bf4f40fd027c94e057d2444bf9e2a7ac60b942
-SHA1 (patch-af) = 1ce6b64c155f141607a7f43fd3f823bb415a7fdc
+SHA1 (patch-af) = 32d8639e8d666d36908929121eb457cb0bd7ab46
 SHA1 (patch-ag) = 7d5fae48c89db4b9bdccf371528c3b3e890455a9
-SHA1 (patch-ah) = c089ae56f23c83291a1e9b5502b952cd58be4860
-SHA1 (patch-ai) = 2a0adae9f5ad8810960dc4e4fecf1e03633f0421
-SHA1 (patch-aj) = 445d110b1a820909b940b5c036de13a2679b064c
+SHA1 (patch-ah) = b04d87fbcbd9ebfbbd0f3d0f1d9734e781077fc7
+SHA1 (patch-ai) = 169c6a90727cdc5a2044837414b5615eabd89cc7
+SHA1 (patch-aj) = c8d5642737733c7a246d7f74f9a319a88d35ecef

Index: pkgsrc/audio/mserv/patches/patch-ab
diff -u pkgsrc/audio/mserv/patches/patch-ab:1.8 pkgsrc/audio/mserv/patches/patch-ab:1.9
--- pkgsrc/audio/mserv/patches/patch-ab:1.8     Fri Feb 20 00:41:16 2004
+++ pkgsrc/audio/mserv/patches/patch-ab Mon Jun  6 12:12:47 2022
@@ -1,13 +1,54 @@
-$NetBSD: patch-ab,v 1.8 2004/02/20 00:41:16 abs Exp $
+$NetBSD: patch-ab,v 1.9 2022/06/06 12:12:47 martin Exp $
 
 --- mserv/cmd.c.orig   Sat Aug  2 15:26:19 2003
 +++ mserv/cmd.c
-@@ -51,7 +51,7 @@ met:
+@@ -49,9 +49,20 @@ met:
+ #include <ctype.h>
+ #include <stdlib.h>
  #include <math.h>
++
  #include "mserv.h"
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#define       TIME_T_PRI_CAST uint64_t
++#define       TIME_T_PRI      PRIu64
++#else
++#define       TIME_T_PRI_CAST unsigned long
++#define       TIME_T_PRI      "lu"
++#endif
++
  #include "misc.h"
 -#include "soundcard.h"
 +#include "mservsoundcard.h"
  #include "acl.h"
  #include "filter.h"
  #include "cmd.h"
+@@ -2534,11 +2545,11 @@ static void mserv_cmd_info(t_client *cl,
+   rate = mserv_getrate(ru, track);
+   snprintf(year, sizeof(year), "%d", track->year);
+   mserv_response(cl, "INFT",
+-               "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%d\t%s\t%.1f\t%.1f\t"
++               "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%" TIME_T_PRI "\t%s\t%.1f\t%.1f\t"
+                "%s\t%s\t%s\t%d:%02d.%d\t%s",
+                track->n_album, track->n_track, album->author, album->name,
+                track->author, track->name, track->year ? year : "unknown",
+-               track->lastplay, ago, 100*track->prating, 100*track->rating,
++               (TIME_T_PRI_CAST)track->lastplay, ago, 100*track->prating, 100*track->rating,
+                mserv_ratestr(rate), track->genres,
+                track->filterok ? "included" : "excluded",
+                (track->duration/100)/60, (track->duration/100) % 60,
+@@ -2547,11 +2558,11 @@ static void mserv_cmd_info(t_client *cl,
+     for (i = 1; i <= 11; i++) {
+       sprintf(token, "INFT%d", i);
+       mserv_response(cl, token,
+-                   "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%d\t%s\t%.1f\t%.1f\t"
++                   "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%" TIME_T_PRI "\t%s\t%.1f\t%.1f\t"
+                    "%s\t%s\t%s\t%d:%02d.%d\t%s",
+                    track->n_album, track->n_track, album->author,
+                    album->name, track->author, track->name,
+-                   track->year ? year : "unknown", track->lastplay,
++                   track->year ? year : "unknown", (TIME_T_PRI_CAST)track->lastplay,
+                    ago, 100*track->prating, 100*track->rating,
+                    mserv_ratestr(rate), track->genres,
+                    track->filterok ? "included" : "excluded",

Index: pkgsrc/audio/mserv/patches/patch-af
diff -u pkgsrc/audio/mserv/patches/patch-af:1.10 pkgsrc/audio/mserv/patches/patch-af:1.11
--- pkgsrc/audio/mserv/patches/patch-af:1.10    Tue Feb  7 09:44:22 2012
+++ pkgsrc/audio/mserv/patches/patch-af Mon Jun  6 12:12:47 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.10 2012/02/07 09:44:22 martin Exp $
+$NetBSD: patch-af,v 1.11 2022/06/06 12:12:47 martin Exp $
 
 --- mserv/mserv.c.orig 2003-08-03 16:57:20.000000000 +0200
 +++ mserv/mserv.c      2012-02-07 10:39:02.000000000 +0100
-@@ -62,12 +62,17 @@
+@@ -62,12 +62,27 @@ met:
  #include <sys/ioctl.h>
  #include <time.h>
  
@@ -12,6 +12,16 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
 +#endif
 +
  #include "mserv.h"
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#define       TIME_T_PRI_CAST uint64_t
++#define       TIME_T_PRI      PRIu64
++#else
++#define       TIME_T_PRI_CAST unsigned long
++#define       TIME_T_PRI      "lu"
++#endif
++
  #include "misc.h"
  #include "cmd.h"
  #include "acl.h"
@@ -21,18 +31,21 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
  #include "defconf.h"
  #include "conf.h"
  #include "opt.h"
-@@ -79,6 +84,10 @@
+@@ -79,6 +94,13 @@ met:
  # define MIN(X,Y) (((X) < (Y)) ? (X) : (Y))
  #endif
  
 +#ifndef HAVE_STRLCPY
 +#define strlcpy strncpy
 +#endif
++#ifndef HAVE_STRTOUMAX
++#define       strtoumax strtoul
++#endif
 +
  extern char *optarg;
  extern int optind;
  /* extern int getopt(int, char *const *, const char *); */ /* sunos ;( */
-@@ -131,7 +140,8 @@
+@@ -131,7 +153,8 @@ static void mserv_vresponse(t_client *cl
  static void mserv_scandir(void);
  static void mserv_scandir_recurse(const char *pathname);
  static t_track *mserv_loadtrk(const char *filename);
@@ -42,7 +55,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
  static int album_insertsort(t_album *album);
  static t_author *mserv_authorlist(void);
  static int author_insertsort(t_author **list, t_author *author);
-@@ -224,7 +234,7 @@
+@@ -224,7 +247,7 @@ int main(int argc, char *argv[])
    int i;
    struct protoent *protocol;
    struct sockaddr_in sin;
@@ -51,7 +64,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
    int flags;
    char *mserv_root = NULL;
    char *mserv_conf = NULL;
-@@ -292,7 +302,7 @@
+@@ -292,7 +315,7 @@ int main(int argc, char *argv[])
             ps->pw_dir[strlen(ps->pw_dir)-1] == '/' ? "" : "/");
    } else {
      /* copy out of environment */
@@ -60,7 +73,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
        fprintf(stderr, "%s: out of memory\n", progname);
        exit(1);
      }
-@@ -305,7 +315,7 @@
+@@ -305,7 +328,7 @@ int main(int argc, char *argv[])
      l--;
    mserv_root[l] = '\0';
    if (!mserv_conf) {
@@ -69,7 +82,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
        fprintf(stderr, "%s: out of memory\n", progname);
        exit(1);
      }
-@@ -427,8 +437,13 @@
+@@ -427,8 +450,13 @@ int main(int argc, char *argv[])
   
    if (mserv_verbose && mserv_port)
      printf("Port set via command line options to %d\n", mserv_port);
@@ -84,7 +97,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
    if (mserv_socket == -1) {
      mserv_log("Socket error '%s'", strerror(errno));
      mserv_closedown(1);
-@@ -1624,6 +1639,7 @@
+@@ -1624,6 +1652,7 @@ static void mserv_scandir_recurse(const 
    int i;
    t_album *album;
    int flag = 0;
@@ -92,7 +105,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
  
    /* pathname is "" or "directory/" or "directory/directory/..." */
  
-@@ -1686,22 +1702,32 @@
+@@ -1686,22 +1715,32 @@ static void mserv_scandir_recurse(const 
        toomany = 1;
        break;
      }
@@ -126,7 +139,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
      return;
    qsort(tracks, TRACKSPERALBUM, sizeof(t_track *),
        mserv_trackcompare_filename);
-@@ -1815,7 +1841,7 @@
+@@ -1815,7 +1854,7 @@ static int mserv_trackcompare_rating(con
    }
  }
  
@@ -135,7 +148,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
  {
    FILE *fd;
    char fullpath[MAXFNAME];
-@@ -1899,8 +1925,13 @@
+@@ -1899,8 +1938,13 @@ static t_album *mserv_loadalbum(const ch
        return NULL;
      mtime = time(NULL);
    }
@@ -151,7 +164,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
    if (!*name) {
      if (!*filename || !*(filename+1)) {
        strcpy(name, "rootdir");
-@@ -2019,11 +2050,13 @@
+@@ -2019,11 +2063,13 @@ static t_track *mserv_loadtrk(const char
        alen = strlen(buffer);
        if (buffer[alen-1] != '\n') {
        mserv_log("Line %d too long in '%s'", line, fullpath_trk);
@@ -165,7 +178,16 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
        return NULL;
        }
        strncpy(token, buffer, l);
-@@ -2059,6 +2092,7 @@
+@@ -2043,7 +2089,7 @@ static t_track *mserv_loadtrk(const char
+         /* ignore old line */
+         modified = 1;
+       } else if (!stricmp(token, "_lastplay")) {
+-        lastplay = atol(value);
++        lastplay = (time_t)strtoumax(value, NULL, 10);
+       } else if (!stricmp(token, "_duration")) {
+         duration = atol(value);
+       } else if (!stricmp(token, "_miscinfo")) {
+@@ -2059,6 +2105,7 @@ static t_track *mserv_loadtrk(const char
        }
        if ((arate = malloc(sizeof(t_rating)+strlen(token)+1)) == NULL) {
          mserv_log("Out of memory creating ratings for '%s'", fullpath_trk);
@@ -173,7 +195,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
          return NULL;
        }
        memset(arate, 0, sizeof(t_rating));
-@@ -2082,15 +2116,18 @@
+@@ -2082,15 +2129,18 @@ static t_track *mserv_loadtrk(const char
      }
      if (!*author) {
        mserv_log("No author specified in '%s'", fullpath_trk);
@@ -192,7 +214,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
        return NULL;
      }
      mtime = buf.st_mtime;
-@@ -2098,8 +2135,17 @@
+@@ -2098,8 +2148,17 @@ static t_track *mserv_loadtrk(const char
    }
    if (duration == 0 && !*miscinfo) {
      len = strlen(fullpath_file);
@@ -210,7 +232,7 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
        if (duration == -1) {
        mserv_log("Unable to determine details of mp3 '%s': %s",
                  filename, strerror(errno));
-@@ -2719,7 +2765,7 @@
+@@ -2719,7 +2778,7 @@ t_album *mserv_checkdisk_album(t_album *
    }
    if (buf.st_mtime == album->mtime)
      return album;
@@ -219,7 +241,16 @@ $NetBSD: patch-af,v 1.10 2012/02/07 09:4
      mserv_log("Unable to re-load '%s'", album->filename);
      return album;
    }
-@@ -3430,3 +3476,59 @@
+@@ -2762,7 +2821,7 @@ int mserv_savechanges(void)
+     fprintf(fd, "_name=%s\n", track->name);
+     fprintf(fd, "_year=%d\n", track->year);
+     fprintf(fd, "_genres=%s\n", track->genres);
+-    fprintf(fd, "_lastplay=%lu\n", (unsigned long int)track->lastplay);
++    fprintf(fd, "_lastplay=%" TIME_T_PRI "\n", (TIME_T_PRI_CAST)track->lastplay);
+     fprintf(fd, "_duration=%lu\n", track->duration);
+     fprintf(fd, "_miscinfo=%s\n", track->miscinfo);
+     for (rate = track->ratings; rate; rate = rate->next) {
+@@ -3430,3 +3489,59 @@ int mserv_setmixer(t_client *cl, int wha
  }
  
  #endif

Index: pkgsrc/audio/mserv/patches/patch-ah
diff -u pkgsrc/audio/mserv/patches/patch-ah:1.6 pkgsrc/audio/mserv/patches/patch-ah:1.7
--- pkgsrc/audio/mserv/patches/patch-ah:1.6     Sun Sep 12 05:08:28 2004
+++ pkgsrc/audio/mserv/patches/patch-ah Mon Jun  6 12:12:47 2022
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.6 2004/09/12 05:08:28 minskim Exp $
+$NetBSD: patch-ah,v 1.7 2022/06/06 12:12:47 martin Exp $
 
 --- configure.ac.orig  2003-08-03 09:57:19.000000000 -0500
 +++ configure.ac
-@@ -90,7 +90,7 @@ dnl Checks for typedefs, structures, and
+@@ -90,7 +90,7 @@
  
  dnl Checks for functions
  
 -  AC_CHECK_FUNCS(strsep)
-+  AC_CHECK_FUNCS(strsep strlcpy)
++  AC_CHECK_FUNCS(strsep strlcpy strtoumax)
  
  dnl Engine selection
  

Index: pkgsrc/audio/mserv/patches/patch-ai
diff -u pkgsrc/audio/mserv/patches/patch-ai:1.5 pkgsrc/audio/mserv/patches/patch-ai:1.6
--- pkgsrc/audio/mserv/patches/patch-ai:1.5     Sun Sep 12 05:08:28 2004
+++ pkgsrc/audio/mserv/patches/patch-ai Mon Jun  6 12:12:47 2022
@@ -1,13 +1,22 @@
-$NetBSD: patch-ai,v 1.5 2004/09/12 05:08:28 minskim Exp $
+$NetBSD: patch-ai,v 1.6 2022/06/06 12:12:47 martin Exp $
 
 --- configure.orig     2003-08-03 09:57:19.000000000 -0500
 +++ configure
-@@ -9316,7 +9316,7 @@ esac
+@@ -9316,7 +9316,7 @@
  
  
  
 -for ac_func in strsep
-+for ac_func in strsep strlcpy
++for ac_func in strsep strlcpy strtoumax
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -9896,6 +9896,8 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++      : Avoid regenerating within pkgsrc
++      exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
Index: pkgsrc/audio/mserv/patches/patch-aj
diff -u pkgsrc/audio/mserv/patches/patch-aj:1.5 pkgsrc/audio/mserv/patches/patch-aj:1.6
--- pkgsrc/audio/mserv/patches/patch-aj:1.5     Sun Sep 12 05:08:28 2004
+++ pkgsrc/audio/mserv/patches/patch-aj Mon Jun  6 12:12:47 2022
@@ -1,14 +1,17 @@
-$NetBSD: patch-aj,v 1.5 2004/09/12 05:08:28 minskim Exp $
+$NetBSD: patch-aj,v 1.6 2022/06/06 12:12:47 martin Exp $
 
 --- config.h.in.orig   2003-08-03 09:57:19.000000000 -0500
 +++ config.h.in
-@@ -27,6 +27,9 @@
+@@ -27,6 +27,12 @@
  /* Define to 1 if you have the `strsep' function. */
  #undef HAVE_STRSEP
  
 +/* Define to 1 if you have the `strlcpy' function. */
 +#undef HAVE_STRLCPY
 +
++/* Define to 1 if you have the `strtoumax' function. */
++#undef HAVE_STRTOUMAX
++
  /* Define to 1 if you have the <sys/soundcard.h> header file. */
  #undef HAVE_SYS_SOUNDCARD_H