Date: Wed, 20 Jan 2010 08:22:52 GMT From: "Andrey V. Elsukov" <bu7cher@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/143008: [maintainer-update] utmpx-related fix and small update to irc/ircd-ru Message-ID: <201001200822.o0K8MqvG090590@www.freebsd.org> Resent-Message-ID: <201001200830.o0K8U9Af069295@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143008 >Category: ports >Synopsis: [maintainer-update] utmpx-related fix and small update to irc/ircd-ru >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jan 20 08:30:08 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Andrey V. Elsukov >Release: 9.0-CURRENT-i386, 6.2-STABLE-amd64 >Organization: >Environment: >Description: 1. Updated mirrors. 2. Changed distname. 3. Removed patch for include/ircsprintf.h. It seems not needed today. 4. Added patch for src/s_serv.c (it needed for custom compilation with syslog disabled) 5. Removed several includes utmp.h. They are not used. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -burNp ircd-ru.orig/Makefile ircd-ru/Makefile --- ircd-ru.orig/Makefile 2009-05-13 13:45:50.000000000 +0400 +++ ircd-ru/Makefile 2010-01-20 09:11:10.834932795 +0300 @@ -7,11 +7,11 @@ PORTNAME= ircd-ru PORTVERSION= 1.0.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= irc russian -MASTER_SITES= http://muhnet.org.ru/ \ - ftp://repoman.wenet.ru/pub/ircd-RU/ -DISTNAME= ircd-RU-${PORTVERSION}-03-rc +MASTER_SITES= http://link.wenet.su/ +DISTNAME= ircd-RU-${PORTVERSION}-03-rc-20090810 +WRKSRC= ${WRKDIR}/ircd-RU-${PORTVERSION}-03-rc MAINTAINER= bu7cher@yandex.ru COMMENT= An irc daemon with translation schemes and other useful features diff -burNp ircd-ru.orig/distinfo ircd-ru/distinfo --- ircd-ru.orig/distinfo 2006-12-30 22:49:40.000000000 +0300 +++ ircd-ru/distinfo 2010-01-20 08:59:34.440568987 +0300 @@ -1,3 +1,3 @@ -MD5 (ircd-RU-1.0.7-03-rc.tar.bz2) = 5ee68f6277e540365cdc0d12c3b9592b -SHA256 (ircd-RU-1.0.7-03-rc.tar.bz2) = b8f57c8d1acdeb6fbb32506afcc6cc1c410387e9be244d7613686d89b531a285 -SIZE (ircd-RU-1.0.7-03-rc.tar.bz2) = 409535 +MD5 (ircd-RU-1.0.7-03-rc-20090810.tar.bz2) = 24263805be10213db5b2d276076f0de0 +SHA256 (ircd-RU-1.0.7-03-rc-20090810.tar.bz2) = c67a6628125cf44eaf7198491016809ad121d58dd0204b87fe81bb51cdb33fba +SIZE (ircd-RU-1.0.7-03-rc-20090810.tar.bz2) = 409009 diff -burNp ircd-ru.orig/files/patch-ircsprintf.h ircd-ru/files/patch-ircsprintf.h --- ircd-ru.orig/files/patch-ircsprintf.h 2006-12-31 00:25:22.000000000 +0300 +++ ircd-ru/files/patch-ircsprintf.h 1970-01-01 03:00:00.000000000 +0300 @@ -1,13 +0,0 @@ ---- include/ircsprintf.h.orig Wed Dec 27 21:28:44 2006 -+++ include/ircsprintf.h Wed Dec 27 21:29:34 2006 -@@ -3,6 +3,10 @@ - #include <stdarg.h> - #include <stdio.h> - -+#ifndef va_copy -+#define va_copy(a1, a2) (a1) = (a2) -+#endif -+ - /* define this if you intend to use ircsnprintf or ircvsnprintf */ - /* It's not used, and sNprintf functions are not in all libraries */ - #define WANT_SNPRINTF diff -burNp ircd-ru.orig/files/patch-src_s_serv.c ircd-ru/files/patch-src_s_serv.c --- ircd-ru.orig/files/patch-src_s_serv.c 1970-01-01 03:00:00.000000000 +0300 +++ ircd-ru/files/patch-src_s_serv.c 2010-01-20 08:54:18.000000000 +0300 @@ -0,0 +1,12 @@ +--- src/s_serv.c 2006-07-14 18:11:33.000000000 +0400 ++++ src/s_serv.c 2007-01-11 02:54:40.000000000 +0300 +@@ -290,8 +290,8 @@ int m_squit(aClient *cptr, aClient *sptr + #ifdef USE_SYSLOG + syslog(LOG_NOTICE, "Failed SQUIT U-lined server %s attempt by " + "server %s", acptr->name, parv[0]); +- } + #endif ++ } + else + { + sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); diff -burNp ircd-ru.orig/files/patch-utmpx ircd-ru/files/patch-utmpx --- ircd-ru.orig/files/patch-utmpx 1970-01-01 03:00:00.000000000 +0300 +++ ircd-ru/files/patch-utmpx 2010-01-20 09:36:05.304791953 +0300 @@ -0,0 +1,60 @@ +--- src/m_nick.c.orig 2006-07-14 17:53:58.000000000 +0400 ++++ src/m_nick.c 2010-01-20 09:30:51.342752644 +0300 +@@ -29,7 +29,6 @@ + #include "msg.h" + #include "channel.h" + #include <sys/stat.h> +-#include <utmp.h> + #include <fcntl.h> + #include "h.h" + +--- src/m_services.c.orig 2006-07-14 17:53:58.000000000 +0400 ++++ src/m_services.c 2010-01-20 09:31:39.523130876 +0300 +@@ -29,7 +29,6 @@ + #include "msg.h" + #include "channel.h" + #include <sys/stat.h> +-#include <utmp.h> + #include <fcntl.h> + #include "h.h" + +--- src/m_who.c.orig 2010-01-20 09:24:57.060156113 +0300 ++++ src/m_who.c 2010-01-20 09:32:12.763365040 +0300 +@@ -29,7 +29,6 @@ + #include "msg.h" + #include "channel.h" + #include <sys/stat.h> +-#include <utmp.h> + #include <fcntl.h> + #include "h.h" + +--- src/s_bsd.c.orig 2006-07-14 18:11:33.000000000 +0400 ++++ src/s_bsd.c 2010-01-20 09:32:50.543598561 +0300 +@@ -42,7 +42,6 @@ + #include <arpa/inet.h> + #include <stdio.h> + #include <fcntl.h> +-#include <utmp.h> + #include <sys/resource.h> + + /* Stuff for poll() */ +--- src/s_serv.c.orig 2010-01-20 09:24:57.340153990 +0300 ++++ src/s_serv.c 2010-01-20 09:33:38.093895317 +0300 +@@ -41,7 +41,6 @@ + #endif + #include <sys/stat.h> + #include <fcntl.h> +-#include <utmp.h> + #include "h.h" + #if defined( HAVE_STRING_H ) + #include <string.h> +--- src/s_user.c.orig 2006-07-14 18:11:33.000000000 +0400 ++++ src/s_user.c 2010-01-20 09:33:57.834018154 +0300 +@@ -34,7 +34,6 @@ + #include <arpa/inet.h> + #endif + #include <sys/stat.h> +-#include <utmp.h> + #include <fcntl.h> + #include "h.h" + #ifdef FLUD >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001200822.o0K8MqvG090590>