cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to ircd-ratbox 3.0.7.

Browse Source 
from brad. maintainer timed out
This commit is contained in:
fgsch 2011-11-27 10:57:24 +00:00
parent 0132b0aa29
commit 51f75be3a1
9 changed files with 81 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
net/ircd-ratbox/Makefile
View File

@ -1,20 +1,19 @@
# $OpenBSD: Makefile,v 1.14 2011/09/16 11:13:38 espie Exp $
# $OpenBSD: Makefile,v 1.15 2011/11/27 10:57:24 fgsch Exp $
SHARED_ONLY = Yes
COMMENT = advanced, stable and fast irc server
DISTNAME = ircd-ratbox-3.0.6
DISTNAME = ircd-ratbox-3.0.7
CATEGORIES = net
REVISION = 5
MASTER_SITES = ${HOMEPAGE}download/
EXTRACT_SUFX = .tar.bz2
HOMEPAGE = http://www.ircd-ratbox.org/
MASTER_SITES = ${HOMEPAGE}download/testing/
HOMEPAGE = http://www.ratbox.org/
MAINTAINER = Simon Bertrang <simon@openbsd.org>
# GPLv2
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
@ -25,31 +24,27 @@ WANTLIB = c crypto ltdl sqlite3 ssl z
LIB_DEPENDS = databases/sqlite3 \
devel/libtool,-ltdl
USE_LIBTOOL = Yes
NO_REGRESS = Yes
CONFDIR = ${SYSCONFDIR}/ircd-ratbox
LOGDIR = /var/log/ircd-ratbox
SUBST_VARS += CONFDIR LOGDIR
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
AUTOCONF_VERSION = 2.65
USE_LIBTOOL = Yes
LIBTOOL_FLAGS = --tag=disable-static
CONFIGURE_STYLE = autoconf
CONFIGURE_ARGS = --enable-ipv6 \
--enable-openssl=/usr \
--enable-kqueue \
AUTOCONF_VERSION = 2.68
CONFIGURE_ARGS = --enable-openssl=/usr \
--with-confdir=${CONFDIR} \
--with-logdir=${LOGDIR} \
--with-rundir=/var/run/ircd-ratbox \
--with-helpdir=${PREFIX}/share/ircd-ratbox/help \
--with-moduledir=${PREFIX}/lib/ircd-ratbox/modules \
--enable-services \
--with-sqlite3=${LOCALBASE} \
--with-zlib-path=/usr
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
NO_REGRESS = Yes
# Hack to make the nick length configurable at build time
NICKLEN ?=
@ -64,7 +59,7 @@ DOCS = README.cidr_bans challenge.txt modeg.txt \
tgchange.txt
pre-configure:
${SUBST_CMD} ${WRKSRC}/doc/example.conf \
@${SUBST_CMD} ${WRKSRC}/doc/example.conf \
${WRKSRC}/doc/example.efnet.conf
post-install:
@ -74,5 +69,6 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ircd-ratbox
cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} \
${PREFIX}/share/doc/ircd-ratbox
@find ${PREFIX}/lib -name '*.la' -print | xargs rm
.include <bsd.port.mk>

10
net/ircd-ratbox/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ircd-ratbox-3.0.6.tar.bz2) = MfT65CERRBiLS5gtbn00ZQ==
RMD160 (ircd-ratbox-3.0.6.tar.bz2) = Eyc9oeV6a+44Tm3ZZ13b/eNGUwE=
SHA1 (ircd-ratbox-3.0.6.tar.bz2) = Og99yfezkyoEyvW4BzNOeoAGgko=
SHA256 (ircd-ratbox-3.0.6.tar.bz2) = Os72ppJnjShwM8nHuj6NL0wWPQRPO5hZYo5VBBy1S3Q=
SIZE (ircd-ratbox-3.0.6.tar.bz2) = 1977354
MD5 (ircd-ratbox-3.0.7.tar.bz2) = m20SkDiwDKEZTyQuGiHBaA==
RMD160 (ircd-ratbox-3.0.7.tar.bz2) = dfQXCxT1HgYZPDc1VplFBLzvLJY=
SHA1 (ircd-ratbox-3.0.7.tar.bz2) = 12OiOTcc7w+/ATCLzZW6LxwPErg=
SHA256 (ircd-ratbox-3.0.7.tar.bz2) = cWJqDq3EGCKvuTp6uzdOOOxCUSnfaiDuL8Qx3w5cT24=
SIZE (ircd-ratbox-3.0.7.tar.bz2) = 2379425

25
net/ircd-ratbox/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.2 2010/02/01 10:32:07 jasper Exp $
--- Makefile.in.orig Fri Jan 22 18:26:08 2010
+++ Makefile.in Mon Feb 1 10:39:19 2010
$OpenBSD: patch-Makefile_in,v 1.3 2011/11/27 10:57:24 fgsch Exp $
--- Makefile.in.orig Thu Oct 20 18:55:29 2011
+++ Makefile.in Wed Nov 16 20:51:19 2011
@@ -102,7 +102,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=
distdir dist dist-all distcheck
ETAGS = etags
@ -10,18 +10,23 @@ $OpenBSD: patch-Makefile_in,v 1.2 2010/02/01 10:32:07 jasper Exp $
resolver
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -295,10 +295,10 @@ servicesdir = @moduledir@/autoload
@@ -182,7 +182,7 @@ LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBEXEC_DIR = @LIBEXEC_DIR@
-LIBLTDL = @LIBLTDL@
+LIBLTDL = -lltdl
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -297,8 +297,8 @@ servicesdir = @moduledir@/autoload
AM_CFLAGS = $(WARNFLAGS)
ircd_SOURCES = main.c
@MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
-@STATIC_MODULES_FALSE@SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver
-@STATIC_MODULES_TRUE@SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver
-@STATIC_MODULES_FALSE@ircd_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL)
-@STATIC_MODULES_TRUE@ircd_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN)
+@STATIC_MODULES_FALSE@SUBDIRS = libratbox src modules tools doc help bandb ssld resolver
+@STATIC_MODULES_TRUE@SUBDIRS = libratbox modules src tools doc help bandb ssld resolver
+@STATIC_MODULES_FALSE@ircd_LDADD = libratbox/src/libratbox.la src/libcore.la
+@STATIC_MODULES_TRUE@ircd_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(DLOPEN)
@STATIC_MODULES_FALSE@ircd_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL)
@STATIC_MODULES_TRUE@ircd_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN)
@STATIC_MODULES_FALSE@ircd_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
all: all-recursive

44
net/ircd-ratbox/patches/patch-configure_ac
View File

@ -1,18 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.2 2010/02/01 10:32:07 jasper Exp $
--- configure.ac.orig Fri Jan 22 18:26:08 2010
+++ configure.ac Mon Feb 1 10:39:19 2010
@@ -5,8 +5,8 @@ dnl TODO: clean up all the OpenSSL and shared module c
dnl the most major changes have already been made and it looks like
dnl said functions need to be just about as complex as they already are.
-AC_PREREQ(2.63)
-AUTOMAKE_OPTIONS = 1.10
+AC_PREREQ(2.62)
+AUTOMAKE_OPTIONS = 1.9
dnl Sneaky way to get an Id tag into the configure script
AC_COPYRIGHT([$Id: patch-configure_ac,v 1.2 2010/02/01 10:32:07 jasper Exp $])
AC_INIT([ircd-ratbox],[devel])
@@ -109,7 +109,7 @@ done
$OpenBSD: patch-configure_ac,v 1.3 2011/11/27 10:57:24 fgsch Exp $
--- configure.ac.orig Thu Oct 20 18:55:29 2011
+++ configure.ac Wed Nov 16 20:51:19 2011
@@ -113,7 +113,7 @@ done
LIBTOOL="$LIBTOOL --silent"
@ -21,28 +10,3 @@ $OpenBSD: patch-configure_ac,v 1.2 2010/02/01 10:32:07 jasper Exp $
case "$host_os" in
*cygwin*)
@@ -383,6 +383,24 @@ AC_HELP_STRING([--with-logdir=DIR],
AC_MSG_RESULT(no)
AC_DEFINE_DIR(LOG_DIR, logdir, [Prefix where to write logfiles.])
AC_SUBST_DIR([logdir])]
+)
+
+dnl **********************************************************************
+dnl Check for --with-rundir
+dnl **********************************************************************
+
+AC_MSG_CHECKING([whether to modify rundir])
+AC_ARG_WITH(rundir,
+AC_HELP_STRING([--with-rundir=DIR],
+ [Directory where to write runtime files.]),
+ [ rundir=`echo $withval | sed 's/\/$//'`
+ AC_MSG_RESULT(yes)
+ AC_DEFINE_DIR(RUN_DIR, rundir, [Prefix where to write runtime files.])
+ AC_SUBST_DIR([rundir]) ],
+ [ rundir='${localstatedir}/run'
+ AC_MSG_RESULT(no)
+ AC_DEFINE_DIR(RUN_DIR, rundir, [Prefix where to write runtime files.])
+ AC_SUBST_DIR([rundir])]
)
dnl **********************************************************************

20
net/ircd-ratbox/patches/patch-doc_example_conf
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-doc_example_conf,v 1.2 2010/02/01 10:32:07 jasper Exp $
--- doc/example.conf.orig Mon Feb 1 10:27:06 2010
+++ doc/example.conf Mon Feb 1 10:29:06 2010
$OpenBSD: patch-doc_example_conf,v 1.3 2011/11/27 10:57:24 fgsch Exp $
--- doc/example.conf.orig Thu Oct 13 01:09:59 2011
+++ doc/example.conf Wed Nov 16 20:52:44 2011
@@ -98,13 +98,13 @@ serverinfo {
default_max_clients = 10000;
/* ssl_private_key: our ssl private key */
- ssl_private_key = "etc/test.key";
+ ssl_private_key = "${CONFDIR}/test.key";
- ssl_private_key = "etc/test.key";
+ ssl_private_key = "${CONFDIR}/test.key";
/* ssl_cert: certificate for our ssl server */
- ssl_cert = "etc/test.cert";
+ ssl_cert = "${CONFDIR}/test.cert";
- ssl_cert = "etc/test.cert";
+ ssl_cert = "${CONFDIR}/test.cert";
/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
- ssl_dh_params = "etc/dh.pem";
+ ssl_dh_params = "${CONFDIR}/dh.pem";
- ssl_dh_params = "etc/dh.pem";
+ ssl_dh_params = "${CONFDIR}/dh.pem";
/* ssld_count: number of ssld processes you want to start, if you
* have a really busy server, using N-1 where N is the number of
@ -65,7 +65,7 @@ $OpenBSD: patch-doc_example_conf,v 1.2 2010/02/01 10:32:07 jasper Exp $
/* umodes: the specific umodes this oper gets when they oper.
* If this is specified an oper will not be given oper_umodes
@@ -1027,8 +1027,8 @@ modules {
@@ -1022,8 +1022,8 @@ modules {
/* module path: paths to search for modules specified below and
* in /modload.
*/

22
net/ircd-ratbox/patches/patch-doc_example_efnet_conf
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-doc_example_efnet_conf,v 1.2 2010/02/01 10:32:07 jasper Exp $
--- doc/example.efnet.conf.orig Mon Feb 1 10:37:46 2010
+++ doc/example.efnet.conf Mon Feb 1 10:39:06 2010
$OpenBSD: patch-doc_example_efnet_conf,v 1.3 2011/11/27 10:57:24 fgsch Exp $
--- doc/example.efnet.conf.orig Thu Oct 13 01:09:59 2011
+++ doc/example.efnet.conf Wed Nov 16 20:53:21 2011
@@ -101,13 +101,13 @@ serverinfo {
default_max_clients = 10000;
/* ssl_private_key: our ssl private key */
- ssl_private_key = "etc/test.key";
+ ssl_private_key = "${CONFDIR}/test.key";
- ssl_private_key = "etc/test.key";
+ ssl_private_key = "${CONFDIR}/test.key";
/* ssl_cert: certificate for our ssl server */
- ssl_cert = "etc/test.cert";
+ ssl_cert = "${CONFDIR}/test.cert";
- ssl_cert = "etc/test.cert";
+ ssl_cert = "${CONFDIR}/test.cert";
/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
- ssl_dh_params = "etc/dh.pem";
+ ssl_dh_params = "${CONFDIR}/dh.pem";
- ssl_dh_params = "etc/dh.pem";
+ ssl_dh_params = "${CONFDIR}/dh.pem";
/* ssld_count: number of ssld processes you want to start, if you
* have a really busy server, using N-1 where N is the number of
@ -56,7 +56,7 @@ $OpenBSD: patch-doc_example_efnet_conf,v 1.2 2010/02/01 10:32:07 jasper Exp $
};
/* class {}: contain information about classes for users (OLD Y:) */
@@ -358,7 +358,7 @@ operator "god" {
@@ -357,7 +357,7 @@ operator "god" {
* A password should not be defined when this is used, see
* doc/challenge.txt for more information.
*/
@ -65,7 +65,7 @@ $OpenBSD: patch-doc_example_efnet_conf,v 1.2 2010/02/01 10:32:07 jasper Exp $
/* umodes: the specific umodes this oper gets when they oper.
* If this is specified an oper will not be given oper_umodes
@@ -1041,8 +1041,8 @@ modules {
@@ -1038,8 +1038,8 @@ modules {
/* module path: paths to search for modules specified below and
* in /modload.
*/

8
net/ircd-ratbox/patches/patch-include_config_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-include_config_h,v 1.1.1.1 2009/02/09 09:41:54 simon Exp $
--- include/config.h.orig Fri Sep 19 17:33:46 2008
+++ include/config.h Sun Feb 8 23:21:33 2009
$OpenBSD: patch-include_config_h,v 1.2 2011/11/27 10:57:24 fgsch Exp $
--- include/config.h.orig Fri Sep 19 11:33:46 2008
+++ include/config.h Mon Oct 24 01:10:59 2011
@@ -45,6 +45,11 @@
* AUTOMODPATH = directory for autoloaded modules
*/
@ -18,7 +18,7 @@ $OpenBSD: patch-include_config_h,v 1.1.1.1 2009/02/09 09:41:54 simon Exp $
#define MPATH ETCPATH "/ircd.motd" /* MOTD file */
#define LPATH LOGPATH "/ircd.log" /* ircd logfile */
-#define PPATH ETCPATH "/ircd.pid" /* pid file */
+#define PPATH RUN_DIR "/ircd.pid" /* pid file */
+#define PPATH "/var/run/ircd-ratbox/ircd.pid" /* pid file */
#define OPATH ETCPATH "/opers.motd" /* oper MOTD file */
/* HANGONGOODLINK and HANGONGOODLINK

28
net/ircd-ratbox/patches/patch-src_Makefile_in
View File

@ -1,21 +1,21 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2010/02/01 10:32:07 jasper Exp $
--- src/Makefile.in.orig Fri Jan 22 18:26:08 2010
+++ src/Makefile.in Mon Feb 1 10:39:19 2010
@@ -136,7 +136,7 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HELP_DIR = @HELP_DIR@
-INCLTDL = @INCLTDL@
+INCLTDL = -I@includedir@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -149,7 +149,7 @@ LEX = @LEX@
$OpenBSD: patch-src_Makefile_in,v 1.3 2011/11/27 10:57:24 fgsch Exp $
--- src/Makefile.in.orig Thu Oct 20 18:55:29 2011
+++ src/Makefile.in Wed Nov 16 20:51:20 2011
@@ -150,7 +150,7 @@ LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBEXEC_DIR = @LIBEXEC_DIR@
-LIBLTDL = @LIBLTDL@
+LIBLTDL = -L@libdir@ -lltdl
+LIBLTDL = -lltdl
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -261,7 +261,7 @@ AUTOMAKE_OPTIONS = foreign
libcoredir = @libdir@
AM_YFLAGS = -d
AM_CFLAGS = $(WARNFLAGS)
-INCLUDES = -I../libratbox/include -I../libltdl @SSL_INCLUDES@
+INCLUDES = -I../libratbox/include -I$(LOCALBASE)/include @SSL_INCLUDES@
BUILT_SOURCES = version.c
@MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
libcore_la_SOURCES = \

9
net/ircd-ratbox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2010/11/09 11:56:17 jasper Exp $
@comment $OpenBSD: PLIST,v 1.6 2011/11/27 10:57:24 fgsch Exp $
@conflict irc-*
@conflict ircd-hybrid-*
@newgroup _ircd-ratbox:619
@ -45,8 +45,6 @@ lib/ircd-ratbox/modules/autoload/m_post.so
lib/ircd-ratbox/modules/autoload/m_rehash.so
lib/ircd-ratbox/modules/autoload/m_restart.so
lib/ircd-ratbox/modules/autoload/m_resv.so
@comment lib/ircd-ratbox/modules/autoload/m_services.a
@comment lib/ircd-ratbox/modules/autoload/m_services.la
lib/ircd-ratbox/modules/autoload/m_services.so
lib/ircd-ratbox/modules/autoload/m_set.so
lib/ircd-ratbox/modules/autoload/m_stats.so
@ -78,11 +76,7 @@ lib/ircd-ratbox/modules/m_part.so
lib/ircd-ratbox/modules/m_quit.so
lib/ircd-ratbox/modules/m_server.so
lib/ircd-ratbox/modules/m_squit.so
@comment lib/libcore.a
@comment lib/libcore.la
lib/libcore.so
@comment lib/libratbox.a
@comment lib/libratbox.la
lib/libratbox.so
libexec/ircd-ratbox/
@bin libexec/ircd-ratbox/bandb
@ -146,6 +140,7 @@ share/ircd-ratbox/help/opers/dline
share/ircd-ratbox/help/opers/error
share/ircd-ratbox/help/opers/etrace
share/ircd-ratbox/help/opers/gline
share/ircd-ratbox/help/opers/gungline
share/ircd-ratbox/help/opers/help
share/ircd-ratbox/help/opers/index
share/ircd-ratbox/help/opers/info