upstream changelog: Document merge

[userv-utils.git] / debian / control

diff --git a/debian/control b/debian/control
index d25819de962c46963efb0211692e659c5f0fab75..7272e6c428473807f12ede4cbe8151600b1db1fa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,37 +1,34 @@
 Source: userv-utils
 Section: admin
-Priority: extra
-Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Standards-Version: 3.7.0.0
-Build-Depends: debhelper (>= 8)
+Priority: optional
+Maintainer: Sean Whitton <spwhitton@spwhitton.name>
+Uploaders: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Build-Depends: debhelper-compat (= 12), rename
+Standards-Version: 4.5.1
+Rules-Requires-Root: binary-targets
+Homepage: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=summary
+Vcs-Git: https://git.spwhitton.name/userv-utils/
+Vcs-Browser: https://git.spwhitton.name/userv-utils/
 
 Package: userv-utils
-Architecture: all
-Depends: userv
-Recommends: ${perl:Depends}, ${misc:Depends}
+Architecture: any
+Depends: userv, ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${perl: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/*.
  .
+ ipif - allow non-root users to create network interfaces
+ ucgi - run CGI programs in providing user's account
  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-ipif
-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.
- .
- The default configuration does set up any users with permission to
- create network interfaces such as VPN endpoints.
+ groupmanage - allow users to create and manage a few groups each
 
 Package: userv-dyndns
 Architecture: all
-Depends: userv, chiark-utils-bin, ${perl:Depends}, ${misc:Depends}
+Depends: userv, chiark-utils-bin, adduser, ${perl:Depends}, ${misc:Depends}
 Recommends: bind
 Description: dynamic DNS for shell account users
  userv-dyndns is a userv service which allows non-root users to
@@ -40,38 +37,8 @@ Description: dynamic DNS for shell account users
  Typically, this can be used to provide a `dyndns.org'-like service
  which is modifiable by shell account users.
  .
- The default configuration does not set up any users with permission
- to modify the DNS.
-
-Package: userv-cgi
-Architecture: any
-Depends: userv, ${shlibs:Depends}, ${misc:Depends}
-Recommends: httpd
-Description: user-provided CGI scripts invoked by userv
- This package contains ucgi, a userv service which allows CGI programs
- to be provided which do not run as the webserver user, but instead
- are owned by a particular other account.
- .
- Similar effects can be achieved with Apache's suexec; this package is
- for administrators who do not trust suexec and wish to defend the
- webserver from the CGI script providers, and vice versa, as much as
- possible.  This is achieved by using userv to do the cross-account
- call, rather than a custom setuid helper.
- .
- The default configuration allows the webserver user to invoke users'
- 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
-Architecture: all
-Depends: userv, ${perl:Depends}, ${misc:Depends}
-Description: user-controlled group membership
- groupmanage is a userv service which allows individual shell users to
- create UN*X groups, and/or to change the membership of existing
- groups of which they are recorded as the manager.
- .
- The default configuration allows users to create and manage a few
- groups, but is reasonably conservative.
+ The default configuration creates the infrastructure (including a
+ service user) but does not allow any users to modify the DNS.
 
 Package: userv-git-daemon
 Architecture: all