Anyone? I will commit this tomorrow unless someone objects.
On Wed, Oct 30, 2013 at 11:55 PM, Federico G. Schwindt <fg...@lodoss.net>wrote: > Hi, > > The diff below updates ngircd to version 21. > > I've moved the config to /etc/ngircd. I appreciate this adds a manual > step to the upgrade process but should be better in the long run and > people using ssl and/or having a separate motd file will benefit. > > I've been running with some form of rel 21 for a while on i386. Tested > on amd64 as well. > > Comments? OK? > > f.- > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/ngircd/Makefile,v > retrieving revision 1.7 > diff -p -u -r1.7 Makefile > --- Makefile 28 Aug 2013 11:53:16 -0000 1.7 > +++ Makefile 30 Oct 2013 23:18:18 -0000 > @@ -2,7 +2,7 @@ > > COMMENT = lightweight irc server > > -DISTNAME = ngircd-20.3 > +DISTNAME = ngircd-21 > > CATEGORIES = net > > @@ -18,11 +18,15 @@ WANTLIB = c crypto ssl z > MASTER_SITES = ftp://ftp.berlios.de/pub/ngircd/ \ > http://ngircd.barton.de/pub/ngircd/ > > -TEST_DEPENDS = lang/expect \ > - ${BASE_PKGPATH} > +MODULES = converters/libiconv > +TEST_DEPENDS = lang/expect \ > + ${BASE_PKGPATH} > + > +SYSCONFDIR = ${BASESYSCONFDIR}/ngircd > > CONFIGURE_STYLE = gnu > -CONFIGURE_ARGS += --with-openssl \ > +CONFIGURE_ARGS += --with-iconv=${LOCALBASE} \ > + --with-openssl \ > --enable-ipv6 > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/ngircd/distinfo,v > retrieving revision 1.4 > diff -p -u -r1.4 distinfo > --- distinfo 28 Aug 2013 11:53:16 -0000 1.4 > +++ distinfo 30 Oct 2013 23:18:18 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (ngircd-20.3.tar.gz) = VdfHTG33kLEaaMB/OYNtWBllCH77YY0+mmvshVNkwvk= > -SIZE (ngircd-20.3.tar.gz) = 479982 > +SHA256 (ngircd-21.tar.gz) = DtvUEwQYbkP52QenAXtAUgzJDCzimxM5vc12Iv/+GaA= > +SIZE (ngircd-21.tar.gz) = 500668 > Index: patches/patch-doc_Makefile_in > =================================================================== > RCS file: /cvs/ports/net/ngircd/patches/patch-doc_Makefile_in,v > retrieving revision 1.2 > diff -p -u -r1.2 patch-doc_Makefile_in > --- patches/patch-doc_Makefile_in 19 Jan 2013 20:40:56 -0000 1.2 > +++ patches/patch-doc_Makefile_in 30 Oct 2013 23:18:18 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-doc_Makefile_in,v 1.2 2013/01/19 20:40:56 fgsch Exp $ > ---- doc/Makefile.in.orig Fri Jan 18 01:32:04 2013 > -+++ doc/Makefile.in Fri Jan 18 01:32:49 2013 > -@@ -584,16 +584,13 @@ maintainer-clean-local: > +--- doc/Makefile.in.orig Wed Oct 30 21:21:47 2013 > ++++ doc/Makefile.in Wed Oct 30 22:14:16 2013 > +@@ -586,16 +586,13 @@ maintainer-clean-local: > all: $(generated_docs) > > install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) > Index: patches/patch-doc_sample-ngircd_conf_tmpl > =================================================================== > RCS file: /cvs/ports/net/ngircd/patches/patch-doc_sample-ngircd_conf_tmpl,v > retrieving revision 1.2 > diff -p -u -r1.2 patch-doc_sample-ngircd_conf_tmpl > --- patches/patch-doc_sample-ngircd_conf_tmpl 19 Jan 2013 20:40:57 -0000 > 1.2 > +++ patches/patch-doc_sample-ngircd_conf_tmpl 30 Oct 2013 23:18:18 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.2 2013/01/19 20:40:57 > fgsch Exp $ > ---- doc/sample-ngircd.conf.tmpl.orig Tue Jan 1 18:22:11 2013 > -+++ doc/sample-ngircd.conf.tmpl Fri Jan 18 01:31:56 2013 > -@@ -67,14 +67,14 @@ > +--- doc/sample-ngircd.conf.tmpl.orig Wed Sep 18 22:12:44 2013 > ++++ doc/sample-ngircd.conf.tmpl Wed Oct 30 22:36:03 2013 > +@@ -71,14 +71,14 @@ > # Group ID under which the ngIRCd should run; you can use the name > # of the group or the numerical ID. ATTENTION: For this to work the > # server must have been started with root privileges! > @@ -18,7 +18,7 @@ $OpenBSD: patch-doc_sample-ngircd_conf_t > > [Limits] > # Define some limits and timeouts for this ngIRCd instance. Default > -@@ -126,7 +126,7 @@ > +@@ -143,7 +143,7 @@ > # binary. By default ngIRCd won't use the chroot() feature. > # ATTENTION: For this to work the server must have been started > # with root privileges! > @@ -27,3 +27,25 @@ $OpenBSD: patch-doc_sample-ngircd_conf_t > > # Set this hostname for every client instead of the real one. > # Use %x to add the hashed value of the original hostname. > +@@ -246,7 +246,7 @@ > + # So don't forget to remove the ";" above if this is the case ... > + > + # SSL Server Key Certificate > +- ;CertFile = :ETCDIR:/ssl/server-cert.pem > ++ ;CertFile = :ETCDIR:/server-cert.pem > + > + # Select cipher suites allowed for SSL/TLS connections. This > defaults > + # to HIGH:!aNULL:@STRENGTH (OpenSSL) or SECURE128 (GnuTLS). > +@@ -258,10 +258,10 @@ > + ;CipherList = SECURE128 > + > + # Diffie-Hellman parameters > +- ;DHFile = :ETCDIR:/ssl/dhparams.pem > ++ ;DHFile = :ETCDIR:/dhparams.pem > + > + # SSL Server Key > +- ;KeyFile = :ETCDIR:/ssl/server-key.pem > ++ ;KeyFile = :ETCDIR:/server-key.pem > + > + # password to decrypt SSLKeyFile (OpenSSL only) > + ;KeyFilePassword = secret > Index: patches/patch-src_ngircd_conf_c > =================================================================== > RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_conf_c,v > retrieving revision 1.2 > diff -p -u -r1.2 patch-src_ngircd_conf_c > --- patches/patch-src_ngircd_conf_c 19 Jan 2013 20:40:57 -0000 1.2 > +++ patches/patch-src_ngircd_conf_c 30 Oct 2013 23:18:18 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_ngircd_conf_c,v 1.2 2013/01/19 20:40:57 fgsch Exp $ > ---- src/ngircd/conf.c.orig Tue Jan 1 18:22:12 2013 > -+++ src/ngircd/conf.c Fri Jan 18 01:31:56 2013 > -@@ -705,7 +705,7 @@ Set_Defaults(bool InitServers) > - strlcat(Conf_MotdFile, MOTD_FILE, sizeof(Conf_MotdFile)); > +--- src/ngircd/conf.c.orig Fri Oct 18 21:07:07 2013 > ++++ src/ngircd/conf.c Wed Oct 30 22:14:16 2013 > +@@ -760,7 +760,7 @@ Set_Defaults(bool InitServers) > + strlcat(Conf_HelpFile, HELP_FILE, sizeof(Conf_HelpFile)); > strcpy(Conf_ServerPwd, ""); > strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile)); > - Conf_UID = Conf_GID = 0; > Index: patches/patch-src_ngircd_ngircd_c > =================================================================== > RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_ngircd_c,v > retrieving revision 1.2 > diff -p -u -r1.2 patch-src_ngircd_ngircd_c > --- patches/patch-src_ngircd_ngircd_c 19 Jan 2013 20:40:57 -0000 1.2 > +++ patches/patch-src_ngircd_ngircd_c 30 Oct 2013 23:18:18 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_ngircd_ngircd_c,v 1.2 2013/01/19 20:40:57 fgsch Exp $ > ---- src/ngircd/ngircd.c.orig Tue Jan 1 18:22:33 2013 > -+++ src/ngircd/ngircd.c Fri Jan 18 01:31:56 2013 > -@@ -570,7 +570,7 @@ Setup_FDStreams(int fd) > +--- src/ngircd/ngircd.c.orig Wed Oct 16 19:59:20 2013 > ++++ src/ngircd/ngircd.c Wed Oct 30 22:14:16 2013 > +@@ -572,7 +572,7 @@ Setup_FDStreams(int fd) > #if !defined(SINGLE_USER_OS) > > /** > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1. > * > * @param uid User ID > * @param gid Group ID > -@@ -594,7 +594,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) > +@@ -596,7 +596,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) > } > #endif > > @@ -19,7 +19,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1. > if (!pwd) > return false; > > -@@ -701,11 +701,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) > +@@ -712,11 +712,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) > if (Conf_UID == 0) { > pwd = getpwuid(0); > Log(LOG_INFO, > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/ngircd/pkg/PLIST,v > retrieving revision 1.2 > diff -p -u -r1.2 PLIST > --- pkg/PLIST 19 Jan 2013 20:40:57 -0000 1.2 > +++ pkg/PLIST 30 Oct 2013 23:18:18 -0000 > @@ -10,6 +10,7 @@ share/doc/ngircd/Bopm.txt > share/doc/ngircd/COPYING > share/doc/ngircd/Capabilities.txt > share/doc/ngircd/ChangeLog > +share/doc/ngircd/Commands.txt > share/doc/ngircd/Contributing.txt > share/doc/ngircd/FAQ.txt > share/doc/ngircd/GIT.txt > @@ -29,9 +30,11 @@ share/doc/ngircd/SSL.txt > share/doc/ngircd/Services.txt > share/examples/ngircd/ > share/examples/ngircd/sample-ngircd.conf > -@mode 600 > +@mode 700 > @owner _ngircd > @group _ngircd > +@sample ${SYSCONFDIR}/ > +@mode 600 > @sample ${SYSCONFDIR}/ngircd.conf > @mode 700 > @sample /var/ngircd/ >
