cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to conserver-8.2.2

Browse Source
This commit is contained in:
sthen 2018-05-29 13:54:05 +00:00
parent e4ae318511
commit 05caeca6a3
9 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comms/conserver/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.60 2018/05/22 14:57:44 sthen Exp $
# $OpenBSD: Makefile,v 1.61 2018/05/29 13:54:05 sthen Exp $
COMMENT= manage remote serial consoles via TCP/IP
V= 8.2.1
V= 8.2.2
DISTNAME= conserver-$V
REVISION= 7
CATEGORIES= comms
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
@ -40,7 +39,7 @@ CONFIGURE_ARGS+= --with-uds=${LOCALSTATEDIR}/run/conserver \
.if ${FLAVOR:Mipmi}
CONFIGURE_ARGS+= --with-freeipmi=yes
LIB_DEPENDS+= sysutils/freeipmi
WANTLIB+= freeipmi ipmiconsole pthread
WANTLIB+= freeipmi ipmiconsole
.endif
post-install:

4
comms/conserver/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (conserver-8.2.1.tar.gz) = JRrgGZfo8+51EGpbhOxvKo61/y+AkkOOujQ4SmFRU9A=
SIZE (conserver-8.2.1.tar.gz) = 335241
SHA256 (conserver-8.2.2.tar.gz) = BeoWk7+StCrS8Kk4nGA1LM01wuqTyPyOYY0BUzYqfYE=
SIZE (conserver-8.2.2.tar.gz) = 329048

12
comms/conserver/patches/patch-configure_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_in,v 1.5 2015/08/11 21:13:14 sthen Exp $
$OpenBSD: patch-configure_in,v 1.6 2018/05/29 13:54:05 sthen Exp $
--- 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,
@ -28,11 +28,11 @@ $OpenBSD: patch-configure_in,v 1.5 2015/08/11 21:13:14 sthen Exp $
+#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_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>],

11
comms/conserver/patches/patch-conserver_consent_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-conserver_consent_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
--- conserver/consent.c.orig Sun Apr 20 08:14:49 2014
+++ conserver/consent.c Tue Oct 7 16:49:57 2014
@@ -521,7 +521,8 @@ SetupTty(CONSENT *pCE, int fd)
$OpenBSD: patch-conserver_consent_c,v 1.6 2018/05/29 13:54:05 sthen Exp $
Index: conserver/consent.c
--- conserver/consent.c.orig
+++ conserver/consent.c
@@ -519,7 +519,8 @@ SetupTty(CONSENT *pCE, int fd)
if (0 != tcgetattr(1, &n_tio)) {
exit(EX_OSERR);
}
@ -11,7 +12,7 @@ $OpenBSD: patch-conserver_consent_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
n_tio.c_iflag |= ICRNL;
if (pCE->ixon == FLAGTRUE)
n_tio.c_iflag |= IXON;
@@ -529,10 +530,8 @@ SetupTty(CONSENT *pCE, int fd)
@@ -527,10 +528,8 @@ SetupTty(CONSENT *pCE, int fd)
n_tio.c_iflag |= IXANY;
if (pCE->ixoff == FLAGTRUE)
n_tio.c_iflag |= IXOFF;

17
comms/conserver/patches/patch-conserver_cutil_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-conserver_cutil_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
--- conserver/cutil.c.orig Sun Apr 20 08:17:56 2014
+++ conserver/cutil.c Tue Oct 7 17:25:07 2014
@@ -1845,7 +1845,7 @@ ProbeInterfaces(in_addr_t bindAddr)
$OpenBSD: patch-conserver_cutil_c,v 1.6 2018/05/29 13:54:05 sthen Exp $
Index: conserver/cutil.c
--- conserver/cutil.c.orig
+++ conserver/cutil.c
@@ -1843,7 +1843,7 @@ ProbeInterfaces(in_addr_t bindAddr)
{
# ifdef SIOCGIFCONF
struct ifconf ifc;
@ -10,7 +11,7 @@ $OpenBSD: patch-conserver_cutil_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
# ifdef SIOCGIFFLAGS
struct ifreq ifrcopy;
# endif
@@ -1914,7 +1914,7 @@ ProbeInterfaces(in_addr_t bindAddr)
@@ -1912,7 +1912,7 @@ ProbeInterfaces(in_addr_t bindAddr)
* than loop through looking for valid interfaces that are up
* twice, huh?
*/
@ -19,7 +20,7 @@ $OpenBSD: patch-conserver_cutil_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
CONDDEBUG((1, "ProbeInterfaces(): ifc_len==%d max_count==%d",
ifc.ifc_len, count));
@@ -1933,17 +1933,17 @@ ProbeInterfaces(in_addr_t bindAddr)
@@ -1931,17 +1931,17 @@ ProbeInterfaces(in_addr_t bindAddr)
for (m = r = 0; r < ifc.ifc_len;) {
struct sockaddr *sa;
@ -43,7 +44,7 @@ $OpenBSD: patch-conserver_cutil_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
if (sa->sa_family == AF_INET) {
struct sockaddr_in *sin = (struct sockaddr_in *)sa;
@@ -1964,14 +1964,14 @@ ProbeInterfaces(in_addr_t bindAddr)
@@ -1962,14 +1962,14 @@ ProbeInterfaces(in_addr_t bindAddr)
# ifdef SIOCGIFFLAGS
/* make sure the interface is up */
@ -60,7 +61,7 @@ $OpenBSD: patch-conserver_cutil_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
# if HAVE_MEMCPY
memcpy(&myAddrs[m], &(sin->sin_addr), sizeof(struct in_addr));
@@ -1980,7 +1980,7 @@ ProbeInterfaces(in_addr_t bindAddr)
@@ -1978,7 +1978,7 @@ ProbeInterfaces(in_addr_t bindAddr)
# endif
Verbose("interface address %s (%s)", inet_ntoa(myAddrs[m]),

9
comms/conserver/patches/patch-conserver_group_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-conserver_group_c,v 1.7 2015/11/19 14:03:30 sthen Exp $
--- conserver/group.c.orig Thu Nov 19 13:55:52 2015
+++ conserver/group.c Thu Nov 19 13:59:18 2015
@@ -754,7 +754,7 @@ CheckPass(char *pcUser, char *pcWord, FLAG empty_check
$OpenBSD: patch-conserver_group_c,v 1.8 2018/05/29 13:54:05 sthen Exp $
Index: conserver/group.c
--- conserver/group.c.orig
+++ conserver/group.c
@@ -752,7 +752,7 @@ CheckPass(char *pcUser, char *pcWord, FLAG empty_check
struct spwd *spwd;
# endif

4
comms/conserver/patches/patch-conserver_main_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-conserver_main_c,v 1.1 2018/05/22 14:57:44 sthen Exp $
$OpenBSD: patch-conserver_main_c,v 1.2 2018/05/29 13:54:05 sthen Exp $
enable "setproctitle" option by default, for more information ps listings
Index: conserver/main.c
--- conserver/main.c.orig
+++ conserver/main.c
@@ -72,7 +72,7 @@ CONFIG defConfig =
@@ -70,7 +70,7 @@ CONFIG defConfig =
DEFPORT,
FLAGTRUE, FLAGTRUE, 0, DEFBASEPORT, (char *)0, 0
#if HAVE_SETPROCTITLE

9
comms/conserver/patches/patch-console_console_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-console_console_c,v 1.6 2015/06/10 13:07:33 sthen Exp $
--- console/console.c.orig Mon Jun 1 16:36:59 2015
+++ console/console.c Wed Jun 10 14:05:46 2015
@@ -695,7 +695,7 @@ C2Raw(void)
$OpenBSD: patch-console_console_c,v 1.7 2018/05/29 13:54:05 sthen Exp $
Index: console/console.c
--- console/console.c.orig
+++ console/console.c
@@ -693,7 +693,7 @@ C2Raw(void)
Bye(EX_UNAVAILABLE);
}
n_tios = o_tios;

7
comms/conserver/pkg/PLIST
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.14 2017/12/16 20:53:06 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.15 2018/05/29 13:54:05 sthen Exp $
@newgroup _conserver:736
@newuser _conserver:736:_conserver:daemon:Serial console server:/nonexistent:/sbin/nologin
@extra /var/log/conserver
@extraunexec rm -rf /var/consoles/*
@rcscript ${RCDIR}/conserver
@bin bin/console
@man man/man1/console.1
@man man/man5/conserver.cf.5
@ -27,7 +28,3 @@ share/examples/conserver/simple.cf
@owner _conserver
@group wheel
@sample /var/log/consoles/
@mode
@group
@owner
@rcscript ${RCDIR}/conserver