From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Dec 2013 19:07:53 +0000 (+0000)
Subject: ipif: Deprecate udptunnel.
X-Git-Tag: userv/0.6.1~59
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=97f318e04ed0024b2bf5903215a75249401d3fd7;ds=sidebyside

ipif: Deprecate udptunnel.
---

diff --git a/debian/changelog b/debian/changelog
index 2009368..c8a0561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ userv-utils (0.6.0~~iwj1) unstable; urgency=low
   * 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.
 
  --
 
diff --git a/debian/rules b/debian/rules
index 345d645..dbe4360 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,9 @@ t=	$d/tmp
 
 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:
@@ -55,6 +57,7 @@ binary-prep:
 			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
diff --git a/ipif/INSTALL b/ipif/INSTALL.udptunnel
similarity index 100%
rename from ipif/INSTALL
rename to 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.