Update net/openslp to 1.2.0. Changes from version 1.0.11 include:

* Support for SLP queries on multiple network interfaces
* Support for SLP query through a unicast
* DHCP code
* Added support for the net.slp.DAHeartBeat setting
* Make attribute compares case insensitive as per RFC 2608
* Added PID monitoring.  Now when the process that called SLPReg()
  (with SLP_REG_FLAG_WATCH_PID) dies the registration will automatically
  be deregistered.

patch-a[cdefg] fix compilation warnings and errors (all the world is not
Linux/i386).

12 files changed, 209 insertions, 140 deletions

diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 6a29641d6c7..da95afcd60b 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: Makefile,v 1.19 2004/11/27 04:41:12 jlam Exp $
 
-DISTNAME=	openslp-1.0.11
-PKGREVISION=	1
+DISTNAME=	openslp-1.2.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openslp/}
 
@@ -11,16 +10,17 @@ COMMENT=	Open-source implementation of the Service Location Protocol
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
-USE_PKGINSTALL=		YES
-USE_LIBTOOL=		YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=/var
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--enable-slpv2-security
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR} DOC_DIR=${DOCDIR}
 
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-HTMLDIR=		${PREFIX}/share/doc/html/${PKGBASE}
 
 CONFS=			slp.conf slp.reg slp.spi
 CONF_FILES=		# empty
@@ -29,21 +29,15 @@ CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 .endfor
 RCD_SCRIPTS=		slpd
 
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/automake.mk"
+
 post-extract:
 	${FIND} ${WRKSRC} -name "CVS" -print | ${XARGS} ${RM} -rf
+	${RM} -fr ${WRKSRC}/doc/html/UsersGuide/.xvpics
 
-post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/etc; for file in ${CONFS}; do			\
-		${INSTALL_DATA} $${file} ${EGDIR}/$${file};		\
-	done
-	${INSTALL_DATA} ${WRKSRC}/doc/rfc/* ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${HTMLDIR}
-	for d in IntroductionToSLP ProgrammersGuide UsersGuide; do	\
-		${INSTALL_DATA_DIR} ${HTMLDIR}/$${d};			\
-		${INSTALL_DATA} ${WRKSRC}/doc/html/$${d}/* ${HTMLDIR}/$${d}; \
-	done
+pre-configure:
+	cd ${WRKSRC} && ${ACLOCAL} && ${AUTOHEADER} && ${AUTOCONF} &&	\
+		${LOCALBASE}/bin/libtoolize && ${AUTOMAKE} --add-missing
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openslp/PLIST b/net/openslp/PLIST
index 9fd37c21c2a..9b50b51bc0f 100644
--- a/net/openslp/PLIST
+++ b/net/openslp/PLIST
@@ -1,71 +1,72 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:48 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/27 04:41:12 jlam Exp $
 bin/slptool
 include/slp.h
 lib/libslp.la
 sbin/slpd
-share/doc/html/${PKGBASE}/IntroductionToSLP/AgentInit.jpg
-share/doc/html/${PKGBASE}/IntroductionToSLP/ServiceReg.jpg
-share/doc/html/${PKGBASE}/IntroductionToSLP/ServiceRqst.jpg
-share/doc/html/${PKGBASE}/IntroductionToSLP/index.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/Callbacks.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/Divergence.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/Examples.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPAttrCallback.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPClose.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPDelAttrs.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPDereg.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPError.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPEscape.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFindAttrs.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFindScopes.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFindSrvTypes.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFindSrvs.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFree.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPGetProperty.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPGetRefreshInterval.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPOpen.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPParseSrvURL.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPReg.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPRegReport.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPSetProperty.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPSrvTypeCallback.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPSrvURLCallback.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPTypes.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/SLPUnescape.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/Security.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/Syntax.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/index.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/openslp_security_whitepaper.html
-share/doc/html/${PKGBASE}/ProgrammersGuide/smalllogo.jpg
-share/doc/html/${PKGBASE}/UsersGuide/CommandLine.html
-share/doc/html/${PKGBASE}/UsersGuide/FileLocations.html
-share/doc/html/${PKGBASE}/UsersGuide/Installation.html
-share/doc/html/${PKGBASE}/UsersGuide/Optimization.html
-share/doc/html/${PKGBASE}/UsersGuide/Security.html
-share/doc/html/${PKGBASE}/UsersGuide/SlpConf.html
-share/doc/html/${PKGBASE}/UsersGuide/SlpReg.html
-share/doc/html/${PKGBASE}/UsersGuide/UserFAQ.html
-share/doc/html/${PKGBASE}/UsersGuide/WhenToRunSlpd.html
-share/doc/html/${PKGBASE}/UsersGuide/WhoShouldRead.html
-share/doc/html/${PKGBASE}/UsersGuide/index.html
-share/doc/html/${PKGBASE}/UsersGuide/smalllogo.jpg
-share/doc/html/${PKGBASE}/faq.html
-share/doc/${PKGBASE}/rfc1766.txt
-share/doc/${PKGBASE}/rfc2165.txt
-share/doc/${PKGBASE}/rfc2254.txt
-share/doc/${PKGBASE}/rfc2396.txt
-share/doc/${PKGBASE}/rfc2608.txt
-share/doc/${PKGBASE}/rfc2609.txt
-share/doc/${PKGBASE}/rfc2610.txt
-share/doc/${PKGBASE}/rfc2614.txt
-share/doc/${PKGBASE}/srvreg-integrity.txt
-share/doc/${PKGBASE}/threat_analysis_min_security.html
-share/examples/${PKGBASE}/slp.conf
-share/examples/${PKGBASE}/slp.reg
-share/examples/${PKGBASE}/slp.spi
-@dirrm share/examples/${PKGBASE}
-@dirrm share/doc/${PKGBASE}
-@dirrm share/doc/html/${PKGBASE}/UsersGuide
-@dirrm share/doc/html/${PKGBASE}/ProgrammersGuide
-@dirrm share/doc/html/${PKGBASE}/IntroductionToSLP
-@dirrm share/doc/html/${PKGBASE}
+share/doc/openslp/html/IntroductionToSLP/AgentInit.jpg
+share/doc/openslp/html/IntroductionToSLP/ServiceReg.jpg
+share/doc/openslp/html/IntroductionToSLP/ServiceRqst.jpg
+share/doc/openslp/html/IntroductionToSLP/index.html
+share/doc/openslp/html/ProgrammersGuide/Callbacks.html
+share/doc/openslp/html/ProgrammersGuide/Divergence.html
+share/doc/openslp/html/ProgrammersGuide/Examples.html
+share/doc/openslp/html/ProgrammersGuide/SLPAttrCallback.html
+share/doc/openslp/html/ProgrammersGuide/SLPClose.html
+share/doc/openslp/html/ProgrammersGuide/SLPDelAttrs.html
+share/doc/openslp/html/ProgrammersGuide/SLPDereg.html
+share/doc/openslp/html/ProgrammersGuide/SLPError.html
+share/doc/openslp/html/ProgrammersGuide/SLPEscape.html
+share/doc/openslp/html/ProgrammersGuide/SLPFindAttrs.html
+share/doc/openslp/html/ProgrammersGuide/SLPFindScopes.html
+share/doc/openslp/html/ProgrammersGuide/SLPFindSrvTypes.html
+share/doc/openslp/html/ProgrammersGuide/SLPFindSrvs.html
+share/doc/openslp/html/ProgrammersGuide/SLPFree.html
+share/doc/openslp/html/ProgrammersGuide/SLPGetProperty.html
+share/doc/openslp/html/ProgrammersGuide/SLPGetRefreshInterval.html
+share/doc/openslp/html/ProgrammersGuide/SLPOpen.html
+share/doc/openslp/html/ProgrammersGuide/SLPParseSrvURL.html
+share/doc/openslp/html/ProgrammersGuide/SLPReg.html
+share/doc/openslp/html/ProgrammersGuide/SLPRegReport.html
+share/doc/openslp/html/ProgrammersGuide/SLPSetProperty.html
+share/doc/openslp/html/ProgrammersGuide/SLPSrvTypeCallback.html
+share/doc/openslp/html/ProgrammersGuide/SLPSrvURLCallback.html
+share/doc/openslp/html/ProgrammersGuide/SLPTypes.html
+share/doc/openslp/html/ProgrammersGuide/SLPUnescape.html
+share/doc/openslp/html/ProgrammersGuide/Security.html
+share/doc/openslp/html/ProgrammersGuide/Syntax.html
+share/doc/openslp/html/ProgrammersGuide/index.html
+share/doc/openslp/html/ProgrammersGuide/openslp_security_whitepaper.html
+share/doc/openslp/html/ProgrammersGuide/smalllogo.jpg
+share/doc/openslp/html/UsersGuide/CommandLine.html
+share/doc/openslp/html/UsersGuide/FileLocations.html
+share/doc/openslp/html/UsersGuide/Installation.html
+share/doc/openslp/html/UsersGuide/Optimization.html
+share/doc/openslp/html/UsersGuide/Security.html
+share/doc/openslp/html/UsersGuide/SlpConf.html
+share/doc/openslp/html/UsersGuide/SlpReg.html
+share/doc/openslp/html/UsersGuide/UserFAQ.html
+share/doc/openslp/html/UsersGuide/WhenToRunSlpd.html
+share/doc/openslp/html/UsersGuide/WhoShouldRead.html
+share/doc/openslp/html/UsersGuide/index.html
+share/doc/openslp/html/UsersGuide/smalllogo.jpg
+share/doc/openslp/html/faq.html
+share/doc/openslp/rfc/rfc1766.txt
+share/doc/openslp/rfc/rfc2165.txt
+share/doc/openslp/rfc/rfc2254.txt
+share/doc/openslp/rfc/rfc2396.txt
+share/doc/openslp/rfc/rfc2608.txt
+share/doc/openslp/rfc/rfc2609.txt
+share/doc/openslp/rfc/rfc2610.txt
+share/doc/openslp/rfc/rfc2614.txt
+share/doc/openslp/rfc/srvreg-integrity.txt
+share/doc/openslp/rfc/threat_analysis_min_security.html
+share/examples/openslp/slp.conf
+share/examples/openslp/slp.reg
+share/examples/openslp/slp.spi
+@dirrm share/examples/openslp
+@dirrm share/doc/openslp/rfc
+@dirrm share/doc/openslp/html/UsersGuide
+@dirrm share/doc/openslp/html/ProgrammersGuide
+@dirrm share/doc/openslp/html/IntroductionToSLP
+@dirrm share/doc/openslp/html
+@dirrm share/doc/openslp
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index 5a3f5ba2035..736e0709779 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/11/27 04:41:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSLP_BUILDLINK3_MK:=	${OPENSLP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	openslp
 
 .if !empty(OPENSLP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.openslp+=	openslp>=1.0.1
-BUILDLINK_RECOMMENDED.openslp+=	openslp>=1.0.11nb1
+BUILDLINK_RECOMMENDED.openslp+=	openslp>=1.2.0
 BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
 .endif	# OPENSLP_BUILDLINK3_MK
 
diff --git a/net/openslp/distinfo b/net/openslp/distinfo
index 63ee96707ed..2feba97d10d 100644
--- a/net/openslp/distinfo
+++ b/net/openslp/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.8 2004/04/28 11:48:54 adam Exp $
+$NetBSD: distinfo,v 1.9 2004/11/27 04:41:12 jlam Exp $
 
-SHA1 (openslp-1.0.11.tar.gz) = 222afa54b565b19f0de942f7b686d883c3a9fa2c
-Size (openslp-1.0.11.tar.gz) = 608138 bytes
-SHA1 (patch-aa) = fc8420f9bc0834e7c80cee1a1b3eb551ab6cc9a1
-SHA1 (patch-ab) = 9d9bd52b40ab2ffa6b619bbdf93453f2c9b3aebd
+SHA1 (openslp-1.2.0.tar.gz) = 3525c74b1f8a56fe96fbca24c603bbe43028cc2b
+Size (openslp-1.2.0.tar.gz) = 548410 bytes
+SHA1 (patch-ac) = 7f051530c654d92139ea03f8e33cd8f87720133f
+SHA1 (patch-ad) = 6b1f63d5ad1a6893fbf402f897700e4fa01ce161
+SHA1 (patch-ae) = 805c12cceaf338f2d5fcc5b47ef68ebe11d0a046
+SHA1 (patch-af) = 7f62a8532f14370415def8e0fa59c4ca7c6c9c4c
+SHA1 (patch-ag) = 6cf63c299bd04854df7e3272c1f3036c82ff5337
diff --git a/net/openslp/files/slpd.sh b/net/openslp/files/slpd.sh
index 436d078c348..06ed3f3efb3 100644
--- a/net/openslp/files/slpd.sh
+++ b/net/openslp/files/slpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: slpd.sh,v 1.9 2002/10/20 07:57:57 jlam Exp $
+# $NetBSD: slpd.sh,v 1.10 2004/11/27 04:41:12 jlam Exp $
 #
 # Service Location Protocol daemon
 #
@@ -15,7 +15,7 @@ fi
 name="slpd"
 rcvar=${name}
 command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}.pid"
 required_files="@PKG_SYSCONFDIR@/slp.conf"
 
 if [ -f /etc/rc.subr ]
diff --git a/net/openslp/patches/patch-aa b/net/openslp/patches/patch-aa
deleted file mode 100644
index c6565417d7c..00000000000
--- a/net/openslp/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/05/27 22:52:35 jlam Exp $
-
---- Makefile.in.orig	Mon Mar 10 23:24:25 2003
-+++ Makefile.in	Sun May 25 19:04:48 2003
-@@ -333,24 +333,6 @@
- 
- 
- install-data-local:
--	mkdir -p $(DESTDIR)$(sysconfdir)
--	file=$(DESTDIR)$(sysconfdir)/slp.reg;\
--        if [ -f $$file ]; then true;\
--	else cp -f $(srcdir)/etc/slp.reg $(DESTDIR)$(sysconfdir);\
--	fi
--	file=$(DESTDIR)$(sysconfdir)/slp.conf;\
--	if [ -f $$file ]; then true;\
--	else cp -f $(srcdir)/etc/slp.conf \
--	$(DESTDIR)$(sysconfdir);\
--	fi
--	file=$(DESTDIR)$(sysconfdir)/slp.spi;\
--	if [ -f $$file ]; then true;\
--	else cp -f $(srcdir)/etc/slp.spi $(DESTDIR)$(sysconfdir);\
--	fi
--	rm -rf $(DESTDIR)$(DOC_DIR)
--	mkdir -p $(DESTDIR)$(DOC_DIR)
--	cp -r $(srcdir)/doc/* $(DESTDIR)$(DOC_DIR)
--#	rm -rf `find $(DESTDIR)$(DOC_DIR) -name CVS`
- 
- dist-hook:
- #	rm -rf `find $(distdir)/doc -name CVS`
diff --git a/net/openslp/patches/patch-ab b/net/openslp/patches/patch-ab
deleted file mode 100644
index 4749a186a8c..00000000000
--- a/net/openslp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/04/28 11:49:12 adam Exp $
-
---- configure.orig	2004-04-28 13:40:34.000000000 +0000
-+++ configure
-@@ -1810,7 +1810,7 @@ if test X"$GCC" = X"yes"; then	
-        CFLAGS="$CFLAGS -Werror"
-     fi
-     if test X"$debug" = X"no"; then 
--       OPTFLAGS="-O3"
-+       OPTFLAGS=""
-     fi
-     
- elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
diff --git a/net/openslp/patches/patch-ac b/net/openslp/patches/patch-ac
new file mode 100644
index 00000000000..55f2a6a661e
--- /dev/null
+++ b/net/openslp/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/11/27 04:41:12 jlam Exp $
+
+--- configure.in.orig	2004-02-04 15:07:33.000000000 -0500
++++ configure.in
+@@ -155,7 +155,7 @@ dnl ************************************
+ dnl Checks for header files.
+ dnl ***********************************************************************
+ AC_STDC_HEADERS
+-AC_HAVE_HEADERS(string.h sys/types.h stdint.h netinet/in.h)
++AC_HAVE_HEADERS(string.h sys/types.h stdint.h netinet/in.h bits/ioctls.h)
+ 
+ dnl ***********************************************************************
+ dnl Checks for data types.
diff --git a/net/openslp/patches/patch-ad b/net/openslp/patches/patch-ad
new file mode 100644
index 00000000000..94fb73d39fe
--- /dev/null
+++ b/net/openslp/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2004/11/27 04:41:12 jlam Exp $
+
+--- common/slp_dhcp.c.orig	2003-02-12 17:18:16.000000000 -0500
++++ common/slp_dhcp.c
+@@ -66,7 +66,9 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <net/if_arp.h>
++#if HAVE_BITS_IOCTLS_H
+ #include <bits/ioctls.h>
++#endif
+ #include <sys/time.h>
+ #endif
+ 
diff --git a/net/openslp/patches/patch-ae b/net/openslp/patches/patch-ae
new file mode 100644
index 00000000000..2d42daab45f
--- /dev/null
+++ b/net/openslp/patches/patch-ae
@@ -0,0 +1,34 @@
+$NetBSD: patch-ae,v 1.1 2004/11/27 04:41:12 jlam Exp $
+
+--- common/slp_attr_l.l.orig	2002-05-10 01:23:43.000000000 -0400
++++ common/slp_attr_l.l
+@@ -82,9 +82,9 @@ int slp_attr_wrap(void);
+ 
+ int slp_attr_lex(void);
+ 
+-void slp_attr_close_lexer(unsigned int handle);
++void slp_attr_close_lexer(unsigned long handle);
+ 
+-uint slp_attr_init_lexer(char *s);
++unsigned long slp_attr_init_lexer(char *s);
+ 
+ 
+ %}
+@@ -194,14 +194,14 @@ val				[^(),\\!<>~\x00-\x1f*_\r\n\t]
+ 
+ %%
+ 
+-unsigned int slp_attr_init_lexer(char *s)
++unsigned long slp_attr_init_lexer(char *s)
+ {
+     memset(&buf[0], 0x00, 2052);
+     strncpy(&buf[0], s, 2052);
+-    return((uint)yy_scan_buffer(&buf[0], strlen(s) + 2));
++    return((unsigned long)yy_scan_buffer(&buf[0], strlen(s) + 2));
+ }
+ 
+-void attr_close_lexer(uint handle)
++void attr_close_lexer(unsigned long handle)
+ {
+     // assert(handle != 0);
+     yy_delete_buffer((YY_BUFFER_STATE)handle);
diff --git a/net/openslp/patches/patch-af b/net/openslp/patches/patch-af
new file mode 100644
index 00000000000..ffc6fb51bc1
--- /dev/null
+++ b/net/openslp/patches/patch-af
@@ -0,0 +1,36 @@
+$NetBSD: patch-af,v 1.1 2004/11/27 04:41:12 jlam Exp $
+
+--- common/slp_filter_l.l.orig	2002-05-10 01:23:43.000000000 -0400
++++ common/slp_filter_l.l
+@@ -76,9 +76,9 @@ static char buf[2052];
+ 
+ void slp_filter_error(char *, ...);
+ 
+-void slp_filter_close_lexer(unsigned int handle);
++void slp_filter_close_lexer(unsigned long handle);
+ 
+-unsigned int slp_filter_init_lexer(const char *s);
++unsigned long slp_filter_init_lexer(const char *s);
+ 
+ %}
+ 
+@@ -150,16 +150,16 @@ not_reserved            [^()\&|!=<>~\n] 
+ 
+ %%
+ 
+-void filter_close_lexer(unsigned int handle)
++void filter_close_lexer(unsigned long handle)
+ {
+     yy_delete_buffer((YY_BUFFER_STATE)handle);
+ }
+ 
+-unsigned int slp_filter_init_lexer(const char *s)
++unsigned long slp_filter_init_lexer(const char *s)
+ {
+     memset(&buf[0], 0x00, 2052);
+     strncpy(&buf[0], s, 2048);
+-    return((uint)yy_scan_buffer(&buf[0], strlen(s) + 2));
++    return((unsigned long)yy_scan_buffer(&buf[0], strlen(s) + 2));
+ }
+ 
+ void slp_filter_error(char *s, ...)
diff --git a/net/openslp/patches/patch-ag b/net/openslp/patches/patch-ag
new file mode 100644
index 00000000000..cfa1ed9a814
--- /dev/null
+++ b/net/openslp/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2004/11/27 04:41:12 jlam Exp $
+
+--- common/slp_spi.c.orig	2002-09-10 00:38:25.000000000 -0400
++++ common/slp_spi.c
+@@ -267,9 +267,9 @@ SLPSpiHandle SLPSpiOpen(const char* spif
+     fp = fopen(spifile,"r");
+     if(fp)
+     {
+-        result = xmalloc(sizeof(structSLPSpiHandle));
++        result = xmalloc(sizeof(*result));
+         if(result == 0) return 0;
+-        memset(result, 0, sizeof(structSLPSpiHandle));
++        memset(result, 0, sizeof(*result));
+         
+         result->spifile = xstrdup(spifile);
+         result->cacheprivate = cacheprivate;