aboutsummaryrefslogtreecommitdiff
path: root/irc/inspircd
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2016-09-06 14:24:18 +0000
committerMark Felder <feld@FreeBSD.org>2016-09-06 14:24:18 +0000
commit4dec6bdd8bec5926bc28474ee6f0ae2fd06c7131 (patch)
tree9166633c98238f9af7c5b1cd06db0598c0bcf250 /irc/inspircd
parent7cda5a90ee7ac6fc4ce82187f6b1f9677e83e840 (diff)
downloadports-4dec6bdd8bec5926bc28474ee6f0ae2fd06c7131.tar.gz
ports-4dec6bdd8bec5926bc28474ee6f0ae2fd06c7131.zip
irc/inspircd: Update to 2.0.23
This update also resolves an authentication bypass vulnerability. Reported by: <dijit sh drk sc> MFH: 2016Q3
Notes
Notes: svn path=/head/; revision=421433
Diffstat (limited to 'irc/inspircd')
-rw-r--r--irc/inspircd/Makefile6
-rw-r--r--irc/inspircd/distinfo5
-rw-r--r--irc/inspircd/files/patch-make_template_main.mk17
-rw-r--r--irc/inspircd/pkg-plist2
4 files changed, 19 insertions, 11 deletions
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%%\""