CVS commit: pkgsrc/databases/redis

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases/redis
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Fri, 6 Oct 2023 07:27:44 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Oct  6 07:27:44 UTC 2023

Modified Files:
        pkgsrc/databases/redis: Makefile distinfo
        pkgsrc/databases/redis/files: redis.sh
        pkgsrc/databases/redis/patches: patch-redis.conf patch-src_Makefile
            patch-src_object.c
Added Files:
        pkgsrc/databases/redis/patches: patch-src_config.h

Log Message:
redis: Fix build on Darwin

pkgsrc changes:
---------------
  * Fix building for macOS 13.5.2 by applying upstream patch:
    https://github.com/redis/redis/issues/12585
  * Use USE_CC_FEATURES to set c99 standard as recommanded by pkglint.
  * Fix rc.d script for systems without /etc/rc.subr and using
    pkgtools/rc.subr with SYSCONFBASE different from /etc.
  * Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/databases/redis/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/databases/redis/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/redis/files/redis.sh
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/redis/patches/patch-redis.conf
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/redis/patches/patch-src_Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/databases/redis/patches/patch-src_config.h
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/redis/patches/patch-src_object.c

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

Modified files:

Index: pkgsrc/databases/redis/Makefile
diff -u pkgsrc/databases/redis/Makefile:1.83 pkgsrc/databases/redis/Makefile:1.84
--- pkgsrc/databases/redis/Makefile:1.83        Wed Sep 13 17:24:37 2023
+++ pkgsrc/databases/redis/Makefile     Fri Oct  6 07:27:43 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2023/09/13 17:24:37 adam Exp $
+# $NetBSD: Makefile,v 1.84 2023/10/06 07:27:43 triaxx Exp $
 
 DISTNAME=      redis-7.2.1
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://download.redis.io/releases/
 
@@ -11,10 +12,11 @@ LICENSE=    modified-bsd
 
 TEST_DEPENDS+= tcl>=8.5:../../lang/tcl
 
-USE_LANGUAGES= c99
-USE_TOOLS+=    gmake pkg-config
+USE_LANGUAGES=         c
+USE_CC_FEATURES=       c99
+USE_TOOLS+=            gmake pkg-config
 # Don't let LTO kick in as it is not supported on all platforms.
-MAKE_ENV+=     OPTIMIZATION=${DBG:U-O2:Q}
+MAKE_ENV+=             OPTIMIZATION=${DBG:U-O2:Q}
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/databases/redis/distinfo
diff -u pkgsrc/databases/redis/distinfo:1.76 pkgsrc/databases/redis/distinfo:1.77
--- pkgsrc/databases/redis/distinfo:1.76        Wed Sep 13 17:24:37 2023
+++ pkgsrc/databases/redis/distinfo     Fri Oct  6 07:27:43 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.76 2023/09/13 17:24:37 adam Exp $
+$NetBSD: distinfo,v 1.77 2023/10/06 07:27:43 triaxx Exp $
 
 BLAKE2s (redis-7.2.1.tar.gz) = 26ab440123afe57ec32f39306757e88fd5cb2499f283f3a46bd56851bd89faaa
 SHA512 (redis-7.2.1.tar.gz) = 7df4afd51dceea0edbb999027c84820a6aebdd58d71b2e93a4861120fa2b9c0801a0e61c70e695845dbff4e9b96907a4215dcacf72d3593ad014cfa584b5cad0
 Size (redis-7.2.1.tar.gz) = 3383319 bytes
-SHA1 (patch-redis.conf) = ee657a9d82711263ceb0fb8f7d8059ed23528fe9
-SHA1 (patch-src_Makefile) = 2c23fb065e827e0cb25fdfba1bc1976db03dc789
+SHA1 (patch-redis.conf) = a16fd0c559c9fbe0237b719d92a59259ae19c41a
+SHA1 (patch-src_Makefile) = 2408fc02e294f16db8ec2e339f0025164695cfcf
+SHA1 (patch-src_config.h) = 46d434465269977b7897c025c2d6f72b3b736de1
 SHA1 (patch-src_hyperloglog.c) = e9bdd3c630024a6fbe02c2c1d85e26131ad938cf
-SHA1 (patch-src_object.c) = 30ffaec9c7e6135e3a5576cd1a35d7bcec668299
+SHA1 (patch-src_object.c) = 1c200ab9cf71498dbf5610da5ba07223d5817f6e

Index: pkgsrc/databases/redis/files/redis.sh
diff -u pkgsrc/databases/redis/files/redis.sh:1.5 pkgsrc/databases/redis/files/redis.sh:1.6
--- pkgsrc/databases/redis/files/redis.sh:1.5   Fri Dec  2 05:51:26 2022
+++ pkgsrc/databases/redis/files/redis.sh       Fri Oct  6 07:27:43 2023
@@ -1,14 +1,12 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: redis.sh,v 1.5 2022/12/02 05:51:26 triaxx Exp $
+# $NetBSD: redis.sh,v 1.6 2023/10/06 07:27:43 triaxx Exp $
 #
 # PROVIDE: redis
 # REQUIRE: DAEMON NETWORKING
 # KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
-fi
+$_rc_subr_loaded . @SYSCONFBASE@/rc.subr
 
 name="redis"
 rcvar=$name
@@ -16,7 +14,7 @@ command="@PREFIX@/bin/redis-server"
 redis_user="@REDIS_USER@"
 redis_flags="@PKG_SYSCONFDIR@/redis.conf"
 
-if [ -f /etc/rc.subr ]; then
+if [ -f @SYSCONFBASE@/rc.subr ]; then
         load_rc_config $name
        run_rc_command "$1"
 else

Index: pkgsrc/databases/redis/patches/patch-redis.conf
diff -u pkgsrc/databases/redis/patches/patch-redis.conf:1.2 pkgsrc/databases/redis/patches/patch-redis.conf:1.3
--- pkgsrc/databases/redis/patches/patch-redis.conf:1.2 Mon Mar  1 13:19:19 2021
+++ pkgsrc/databases/redis/patches/patch-redis.conf     Fri Oct  6 07:27:44 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-redis.conf,v 1.2 2021/03/01 13:19:19 adam Exp $
+$NetBSD: patch-redis.conf,v 1.3 2023/10/06 07:27:44 triaxx Exp $
 
 Sane defaults for the config file.
 
 --- redis.conf.orig    2021-02-22 21:23:58.000000000 +0000
 +++ redis.conf
-@@ -244,7 +244,7 @@ tcp-keepalive 300
+@@ -306,7 +306,7 @@ tcp-keepalive 300
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
  # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
  # When Redis is supervised by upstart or systemd, this parameter has no impact.
@@ -13,7 +13,7 @@ Sane defaults for the config file.
  
  # If you run Redis from upstart or systemd, Redis can interact with your
  # supervision tree. Options:
-@@ -276,7 +276,7 @@ daemonize no
+@@ -338,7 +338,7 @@ daemonize no
  #
  # Note that on modern Linux systems "/run/redis.pid" is more conforming
  # and should be used instead.
@@ -22,7 +22,7 @@ Sane defaults for the config file.
  
  # Specify the server verbosity level.
  # This can be one of:
-@@ -289,7 +289,7 @@ loglevel notice
+@@ -352,7 +352,7 @@ loglevel notice
  # Specify the log file name. Also the empty string can be used to force
  # Redis to log on the standard output. Note that if you use standard
  # output for logging but daemonize, logs will be sent to /dev/null
@@ -31,7 +31,7 @@ Sane defaults for the config file.
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -441,7 +441,7 @@ rdb-del-sync-files no
+@@ -507,7 +507,7 @@ rdb-del-sync-files no
  # The Append Only File will also be created inside this directory.
  #
  # Note that you must specify a directory here, not a file name.

Index: pkgsrc/databases/redis/patches/patch-src_Makefile
diff -u pkgsrc/databases/redis/patches/patch-src_Makefile:1.6 pkgsrc/databases/redis/patches/patch-src_Makefile:1.7
--- pkgsrc/databases/redis/patches/patch-src_Makefile:1.6       Tue Nov 22 19:11:11 2022
+++ pkgsrc/databases/redis/patches/patch-src_Makefile   Fri Oct  6 07:27:44 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_Makefile,v 1.6 2022/11/22 19:11:11 adam Exp $
+$NetBSD: patch-src_Makefile,v 1.7 2023/10/06 07:27:44 triaxx Exp $
 
 Add DESTDIR support.
 Fix NetBSD support.
 
---- src/Makefile.orig  2022-09-21 19:42:01.000000000 +0000
+--- src/Makefile.orig  2023-09-06 17:56:15.000000000 +0000
 +++ src/Makefile
-@@ -47,8 +47,8 @@ else
+@@ -56,8 +56,8 @@ else
  endif
  
  PREFIX?=/usr/local
@@ -16,7 +16,7 @@ Fix NetBSD support.
  PKG_CONFIG?=pkg-config
  
  ifndef PYTHON
-@@ -178,6 +178,10 @@ ifeq ($(uname_S),NetBSD)
+@@ -182,6 +182,10 @@ ifeq ($(uname_S),NetBSD)
            FINAL_LIBS+= -lexecinfo
        endif
  else
@@ -27,11 +27,11 @@ Fix NetBSD support.
  ifeq ($(uname_S),FreeBSD)
        # FreeBSD
        FINAL_LIBS+= -lpthread -lexecinfo
-@@ -213,6 +217,7 @@ endif
+@@ -210,6 +214,7 @@ else
  endif
  endif
  endif
 +endif
- 
- ifdef OPENSSL_PREFIX
-       OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include
+ endif
+ endif
+ endif

Index: pkgsrc/databases/redis/patches/patch-src_object.c
diff -u pkgsrc/databases/redis/patches/patch-src_object.c:1.3 pkgsrc/databases/redis/patches/patch-src_object.c:1.4
--- pkgsrc/databases/redis/patches/patch-src_object.c:1.3       Mon Apr 13 11:33:35 2015
+++ pkgsrc/databases/redis/patches/patch-src_object.c   Fri Oct  6 07:27:44 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_object.c,v 1.3 2015/04/13 11:33:35 fhajny Exp $
+$NetBSD: patch-src_object.c,v 1.4 2023/10/06 07:27:44 triaxx Exp $
 
 Add MirBSD support.
 
 --- src/object.c.orig  2015-04-01 14:01:44.000000000 +0000
 +++ src/object.c
-@@ -32,7 +32,7 @@
+@@ -34,7 +34,7 @@
  #include <math.h>
  #include <ctype.h>
  

Added files:

Index: pkgsrc/databases/redis/patches/patch-src_config.h
diff -u /dev/null pkgsrc/databases/redis/patches/patch-src_config.h:1.3
--- /dev/null   Fri Oct  6 07:27:44 2023
+++ pkgsrc/databases/redis/patches/patch-src_config.h   Fri Oct  6 07:27:44 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_config.h,v 1.3 2023/10/06 07:27:44 triaxx Exp $
+
+Fix building on Darwin from
+https://github.com/redis/redis/issues/12585#issuecomment-1729243412
+
+--- src/config.h.orig  2023-09-06 17:56:15.000000000 +0000
++++ src/config.h
+@@ -31,6 +31,7 @@
+ #define __CONFIG_H
+ 
+ #ifdef __APPLE__
++#define _DARWIN_C_SOURCE
+ #include <fcntl.h> // for fcntl(fd, F_FULLFSYNC)
+ #include <AvailabilityMacros.h>
+ #endif

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

Home | Main Index | Thread Index | Old Index