aboutsummaryrefslogtreecommitdiff
path: root/irc/inspircd
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2019-07-06 17:48:54 +0000
committerSteve Wills <swills@FreeBSD.org>2019-07-06 17:48:54 +0000
commit038b39280ac95ea318324d031d9cc95ee80fb873 (patch)
tree910178af4d62a1ccb119a95e1e130d3543b080e0 /irc/inspircd
parentd67fbe0cd5d36e3b81bd22af2693a1855d3110ee (diff)
downloadports-038b39280ac95ea318324d031d9cc95ee80fb873.tar.gz
ports-038b39280ac95ea318324d031d9cc95ee80fb873.zip
irc/inspircd: update to 3.2.0
PR: 239017 Submitted by: Dmitri Goutnik <dg@syrec.org> (maintainer)
Notes
Notes: svn path=/head/; revision=506011
Diffstat (limited to 'irc/inspircd')
-rw-r--r--irc/inspircd/Makefile7
-rw-r--r--irc/inspircd/distinfo6
-rw-r--r--irc/inspircd/files/patch-configure6
-rw-r--r--irc/inspircd/files/patch-make_template_main.mk30
-rw-r--r--irc/inspircd/files/pkg-deinstall.in22
-rw-r--r--irc/inspircd/files/pkg-message.in29
-rw-r--r--irc/inspircd/pkg-message6
-rw-r--r--irc/inspircd/pkg-plist1
8 files changed, 55 insertions, 52 deletions
diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index ae4725643908..f439efc9673d 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= inspircd
DISTVERSIONPREFIX= v
-DISTVERSION= 3.1.0
+DISTVERSION= 3.2.0
CATEGORIES= irc
MAINTAINER= dg@syrec.org
@@ -28,7 +28,8 @@ CONFIGURE_ARGS= --binary-dir=${PREFIX}/bin \
--manual-dir=${MANPREFIX}/man/man1 \
--module-dir=${PREFIX}/libexec/${PORTNAME}/modules \
--prefix=${PREFIX}/libexec/${PORTNAME} \
- --distribution-label=${OPSYS}-${PORTVERSION}
+ --distribution-label=${OPSYS}-${PORTVERSION} \
+ --disable-auto-extras
USE_RC_SUBR= ${PORTNAME}
MAKEFILE= GNUmakefile
@@ -42,7 +43,7 @@ INSPIRCD_DBDIR?= /var/db/${PORTNAME}
INSPIRCD_LOGDIR?= /var/log/${PORTNAME}
INSPIRCD_RUNDIR?= /var/run/${PORTNAME}
-SUB_FILES= pkg-deinstall
+SUB_FILES= pkg-message
SUB_LIST= INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
INSPIRCD_GROUP=${GROUPS} \
INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \
diff --git a/irc/inspircd/distinfo b/irc/inspircd/distinfo
index fd43921492c2..920c9562386e 100644
--- a/irc/inspircd/distinfo
+++ b/irc/inspircd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558182673
-SHA256 (inspircd-inspircd-v3.1.0_GH0.tar.gz) = 5fd6b30e0285dd2bcf6fd135ffce52a08d8452f820a02e0068ac471e99d465ba
-SIZE (inspircd-inspircd-v3.1.0_GH0.tar.gz) = 795435
+TIMESTAMP = 1562413014
+SHA256 (inspircd-inspircd-v3.2.0_GH0.tar.gz) = 16d0b92a5610236e6cd2ece2a6a84eda1a16e4217f0e673ab089a25cf4001ef4
+SIZE (inspircd-inspircd-v3.2.0_GH0.tar.gz) = 799842
diff --git a/irc/inspircd/files/patch-configure b/irc/inspircd/files/patch-configure
index 3615046f139b..6dbe6e3e5fc1 100644
--- a/irc/inspircd/files/patch-configure
+++ b/irc/inspircd/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig 2019-05-10 20:05:04 UTC
+--- configure.orig 2019-07-05 09:09:06 UTC
+++ configure
-@@ -199,57 +199,10 @@ if (defined $opt_system) {
- $config{SCRIPT_DIR} = $opt_script_dir // $config{SCRIPT_DIR} // $config{BASE_DIR};
+@@ -207,57 +207,10 @@ if (defined $opt_system) {
+ $config{SCRIPT_DIR} = $opt_script_dir // $config{SCRIPT_DIR} // $config{BASE_DIR};
}
-# Parse --gid=123 or --gid=foo and extract the group id.
diff --git a/irc/inspircd/files/patch-make_template_main.mk b/irc/inspircd/files/patch-make_template_main.mk
index d2b788fecb50..674ad933e52c 100644
--- a/irc/inspircd/files/patch-make_template_main.mk
+++ b/irc/inspircd/files/patch-make_template_main.mk
@@ -1,15 +1,16 @@
---- make/template/main.mk.orig 2019-05-10 08:54:28 UTC
+--- make/template/main.mk.orig 2019-07-06 12:03:50 UTC
+++ make/template/main.mk
-@@ -203,32 +203,32 @@ finishmessage: target
+@@ -206,33 +206,33 @@ finishmessage: target
@echo "*************************************"
install: target
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BASE)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
@@ -18,11 +19,12 @@
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BASE)
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(DATPATH)
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/services
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/sql
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(LOGPATH)
-+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
-+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services
-+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(SCRPATH)
@@ -39,16 +41,16 @@
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
-+ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
-+ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
-+ -$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
++ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
++ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
++ -$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
+ -$(INSTALL) -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
@echo ""
@echo "*************************************"
diff --git a/irc/inspircd/files/pkg-deinstall.in b/irc/inspircd/files/pkg-deinstall.in
deleted file mode 100644
index 8646e9ca08a4..000000000000
--- a/irc/inspircd/files/pkg-deinstall.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-case $2 in
-POST-DEINSTALL)
- cat <<EOMSG
-
-To completely remove %%PORTNAME%%, you may wish to
-remove its configuration, database and log directories:
-
- # rm -rf %%ETCDIR%% \\
- %%INSPIRCD_DBDIR%% \\
- %%INSPIRCD_LOGDIR%% \\
- %%INSPIRCD_RUNDIR%%
-
-To remove the %%INSPIRCD_USER%% user and the %%INSPIRCD_GROUP%% group, run:
-
- # pw groupdel %%INSPIRCD_GROUP%%
- # pw userdel %%INSPIRCD_USER%%
-
-EOMSG
-esac
diff --git a/irc/inspircd/files/pkg-message.in b/irc/inspircd/files/pkg-message.in
new file mode 100644
index 000000000000..27224df24b7d
--- /dev/null
+++ b/irc/inspircd/files/pkg-message.in
@@ -0,0 +1,29 @@
+[
+{
+ type: upgrade,
+ maximum_version: 3,
+ message: <<EOM
+InspIRCd v3 has many configuration changes that are not backwards
+compatible with InspIRCd v2. Please review
+https://docs.inspircd.org/3/configuration-changes/ and update your
+configuration files accrdingly.
+EOM
+}
+{
+ type: remove,
+ message: <<EOM
+To completely remove %%PORTNAME%%, you may wish to remove its
+configuration, database and log directories:
+
+ # rm -rf %%ETCDIR%% \\
+ %%INSPIRCD_DBDIR%% \\
+ %%INSPIRCD_LOGDIR%% \\
+ %%INSPIRCD_RUNDIR%%
+
+To remove the %%INSPIRCD_USER%% user and the %%INSPIRCD_GROUP%% group, run:
+
+ # pw groupdel %%INSPIRCD_GROUP%%
+ # pw userdel %%INSPIRCD_USER%%
+EOM
+}
+]
diff --git a/irc/inspircd/pkg-message b/irc/inspircd/pkg-message
deleted file mode 100644
index 4d1504bfb700..000000000000
--- a/irc/inspircd/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-========================================================================
-InspIRCd v3 has many configuration changes that are not backwards
-compatible with InspIRCd v2. If you are upgrading from v2, please review
-https://docs.inspircd.org/3/configuration-changes/ and update your
-configuration files accrdingly.
-========================================================================
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index f3a9e3267024..c6d9b583aa39 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -190,7 +190,6 @@ libexec/inspircd/modules/m_sqlauth.so
libexec/inspircd/modules/m_sqloper.so
libexec/inspircd/modules/m_sslinfo.so
libexec/inspircd/modules/m_sslmodes.so
-libexec/inspircd/modules/m_sslrehashsignal.so
libexec/inspircd/modules/m_starttls.so
libexec/inspircd/modules/m_stripcolor.so
libexec/inspircd/modules/m_svshold.so
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 10:33:40 +0000