From 1d139989a32e61b08a6a3a62f91962f2010e6d75 Mon Sep 17 00:00:00 2001
From: weerd <weerd@openbsd.org>
Date: Wed, 26 May 2010 17:03:59 +0000
Subject: [PATCH] Update ladvd to 0.9.0. New version adds improved (aka sane)
 chrooting logic, better ifdescr support and support for vlan encapsulated
 advertisements amongst other things.

Tested on i386, amd64, sparc64 and arm by various people - thanks.
Brad reminded to switch off PIE on hppa.

ok stephan@ jasper@ kili@
---
 net/ladvd/Makefile                   |  7 +++----
 net/ladvd/distinfo                   | 10 +++++-----
 net/ladvd/patches/patch-configure_ac | 14 ++++++++------
 net/ladvd/pkg/PLIST                  |  4 +++-
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile
index a148dd4f725..1eef64ba4da 100644
--- a/net/ladvd/Makefile
+++ b/net/ladvd/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2010/04/21 22:57:04 alek Exp $
+# $OpenBSD: Makefile,v 1.7 2010/05/26 17:03:59 weerd Exp $
 
 COMMENT =		link advertisement (LLDP/CDP etc) daemon
 
-DISTNAME =		ladvd-0.8
-PKGNAME =		${DISTNAME}p0
+DISTNAME =		ladvd-0.9.0
 CATEGORIES =		net
 
 HOMEPAGE =		http://blinkenlights.nl/software/ladvd/
@@ -18,7 +17,7 @@ PERMIT_DISTFILES_FTP =	Yes
 
 MASTER_SITES =		${HOMEPAGE}
 
-AUTOCONF_VERSION =	2.61
+AUTOCONF_VERSION =	2.64
 CONFIGURE_STYLE =	gnu autoconf
 CONFIGURE_ARGS +=	--with-user=_ladvd --with-chroot-dir=/var/empty
 
diff --git a/net/ladvd/distinfo b/net/ladvd/distinfo
index 3fe20e9d388..11634de7807 100644
--- a/net/ladvd/distinfo
+++ b/net/ladvd/distinfo
@@ -1,5 +1,5 @@
-MD5 (ladvd-0.8.tar.gz) = moC0Wsgw+vAVHSNiOu1UlA==
-RMD160 (ladvd-0.8.tar.gz) = 1okcgtmULs7EvWqp/h8k2uHxy5Q=
-SHA1 (ladvd-0.8.tar.gz) = EjkqF1N+4ZxmjDkWW7gJHmmDoUk=
-SHA256 (ladvd-0.8.tar.gz) = 0FRT0/GPdgVuh2TDkz+zq+kitR3F64fM+ltObHVFYsc=
-SIZE (ladvd-0.8.tar.gz) = 398595
+MD5 (ladvd-0.9.0.tar.gz) = waTOwN2MvDEq2WRlYkSlxQ==
+RMD160 (ladvd-0.9.0.tar.gz) = F3rLY7XtqfKnppXkp8QBhkG1N58=
+SHA1 (ladvd-0.9.0.tar.gz) = mZEmVmXmx+m5CFJnGzYMeUFxxVU=
+SHA256 (ladvd-0.9.0.tar.gz) = BpxGsN6uANus356+TpXjGpOQvEvQmbYKNvSKaHood/g=
+SIZE (ladvd-0.9.0.tar.gz) = 397506
diff --git a/net/ladvd/patches/patch-configure_ac b/net/ladvd/patches/patch-configure_ac
index 703377b8d99..33b00bd81d9 100644
--- a/net/ladvd/patches/patch-configure_ac
+++ b/net/ladvd/patches/patch-configure_ac
@@ -1,13 +1,15 @@
-$OpenBSD: patch-configure_ac,v 1.1 2009/07/26 10:50:53 kili Exp $
---- configure.ac.orig	Sun Jun 21 21:43:51 2009
-+++ configure.ac	Wed Jul 22 12:29:58 2009
-@@ -31,6 +31,9 @@ case "$target_os" in
- 	AC_DEFINE([TARGET_IS_FREEBSD], 1, [Define if target OS is FreeBSD])
+$OpenBSD: patch-configure_ac,v 1.2 2010/05/26 17:03:59 weerd Exp $
+Disable PIE on ARM and HPPA
+--- configure.ac.orig	Thu May 20 11:17:15 2010
++++ configure.ac	Sat May 22 13:46:10 2010
+@@ -28,6 +28,10 @@ case "$target_os" in
+ 	use_pie=no
  	;;
      openbsd*)
 +	case "$target" in
 +	arm-*-openbsd*) use_pie=no;;
++	hppa-*-openbsd*) use_pie=no;;
 +	esac
- 	AC_DEFINE([TARGET_IS_OPENBSD], 1, [Define if target OS is OpenBSD])
  	;;
      *)
+ 	AC_MSG_ERROR([Unsupported operating system])
diff --git a/net/ladvd/pkg/PLIST b/net/ladvd/pkg/PLIST
index 135199702d9..54b8bf0a0a1 100644
--- a/net/ladvd/pkg/PLIST
+++ b/net/ladvd/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/07/15 08:51:35 weerd Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/05/26 17:03:59 weerd Exp $
 @newgroup _ladvd:606
 @newuser _ladvd:606:606:daemon:Link Advertisement Daemon:/var/empty:/sbin/nologin
 @man man/man8/ladvd.8
+@man man/man8/ladvdc.8
 @bin sbin/ladvd
+@bin sbin/ladvdc
 share/doc/ladvd/
 share/doc/ladvd/ChangeLog
 share/doc/ladvd/LICENSE