* REAMDE, copyright: Correct locations for GPL, and contact info.
* Update to GPLv3+; update copyright notices everywhere.
* ipif: Update docs to reflect fact that we are now using tun/tap.
+ * ipif: Deprecate udptunnel.
--
build:
$(checkdir)
- set -e; for s in $(subdirs_build); do $(MAKE) -C $$s all; done
+ set -e; for s in $(subdirs_build); do \
+ $(MAKE) -C $$s all depr=disable; \
+ done
touch build
clean:
etcdir=$t/userv-$$s/etc \
vardir=$t/userv-$$s/var \
gituser=root; \
+ depr=disable; \
done
#
mv debian/tmp/userv-www-cgi debian/tmp/userv-cgi
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)
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 \
* 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
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.