From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Aug 2021 21:38:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'spwhitton/master'
X-Git-Tag: userv/0.6.1~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=6c46c4d447bddd5e0b307af8677bf4bf25443639;hp=c44ef57903ad29418b7d0b0a325524e7b6eb341b;p=userv-utils.git

Merge remote-tracking branch 'spwhitton/master'
---

diff --git a/debian/changelog b/debian/changelog
index 4ae21f8..65cd19f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ userv-utils (0.6.0~~iwj4) unstable; urgency=medium
     the service-specific configurations into their enabled locations where
     appropriate.
 
+  * ipif: Provide ipif-access aka ipif/service-wrap, new access control
+    wrapper program for service with a new better syntax.
+    [Ian Jackson; fixes from Mark Wooding]
+  * ipif: Fix some option-handling bugs.
+  * ipif: Tidy up some compiler warnings.  [Mark Wooding]
+
  --
 
 userv-utils (0.6.0~~iwj3) unstable; urgency=low