[ptxdist] [PATCH v2 1/3] redis: version bump 6.2.6 -> 7.2.2

[ptxdist] [PATCH v2 1/3] redis: version bump 6.2.6 -> 7.2.2

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../0001-Support-systemd-and-set-a-data-directory.patch     | 6 +++---
 patches/{redis-6.2.6 => redis-7.2.2}/series                 | 0
 rules/redis.make                                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename patches/{redis-6.2.6 => redis-7.2.2}/0001-Support-systemd-and-set-a-data-directory.patch (87%)
 rename patches/{redis-6.2.6 => redis-7.2.2}/series (100%)

diff --git a/patches/redis-6.2.6/0001-Support-systemd-and-set-a-data-directory.patch b/patches/redis-7.2.2/0001-Support-systemd-and-set-a-data-directory.patch
similarity index 87%
rename from patches/redis-6.2.6/0001-Support-systemd-and-set-a-data-directory.patch
rename to patches/redis-7.2.2/0001-Support-systemd-and-set-a-data-directory.patch
index 34d8fd283..dde2a41a6 100644
--- a/patches/redis-6.2.6/0001-Support-systemd-and-set-a-data-directory.patch
+++ b/patches/redis-7.2.2/0001-Support-systemd-and-set-a-data-directory.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Support systemd and set a data directory
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/redis.conf b/redis.conf
-index e8eff2774981..8f76ea1c84e4 100644
+index 97f077b0d0aa..abc03980de3e 100644
 --- a/redis.conf
 +++ b/redis.conf
-@@ -272,7 +272,7 @@ daemonize no
+@@ -324,7 +324,7 @@ daemonize no
  # The default is "no". To run under upstart/systemd, you can simply uncomment
  # the line below:
  #
@@ -19,7 +19,7 @@ index e8eff2774981..8f76ea1c84e4 100644
  
  # If a pid file is specified, Redis writes it where specified at startup
  # and removes it at exit.
-@@ -451,7 +451,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.
diff --git a/patches/redis-6.2.6/series b/patches/redis-7.2.2/series
similarity index 100%
rename from patches/redis-6.2.6/series
rename to patches/redis-7.2.2/series
diff --git a/rules/redis.make b/rules/redis.make
index 88b300921..d0c9bec48 100644
--- a/rules/redis.make
+++ b/rules/redis.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_REDIS) += redis
 #
 # Paths and names
 #
-REDIS_VERSION		:= 6.2.6
-REDIS_MD5		:= f69ca96b39ca93001add922d558f9842
+REDIS_VERSION		:= 7.2.2
+REDIS_MD5		:= 5ece867a53b30f31266a2130fd10568d
 REDIS			:= redis-$(REDIS_VERSION)
 REDIS_SUFFIX		:= tar.gz
 REDIS_URL		:= https://download.redis.io/releases/$(REDIS).$(REDIS_SUFFIX)
-- 
2.42.0

[ptxdist] [PATCH v2 2/3] hiredis: version bump 1.0.2 -> 1.2.0

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/hiredis.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/hiredis.make b/rules/hiredis.make
index c0d183a36..cac7304d4 100644
--- a/rules/hiredis.make
+++ b/rules/hiredis.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HIREDIS) += hiredis
 #
 # Paths and names
 #
-HIREDIS_VERSION		:= 1.0.2
-HIREDIS_MD5		:= 58e8313188f66ed1be1c220d14a7752e
+HIREDIS_VERSION		:= 1.2.0
+HIREDIS_MD5		:= 119767d178cfa79718a80c83e0d0e849
 HIREDIS			:= hiredis-$(HIREDIS_VERSION)
 HIREDIS_SUFFIX		:= tar.gz
 HIREDIS_URL		:= https://github.com/redis/hiredis/archive/v$(HIREDIS_VERSION).$(HIREDIS_SUFFIX)
-- 
2.42.0

[ptxdist] [PATCH v2 3/3] minisign: new package

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/minisign.in   | 13 +++++++++++
 rules/minisign.make | 57 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 rules/minisign.in
 create mode 100644 rules/minisign.make

diff --git a/rules/minisign.in b/rules/minisign.in
new file mode 100644
index 000000000..d1efe3b45
--- /dev/null
+++ b/rules/minisign.in
@@ -0,0 +1,13 @@
+## SECTION=applications
+
+config MINISIGN
+	tristate
+	prompt "minisign"
+	select HOST_CMAKE
+	select GCCLIBS_GCC_S
+	select LIBC_M
+	select LIBSODIUM
+	help
+	  Minisign is a dead simple tool to sign files and verify signatures.
+	  It is portable, lightweight, and uses the highly secure Ed25519
+	  public-key signature system.
diff --git a/rules/minisign.make b/rules/minisign.make
new file mode 100644
index 000000000..a90cad200
--- /dev/null
+++ b/rules/minisign.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Clemens Gruber <clemens.gruber@pqgruber.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_MINISIGN) += minisign
+
+#
+# Paths and names
+#
+MINISIGN_VERSION	:= 0.11
+MINISIGN_MD5		:= 1565d40ec75b9602e84379c9f1e96371
+MINISIGN		:= minisign-$(MINISIGN_VERSION)
+MINISIGN_SUFFIX		:= tar.gz
+MINISIGN_URL		:= https://github.com/jedisct1/minisign/archive/refs/tags/$(MINISIGN_VERSION).$(MINISIGN_SUFFIX)
+MINISIGN_SOURCE		:= $(SRCDIR)/$(MINISIGN).$(MINISIGN_SUFFIX)
+MINISIGN_DIR		:= $(BUILDDIR)/$(MINISIGN)
+MINISIGN_LICENSE	:= ISC
+MINISIGN_LICENSE_FILES	:= file://LICENSE;md5=ae8e10a2c8237f13943f14fa3ffe437a
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+MINISIGN_CONF_TOOL	:= cmake
+MINISIGN_CONF_OPT	:= \
+	$(CROSS_CMAKE_USR)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/minisign.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init,  minisign)
+	@$(call install_fixup, minisign,PRIORITY,optional)
+	@$(call install_fixup, minisign,SECTION,base)
+	@$(call install_fixup, minisign,AUTHOR,"Clemens Gruber <clemens.gruber@pqgruber.com>")
+	@$(call install_fixup, minisign,DESCRIPTION,missing)
+
+	@$(call install_copy, minisign, 0, 0, 0755, -, /usr/bin/minisign)
+
+	@$(call install_finish, minisign)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.42.0

Re: [ptxdist] [APPLIED] redis: version bump 6.2.6 -> 7.2.2

[Michael Olbrich]

Thanks, applied as 97cf98cb1b922081b35ed0efd2004aa899530fbe.

Michael

[sent from post-receive hook]

On Fri, 10 Nov 2023 08:25:06 +0100, Clemens Gruber <clemens.gruber@pqgruber.com> wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> Message-Id: <20231028114643.1437-1-clemens.gruber@pqgruber.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/redis-6.2.6/0001-Support-systemd-and-set-a-data-directory.patch b/patches/redis-7.2.2/0001-Support-systemd-and-set-a-data-directory.patch
> similarity index 87%
> rename from patches/redis-6.2.6/0001-Support-systemd-and-set-a-data-directory.patch
> rename to patches/redis-7.2.2/0001-Support-systemd-and-set-a-data-directory.patch
> index 34d8fd283bfc..dde2a41a6400 100644
> --- a/patches/redis-6.2.6/0001-Support-systemd-and-set-a-data-directory.patch
> +++ b/patches/redis-7.2.2/0001-Support-systemd-and-set-a-data-directory.patch
> @@ -7,10 +7,10 @@ Subject: [PATCH] Support systemd and set a data directory
>   1 file changed, 2 insertions(+), 2 deletions(-)
>  
>  diff --git a/redis.conf b/redis.conf
> -index e8eff2774981..8f76ea1c84e4 100644
> +index 97f077b0d0aa..abc03980de3e 100644
>  --- a/redis.conf
>  +++ b/redis.conf
> -@@ -272,7 +272,7 @@ daemonize no
> +@@ -324,7 +324,7 @@ daemonize no
>   # The default is "no". To run under upstart/systemd, you can simply uncomment
>   # the line below:
>   #
> @@ -19,7 +19,7 @@ index e8eff2774981..8f76ea1c84e4 100644
>   
>   # If a pid file is specified, Redis writes it where specified at startup
>   # and removes it at exit.
> -@@ -451,7 +451,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.
> diff --git a/patches/redis-6.2.6/series b/patches/redis-7.2.2/series
> similarity index 100%
> rename from patches/redis-6.2.6/series
> rename to patches/redis-7.2.2/series
> diff --git a/rules/redis.make b/rules/redis.make
> index 88b300921811..d0c9bec489fb 100644
> --- a/rules/redis.make
> +++ b/rules/redis.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_REDIS) += redis
>  #
>  # Paths and names
>  #
> -REDIS_VERSION		:= 6.2.6
> -REDIS_MD5		:= f69ca96b39ca93001add922d558f9842
> +REDIS_VERSION		:= 7.2.2
> +REDIS_MD5		:= 5ece867a53b30f31266a2130fd10568d
>  REDIS			:= redis-$(REDIS_VERSION)
>  REDIS_SUFFIX		:= tar.gz
>  REDIS_URL		:= https://download.redis.io/releases/$(REDIS).$(REDIS_SUFFIX)

Re: [ptxdist] [APPLIED] hiredis: version bump 1.0.2 -> 1.2.0

[Michael Olbrich]

Thanks, applied as 68f56bd1dab9aca1fbdb92b6d8eff1047bad8347.

Michael

[sent from post-receive hook]

On Fri, 10 Nov 2023 08:25:07 +0100, Clemens Gruber <clemens.gruber@pqgruber.com> wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> Message-Id: <20231028114643.1437-2-clemens.gruber@pqgruber.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/hiredis.make b/rules/hiredis.make
> index c0d183a36e29..cac7304d4591 100644
> --- a/rules/hiredis.make
> +++ b/rules/hiredis.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HIREDIS) += hiredis
>  #
>  # Paths and names
>  #
> -HIREDIS_VERSION		:= 1.0.2
> -HIREDIS_MD5		:= 58e8313188f66ed1be1c220d14a7752e
> +HIREDIS_VERSION		:= 1.2.0
> +HIREDIS_MD5		:= 119767d178cfa79718a80c83e0d0e849
>  HIREDIS			:= hiredis-$(HIREDIS_VERSION)
>  HIREDIS_SUFFIX		:= tar.gz
>  HIREDIS_URL		:= https://github.com/redis/hiredis/archive/v$(HIREDIS_VERSION).$(HIREDIS_SUFFIX)

Re: [ptxdist] [APPLIED] minisign: new package

[Michael Olbrich]

Thanks, applied as 6a1353dc1081f34c5c5e710c3359fa402065fbf6.

Michael

[sent from post-receive hook]

On Fri, 10 Nov 2023 08:25:08 +0100, Clemens Gruber <clemens.gruber@pqgruber.com> wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> Message-Id: <20231028114643.1437-3-clemens.gruber@pqgruber.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/minisign.in b/rules/minisign.in
> new file mode 100644
> index 000000000000..d1efe3b45b1c
> --- /dev/null
> +++ b/rules/minisign.in
> @@ -0,0 +1,13 @@
> +## SECTION=applications
> +
> +config MINISIGN
> +	tristate
> +	prompt "minisign"
> +	select HOST_CMAKE
> +	select GCCLIBS_GCC_S
> +	select LIBC_M
> +	select LIBSODIUM
> +	help
> +	  Minisign is a dead simple tool to sign files and verify signatures.
> +	  It is portable, lightweight, and uses the highly secure Ed25519
> +	  public-key signature system.
> diff --git a/rules/minisign.make b/rules/minisign.make
> new file mode 100644
> index 000000000000..a90cad2008f6
> --- /dev/null
> +++ b/rules/minisign.make
> @@ -0,0 +1,57 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Clemens Gruber <clemens.gruber@pqgruber.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_MINISIGN) += minisign
> +
> +#
> +# Paths and names
> +#
> +MINISIGN_VERSION	:= 0.11
> +MINISIGN_MD5		:= 1565d40ec75b9602e84379c9f1e96371
> +MINISIGN		:= minisign-$(MINISIGN_VERSION)
> +MINISIGN_SUFFIX		:= tar.gz
> +MINISIGN_URL		:= https://github.com/jedisct1/minisign/archive/refs/tags/$(MINISIGN_VERSION).$(MINISIGN_SUFFIX)
> +MINISIGN_SOURCE		:= $(SRCDIR)/$(MINISIGN).$(MINISIGN_SUFFIX)
> +MINISIGN_DIR		:= $(BUILDDIR)/$(MINISIGN)
> +MINISIGN_LICENSE	:= ISC
> +MINISIGN_LICENSE_FILES	:= file://LICENSE;md5=ae8e10a2c8237f13943f14fa3ffe437a
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# cmake
> +#
> +MINISIGN_CONF_TOOL	:= cmake
> +MINISIGN_CONF_OPT	:= \
> +	$(CROSS_CMAKE_USR)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/minisign.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init,  minisign)
> +	@$(call install_fixup, minisign,PRIORITY,optional)
> +	@$(call install_fixup, minisign,SECTION,base)
> +	@$(call install_fixup, minisign,AUTHOR,"Clemens Gruber <clemens.gruber@pqgruber.com>")
> +	@$(call install_fixup, minisign,DESCRIPTION,missing)
> +
> +	@$(call install_copy, minisign, 0, 0, 0755, -, /usr/bin/minisign)
> +
> +	@$(call install_finish, minisign)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make