diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-12-04 19:07:53 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-12-04 19:07:53 +0000 |
| commit | 97f318e04ed0024b2bf5903215a75249401d3fd7 (patch) | |
| tree | 6a779a6bcb79ebaf0e230b120ba7c2fdf6771d9f /ipif | |
| parent | dd0d6c7ef9375390cfe9e633addc271f1be5fd0d (diff) | |
| download | userv-utils-97f318e04ed0024b2bf5903215a75249401d3fd7.tar.gz | |
ipif: Deprecate udptunnel.
Diffstat (limited to 'ipif')
| -rw-r--r-- | ipif/INSTALL.udptunnel (renamed from ipif/INSTALL) | 0 | ||||
| -rw-r--r-- | ipif/Makefile | 33 | ||||
| -rw-r--r-- | ipif/README | 4 |
3 files changed, 25 insertions, 12 deletions
diff --git a/ipif/INSTALL b/ipif/INSTALL.udptunnel index 71ba29d..71ba29d 100644 --- a/ipif/INSTALL +++ b/ipif/INSTALL.udptunnel diff --git a/ipif/Makefile b/ipif/Makefile index 5136656..0addd4d 100644 --- a/ipif/Makefile +++ b/ipif/Makefile @@ -26,9 +26,20 @@ include ../settings.make varlibvpn= $(varlibuserv)/vpn etcvpn= $(etcdir)/userv/vpn -PROGRAM_TARGETS= udptunnel-forwarder udptunnel-reconf -TARGETS= service blowfishtest $(PROGRAM_TARGETS) -PROGRAMS= udptunnel $(PROGRAM_TARGETS) +PROGRAM_TARGETS+= +PROGRAM_TARGETS$(depr)+= udptunnel-forwarder udptunnel-reconf + +TARGETS+= service +TARGETS$(depr)+= blowfishtest +TARGETS+= $(PROGRAM_TARGETS) + +PROGRAMS$(depr)+= udptunnel +PROGRAMS+= $(PROGRAM_TARGETS) + +DIRS+= $(libuserv) +DIRS$(depr)+= $(bindir) $(services) $(varlibvpn) $(shareuserv) + +SHAREFILES$(depr)+= udptunnel-vpn-config.m4 udptunnel-vpn-defaults MECHFILES= null pkcs5 timestamp sequence blowfish MECHOBJS= $(foreach m, $(MECHFILES), mech-$m.o) @@ -38,21 +49,21 @@ OBJS_BFTEST= blowfishtest.o blowfish.o hex.o all: $(TARGETS) -install: all - mkdir -p $(bindir) $(libuserv) $(services) \ - $(varlibvpn) $(shareuserv) +install: installdirs all + mkdir -p $(DIRS) cp -b service $(libuserv)/ipif - cp -b $(PROGRAMS) $(bindir)/. + set -e; for f in $(PROGRAMS); do cp -b $$f $(bindir)/.; done cp ipif $(services)/ipif:new set -e; cd $(services); test -f ipif || mv ipif:new ipif - cp udptunnel-vpn-config.m4 udptunnel-vpn-defaults \ - $(shareuserv)/. + set -e; for f in $(SHAREFILES); do cp $$f $(shareuserv)/.; done install-docs: install-examples: - mkdir -p $(etcvpn) - cp *.example $(etcvpn)/. + set -e; if [ "x$depr" = x ]; then \ + mkdir -p $(etcvpn); \ + cp *.example $(etcvpn)/.; \ + fi udptunnel-reconf: udptunnel-reconf.pl Makefile perl -p \ diff --git a/ipif/README b/ipif/README index 39a691a..9557961 100644 --- a/ipif/README +++ b/ipif/README @@ -7,6 +7,8 @@ This directory contains: * udptunnel + This is deprecated. + A VPN tunnelling system based on userv ipif, which does encryption and can be used to join two hosts or whole networks. It uses its own nonstandard protocols, not IPSEC. Key setup is done via an ssh @@ -19,7 +21,7 @@ These tools have only been tested on GNU/Linux. The documentation available is: -INSTALL +INSTALL.udptunnel Build and install instructions for both ipif and udptunnel, and tutorial on setting up userv ipif and udptunnel in the usual way. |