diff --git a/MOVED b/MOVED index 15fd8c9c7e6a..ffe5b4ea0ca1 100644 --- a/MOVED +++ b/MOVED @@ -3446,3 +3446,4 @@ dns/p5-DSC||2024-09-01|Has expired: Depends on expired math/ploticus textproc/btparse|textproc/p5-Text-BibTeX|2024-09-01|Has expired: btparse has not updated for 19 years while p5-Text-BibTeX is up-to-date. Use textproc/p5-Text-BibTeX instead devel/py-jaraco.timing||2024-09-01|Has expired: Deprecated by upstream irc/ircd-ratbox-devel|irc/ircd-ratbox|2024-09-01|Has expired: Development stalled upstream, consider switching to irc/ircd-ratbox +irc/ctrlproxy||2024-09-01|Has expired: Development stalled upstream, consider switching to irc/soju or irc/znc diff --git a/irc/Makefile b/irc/Makefile index acc68e14a248..09342dafd759 100644 --- a/irc/Makefile +++ b/irc/Makefile @@ -12,7 +12,6 @@ SUBDIR += bnc SUBDIR += catgirl SUBDIR += cgiirc - SUBDIR += ctrlproxy SUBDIR += dancer SUBDIR += dircproxy SUBDIR += dxirc diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile deleted file mode 100644 index 922a646e30f6..000000000000 --- a/irc/ctrlproxy/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -PORTNAME= ctrlproxy -PORTVERSION= 3.0.8 -PORTREVISION= 10 -CATEGORIES= irc -MASTER_SITES= http://launchpadlibrarian.net/50016234/ \ - LOCAL/ashish/ - -MAINTAINER= ashish@FreeBSD.org -COMMENT= Flexible IRC proxy -WWW= https://www.samba.org/~jelmer/ctrlproxy/ - -DEPRECATED= Development stalled upstream, consider switching to irc/soju or irc/znc -EXPIRATION_DATE=2024-08-31 - -LIB_DEPENDS= libgnutls.so:security/gnutls - -USES= compiler:c11 gmake gnome localbase:ldflags pathfix pkgconfig -USE_GNOME= glib20 -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -PATHFIX_MAKEFILEIN= Makefile - -OPTIONS_DEFINE= DOCS - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ctrlproxy - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ctrlproxy-admin - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/linestack-cmd - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ctrlproxyd - ${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy.1 ${STAGEDIR}${PREFIX}/share/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy_config.5 ${STAGEDIR}${PREFIX}/share/man/man5 - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/doc/help.txt ${STAGEDIR}${DATADIR}/help.txt - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for file in AUTHORS HACKING NEWS README - ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} -.endfor - ${INSTALL_DATA} ${WRKSRC}/doc/user-guide.html ${STAGEDIR}${DOCSDIR} - -.include diff --git a/irc/ctrlproxy/distinfo b/irc/ctrlproxy/distinfo deleted file mode 100644 index 662cac8cee1d..000000000000 --- a/irc/ctrlproxy/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (ctrlproxy-3.0.8.tar.gz) = d3ca05f12a47b70ce7ab9d23d228738aef1cde4c0474d952215a5d4df02c697a -SIZE (ctrlproxy-3.0.8.tar.gz) = 277083 diff --git a/irc/ctrlproxy/files/patch-Makefile b/irc/ctrlproxy/files/patch-Makefile deleted file mode 100644 index 1ad875305999..000000000000 --- a/irc/ctrlproxy/files/patch-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.orig 2008-12-06 17:36:33 UTC -+++ Makefile -@@ -145,7 +145,7 @@ endif - ctrlproxy.pc Makefile.settings config.h: configure Makefile.settings.in ctrlproxy.pc.in - ./$< - --install: all install-dirs install-bin install-header install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS) -+install: all install-dirs install-bin install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS) - install-dirs: - $(INSTALL) -d $(DESTDIR)$(modulesdir) - -@@ -177,7 +177,6 @@ doc:: - - install-doc:: doc - $(INSTALL) -d $(DESTDIR)$(docdir) -- $(MAKE) -C doc install PACKAGE_VERSION=$(PACKAGE_VERSION) - - uninstall-doc: - $(MAKE) -C doc uninstall diff --git a/irc/ctrlproxy/files/patch-Makefile.settings.in b/irc/ctrlproxy/files/patch-Makefile.settings.in deleted file mode 100644 index 84d78dc32ad5..000000000000 --- a/irc/ctrlproxy/files/patch-Makefile.settings.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.settings.in.orig -+++ Makefile.settings.in -@@ -40,6 +40,6 @@ - XSLTPROC = @XSLTPROC@ - EXTRA_INSTALL_TARGETS = @EXTRA_INSTALL_TARGETS@ - DEFAULT_CONFIG_DIR = $(sysconfdir)/ctrlproxy --HELPFILE = $(cdatadir)/help -+HELPFILE = $(cdatadir)/help.txt - CHECK_CFLAGS = @CHECK_CFLAGS@ - CHECK_LIBS = @CHECK_LIBS@ diff --git a/irc/ctrlproxy/files/patch-lib_connection.c b/irc/ctrlproxy/files/patch-lib_connection.c deleted file mode 100644 index 822eedb51e01..000000000000 --- a/irc/ctrlproxy/files/patch-lib_connection.c +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/connection.c.orig -+++ lib/connection.c -@@ -676,8 +676,12 @@ - pid_t pid; - int sock[2]; - -+#ifdef __FreeBSD__ -+ if (socketpair(PF_LOCAL, SOCK_STREAM, 0, sock) == -1) { -+#else - if (socketpair(PF_UNIX, SOCK_STREAM, AF_LOCAL, sock) == -1) { -+#endif - network_log(LOG_ERROR, s, "socketpair: %s", strerror(errno)); - return -1; - } - diff --git a/irc/ctrlproxy/files/patch-lib_listener.h b/irc/ctrlproxy/files/patch-lib_listener.h deleted file mode 100644 index 13f39f8d886f..000000000000 --- a/irc/ctrlproxy/files/patch-lib_listener.h +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/listener.h.orig -+++ lib/listener.h -@@ -5,8 +5,12 @@ - #include "ctrlproxy.h" - - #ifdef HAVE_GSSAPI -+#if (__FreeBSD__ >= 7) -+#include -+#else - #include - #endif -+#endif - - #ifndef G_MODULE_EXPORT - #define G_MODULE_EXPORT diff --git a/irc/ctrlproxy/files/patch-src_gnutls.c b/irc/ctrlproxy/files/patch-src_gnutls.c deleted file mode 100644 index fb2c8fe15faa..000000000000 --- a/irc/ctrlproxy/files/patch-src_gnutls.c +++ /dev/null @@ -1,35 +0,0 @@ ---- src/gnutls.c.orig -+++ src/gnutls.c -@@ -18,7 +18,6 @@ - - #include - --#include - #include - #include - -@@ -47,11 +46,11 @@ - static gboolean - verify_certificate (gnutls_session session, const char *hostname, GError **err) - { -- int status; -+ int res, status; - -- status = gnutls_certificate_verify_peers (session); -+ res = gnutls_certificate_verify_peers2 (session, &status); - -- if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) { -+ if (res < 0 || status == GNUTLS_E_NO_CERTIFICATE_FOUND) { - g_set_error (err, SSL_ERROR, - SSL_ERROR_CERTIFICATE, - "No SSL certificate was sent."); -@@ -452,9 +451,6 @@ - static void - _gnutls_init (void) - { -- /* to disallow usage of the blocking /dev/random */ -- gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -- - gnutls_global_init (); - gnutls_inited = TRUE; - } diff --git a/irc/ctrlproxy/pkg-descr b/irc/ctrlproxy/pkg-descr deleted file mode 100644 index f81ca8e56eed..000000000000 --- a/irc/ctrlproxy/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -CtrlProxy runs on a computer with a 24/7 internet connection and allows you to -transparently connect to IRC from anywhere on the world to your nick. It -connects to one or more IRC servers and then allows you to connect to it with -any number of clients, providing access to these servers. This is very useful -if you don't want to leave IRC but still want to be able to use it from home, -school or work. diff --git a/irc/ctrlproxy/pkg-plist b/irc/ctrlproxy/pkg-plist deleted file mode 100644 index b752217b7825..000000000000 --- a/irc/ctrlproxy/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/ctrlproxy -bin/ctrlproxy-admin -bin/linestack-cmd -sbin/ctrlproxyd -libdata/pkgconfig/ctrlproxy.pc -etc/ctrlproxy/motd -etc/ctrlproxy/config -share/man/man1/ctrlproxy.1.gz -share/man/man5/ctrlproxy_config.5.gz -%%DATADIR%%/help.txt -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/HACKING -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/user-guide.html -@comment @dir lib/ctrlproxy