[Pkg-irc-commits] r258 - in /packages/inspircd12/trunk/debian: ./ patches/ source/
kcd-guest at users.alioth.debian.org
kcd-guest at users.alioth.debian.org
Mon Apr 5 21:37:12 UTC 2010
Author: kcd-guest
Date: Mon Apr 5 21:37:07 2010
New Revision: 258
URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=258
Log:
- New upstream release 1.2.6
- Drop old upstream patchs
- Add support for all extra modules (except openssl and mssql)
- Change watchfile
- Switch to new source format (dpatch->dpatch)
- Close all (3) bugs opened
TODO: pbuilder test, Suggest extra modules dependencies, FTBFS kFreeBSD and hurd
Added:
packages/inspircd12/trunk/debian/patches/01_destdir_package (with props)
packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary (with props)
packages/inspircd12/trunk/debian/patches/03_disable_rpath_for_extra_modules
packages/inspircd12/trunk/debian/patches/04_disable_ssl_certs_copy
packages/inspircd12/trunk/debian/patches/series
- copied, changed from r257, packages/inspircd12/trunk/debian/patches/00list
packages/inspircd12/trunk/debian/source/
packages/inspircd12/trunk/debian/source/format
Removed:
packages/inspircd12/trunk/debian/patches/00list
packages/inspircd12/trunk/debian/patches/01_fix_config_reload.dpatch
packages/inspircd12/trunk/debian/patches/02_fix_gnutls_config.dpatch
packages/inspircd12/trunk/debian/patches/03_use_pkg-config_gnutls.dpatch
packages/inspircd12/trunk/debian/patches/04_gcc44_fixes.dpatch
Modified:
packages/inspircd12/trunk/debian/README.Debian
packages/inspircd12/trunk/debian/changelog
packages/inspircd12/trunk/debian/control
packages/inspircd12/trunk/debian/copyright
packages/inspircd12/trunk/debian/inspircd.1
packages/inspircd12/trunk/debian/inspircd.examples
packages/inspircd12/trunk/debian/inspircd.init
packages/inspircd12/trunk/debian/rules
packages/inspircd12/trunk/debian/watch
Modified: packages/inspircd12/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/README.Debian?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/README.Debian (original)
+++ packages/inspircd12/trunk/debian/README.Debian Mon Apr 5 21:37:07 2010
@@ -4,19 +4,19 @@
You will likely want to edit the configuration file, as many default settings will not be
suitable for a production network.
-Please read http://inspircd.org/wiki/Configuration for an outline and overview of various
+Please read http://inspircd.org/wiki/Configuration for an outline and overview of various
configuration options.
SSL:
-If you would like to use ssl with inspircd, please read
+If you would like to use ssl with inspircd, please read
http://www.inspircd.org/wiki/GnuTLS_SSL_Module.
Install gnutls-bin for the utilities required to generate the certificate.
-You may also be interested in using CACert instead of a self-signed certificate, in which
+You may also be interested in using CACert instead of a self-signed certificate, in which
case, follow the instructions at the Wiki.
More information:
-For the complete documentation of inspircd, please goto the inspircd wiki,
+For the complete documentation of inspircd, please goto the inspircd wiki,
http://inspircd.org/wiki/.
-- Darren Blaber <dmbtech at gmail.com> Fri, 15 Jun 2007 20:05:39 -0400
Modified: packages/inspircd12/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/changelog?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/changelog (original)
+++ packages/inspircd12/trunk/debian/changelog Mon Apr 5 21:37:07 2010
@@ -1,3 +1,32 @@
+inspircd (1.2.6+dfsg-1) unstable; urgency=low
+
+ * 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
+ - 03_use_pkg-config_gnutls.dpatch: drop old upstream patch
+ - 04_gcc44_fixes.dpatch: drop old upstream patch
+ + 01_destdir_package: add $DESTDIR to install binaries in package
+ + 02_spelling_error_in_binary: fix some spelling errors
+ + 03_disable_rpath_for_extra_modules: disable rpath: mysql, pcre, gnutls
+ * debian/control:
+ + 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.)
+ * 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)
+ * 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)
+
+ -- Guillaume Delacour <gui at iroqwa.org> Mon, 05 Apr 2010 14:56:03 +0000
+
inspircd (1.2.4-1) UNRELEASED; urgency=low
* New upstream release
Modified: packages/inspircd12/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/control?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/control (original)
+++ packages/inspircd12/trunk/debian/control Mon Apr 5 21:37:07 2010
@@ -8,9 +8,10 @@
Mario Iseli <mario at debian.org>,
Matt Arnold <mattarnold5 at gmail.com>,
Giacomo Catenazzi <cate at debian.org>,
- Bradley Smith <bradsmith at debian.org>
-Build-Depends: debhelper (>= 7), perl-modules, libgnutls-dev, dpatch, pkg-config
-Standards-Version: 3.8.2
+ Bradley Smith <bradsmith at debian.org>,
+ Guillaume Delacour <gui at iroqwa.org>
+Build-Depends: debhelper (>= 7), perl-modules, libgnutls-dev, pkg-config, libldap2-dev, libpcre3-dev, libmysqlclient-dev, libpq-dev, libsqlite3-dev, libssl-dev, zlib1g-dev, libgeoip-dev, libtre-dev
+Standards-Version: 3.8.4
Homepage: http://www.inspircd.org/
Vcs-Svn: svn://svn.debian.org/pkg-irc/packages/inspircd/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/
Modified: packages/inspircd12/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/copyright?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/copyright (original)
+++ packages/inspircd12/trunk/debian/copyright Mon Apr 5 21:37:07 2010
@@ -1,9 +1,10 @@
This package was debianized by Darren Blaber <dmbtech at gmail.com> on
Fri, 15 Jun 2007 20:05:39 -0400.
-It was downloaded from <http://www.inspircd.org/>.
+It was downloaded from http://www.inspircd.org/
-Upstream Authors: Craig Edwards (Brain) <brain at inspircd.org>,
+Upstream Authors:
+ Craig Edwards (Brain) <brain at inspircd.org>,
Craig McLure (FrostyCoolSlug) <craig at inspircd.org>,
Robin Burchell (w00t) <w00t at inspircd.org>.
@@ -11,25 +12,11 @@
All files except those mentioned below are copyright:
- Copyright (c) 2002-2007 InspIRCd Development Team (see Upstream Authors)
+ Copyright (C) 2002-2007 InspIRCd Development Team (see Upstream Authors)
License:
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; under version 2 of the License.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ GPL-2
The following files are licensed under a different license and belong to
different copyright holders:
@@ -48,7 +35,7 @@
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
-
+
THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -74,7 +61,7 @@
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
-
+
THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -91,5 +78,5 @@
rfc1413.txt
rfc1459.txt
-The Debian packaging is (C) 2007, Darren Blaber <dmbtech at gmail.com> and
-is licensed under the GPL, see above.
+The Debian packaging is copyright 2007, Darren Blaber <dmbtech at gmail.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
Modified: packages/inspircd12/trunk/debian/inspircd.1
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/inspircd.1?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/inspircd.1 (original)
+++ packages/inspircd12/trunk/debian/inspircd.1 Mon Apr 5 21:37:07 2010
@@ -23,16 +23,16 @@
.br
.SH DESCRIPTION
This manual page documents briefly the
-.B inspircd
+.B inspircd
command.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" 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.conf as its configuration file unless used with \fB\-\-config\fP.
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
Modified: packages/inspircd12/trunk/debian/inspircd.examples
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/inspircd.examples?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/inspircd.examples (original)
+++ packages/inspircd12/trunk/debian/inspircd.examples Mon Apr 5 21:37:07 2010
@@ -1,11 +1,2 @@
-conf/inspircd.motd.example
-conf/inspircd.helpop-full.example
-conf/inspircd.censor.example
-conf/aliases
-conf/aliases/ircservices.conf.example
-conf/aliases/anope.conf.example
-conf/aliases/atheme.conf.example
-conf/inspircd.quotes.example
-conf/inspircd.helpop.example
-conf/inspircd.filter.example
-conf/inspircd.rules.example
+conf/
+conf/aliases/
Modified: packages/inspircd12/trunk/debian/inspircd.init
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/inspircd.init?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/inspircd.init (original)
+++ packages/inspircd12/trunk/debian/inspircd.init Mon Apr 5 21:37:07 2010
@@ -1,14 +1,14 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: inspircd
-# Required-Start: $network $syslog $time
-# Required-Stop: $syslog
+# Required-Start: $remote_fs $network $syslog $time
+# Required-Stop: $remote_fs $syslog
# Should-Start: $local_fs
# Should-Stop: $local_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start inspircd
-# Description: Starts the inspircd irc server
+# Description: Starts the inspircd irc server
### END INIT INFO
# GPL Licensed
@@ -46,7 +46,7 @@
reload_ircd()
{
- if [ ! -z "$IRCDPIDN" ] && kill -0 $IRCDPIDN 2> /dev/null; then
+ if [ ! -z "$IRCDPIDN" ] && kill -0 $IRCDPIDN 2> /dev/null; then
kill -HUP $IRCDPIDN >/dev/null 2>&1 || return 1
return 0
else
Added: packages/inspircd12/trunk/debian/patches/01_destdir_package
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/patches/01_destdir_package?rev=258&op=file
==============================================================================
--- packages/inspircd12/trunk/debian/patches/01_destdir_package (added)
+++ packages/inspircd12/trunk/debian/patches/01_destdir_package Mon Apr 5 21:37:07 2010
@@ -1,0 +1,39 @@
+Define variable to install binaries on Debian package
+
+--- inspircd-1.2.4~/.Makefile.inc 2010-01-16 20:42:16.000000000 +0000
++++ inspircd-1.2.4/.Makefile.inc 2010-04-05 14:20:00.000000000 +0000
+@@ -22,11 +22,11 @@
+ CC = @CC@
+ FLAGS = $(NICEFLAGS) -pedantic
+ LDLIBS = @LDLIBS@
+-BASE = "@BASE_DIR@"
+-CONPATH = "@CONFIG_DIR@"
+-MODPATH = "@MODULE_DIR@"
+-BINPATH = "@BINARY_DIR@"
+-LIBPATH = "@LIBRARY_DIR@"
++BASE = "${DESTDIR}/@BASE_DIR@"
++CONPATH = "${DESTDIR}/@CONFIG_DIR@"
++MODPATH = "${DESTDIR}/@MODULE_DIR@"
++BINPATH = "${DESTDIR}/@BINARY_DIR@"
++LIBPATH = "${DESTDIR}/@LIBRARY_DIR@"
+ MODULES = @MODULES@
+ INSTMODE = 0755
+ @GNU_ONLY MAKEFLAGS += --no-print-directory
+@@ -55,7 +55,7 @@
+ check-root:
+ @if [ `id -u` = 0 ] && [ ! -e .force-root-ok ]; then echo "Don't compile or install as root!"; exit 1; fi
+
+-debug-header: check-root
++debug-header:
+ @echo "*************************************"
+ @echo "* BUILDING WITH DEBUG SYMBOLS *"
+ @echo "* *"
+@@ -69,7 +69,7 @@
+ @echo "* *"
+ @echo "*************************************"
+
+-std-header: check-root
++std-header:
+ @echo "*************************************"
+ @echo "* BUILDING INSPIRCD *"
+ @echo "* *"
Propchange: packages/inspircd12/trunk/debian/patches/01_destdir_package
------------------------------------------------------------------------------
svn:executable = *
Added: 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=258&op=file
==============================================================================
--- packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary (added)
+++ packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary Mon Apr 5 21:37:07 2010
@@ -1,0 +1,76 @@
+Fix spelling error in binaries
+
+--- a/src/commands/cmd_server.cpp
++++ b/src/commands/cmd_server.cpp
+@@ -29,7 +29,7 @@
+ }
+ else
+ {
+- user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have seperate ports from clients, change your config)",command.c_str());
++ user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have separate ports from clients, change your config)",command.c_str());
+ }
+ return CMD_FAILURE;
+ }
+--- a/src/modules/m_rpc_json.cpp
++++ b/src/modules/m_rpc_json.cpp
+@@ -235,7 +235,7 @@
+ else if (*i == ',')
+ {
+ if ((!aparent) || (!value) || ((pisobject) && (vkey.empty())))
+- throw JsonException("Unexpected value seperator token (',')");
++ throw JsonException("Unexpected value separator token (',')");
+
+ AttachToParentReset(aparent, value, vkey);
+ }
+--- a/src/modules/m_spanningtree/fjoin.cpp
++++ b/src/modules/m_spanningtree/fjoin.cpp
+@@ -78,14 +78,14 @@
+ if (created)
+ {
+ chan = new Channel(ServerInstance, channel, TS);
+- ServerInstance->SNO->WriteToSnoMask('d', "Creation FJOIN recieved for %s, timestamp: %lu", chan->name.c_str(), (unsigned long)TS);
++ ServerInstance->SNO->WriteToSnoMask('d', "Creation FJOIN received for %s, timestamp: %lu", chan->name.c_str(), (unsigned long)TS);
+ }
+ else
+ {
+ time_t ourTS = chan->age;
+
+ if (TS != ourTS)
+- ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN recieved for %s, ourTS: %lu, TS: %lu, difference: %lu",
++ ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %lu",
+ chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (unsigned long)(ourTS - TS));
+ /* If our TS is less than theirs, we dont accept their modes */
+ if (ourTS < TS)
+--- a/src/modules/m_spanningtree/treeserver.h
++++ b/src/modules/m_spanningtree/treeserver.h
+@@ -116,7 +116,7 @@
+ */
+ unsigned long rtt;
+
+- /** When we recieved BURST from this server, used to calculate total burst time at ENDBURST.
++ /** When we received BURST from this server, used to calculate total burst time at ENDBURST.
+ */
+ unsigned long StartBurst;
+
+--- a/src/modules/m_spanningtree/treesocket2.cpp
++++ b/src/modules/m_spanningtree/treesocket2.cpp
+@@ -86,7 +86,7 @@
+
+ if (prefix.empty())
+ {
+- this->SendError("BUG (?) Empty prefix recieved: " + line);
++ this->SendError("BUG (?) Empty prefix received: " + line);
+ return false;
+ }
+ }
+--- a/src/users.cpp
++++ b/src/users.cpp
+@@ -1103,7 +1103,7 @@
+ }
+ break;
+ default:
+- ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick.c_str());
++ ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I don't know protocol %d to be set on '%s'!", protocol_family, this->nick.c_str());
+ break;
+ }
+ }
Propchange: packages/inspircd12/trunk/debian/patches/02_spelling_error_in_binary
------------------------------------------------------------------------------
svn:executable = *
Added: packages/inspircd12/trunk/debian/patches/03_disable_rpath_for_extra_modules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/patches/03_disable_rpath_for_extra_modules?rev=258&op=file
==============================================================================
--- packages/inspircd12/trunk/debian/patches/03_disable_rpath_for_extra_modules (added)
+++ packages/inspircd12/trunk/debian/patches/03_disable_rpath_for_extra_modules Mon Apr 5 21:37:07 2010
@@ -1,0 +1,46 @@
+Disable rpath for extra modules.
+
+--- a/src/modules/extra/m_mysql.cpp
++++ b/src/modules/extra/m_mysql.cpp
+@@ -26,7 +26,7 @@
+
+ /* $ModDesc: SQL Service Provider module for all other m_sql* modules */
+ /* $CompileFlags: exec("mysql_config --include") */
+-/* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */
++/* $LinkerFlags: exec("mysql_config --libs_r") */
+ /* $ModDep: m_sqlv2.h */
+
+ /* THE NONBLOCKING MYSQL API!
+--- a/src/modules/extra/m_regex_tre.cpp
++++ b/src/modules/extra/m_regex_tre.cpp
+@@ -18,7 +18,7 @@
+
+ /* $ModDesc: Regex Provider Module for TRE Regular Expressions */
+ /* $CompileFlags: pkgconfincludes("tre","tre/regex.h","") */
+-/* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") rpath("pkg-config --libs tre") */
++/* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") */
+ /* $ModDep: m_regex.h */
+
+ class TRERegexException : public ModuleException
+--- a/src/modules/extra/m_regex_pcre.cpp
++++ b/src/modules/extra/m_regex_pcre.cpp
+@@ -18,7 +18,7 @@
+ /* $ModDesc: Regex Provider Module for PCRE */
+ /* $ModDep: m_regex.h */
+ /* $CompileFlags: exec("pcre-config --cflags") */
+-/* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
++/* $LinkerFlags: exec("pcre-config --libs") -lpcre */
+
+ #ifdef WINDOWS
+ #pragma comment(lib, "pcre.lib")
+--- a/src/modules/extra/m_ssl_gnutls.cpp
++++ b/src/modules/extra/m_ssl_gnutls.cpp
+@@ -23,7 +23,7 @@
+
+ /* $ModDesc: Provides SSL support for clients */
+ /* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */
+-/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
++/* $LinkerFlags: pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
+ /* $ModDep: transport.h */
+ /* $CopyInstall: conf/key.pem $(CONPATH) */
+ /* $CopyInstall: conf/cert.pem $(CONPATH) */
Added: packages/inspircd12/trunk/debian/patches/04_disable_ssl_certs_copy
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/patches/04_disable_ssl_certs_copy?rev=258&op=file
==============================================================================
--- packages/inspircd12/trunk/debian/patches/04_disable_ssl_certs_copy (added)
+++ packages/inspircd12/trunk/debian/patches/04_disable_ssl_certs_copy Mon Apr 5 21:37:07 2010
@@ -1,0 +1,12 @@
+--- a/configure
++++ b/configure
+@@ -1616,7 +1616,8 @@
+ }
+ elsif ($line =~ /\/\* \$CopyInstall: (.*?) \*\//i)
+ {
+- if (!exists($existing_install_list{$1}))
++ # don't copye non-existent ssl certs
++ if (!exists($existing_install_list{$1}) and $name !~ /m_ssl_{gnutls,openssl}.cpp/ and $non_interactive)
+ {
+ $existing_install_list{$1} = 1;
+ my $idir = (split(' ',$1))[1];
Copied: packages/inspircd12/trunk/debian/patches/series (from r257, packages/inspircd12/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/patches/series?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/patches/00list (original)
+++ packages/inspircd12/trunk/debian/patches/series Mon Apr 5 21:37:07 2010
@@ -1,4 +1,3 @@
-01_fix_config_reload.dpatch
-02_fix_gnutls_config.dpatch
-03_use_pkg-config_gnutls.dpatch
-04_gcc44_fixes.dpatch
+01_destdir_package
+02_spelling_error_in_binary
+03_disable_rpath_for_extra_modules
Modified: packages/inspircd12/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/rules?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/rules (original)
+++ packages/inspircd12/trunk/debian/rules Mon Apr 5 21:37:07 2010
@@ -1,9 +1,7 @@
#!/usr/bin/make -f
# $Id$
-export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
+#export DH_VERBOSE=1
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -25,9 +23,14 @@
endif
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
- ./configure --disable-interactive --disable-rpath=1 \
+ # 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
+ # Refresh makefiles
+ ./configure --modupdate
+ # Really launch configure
+ ./configure --disable-interactive \
--enable-gnutls $(SOCKET_ENGINE) \
--enable-ipv6 --prefix=/usr/lib/inspircd \
--config-dir=/etc/inspircd \
@@ -37,15 +40,15 @@
$(MAKE)
touch build-stamp
-clean: clean1 unpatch
-clean1:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Making distclean should remove the symlink, but it doesn't, so we do
# it here
[ ! -f Makefile ] || $(MAKE) distclean
- rm -rf src/modules/m_ssl_gnutls.cpp
+ # Delete symlinks to extra modules
+ find $(CURDIR)/src/modules/ -type l -exec rm '{}' \;
dh_clean
install: build-stamp
Added: packages/inspircd12/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/source/format?rev=258&op=file
==============================================================================
--- packages/inspircd12/trunk/debian/source/format (added)
+++ packages/inspircd12/trunk/debian/source/format Mon Apr 5 21:37:07 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: packages/inspircd12/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/watch?rev=258&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/watch (original)
+++ packages/inspircd12/trunk/debian/watch Mon Apr 5 21:37:07 2010
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/\+dfsg$// \
-http://sf.net/inspircd/InspIRCd-([\d\.]+)\.tar\.bz2
+http://www.inspircd.org/?p=olddownloads /\?p=download&version=([\d\.]+)
More information about the Pkg-irc-commits
mailing list