update to conserver-8.2.5
This commit is contained in:
parent
3ad0144521
commit
a08ab8d5c4
@ -1,10 +1,9 @@
|
|||||||
# $OpenBSD: Makefile,v 1.71 2019/06/03 16:06:50 sthen Exp $
|
# $OpenBSD: Makefile,v 1.72 2020/05/14 11:43:24 sthen Exp $
|
||||||
|
|
||||||
COMMENT= manage remote serial consoles via TCP/IP
|
COMMENT= manage remote serial consoles via TCP/IP
|
||||||
|
|
||||||
V= 8.2.4
|
V= 8.2.5
|
||||||
DISTNAME= conserver-$V
|
DISTNAME= conserver-$V
|
||||||
REVISION= 0
|
|
||||||
CATEGORIES= comms
|
CATEGORIES= comms
|
||||||
|
|
||||||
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
|
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
|
||||||
@ -21,8 +20,7 @@ FLAVOR?=
|
|||||||
|
|
||||||
MASTER_SITES= https://github.com/conserver/conserver/releases/download/v$V/
|
MASTER_SITES= https://github.com/conserver/conserver/releases/download/v$V/
|
||||||
|
|
||||||
AUTOCONF_VERSION= 2.69
|
CONFIGURE_STYLE= gnu
|
||||||
CONFIGURE_STYLE= autoconf
|
|
||||||
CONFIGURE_ARGS= --with-master=localhost \
|
CONFIGURE_ARGS= --with-master=localhost \
|
||||||
--with-pidfile=${LOCALSTATEDIR}/run/conserver/conserver.pid
|
--with-pidfile=${LOCALSTATEDIR}/run/conserver/conserver.pid
|
||||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
SHA256 (conserver-8.2.4.tar.gz) = pZHqu0q7YyMi0vMFii8L1lAnVAaamaFT7+LW0FvZf28=
|
SHA256 (conserver-8.2.5.tar.gz) = fbGS8wQSbX5cFUIcTIPNXAgDny8rPGGymY5xiBrkfuo=
|
||||||
SIZE (conserver-8.2.4.tar.gz) = 432854
|
SIZE (conserver-8.2.5.tar.gz) = 434260
|
||||||
|
@ -1,69 +0,0 @@
|
|||||||
$OpenBSD: patch-configure_ac,v 1.2 2019/03/27 23:38:19 sthen Exp $
|
|
||||||
|
|
||||||
From 956a6181147df7d3bb310e86a2b52e54a68cb08f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stuart Henderson <stu@spacehopper.org>
|
|
||||||
Date: Wed, 27 Mar 2019 10:40:31 +0000
|
|
||||||
Subject: [PATCH] support SO_PEERCRED as well as ucred
|
|
||||||
|
|
||||||
Index: configure.ac
|
|
||||||
--- configure.ac.orig
|
|
||||||
+++ configure.ac
|
|
||||||
@@ -416,14 +416,14 @@ AC_ARG_WITH(uds,
|
|
||||||
AC_TRY_COMPILE([#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>],
|
|
||||||
[
|
|
||||||
-struct ucred u;
|
|
||||||
+struct sockpeercred u;
|
|
||||||
u.uid = 0;
|
|
||||||
#if !defined(SO_PEERCRED)
|
|
||||||
#error "no SO_PEERCRED defined"
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
[AC_MSG_RESULT(yes)
|
|
||||||
- AC_DEFINE(UDS_CRED_STYPE, ucred, [Defined to UDS credential structure name])
|
|
||||||
+ AC_DEFINE(UDS_CRED_STYPE, sockpeercred, [Defined to UDS credential structure name])
|
|
||||||
AC_DEFINE(UDS_CRED_UID, uid, [Defined to UDS credential structure uid field])
|
|
||||||
AC_DEFINE(UDS_CRED_SO, SO_PEERCRED, [Defined to UDS credential socket option])
|
|
||||||
AC_DEFINE(TRUST_UDS_CRED)],
|
|
||||||
@@ -431,18 +431,34 @@ u.uid = 0;
|
|
||||||
AC_TRY_COMPILE([#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>],
|
|
||||||
[
|
|
||||||
+struct ucred u;
|
|
||||||
+u.euid = 0;
|
|
||||||
+#if !defined(SO_PEERCRED)
|
|
||||||
+#error "no SO_PEERCRED defined"
|
|
||||||
+#endif
|
|
||||||
+ ],
|
|
||||||
+ [AC_MSG_RESULT(yes)
|
|
||||||
+ AC_DEFINE(UDS_CRED_STYPE, ucred, [Defined to UDS credential structure name])
|
|
||||||
+ AC_DEFINE(UDS_CRED_UID, uid, [Defined to UDS credential structure uid field])
|
|
||||||
+ AC_DEFINE(UDS_CRED_SO, SO_PEERCRED, [Defined to UDS credential socket option])
|
|
||||||
+ AC_DEFINE(TRUST_UDS_CRED)],
|
|
||||||
+ [
|
|
||||||
+ AC_TRY_COMPILE([#include <sys/types.h>
|
|
||||||
+ #include <sys/socket.h>],
|
|
||||||
+ [
|
|
||||||
struct peercred_struct u;
|
|
||||||
u.euid = 0;
|
|
||||||
#if !defined(SO_PEERID)
|
|
||||||
#error "no SO_PEERID defined"
|
|
||||||
#endif
|
|
||||||
- ],
|
|
||||||
- [AC_MSG_RESULT(yes)
|
|
||||||
- AC_DEFINE(UDS_CRED_STYPE, peercred_struct, [Defined to UDS credential structure name])
|
|
||||||
- AC_DEFINE(UDS_CRED_UID, euid, [Defined to UDS credential structure uid field])
|
|
||||||
- AC_DEFINE(UDS_CRED_SO, SO_PEERID, [Defined to UDS credential socket option])
|
|
||||||
- AC_DEFINE(TRUST_UDS_CRED)],
|
|
||||||
- [AC_MSG_RESULT(no)])
|
|
||||||
+ ],
|
|
||||||
+ [AC_MSG_RESULT(yes)
|
|
||||||
+ AC_DEFINE(UDS_CRED_STYPE, peercred_struct, [Defined to UDS credential structure name])
|
|
||||||
+ AC_DEFINE(UDS_CRED_UID, euid, [Defined to UDS credential structure uid field])
|
|
||||||
+ AC_DEFINE(UDS_CRED_SO, SO_PEERID, [Defined to UDS credential socket option])
|
|
||||||
+ AC_DEFINE(TRUST_UDS_CRED)],
|
|
||||||
+ [AC_MSG_RESULT(no)]),
|
|
||||||
+ ])
|
|
||||||
])
|
|
||||||
;;
|
|
||||||
*)
|
|
@ -1,6 +1,8 @@
|
|||||||
$OpenBSD: patch-conserver_cf_conserver_cf,v 1.3 2014/10/07 15:21:42 sthen Exp $
|
$OpenBSD: patch-conserver_cf_conserver_cf,v 1.4 2020/05/14 11:43:24 sthen Exp $
|
||||||
--- conserver.cf/conserver.cf.orig Thu Mar 11 16:51:23 2004
|
|
||||||
+++ conserver.cf/conserver.cf Tue Oct 7 16:19:32 2014
|
Index: conserver.cf/conserver.cf
|
||||||
|
--- conserver.cf/conserver.cf.orig
|
||||||
|
+++ conserver.cf/conserver.cf
|
||||||
@@ -14,9 +14,18 @@ default cisco { type host; portbase 2000; portinc 1; }
|
@@ -14,9 +14,18 @@ default cisco { type host; portbase 2000; portinc 1; }
|
||||||
default xyplex { type host; portbase 2000; portinc 100; }
|
default xyplex { type host; portbase 2000; portinc 100; }
|
||||||
default iolan { type host; portbase 10000; portinc 1; }
|
default iolan { type host; portbase 10000; portinc 1; }
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
$OpenBSD: patch-conserver_cf_conserver_passwd,v 1.2 2005/08/02 07:25:47 pvalchev Exp $
|
$OpenBSD: patch-conserver_cf_conserver_passwd,v 1.3 2020/05/14 11:43:24 sthen Exp $
|
||||||
--- conserver.cf/conserver.passwd.orig Thu Jun 23 23:25:24 2005
|
|
||||||
+++ conserver.cf/conserver.passwd Thu Jun 23 23:26:07 2005
|
Index: conserver.cf/conserver.passwd
|
||||||
|
--- conserver.cf/conserver.passwd.orig
|
||||||
|
+++ conserver.cf/conserver.passwd
|
||||||
@@ -1,3 +1,2 @@
|
@@ -1,3 +1,2 @@
|
||||||
-bryan:td1AgneGE3RsU
|
-bryan:td1AgneGE3RsU
|
||||||
-djs:*passwd*
|
-djs:*passwd*
|
||||||
|
@ -1,28 +0,0 @@
|
|||||||
$OpenBSD: patch-conserver_consent_c,v 1.9 2019/03/27 23:39:59 sthen Exp $
|
|
||||||
|
|
||||||
XXX probably not needed; review
|
|
||||||
|
|
||||||
Index: conserver/consent.c
|
|
||||||
--- conserver/consent.c.orig
|
|
||||||
+++ conserver/consent.c
|
|
||||||
@@ -527,7 +527,7 @@ SetupTty(CONSENT *pCE, int fd)
|
|
||||||
if (0 != tcgetattr(1, &n_tio)) {
|
|
||||||
exit(EX_OSERR);
|
|
||||||
}
|
|
||||||
- n_tio.c_iflag &= ~(IGNCR | IUCLC);
|
|
||||||
+ n_tio.c_iflag &= ~(IGNCR);
|
|
||||||
n_tio.c_iflag |= ICRNL;
|
|
||||||
if (pCE->ixon == FLAGTRUE)
|
|
||||||
n_tio.c_iflag |= IXON;
|
|
||||||
@@ -535,10 +535,8 @@ SetupTty(CONSENT *pCE, int fd)
|
|
||||||
n_tio.c_iflag |= IXANY;
|
|
||||||
if (pCE->ixoff == FLAGTRUE)
|
|
||||||
n_tio.c_iflag |= IXOFF;
|
|
||||||
- n_tio.c_oflag &=
|
|
||||||
- ~(OLCUC | ONOCR | ONLRET | OFILL | NLDLY | CRDLY | TABDLY | BSDLY);
|
|
||||||
n_tio.c_oflag |= OPOST | ONLCR;
|
|
||||||
- n_tio.c_lflag &= ~(XCASE | NOFLSH | ECHOK | ECHONL);
|
|
||||||
+ n_tio.c_lflag &= ~(NOFLSH | ECHOK | ECHONL);
|
|
||||||
n_tio.c_lflag |= ISIG | ICANON | ECHO;
|
|
||||||
n_tio.c_cc[VEOF] = '\004';
|
|
||||||
n_tio.c_cc[VEOL] = '\000';
|
|
@ -1,11 +1,11 @@
|
|||||||
$OpenBSD: patch-conserver_cutil_c,v 1.8 2019/03/27 10:14:03 sthen Exp $
|
$OpenBSD: patch-conserver_cutil_c,v 1.9 2020/05/14 11:43:24 sthen Exp $
|
||||||
|
|
||||||
fix unaligned access on strict-alignment 64-bit
|
fix unaligned access on strict-alignment 64-bit
|
||||||
|
|
||||||
Index: conserver/cutil.c
|
Index: conserver/cutil.c
|
||||||
--- conserver/cutil.c.orig
|
--- conserver/cutil.c.orig
|
||||||
+++ conserver/cutil.c
|
+++ conserver/cutil.c
|
||||||
@@ -1847,7 +1847,7 @@ ProbeInterfaces(in_addr_t bindAddr)
|
@@ -1852,7 +1852,7 @@ ProbeInterfaces(in_addr_t bindAddr)
|
||||||
{
|
{
|
||||||
# ifdef SIOCGIFCONF
|
# ifdef SIOCGIFCONF
|
||||||
struct ifconf ifc;
|
struct ifconf ifc;
|
||||||
@ -14,7 +14,7 @@ Index: conserver/cutil.c
|
|||||||
# ifdef SIOCGIFFLAGS
|
# ifdef SIOCGIFFLAGS
|
||||||
struct ifreq ifrcopy;
|
struct ifreq ifrcopy;
|
||||||
# endif
|
# endif
|
||||||
@@ -1916,7 +1916,7 @@ ProbeInterfaces(in_addr_t bindAddr)
|
@@ -1921,7 +1921,7 @@ ProbeInterfaces(in_addr_t bindAddr)
|
||||||
* than loop through looking for valid interfaces that are up
|
* than loop through looking for valid interfaces that are up
|
||||||
* twice, huh?
|
* twice, huh?
|
||||||
*/
|
*/
|
||||||
@ -23,7 +23,7 @@ Index: conserver/cutil.c
|
|||||||
CONDDEBUG((1, "ProbeInterfaces(): ifc_len==%d max_count==%d",
|
CONDDEBUG((1, "ProbeInterfaces(): ifc_len==%d max_count==%d",
|
||||||
ifc.ifc_len, count));
|
ifc.ifc_len, count));
|
||||||
|
|
||||||
@@ -1935,17 +1935,17 @@ ProbeInterfaces(in_addr_t bindAddr)
|
@@ -1940,21 +1940,21 @@ ProbeInterfaces(in_addr_t bindAddr)
|
||||||
|
|
||||||
for (m = r = 0; r < ifc.ifc_len;) {
|
for (m = r = 0; r < ifc.ifc_len;) {
|
||||||
struct sockaddr *sa;
|
struct sockaddr *sa;
|
||||||
@ -36,9 +36,14 @@ Index: conserver/cutil.c
|
|||||||
+ if ((ifc.ifc_len - r) < sizeof(ifr))
|
+ if ((ifc.ifc_len - r) < sizeof(ifr))
|
||||||
break;
|
break;
|
||||||
# ifdef HAVE_SA_LEN
|
# ifdef HAVE_SA_LEN
|
||||||
|
# ifdef __FreeBSD__
|
||||||
|
- if (sa->sa_len > sizeof(ifr->ifr_addr))
|
||||||
|
+ if (sa->sa_len > sizeof(ifr.ifr_addr))
|
||||||
|
# else
|
||||||
- if (sa->sa_len > sizeof(ifr->ifr_ifru))
|
- if (sa->sa_len > sizeof(ifr->ifr_ifru))
|
||||||
- r += sizeof(ifr->ifr_name) + sa->sa_len;
|
|
||||||
+ if (sa->sa_len > sizeof(ifr.ifr_ifru))
|
+ if (sa->sa_len > sizeof(ifr.ifr_ifru))
|
||||||
|
# endif
|
||||||
|
- r += sizeof(ifr->ifr_name) + sa->sa_len;
|
||||||
+ r += sizeof(ifr.ifr_name) + sa->sa_len;
|
+ r += sizeof(ifr.ifr_name) + sa->sa_len;
|
||||||
else
|
else
|
||||||
# endif
|
# endif
|
||||||
@ -47,7 +52,7 @@ Index: conserver/cutil.c
|
|||||||
|
|
||||||
if (sa->sa_family == AF_INET) {
|
if (sa->sa_family == AF_INET) {
|
||||||
struct sockaddr_in *sin = (struct sockaddr_in *)sa;
|
struct sockaddr_in *sin = (struct sockaddr_in *)sa;
|
||||||
@@ -1966,14 +1966,14 @@ ProbeInterfaces(in_addr_t bindAddr)
|
@@ -1975,14 +1975,14 @@ ProbeInterfaces(in_addr_t bindAddr)
|
||||||
|
|
||||||
# ifdef SIOCGIFFLAGS
|
# ifdef SIOCGIFFLAGS
|
||||||
/* make sure the interface is up */
|
/* make sure the interface is up */
|
||||||
@ -64,7 +69,7 @@ Index: conserver/cutil.c
|
|||||||
|
|
||||||
# if HAVE_MEMCPY
|
# if HAVE_MEMCPY
|
||||||
memcpy(&myAddrs[m], &(sin->sin_addr), sizeof(struct in_addr));
|
memcpy(&myAddrs[m], &(sin->sin_addr), sizeof(struct in_addr));
|
||||||
@@ -1982,7 +1982,7 @@ ProbeInterfaces(in_addr_t bindAddr)
|
@@ -1991,7 +1991,7 @@ ProbeInterfaces(in_addr_t bindAddr)
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
Verbose("interface address %s (%s)", inet_ntoa(myAddrs[m]),
|
Verbose("interface address %s (%s)", inet_ntoa(myAddrs[m]),
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
$OpenBSD: patch-conserver_cutil_h,v 1.1 2019/03/27 10:37:09 sthen Exp $
|
|
||||||
|
|
||||||
Index: conserver/cutil.h
|
|
||||||
--- conserver/cutil.h.orig
|
|
||||||
+++ conserver/cutil.h
|
|
||||||
@@ -12,10 +12,12 @@
|
|
||||||
# include <openssl/err.h>
|
|
||||||
# if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
||||||
# define TLS_method SSLv23_method
|
|
||||||
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
|
||||||
+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
|
||||||
# define CIPHER_SEC0
|
|
||||||
# else
|
|
||||||
# define CIPHER_SEC0 ":@SECLEVEL=0"
|
|
||||||
-# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
|
||||||
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
|
|
||||||
#endif
|
|
||||||
#if HAVE_GSSAPI
|
|
||||||
# include <gssapi/gssapi.h>
|
|
@ -1,9 +1,9 @@
|
|||||||
$OpenBSD: patch-conserver_group_c,v 1.9 2019/03/27 10:37:09 sthen Exp $
|
$OpenBSD: patch-conserver_group_c,v 1.10 2020/05/14 11:43:24 sthen Exp $
|
||||||
|
|
||||||
Index: conserver/group.c
|
Index: conserver/group.c
|
||||||
--- conserver/group.c.orig
|
--- conserver/group.c.orig
|
||||||
+++ conserver/group.c
|
+++ conserver/group.c
|
||||||
@@ -752,7 +752,7 @@ CheckPass(char *pcUser, char *pcWord, FLAG empty_check
|
@@ -753,7 +753,7 @@ CheckPass(char *pcUser, char *pcWord, FLAG empty_check
|
||||||
struct spwd *spwd;
|
struct spwd *spwd;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
$OpenBSD: patch-console_console_c,v 1.10 2019/03/27 23:39:59 sthen Exp $
|
|
||||||
|
|
||||||
XXX probably not needed; review
|
|
||||||
|
|
||||||
Index: console/console.c
|
|
||||||
--- console/console.c.orig
|
|
||||||
+++ console/console.c
|
|
||||||
@@ -693,7 +693,7 @@ C2Raw(void)
|
|
||||||
Bye(EX_UNAVAILABLE);
|
|
||||||
}
|
|
||||||
n_tios = o_tios;
|
|
||||||
- n_tios.c_iflag &= ~(INLCR | IGNCR | ICRNL | IUCLC | IXON);
|
|
||||||
+ n_tios.c_iflag &= ~(INLCR | IGNCR | ICRNL | IXON);
|
|
||||||
n_tios.c_oflag &= ~OPOST;
|
|
||||||
n_tios.c_lflag &= ~(ICANON | ISIG | ECHO | IEXTEN);
|
|
||||||
n_tios.c_cc[VMIN] = 1;
|
|
Loading…
Reference in New Issue
Block a user