Due to the way we build libunbound inside of unwind .o files collide in

the obj directory. Previously this was solved by keeping the libunbound
file name (to be able to keep in sync with upstream) and prefixing
the source filename of colliding .o files in unwind with uw_.

However, these files are shared through out our tree (namely parse.y,
log.c and log.h) and we try to keep them in sync.

Move files back to their original name and instead symlink colliding source
files in libunbound to unique filenames by prefixing them with the directory
they live in:
obj/sldns_parse.c -> /usr/src/sbin/unwind/libunbound/sldns/parse.c
obj/util_log.c -> /usr/src/sbin/unwind/libunbound/util/log.c

Idea to use symlinks deraadt@ via jsg@
OK benno

11 files changed, 33 insertions, 22 deletions

diff --git a/sbin/unwind/Makefile b/sbin/unwind/Makefile
index 563e6a9cc89..b48a14ce4b1 100644
--- a/sbin/unwind/Makefile
+++ b/sbin/unwind/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 2019/02/03 12:02:30 florian Exp $
+#	$OpenBSD: Makefile,v 1.4 2019/03/01 08:02:25 florian Exp $
 
 PROG=	unwind
-SRCS=	control.c resolver.c frontend.c uw_log.c unwind.c uw_parse.y printconf.c
+SRCS=	control.c resolver.c frontend.c log.c unwind.c parse.y printconf.c
 SRCS+=	captiveportal.c
 MAN=	unwind.8 unwind.conf.5
 
diff --git a/sbin/unwind/captiveportal.c b/sbin/unwind/captiveportal.c
index d4e1b5fb5f3..a38a887f4fa 100644
--- a/sbin/unwind/captiveportal.c
+++ b/sbin/unwind/captiveportal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: captiveportal.c,v 1.7 2019/02/18 16:52:18 deraadt Exp $	*/
+/*	$OpenBSD: captiveportal.c,v 1.8 2019/03/01 08:02:25 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <vis.h>
 
-#include "uw_log.h"
+#include "log.h"
 #include "unwind.h"
 #include "captiveportal.h"
 
diff --git a/sbin/unwind/control.c b/sbin/unwind/control.c
index f2a948734d4..f1135befb1c 100644
--- a/sbin/unwind/control.c
+++ b/sbin/unwind/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.9 2019/02/18 07:50:14 florian Exp $	*/
+/*	$OpenBSD: control.c,v 1.10 2019/03/01 08:02:25 florian Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "uw_log.h"
+#include "log.h"
 #include "unwind.h"
 #include "control.h"
 #include "frontend.h"
diff --git a/sbin/unwind/frontend.c b/sbin/unwind/frontend.c
index 9c6bc62a5ef..ebe1a3c79b8 100644
--- a/sbin/unwind/frontend.c
+++ b/sbin/unwind/frontend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frontend.c,v 1.15 2019/02/18 07:50:14 florian Exp $	*/
+/*	$OpenBSD: frontend.c,v 1.16 2019/03/01 08:02:25 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -48,7 +48,7 @@
 #include "libunbound/sldns/str2wire.h"
 #include "libunbound/sldns/wire2str.h"
 
-#include "uw_log.h"
+#include "log.h"
 #include "unwind.h"
 #include "frontend.h"
 #include "control.h"
diff --git a/sbin/unwind/libunbound/sldns/Makefile.inc b/sbin/unwind/libunbound/sldns/Makefile.inc
index 5685a50c03c..f7718a9cc90 100644
--- a/sbin/unwind/libunbound/sldns/Makefile.inc
+++ b/sbin/unwind/libunbound/sldns/Makefile.inc
@@ -1,5 +1,11 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2019/01/23 13:05:27 florian Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2019/03/01 08:02:25 florian Exp $
 
 .PATH: ${.CURDIR}/libunbound/sldns
 
-SRCS+=	keyraw.c parse.c parseutil.c rrdef.c sbuffer.c str2wire.c wire2str.c
+SRCS+=	keyraw.c parseutil.c rrdef.c sbuffer.c sldns_parse.c str2wire.c \
+	wire2str.c
+
+sldns_parse.c:
+	ln -s ${.CURDIR}/libunbound/sldns/parse.c $@
+
+CLEANFILES+=	sldns_parse.c
diff --git a/sbin/unwind/libunbound/util/Makefile.inc b/sbin/unwind/libunbound/util/Makefile.inc
index 03e0a67d923..358298fe00e 100644
--- a/sbin/unwind/libunbound/util/Makefile.inc
+++ b/sbin/unwind/libunbound/util/Makefile.inc
@@ -1,8 +1,13 @@
-#	$OpenBSD: Makefile.inc,v 1.2 2019/01/25 12:15:49 florian Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 2019/03/01 08:02:25 florian Exp $
 
 .PATH: ${.CURDIR}/libunbound/util
 
 SRCS+=	alloc.c as112.c config_file.c configlexer.c configparser.y edns.c \
-	fptr_wlist.c locks.c log.c mini_event.c module.c net_help.c netevent.c \
+	fptr_wlist.c locks.c mini_event.c module.c net_help.c netevent.c \
 	random.c rbtree.c regional.c rtt.c tcp_conn_limit.c timehist.c tube.c \
-	ub_event.c winsock_event.c
+	ub_event.c util_log.c winsock_event.c
+
+util_log.c:
+	ln -s ${.CURDIR}/libunbound/util/log.c $@
+
+CLEANFILES+=	util_log.c
diff --git a/sbin/unwind/uw_log.c b/sbin/unwind/log.c
index 8967fd00556..dd88fb1bc14 100644
--- a/sbin/unwind/uw_log.c
+++ b/sbin/unwind/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uw_log.c,v 1.1 2019/01/23 13:11:00 florian Exp $	*/
+/*	$OpenBSD: log.c,v 1.1 2019/03/01 08:02:25 florian Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <time.h>
 
-#include "uw_log.h"
+#include "log.h"
 
 static int		 debug;
 static int		 verbose;
diff --git a/sbin/unwind/uw_log.h b/sbin/unwind/log.h
index f9c3041ba3d..9fc959a44a9 100644
--- a/sbin/unwind/uw_log.h
+++ b/sbin/unwind/log.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uw_log.h,v 1.1 2019/01/23 13:11:00 florian Exp $ */
+/*	$OpenBSD: log.h,v 1.1 2019/03/01 08:02:25 florian Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
diff --git a/sbin/unwind/uw_parse.y b/sbin/unwind/parse.y
index b312671d289..5691b9d7a36 100644
--- a/sbin/unwind/uw_parse.y
+++ b/sbin/unwind/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uw_parse.y,v 1.11 2019/02/17 14:49:15 florian Exp $	*/
+/*	$OpenBSD: parse.y,v 1.1 2019/03/01 08:02:25 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -39,7 +39,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "uw_log.h"
+#include "log.h"
 #include "unwind.h"
 
 TAILQ_HEAD(files, file)		 files = TAILQ_HEAD_INITIALIZER(files);
diff --git a/sbin/unwind/resolver.c b/sbin/unwind/resolver.c
index ae48d6e4207..61caebcb790 100644
--- a/sbin/unwind/resolver.c
+++ b/sbin/unwind/resolver.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolver.c,v 1.20 2019/02/18 07:50:14 florian Exp $	*/
+/*	$OpenBSD: resolver.c,v 1.21 2019/03/01 08:02:25 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -51,7 +51,7 @@
 #include <openssl/crypto.h>
 
 #include "captiveportal.h"
-#include "uw_log.h"
+#include "log.h"
 #include "frontend.h"
 #include "unwind.h"
 #include "resolver.h"
diff --git a/sbin/unwind/unwind.c b/sbin/unwind/unwind.c
index 9c005d26e17..8445d1915da 100644
--- a/sbin/unwind/unwind.c
+++ b/sbin/unwind/unwind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwind.c,v 1.16 2019/02/18 07:50:14 florian Exp $	*/
+/*	$OpenBSD: unwind.c,v 1.17 2019/03/01 08:02:25 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -41,7 +41,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "uw_log.h"
+#include "log.h"
 #include "unwind.h"
 #include "frontend.h"
 #include "resolver.h"