From 202a90e45177e00c0a4c808bb465b529b1198608 Mon Sep 17 00:00:00 2001
From: feld <feld@FreeBSD.org>
Date: Tue, 6 Sep 2016 14:24:18 +0000
Subject: irc/inspircd: Update to 2.0.23

This update also resolves an authentication bypass vulnerability.

Reported by:	<dijit sh drk sc>
MFH:		2016Q3
---
 irc/inspircd/Makefile                          |  6 +++---
 irc/inspircd/distinfo                          |  5 +++--
 irc/inspircd/files/patch-make_template_main.mk | 17 +++++++++++++----
 irc/inspircd/pkg-plist                         |  2 --
 4 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'irc')

diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index 6138030af23e..264906134e53 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	inspircd
-PORTVERSION=	2.0.20
+PORTVERSION=	2.0.23
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	irc
 
 MAINTAINER=	feld@FreeBSD.org
@@ -114,7 +114,7 @@ PLIST_SUB+=	GNUTLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=yes
+USES+=	ssl
 CONFIGURE_ARGS+=	--enable-openssl
 EXTRAS:=${EXTRAS},m_ssl_openssl.cpp
 PLIST_SUB+=	OPENSSL=""
diff --git a/irc/inspircd/distinfo b/irc/inspircd/distinfo
index 55ae6ce28cd3..ff35898d1adc 100644
--- a/irc/inspircd/distinfo
+++ b/irc/inspircd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (inspircd-inspircd-v2.0.20_GH0.tar.gz) = 5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f
-SIZE (inspircd-inspircd-v2.0.20_GH0.tar.gz) = 728970
+TIMESTAMP = 1473170069
+SHA256 (inspircd-inspircd-v2.0.23_GH0.tar.gz) = 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162
+SIZE (inspircd-inspircd-v2.0.23_GH0.tar.gz) = 731695
diff --git a/irc/inspircd/files/patch-make_template_main.mk b/irc/inspircd/files/patch-make_template_main.mk
index e3248d9525bc..706969bd908a 100644
--- a/irc/inspircd/files/patch-make_template_main.mk
+++ b/irc/inspircd/files/patch-make_template_main.mk
@@ -1,6 +1,6 @@
---- make/template/main.mk.orig	2012-07-13 10:38:01.000000000 -0500
-+++ make/template/main.mk	2012-08-14 23:58:06.816315279 -0500
-@@ -58,6 +58,10 @@
+--- make/template/main.mk.orig	2016-09-03 14:51:50 UTC
++++ make/template/main.mk
+@@ -61,6 +61,10 @@ INSTMODE_LIB = 0644
  @IFEQ $(SYSTEM) linux
    LDLIBS += -ldl -lrt
  @ENDIF
@@ -11,7 +11,7 @@
  @IFEQ $(SYSTEM) gnukfreebsd
    LDLIBS += -ldl -lrt
  @ENDIF
-@@ -124,7 +128,7 @@
+@@ -138,7 +142,7 @@ CXXFLAGS += -Iinclude
    CXXFLAGS += -DPURE_STATIC
  @ENDIF
  
@@ -20,3 +20,12 @@
  @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
  
  # Default target
+@@ -226,8 +230,6 @@ install: target
+ 		exit 1; \
+ 	fi
+ 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
+-	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
+-	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index 964b18190db7..4e19b16db800 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -223,6 +223,4 @@ lib/inspircd/modules/m_userip.so
 lib/inspircd/modules/m_vhost.so
 lib/inspircd/modules/m_watch.so
 lib/inspircd/modules/m_xline_db.so
-@dir lib/inspircd/data
-@dir lib/inspircd/logs
 @postunexec echo "If permanently removing software, you may wish to remove the configuration directory by running \"rm -rf %%PREFIX%%/%%ETCDIR%%\""
-- 
cgit 

.4</option>
<option value='dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8' selected='selected'>dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8</option>
<option value='dependabot/npm_and_yarn/devel/electron6/files/lodash-4.17.19'>dependabot/npm_and_yarn/devel/electron6/files/lodash-4.17.19</option>
<option value='dependabot/npm_and_yarn/devel/electron6/files/lodash.merge-4.6.2'>dependabot/npm_and_yarn/devel/electron6/files/lodash.merge-4.6.2</option>
<option value='dependabot/npm_and_yarn/devel/electron6/files/node-fetch-2.6.1'>dependabot/npm_and_yarn/devel/electron6/files/node-fetch-2.6.1</option>
<option value='dependabot/npm_and_yarn/devel/electron6/files/serve-10.1.2'>dependabot/npm_and_yarn/devel/electron6/files/serve-10.1.2</option>
<option value='gnome-3.22'>gnome-3.22</option>
<option value='gnome-3.24'>gnome-3.24</option>
<option value='gnome-3.26'>gnome-3.26</option>
<option value='gnome-3.28'>gnome-3.28</option>
<option value='gnome-3.32'>gnome-3.32</option>
<option value='gnome-3.36'>gnome-3.36</option>
<option value='gstreamer'>gstreamer</option>
<option value='gstreamer-1.16'>gstreamer-1.16</option>
<option value='gstreamer0.10-removal'>gstreamer0.10-removal</option>
<option value='main'>main</option>
<option value='master'>master</option>
<option value='mate-1.16'>mate-1.16</option>
<option value='mate-1.18'>mate-1.18</option>
<option value='mate-1.20'>mate-1.20</option>
<option value='mate-1.22'>mate-1.22</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>FreeBSD GNOME current development ports (https://github.com/freebsd/freebsd-ports-gnome)</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/~lantw44/cgit/freebsd-ports-gnome/about/?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8'>about</a><a href='/~lantw44/cgit/freebsd-ports-gnome/?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8'>summary</a><a href='/~lantw44/cgit/freebsd-ports-gnome/refs/?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&amp;id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438'>refs</a><a class='active' href='/~lantw44/cgit/freebsd-ports-gnome/log/net/p5-Queue-Beanstalk?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8'>log</a><a href='/~lantw44/cgit/freebsd-ports-gnome/tree/net/p5-Queue-Beanstalk?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&amp;id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438'>tree</a><a href='/~lantw44/cgit/freebsd-ports-gnome/commit/net/p5-Queue-Beanstalk?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&amp;id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438'>commit</a><a href='/~lantw44/cgit/freebsd-ports-gnome/diff/net/p5-Queue-Beanstalk?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&amp;id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438'>diff</a><a href='/~lantw44/cgit/freebsd-ports-gnome/stats/net/p5-Queue-Beanstalk?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8'>stats</a></td><td class='form'><form class='right' method='get' action='/~lantw44/cgit/freebsd-ports-gnome/log/net/p5-Queue-Beanstalk'>
<input type='hidden' name='h' value='dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8'/><input type='hidden' name='id' value='1f143fc8b2f5b6d5ff13d80a7511ebc932287438'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/~lantw44/cgit/freebsd-ports-gnome/log/?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&amp;id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438'>root</a>/<a href='/~lantw44/cgit/freebsd-ports-gnome/log/net?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&amp;id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438'>net</a>/<a href='/~lantw44/cgit/freebsd-ports-gnome/log/net/p5-Queue-Beanstalk?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&amp;id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438'>p5-Queue-Beanstalk</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/~lantw44/cgit/freebsd-ports-gnome/log/net/p5-Queue-Beanstalk?h=dependabot/npm_and_yarn/devel/electron6/files/ini-1.3.8&amp;id=1f143fc8b2f5b6d5ff13d80a7511ebc932287438&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Age</th><th class='left'>Files</th><th class='left'>Lines</th></tr>