--- ngircd-0.10.3.orig/config.guess +++ ngircd-0.10.3/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,7 +161,6 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -781,7 +780,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -791,15 +790,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -954,9 +950,6 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1215,15 +1208,6 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; --- ngircd-0.10.3.orig/config.sub +++ ngircd-0.10.3/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2006-07-02' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,7 +276,6 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -285,7 +284,7 @@ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -324,7 +323,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -368,7 +367,7 @@ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -910,10 +909,6 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; sei) basic_machine=mips-sei os=-seiux @@ -925,9 +920,6 @@ basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1222,7 +1214,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1374,9 +1366,6 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) - os=-elf - ;; spu-*) os=-elf ;; @@ -1417,9 +1406,6 @@ m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;; --- ngircd-0.10.3.orig/debian/docs +++ ngircd-0.10.3/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README --- ngircd-0.10.3.orig/debian/ngircd.init +++ ngircd-0.10.3/debian/ngircd.init @@ -0,0 +1,68 @@ +#! /bin/sh + +# ngircd Start/stop the Next Generation IRC Server +# Version: ngircd 0.9.2 16-Nov-2005 +# Autor: Mario Iseli + +### BEGIN INIT INFO +# Provides: ircd +# Required-Start: $syslog +# Required-Stop: $syslog +# Should-Start: $local_fs, $network +# Should-Stop: $local_fs, $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Next Generation IRC Server +# Description: Starts ngircd in a proper way +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +test -f /usr/sbin/ngircd || exit 0 + +set -e + +case "$1" in + + start) + echo -n "Starting Next generation IRC server: " + start-stop-daemon --start --chuid irc:irc \ + --make-pidfile --background \ + --pidfile /var/run/ngircd/ngircd.pid \ + --exec /usr/sbin/ngircd -- -n + echo "ngircd." + ;; + + stop) + echo -n "Stopping Next generation IRC server: " + start-stop-daemon --stop --quiet \ + --pidfile /var/run/ngircd/ngircd.pid \ + --exec /usr/sbin/ngircd + rm -f /var/run/ngircd/ngircd.pid + echo "ngircd." + ;; + + reload|force-reload) + echo -n "Reloading Next generation IRC server configuration: " + start-stop-daemon --stop --quiet --oknodo --signal 1 \ + --pidfile /var/run/ngircd/ngircd.pid \ + --exec /usr/sbin/ngircd + echo "ngircd." + ;; + + restart) + echo -n "Restarting Next generation IRC server: " + $0 stop + sleep 1 + $0 start + echo "ngircd." + ;; + + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; + +esac + +exit 0 --- ngircd-0.10.3.orig/debian/copyright +++ ngircd-0.10.3/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Mario Iseli on +Tue, 1 Nov 2005 20:08:53 +0100. + +It was downloaded from + +Copyright Holder(s): Alexander Barton + Goetz Hoffart + Ilja Osthoff + Benjamin Pineau + Sean Reifschneider + Florian Westphal + +License: + + Copyright (C) 2001-2005 Alexander Barton + + 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; either version 2 of the License, or + (at your option) any later version. + + 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'. + --- ngircd-0.10.3.orig/debian/control +++ ngircd-0.10.3/debian/control @@ -0,0 +1,18 @@ +Source: ngircd +Section: net +Priority: optional +Maintainer: Mario Iseli +Build-Depends: debhelper (>= 5.0.0), autotools-dev, dpatch +Standards-Version: 3.7.2 + +Package: ngircd +Architecture: any +Depends: ${shlibs:Depends} +Replaces: ircd +Conflicts: dancer-ircd, ircd-hybrid, ircd-irc2, ircd-ircu, rageircd +Description: Next generation IRC Server + ngircd is a IRC Daemon for small or private networks. It does not contain all + the functions like the professional ones, e.g services. It is written from + scratch and is not based upon the original IRCd like many others. + . + Homepage: http://ngircd.barton.de --- ngircd-0.10.3.orig/debian/ngircd.postrm +++ ngircd-0.10.3/debian/ngircd.postrm @@ -0,0 +1,19 @@ +#! /bin/sh + +# ngircd Start/stop the Next Generation IRC Server +# Version: ngircd 0.9.2 16-Nov-2005 +# Autor: Mario Iseli + +set -e + +case "$1" in + purge) + rm -rf /etc/ngircd + rm -rf /var/run/ngircd + ;; + +esac + +#DEBHELPER# + +exit 0 --- ngircd-0.10.3.orig/debian/ngircd.postinst +++ ngircd-0.10.3/debian/ngircd.postinst @@ -0,0 +1,33 @@ +#! /bin/sh + +# ngircd Start/stop the Next Generation IRC Server +# Version: ngircd 0.9.2 14-Dec-2005 +# Autor: Mario Iseli + +set -e + +case "$1" in + + configure) + if [ ! -d "/var/run/ngircd" ]; then + mkdir /var/run/ngircd + chown irc:irc /var/run/ngircd + chmod 770 /var/run/ngircd + fi + chown -R irc:irc /etc/ngircd + chmod 770 /etc/ngircd + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "ERROR: Postinst called with unknown argument!" + exit 0 + ;; + +esac + +#DEBHELPER# + +exit 0 --- ngircd-0.10.3.orig/debian/ngircd.motd +++ ngircd-0.10.3/debian/ngircd.motd @@ -0,0 +1,5 @@ +************************************************** +* H E L L O * +* Welcome on our new IRC server, running on: * +* Debian GNU/Linux (www.debian.org) * +************************************************** --- ngircd-0.10.3.orig/debian/rules +++ ngircd-0.10.3/debian/rules @@ -0,0 +1,64 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +config.status: patch configure + dh_testdir + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc/ngircd --without-syslog --without-epoll + + +build: build-stamp + +build-stamp: config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd + rm -rf $(CURDIR)/debian/ngircd/etc + install -m 640 -D $(CURDIR)/debian/ngircd.conf $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.conf + install -m 640 -D $(CURDIR)/debian/ngircd.motd $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.motd + rm -rf $(CURDIR)/debian/ngircd/usr/share + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installexamples doc/sample-ngircd.conf + dh_installdocs + dh_installinit + dh_installman man/ngircd.8 man/ngircd.conf.5 + dh_compress + dh_strip + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- ngircd-0.10.3.orig/debian/ngircd.conf +++ ngircd-0.10.3/debian/ngircd.conf @@ -0,0 +1,142 @@ +# +# This is only a sample configuration for Debian +# written by Mario Iseli +# +# The original can be found at: +# /usr/share/doc/ngircd/examples/sample-ngircd.conf.gz +# + +[Global] + + # The [Global] section of this file is used to define the main + # configuration of the server, like the server name and the ports + # on which the server should be listening. + + # Server name in the IRC network, must contain at least one dot + # (".") and be unique in the IRC network. Required! + Name = irc.debian.org + + # Info text of the server. This will be shown by WHOIS and + # LINKS requests for example. + Info = Yet another IRC Server running on Debian GNU/Linux + + # Global password for all users needed to connect to the server + ;Password = wealllikedebian + + # Information about the server and the administrator, used by the + # ADMIN command. Not required by server but by RFC! + AdminInfo1 = Debian User + AdminInfo2 = Debian City + AdminEMail = root@localhost + + # Ports on which the server should listen. There may be more than + # one port, separated with ",". (Default: 6667) + Ports = 6667, 6668, 6669 + + # IP address on which the server should listen. (Default: empty, + # so the server listens on all IP addresses of the system) + ;Listen = 1.2.3.4 + + # Text file with the "message of the day" (MOTD). This message will + # be shown to all users connecting to the server: + MotdFile = /etc/ngircd/ngircd.motd + + # A simple Phrase (<256 chars) if you don't want to use a motd file. + # If it is set no MotdFile will be read at all. + ;MotdPhrase = "Hello. This is the Debian default MOTD sentence" + + # Do NOT change this on Debian! It runs with the default user 'irc' + ;ServerUID = 65534 + ;ServerGID = 65534 + PidFile = /var/run/ngircd/ngircd.pid + + # After seconds of inactivity the server will send a + # PING to the peer to test whether it is alive or not. + PingTimeout = 120 + + # If a client fails to answer a PING with a PONG within + # seconds, it will be disconnected by the server. + PongTimeout = 20 + + # The server tries every seconds to establish a link + # to not yet (or no longer) connected servers. + ConnectRetry = 60 + + # Should IRC Operators be allowed to use the MODE command even if + # they are not(!) channel-operators? + OperCanUseMode = yes + + # Maximum number of simultaneous connection the server is allowed + # to accept (<=0: unlimited): + MaxConnections = 500 + + # Maximum number of simultaneous connections from a single IP address + # the server will accept (<=0: unlimited): + MaxConnectionsIP = 10 + + # Maximum number of channels a user can be member of (<=0: no limit): + MaxJoins = 10 + +[Operator] + # [Operator] sections are used to define IRC Operators. There may be + # more than one [Operator] block, one for each local operator. + + # ID of the operator (may be different of the nick name) + ;Name = TheOper + + # Password of the IRC operator + ;Password = ThePwd + +[Server] + # Other servers are configured in [Server] sections. If you + # configure a port for the connection, then this ngircd tries to + # connect to to the other server on the given port; if not it waits + # for the other server to connect. + # There may be more than one server block. + # + # Server Groups: + # The ngIRCd allows "server groups": You can assign an "ID" to every + # server with which you want this ngIRCd to link. If a server of a + # group won't answer, the ngIRCd tries to connect to the next server + # in the given group. But the ngircd never tries to connect to two + # servers with the same group ID. + + # IRC name of the server + ;Name = irc2.debian.org + + # Internet host name of the peer + ;Host = connect-to-host.the.net + + # Port of the server to which the ngIRCd should connect. If you + # assign no port the ngIRCd waits for incoming connections. + ;Port = 6666 + + # Own password for the connection. This password has to be configured + # as "PeerPassword" on the other server. + ;MyPassword = MySecret + + # Foreign password for this connection. This password has to be + # configured as "MyPassword" on the other server. + ;PeerPassword = PeerSecret + + # Group of this server (optional) + ;Group = 123 + +[Channel] + # Pre-defined channels can be configured in [Channel] sections. + # Such channels are created by the server when starting up and even + # persist when there are no more members left. + # Persistent channels are marked with the mode 'P', which can be set + # and unset by IRC operators like other modes on the fly. + # There may be more than one [Channel] block. + + # Name of the channel + Name = #ngircd + + # Topic for this channel + ;Topic = Our ngircd testing channel + + # Initial channel modes + Modes = tn + +# -eof- --- ngircd-0.10.3.orig/debian/compat +++ ngircd-0.10.3/debian/compat @@ -0,0 +1 @@ +5 --- ngircd-0.10.3.orig/debian/changelog +++ ngircd-0.10.3/debian/changelog @@ -0,0 +1,86 @@ +ngircd (0.10.3-2~bpo40+1) etch-backports; urgency=low + + * Security rebuild for etch-backports, to fix this issue: + - CVE-2008-0285: remote triggered crash via crafted IRC PART message + + -- Gerfried Fuchs Wed, 10 Dec 2008 16:01:25 +0100 + +ngircd (0.10.3-2) unstable; urgency=high + + * Added 05-CVE-2008-0285.dpatch from Nico Golde to fix the following + security issue: + - A crafted PART message could lead to referencing invalid memory and thus + causing a denial of service situation (CVE-2008-0285; Closes: #461067). + + -- Mario Iseli Wed, 16 Jan 2008 15:31:32 +0100 + +ngircd (0.10.3-1) unstable; urgency=low + + * New maintainer E-Mail address. + * New upstream release. + * Removed several useless whitespaces in debian/*. + * Added [ ! -f Makefile ] || $(MAKE) distclean to debian/rules. + + -- Mario Iseli Sat, 04 Aug 2007 17:04:53 +0200 + +ngircd (0.10.0-3) unstable; urgency=medium + + * Corrected the PidFile direction in sample ngircd.conf (Closes: #397331). + + -- Mario Iseli Tue, 12 Dec 2006 10:34:13 +0100 + +ngircd (0.10.0-2) unstable; urgency=medium + + * Compile without epoll(), works now on Linux 2.4.x (Closes: #395553). + * Corrected the path to the example config in referenced ngircd.conf. + + -- Mario Iseli Sun, 05 Nov 2006 13:51:59 +0100 + +ngircd (0.10.0-1) unstable; urgency=low + + * New upstream release (Closes: #392616). + * Removed provide on ircd. + + -- Mario Iseli Wed, 11 Oct 2006 23:49:03 +0200 + +ngircd (0.9.2-4) unstable; urgency=low + + * Updated to policy 3.7.2 + * Removed patch 04-nicklength to be RFC-compliant (Closes: #353876) + + -- Mario Iseli Sun, 07 May 2006 15:21:34 +0200 + +ngircd (0.9.2-3) unstable; urgency=low + + * New patch which allows longer nicknames, thanks to Benjamin A'Lee + for the patch. (Closes: #355342) + * Fixed the typo in the example config. (Closes: #353876) + + -- Mario Iseli Sun, 05 Mar 2006 23:22:34 +0100 + +ngircd (0.9.2-2) unstable; urgency=low + + * Wrote 03-ping.dpatch (Closes: #343200) + * Added a "if" in debian/ngircd.postinst + + -- Mario Iseli Wed, 14 Dec 2005 23:02:34 +0100 + +ngircd (0.9.2-1) unstable; urgency=low + + * New upstream version + * Changed the init and postinst script + * reload in init script is now supported + * fixed mistake in configfile + * added original config as example + * Removed patches/01-manuals and added patches/02-manuals + + -- Mario Iseli Wed, 16 Nov 2005 17:50:17 +0100 + +ngircd (0.8.2-1) unstable; urgency=low + + * Initial release Closes: #295970 + * New debian-optimized config + * Introduced dpatch and wrote a patch for the manuals (01-manuals) + + -- Mario Iseli Tue, 1 Nov 2005 20:08:53 +0100 + --- ngircd-0.10.3.orig/debian/patches/03-ping.dpatch +++ ngircd-0.10.3/debian/patches/03-ping.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03-unnamed.dpatch by Mario Iseli +## +## DP: Fixes the problem with the ping answer. + +@DPATCH@ + +diff -Naur ngircd-0.9.2.orig/src/ngircd/irc-login.c ngircd-0.9.2/src/ngircd/irc-login.c +--- ngircd-0.9.2.orig/src/ngircd/irc-login.c 2005-06-04 14:32:09.000000000 +0200 ++++ ngircd-0.9.2/src/ngircd/irc-login.c 2005-12-14 22:49:28.000000000 +0100 +@@ -456,7 +456,7 @@ + } + + Log( LOG_DEBUG, "Connection %d: got PING, sending PONG ...", Client_Conn( Client )); +- return IRC_WriteStrClient( Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Client_ID( Client )); ++ return IRC_WriteStrClient(Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Req->argv[0]); + } /* IRC_PING */ --- ngircd-0.10.3.orig/debian/patches/01-manuals.dpatch +++ ngircd-0.10.3/debian/patches/01-manuals.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-manuals.dpatch by Mario Iseli +## +## DP: Fixes the paths in the manuals. + +@DPATCH@ + +diff -Naur ngircd-0.8.2-orig/man/ngircd.8 ngircd-0.8.2/man/ngircd.8 +--- ngircd-0.8.2-orig/man/ngircd.8 2004-04-05 12:59:10.000000000 +0200 ++++ ngircd-0.8.2/man/ngircd.8 2005-11-07 23:14:08.000000000 +0100 +@@ -58,11 +58,11 @@ + \fB\-\-help\fR + Display a brief help text and exit. + .SH FILES +-.I /usr/local/etc/ngircd.conf ++.I /etc/ngircd/ngircd.conf + .RS + The system wide default configuration file. + .RE +-.I /usr/local/etc/ngircd.motd ++.I /etc/ngircd/ngircd.motd + .RS + Default "message of the day" (MOTD). + .RE +diff -Naur ngircd-0.8.2-orig/man/ngircd.conf.5 ngircd-0.8.2/man/ngircd.conf.5 +--- ngircd-0.8.2-orig/man/ngircd.conf.5 2004-05-07 13:24:18.000000000 +0200 ++++ ngircd-0.8.2/man/ngircd.conf.5 2005-11-07 23:14:27.000000000 +0100 +@@ -5,7 +5,7 @@ + .SH NAME + ngircd.conf \- configuration file of ngIRCd + .SH SYNOPSIS +-.B /usr/local/etc/ngircd.conf ++.B /etc/ngircd/ngircd.conf + .SH DESCRIPTION + .BR ngircd.conf + is the configuration file for --- ngircd-0.10.3.orig/debian/patches/05-CVE-2008-0285.dpatch +++ ngircd-0.10.3/debian/patches/05-CVE-2008-0285.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05-CVE-2008-0285.dpatch by Nico Golde +## +## DP: Fixes the security issue specified in CVE-2008-0285 + +@DPATCH@ +diff -urNad ngircd-0.10.3~/src/ngircd/irc-channel.c ngircd-0.10.3/src/ngircd/irc-channel.c +--- ngircd-0.10.3~/src/ngircd/irc-channel.c 2007-07-31 20:57:06.000000000 +0200 ++++ ngircd-0.10.3/src/ngircd/irc-channel.c 2008-01-16 13:14:46.000000000 +0100 +@@ -270,7 +270,8 @@ + assert( Req != NULL ); + + /* Falsche Anzahl Parameter? */ +- if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); ++ if((Req->argc < 1) || (Req->argc > 2 )) ++ return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + /* Wer ist der Absender? */ + if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix ); +@@ -278,15 +279,9 @@ + if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + + /* Channel-Namen durchgehen */ +- chan = strtok( Req->argv[0], "," ); +- while( chan ) +- { +- if( ! Channel_Part( target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID( target ))) +- { +- /* naechsten Namen ermitteln */ +- chan = strtok( NULL, "," ); +- continue; +- } ++ chan = strtok(Req->argv[0], ","); ++ while (chan) { ++ Channel_Part(target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID(target)); + + /* naechsten Namen ermitteln */ + chan = strtok( NULL, "," ); --- ngircd-0.10.3.orig/debian/patches/04-nicklength.dpatch +++ ngircd-0.10.3/debian/patches/04-nicklength.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99-unnamed.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ + +diff --context -r ngircd-0.9.2/src/ngircd/defines.h ngircd-0.9.2-new/src/ngircd/defines.h +*** ngircd-0.9.2/src/ngircd/defines.h 2005-07-05 23:58:25.000000000 +0100 +--- ngircd-0.9.2-new/src/ngircd/defines.h 2006-03-05 00:45:35.000000000 +0000 +*************** +*** 41,49 **** + #define CONNECTION_POOL 100 /* size of default connection pool */ + + #define CLIENT_ID_LEN 64 /* max. length of an IRC ID; see RFC 2812, 1.1 and 1.2.1 */ +! #define CLIENT_NICK_LEN 10 /* max. nick length; see. RFC 2812, 1.2.1 */ + #define CLIENT_PASS_LEN 21 /* max. password length */ +! #define CLIENT_USER_LEN 10 /* Max. length of user name ("login") + see RFC 2812, section 1.2.1 */ + #define CLIENT_NAME_LEN 32 /* max. length of "real names" */ + #define CLIENT_HOST_LEN 64 /* max. host name length */ +--- 41,49 ---- + #define CONNECTION_POOL 100 /* size of default connection pool */ + + #define CLIENT_ID_LEN 64 /* max. length of an IRC ID; see RFC 2812, 1.1 and 1.2.1 */ +! #define CLIENT_NICK_LEN 16 /* max. nick length; see. RFC 2812, 1.2.1 */ + #define CLIENT_PASS_LEN 21 /* max. password length */ +! #define CLIENT_USER_LEN 16 /* Max. length of user name ("login") + see RFC 2812, section 1.2.1 */ + #define CLIENT_NAME_LEN 32 /* max. length of "real names" */ + #define CLIENT_HOST_LEN 64 /* max. host name length */ --- ngircd-0.10.3.orig/debian/patches/02-manuals.dpatch +++ ngircd-0.10.3/debian/patches/02-manuals.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-manuals.dpatch by Mario Iseli +## +## DP: Fixes the paths in the manuals. + +@DPATCH@ + +diff -Naur ngircd-0.9.2-orig/man/ngircd.8 ngircd-0.9.2/man/ngircd.8 +--- ngircd-0.9.2-orig/man/ngircd.8 2005-06-04 15:39:20.000000000 +0200 ++++ ngircd-0.9.2/man/ngircd.8 2005-11-15 23:39:41.000000000 +0100 +@@ -55,11 +55,11 @@ + \fB\-\-help\fR + Display a brief help text and exit. + .SH FILES +-.I /usr/local/etc/ngircd.conf ++.I /etc/ngircd/ngircd.conf + .RS + The system wide default configuration file. + .RE +-.I /usr/local/etc/ngircd.motd ++.I /etc/ngircd/ngircd.motd + .RS + Default "message of the day" (MOTD). + .RE +@@ -74,7 +74,6 @@ + http://arthur.ath.cx/~alex/ngircd/ + .UE + .SH "SEE ALSO" +-.BR ngircd.conf (5), +-.BR ircd (8) ++.BR ngircd.conf (5) + .\" + .\" -eof- +diff -Naur ngircd-0.9.2-orig/man/ngircd.conf.5 ngircd-0.9.2/man/ngircd.conf.5 +--- ngircd-0.9.2-orig/man/ngircd.conf.5 2005-06-04 15:39:20.000000000 +0200 ++++ ngircd-0.9.2/man/ngircd.conf.5 2005-11-15 23:40:41.000000000 +0100 +@@ -5,7 +5,7 @@ + .SH NAME + ngircd.conf \- configuration file of ngIRCd + .SH SYNOPSIS +-.B /usr/local/etc/ngircd.conf ++.B /etc/ngircd/ngircd.conf + .SH DESCRIPTION + .BR ngircd.conf + is the configuration file for --- ngircd-0.10.3.orig/debian/patches/00list +++ ngircd-0.10.3/debian/patches/00list @@ -0,0 +1,2 @@ +02-manuals +05-CVE-2008-0285