ports/154998: [PATCH] irc/inspircd: update to 2.0.2
Ayumi Mitsui
ayu at commun.jp
Thu Feb 24 09:50:12 UTC 2011
>Number: 154998
>Category: ports
>Synopsis: [PATCH] irc/inspircd: update to 2.0.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 24 09:50:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ayumi Mitsui
>Release: FreeBSD 8.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dahlia.commun.jp 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:36:49 UTC 2010
>Description:
- Update to 2.0.2
Added file(s):
- files/inspircd.in
- files/patch-src::inspircd.cpp
Removed file(s):
- files/extra-patch-src__modules__extra__m_ldapauth.cpp
- files/extra-patch-src__modules__extra__m_ssl_openssl.cpp
- files/inspircd.sh.in
- files/patch-configure
- files/patch-m_ssl_gnutls.cpp
Tested with Tinderbox:
http://tinderbox.commun.jp/index.php?action=describe_port&id=62
Port maintainer (brain at inspircd.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- inspircd-2.0.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/Makefile /usr/ports/irc/inspircd/Makefile
--- /usr/ports/irc/inspircd-1.1.20/Makefile 2011-02-14 07:40:54.000000000 +0900
+++ /usr/ports/irc/inspircd/Makefile 2010-12-11 22:46:03.000000000 +0900
@@ -2,25 +2,22 @@
# Date created: 25 August 2006
# Whom: brain
#
-# $FreeBSD: ports/irc/inspircd/Makefile,v 1.13 2011/02/13 22:40:54 pav Exp $
+# $FreeBSD: ports/irc/inspircd/Makefile,v 1.12 2010/06/02 15:35:11 pav Exp $
#
PORTNAME= inspircd
-PORTVERSION= 1.1.20
+PORTVERSION= 2.0.2
CATEGORIES= irc
-MASTER_SITES= http://www.inspircd.org/downloads/ \
- http://www.chatspike.net/downloads/
+MASTER_SITES= SF/${PORTNAME}/InspIRCd-2.0/${PORTVERSION}
DISTNAME= InspIRCd-${PORTVERSION}
MAINTAINER= brain at inspircd.org
COMMENT= A modular C++ IRC daemon
-WRKSRC= ${WRKDIR}/inspircd
-USE_GMAKE= yes
+#WRKSRC= ${WRKDIR}/{$PORTNAME}
USE_BZIP2= yes
-USE_LDCONFIG= ${PREFIX}/lib/inspircd
-USE_RC_SUBR= inspircd.sh
-MAKE_JOBS_UNSAFE= yes
+USE_RC_SUBR= ${PORTNAME}
+MAKEFILE= BSDmakefile
INSPIRCD_USR?= ircd
INSPIRCD_UID?= 72
@@ -38,44 +35,32 @@
PLIST_SUB+= INSPIRCD_GRP=${INSPIRCD_GRP}
SUB_FILES+= pkg-install pkg-deinstall
-USE_OPENSSL= yes
-OPENSSL_PORT?= security/openssl
-
# Configure script is written in perl
USE_PERL5_BUILD=yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --with-cc=${CXX} --config-dir=${ETCDIR} \
+CONFIGURE_ARGS= --with-cc=${CXX} --config-dir=${ETCDIR} \
--module-dir=${PREFIX}/lib/${PORTNAME}/modules \
--library-dir=${PREFIX}/lib/${PORTNAME} \
- --prefix=${PREFIX}/${PORTNAME} --binary-dir=${PREFIX}/bin \
- --enable-ipv6 --enable-remote-ipv6 --disable-interactive
+ --prefix=${PREFIX}/lib/${PORTNAME} --binary-dir=${PREFIX}/bin \
+ --enable-kqueue --enable-ipv6 --disable-interactive \
+ --uid=${INSPIRCD_UID}
-OPTIONS= FILTER_PCRE "Build m_filter_pcre module" off \
- LDAPAUTH "Build m_ldapauth module" off \
+OPTIONS= LDAPAUTH "Build m_ldapauth module" off \
MYSQL "Build m_mysql module" off \
PGSQL "Build m_pgsql module" off \
SQLITE3 "Build m_sqlite3 module" off \
- SQLMODULES "Build m_sql{log,oper,utils,auth}" off \
GNUTLS "Build m_ssl_gnutls module" off \
- OPENSSL "Build m_ssl_openssl module" off \
- SSLMODULES "Build m_ssl_{info,oper_cert}" off \
- ZIPLINK "Build m_ziplink module" off
+ OPENSSL "Build m_ssl_openssl module" off
.include <bsd.port.pre.mk>
-.if defined(WITH_FILTER_PCRE) && !defined(WITHOUT_FILTER_PCRE)
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-SYMLINK_FILES+= m_filter_pcre.cpp
-PLIST_SUB+= FILTER_PCRE=""
-.else
-PLIST_SUB+= FILTER_PCRE="@comment "
-.endif
+post-extract:
+ @(cd ${WRKDIR} && ${MV} ${PORTNAME} ${DISTNAME})
.if defined(WITH_LDAPAUTH) && !defined(WITHOUT_LDAPAUTH)
USE_OPENLDAP= yes
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__modules__extra__m_ldapauth.cpp
-SYMLINK_FILES+= m_ldapauth.cpp
+EXTRAS:=${EXTRAS},m_ldapauth.cpp
PLIST_SUB+= LDAPAUTH=""
.else
PLIST_SUB+= LDAPAUTH="@comment "
@@ -83,7 +68,7 @@
.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
USE_MYSQL= yes
-SYMLINK_FILES+= m_mysql.cpp m_sqlv2.h
+EXTRAS:=${EXTRAS},m_mysql.cpp
PLIST_SUB+= MYSQL=""
.else
PLIST_SUB+= MYSQL="@comment "
@@ -91,7 +76,7 @@
.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
USE_PGSQL= yes
-SYMLINK_FILES+= m_pgsql.cpp m_sqlv2.h
+EXTRAS:=${EXTRAS},m_pgsql.cpp
PLIST_SUB+= PGSQL=""
.else
PLIST_SUB+= PGSQL="@comment "
@@ -99,95 +84,43 @@
.if defined(WITH_SQLITE3) && !defined(WITHOUT_SQLITE3)
USE_SQLITE= 3
-SYMLINK_FILES+= m_sqlite3.cpp m_sqlv2.h
+EXTRAS:=${EXTRAS},m_sqlite3.cpp
PLIST_SUB+= SQLITE3=""
.else
PLIST_SUB+= SQLITE3="@comment "
.endif
-.if defined(WITH_SQLMODULES) && !defined(WITHOUT_SQLMODULES)
-.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE3)
-BROKEN= Please enable at least one of MYSQL, PGSQL or SQLITE3 required by SQLMODULES
-.endif
-SYMLINK_FILES+= m_sqlauth.cpp m_sqllog.cpp m_sqloper.cpp m_sqlutils.cpp \
- m_sqlutils.h
-PLIST_SUB+= SQLMODULES=""
-.else
-PLIST_SUB+= SQLMODULES="@comment "
-.endif
-
.if defined(WITH_GNUTLS) && !defined(WITHOUT_GNUTLS)
LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+= --enable-gnutls
-SYMLINK_FILES+= m_ssl_gnutls.cpp
PLIST_SUB+= GNUTLS=""
.else
PLIST_SUB+= GNUTLS="@comment "
.endif
.if defined(WITH_OPENSSL) && !defined(WITHOUT_OPENSSL)
-# I'd like to say USE_OPENSSL=yes here but that's not allowed.
-# Failing that maybe?: .include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.include <${PORTSDIR}/Mk/bsd.openssl.mk>
CONFIGURE_ARGS+= --enable-openssl
-SYMLINK_FILES+= m_ssl_openssl.cpp
PLIST_SUB+= OPENSSL=""
-
-# The configure script tries to run 'pkg-config --libs openssl' in
-# order to work out how to link against openssl. This works fine if
-# OpenSSL is installed as a port, but not if the base system version
-# is being used.
-.if defined(WITH_OPENSSL_BASE)
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__modules__extra__m_ssl_openssl.cpp
-.endif
-
.else
PLIST_SUB+= OPENSSL="@comment "
.endif
-.if defined(WITH_SSLMODULES) && !defined(WITHOUT_SSLMODULES)
-.if !defined(WITH_GNUTLS) && !defined(WITH_OPENSSL)
-BROKEN= Please enable at least one of GNUTLS or OPENSSL required by SSLMODULES
-.endif
-SYMLINK_FILES+= m_ssl_oper_cert.cpp m_sslinfo.cpp
-PLIST_SUB+= SSLMODULES=""
-.else
-PLIST_SUB+= SSLMODULES="@comment "
-.endif
-
-.if defined(WITH_ZIPLINK) && !defined(WITHOUT_ZIPLINK)
-SYMLINK_FILES+= m_ziplink.cpp
-PLIST_SUB+= ZIPLINK=""
-.else
-PLIST_SUB+= ZIPLINK="@comment "
-.endif
-
-CXXFLAGS+= -I${LOCALBASE}/include
-
-post-patch:
- ${REINPLACE_CMD} -e '/INSTMODE/s|700|755|;/install -d.*BINPATH/d'\
- -e 's,FLAGS = @FLAGS@,FLAGS = ${CXXFLAGS} @FLAGS@,' \
- ${WRKSRC}/.Makefile.inc
-
-.for f in ${SYMLINK_FILES}
-pre-configure::
- cd ${WRKSRC}/src/modules && \
- ${TEST} -L ${f} || \
- ${LN} -s extra/${f} ${f}
-.endfor
+CONFIGURE_ARGS+= --enable-extras=${EXTRAS}
pre-install:
${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/modules/*.so
- @${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/*.so
@${STRIP_CMD} ${PREFIX}/bin/${PORTNAME}
${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.for FILE in censor conf filter helpop-full helpop motd quotes rules
- @if ${TEST} -f ${ETCDIR}/${PORTNAME}.${FILE} && \
- ${TEST} ! -f ${ETCDIR}/${PORTNAME}.${FILE}.example ; then \
- ${CP} -p ${ETCDIR}/${PORTNAME}.${FILE}.example \
- ${ETCDIR}/${PORTNAME}.${FILE}; \
+.for FILE in inspircd.censor inspircd.conf inspircd.filter inspircd.helpop-full \
+ inspircd.helpop inspircd.motd inspircd.quotes inspircd.rules links.conf modules.conf opers.conf
+ @if ${TEST} -f ${ETCDIR}/${FILE} && \
+ ${TEST} ! -f ${ETCDIR}/${FILE}.example ; then \
+ ${CP} -p ${ETCDIR}/${FILE}.example \
+ ${ETCDIR}/${FILE}; \
fi
.endfor
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/distinfo /usr/ports/irc/inspircd/distinfo
--- /usr/ports/irc/inspircd-1.1.20/distinfo 2009-09-13 08:20:26.000000000 +0900
+++ /usr/ports/irc/inspircd/distinfo 2010-12-11 03:50:39.000000000 +0900
@@ -1,3 +1,2 @@
-MD5 (InspIRCd-1.1.20.tar.bz2) = ed2baad75c131b25b5ebb723c58eb651
-SHA256 (InspIRCd-1.1.20.tar.bz2) = 2a3d3488aae899fd4ae3987cc8a1ee7681c4d0dc931d0ad1ff62d2d248d2dbeb
-SIZE (InspIRCd-1.1.20.tar.bz2) = 505952
+SHA256 (InspIRCd-2.0.2.tar.bz2) = 2ebd2af56da57d68f779c1f707c804b7a480d50c8c943d440f78732e416ab220
+SIZE (InspIRCd-2.0.2.tar.bz2) = 583791
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/files/extra-patch-src__modules__extra__m_ldapauth.cpp /usr/ports/irc/inspircd/files/extra-patch-src__modules__extra__m_ldapauth.cpp
--- /usr/ports/irc/inspircd-1.1.20/files/extra-patch-src__modules__extra__m_ldapauth.cpp 2008-05-19 16:01:38.000000000 +0900
+++ /usr/ports/irc/inspircd/files/extra-patch-src__modules__extra__m_ldapauth.cpp 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- ./src/modules/extra/m_ldapauth.cpp.orig 2008-03-15 13:33:33.000000000 +0000
-+++ ./src/modules/extra/m_ldapauth.cpp 2008-04-11 13:34:37.000000000 +0100
-@@ -29,7 +29,7 @@
- #include <ldap.h>
-
- /* $ModDesc: Allow/Deny connections based upon answer from LDAP server */
--/* $LinkerFlags: -lldap */
-+/* $LinkerFlags: -L/usr/local/lib -lldap */
-
- class ModuleLDAPAuth : public Module
- {
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/files/extra-patch-src__modules__extra__m_ssl_openssl.cpp /usr/ports/irc/inspircd/files/extra-patch-src__modules__extra__m_ssl_openssl.cpp
--- /usr/ports/irc/inspircd-1.1.20/files/extra-patch-src__modules__extra__m_ssl_openssl.cpp 2008-05-19 16:01:38.000000000 +0900
+++ /usr/ports/irc/inspircd/files/extra-patch-src__modules__extra__m_ssl_openssl.cpp 1970-01-01 09:00:00.000000000 +0900
@@ -1,12 +0,0 @@
---- ./src/modules/extra/m_ssl_openssl.cpp.orig 2008-04-18 09:13:19.000000000 +0100
-+++ ./src/modules/extra/m_ssl_openssl.cpp 2008-04-18 09:14:44.000000000 +0100
-@@ -38,8 +38,7 @@
- #endif
-
- /* $ModDesc: Provides SSL support for clients */
--/* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
--/* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
-+/* $LinkerFlags: -lssl -lcrypto */
- /* $ModDep: transport.h */
-
- enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/files/inspircd.in /usr/ports/irc/inspircd/files/inspircd.in
--- /usr/ports/irc/inspircd-1.1.20/files/inspircd.in 1970-01-01 09:00:00.000000000 +0900
+++ /usr/ports/irc/inspircd/files/inspircd.in 2010-12-11 03:50:28.000000000 +0900
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/irc/inspircd/files/inspircd.sh.in,v 1.2 2009/07/15 16:55:44 dougb Exp $
+#
+# PROVIDE: %%PORTNAME%%
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%:
+#
+# %%PORTNAME%%_enable="YES"
+#
+# Other rc.conf variables:
+# %%PORTNAME%%_flags="<set as needed>"
+#
+# %%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf"
+# -- path to config file
+# %%PORTNAME%%_pidfile="%%INSPIRCD_RUN%%/%%PORTNAME%%.pid"
+# -- location of pidfile: must match setting
+# in ${%%PORTNAME%%_conffile}
+# %%PORTNAME%%_user="%%INSPIRCD_USR%%"
+# -- user to run %%PORTNAME%% as
+# %%PORTNAME%%_group="%%INSPIRCD_GRP%%"
+# -- group to run %%PORTNAME%% as
+# %%PORTNAME%%_logfile="%%INSPIRCD_LOG%%"
+# -- file %%PORTNAME%% writes logs to
+#
+. /etc/rc.subr
+
+name=%%PORTNAME%%
+rcvar=`set_rcvar`
+
+load_rc_config ${name}
+
+: ${%%PORTNAME%%_enable="NO"}
+: ${%%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf"}
+: ${%%PORTNAME%%_pidfile="%%INSPIRCD_RUN%%/%%PORTNAME%%.pid"}
+: ${%%PORTNAME%%_user="%%INSPIRCD_USR%%"}
+: ${%%PORTNAME%%_group="%%INSPIRCD_GRP%%"}
+: ${%%PORTNAME%%_logfile="%%INSPIRCD_LOG%%"}
+
+command=%%PREFIX%%/bin/%%PORTNAME%%
+pidfile=${%%PORTNAME%%_pidfile}
+required_files=${%%PORTNAME%%_config}
+start_precmd=%%PORTNAME%%_prestart
+
+%%PORTNAME%%_prestart ()
+{
+ piddir=$(dirname ${%%PORTNAME%%_pidfile})
+ if [ ! -d ${piddir} ]; then
+ mkdir -m 755 -p ${piddir}
+ chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} ${piddir}
+ fi
+ logdir=$(dirname ${%%PORTNAME%%_logfile})
+ if [ ! -d ${logdir} ]; then
+ mkdir -m 755 -p ${logdir}
+ chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} ${logdir}
+ fi
+}
+
+case "${%%PORTNAME%%_flags}" in
+ *--config\ *)
+ echo "Warning \$%%PORTNAME%%_flags includes --config option." \
+ "Please use \$%%PORTNAME%%_config instead."
+ ;;
+ *--logfile\ *)
+ echo "Warning \$%%PORTNAME%%_flags includes --logfile option." \
+ "Please use \$%%PORTNAME%%_logfile instead."
+ ;;
+ *)
+ %%PORTNAME%%_flags="${%%PORTNAME%%_flags} --logfile ${%%PORTNAME%%_logfile} --config ${%%PORTNAME%%_config}"
+ ;;
+esac
+
+run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/files/inspircd.sh.in /usr/ports/irc/inspircd/files/inspircd.sh.in
--- /usr/ports/irc/inspircd-1.1.20/files/inspircd.sh.in 2009-07-16 01:55:44.000000000 +0900
+++ /usr/ports/irc/inspircd/files/inspircd.sh.in 1970-01-01 09:00:00.000000000 +0900
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/irc/inspircd/files/inspircd.sh.in,v 1.2 2009/07/15 16:55:44 dougb Exp $
-#
-# PROVIDE: %%PORTNAME%%
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%:
-#
-# %%PORTNAME%%_enable="YES"
-#
-# Other rc.conf variables:
-# %%PORTNAME%%_flags="<set as needed>"
-#
-# %%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf"
-# -- path to config file
-# %%PORTNAME%%_pidfile="%%INSPIRCD_RUN%%/%%PORTNAME%%.pid"
-# -- location of pidfile: must match setting
-# in ${%%PORTNAME%%_conffile}
-# %%PORTNAME%%_user="%%INSPIRCD_USR%%"
-# -- user to run %%PORTNAME%% as
-# %%PORTNAME%%_group="%%INSPIRCD_GRP%%"
-# -- group to run %%PORTNAME%% as
-# %%PORTNAME%%_logfile="%%INSPIRCD_LOG%%"
-# -- file %%PORTNAME%% writes logs to
-#
-. /etc/rc.subr
-
-name=%%PORTNAME%%
-rcvar=`set_rcvar`
-
-load_rc_config ${name}
-
-: ${%%PORTNAME%%_enable="NO"}
-: ${%%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf"}
-: ${%%PORTNAME%%_pidfile="%%INSPIRCD_RUN%%/%%PORTNAME%%.pid"}
-: ${%%PORTNAME%%_user="%%INSPIRCD_USR%%"}
-: ${%%PORTNAME%%_group="%%INSPIRCD_GRP%%"}
-: ${%%PORTNAME%%_logfile="%%INSPIRCD_LOG%%"}
-
-command=%%PREFIX%%/bin/%%PORTNAME%%
-pidfile=${%%PORTNAME%%_pidfile}
-required_files=${%%PORTNAME%%_config}
-start_precmd=%%PORTNAME%%_prestart
-
-%%PORTNAME%%_prestart ()
-{
- piddir=$(dirname ${%%PORTNAME%%_pidfile})
- if [ ! -d ${piddir} ]; then
- mkdir -m 755 -p ${piddir}
- chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} ${piddir}
- fi
- logdir=$(dirname ${%%PORTNAME%%_logfile})
- if [ ! -d ${logdir} ]; then
- mkdir -m 755 -p ${logdir}
- chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} ${logdir}
- fi
-}
-
-case "${%%PORTNAME%%_flags}" in
- *--config\ *)
- echo "Warning \$%%PORTNAME%%_flags includes --config option." \
- "Please use \$%%PORTNAME%%_config instead."
- ;;
- *--logfile\ *)
- echo "Warning \$%%PORTNAME%%_flags includes --logfile option." \
- "Please use \$%%PORTNAME%%_logfile instead."
- ;;
- *)
- %%PORTNAME%%_flags="${%%PORTNAME%%_flags} --logfile ${%%PORTNAME%%_logfile} --config ${%%PORTNAME%%_config}"
- ;;
-esac
-
-run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/files/patch-configure /usr/ports/irc/inspircd/files/patch-configure
--- /usr/ports/irc/inspircd-1.1.20/files/patch-configure 2010-06-03 00:35:11.000000000 +0900
+++ /usr/ports/irc/inspircd/files/patch-configure 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- ./configure.orig 2008-05-10 20:19:59.000000000 -0400
-+++ ./configure 2010-03-23 18:50:19.000000000 -0400
-@@ -135,7 +135,7 @@
- {
- $config{LIBRARY_DIR} = $opt_library_dir;
- }
--chomp($config{HAS_GNUTLS} = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
-+chomp($config{HAS_GNUTLS} = `pkg-config gnutls --modversion 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
- chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); # Openssl version
- chomp($gnutls_ver = $config{HAS_GNUTLS});
- chomp($openssl_ver = $config{HAS_OPENSSL});
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/files/patch-m_ssl_gnutls.cpp /usr/ports/irc/inspircd/files/patch-m_ssl_gnutls.cpp
--- /usr/ports/irc/inspircd-1.1.20/files/patch-m_ssl_gnutls.cpp 2010-06-03 00:35:11.000000000 +0900
+++ /usr/ports/irc/inspircd/files/patch-m_ssl_gnutls.cpp 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
---- ./src/modules/extra/m_ssl_gnutls.cpp.orig 2008-04-02 14:37:17.000000000 -0400
-+++ ./src/modules/extra/m_ssl_gnutls.cpp 2010-03-23 20:27:41.000000000 -0400
-@@ -32,8 +32,8 @@
- #endif
-
- /* $ModDesc: Provides SSL support for clients */
--/* $CompileFlags: exec("libgnutls-config --cflags") */
--/* $LinkerFlags: rpath("libgnutls-config --libs") exec("libgnutls-config --libs") */
-+/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */
-+/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
- /* $ModDep: transport.h */
-
-
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/files/patch-src::inspircd.cpp /usr/ports/irc/inspircd/files/patch-src::inspircd.cpp
--- /usr/ports/irc/inspircd-1.1.20/files/patch-src::inspircd.cpp 1970-01-01 09:00:00.000000000 +0900
+++ /usr/ports/irc/inspircd/files/patch-src::inspircd.cpp 2010-12-11 15:11:22.000000000 +0900
@@ -0,0 +1,11 @@
+--- src/inspircd.cpp.orig 2010-12-11 15:07:45.000000000 +0900
++++ src/inspircd.cpp 2010-12-11 15:08:11.000000000 +0900
+@@ -274,7 +274,7 @@
+ {
+ std::string fname(filename);
+ if (fname.empty())
+- fname = "data/inspircd.pid";
++ fname = "/var/run/inspircd/inspircd.pid";
+ std::ofstream outfile(fname.c_str());
+ if (outfile.is_open())
+ {
diff -ruN --exclude=CVS /usr/ports/irc/inspircd-1.1.20/pkg-plist /usr/ports/irc/inspircd/pkg-plist
--- /usr/ports/irc/inspircd-1.1.20/pkg-plist 2008-05-19 16:01:38.000000000 +0900
+++ /usr/ports/irc/inspircd/pkg-plist 2010-12-11 22:07:36.000000000 +0900
@@ -1,99 +1,82 @@
bin/inspircd
-inspircd/inspircd
-inspircd/.gdbargs
-lib/inspircd/libIRCDasyncdns.so
-lib/inspircd/libIRCDbase.so
-lib/inspircd/libIRCDchannels.so
-lib/inspircd/libIRCDcommand_parse.so
-lib/inspircd/libIRCDcommands.so
-lib/inspircd/libIRCDconfigreader.so
-lib/inspircd/libIRCDcull_list.so
-lib/inspircd/libIRCDdynamic.so
-lib/inspircd/libIRCDhash.so
-lib/inspircd/libIRCDhelper.so
-lib/inspircd/libIRCDinspsocket.so
-lib/inspircd/libIRCDmode.so
-lib/inspircd/libIRCDmodules.so
-lib/inspircd/libIRCDsnomasks.so
-lib/inspircd/libIRCDsocket.so
-lib/inspircd/libIRCDsocketengine.so
-lib/inspircd/libIRCDstring.so
-lib/inspircd/libIRCDtimer.so
-lib/inspircd/libIRCDuserprocess.so
-lib/inspircd/libIRCDusers.so
-lib/inspircd/libIRCDwildcard.so
-lib/inspircd/libIRCDxline.so
-lib/inspircd/cmd_admin.so
-lib/inspircd/cmd_away.so
-lib/inspircd/cmd_clearcache.so
-lib/inspircd/cmd_commands.so
-lib/inspircd/cmd_connect.so
-lib/inspircd/cmd_die.so
-lib/inspircd/cmd_eline.so
-lib/inspircd/cmd_gline.so
-lib/inspircd/cmd_info.so
-lib/inspircd/cmd_invite.so
-lib/inspircd/cmd_ison.so
-lib/inspircd/cmd_join.so
-lib/inspircd/cmd_kick.so
-lib/inspircd/cmd_kill.so
-lib/inspircd/cmd_kline.so
-lib/inspircd/cmd_links.so
-lib/inspircd/cmd_list.so
-lib/inspircd/cmd_loadmodule.so
-lib/inspircd/cmd_lusers.so
-lib/inspircd/cmd_map.so
-lib/inspircd/cmd_mode.so
-lib/inspircd/cmd_modules.so
-lib/inspircd/cmd_motd.so
-lib/inspircd/cmd_names.so
-lib/inspircd/cmd_nick.so
-lib/inspircd/cmd_notice.so
-lib/inspircd/cmd_oper.so
-lib/inspircd/cmd_part.so
-lib/inspircd/cmd_pass.so
-lib/inspircd/cmd_ping.so
-lib/inspircd/cmd_pong.so
-lib/inspircd/cmd_privmsg.so
-lib/inspircd/cmd_qline.so
-lib/inspircd/cmd_quit.so
-lib/inspircd/cmd_rehash.so
-lib/inspircd/cmd_reloadmodule.so
-lib/inspircd/cmd_restart.so
-lib/inspircd/cmd_rules.so
-lib/inspircd/cmd_server.so
-lib/inspircd/cmd_squit.so
-lib/inspircd/cmd_stats.so
-lib/inspircd/cmd_summon.so
-lib/inspircd/cmd_time.so
-lib/inspircd/cmd_topic.so
-lib/inspircd/cmd_trace.so
-lib/inspircd/cmd_unloadmodule.so
-lib/inspircd/cmd_user.so
-lib/inspircd/cmd_userhost.so
-lib/inspircd/cmd_users.so
-lib/inspircd/cmd_version.so
-lib/inspircd/cmd_wallops.so
-lib/inspircd/cmd_who.so
-lib/inspircd/cmd_whois.so
-lib/inspircd/cmd_whowas.so
-lib/inspircd/cmd_zline.so
+lib/inspircd/.gdbargs
+lib/inspircd/inspircd
+lib/inspircd/modules/cmd_admin.so
+lib/inspircd/modules/cmd_away.so
+lib/inspircd/modules/cmd_clearcache.so
+lib/inspircd/modules/cmd_commands.so
+lib/inspircd/modules/cmd_connect.so
+lib/inspircd/modules/cmd_die.so
+lib/inspircd/modules/cmd_eline.so
+lib/inspircd/modules/cmd_gline.so
+lib/inspircd/modules/cmd_info.so
+lib/inspircd/modules/cmd_invite.so
+lib/inspircd/modules/cmd_ison.so
+lib/inspircd/modules/cmd_join.so
+lib/inspircd/modules/cmd_kick.so
+lib/inspircd/modules/cmd_kill.so
+lib/inspircd/modules/cmd_kline.so
+lib/inspircd/modules/cmd_links.so
+lib/inspircd/modules/cmd_list.so
+lib/inspircd/modules/cmd_loadmodule.so
+lib/inspircd/modules/cmd_lusers.so
+lib/inspircd/modules/cmd_map.so
+lib/inspircd/modules/cmd_mode.so
+lib/inspircd/modules/cmd_modenotice.so
+lib/inspircd/modules/cmd_modules.so
+lib/inspircd/modules/cmd_motd.so
+lib/inspircd/modules/cmd_names.so
+lib/inspircd/modules/cmd_nick.so
+lib/inspircd/modules/cmd_notice.so
+lib/inspircd/modules/cmd_oper.so
+lib/inspircd/modules/cmd_part.so
+lib/inspircd/modules/cmd_pass.so
+lib/inspircd/modules/cmd_ping.so
+lib/inspircd/modules/cmd_pong.so
+lib/inspircd/modules/cmd_privmsg.so
+lib/inspircd/modules/cmd_qline.so
+lib/inspircd/modules/cmd_quit.so
+lib/inspircd/modules/cmd_rehash.so
+lib/inspircd/modules/cmd_reloadmodule.so
+lib/inspircd/modules/cmd_restart.so
+lib/inspircd/modules/cmd_rules.so
+lib/inspircd/modules/cmd_server.so
+lib/inspircd/modules/cmd_squit.so
+lib/inspircd/modules/cmd_stats.so
+lib/inspircd/modules/cmd_time.so
+lib/inspircd/modules/cmd_topic.so
+lib/inspircd/modules/cmd_unloadmodule.so
+lib/inspircd/modules/cmd_user.so
+lib/inspircd/modules/cmd_userhost.so
+lib/inspircd/modules/cmd_version.so
+lib/inspircd/modules/cmd_wallops.so
+lib/inspircd/modules/cmd_who.so
+lib/inspircd/modules/cmd_whois.so
+lib/inspircd/modules/cmd_whowas.so
+lib/inspircd/modules/cmd_zline.so
+lib/inspircd/modules/m_abbreviation.so
lib/inspircd/modules/m_alias.so
+lib/inspircd/modules/m_allowinvite.so
lib/inspircd/modules/m_alltime.so
-lib/inspircd/modules/m_antibear.so
-lib/inspircd/modules/m_antibottler.so
lib/inspircd/modules/m_auditorium.so
+lib/inspircd/modules/m_autoop.so
lib/inspircd/modules/m_banexception.so
lib/inspircd/modules/m_banredirect.so
lib/inspircd/modules/m_blockamsg.so
lib/inspircd/modules/m_blockcaps.so
lib/inspircd/modules/m_blockcolor.so
lib/inspircd/modules/m_botmode.so
+lib/inspircd/modules/m_callerid.so
+lib/inspircd/modules/m_cap.so
lib/inspircd/modules/m_cban.so
lib/inspircd/modules/m_censor.so
lib/inspircd/modules/m_cgiirc.so
lib/inspircd/modules/m_chancreate.so
lib/inspircd/modules/m_chanfilter.so
+lib/inspircd/modules/m_chanhistory.so
+lib/inspircd/modules/m_chanlog.so
+lib/inspircd/modules/m_channames.so
+lib/inspircd/modules/m_channelban.so
lib/inspircd/modules/m_chanprotect.so
lib/inspircd/modules/m_check.so
lib/inspircd/modules/m_chghost.so
@@ -106,84 +89,111 @@
lib/inspircd/modules/m_conn_join.so
lib/inspircd/modules/m_conn_umodes.so
lib/inspircd/modules/m_conn_waitpong.so
+lib/inspircd/modules/m_connectban.so
lib/inspircd/modules/m_connflood.so
+lib/inspircd/modules/m_customprefix.so
lib/inspircd/modules/m_customtitle.so
lib/inspircd/modules/m_cycle.so
lib/inspircd/modules/m_dccallow.so
lib/inspircd/modules/m_deaf.so
+lib/inspircd/modules/m_delayjoin.so
+lib/inspircd/modules/m_delaymsg.so
lib/inspircd/modules/m_denychans.so
lib/inspircd/modules/m_devoice.so
lib/inspircd/modules/m_dnsbl.so
+lib/inspircd/modules/m_exemptchanops.so
lib/inspircd/modules/m_filter.so
-lib/inspircd/modules/m_foobar.so
+lib/inspircd/modules/m_gecosban.so
lib/inspircd/modules/m_globalload.so
lib/inspircd/modules/m_globops.so
+lib/inspircd/modules/m_halfop.so
lib/inspircd/modules/m_helpop.so
lib/inspircd/modules/m_hidechans.so
lib/inspircd/modules/m_hideoper.so
lib/inspircd/modules/m_hostchange.so
lib/inspircd/modules/m_httpd.so
+lib/inspircd/modules/m_httpd_acl.so
+lib/inspircd/modules/m_httpd_config.so
lib/inspircd/modules/m_httpd_stats.so
lib/inspircd/modules/m_ident.so
-lib/inspircd/modules/m_invisible.so
lib/inspircd/modules/m_inviteexception.so
lib/inspircd/modules/m_joinflood.so
lib/inspircd/modules/m_jumpserver.so
lib/inspircd/modules/m_kicknorejoin.so
lib/inspircd/modules/m_knock.so
lib/inspircd/modules/m_lockserv.so
+lib/inspircd/modules/m_maphide.so
lib/inspircd/modules/m_md5.so
lib/inspircd/modules/m_messageflood.so
+lib/inspircd/modules/m_muteban.so
+lib/inspircd/modules/m_namedmodes.so
lib/inspircd/modules/m_namesx.so
+lib/inspircd/modules/m_nationalchars.so
lib/inspircd/modules/m_nickflood.so
lib/inspircd/modules/m_nicklock.so
lib/inspircd/modules/m_noctcp.so
-lib/inspircd/modules/m_noinvite.so
lib/inspircd/modules/m_nokicks.so
lib/inspircd/modules/m_nonicks.so
lib/inspircd/modules/m_nonotice.so
-lib/inspircd/modules/m_oper_hash.so
+lib/inspircd/modules/m_nopartmsg.so
+lib/inspircd/modules/m_ojoin.so
lib/inspircd/modules/m_operchans.so
lib/inspircd/modules/m_operjoin.so
lib/inspircd/modules/m_operlevels.so
lib/inspircd/modules/m_operlog.so
lib/inspircd/modules/m_opermodes.so
lib/inspircd/modules/m_opermotd.so
+lib/inspircd/modules/m_operprefix.so
lib/inspircd/modules/m_override.so
+lib/inspircd/modules/m_passforward.so
+lib/inspircd/modules/m_password_hash.so
+lib/inspircd/modules/m_permchannels.so
lib/inspircd/modules/m_randquote.so
lib/inspircd/modules/m_redirect.so
+lib/inspircd/modules/m_regex_glob.so
+lib/inspircd/modules/m_regex_posix.so
lib/inspircd/modules/m_regonlycreate.so
lib/inspircd/modules/m_remove.so
-lib/inspircd/modules/m_restrictbanned.so
lib/inspircd/modules/m_restrictchans.so
lib/inspircd/modules/m_restrictmsg.so
-lib/inspircd/modules/m_safelist.so
+lib/inspircd/modules/m_ripemd160.so
+lib/inspircd/modules/m_rline.so
lib/inspircd/modules/m_sajoin.so
+lib/inspircd/modules/m_sakick.so
lib/inspircd/modules/m_samode.so
lib/inspircd/modules/m_sanick.so
lib/inspircd/modules/m_sapart.so
lib/inspircd/modules/m_saquit.so
+lib/inspircd/modules/m_sasl.so
+lib/inspircd/modules/m_satopic.so
lib/inspircd/modules/m_securelist.so
lib/inspircd/modules/m_seenicks.so
-lib/inspircd/modules/m_services.so
+lib/inspircd/modules/m_serverban.so
lib/inspircd/modules/m_services_account.so
+lib/inspircd/modules/m_servprotect.so
lib/inspircd/modules/m_sethost.so
lib/inspircd/modules/m_setident.so
lib/inspircd/modules/m_setidle.so
lib/inspircd/modules/m_setname.so
lib/inspircd/modules/m_sha256.so
lib/inspircd/modules/m_showwhois.so
+lib/inspircd/modules/m_shun.so
lib/inspircd/modules/m_silence.so
-lib/inspircd/modules/m_silence_ext.so
lib/inspircd/modules/m_spanningtree.so
-lib/inspircd/modules/m_spy.so
-lib/inspircd/modules/m_ssl_dummy.so
+lib/inspircd/modules/m_sqlauth.so
+lib/inspircd/modules/m_sqloper.so
+%%LDAPAUTH%%lib/inspircd/modules/m_ldapauth.so
+%%MYSQL%%lib/inspircd/modules/m_mysql.so
+%%PGSQL%%lib/inspircd/modules/m_pgsql.so
+%%SQLITE3%%lib/inspircd/modules/m_sqlite3.so
+%%GNUTLS%%lib/inspircd/modules/m_ssl_gnutls.so
+%%OPENSSL%%lib/inspircd/modules/m_ssl_openssl.so
+lib/inspircd/modules/m_sslinfo.so
lib/inspircd/modules/m_sslmodes.so
lib/inspircd/modules/m_stripcolor.so
lib/inspircd/modules/m_svshold.so
lib/inspircd/modules/m_swhois.so
-lib/inspircd/modules/m_taxonomy.so
-lib/inspircd/modules/m_testcommand.so
+lib/inspircd/modules/m_testnet.so
lib/inspircd/modules/m_timedbans.so
lib/inspircd/modules/m_tline.so
lib/inspircd/modules/m_uhnames.so
@@ -191,23 +201,10 @@
lib/inspircd/modules/m_userip.so
lib/inspircd/modules/m_vhost.so
lib/inspircd/modules/m_watch.so
-lib/inspircd/modules/m_xmlsocket.so
-%%FILTER_PCRE%%lib/inspircd/modules/m_filter_pcre.so
-%%LDAPAUTH%%lib/inspircd/modules/m_ldapauth.so
-%%MYSQL%%lib/inspircd/modules/m_mysql.so
-%%PGSQL%%lib/inspircd/modules/m_pgsql.so
-%%SQLMODULES%%lib/inspircd/modules/m_sqlauth.so
-%%SQLITE3%%lib/inspircd/modules/m_sqlite3.so
-%%SQLMODULES%%lib/inspircd/modules/m_sqllog.so
-%%SQLMODULES%%lib/inspircd/modules/m_sqloper.so
-%%SQLMODULES%%lib/inspircd/modules/m_sqlutils.so
-%%GNUTLS%%lib/inspircd/modules/m_ssl_gnutls.so
-%%OPENSSL%%lib/inspircd/modules/m_ssl_openssl.so
-%%SSLMODULES%%lib/inspircd/modules/m_ssl_oper_cert.so
-%%SSLMODULES%%lib/inspircd/modules/m_sslinfo.so
-%%ZIPLINK%%lib/inspircd/modules/m_ziplink.so
- at dirrm inspircd
+lib/inspircd/modules/m_xline_db.so
@dirrm lib/inspircd/modules
+ at dirrm lib/inspircd/logs
+ at dirrm lib/inspircd/data
@dirrm lib/inspircd
@mode 640
@group %%INSPIRCD_GRP%%
@@ -235,6 +232,16 @@
@unexec if cmp -s %D/%%ETCDIR%%/inspircd.rules.example %D/%%ETCDIR%%/inspircd.rules; then rm -f %D/%%ETCDIR%%/inspircd.rules; fi
%%ETCDIR%%/inspircd.rules.example
@exec if [ ! -f %B/inspircd.rules ] ; then cp -p %D/%F %B/inspircd.rules; fi
+ at unexec if cmp -s %D/%%ETCDIR%%/links.conf.example %D/%%ETCDIR%%/links.conf; then rm -f %D/%%ETCDIR%%/links.conf; fi
+%%ETCDIR%%/links.conf.example
+ at exec if [ ! -f %B/links.conf.example ] ; then cp -p %D/%F %B/links.conf.example; fi
+ at unexec if cmp -s %D/%%ETCDIR%%/modules.conf.example %D/%%ETCDIR%%/modules.conf; then rm -f %D/%%ETCDIR%%/modules.conf; fi
+%%ETCDIR%%/modules.conf.example
+ at exec if [ ! -f %B/modules.conf.example ] ; then cp -p %D/%F %B/modules.conf.example; fi
+ at unexec if cmp -s %D/%%ETCDIR%%/opers.conf.example %D/%%ETCDIR%%/opers.conf; then rm -f %D/%%ETCDIR%%/opers.conf; fi
+%%ETCDIR%%/opers.conf.example
+ at exec if [ ! -f %B/opers.conf.example ] ; then cp -p %D/%F %B/opers.conf.example; fi
@dirrmtry %%ETCDIR%%
@mode
@group
+
--- inspircd-2.0.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list