Hi,
Update to ngircd 20.1. Tested on i386.
OK?
f.-
Index: ngircd/Makefile
===================================================================
RCS file: /cvs/ports/net/ngircd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- ngircd/Makefile 29 Sep 2012 12:32:01 -0000 1.1.1.1
+++ ngircd/Makefile 19 Jan 2013 16:06:22 -0000
@@ -2,7 +2,7 @@
COMMENT = lightweight irc server
-DISTNAME = ngircd-19.2
+DISTNAME = ngircd-20.1
CATEGORIES = net
Index: ngircd/distinfo
===================================================================
RCS file: /cvs/ports/net/ngircd/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- ngircd/distinfo 29 Sep 2012 12:32:01 -0000 1.1.1.1
+++ ngircd/distinfo 19 Jan 2013 16:06:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (ngircd-19.2.tar.gz) = vx1bx1VIY+KV0xdUg/W7AcywrPBqZLqbsiIVC4CM800=
-SIZE (ngircd-19.2.tar.gz) = 490590
+SHA256 (ngircd-20.1.tar.gz) = vVuBF+SdxyYE84CX6B64IxJwu2CPc2DMr4vK0FU0JkY=
+SIZE (ngircd-20.1.tar.gz) = 478712
Index: ngircd/patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/net/ngircd/patches/patch-doc_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-doc_Makefile_in
--- ngircd/patches/patch-doc_Makefile_in 29 Sep 2012 12:32:01 -0000
1.1.1.1
+++ ngircd/patches/patch-doc_Makefile_in 19 Jan 2013 16:06:24 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
---- doc/Makefile.in.orig Tue Jun 19 11:36:41 2012
-+++ doc/Makefile.in Sat Sep 15 23:23:24 2012
-@@ -588,16 +588,13 @@ maintainer-clean-local:
+--- 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:
all: $(generated_docs)
install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-- if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
-- $(INSTALL) -m 600 -c sample-ngircd.conf
$(DESTDIR)$(sysconfdir)/ngircd.conf; \
+- @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
+- make install-config; \
- fi
$(mkinstalldirs) $(DESTDIR)$(docdir)
for f in $(static_docs) $(toplevel_docs); do \
@@ -19,4 +19,4 @@
+ $(INSTALL) -m 644 -c $$f
$(DESTDIR)${datarootdir}/examples/${PACKAGE_TARNAME}; \
done
- uninstall-hook:
+ install-config:
Index: ngircd/patches/patch-doc_sample-ngircd_conf_tmpl
===================================================================
RCS file: /cvs/ports/net/ngircd/patches/patch-doc_sample-ngircd_conf_tmpl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-doc_sample-ngircd_conf_tmpl
--- ngircd/patches/patch-doc_sample-ngircd_conf_tmpl 29 Sep 2012 12:32:01
-0000 1.1.1.1
+++ ngircd/patches/patch-doc_sample-ngircd_conf_tmpl 19 Jan 2013 16:06:25
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.1.1.1 2012/09/29 12:32:01
fgsch Exp $
---- doc/sample-ngircd.conf.tmpl.orig Wed Sep 26 12:53:36 2012
-+++ doc/sample-ngircd.conf.tmpl Wed Sep 26 12:54:00 2012
+--- 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 @@
# 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
@@ -18,7 +18,7 @@
[Limits]
# Define some limits and timeouts for this ngIRCd instance. Default
-@@ -122,7 +122,7 @@
+@@ -126,7 +126,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!
@@ -26,4 +26,4 @@
+ ;ChrootDir = /var/ngircd
# Set this hostname for every client instead of the real one.
- # Please note: don't use the percentage sign ("%"), it is reserved for
+ # Use %x to add the hashed value of the original hostname.
Index: ngircd/patches/patch-src_ngircd_conf_c
===================================================================
RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_conf_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_ngircd_conf_c
--- ngircd/patches/patch-src_ngircd_conf_c 29 Sep 2012 12:32:01 -0000
1.1.1.1
+++ ngircd/patches/patch-src_ngircd_conf_c 19 Jan 2013 16:06:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ngircd_conf_c,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
---- src/ngircd/conf.c.orig Sat Sep 15 17:56:34 2012
-+++ src/ngircd/conf.c Sat Sep 15 17:56:46 2012
-@@ -667,7 +667,7 @@ Set_Defaults(bool InitServers)
+--- 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));
strcpy(Conf_ServerPwd, "");
strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile));
Index: ngircd/patches/patch-src_ngircd_ngircd_c
===================================================================
RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_ngircd_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_ngircd_ngircd_c
--- ngircd/patches/patch-src_ngircd_ngircd_c 29 Sep 2012 12:32:01 -0000
1.1.1.1
+++ ngircd/patches/patch-src_ngircd_ngircd_c 19 Jan 2013 16:06:26 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_ngircd_ngircd_c,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
---- src/ngircd/ngircd.c.orig Sun Sep 16 02:40:43 2012
-+++ src/ngircd/ngircd.c Sun Sep 16 02:40:49 2012
-@@ -531,7 +531,7 @@ Setup_FDStreams(int fd)
-
+--- 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)
+ #if !defined(SINGLE_USER_OS)
/**
- * Get user and group ID of unprivileged "nobody" user.
@@ -10,7 +10,7 @@
*
* @param uid User ID
* @param gid Group ID
-@@ -555,7 +555,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
+@@ -594,7 +594,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
}
#endif
@@ -19,7 +19,7 @@
if (!pwd)
return false;
-@@ -659,11 +659,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+@@ -701,11 +701,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
if (Conf_UID == 0) {
pwd = getpwuid(0);
Log(LOG_INFO,
Index: ngircd/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ngircd/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- ngircd/pkg/PLIST 29 Sep 2012 12:32:01 -0000 1.1.1.1
+++ ngircd/pkg/PLIST 19 Jan 2013 16:06:27 -0000
@@ -10,6 +10,7 @@
share/doc/ngircd/COPYING
share/doc/ngircd/Capabilities.txt
share/doc/ngircd/ChangeLog
+share/doc/ngircd/Contributing.txt
share/doc/ngircd/FAQ.txt
share/doc/ngircd/GIT.txt
share/doc/ngircd/HowToRelease.txt
