5 files changed, 0 insertions, 94 deletions
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 <gssapi/gssapi.h>
-+#else
- #include <gssapi.h>
- #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 <glib.h>
- 
--#include <gcrypt.h>
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
- 
-@@ -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;
- }