diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-04-14 16:31:38 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-04-14 16:31:38 +0100 |
| commit | 03a866952f4f2f7c26d0d54305d7ef739f5d9b2d (patch) | |
| tree | f53ef053e3efc891184f30b05b4f2a47094ec43e | |
| parent | 308d46b94510dfdea3e2f5095264b0290806a54c (diff) | |
| download | userv-utils-03a866952f4f2f7c26d0d54305d7ef739f5d9b2d.tar.gz | |
debian/: Move ipif into -utils
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | debian/control | 14 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 10 insertions, 12 deletions
diff --git a/debian/control b/debian/control index d25819d..a089e2c 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.7.0.0 Build-Depends: debhelper (>= 8) Package: userv-utils -Architecture: all +Architecture: any Depends: userv Recommends: ${perl:Depends}, ${misc:Depends} Description: privsep utilities collection @@ -14,21 +14,11 @@ Description: privsep utilities collection 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 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. - Package: userv-dyndns Architecture: all Depends: userv, chiark-utils-bin, ${perl:Depends}, ${misc:Depends} diff --git a/debian/rules b/debian/rules index 499179b..76e59ff 100755 --- a/debian/rules +++ b/debian/rules @@ -58,6 +58,14 @@ override_dh_auto_install: done - mv debian/userv-misc debian/userv-utils + - + set -e; cd debian/userv-ipif/usr/share/doc; \ + mv userv-ipif userv-utils; \ + cd userv-utils; \ + mv service.c.txt ipif.txt + - + cp -al debian/userv-ipif/. debian/userv-utils/. + - mv debian/userv-www-cgi debian/userv-cgi mv debian/userv-groupmanage/usr/share/doc/groupmanage \ debian/userv-groupmanage/usr/share/doc/userv-groupmanage |