From 42d996b30db516fe4d560523b398996bff976e64 Mon Sep 17 00:00:00 2001
From: gdt <gdt>
Date: Fri, 6 Jan 2017 01:55:12 +0000
Subject: Update to 2.5.0; upstream changes:

 * Do not attempt to reload SM modules on SIGHUP
 * Cleanup config files example
 * Fixed memory leak in pgsql storage driver
 * Fixed two double-frees caused by dangling pointers
 * Fixed c2s logger initialization point

On NetBSD, sm receives a SIGHUP shortly after being started from rc.d,
which causes a crash.  With 2.5.0, sm starts correctly on boot.

Drop MESSAGE; reading NEWS on updating is standard practice and not
special about jabberd.
---
 chat/jabberd2/MESSAGE  |  6 ------
 chat/jabberd2/Makefile |  5 ++---
 chat/jabberd2/distinfo | 10 +++++-----
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 chat/jabberd2/MESSAGE

diff --git a/chat/jabberd2/MESSAGE b/chat/jabberd2/MESSAGE
deleted file mode 100644
index b0eee9fb637..00000000000
--- a/chat/jabberd2/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2013/12/12 23:01:02 schnoebe Exp $
-
-	Review ${PREFIX}/share/doc/jabberd/NEWS if you're upgrading
-	from an earlier release of Jabberd 2.x.
-===========================================================================
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index ea368f47235..2079c31b19c 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.114 2016/12/12 14:22:01 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2017/01/06 01:55:12 gdt Exp $
 
-DISTNAME=	jabberd-2.4.0
-PKGREVISION=	4
+DISTNAME=	jabberd-2.5.0
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jabberd2/jabberd2/releases/download/${DISTNAME}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 6a336b4c271..73ab8b2bf65 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.39 2016/05/25 16:24:54 schnoebe Exp $
+$NetBSD: distinfo,v 1.40 2017/01/06 01:55:12 gdt Exp $
 
-SHA1 (jabberd-2.4.0.tar.xz) = 6c51b4fe77d917d46f63864d3852877c1ed722a9
-RMD160 (jabberd-2.4.0.tar.xz) = c4d07cc205199df808977104d9309ad01fcc0dff
-SHA512 (jabberd-2.4.0.tar.xz) = eb621d2d76806361f54db49d1d3b2be0e0b5559f8ec64bc8ce8cd10f1455e8f4b98395cf790f969cb8ef63f2fa83f5974c5b70aaa82bbe670e1aa15a3d5a0a0b
-Size (jabberd-2.4.0.tar.xz) = 1507452 bytes
+SHA1 (jabberd-2.5.0.tar.xz) = 19462ae2c3ceaa0eb2ca306d1f80d421dd79cade
+RMD160 (jabberd-2.5.0.tar.xz) = 36aa01c9a16e91405c5413ceca2da780f0d3f43b
+SHA512 (jabberd-2.5.0.tar.xz) = e1298f42a199bb31cea324f239368327a259eaaa3e4624eac5b6aca983f32467c47248c57e4621fd7f7eb64a3b86d760f5e9a57b4307174d820d20e77ae3229e
+Size (jabberd-2.5.0.tar.xz) = 1507916 bytes
 SHA1 (patch-Makefile.in) = 31d8dc4a5446e96079e1016afb45dc7a602b98c9
-- 
cgit v1.2.3