Mai 2009 - ngIRCd GIT Updates

Tag rel-14-1: Alexander Barton : ngIRCd release 14.1
by alex＠arthur.barton.de 05 Mai '09

05 Mai '09

Module: ngircd.git Branch: refs/tags/rel-14-1 Tag: 6411a2197218db4a6d9e619ee51ebbc3cd67fa3f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=6411a219721… Tagger: Alexander Barton <alex(a)barton.de> Date: Tue May 5 13:04:17 2009 +0200 ngIRCd release 14.1

1 0

Alexander Barton : ngIRCd release 14.1
by alex＠arthur.barton.de 05 Mai '09

05 Mai '09

Module: ngircd.git Branch: master Commit: 822c1e9265cfe31de6688924528dd7dc788872b5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=822c1e92… Author: Alexander Barton <alex(a)barton.de> Date: Tue May 5 12:58:51 2009 +0200 ngIRCd release 14.1 --- ChangeLog | 13 +++++++++++++ NEWS | 6 ++++++ configure.in | 2 +- contrib/ngircd.spec | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5bc401..adba5f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,19 @@ -- ChangeLog -- +ngIRCd Release 14.1 (2009-05-05) + + - Security: fix remotely triggerable crash in SSL/TLS code. + - BSD start script contrib/ngircd.sh has been renamed to ngircd-bsd.sh. + - New start/stop script for RedHat-based distributions: + contrib/ngircd-redhat.init, thanks to Naoya Nakazawa <naoya(a)sanow.net>. + - Doxygen: update source code repository link to GIT. + - Debian: build ngircd-full-dbg package. + - Allow ping timeout quit messages to show the timeout value. + - Fix error handling on compressed links. + - Fix server list announcement. + - Do not remove hostnames from info text. + ngIRCd Release 14 (2009-04-20) - Display IPv6 addresses as "[<addr>]" when accepting connections. diff --git a/NEWS b/NEWS index e92a57c..25494c2 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,12 @@ -- NEWS -- +ngIRCd Release 14.1 (2009-05-05) + + - Security: fix remotely triggerable crash in SSL/TLS code. + - Debian: build ngircd-full-dbg package. + - Allow ping timeout quit messages to show the timeout value. + ngIRCd Release 14 (2009-04-20) ngIRCd 14~rc1 (2009-03-29) diff --git a/configure.in b/configure.in index 221875d..6738dd6 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 14) +AC_INIT(ngircd, 14.1) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index dcd2650..1e72f30 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 14 +%define version 14.1 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Added start/stop script for Red Hat based distributions
by alex＠arthur.barton.de 05 Mai '09

05 Mai '09

Module: ngircd.git Branch: master Commit: 5b4a3eda08029b01fb00c3968cac4df5848e06a7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5b4a3eda… Author: Alexander Barton <alex(a)barton.de> Date: Tue May 5 12:50:55 2009 +0200 Added start/stop script for Red Hat based distributions Script contributed by Naoya Nakazawa <naoya(a)sanow.net>. --- contrib/Makefile.am | 3 +- contrib/README | 3 + contrib/ngircd-redhat.init | 119 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index edc0f57..ab6b342 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -11,7 +11,8 @@ SUBDIRS = Debian MacOSX -EXTRA_DIST = README ngircd.spec systrace.policy ngindent ngircd-bsd.sh +EXTRA_DIST = README ngircd.spec systrace.policy ngindent ngircd-bsd.sh \ + ngircd-redhat.init maintainer-clean-local: rm -f Makefile Makefile.in diff --git a/contrib/README b/contrib/README index c9d8265..353e2bb 100644 --- a/contrib/README +++ b/contrib/README @@ -22,6 +22,9 @@ ngindent ngircd-bsd.sh - Start script for FreeBSD. +ngircd-redhat.init + - Start/stop script for RedHat-based distributions (like CentOS). + ngircd.spec - RPM "spec" file. diff --git a/contrib/ngircd-redhat.init b/contrib/ngircd-redhat.init new file mode 100644 index 0000000..f63eba7 --- /dev/null +++ b/contrib/ngircd-redhat.init @@ -0,0 +1,119 @@ +#!/bin/sh +# +# ngIRCd start and stop script for RedHat based distributions. +# Written by Naoya Nakazawa <naoya(a)sanow.net> for CentOS 5.2, 2009. +# +# chkconfig: 2345 01 +# description: ngIRCd is an Open Source server for \ +# the Internet Relay Chat (IRC), which \ +# is developed and published under \ +# the terms of the GNU General Public +# Licence (URL: http://www.gnu.org/licenses/gpl.html) \ +# ngIRCd means "next generation IRC daemon", \ +# it's written from scratch and not deduced from the \ +# "grandfather of IRC daemons", the daemon of the IRCNet. +# +# processname: /usr/sbin/ngircd +# config: /etc/ngircd +# pidfile: /var/run/ngircd.pid + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/ngircd +NAME=ngIRCd +BASENAME=ngircd +CONF=/etc/$BASENAME.conf +DESC="IRC daemon" +PARAMS="-f $CONF" + +# Source function library. +. /etc/init.d/functions + +# Get config. +test -f /etc/sysconfig/network && . /etc/sysconfig/network +test -f /etc/sysconfig/makuosan && . /etc/sysconfig/makuosan + +# Check that networking is up. +[ "${NETWORKING}" = "yes" ] || exit 0 + +[ -x $DAEMON ] || exit 1 +[ -f $CONF ] || exit 2 + +RETVAL=0 + +start(){ + echo -n $"Starting $NAME: " + daemon $DAEMON $PARAMS + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME + echo + return $RETVAL +} + +stop(){ + echo -n $"Stopping $NAME: " + killproc $DAEMON + RETVAL=$? + if [ $RETVAL -eq 0 ] ; then + rm -f /var/lock/subsys/$BASENAME + fi + echo + return $RETVAL +} + +reload(){ + echo -n $"Reloading configuration: " + killproc $DAEMON -HUP + RETVAL=$? + echo + return $RETVAL +} + +restart(){ + stop + start +} + +condrestart(){ + [ -e /var/lock/subsys/$BASENAME ] && restart + return 0 +} + +check_config(){ + $DAEMON $PARAMS --configtest >/dev/null 2>&1 + [ $? -eq 0 ] && return 0 + + echo -n $"Configuration of $NAME is not valid, won't (re)start!" + echo -n $"Run \"$DAEMON --configtest\" and fix it up ..." + exit 6 +} + +# See how we were called. +case "$1" in + start) + check_config + start + ;; + stop) + stop + ;; + status) + status $NAME + ;; + restart) + restart + ;; + reload) + reload + ;; + condrestart) + condrestart + ;; + test) + check_config + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|test}" + RETVAL=1 +esac + +exit $RETVAL

1 0

Alexander Barton : Renamed contrib/ngircd.sh to contrib/ngircd-bsd.sh
by alex＠arthur.barton.de 05 Mai '09

05 Mai '09

Module: ngircd.git Branch: master Commit: a83554b572255add47d0694d9e85a301a3a0e6b8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a83554b5… Author: Alexander Barton <alex(a)barton.de> Date: Tue May 5 11:41:26 2009 +0200 Renamed contrib/ngircd.sh to contrib/ngircd-bsd.sh --- contrib/Makefile.am | 4 ++-- contrib/README | 8 ++------ contrib/{ngircd.sh => ngircd-bsd.sh} | 0 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 2125c10..edc0f57 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) +# Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) # # 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 @@ -11,7 +11,7 @@ SUBDIRS = Debian MacOSX -EXTRA_DIST = README ngircd.spec systrace.policy ngindent ngircd.sh +EXTRA_DIST = README ngircd.spec systrace.policy ngindent ngircd-bsd.sh maintainer-clean-local: rm -f Makefile Makefile.in diff --git a/contrib/README b/contrib/README index f32005e..c9d8265 100644 --- a/contrib/README +++ b/contrib/README @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2005 Alexander Barton, + (c)2001-2009 Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -19,7 +19,7 @@ MacOSX/ ngindent - Script to indent the code of ngIRCd in the "standard way". -ngircd.sh +ngircd-bsd.sh - Start script for FreeBSD. ngircd.spec @@ -27,7 +27,3 @@ ngircd.spec systrace.policy - Systrace policy file for OpenBSD (and probably NetBSD). - - --- -$Id: README,v 1.3 2006/07/23 11:34:32 alex Exp $ diff --git a/contrib/ngircd.sh b/contrib/ngircd-bsd.sh similarity index 100% rename from contrib/ngircd.sh rename to contrib/ngircd-bsd.sh

1 0

Florian Westphal : security: fix remotely triggerable crash in SSL/TLS code
by alex＠arthur.barton.de 05 Mai '09

05 Mai '09

Module: ngircd.git Branch: master Commit: 627b0b713c52406e50c84bb9459e7794262920a2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=627b0b71… Author: Florian Westphal <fw(a)strlen.de> Date: Mon May 4 23:51:24 2009 +0200 security: fix remotely triggerable crash in SSL/TLS code When a server is running with SSL/TLS support compiled in, it is trivial to crash the server by sending an MOTD request via another server in the network. - ONLY servers without ssl/tls support compiled in are not affected. Disabling SSL in the configuration (no ssl listening ports, etc) does NOT help. - servers that are running standalone (i.e., not connected to any other servers) are not affected, either. This affects all ngircd releases since ngircd 13 (earlier versions have no SSL/TLS support). --- src/ngircd/conn.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 9752a61..c6095a3 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1951,6 +1951,9 @@ Conn_GetClient( CONN_ID Idx ) GLOBAL bool Conn_GetCipherInfo(CONN_ID Idx, char *buf, size_t len) { + if (Idx < 0) + return false; + assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); return ConnSSL_GetCipherInfo(&My_Connections[Idx], buf, len); } @@ -1958,6 +1961,9 @@ Conn_GetCipherInfo(CONN_ID Idx, char *buf, size_t len) GLOBAL bool Conn_UsesSSL(CONN_ID Idx) { + if (Idx < 0) + return false; + assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL); } #endif

1 0

Alexander Barton : Fixed "Conflicts:" line in debian/control: missing comma
by alex＠arthur.barton.de 04 Mai '09

04 Mai '09

Module: ngircd.git Branch: master Commit: 95428a72ffb5214826b61d5e77f860e7ef6a6c9e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=95428a72… Author: Alexander Barton <alex(a)barton.de> Date: Mon May 4 11:23:19 2009 +0200 Fixed "Conflicts:" line in debian/control: missing comma --- contrib/Debian/changelog | 6 ++++++ contrib/Debian/control | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 8bce849..f41f1d8 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (14-0ab3) unstable; urgency=low + + * Fixed "Conflicts:" line in debian/control: missing comma. + + -- Alexander Barton <alex(a)barton.de> Mon, 4 May 2009 11:21:55 +0200 + ngircd (14-0ab2) unstable; urgency=low * Add new "ngircd-full-dbg" package including degug code and both diff --git a/contrib/Debian/control b/contrib/Debian/control index fa393ec..13163ce 100644 --- a/contrib/Debian/control +++ b/contrib/Debian/control @@ -32,7 +32,7 @@ Package: ngircd-full Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ircd -Conflicts: ngircd ngircd-dbg +Conflicts: ngircd, ngircd-dbg Description: A lightweight daemon for the Internet Relay Chat (IRC) ngIRCd is a free open source daemon for the Internet Relay Chat (IRC) network. It is written from scratch and is not based upon the original @@ -55,7 +55,7 @@ Package: ngircd-full-dbg Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ircd -Conflicts: ngircd ngircd-full +Conflicts: ngircd, ngircd-full Description: A lightweight daemon for the Internet Relay Chat (IRC) ngIRCd is a free open source daemon for the Internet Relay Chat (IRC) network. It is written from scratch and is not based upon the original

1 0

Alexander Barton : Debian: build ngircd-full-dbg package
by alex＠arthur.barton.de 04 Mai '09

04 Mai '09

Module: ngircd.git Branch: master Commit: 6b83d1740eb892c90f92fac55d9bbc362346feb5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6b83d174… Author: Alexander Barton <alex(a)barton.de> Date: Wed Apr 29 02:13:27 2009 +0200 Debian: build ngircd-full-dbg package In addition to the "ngircd" and "ngircd-full" packages a new package named "ngircd-full-dbg" is build: this package contains all the features of the "full" package but includes debug code and both the --debug and --sniffer options and the resulting binaries are _not_ stripped. --- contrib/Debian/.gitignore | 4 +++ contrib/Debian/Makefile.am | 7 +++- contrib/Debian/changelog | 7 +++++ contrib/Debian/control | 28 +++++++++++++++++++- contrib/Debian/rules | 63 ++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 101 insertions(+), 8 deletions(-) diff --git a/contrib/Debian/.gitignore b/contrib/Debian/.gitignore index f2a4c05..111d4ac 100644 --- a/contrib/Debian/.gitignore +++ b/contrib/Debian/.gitignore @@ -7,3 +7,7 @@ ngircd-full/ ngircd-full.default ngircd-full.init ngircd-full.postinst +ngircd-full-dbg/ +ngircd-full-dbg.default +ngircd-full-dbg.init +ngircd-full-dbg.postinst diff --git a/contrib/Debian/Makefile.am b/contrib/Debian/Makefile.am index f3d02a5..b20da99 100644 --- a/contrib/Debian/Makefile.am +++ b/contrib/Debian/Makefile.am @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) +# Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) # # 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 @@ -20,7 +20,10 @@ clean-local: ngircd.prerm.debhelper ngircd.substvars rm -f ngircd-full.postinst.debhelper ngircd-full.postrm.debhelper \ ngircd-full.prerm.debhelper ngircd-full.substvars - rm -rf ngircd ngircd-full + rm -f ngircd-full-dbg.postinst.debhelper \ + ngircd-full-dbg.postrm.debhelper ngircd-full-dbg.prerm.debhelper \ + ngircd-full-dbg.substvars + rm -rf ngircd ngircd-full ngircd-full-dbg rm -f files # -eof- diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 9999779..8bce849 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,10 @@ +ngircd (14-0ab2) unstable; urgency=low + + * Add new "ngircd-full-dbg" package including degug code and both + the --debug and --sniffer options, and containing debug symbols. + + -- Alexander Barton <alex(a)barton.de> Wed, 29 Apr 2009 01:13:03 +0200 + ngircd (14-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 14. diff --git a/contrib/Debian/control b/contrib/Debian/control index 543c5ad..fa393ec 100644 --- a/contrib/Debian/control +++ b/contrib/Debian/control @@ -32,7 +32,7 @@ Package: ngircd-full Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ircd -Conflicts: ngircd +Conflicts: ngircd ngircd-dbg Description: A lightweight daemon for the Internet Relay Chat (IRC) ngIRCd is a free open source daemon for the Internet Relay Chat (IRC) network. It is written from scratch and is not based upon the original @@ -50,3 +50,29 @@ Description: A lightweight daemon for the Internet Relay Chat (IRC) . ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run mixed networks. + +Package: ngircd-full-dbg +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: ircd +Conflicts: ngircd ngircd-full +Description: A lightweight daemon for the Internet Relay Chat (IRC) + ngIRCd is a free open source daemon for the Internet Relay Chat (IRC) + network. It is written from scratch and is not based upon the original + IRCd like many others. + . + In addition to the features of the "standard package", this package + includes support for TCP wrappers, IDENT requests, the IPv6 protocol and + SSL encrypted client and server links. + . + And in addition to the "full" variant, the binaries contained in this + package are build with debug code and contain debug symbols. + . + Advantages of ngIRCd: + - no problems with servers using changing/non-static IP addresses. + - small and lean configuration file. + - free, modern and open source C code. + - still under active development. + . + ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run + mixed networks. diff --git a/contrib/Debian/rules b/contrib/Debian/rules index bfe7ff7..5f6f826 100755 --- a/contrib/Debian/rules +++ b/contrib/Debian/rules @@ -56,6 +56,19 @@ configure-ngircd-full: configure --with-gnutls --with-ident --with-tcp-wrappers \ --enable-ipv6 +configure-ngircd-full-dbg: configure + dh_testdir + + # configure "full debug" variant: + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --sysconfdir=/etc/ngircd \ + --mandir=\$${prefix}/share/man \ + --enable-debug --enable-sniffer \ + --with-syslog --with-zlib \ + --with-gnutls --with-ident --with-tcp-wrappers \ + --enable-ipv6 + build: dh_clean -k @@ -76,7 +89,17 @@ build-stamp-ngircd-full: configure-ngircd-full # Add here commands to compile the "full" package: $(MAKE) - + + touch build-stamp-ngircd-full + +build-ngircd-full-dbg: build-stamp-ngircd-full-dbg +build-stamp-ngircd-full-dbg: configure-ngircd-full-dbg + dh_testdir + rm -f build-stamp-* + + # Add here commands to compile the "full debug" package: + $(MAKE) + touch build-stamp-ngircd-full clean: @@ -86,7 +109,10 @@ clean: rm -f $(CURDIR)/debian/ngircd-full.default rm -f $(CURDIR)/debian/ngircd-full.init rm -f $(CURDIR)/debian/ngircd-full.postinst - + rm -f $(CURDIR)/debian/ngircd-full-dbg.default + rm -f $(CURDIR)/debian/ngircd-full-dbg.postinst + rm -f $(CURDIR)/debian/ngircd-full-dbg.init + # Add here commands to clean up after the build process: [ ! -f Makefile ] || $(MAKE) distclean @@ -98,7 +124,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" endif dh_clean -install: install-ngircd install-ngircd-full +install: install-ngircd install-ngircd-full install-ngircd-full-dbg install-ngircd: build-ngircd dh_testdir @@ -138,6 +164,26 @@ install-ngircd-full: build-ngircd-full >$(CURDIR)/debian/ngircd-full/etc/ngircd/ngircd.conf touch $(CURDIR)/debian/ngircd-full/etc/ngircd/ngircd.motd +install-ngircd-full-dbg: build-ngircd-full-dbg + dh_testdir + dh_testroot + dh_installdirs + + # Add here commands to install the "full" package into debian/ngircd-full: + $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full-dbg + rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/INSTALL* + rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/COPYING* + mv $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd \ + $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg + mkdir -p $(CURDIR)/debian/ngircd-full-dbg/var/run/ircd + cat $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/sample-ngircd.conf | \ + sed -e "s/;ServerUID = 65534/ServerUID = irc/g" | \ + sed -e "s/;ServerGID = 65534/ServerGID = irc/g" | \ + sed -e "s/;MotdFile = \/usr\/local\/etc\/ngircd.motd/MotdFile = \/etc\/ngircd\/ngircd.motd/g" | \ + sed -e "s/;PidFile = \/var\/run\/ngircd\/ngircd.pid/PidFile = \/var\/run\/ircd\/ngircd.pid/g" \ + >$(CURDIR)/debian/ngircd-full-dbg/etc/ngircd/ngircd.conf + touch $(CURDIR)/debian/ngircd-full-dbg/etc/ngircd/ngircd.motd + # Build architecture-independent files here. binary-indep: # We have nothing to do by default. @@ -150,13 +196,20 @@ binary-arch: build install $(CURDIR)/debian/ngircd-full.init ln -s $(CURDIR)/debian/ngircd.postinst \ $(CURDIR)/debian/ngircd-full.postinst - + + ln -s $(CURDIR)/debian/ngircd.default \ + $(CURDIR)/debian/ngircd-full-dbg.default + ln -s $(CURDIR)/debian/ngircd.init \ + $(CURDIR)/debian/ngircd-full-dbg.init + ln -s $(CURDIR)/debian/ngircd.postinst \ + $(CURDIR)/debian/ngircd-full-dbg.postinst + dh_testdir dh_testroot dh_installchangelogs -a -A ChangeLog dh_installdocs -a dh_installinit -a - dh_strip -a + dh_strip -a --no-package=ngircd-full-dbg dh_compress -a dh_fixperms -a dh_installdeb -a

1 0

Alexander Barton : debian/rules: whitespace fixes
by alex＠arthur.barton.de 04 Mai '09

04 Mai '09

Module: ngircd.git Branch: master Commit: c8bba8e5c360519e3d6401a62dbc023515ddd8d7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c8bba8e5… Author: Alexander Barton <alex(a)barton.de> Date: Wed Apr 29 02:12:56 2009 +0200 debian/rules: whitespace fixes --- contrib/Debian/rules | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/Debian/rules b/contrib/Debian/rules index 5648846..bfe7ff7 100755 --- a/contrib/Debian/rules +++ b/contrib/Debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2008 Alexander Barton <alex(a)barton.de> +# Copyright (c)2001-2009 Alexander Barton <alex(a)barton.de> # # 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 @@ -36,7 +36,7 @@ endif configure-ngircd: configure dh_testdir - + # configure "standard" variant: ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ @@ -46,7 +46,7 @@ configure-ngircd: configure configure-ngircd-full: configure dh_testdir - + # configure "full" variant: ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ @@ -63,17 +63,17 @@ build-ngircd: build-stamp-ngircd build-stamp-ngircd: configure-ngircd dh_testdir rm -f build-stamp-* - + # Add here commands to compile the "standard" package: $(MAKE) - + touch build-stamp-ngircd build-ngircd-full: build-stamp-ngircd-full build-stamp-ngircd-full: configure-ngircd-full dh_testdir rm -f build-stamp-* - + # Add here commands to compile the "full" package: $(MAKE) @@ -89,7 +89,7 @@ clean: # Add here commands to clean up after the build process: [ ! -f Makefile ] || $(MAKE) distclean - + ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -104,7 +104,7 @@ install-ngircd: build-ngircd dh_testdir dh_testroot dh_installdirs - + # Add here commands to install the "standard" package into debian/ngircd: $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/INSTALL* @@ -122,7 +122,7 @@ install-ngircd-full: build-ngircd-full dh_testdir dh_testroot dh_installdirs - + # Add here commands to install the "full" package into debian/ngircd-full: $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/INSTALL*

1 0