Date: Thu, 1 Jun 2023 19:06:26 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b37fbe1f0fef - main - net-mgmt/nagircbot: Remove expired port: Message-ID: <202306011906.351J6QWN064902@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=b37fbe1f0fefe07dc092802fc666338eeb5f30e1 commit b37fbe1f0fefe07dc092802fc666338eeb5f30e1 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-06-01 19:06:16 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2023-06-01 19:06:16 +0000 net-mgmt/nagircbot: Remove expired port: 2023-06-01 net-mgmt/nagircbot: Broken for more than a year and fails to build on all supported release --- MOVED | 1 + net-mgmt/Makefile | 1 - net-mgmt/nagircbot/Makefile | 25 ------------- net-mgmt/nagircbot/distinfo | 2 - net-mgmt/nagircbot/files/nagircbot.in | 29 --------------- net-mgmt/nagircbot/files/patch-Makefile | 20 ---------- net-mgmt/nagircbot/files/patch-anna.cpp | 59 ------------------------------ net-mgmt/nagircbot/files/patch-anna.h | 4 -- net-mgmt/nagircbot/files/patch-br.cpp | 63 -------------------------------- net-mgmt/nagircbot/files/patch-br.h | 26 ------------- net-mgmt/nagircbot/files/patch-error.c | 9 ----- net-mgmt/nagircbot/files/patch-utils.cpp | 10 ----- net-mgmt/nagircbot/files/patch-utils.h | 11 ------ net-mgmt/nagircbot/pkg-descr | 3 -- 14 files changed, 1 insertion(+), 262 deletions(-) diff --git a/MOVED b/MOVED index ebb7da836d17..c5433b656fd6 100644 --- a/MOVED +++ b/MOVED @@ -7609,3 +7609,4 @@ www/webstone-ssl||2023-06-01|Has expired: Requires upstream EOL OpenSSL 1.0.X sysutils/bareos18-client|sysutils/bareos19-client|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03 sysutils/bareos18-server|sysutils/bareos19-server|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03 sysutils/bareos18-traymonitor|sysutils/bareos19-traymonitor|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03 +net-mgmt/nagircbot||2023-06-01|Has expired: Broken for more than a year and fails to build on all supported release diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index 31939a9d13bb..5a3305c86f0e 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -172,7 +172,6 @@ SUBDIR += nagios4 SUBDIR += nagiosgraph SUBDIR += nagiosql - SUBDIR += nagircbot SUBDIR += nagnu SUBDIR += nagstamon SUBDIR += nagtail diff --git a/net-mgmt/nagircbot/Makefile b/net-mgmt/nagircbot/Makefile deleted file mode 100644 index d65bcf986fb4..000000000000 --- a/net-mgmt/nagircbot/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -PORTNAME= nagircbot -PORTVERSION= 0.0.33 -PORTREVISION= 2 -CATEGORIES= net-mgmt irc -MASTER_SITES= http://www.vanheusden.com/nagircbot/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= IRC bot for Nagios -WWW= http://www.vanheusden.com/nagircbot/ - -DEPRECATED= Broken for more than a year and fails to build on all supported release -EXPIRATION_DATE= 2023-06-01 -BROKEN= ld: error: duplicate symbol: pfh - -USES= gmake ssl tar:tgz -USE_RC_SUBR= nagircbot -CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} - -PLIST_FILES= bin/nagircbot - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nagircbot - -.include <bsd.port.mk> diff --git a/net-mgmt/nagircbot/distinfo b/net-mgmt/nagircbot/distinfo deleted file mode 100644 index 0e7fcdc2ba56..000000000000 --- a/net-mgmt/nagircbot/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (nagircbot-0.0.33.tgz) = 7a7c63a409bdad125b19ec852a772746eda2b1feef71bbdf58bd2a2c785a0887 -SIZE (nagircbot-0.0.33.tgz) = 20085 diff --git a/net-mgmt/nagircbot/files/nagircbot.in b/net-mgmt/nagircbot/files/nagircbot.in deleted file mode 100644 index e1d288a99678..000000000000 --- a/net-mgmt/nagircbot/files/nagircbot.in +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# PROVIDE: nagircbot -# REQUIRE: NETWORKING -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable nagircbot: -# -# nagircbot_enable="YES" -# nagircbot_flags="<set as needed>" -# -# You must configure at least some flags to make it connect to a server. See -h. -# - -. /etc/rc.subr - -name=nagircbot -rcvar=nagircbot_enable - -pidfile=/var/run/nagios/${name}.pid -command=%%PREFIX%%/bin/nagircbot -command_args="-P $pidfile -z nagios" - -# set defaults - -nagircbot_enable=${nagircbot_enable:-"NO"} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net-mgmt/nagircbot/files/patch-Makefile b/net-mgmt/nagircbot/files/patch-Makefile deleted file mode 100644 index 349b6c35e6ae..000000000000 --- a/net-mgmt/nagircbot/files/patch-Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.orig 2011-01-18 18:39:10.000000000 +0800 -+++ Makefile 2014-06-09 11:58:06.803930107 +0800 -@@ -3,7 +3,7 @@ - VERSION=0.0.33 - - DEBUG= -g -D_DEBUG #-fprofile-arcs -ftest-coverage # -pg -g --CXXFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG) -+CXXFLAGS+=-DUSE_MMAP -Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG) - CFLAGS+=${CXXFLAGS} - LDFLAGS+=$(DEBUG) -lcrypto -lssl -lstdc++ - -@@ -15,7 +15,7 @@ nagircbot: $(OBJS) - $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o nagircbot - - install: nagircbot -- cp nagircbot /usr/local/bin -+ cp nagircbot $(DESTDIR)${PREFIX}/bin - - clean: - rm -f $(OBJS) nagircbot core *.da *.gcov *.bb* diff --git a/net-mgmt/nagircbot/files/patch-anna.cpp b/net-mgmt/nagircbot/files/patch-anna.cpp deleted file mode 100644 index 9a1a2968be71..000000000000 --- a/net-mgmt/nagircbot/files/patch-anna.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- anna.cpp.orig 2011-01-18 05:39:10.000000000 -0500 -+++ anna.cpp 2011-05-31 22:45:11.000000000 -0400 -@@ -23,6 +23,7 @@ - #include "ssl.h" - #include "log.h" - } -+#include "anna.h" - - #define S_DISCONNECTED 1 - #define S_CONNECTED 2 -@@ -43,6 +44,7 @@ - int minimum_time_for_successfull_login = 25; // one needs to be on-channel for at least 5 seconds to be considered a successfull login - int join_timeout = 5; // it should take no longer then 5 seconds to join a channel, otherwhise: abort connection and retry - int max_n_join_tries = 2; // try 2 times to get on a channel -+int throttle_delay = 1; // don't send more than one message per 1 seconds - char *server = "localhost:6667"; /* default irc server */ - char *channel = "#nagircbot"; /* default channel to connect to */ - char *nick_prefix = ""; /* prefix text for all messages sent to channel */ -@@ -53,7 +55,7 @@ - int one_line = 1; - char *username = "Nagios IRC Bot " VERSION ", (C) www.vanheusden.com"; /* complete username */ - int verbose = 255; /* default is log everything */ --char *statuslog = "/usr/local/nagios/var/status.log"; -+char *statuslog = "/var/spool/nagios/status.dat"; - int statuslog_version = 2; - int statuslog_location = L_FILE; - char use_colors = 0; -@@ -174,6 +176,13 @@ - - int irc_privmsg(server_t server_conn, char *channel, char *msg) - { -+ static time_t last_msg = time(NULL); -+ time_t diff = time(NULL) - last_msg; -+ if (diff < throttle_delay) { -+ sleep(throttle_delay - diff); -+ } -+ time(&last_msg); -+ - return send_irc(server_conn, "PRIVMSG %s :%s", channel, msg); - } - -@@ -192,7 +201,7 @@ - - /* open file or connection to nagios status socket */ - if (is_file == 1) /* file */ -- fd = open64(statuslog, O_RDONLY); -+ fd = open(statuslog, O_RDONLY); - else - fd = connect_to(statuslog); - if (fd == -1) -@@ -490,7 +499,7 @@ - if (verbose > 1) dolog("reload_statuslog started"); - - if (statuslog_location == L_FILE) /* file */ -- fd_sl = open64(statuslog, O_RDONLY); -+ fd_sl = open(statuslog, O_RDONLY); - else - fd_sl = connect_to(statuslog); - diff --git a/net-mgmt/nagircbot/files/patch-anna.h b/net-mgmt/nagircbot/files/patch-anna.h deleted file mode 100644 index c812b25cb58b..000000000000 --- a/net-mgmt/nagircbot/files/patch-anna.h +++ /dev/null @@ -1,4 +0,0 @@ ---- /dev/null Sat Apr 28 14:15:01 2007 -+++ anna.h Sat Apr 28 14:16:47 2007 -@@ -0,0 +1 @@ -+struct pidfh *pfh; diff --git a/net-mgmt/nagircbot/files/patch-br.cpp b/net-mgmt/nagircbot/files/patch-br.cpp deleted file mode 100644 index 1b61a13923d5..000000000000 --- a/net-mgmt/nagircbot/files/patch-br.cpp +++ /dev/null @@ -1,63 +0,0 @@ ---- br.cpp.orig Mon Nov 27 06:21:58 2006 -+++ br.cpp Sat Apr 28 13:45:23 2007 -@@ -29,11 +29,12 @@ - #include <fcntl.h> - #include <syslog.h> - #include "br.h" -+#include "utils.h" - - buffered_reader::buffered_reader(int cur_fd, int cur_block_size) - { - #ifdef USE_MMAP -- struct stat64 finfo; -+ struct stat finfo; - #endif - - fd = cur_fd; -@@ -44,20 +45,20 @@ - - /* try do mmap */ - #ifdef USE_MMAP -- if (fstat64(cur_fd, &finfo) == 0) -+ if (fstat(cur_fd, &finfo) == 0) - { - if (!S_ISFIFO(finfo.st_mode)) - { - /* mmap */ - size_of_file = finfo.st_size; -- cur_offset = mmap_addr = (char *)mmap64(NULL, size_of_file, PROT_READ, MAP_SHARED, cur_fd, 0); -+ cur_offset = mmap_addr = (char *)mmap(NULL, size_of_file, PROT_READ, MAP_SHARED, cur_fd, 0); - if (!mmap_addr) - { -- fprintf(stderr, "mmap64 failed: %d/%s\n", errno, strerror(errno)); -+ fprintf(stderr, "mmap failed: %d/%s\n", errno, strerror(errno)); - } - - /* advise the kernel how to treat the mmaped region */ -- /* FIXME: change to madvise64 as soon as it comes available */ -+ /* FIXME: change to madvise as soon as it comes available */ - (void)madvise(mmap_addr, size_of_file, MADV_SEQUENTIAL); - - // fprintf(stderr, "*using mmap*\n"); -@@ -237,7 +238,7 @@ - - n_bytes = lf_offset - buffer_pointer; - -- out = strndup(&buffer[buffer_pointer], n_bytes); -+ out = mystrndup(&buffer[buffer_pointer], n_bytes); - if (!out) - { - fprintf(stderr, "buffered_reader::read_line: malloc(%lld) failed\n", n_bytes + 1); -@@ -251,10 +252,10 @@ - return out; - } - --off64_t buffered_reader::file_offset(void) -+off_t buffered_reader::file_offset(void) - { - if (mmap_addr) - return cur_offset - mmap_addr; - else -- return lseek64(fd, 0, SEEK_CUR); -+ return lseek(fd, 0, SEEK_CUR); - } diff --git a/net-mgmt/nagircbot/files/patch-br.h b/net-mgmt/nagircbot/files/patch-br.h deleted file mode 100644 index ade60765a07e..000000000000 --- a/net-mgmt/nagircbot/files/patch-br.h +++ /dev/null @@ -1,26 +0,0 @@ ---- br.h.orig 2011-01-18 05:39:10.000000000 -0500 -+++ br.h 2011-05-31 22:12:14.000000000 -0400 -@@ -1,5 +1,7 @@ - /* (C) 2006-2010 by folkert@vanheusden.com GPLv2 applies */ - -+#include <sys/types.h> -+ - /* code taken from linux kernel */ - #if __GNUC__ == 2 && __GNUC_MINOR__ < 96 - #define __builtin_expect(x, expected_value) (x) -@@ -17,7 +19,7 @@ - char *buffer; - long long int buffer_length, buffer_pointer; - char *mmap_addr, *cur_offset; -- off64_t size_of_file; -+ off_t size_of_file; - - int number_of_bytes_in_buffer(void); - int read_into_buffer(void); -@@ -30,5 +32,5 @@ - - char * read_line(void); - -- off64_t file_offset(void); -+ off_t file_offset(void); - }; diff --git a/net-mgmt/nagircbot/files/patch-error.c b/net-mgmt/nagircbot/files/patch-error.c deleted file mode 100644 index 486883fb5604..000000000000 --- a/net-mgmt/nagircbot/files/patch-error.c +++ /dev/null @@ -1,9 +0,0 @@ ---- error.c.orig Sat Apr 28 14:08:54 2007 -+++ error.c Sat Apr 28 14:17:12 2007 -@@ -5,6 +5,9 @@ - #include <sys/types.h> - #include <signal.h> - #include <syslog.h> -+#include <sys/param.h> -+#include <libutil.h> -+#include "anna.h" diff --git a/net-mgmt/nagircbot/files/patch-utils.cpp b/net-mgmt/nagircbot/files/patch-utils.cpp deleted file mode 100644 index baf92293db0f..000000000000 --- a/net-mgmt/nagircbot/files/patch-utils.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- utils.cpp.orig Mon Nov 27 06:21:58 2006 -+++ utils.cpp Sat Apr 28 13:45:23 2007 -@@ -29,6 +29,7 @@ - #include <netdb.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - extern "C" { - #include "error.h" - } diff --git a/net-mgmt/nagircbot/files/patch-utils.h b/net-mgmt/nagircbot/files/patch-utils.h deleted file mode 100644 index b96affbdd161..000000000000 --- a/net-mgmt/nagircbot/files/patch-utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- utils.h.orig Mon Nov 27 06:21:58 2006 -+++ utils.h Sat Apr 28 13:45:23 2007 -@@ -19,7 +19,7 @@ - void * mymalloc(int size, char *what); - void * myrealloc(void *oldp, int newsize, char *what); - char * mystrdup(char *in); --char * mtstrndup(char *in, int len); -+char * mystrndup(char *in, int len); - void myfree(void *p, char *what); - ssize_t WRITE(int fd, char *whereto, size_t len); - int get_filesize(char *filename); diff --git a/net-mgmt/nagircbot/pkg-descr b/net-mgmt/nagircbot/pkg-descr deleted file mode 100644 index 357aee36d230..000000000000 --- a/net-mgmt/nagircbot/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Nagircbot is an IRC bot that monitors Nagios's status file for changes and -announces those in an IRC channel. It can also change the topic of the channel -to reflect current status.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306011906.351J6QWN064902>