From da654c9ea27085518e919199f21a6cd0a0d4097d Mon Sep 17 00:00:00 2001
From: he <he@pkgsrc.org>
Date: Thu, 13 Jul 2006 13:42:36 +0000
Subject: Make slpd reopen its log file on HUP (it does not use syslog - bah!).
 The log file needs to be writable for user=daemon, since slpd setuid()s to
 that user after starting up.

Put the extremely verbose and disk-filling logging of "Parse Erorr"
packets (is this an SLPv1 vs. SLPv2 protocol versioning issue gone
bad?!?) under DEBUG, which is not normally turned on in our builds.

Change HOMEPAGE, since Caldera appears to have seen fit to remove
the www.openslp.org DNS name and associated web server.  Instead point
to the SourceForge home page.

Bump package revision to 1.
---
 net/openslp/Makefile         |  5 +++--
 net/openslp/distinfo         |  4 +++-
 net/openslp/patches/patch-aj | 19 +++++++++++++++++++
 net/openslp/patches/patch-ak | 30 ++++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 net/openslp/patches/patch-aj
 create mode 100644 net/openslp/patches/patch-ak

(limited to 'net')

diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 64dab94b961..f0701b79c4b 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.30 2005/12/29 06:22:01 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/07/13 13:42:36 he Exp $
 
 DISTNAME=	openslp-1.2.1
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openslp/}
 
 MAINTAINER=	jlam@pkgsrc.org
-HOMEPAGE=	http://www.openslp.org/
+HOMEPAGE=	http://sourceforge.net/projects/openslp
 COMMENT=	Open-source implementation of the Service Location Protocol
 
 # Needs pkgviews-enabled automake
diff --git a/net/openslp/distinfo b/net/openslp/distinfo
index 99fae7169d2..86b8df4bd09 100644
--- a/net/openslp/distinfo
+++ b/net/openslp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/05/26 20:14:21 adrianp Exp $
+$NetBSD: distinfo,v 1.13 2006/07/13 13:42:36 he Exp $
 
 SHA1 (openslp-1.2.1.tar.gz) = 47ab19154084d2b467f09525f5351e9ab7193cf9
 RMD160 (openslp-1.2.1.tar.gz) = a31d516ba784ad893a740946082fe5e0f15a37ea
@@ -7,3 +7,5 @@ SHA1 (patch-ac) = 031177b9334b570e1021887ae2bdf56f4ba02c48
 SHA1 (patch-ae) = 1332580b2d9cb3e2e5c5da219c1036b9701161e5
 SHA1 (patch-ah) = f15c497b19f4bfc4efbd5cce0b50932733115824
 SHA1 (patch-ai) = 11baa3ef891677f1df78f75b93001580ff450e13
+SHA1 (patch-aj) = 8e1d32772cf59a938a4d9d9d0957d223f4ea6c06
+SHA1 (patch-ak) = e64ede590e4af9d8951177b68c4bbf1b56ebdfae
diff --git a/net/openslp/patches/patch-aj b/net/openslp/patches/patch-aj
new file mode 100644
index 00000000000..b35275e8329
--- /dev/null
+++ b/net/openslp/patches/patch-aj
@@ -0,0 +1,19 @@
+$NetBSD: patch-aj,v 1.1 2006/07/13 13:42:36 he Exp $
+
+--- slpd/slpd_main.c.orig	2005-02-09 00:24:53.000000000 +0100
++++ slpd/slpd_main.c
+@@ -208,6 +208,14 @@ void HandleSigTerm()
+ void HandleSigHup()
+ /*------------------------------------------------------------------------*/
+ {
++    /*------------------------------*/
++    /* Reinitialize the log file    */
++    /*------------------------------*/
++    if(SLPDLogFileOpen(G_SlpdCommandLine.logfile, 1))
++    {
++        SLPDFatal("Could not open logfile %s\n",G_SlpdCommandLine.logfile);
++    }
++
+     /* Reinitialize */
+     SLPDLog("****************************************\n");
+     SLPDLogTime();
diff --git a/net/openslp/patches/patch-ak b/net/openslp/patches/patch-ak
new file mode 100644
index 00000000000..2d3f6d62943
--- /dev/null
+++ b/net/openslp/patches/patch-ak
@@ -0,0 +1,30 @@
+$NetBSD: patch-ak,v 1.1 2006/07/13 13:42:36 he Exp $
+
+--- slpd/slpd_process.c.orig	2005-02-08 07:12:24.000000000 +0100
++++ slpd/slpd_process.c
+@@ -1438,10 +1438,12 @@ int SLPDProcessMessage(struct sockaddr_i
+                     break;
+                 }
+             }
++#ifdef DEBUG
+             else
+             {
+                 SLPDLogParseWarning(peerinfo, recvbuf);
+             }
++#endif
+                             
+             if (header.functionid == SLP_FUNCT_SRVREG ||
+                 header.functionid == SLP_FUNCT_DAADVERT )
+@@ -1470,10 +1472,12 @@ int SLPDProcessMessage(struct sockaddr_i
+             errorcode = SLP_ERROR_INTERNAL_ERROR;
+         }
+     }
++#ifdef DEBUG
+     else
+     {
+         SLPDLogParseWarning(peerinfo,recvbuf);
+     }
++#endif
+ 
+     FINISHED:
+ 
-- 
cgit v1.2.3