[Pkg-irc-commits] r299 - in /packages/inspircd2/trunk/debian: changelog control copyright inspircd.service inspircd.tmpfiles.d.conf rules
kcd-guest at users.alioth.debian.org
kcd-guest at users.alioth.debian.org
Sun Mar 23 16:52:02 UTC 2014
Author: kcd-guest
Date: Sun Mar 23 16:52:02 2014
New Revision: 299
URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=299
Log:
Release 2.0.15 with help of David Adam
Added:
packages/inspircd2/trunk/debian/inspircd.service
packages/inspircd2/trunk/debian/inspircd.tmpfiles.d.conf
Modified:
packages/inspircd2/trunk/debian/changelog
packages/inspircd2/trunk/debian/control
packages/inspircd2/trunk/debian/copyright
packages/inspircd2/trunk/debian/rules
Modified: packages/inspircd2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/changelog?rev=299&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/changelog (original)
+++ packages/inspircd2/trunk/debian/changelog Sun Mar 23 16:52:02 2014
@@ -1,19 +1,31 @@
-inspircd (2.0.14-1) unstable; urgency=low
-
- * New upstream release (Closes: #724874)
+inspircd (2.0.15-1) unstable; urgency=low
+
+ * New upstream release (Closes: #724874), enable m_regex_stdlib new module
+ and repack tarball to remove docs/rfc/{rfc1035.txt,rfc1413.txt,rfc1459.txt}
+ as i re-introduce them a few years ago. Upstream removes dir at 7fea7c24c5
* Drop patches accepted upstream:
+ debian/patches/01_spelling_error.diff
+ debian/patches/03_CVE-2012-1836.diff (cherry-picked)
+ debian/patches/04_FTBFS_kfreebsd.diff
+ debian/patches/05_FTBFS_gcc-4.7.diff
- + debian/patches/06_FTBFS-hurd.diff
* debian/docs: docs/README has moved to README.md
- * debian/examples: examples are now in docs/conf
+ * debian/inspircd.examples: examples are now in docs/conf
* Bump debhelper compat to 9
* Remove Bradley Smith as uploaders (Closes: #674890)
* debian/watch: update based on sepwatch
-
- -- Guillaume Delacour <gui at iroqwa.org> Thu, 19 Dec 2013 00:35:13 +0100
+ * Add systemd support:
+ + Build-Depends on dh-systemd (>= 1.5)
+ + Add debian/inspircd.service, debian/inspircd.tmpfiles.d.conf
+ + debian/rules: call generic dh with "--with systemd"
+ * debian/control: Change Vcs-{Svn,Browser}, point to anonscm.debian.org and
+ bump to Standards-Version 3.9.5 (no changes needed)
+ * debian/patches/02_disable_rpath_for_extra_modules.diff: Refresh according
+ upstream modules changes
+ * debian/copyright: make it machine-readable
+ * debian/rules: compile binary with debuginfo as upstream don't
+ generate it by default; dh_strip overrided to generate a -dbg package
+
+ -- Guillaume Delacour <gui at iroqwa.org> Sun, 23 Mar 2014 17:03:55 +0100
inspircd (2.0.5-1) unstable; urgency=low
Modified: packages/inspircd2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/control?rev=299&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/control (original)
+++ packages/inspircd2/trunk/debian/control Sun Mar 23 16:52:02 2014
@@ -12,11 +12,11 @@
Build-Depends: debhelper (>= 9.0.0), perl-modules, libgnutls-dev, pkg-config,
libldap2-dev, libpcre3-dev, libmysqlclient-dev, libpq-dev,
libsqlite3-dev, zlib1g-dev, libgeoip-dev,
- libtre-dev, hardening-wrapper
-Standards-Version: 3.9.3
+ libtre-dev, hardening-wrapper, dh-systemd (>= 1.5)
+Standards-Version: 3.9.5
Homepage: http://www.inspircd.org/
-Vcs-Svn: svn://svn.debian.org/pkg-irc/packages/inspircd2/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/
+Vcs-Svn: svn://anonscm.debian.org/pkg-irc/packages/inspircd2/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-irc/packages/inspircd2/trunk/
Package: inspircd
Architecture: any
Modified: packages/inspircd2/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/copyright?rev=299&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/copyright (original)
+++ packages/inspircd2/trunk/debian/copyright Sun Mar 23 16:52:02 2014
@@ -1,95 +1,44 @@
-This package was debianized by Darren Blaber <dmbtech at gmail.com> on
-Fri, 15 Jun 2007 20:05:39 -0400.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: inspircd
+Source: https://github.com/inspircd/inspircd/releases
-It was downloaded from <http://www.inspircd.org/>.
+Files: *
+Copyright: InspIRCd Development Team (see Upstream Authors)
+License: GPL-2
+ This program 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; version 2 dated June, 1991.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-Upstream Authors: Craig Edwards (Brain) <brain at inspircd.org>,
- Craig McLure (FrostyCoolSlug) <craig at inspircd.org>,
- Robin Burchell (w00t) <w00t at inspircd.org>.
+Files: src/inspstring.cpp
+Copyright: 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+License: BSD-3-clause
-(There are lesser contributors, see <http://www.inspircd.org/wiki/Credits>.)
+Files: src/modules/m_sha256.cpp
+Copyright: 2005 Olivier Gay <olivier.gay at a3.epfl.ch>
+License: BSD-3-clause
-All files except those mentioned below are copyright:
-
- 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'.
-
-The following files are licensed under a different license and belong to
-different copyright holders:
-
- "src/inspstring.cpp":
- Copyright: Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
- License: Three-clause BSD license
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- 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
- THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- "src/modules/m_sha256.cpp":
- Copyright: Copyright (C) 2005 Olivier Gay <olivier.gay at a3.epfl.ch>
- License: Three-clause BSD license
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- 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
- THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-These files have been removed because they're not available with/under a free license:
-rfc1035.txt
-rfc1413.txt
-rfc1459.txt
-
-The Debian packaging is (C) 2007, Darren Blaber <dmbtech at gmail.com> and
-is licensed under the GPL, see above.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 4. Neither the name of the University nor the names of its contributors
+ may 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
+ THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Added: packages/inspircd2/trunk/debian/inspircd.service
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/inspircd.service?rev=299&op=file
==============================================================================
--- packages/inspircd2/trunk/debian/inspircd.service (added)
+++ packages/inspircd2/trunk/debian/inspircd.service Sun Mar 23 16:52:02 2014
@@ -0,0 +1,10 @@
+[Unit]
+Description=IRC server
+
+[Service]
+User=irc
+PIDFile=/var/run/inspircd/inspircd.pid
+ExecStart=/usr/sbin/inspircd --logfile /var/log/inspircd.log --config /etc/inspircd/inspircd.conf --nofork
+
+[Install]
+WantedBy=multi-user.target
Added: packages/inspircd2/trunk/debian/inspircd.tmpfiles.d.conf
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/inspircd.tmpfiles.d.conf?rev=299&op=file
==============================================================================
--- packages/inspircd2/trunk/debian/inspircd.tmpfiles.d.conf (added)
+++ packages/inspircd2/trunk/debian/inspircd.tmpfiles.d.conf Sun Mar 23 16:52:02 2014
@@ -0,0 +1 @@
+d /run/inspircd 0755 irc irc -
Modified: packages/inspircd2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/rules?rev=299&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/rules (original)
+++ packages/inspircd2/trunk/debian/rules Sun Mar 23 16:52:02 2014
@@ -13,7 +13,7 @@
# modules selection
LDAP_MODULES = m_ldapauth.cpp,m_ldapoper.cpp
DATABASES_MODULES = $(LDAP_MODULES),m_mysql.cpp,m_pgsql.cpp,m_sqlite3.cpp
-REGEX_MODULES = m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_tre.cpp
+REGEX_MODULES = m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_tre.cpp,m_regex_stdlib.cpp
OTHER_MODULES = $(REGEX_MODULES),m_geoip.cpp
SSL_MODULE = m_ssl_gnutls.cpp
INSPIRCD_MODULES = $(SSL_MODULE),$(DATABASES_MODULES),$(OTHER_MODULES)
@@ -62,4 +62,4 @@
rm -f $(CURDIR)/inspircd
%:
- dh $@
+ dh $@ --with systemd
More information about the Pkg-irc-commits
mailing list