ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : New numeric 329: get channel creation time on " MODE #chan" commands
by alex＠arthur.barton.de 15 Nov '10

15 Nov '10

Module: ngircd.git Branch: master Commit: 7321be2ccd861f1a260e16bf8ddbd32490fbc340 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7321be2c… Author: Alexander Barton <alex(a)barton.de> Date: Thu Nov 11 12:39:49 2010 +0100 New numeric 329: get channel creation time on "MODE #chan" commands --- src/ngircd/irc-mode.c | 13 +++++++++++-- src/ngircd/messages.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index df464a7..a4c1d89 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -294,8 +294,17 @@ Channel_Mode_Answer_Request(CLIENT *Origin, CHANNEL *Channel) if (the_args[0]) strlcat(the_modes, the_args, sizeof(the_modes)); - return IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG, - Client_ID(Origin), Channel_Name(Channel), the_modes); + if (!IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG, + Client_ID(Origin), Channel_Name(Channel), + the_modes)) + return DISCONNECTED; +#ifndef STRICT_RFC + if (!IRC_WriteStrClient(Origin, RPL_CREATIONTIME_MSG, + Client_ID(Origin), Channel_Name(Channel), + Channel_CreationTime(Channel))) + return DISCONNECTED; +#endif + return CONNECTED; } diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 03ddc36..900d2ff 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -65,6 +65,7 @@ #define RPL_LIST_MSG "322 %s %s %ld :%s" #define RPL_LISTEND_MSG "323 %s :End of LIST" #define RPL_CHANNELMODEIS_MSG "324 %s %s +%s" +#define RPL_CREATIONTIME_MSG "329 %s %s %ld" #define RPL_NOTOPIC_MSG "331 %s %s :No topic is set" #define RPL_TOPIC_MSG "332 %s %s :%s" #define RPL_TOPICSETBY_MSG "333 %s %s %s %u"

1 0

Alexander Barton : Merge branch 'numeric-329'
by alex＠arthur.barton.de 15 Nov '10

15 Nov '10

Module: ngircd.git Branch: master Commit: de6f08cc040240fdec662f18fb51d95859c4ab5a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=de6f08cc… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 15 19:36:21 2010 +0100 Merge branch 'numeric-329' * numeric-329: New numeric 329: get channel creation time on "MODE #chan" commands Save channel creation time; new function Channel_CreationTime() ---

1 0

Florian Westphal : add doc/PAM.txt to distribution tarball
by fw＠arthur.barton.de 14 Nov '10

14 Nov '10

Module: ngircd.git Branch: master Commit: 678d5411e23b3361ef32617f520d051109de8eef URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=678d5411… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Nov 14 23:15:43 2010 +0100 add doc/PAM.txt to distribution tarball doc/PAM.txt was not included in the release tarball. reported by Christoph Biedl. --- doc/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 4b20e70..dc710d4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,7 +19,7 @@ SUFFIXES = .tmpl static_docs = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ README-BeOS.txt RFC.txt Services.txt SSL.txt Zeroconf.txt \ - HowToRelease.txt + HowToRelease.txt PAM.txt doc_templates = sample-ngircd.conf.tmpl

1 0

Tag rel-17: Alexander Barton : ngIRCd release 17
by alex＠arthur.barton.de 07 Nov '10

07 Nov '10

Module: ngircd.git Branch: refs/tags/rel-17 Tag: d894b47cc9cbbb8a0638d306588c74d6d2813cf5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=d894b47cc9c… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun Nov 7 17:24:49 2010 +0100 ngIRCd release 17

1 0

Alexander Barton : ngIRCd release 17
by alex＠arthur.barton.de 07 Nov '10

07 Nov '10

Module: ngircd.git Branch: master Commit: 0d19f2b43a0c5cc5c2c87e949bd3d32efcd2f935 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0d19f2b4… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 7 17:24:07 2010 +0100 ngIRCd release 17 --- ChangeLog | 7 ++++++- NEWS | 4 +++- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cd1e96..83cdfd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,12 @@ -- ChangeLog -- -ngIRCd Release 17 +ngIRCd Release 17 (2010-11-07) + + - doc: change path names in sample-ngircd.conf depending on sysconfdir + - Fix up generation and distribution of sample-ngircd.conf + - contrib/ngircd-redhat.init: updated email address of Naoya Nakazawa + - contrib/platformtest.sh: make command name quoting consistent ngIRCd 17~rc3 (2010-10-27) - Xcode builds: detect version number correctly, updateed project file diff --git a/NEWS b/NEWS index 06ba872..47cb72d 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,9 @@ -- NEWS -- -ngIRCd Release 17 +ngIRCd Release 17 (2010-11-07) + + - doc: change path names in sample-ngircd.conf depending on sysconfdir ngIRCd 17~rc2 (2010-10-25) - Generate ngIRCd version number from GIT tag. diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 000392b..907a31a 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (17-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 17. + + -- Alexander Barton <alex(a)barton.de> Sun, 07 Nov 2010 17:23:07 +0100 + ngircd (17~rc3-0ab1) unstable; urgency=low * New "upstream" release candidate 3 for ngIRCd Release 17. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index c960ad4..5240c88 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 17~rc3 +%define version 17 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Updated doc/Platforms.txt for upcoming release 17
by alex＠arthur.barton.de 07 Nov '10

07 Nov '10

Module: ngircd.git Branch: master Commit: 5a14942b0a01bbb144589d6d7ba33184d924f495 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5a14942b… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 7 17:20:28 2010 +0100 Updated doc/Platforms.txt for upcoming release 17 --- doc/Platforms.txt | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 32cb8c1..c811c19 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -32,48 +32,42 @@ hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y hppa2.0/unknown/linux-gnu gcc 3.3.5 13~rc1 08-12-02 alex Y Y Y Y hppa2.0w-hp-hpux11.11 gcc 4.2.3 14.1 09-07-22 goetz Y Y Y Y i386/apple/darwin9.7.0 gcc 4.0.1 14.1 09-08-04 alex Y Y Y Y (3) -i386/apple/darwin10.4.0 gcc 4.2.1 17-dev 10-10-05 alex Y Y Y Y (3) +i386/apple/darwin10.4.0 gcc 4.2.1 17 10-11-07 alex Y Y Y Y (3) i386/pc/solaris2.9 gcc 3.2.2 CVSHEAD 04-02-24 alex Y Y Y Y -i386/pc/solaris2.11 gcc 3.4.3 14.1 09-08-03 alex Y Y Y Y (4) +i386/pc/solaris2.11 gcc 3.4.3 17 10-11-07 alex Y Y N Y (4) i386/unknown/freebsd5.2.1 gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y -i386/unknown/freebsd6.0 gcc 3.4.4 0.10.0-p1 06-08-04 alex Y Y Y Y (3) -i386/unknown/freebsd6.1 gcc 3.4.4 CVSHEAD 06-05-07 fw Y Y Y Y (3) -i386/unknown/freebsd6.2 gcc 3.4.6 17-dev 10-10-05 alex Y Y Y Y (3) -i386/unknown/freebsd7.0 gcc 4.2.1 14.1 09-07-28 alex Y Y Y Y (3) -i386/unknown/freebsd7.2 gcc 4.2.1 14.1 09-08-03 alex Y Y Y Y (3) -i386/unknown/freebsd7.3 gcc 4.2.1 17-dev 10-10-05 alex Y Y Y Y (3) -i386/unknown/gnu0.3 gcc 3.3.3 0.8.0 04-05-30 alex Y Y n Y -i686/unknown/gnu0.3 gcc 4.3.1 14.1 09-07-28 alex Y Y Y Y +i386/unknown/freebsd6.2 gcc 3.4.6 17 10-11-07 alex Y Y Y Y (3) +i386/unknown/freebsd7.3 gcc 4.2.1 17 10-11-07 alex Y Y Y Y (3) +i686/unknown/gnu0.3 gcc 4.4.5 17 10-11-07 alex Y Y Y Y i686/unkn./kfreebsd7.2-gnu gcc 4.3.4 15 09-12-02 alex Y Y Y Y (3) i386/unknown/netbsdelf1.6.1 gcc 2.95.3 CVSHEAD 04-02-24 alex Y Y Y Y i386/unknown/netbsdelf3.0.1 gcc 3.3.3 0.10.0-p1 06-08-30 alex Y Y Y Y (3) -i386/unknown/netbsdelf4.0 gcc 4.1.2 17-dev 10-10-05 alex Y Y Y Y (3) -i386/unknown/netbsdelf5.0.2 gcc 4.1.3 17-dev 10-10-07 alex Y Y Y Y (3) +i386/unknown/netbsdelf4.0 gcc 4.1.2 17 10-11-07 alex Y Y Y Y (3) +i386/unknown/netbsdelf5.0.2 gcc 4.1.3 17 10-11-07 alex Y Y Y Y (3) i386/unknown/openbsd3.9 gcc 3.3.5 0.10.0-p1 06-08-30 alex Y Y Y Y (3) i386/unknown/openbsd4.1 gcc 3.3.5 16 10-04-11 alex Y Y Y Y (3) i586/pc/interix3.5 gcc 3.3 15 10-01-22 alex Y Y N Y -i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y n Y +i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y N Y i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y (1) i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1) -m68k/apple/aux3.0.1 gcc 2.7.2 17~rc1 10-10-12 alex Y Y Y Y +m68k/apple/aux3.0.1 gcc 2.7.2 17 10-11-07 alex Y Y N Y +m68k/apple/aux3.0.1 Orig. A/UX 17 10-11-07 alex Y Y N Y (2) m68k/apple/aux3.1.1 Orig. A/UX 0.7.x-CVS 03-04-22 alex Y Y Y Y (2) m68k/hp/hp-ux9.10 Orig. HPUX 0.7.x-CVS 03-04-30 goetz Y Y Y Y m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ? powerpc/apple/darwin6.5 gcc 3.1 0.7.x-CVS 03-04-23 alex Y Y Y Y -powerpc/apple/darwin7.4.0 gcc 3.3 0.8.0 04-05-30 alex Y Y Y Y powerpc/apple/darwin7.9.0 gcc 3.3 CVSHEAD 06-05-07 fw Y Y Y Y (3) powerpc/apple/darwin8.1.0 gcc 4.0 0.9.x-CVS 05-06-27 alex Y Y Y Y powerpc/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y -powerpc/unknown/openbsd3.6 gcc 2.95.3 0.10.0 06-10-08 alex Y Y n Y +powerpc/unknown/openbsd3.6 gcc 2.95.3 0.10.0 06-10-08 alex Y Y N Y sparc/sun/solaris2.6 gcc 2.95.3 0.7.x-CVS 03-04-22 alex Y Y Y Y sparc/sun/solaris2.7 gcc 3.3 0.8.0 04-05-30 alex Y Y Y Y sparc/unkn./netbsdelf1.6.1 gcc 2.95.3 0.8.0 04-05-30 alex Y Y Y Y -x86_64/unknown/freebsd8.0 gcc 4.2.1 16 10-04-23 alex Y Y Y Y (3) -x86_64/unknown/freebsd8.1 gcc 4.2.1 17-dev 10-10-05 alex Y Y Y Y (3) -x86_64/unknown/linux-gnu gcc 4.3.2 17-dev 10-10-05 alex Y Y Y Y (1) -x86_64/unknown/openbsd4.7 gcc 3.3.5 17-dev 10-10-05 alex Y Y Y Y (3) +x86_64/unknown/freebsd8.1 gcc 4.2.1 17 10-11-07 alex Y Y Y Y (3) +x86_64/unknown/linux-gnu gcc 4.3.2 17 10-11-07 alex Y Y Y Y (1) +x86_64/unknown/openbsd4.7 gcc 3.3.5 17 10-11-07 alex Y Y Y Y (3) Notes

1 0

Alexander Barton : contrib/platformtest.sh: make command name quoting consistent
by alex＠arthur.barton.de 07 Nov '10

07 Nov '10

Module: ngircd.git Branch: master Commit: 2bca14b52e69d3ca3dd5591fd11300860ccfd050 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2bca14b5… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 7 15:26:26 2010 +0100 contrib/platformtest.sh: make command name quoting consistent --- contrib/platformtest.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 432243a..85d3a1d 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -51,9 +51,9 @@ if [ $? -ne 0 ]; then cd .. fi -echo "$NAME: Checking for ./autogen.sh script ..." +echo "$NAME: Checking for \"./autogen.sh\" script ..." if [ -r ./autogen.sh ]; then - echo "$NAME: Running ./autogen.sh ..." + echo "$NAME: Running \"./autogen.sh\" ..." [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null fi

1 0

Alexander Barton : contrib/ngircd-redhat.init: updated email address of Naoya Nakazawa
by alex＠arthur.barton.de 07 Nov '10

07 Nov '10

Module: ngircd.git Branch: master Commit: 29b41a4eccf024348631830d7fa087f88556f81a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=29b41a4e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 7 14:18:04 2010 +0100 contrib/ngircd-redhat.init: updated email address of Naoya Nakazawa --- contrib/ngircd-redhat.init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/ngircd-redhat.init b/contrib/ngircd-redhat.init index f63eba7..9f133bd 100644 --- a/contrib/ngircd-redhat.init +++ b/contrib/ngircd-redhat.init @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd start and stop script for RedHat based distributions. -# Written by Naoya Nakazawa <naoya(a)sanow.net> for CentOS 5.2, 2009. +# Written by Naoya Nakazawa <naoya.n(a)gmail.com> for CentOS 5.2, 2009. # # chkconfig: 2345 01 # description: ngIRCd is an Open Source server for \

1 0

Florian Westphal : doc: change path names in sample-ngircd. conf depending on sysconfdir
by alex＠arthur.barton.de 03 Nov '10

03 Nov '10

Module: ngircd.git Branch: master Commit: 4a197638688d4e39d57f201ac735a38c9fc5a260 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a197638… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Nov 1 23:47:04 2010 +0100 doc: change path names in sample-ngircd.conf depending on sysconfdir --- doc/Makefile.am | 9 ++++++++- ...{sample-ngircd.conf => sample-ngircd.conf.tmpl} | 12 ++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 1e5773e..51fab0e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,6 +10,13 @@ # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. # +.tmpl: + sed \ + -e s@:ETCDIR:@${sysconfdir}@ \ + <$< >$@ + +SUFFIXES = .tmpl + SUBDIRS = src EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ @@ -22,7 +29,7 @@ maintainer-clean-local: documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \ ../NEWS ../README -install-data-hook: +install-data-hook: $(documents) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf.tmpl similarity index 97% rename from doc/sample-ngircd.conf rename to doc/sample-ngircd.conf.tmpl index fe34dff..c6dde60 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf.tmpl @@ -42,7 +42,7 @@ ;AdminInfo1 = Description ;AdminInfo2 = Location ;AdminEMail = admin(a)irc.server - + # Ports on which the server should listen. There may be more than # one port, separated with ",". (Default: 6667) ;Ports = 6667, 6668, 6669 @@ -51,16 +51,16 @@ ;SSLPorts = 6697, 9999 # SSL Server Key - ;SSLKeyFile = /usr/local/etc/ngircd/ssl/server-key.pem + ;SSLKeyFile = :ETCDIR:ssl/server-key.pem # password to decrypt SSLKeyFile (OpenSSL only) ;SSLKeyFilePassword = secret # SSL Server Key Certificate - ;SSLCertFile = /usr/local/etc/ngircd/ssl/server-cert.pem + ;SSLCertFile = :ETCDIR:ssl/server-cert.pem # Diffie-Hellman parameters - ;SSLDHFile = /usr/local/etc/ngircd/ssl/dhparams.pem + ;SSLDHFile = :ETCDIR:ssl/dhparams.pem # comma separated list of IP addresses on which the server should # listen. Default values are: @@ -77,7 +77,7 @@ # Text file with the "message of the day" (MOTD). This message will # be shown to all users connecting to the server: - ;MotdFile = /usr/local/etc/ngircd.motd + ;MotdFile = :ETCDIR:ngircd.motd # A simple Phrase (<256 chars) if you don't want to use a motd file. ;MotdPhrase = "Hello world!" @@ -270,7 +270,7 @@ # Key file, syntax for each line: "<user>:<nick>:<key>". # Default: none. - ;KeyFile = /etc/ngircd/#chan.key + ;KeyFile = :ETCDIR:#chan.key # maximum users per channel (mode l) ;MaxUsers = 23

1 0

Alexander Barton : Fix up generation and distribution of sample-ngircd.conf
by alex＠arthur.barton.de 03 Nov '10

03 Nov '10

Module: ngircd.git Branch: master Commit: 30b6e72b96e8092f3a0884b1a02eb403b8a4b12c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=30b6e72b… Author: Alexander Barton <alex(a)barton.de> Date: Wed Nov 3 23:47:21 2010 +0100 Fix up generation and distribution of sample-ngircd.conf - Add generated sample-ngircd.conf to new .gitignore file, - refactor Makefile.am to generate sample-ngircd.conf on "make all", to clean it up on "make clean", and to install it to the correct place. - Make sure path names in sample-ngircd.conf are separated by "/". --- doc/.gitignore | 1 + doc/Makefile.am | 28 ++++++++++++++++++++-------- doc/sample-ngircd.conf.tmpl | 10 +++++----- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..0035855 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +sample-ngircd.conf diff --git a/doc/Makefile.am b/doc/Makefile.am index 51fab0e..4b20e70 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -17,27 +17,39 @@ SUFFIXES = .tmpl +static_docs = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ + README-BeOS.txt RFC.txt Services.txt SSL.txt Zeroconf.txt \ + HowToRelease.txt + +doc_templates = sample-ngircd.conf.tmpl + +generated_docs = sample-ngircd.conf + +toplevel_docs = ../AUTHORS ../COPYING ../ChangeLog ../INSTALL ../NEWS ../README + SUBDIRS = src -EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ - README-BeOS.txt RFC.txt Services.txt SSL.txt Zeroconf.txt \ - HowToRelease.txt sample-ngircd.conf +EXTRA_DIST = $(static_docs) $(doc_templates) + +CLEANFILES = $(generated_docs) maintainer-clean-local: rm -f Makefile Makefile.in -documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \ - ../NEWS ../README +all: $(generated_docs) -install-data-hook: $(documents) +install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ - $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ + $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ fi $(mkinstalldirs) $(DESTDIR)$(docdir) - for f in $(documents); do \ + for f in $(static_docs) $(toplevel_docs); do \ $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \ done + for f in $(generated_docs); do \ + $(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \ + done uninstall-hook: rm -rf $(DESTDIR)$(docdir) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index c6dde60..12b688d 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -51,16 +51,16 @@ ;SSLPorts = 6697, 9999 # SSL Server Key - ;SSLKeyFile = :ETCDIR:ssl/server-key.pem + ;SSLKeyFile = :ETCDIR:/ssl/server-key.pem # password to decrypt SSLKeyFile (OpenSSL only) ;SSLKeyFilePassword = secret # SSL Server Key Certificate - ;SSLCertFile = :ETCDIR:ssl/server-cert.pem + ;SSLCertFile = :ETCDIR:/ssl/server-cert.pem # Diffie-Hellman parameters - ;SSLDHFile = :ETCDIR:ssl/dhparams.pem + ;SSLDHFile = :ETCDIR:/ssl/dhparams.pem # comma separated list of IP addresses on which the server should # listen. Default values are: @@ -77,7 +77,7 @@ # Text file with the "message of the day" (MOTD). This message will # be shown to all users connecting to the server: - ;MotdFile = :ETCDIR:ngircd.motd + ;MotdFile = :ETCDIR:/ngircd.motd # A simple Phrase (<256 chars) if you don't want to use a motd file. ;MotdPhrase = "Hello world!" @@ -270,7 +270,7 @@ # Key file, syntax for each line: "<user>:<nick>:<key>". # Default: none. - ;KeyFile = :ETCDIR:#chan.key + ;KeyFile = :ETCDIR:/#chan.key # maximum users per channel (mode l) ;MaxUsers = 23

1 0

Springe zur Seite:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates