Update to ngircd 20.1.

merdely@ benoit@ ok.
This commit is contained in:
fgsch 2013-01-19 20:40:56 +00:00
parent 13dae1badc
commit 09959a815f
7 changed files with 29 additions and 28 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
# $OpenBSD: Makefile,v 1.2 2013/01/19 20:40:56 fgsch Exp $
COMMENT = lightweight irc server
DISTNAME = ngircd-19.2
DISTNAME = ngircd-20.1
CATEGORIES = net

View File

@ -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

View File

@ -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:
$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:
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 @@ $OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
+ $(INSTALL) -m 644 -c $$f $(DESTDIR)${datarootdir}/examples/${PACKAGE_TARNAME}; \
done
uninstall-hook:
install-config:

View File

@ -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
$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 @@
# 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 @@ $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.1.1.1 2012/09/29 12:32:01 fgsch
[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 @@ $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.1.1.1 2012/09/29 12:32:01 fgsch
+ ;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.

View File

@ -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)
$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));
strcpy(Conf_ServerPwd, "");
strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile));

View File

@ -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)
$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)
#if !defined(SINGLE_USER_OS)
/**
- * Get user and group ID of unprivileged "nobody" user.
@ -10,7 +10,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
*
* @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 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
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,

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/01/19 20:40:57 fgsch Exp $
@newgroup _ngircd:703
@newuser _ngircd:703:703:daemon:ngircd account:/var/ngircd:/sbin/nologin
@man man/man5/ngircd.conf.5
@ -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/Contributing.txt
share/doc/ngircd/FAQ.txt
share/doc/ngircd/GIT.txt
share/doc/ngircd/HowToRelease.txt