Update chat/unrealircd to 3.2.10.5.

pkgsrc changes: - Remove obsolete and broken MESSAGE files. - Find zlib correctly when enabled. - Add SMF manifest. - Update patch files and add comments where necessary. Upstream changes: - This release fixes a SASL Denial of Service issue Patch provided by Marco Wessel in TritonDataCenter/pkgsrc#306.
jsonn · Nov 26, 2015 · 12965b6 · 12965b6
1 parent b45a9fd
commit 12965b6
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 83 deletions.
diff --git a/chat/unrealircd/MESSAGE b/chat/unrealircd/MESSAGE
diff --git a/chat/unrealircd/MESSAGE.inet6 b/chat/unrealircd/MESSAGE.inet6
diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2015/11/07 22:52:04 dholland Exp $
+# $NetBSD: Makefile,v 1.44 2015/11/26 16:36:00 jperkin Exp $
 
-DISTNAME=	Unreal3.2.10.4
+DISTNAME=	Unreal3.2.10.5
 PKGNAME=	${DISTNAME:tl:S/l/lircd-/1}
 PKGREVISION=	1
 CATEGORIES=	chat
@@ -74,8 +74,6 @@ PKG_HOME.${UIRCD_USER}=		${UIRCD_HOME}
 
 RCD_SCRIPTS=	unrealircd
 
-MESSAGE_SRC+=	MESSAGE
-MESSAGE_SUBST+=	UIRCD_HOME=${UIRCD_HOME}
 FILES_SUBST+=	UIRCD_HOME=${UIRCD_HOME}
 FILES_SUBST+=	UIRCD_USER=${UIRCD_USER}
 FILES_SUBST+=	UIRCD_GROUP=${UIRCD_GROUP}

diff --git a/chat/unrealircd/distinfo b/chat/unrealircd/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.18 2015/11/07 22:52:54 dholland Exp $
+$NetBSD: distinfo,v 1.19 2015/11/26 16:36:00 jperkin Exp $
 
-SHA1 (Unreal3.2.10.4.tar.gz) = fa2b828b98afeab8677cb04aed9a634f7e43c386
-RMD160 (Unreal3.2.10.4.tar.gz) = 07c4854a59432dfa8a2ef16c5c9517e08b20cb6b
-SHA512 (Unreal3.2.10.4.tar.gz) = eeecefe79cadf3efa1b9379d4b675c0b86a2dd91e703f9e4b3998331f56b923d3719c67482f464f9b1699f801e0a83d677ada642ea7037c52a9d5db63abe6a5c
-Size (Unreal3.2.10.4.tar.gz) = 3540227 bytes
-SHA1 (patch-ab) = b66ae1990e25479abe9087a9308a2185692fcba2
-SHA1 (patch-ac) = 7b2909bc4c9676440d752675a42115c3b3fc3a1c
-SHA1 (patch-ae) = ec6baaa921a9ee9cf8e494da4185b22697299545
-SHA1 (patch-af) = 9e81feddf3a25bdfedd0b27b6a2853b264f40fa5
-SHA1 (patch-src_modules_m__cycle.c) = 9841937064cf0573dd3bb9d0cc8bc77c4e850bcc
-SHA1 (patch-src_modules_m__rping.c) = 505f36bb4dcb4d0c7f0b25d7ec357c85e791c012
-SHA1 (patch-src_modules_m__svsjoin.c) = 9ca6d9c32637ce8b68633bdd539e612af26b2672
-SHA1 (patch-src_modules_m__svspart.c) = 62ba995e3808c1558595ec8e36daa6a60697eab9
-SHA1 (patch-src_modules_m__svssilence.c) = 2eb10a6343ea3417073266df5c70fbb872bdfc9f
-SHA1 (patch-src_modules_m__svswatch.c) = efc0bdee6a8e0039db5604d50babe7e5c92dbbad
-SHA1 (patch-src_modules_m__vhost.c) = 80c528b455f0821d75622afde90b06c3c256cf6f
+SHA1 (Unreal3.2.10.5.tar.gz) = 3a8823e79c8c89ac8339e105c6c0b6a2a76f6097
+RMD160 (Unreal3.2.10.5.tar.gz) = 4acf7edbadeca5679a22a09d16e08873f1e61e8b
+SHA512 (Unreal3.2.10.5.tar.gz) = 98c71a958f3b620ff4c9d83279c508e13bdd76cc9d191ac021c4ef57eaf6a549345c0b2c1f8c550f29c2d79f8f257a176ae73e73dcbab839715462aa4b80565e
+Size (Unreal3.2.10.5.tar.gz) = 3538121 bytes
+SHA1 (patch-ab) = 3c36478f05d9acffa0c0b51ca0c4a4d313252687
+SHA1 (patch-ac) = f0d882e6caae52527f6ad9cc2bb5657d0288d852
+SHA1 (patch-ae) = 0a3a072871295f5108d439770609e8e4c4036d7b
+SHA1 (patch-af) = a00efce16f294aa1675cc8cc4fb5b5ada3c7146e
+SHA1 (patch-src_modules_m__cycle.c) = 05944483d7b7584e03f883bd3dcd30fdaec0526f
+SHA1 (patch-src_modules_m__rping.c) = 799e8d26b4916fdf7a251bae49da594fc19f8612
+SHA1 (patch-src_modules_m__svsjoin.c) = 6af54f4e141674d8a207213a0de28289cbbe8ba1
+SHA1 (patch-src_modules_m__svspart.c) = 898ef5c57238071aa796fef4226e70156b0d29ff
+SHA1 (patch-src_modules_m__svssilence.c) = 5e3bb9eae6557196069fba081828d90e107226e2
+SHA1 (patch-src_modules_m__svswatch.c) = 2be4f2218edd263ccdef4f8fd8c6f5c06d78166f
+SHA1 (patch-src_modules_m__vhost.c) = 080b1c827e575d7fbdab760b05bfdd10b9413b88
diff --git a/chat/unrealircd/files/smf/manifest.xml b/chat/unrealircd/files/smf/manifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="@SMF_NAME@">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name='network' grouping='require_all' restart_on='error' type='service'>
+      <service_fmri value='svc:/milestone/network:default' />
+    </dependency>
+    <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local:default' />
+    </dependency>
+    <method_context>
+      <method_credential user='@UIRCD_USER@' group='@UIRCD_GROUP@' />
+    </method_context>
+    <exec_method type="method" name="start" exec="@PREFIX@/sbin/ircd -f %{config_file} -F" timeout_seconds="60" />
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+    <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="child" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@UIRCD_HOME@/unrealircd.conf" />
+    </property_group>
+    <stability value="Evolving" />
+    <template>
+      <common_name>
+        <loctext xml:lang="C">UnrealIRCD IRC server</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
diff --git a/chat/unrealircd/options.mk b/chat/unrealircd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2015/11/07 22:52:04 dholland Exp $
+# $NetBSD: options.mk,v 1.16 2015/11/26 16:36:00 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unrealircd
 
@@ -17,7 +17,6 @@ PKG_SUGGESTED_OPTIONS=	unrealircd-showlistmodes unrealircd-prefixaq
 ###
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-inet6
-MESSAGE_SRC+=		MESSAGE_SRC.inet6
 .else
 CONFIGURE_ARGS+=	--disable-inet6
 CONFIGURE_ENV+=		ac_cv_ip6=no
@@ -43,7 +42,7 @@ CONFIGURE_ARGS+=	--enable-nospoof
 ### server <-> server with zlib.
 ###
 .if !empty(PKG_OPTIONS:Munrealircd-ziplinks)
-CONFIGURE_ARGS+=		--enable-ziplinks
+CONFIGURE_ARGS+=		--enable-ziplinks=${BUILDLINK_PREFIX.zlib}
 .	include "../../devel/zlib/buildlink3.mk"
 .endif
 

diff --git a/chat/unrealircd/patches/patch-ab b/chat/unrealircd/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/11/29 19:17:03 adrianp Exp $
+$NetBSD: patch-ab,v 1.2 2015/11/26 16:36:00 jperkin Exp $
 
---- Makefile.in.orig	2005-11-29 18:38:58.000000000 +0000
+Remove LDFLAGS from CFLAGS.
+
+--- Makefile.in.orig	2015-11-09 16:16:59.000000000 +0000
 +++ Makefile.in
-@@ -112,7 +112,7 @@ FD_SETSIZE=@FD_SETSIZE@
+@@ -114,7 +114,7 @@ FD_SETSIZE=@FD_SETSIZE@
  # Where is your openssl binary
  OPENSSLPATH=@OPENSSLPATH@
 

diff --git a/chat/unrealircd/patches/patch-ac b/chat/unrealircd/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2015/11/07 22:52:54 dholland Exp $
+$NetBSD: patch-ac,v 1.3 2015/11/26 16:36:00 jperkin Exp $
 
 Don't declare own errno.
 
---- include/h.h.orig	2005-12-16 15:19:27.000000000 +0000
+--- include/h.h.orig	2015-11-09 16:16:59.000000000 +0000
 +++ include/h.h
-@@ -227,7 +227,7 @@ extern int vsnprintf (char *str, size_t 
+@@ -237,7 +237,7 @@ extern int vsnprintf (char *str, size_t 
  #ifdef _WIN32
  extern MODVAR int dbufalloc, dbufblocks, debuglevel;
  #else

diff --git a/chat/unrealircd/patches/patch-ae b/chat/unrealircd/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2015/11/07 22:52:54 dholland Exp $
+$NetBSD: patch-ae,v 1.3 2015/11/26 16:36:00 jperkin Exp $
 
 Don't declare own errno.
 
---- src/socket.c.orig	2005-12-16 15:23:27.000000000 +0000
+--- src/socket.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/socket.c
 @@ -24,9 +24,6 @@
  #include "h.h"

diff --git a/chat/unrealircd/patches/patch-af b/chat/unrealircd/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.2 2015/11/07 22:52:54 dholland Exp $
+$NetBSD: patch-af,v 1.3 2015/11/26 16:36:00 jperkin Exp $
 
 Don't declare own errno.
 
---- src/support.c.orig	2005-12-16 15:26:56.000000000 +0000
+--- src/support.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/support.c
-@@ -40,7 +40,6 @@ static char sccsid[] = "@(#)support.c	2.
+@@ -42,7 +42,6 @@ extern gid_t irc_gid;
  #include <sys/socket.h>
  #include <string.h>
  #include <utime.h>

diff --git a/chat/unrealircd/patches/patch-src_modules_m__cycle.c b/chat/unrealircd/patches/patch-src_modules_m__cycle.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_modules_m__cycle.c,v 1.1 2015/11/07 22:46:25 dholland Exp $
+$NetBSD: patch-src_modules_m__cycle.c,v 1.2 2015/11/26 16:36:00 jperkin Exp $
 
 Avoid unnecessary use of legacy sys/timeb.h, which doesn't exist on OpenBSD.
 
---- src/modules/m_cycle.c~	2014-07-26 15:42:10.000000000 +0000
+--- src/modules/m_cycle.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/modules/m_cycle.c
 @@ -31,8 +31,8 @@
  #include <string.h>

diff --git a/chat/unrealircd/patches/patch-src_modules_m__rping.c b/chat/unrealircd/patches/patch-src_modules_m__rping.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_modules_m__rping.c,v 1.1 2015/11/07 22:46:25 dholland Exp $
+$NetBSD: patch-src_modules_m__rping.c,v 1.2 2015/11/26 16:36:00 jperkin Exp $
 
 Avoid unnecessary use of legacy sys/timeb.h, which doesn't exist on OpenBSD.
 
---- src/modules/m_rping.c~	2014-07-26 15:42:10.000000000 +0000
+--- src/modules/m_rping.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/modules/m_rping.c
 @@ -32,8 +32,8 @@
  #include <string.h>

diff --git a/chat/unrealircd/patches/patch-src_modules_m__svsjoin.c b/chat/unrealircd/patches/patch-src_modules_m__svsjoin.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_modules_m__svsjoin.c,v 1.1 2015/11/07 22:46:25 dholland Exp $
+$NetBSD: patch-src_modules_m__svsjoin.c,v 1.2 2015/11/26 16:36:00 jperkin Exp $
 
 Avoid unnecessary use of legacy sys/timeb.h, which doesn't exist on OpenBSD.
 
---- src/modules/m_svsjoin.c~	2014-07-26 15:42:10.000000000 +0000
+--- src/modules/m_svsjoin.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/modules/m_svsjoin.c
 @@ -31,8 +31,8 @@
  #include <string.h>

diff --git a/chat/unrealircd/patches/patch-src_modules_m__svspart.c b/chat/unrealircd/patches/patch-src_modules_m__svspart.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_modules_m__svspart.c,v 1.1 2015/11/07 22:46:25 dholland Exp $
+$NetBSD: patch-src_modules_m__svspart.c,v 1.2 2015/11/26 16:36:00 jperkin Exp $
 
 Avoid unnecessary use of legacy sys/timeb.h, which doesn't exist on OpenBSD.
 
---- src/modules/m_svspart.c~	2014-07-26 15:42:10.000000000 +0000
+--- src/modules/m_svspart.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/modules/m_svspart.c
 @@ -31,8 +31,8 @@
  #include <string.h>

diff --git a/chat/unrealircd/patches/patch-src_modules_m__svssilence.c b/chat/unrealircd/patches/patch-src_modules_m__svssilence.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_modules_m__svssilence.c,v 1.1 2015/11/07 22:46:25 dholland Exp $
+$NetBSD: patch-src_modules_m__svssilence.c,v 1.2 2015/11/26 16:36:00 jperkin Exp $
 
 Avoid unnecessary use of legacy sys/timeb.h, which doesn't exist on OpenBSD.
 
---- src/modules/m_svssilence.c~	2014-07-26 15:42:10.000000000 +0000
+--- src/modules/m_svssilence.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/modules/m_svssilence.c
 @@ -31,8 +31,8 @@
  #include <string.h>

diff --git a/chat/unrealircd/patches/patch-src_modules_m__svswatch.c b/chat/unrealircd/patches/patch-src_modules_m__svswatch.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_modules_m__svswatch.c,v 1.1 2015/11/07 22:46:25 dholland Exp $
+$NetBSD: patch-src_modules_m__svswatch.c,v 1.2 2015/11/26 16:36:00 jperkin Exp $
 
 Avoid unnecessary use of legacy sys/timeb.h, which doesn't exist on OpenBSD.
 
---- src/modules/m_svswatch.c~	2014-07-26 15:42:10.000000000 +0000
+--- src/modules/m_svswatch.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/modules/m_svswatch.c
 @@ -31,8 +31,8 @@
  #include <string.h>

diff --git a/chat/unrealircd/patches/patch-src_modules_m__vhost.c b/chat/unrealircd/patches/patch-src_modules_m__vhost.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_modules_m__vhost.c,v 1.1 2015/11/07 22:46:25 dholland Exp $
+$NetBSD: patch-src_modules_m__vhost.c,v 1.2 2015/11/26 16:36:00 jperkin Exp $
 
 Avoid unnecessary use of legacy sys/timeb.h, which doesn't exist on OpenBSD.
 
---- src/modules/m_vhost.c~	2014-07-26 15:42:10.000000000 +0000
+--- src/modules/m_vhost.c.orig	2015-11-09 16:16:59.000000000 +0000
 +++ src/modules/m_vhost.c
 @@ -32,8 +32,8 @@
  #include <string.h>