conserver: update to version 8.2.7

version 8.2.7 (July 7, 2022):
        - configure.ac: autoconf-2.70 fix (Lars Wendler <polynomial-c@gentoo.org>)
        - Add high baud rates (Peter Chubb <Peter.Chubb@data61.csiro.au>)
        - Make compile --with-ipv6 & setproctitle (Bjoern A. Zeeb <patch@zabbadoz.net>)
        - conserver.cf: devicesubst add 'b' for baud rate (Bjoern A. Zeeb <patch@zabbadoz.net>)
        - Reflect that baud values have increased to 7 digits (Bjoern A. Zeeb <patch@zabbadoz.net>)
        - cirrus-ci: move to freebsd-13-0 (Bryan Stansell <bryan@stansell.org>)
        - configure.ac: support libgssapi_krb5 (Jiri Kastner <cz172638@gmail.com>)

Drop upstreamed patch 000-100-backport-config-macro-fix.patch

Signed-off-by: Bjørn Mork <bjorn@mork.no>
This commit is contained in:
Bjørn Mork
2023-09-21 19:47:07 +02:00
committed by Hannu Nyman
parent b8a04addb1
commit 86a2b342de
3 changed files with 5 additions and 32 deletions

View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=conserver
PKG_VERSION:=8.2.6
PKG_RELEASE:=3
PKG_VERSION:=8.2.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/conserver/conserver/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=1c8b86f123d2d8e3ce568b782087b43dfac9cf6ffd5a9bdfcfdc6718d749a923
PKG_HASH:=b88f1880f4090b42370e075ca9c8a6062fb553ee33f155b204714c43dc71cef3
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE

View File

@@ -1,27 +0,0 @@
From ce3b4f1d000c75ace2be2be83a0cc0df84ff6983
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 12 Jan 2021 18:18:23 +0100
Subject: [PATCH] configure.ac: autoconf-2.70 fix
Gentoo-bug: https://bugs.gentoo.org/750230
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/configure.ac
+++ b/configure.ac
@@ -30,11 +30,11 @@ AH_TEMPLATE([TRUST_UDS_CRED], [Defined i
dnl ### Normal initialization. ######################################
AC_INIT([conserver],m4_esyscmd_s([./gen-version number]))
-AC_PREREQ(2.59)
+AC_PREREQ(2.69)
AC_CONFIG_SRCDIR([conserver/main.c])
AC_CONFIG_HEADER(config.h)
-AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $@")
+AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $*")
dnl ### Set some option defaults. ###################################
if test -z "$CFLAGS"; then

View File

@@ -1,6 +1,6 @@
--- a/conserver/consent.c
+++ b/conserver/consent.c
@@ -1269,7 +1269,7 @@ AddrsMatch(char *addr1, char *addr2)
@@ -1308,7 +1308,7 @@ AddrsMatch(char *addr1, char *addr2)
{
#if USE_IPV6
int error, ret = 0;
@@ -9,7 +9,7 @@
#else
/* so, since we might use inet_addr, we're going to use
* (in_addr_t)(-1) as a sign of an invalid ip address.
@@ -1307,17 +1307,19 @@ AddrsMatch(char *addr1, char *addr2)
@@ -1346,17 +1346,19 @@ AddrsMatch(char *addr1, char *addr2)
goto done;
}