X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/4c34768665f121ebbd3c46c4769e81d561db2022..03a866952f4f2f7c26d0d54305d7ef739f5d9b2d:/debian/control

diff --git a/debian/control b/debian/control
index a92cb18..a089e2c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,24 +2,22 @@ Source: userv-utils
 Section: admin
 Priority: extra
 Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Standards-Version: 2.1.1.0
+Standards-Version: 3.7.0.0
+Build-Depends: debhelper (>= 8)
 
-Package: userv-ipif
+Package: userv-utils
 Architecture: any
-Depends: userv, ${shlibs:Depends}, ${misc:Depends}
-Recommends: ssh
-Description: VPN system (and user-mode network interface)
- userv-ipif is a userv service to allow non-root users to create
- network interfaces implemented in user space.  No kernel patches are
- required (the kernel's built-in SLIP driver is used).
- .
- Based on this, udptunnel is a a simple but flexible VPN program which
- uses ssh for authentication and key exchange but sends the packets
- over UDP.  (Other VPN-over-ssh programs typically do PPP-over-TCP,
- which yields poor perfoormance.)  Note that udptunnel is not IPSEC.
+Depends: userv
+Recommends: ${perl:Depends}, ${misc:Depends}
+Description: privsep utilities collection
+ Several small userv services, which allow certain system configuration
+ actions to be delegated.  In each case the service is disabled unless
+ enabled by symlink /etc/userv/services.d/* -> ../services-available/*.
  .
- The default configuration does set up any users with permission to
- create network interfaces such as VPN endpoints.
+ ipif - allow non-root users to create network interfaces
+ mailq - allow users to view the mail queue
+ ndc-reload  - allow certain users to reload the nameserver
+ checkpasswd-* - allow users to run a UNIX password check
 
 Package: userv-dyndns
 Architecture: all
@@ -51,7 +49,7 @@ Description: user-provided CGI scripts invoked by userv
  call, rather than a custom setuid helper.
  .
  The default configuration allows the webserver user to invoke users'
- CGI programs from each user's ~/public-GI, but to allow external
+ CGI programs from each user's ~/public-cgi, but to allow external
  callers to do this, the webserver will also need to be configured.
 
 Package: userv-groupmanage
@@ -78,16 +76,3 @@ Description: per-user git daemon service
  the line from /usr/share/doc/examples/userv-git-daemon.inetd into
  /etc/inetd.conf and (b) specifically list hostnames and target
  directories in /etc/userv/git-urlmap.
-
-Package: userv-misc
-Architecture: all
-Depends: userv
-Recommends: ${perl:Depends}, ${misc:Depends}
-Description: miscellaneous small userv scripts
- This package a few small userv services.  Since you must choose
- whether to install this package or not as one lump, the default
- configuration for each script does not give users any new abilities.
- .
- mailq - allow users to view the mail queue
- ndc-reload  - allow certain users to reload the nameserver
- checkpasswd-* - allow users to run a UNIX password check