[Pkg-irc-commits] r259 - in /packages/inspircd12/trunk/debian: changelog control inspircd.1 inspircd.conf inspircd.examples inspircd.init patches/02_spelling_error_in_binary rules
kcd-guest at users.alioth.debian.org
kcd-guest at users.alioth.debian.org
Wed Apr 7 23:26:22 UTC 2010
Author: kcd-guest
Date: Wed Apr 7 23:26:21 2010
New Revision: 259
URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=259
Log:
refresh of manpage
refresh initscript
gnutls support reactivated (disable by extra modules addition)
provide sql dump upstream examples
add recommands and suggests
Modified:
packages/inspircd12/trunk/debian/changelog
packages/inspircd12/trunk/debian/control
packages/inspircd12/trunk/debian/inspircd.1
packages/inspircd12/trunk/debian/inspircd.conf
packages/inspircd12/trunk/debian/inspircd.examples
packages/inspircd12/trunk/debian/inspircd.init
packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary
packages/inspircd12/trunk/debian/rules
Modified: packages/inspircd12/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/changelog?rev=259&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/changelog (original)
+++ packages/inspircd12/trunk/debian/changelog Wed Apr 7 23:26:21 2010
@@ -2,7 +2,6 @@
* New upstream release (Closes: #545233, #519910)
* debian/watch: update url to project website (SF not up2date)
- * debian/inspircd.init: add dependency on $remote_fs in Required-St{art,op}
* debian/patches/debian/patches:
- 01_fix_config_reload.dpatch: drop old upstream patch
- 02_fix_gnutls_config.dpatch: drop old upstream patch
@@ -15,15 +14,26 @@
+ Bump to Standards-Version 3.8.4 (no changes needed)
+ Switch to dpkg-source 3.0 (quilt) format and drop dpatch dependency
+ Build-Depend on extra modules libraries (mysql, sqlite, pgsql, etc.)
+ + Recommends logrotate
+ + Suggests sqlite3, mysql-server, ldap-server, postgresql, gnutls-bin
* debian/copyright: Adapt file to new template
* debian/rules:
+ Delete unknown and old option "disable-rpath"
+ Add support for all DFSG extra modules
(mysql, sqlite, pgsql, ldap, pcre, geoip, testclient, ziplink)
(Closes: #539569)
+ + Provide various upstream databases schemas
+ + Move gnutls in extra module activation
* debian/inspircd.examples: delete files and give conf and aliases dirs
to provide all upstream documented files
* Delete unnecessary spaces (inspircd.{1,init}, copyright, README.Debian)
+ * debian/inspircd.1: refresh manpage with new options/path to configfile
+ * debian/inspircd.init:
+ + Add status and checkconf parameters
+ (use /usr/lib/inspircd/inspircd upstream perl script)
+ + Add dependency on $remote_fs in Required-St{art,op}
+ * debian/inspircd.conf: move some settings from options to performance,
+ security and log (upstream changes)
-- Guillaume Delacour <gui at iroqwa.org> Mon, 05 Apr 2010 14:56:03 +0000
Modified: packages/inspircd12/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/control?rev=259&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/control (original)
+++ packages/inspircd12/trunk/debian/control Wed Apr 7 23:26:21 2010
@@ -20,6 +20,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: ircd
+Recommends: logrotate
+Suggests: sqlite3, mysql-server, ldap-server, postgresql, gnutls-bin
Description: Modular IRCd written in C++
InspIRCd is a modular C++ IRC Daemon for several operating systems created
to provide a stable, modern, lightweight irc server from scratch and provide
Modified: packages/inspircd12/trunk/debian/inspircd.1
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/inspircd.1?rev=259&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/inspircd.1 (original)
+++ packages/inspircd12/trunk/debian/inspircd.1 Wed Apr 7 23:26:21 2010
@@ -19,7 +19,7 @@
inspircd \- A modular C++ IRC Daemon
.SH SYNOPSIS
.B inspircd
-[\-\-nofork] [\-\-nolog] [\-\-debug] [\-\-logfile <filename>] [\-\-runasroot] [\-\-version] [\-\-config <config>]
+[\-\-version] [\-\-config <config>] [\-\-runasroot] [\-\-nofork] [\-\-nolog] [\-\-logfile <filename>] [\-\-debug] [\-\-testsuite]
.br
.SH DESCRIPTION
This manual page documents briefly the
@@ -32,7 +32,7 @@
.\" respectively.
\fBinspircd\fP is a modular C++ IRC Daemon (ircd) for Linux, BSD and Windows systems created to provide a stable, modern, lightweight irc server from scratch and provide a vast number of features in a modularised form using an advanced module API. By keeping the functionality of the main core to a minimum we hope to increase the stability and speed of our project and make it customisable to the needs of many users. InspIRCd is designed primarily to be a custom irc server for the chatspike irc network (irc.chatspike.net) but we are releasing it into the public domain under GPL so that you may benefit yourself from our work. The project is written from scratch, avoiding the inherent instability under large loads which can be seen in many other irc server distributions which have the same featureset.
.PP
-The \fBinspircd\fP command starts the ircd server, using /etc/inspircd.conf as its configuration file unless used with \fB\-\-config\fP.
+The \fBinspircd\fP command starts the ircd server, using /etc/inspircd/inspircd.conf as its configuration file unless used with \fB\-\-config\fP.
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
@@ -44,13 +44,32 @@
Show summary of options.
.TP
.B \-v, \-\-version
-Show version of program.
+Show the version and revision ID
.TP
.B \-c, \-\-config <config>
-Specify the config file
+Change the file name used for the main configuration file
+.TP
+.B \-r, \-\-runasroot
+Allow InspIRCd to run as root, after a short pause and a nag banner to prevent this being done accidentally (NOT RECOMMENDED OR SUPPORTED!)
+.TP
+.B \-\-nofork
+Do not fork to the background on startup, useful for debugging modules
+.TP
+.B \-\-nolog
+Do not write to the logfile, used mostly in conjunction with \-\-debug
+.TP
+.B \-\-logfile <filename>
+Change the logfile used
+.TP
+.B \-\-debug
+Force debug logging, overriding the config setting. Usually used with \-\-nolog by the debug launcher
+.TP
+.B \-\-testsuite
+Test suite for debugging purpose
+
.SH SEE ALSO
-InspIRCd is fully documented by the inspircd documentation team, which is viewable at http://inspircd.org/wiki/.
+InspIRCd is fully documented by the inspircd documentation team, which is viewable at http://wiki.inspircd.org/.
.SH AUTHOR
InspIRCd was written by Craig Edwards (Brain), Craig McLure (FrostyCoolSlug), Robin Burchell (w00t), and more (see http://www.inspircd.org/wiki/Credits).
.PP
Modified: packages/inspircd12/trunk/debian/inspircd.conf
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/inspircd.conf?rev=259&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/inspircd.conf (original)
+++ packages/inspircd12/trunk/debian/inspircd.conf Wed Apr 7 23:26:21 2010
@@ -51,36 +51,39 @@
<pid file="/var/run/inspircd.pid">
<options prefixquit="Quit: "
- loglevel="default"
- netbuffersize="10240"
- maxwho="128"
noservices="no"
qaprefixes="no"
deprotectself="no"
deprotectothers="no"
- somaxconn="128"
- softlimit="12800"
- userstats="Pu"
- operspywhois="no"
- customversion=""
- maxtargets="20"
- hidesplits="no"
- hidebans="no"
- hidewhois=""
- flatlinks="no"
- hideulines="no"
- nouserdns="no"
syntaxhints="no"
cyclehosts="yes"
ircumsgprefix="no"
announcets="yes"
disablehmac="no"
hostintopic="yes"
- hidemodes="eI"
- quietbursts="yes"
pingwarning="15"
allowhalfop="yes"
exemptchanops="">
+
+<performance maxwho="128"
+ netbuffersize="10240"
+ somaxconn="128"
+ softlimit="1024"
+ quietbursts="yes"
+ nouserdns="no">
+
+<security hidemodes="eI"
+ hideulines="no"
+ flatlinks="no"
+ hidewhois=""
+ hidebans="no"
+ hidesplits="no"
+ maxtargets="20"
+ customversion=""
+ operspywhois="no"
+ userstats="Pu">
+
+<log method="file" level="default">
<timesync enable="no" master="no">
Modified: packages/inspircd12/trunk/debian/inspircd.examples
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/inspircd.examples?rev=259&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/inspircd.examples (original)
+++ packages/inspircd12/trunk/debian/inspircd.examples Wed Apr 7 23:26:21 2010
@@ -1,2 +1,2 @@
conf/
-conf/aliases/
+extras/
Modified: packages/inspircd12/trunk/debian/inspircd.init
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/inspircd.init?rev=259&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/inspircd.init (original)
+++ packages/inspircd12/trunk/debian/inspircd.init Wed Apr 7 23:26:21 2010
@@ -68,6 +68,9 @@
echo -n "Stopping Inspircd... "
stop_ircd && echo "done."
;;
+ status)
+ [ -f /usr/lib/inspircd/inspircd ] && /usr/lib/inspircd/inspircd status
+ ;;
force-reload|reload)
echo -n "Reloading Inspircd... "
reload_ircd && echo "done."
@@ -80,10 +83,11 @@
cron)
start_ircd || echo "Inspircd not running, starting it"
;;
+ checkconf)
+ [ -f /usr/lib/inspircd/inspircd ] && /usr/lib/inspircd/inspircd checkconf
+ ;;
*)
- echo "Usage: $0 {start|stop|restart|reload|force-reload|cron}"
+ echo "Usage: $0 {start|stop|status|checkconf|restart|reload|force-reload|cron}"
exit 1
esac
-
-
Modified: packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary?rev=259&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary (original)
+++ packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary Wed Apr 7 23:26:21 2010
@@ -74,3 +74,14 @@
break;
}
}
+--- a/src/modules/extra/m_ssl_gnutls.cpp
++++ b/src/modules/extra/m_ssl_gnutls.cpp
+@@ -202,7 +202,7 @@
+ }
+ catch (ModuleException &e)
+ {
+- ServerInstance->Logs->Log("m_ssl_gnutls",DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %ld: %s. Maybe it's already hooked by the same port on a different IP, or you have an other SSL or similar module loaded?", portno, e.GetReason());
++ ServerInstance->Logs->Log("m_ssl_gnutls",DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %ld: %s. Maybe it's already hooked by the same port on a different IP, or you have another SSL or similar module loaded?", portno, e.GetReason());
+ }
+ }
+ }
Modified: packages/inspircd12/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/rules?rev=259&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/rules (original)
+++ packages/inspircd12/trunk/debian/rules Wed Apr 7 23:26:21 2010
@@ -26,13 +26,14 @@
build-stamp:
dh_testdir
# Enable extra modules
- ./configure --enable-extras=m_geoip.cpp,m_ldapauth.cpp,m_ldapoper.cpp,m_sqllog.cpp,m_sqloper.cpp,m_sqlauth.cpp,m_sqlutils.cpp,m_mysql.cpp,m_pgsql.cpp,m_sqlite3.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_tre.cpp,m_testclient.cpp,m_ziplink.cpp
+ ./configure --enable-extras=m_geoip.cpp,m_ldapauth.cpp,m_ldapoper.cpp,m_sqllog.cpp,m_sqloper.cpp,m_sqlauth.cpp,m_sqlutils.cpp,m_mysql.cpp,m_pgsql.cpp,m_sqlite3.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_tre.cpp,m_testclient.cpp,m_ziplink.cpp,m_ssl_gnutls.cpp
# Refresh makefiles
./configure --modupdate
# Really launch configure
./configure --disable-interactive \
- --enable-gnutls $(SOCKET_ENGINE) \
- --enable-ipv6 --prefix=/usr/lib/inspircd \
+ $(SOCKET_ENGINE) \
+ --enable-ipv6 \
+ --prefix=/usr/lib/inspircd \
--config-dir=/etc/inspircd \
--module-dir=/usr/lib/inspircd/modules \
--binary-dir=/usr/sbin \
More information about the Pkg-irc-commits
mailing list