From cf9c2acd668a4ada2933396ac83bc1a7cd3f18fc Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 17 Mar 2019 23:39:59 +0000 Subject: [PATCH] update to conserver-8.2.3 --- comms/conserver/Makefile | 7 +++---- comms/conserver/distinfo | 4 ++-- comms/conserver/patches/patch-configure_in | 6 +++++- comms/conserver/patches/patch-conserver_consent_c | 6 +++--- comms/conserver/patches/patch-conserver_cutil_c | 15 +++++++++------ comms/conserver/patches/patch-conserver_main_c | 4 ++-- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile index f740a1103a7..9b3643349ad 100644 --- a/comms/conserver/Makefile +++ b/comms/conserver/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.67 2019/02/26 15:31:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.68 2019/03/17 23:39:59 sthen Exp $ COMMENT= manage remote serial consoles via TCP/IP -V= 8.2.2 -REVISION= 5 +V= 8.2.3 DISTNAME= conserver-$V CATEGORIES= comms @@ -21,7 +20,7 @@ FLAVOR?= MASTER_SITES= https://github.com/conserver/conserver/releases/download/v$V/ -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION= 2.69 CONFIGURE_STYLE= autoconf CONFIGURE_ARGS= --with-master=localhost \ --with-pidfile=${LOCALSTATEDIR}/run/conserver/conserver.pid diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo index fc72b96b431..d2fdf616fa8 100644 --- a/comms/conserver/distinfo +++ b/comms/conserver/distinfo @@ -1,2 +1,2 @@ -SHA256 (conserver-8.2.2.tar.gz) = BeoWk7+StCrS8Kk4nGA1LM01wuqTyPyOYY0BUzYqfYE= -SIZE (conserver-8.2.2.tar.gz) = 329048 +SHA256 (conserver-8.2.3.tar.gz) = dkRDsnmAR/dCl0dRDusyByQCYFkFUXANE9u62KW97gg= +SIZE (conserver-8.2.3.tar.gz) = 329825 diff --git a/comms/conserver/patches/patch-configure_in b/comms/conserver/patches/patch-configure_in index 2bddc70a818..a2e2aada217 100644 --- a/comms/conserver/patches/patch-configure_in +++ b/comms/conserver/patches/patch-configure_in @@ -1,4 +1,8 @@ -$OpenBSD: patch-configure_in,v 1.6 2018/05/29 13:54:05 sthen Exp $ +$OpenBSD: patch-configure_in,v 1.7 2019/03/17 23:39:59 sthen Exp $ + +- support SO_PEERCRED as well as ucred +- use pkgconfig for freeipmi bits + --- configure.in.orig Thu Apr 17 22:55:38 2014 +++ configure.in Thu Jul 30 16:52:11 2015 @@ -413,14 +413,14 @@ AC_ARG_WITH(uds, diff --git a/comms/conserver/patches/patch-conserver_consent_c b/comms/conserver/patches/patch-conserver_consent_c index 642ad579ac1..07aeaf91610 100644 --- a/comms/conserver/patches/patch-conserver_consent_c +++ b/comms/conserver/patches/patch-conserver_consent_c @@ -1,8 +1,8 @@ -$OpenBSD: patch-conserver_consent_c,v 1.6 2018/05/29 13:54:05 sthen Exp $ +$OpenBSD: patch-conserver_consent_c,v 1.7 2019/03/17 23:39:59 sthen Exp $ Index: conserver/consent.c --- conserver/consent.c.orig +++ conserver/consent.c -@@ -519,7 +519,8 @@ SetupTty(CONSENT *pCE, int fd) +@@ -527,7 +527,8 @@ SetupTty(CONSENT *pCE, int fd) if (0 != tcgetattr(1, &n_tio)) { exit(EX_OSERR); } @@ -12,7 +12,7 @@ Index: conserver/consent.c n_tio.c_iflag |= ICRNL; if (pCE->ixon == FLAGTRUE) n_tio.c_iflag |= IXON; -@@ -527,10 +528,8 @@ SetupTty(CONSENT *pCE, int fd) +@@ -535,10 +536,8 @@ SetupTty(CONSENT *pCE, int fd) n_tio.c_iflag |= IXANY; if (pCE->ixoff == FLAGTRUE) n_tio.c_iflag |= IXOFF; diff --git a/comms/conserver/patches/patch-conserver_cutil_c b/comms/conserver/patches/patch-conserver_cutil_c index 057f025f131..f04220c40b2 100644 --- a/comms/conserver/patches/patch-conserver_cutil_c +++ b/comms/conserver/patches/patch-conserver_cutil_c @@ -1,8 +1,11 @@ -$OpenBSD: patch-conserver_cutil_c,v 1.6 2018/05/29 13:54:05 sthen Exp $ +$OpenBSD: patch-conserver_cutil_c,v 1.7 2019/03/17 23:39:59 sthen Exp $ + +fix unaligned access on strict-alignment 64-bit + Index: conserver/cutil.c --- conserver/cutil.c.orig +++ conserver/cutil.c -@@ -1843,7 +1843,7 @@ ProbeInterfaces(in_addr_t bindAddr) +@@ -1845,7 +1845,7 @@ ProbeInterfaces(in_addr_t bindAddr) { # ifdef SIOCGIFCONF struct ifconf ifc; @@ -11,7 +14,7 @@ Index: conserver/cutil.c # ifdef SIOCGIFFLAGS struct ifreq ifrcopy; # endif -@@ -1912,7 +1912,7 @@ ProbeInterfaces(in_addr_t bindAddr) +@@ -1914,7 +1914,7 @@ ProbeInterfaces(in_addr_t bindAddr) * than loop through looking for valid interfaces that are up * twice, huh? */ @@ -20,7 +23,7 @@ Index: conserver/cutil.c CONDDEBUG((1, "ProbeInterfaces(): ifc_len==%d max_count==%d", ifc.ifc_len, count)); -@@ -1931,17 +1931,17 @@ ProbeInterfaces(in_addr_t bindAddr) +@@ -1933,17 +1933,17 @@ ProbeInterfaces(in_addr_t bindAddr) for (m = r = 0; r < ifc.ifc_len;) { struct sockaddr *sa; @@ -44,7 +47,7 @@ Index: conserver/cutil.c if (sa->sa_family == AF_INET) { struct sockaddr_in *sin = (struct sockaddr_in *)sa; -@@ -1962,14 +1962,14 @@ ProbeInterfaces(in_addr_t bindAddr) +@@ -1964,14 +1964,14 @@ ProbeInterfaces(in_addr_t bindAddr) # ifdef SIOCGIFFLAGS /* make sure the interface is up */ @@ -61,7 +64,7 @@ Index: conserver/cutil.c # if HAVE_MEMCPY memcpy(&myAddrs[m], &(sin->sin_addr), sizeof(struct in_addr)); -@@ -1978,7 +1978,7 @@ ProbeInterfaces(in_addr_t bindAddr) +@@ -1980,7 +1980,7 @@ ProbeInterfaces(in_addr_t bindAddr) # endif Verbose("interface address %s (%s)", inet_ntoa(myAddrs[m]), diff --git a/comms/conserver/patches/patch-conserver_main_c b/comms/conserver/patches/patch-conserver_main_c index 0032f9c8146..6cfd81ea684 100644 --- a/comms/conserver/patches/patch-conserver_main_c +++ b/comms/conserver/patches/patch-conserver_main_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-conserver_main_c,v 1.3 2019/02/25 19:53:16 sthen Exp $ +$OpenBSD: patch-conserver_main_c,v 1.4 2019/03/17 23:39:59 sthen Exp $ -- enable "setproctitle" option by default, for more information ps listings +- enable "setproctitle" option by default, for more information in ps listings - libressl doesn't support @SECLEVEL=0 Index: conserver/main.c