Skip to contentSkip to conversation

package/libpagekite: bump to version 0.91.190530

PATCH New Fabrice Fontaine 2 participants 2 messages Oct 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libpagekite: bump to version 0.91.190530

- Remove all patches (already in version)
- In order for the libpagekite version to match what is given by release-monitoring.org, the 'v' prefix should be encoded in LIBPAGEKITE_SITE and not LIBPAGEKITE_VERSION.

---
 ...01-configure.ac-fix-handling-of-with.patch |  76 ----------
 ...-use-AS_HELP_STRING-for-with-openssl.patch |  28 ----
 ...figure.ac-use-pkg-config-for-openssl.patch | 137 ------------------
 package/libpagekite/libpagekite.hash          |   2 +-
 package/libpagekite/libpagekite.mk            |   5 +-
 5 files changed, 3 insertions(+), 245 deletions(-)
 delete mode 100644 package/libpagekite/0001-configure.ac-fix-handling-of-with.patch
 delete mode 100644 package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch
 delete mode 100644 package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch
package/libpagekite/0001-configure.ac-fix-handling-of-with.patch deleted +0 -76
deleted file mode 100644
index 342b7d50a3..0000000000
@@ -1,76 +0,0 @@
-From dbb7ea56148949412b18770967022455f3e5cb63 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
-Date: Fri, 16 Feb 2018 11:45:21 +0100
-Subject: [PATCH] configure.ac: fix handling of --with-*
-
-The 'action-if-given' argument of AC_ARG_WITH is executed whenever the
---with- or --without- option is given. Setting e.g. with_tests=yes in
-that branch causes the argument '--without-tests' to *enable* the tests
-instead of disabling them.
-
-In most cases, the third and fourth argument can simply be skipped
-since they are optional. We only need them in the cases where we use a
-different variable than with_foo, or where we want to default to yes
-instead of defaulting to empty.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
-
-Upstream status: pull request sent:
-  https://github.com/pagekite/libpagekite/pull/49
----
- configure.ac | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index aa4eb9c..130752a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,18 +34,15 @@ AC_ARG_WITH(openssl,[  --with-openssl=DIR    Use optional openssl libs and inclu
- 
- AC_ARG_WITH(tests,
- 	[AS_HELP_STRING([--with-tests],
--		[Compile libpagekite unit tests])],
--		[with_tests=yes], [])
-+		[Compile libpagekite unit tests])])
- 
- AC_ARG_WITH(debug-traces,
- 	[AS_HELP_STRING([--with-debug-traces],
--		[Compile libpagekite debug function traces])],
--		[with_debug_traces=yes], [])
-+		[Compile libpagekite debug function traces])])
- 
- AC_ARG_WITH(debug-canaries,
- 	[AS_HELP_STRING([--with-debug-canaries],
--		[Compile libpagekite debug memory canaries])],
--		[with_debug_canaries=yes], [])
-+		[Compile libpagekite debug memory canaries])])
- 
- AC_ARG_WITH(lua,
- 	[AS_HELP_STRING([--without-lua],
-@@ -55,7 +52,7 @@ AC_ARG_WITH(lua,
- AC_ARG_WITH(os-libev,
- 	[AS_HELP_STRING([--without-os-libev],
- 		[Use embedded libev, not the OS-provided library])],
--		[use_libev=no], [])
-+		[use_libev="$withval"], [])
- 
- AC_ARG_WITH(ipv6,
- 	[AS_HELP_STRING([--without-ipv6],
-@@ -70,12 +67,12 @@ AC_ARG_WITH(java,
- AC_ARG_WITH(agpl-relay,
- 	[AS_HELP_STRING([--with-agpl-relay],
- 		[Compile libpagekite relay support (AGPLv3 code)])],
--		[with_relay=yes], [with_relay=no])
-+		[with_relay="$withval"], [with_relay=no])
- 
- AC_ARG_WITH(ds-logfmt,
- 	[AS_HELP_STRING([--with-ds-logfmt],
- 		[Compile libpagekite with DigitalSTROM log format.])],
--		[with_ds_logfmt=yes], [with_ds_logfmt=no])
-+		[with_ds_logfmt="$withval"], [with_ds_logfmt=no])
- 
- 
- # Checks for programs.
--- 
-2.15.1
-
package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch deleted +0 -28
deleted file mode 100644
index f72127b117..0000000000
@@ -1,28 +0,0 @@
-From cb20efae0e2ca86dd48c603b61d9c20225ebcd3d Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
-Date: Fri, 16 Feb 2018 12:06:28 +0100
-Subject: [PATCH] configure.ac: use AS_HELP_STRING for --with-openssl
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
----
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 130752a..4874c0b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,9 @@ use_openssl="yes"
- use_libev="yes"
- 
- specialssldir=""
--AC_ARG_WITH(openssl,[  --with-openssl=DIR    Use optional openssl libs and includes from [DIR]/lib/ and [DIR]/include/openssl/],
-+AC_ARG_WITH(openssl,
-+	[AS_HELP_STRING([--with-openssl=DIR],
-+		[Use optional openssl libs and includes from [DIR]/lib/ and [DIR]/include/openssl/])],
- [  case "$with_openssl" in
-   yes)
-   ;;
--- 
-2.15.1
-
package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch deleted +0 -137

137 lines not on this page · raw message

package/libpagekite/libpagekite.hash +1 -1
index 262adc7aab..8716b991ca 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  df95bfe95c04b6908e835e13444c1c1883765926f1265e0d2223c42d3c59a4c2  libpagekite-v0.91.171102.tar.gz
+sha256  c812815aae6f100212b7d6f662370a0634151fabb59f028126a59c4083a6d26d  libpagekite-0.91.190530.tar.gz
 
 # License files, locally calculated
 sha256  ba443b9c9d4273d06aae3e147e9ad1ec199cc9c23455f486a039536d47f57eed  doc/COPYING.md
package/libpagekite/libpagekite.mk +2 -3
index 2c143ba022..60b62f5cfd 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBPAGEKITE_VERSION = v0.91.171102
-LIBPAGEKITE_SITE = $(call github,pagekite,libpagekite,$(LIBPAGEKITE_VERSION))
+LIBPAGEKITE_VERSION = 0.91.190530
+LIBPAGEKITE_SITE = $(call github,pagekite,libpagekite,v$(LIBPAGEKITE_VERSION))
 
 # pkrelay is AGPL-3.0+ but is not built
 LIBPAGEKITE_LICENSE = Apache-2.0 or AGPL-3.0+
@@ -15,7 +15,6 @@ LIBPAGEKITE_DEPENDENCIES = host-pkgconf libev openssl
 LIBPAGEKITE_INSTALL_STAGING = YES
 
 # Sources from git, no configure included
-# 0001-configure.ac-fix-handling-of-with-os-libev.patch touches configure.ac
 LIBPAGEKITE_AUTORECONF = YES
 
 LIBPAGEKITE_CONF_OPTS = \
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/libpagekite: bump to version 0.91.190530

Quoted 6 lines · On Sat, 5 Oct 2019 18:08:05 +0200 Fabrice Fontaine…

- Remove all patches (already in version)
- In order for the libpagekite version to match what is given by release-monitoring.org, the 'v' prefix should be encoded in LIBPAGEKITE_SITE and not LIBPAGEKITE_VERSION.

Quoted 10 lines
---
 ...01-configure.ac-fix-handling-of-with.patch |  76 ----------
 ...-use-AS_HELP_STRING-for-with-openssl.patch |  28 ----
 ...figure.ac-use-pkg-config-for-openssl.patch | 137 ------------------
 package/libpagekite/libpagekite.hash          |   2 +-
 package/libpagekite/libpagekite.mk            |   5 +-
 5 files changed, 3 insertions(+), 245 deletions(-)
 delete mode 100644 package/libpagekite/0001-configure.ac-fix-handling-of-with.patch
 delete mode 100644 package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch
 delete mode 100644 package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com