add a patch from upstream which adds support for ipv6 addresses to the inetd lens.

This commit is contained in:
jasper 2012-12-30 21:38:58 +00:00
parent f3d487ef45
commit f3883c5e00
3 changed files with 54 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2012/12/30 19:38:44 jasper Exp $
# $OpenBSD: Makefile,v 1.6 2012/12/30 21:38:58 jasper Exp $
COMMENT= configuration editing tool and API
DISTNAME= augeas-1.0.0
REVISION= 3
REVISION= 4
CATEGORIES= sysutils devel
SHARED_LIBS += augeas 0.0 # 16.0

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-lenses_inetd_aug,v 1.1 2012/12/30 21:38:58 jasper Exp $
From cfd0aaadd0741942de93c8e25de2ca8485a3eb22 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Sun, 30 Dec 2012 19:40:58 +0000
Subject: Inetd: support IPv6 addresses
--- lenses/inetd.aug.orig Fri Nov 2 16:20:11 2012
+++ lenses/inetd.aug Sun Dec 30 22:35:05 2012
@@ -86,7 +86,7 @@ module Inetd =
let del_str = Util.del_str
- let address = [ seq "addrseq" . store /([a-zA-Z0-9.-]+|\*)/ ]
+ let address = [ seq "addrseq" . store /([a-zA-Z0-9.-]+|\[[A-Za-z0-9:?*%]+\]|\*)/ ]
let address_list = ( counter "addrseq" . (address . del_str ",")* . address )
let argument = [ seq "argseq" . store /[^ \t\n]+/ ]

View File

@ -0,0 +1,34 @@
$OpenBSD: patch-lenses_tests_test_inetd_aug,v 1.1 2012/12/30 21:38:58 jasper Exp $
From cfd0aaadd0741942de93c8e25de2ca8485a3eb22 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Sun, 30 Dec 2012 19:40:58 +0000
Subject: Inetd: support IPv6 addresses
--- lenses/tests/test_inetd.aug.orig Fri Nov 2 16:20:11 2012
+++ lenses/tests/test_inetd.aug Sun Dec 30 22:35:05 2012
@@ -13,6 +13,7 @@ arguserve dgram udp wait mary /usr/bin/usenet foo bar
faff.fred.com:
127.0.0.1,faff.fred.com:
*:
+[::1]:addrsrv stream tcp nowait fred /usr/bin/addrsrv
sndbufsrv stream tcp,sndbuf=12k nowait fred /usr/bin/sndbufsrv
rcvbufsrv stream tcp,rcvbuf=24k nowait fred /usr/bin/rcvbufsrv
@@ -87,6 +88,16 @@ dummy/1 tli rpc/circuit_v,udp wait
}
{ "address"
{ "1" = "*" }
+ }
+ { "service" = "addrsrv"
+ { "address"
+ { "1" = "[::1]" }
+ }
+ { "socket" = "stream" }
+ { "protocol" = "tcp" }
+ { "wait" = "nowait" }
+ { "user" = "fred" }
+ { "command" = "/usr/bin/addrsrv" }
}
{}
{ "service" = "sndbufsrv"