summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-24 02:02:21 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-24 02:02:21 +0100
commit32d40f0f98e7cb50a979a596d61f757fda4ab27d (patch)
tree1ffb704b02475de2ae9f1e37e9e10ab6b6084e38 /pkgs/tools/networking
parent5fa5eae086d7b34858dad4927e933e1d29d8bc34 (diff)
downloadnixpkgs-32d40f0f98e7cb50a979a596d61f757fda4ab27d.tar
nixpkgs-32d40f0f98e7cb50a979a596d61f757fda4ab27d.tar.gz
nixpkgs-32d40f0f98e7cb50a979a596d61f757fda4ab27d.tar.bz2
nixpkgs-32d40f0f98e7cb50a979a596d61f757fda4ab27d.tar.lz
nixpkgs-32d40f0f98e7cb50a979a596d61f757fda4ab27d.tar.xz
nixpkgs-32d40f0f98e7cb50a979a596d61f757fda4ab27d.tar.zst
nixpkgs-32d40f0f98e7cb50a979a596d61f757fda4ab27d.zip
Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/isync/isync-recursice-imap.patch114
-rw-r--r--pkgs/tools/networking/mtr/edd425.patch218
-rw-r--r--pkgs/tools/networking/ntp/no-openssl.patch161
3 files changed, 0 insertions, 493 deletions
diff --git a/pkgs/tools/networking/isync/isync-recursice-imap.patch b/pkgs/tools/networking/isync/isync-recursice-imap.patch
deleted file mode 100644
index db12069950f..00000000000
--- a/pkgs/tools/networking/isync/isync-recursice-imap.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -rupN ../isync-1.0.4_original/./src/drv_imap.c ./src/drv_imap.c
---- ../isync-1.0.4_original/./src/drv_imap.c	2007-09-22 01:44:12.000000000 -0700
-+++ ./src/drv_imap.c	2009-04-22 15:28:58.000000000 -0700
-@@ -1678,7 +1678,7 @@ imap_list( store_t *gctx, string_list_t 
- 	int ret;
- 
- 	imap->boxes = 0;
--	if ((ret = imap_exec_b( ctx, 0, "LIST \"\" \"%s%%\"", ctx->prefix )) != DRV_OK)
-+	if ((ret = imap_exec_b( ctx, 0, "LIST \"\" \"%s*\"", ctx->prefix )) != DRV_OK)
- 		return ret;
- 	*retb = imap->boxes;
- 	return DRV_OK;
-diff -rupN ../isync-1.0.4_original/./src/drv_maildir.c ./src/drv_maildir.c
---- ../isync-1.0.4_original/./src/drv_maildir.c	2008-02-23 01:02:21.000000000 -0800
-+++ ./src/drv_maildir.c	2009-04-22 15:34:05.000000000 -0700
-@@ -24,6 +24,7 @@
- 
- #include "isync.h"
- 
-+#include <assert.h>
- #include <limits.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -46,6 +47,56 @@
- #include <db.h>
- #endif /* USE_DB */
- 
-+static void encode_maildir_box(const char* in, char* out, size_t size)
-+{
-+	const char* p;
-+	char c;
-+	size_t out_chars;
-+
-+	for (p = in, out_chars = 0; (c = *p); ++p, ++out, ++out_chars) {
-+		assert(out_chars < size);
-+		if (c == '/') {
-+			assert(out_chars < size - 1);
-+			*(out++) = '~';
-+			*out = '-';
-+			++out_chars;
-+		}
-+		else if (c == '~') {
-+			assert(out_chars < size - 1);
-+			*(out++) = '~';
-+			*out = '~';
-+			++out_chars;
-+		}
-+		else {
-+			*out = c;
-+		}
-+	}
-+	assert(out_chars < size);
-+	*out = 0;
-+}
-+
-+static void decode_maildir_box(const char* in, char* out, size_t size)
-+{
-+	const char* p;
-+	char c;
-+	size_t out_chars;
-+
-+	for (p = in, out_chars = 0; (c = *p); ++p, ++out, ++out_chars) {
-+		assert(out_chars < size);
-+		if (c == '~') {
-+			assert(out_chars < size - 1);
-+			c = *(++p);
-+			*out = (c == '-' ? '/' : '~');
-+			++out_chars;
-+		}
-+		else {
-+			*out = c;
-+		}
-+	}
-+	assert(out_chars < size);
-+	*out = 0;
-+}
-+
- typedef struct maildir_store_conf {
- 	store_conf_t gen;
- 	char *inbox;
-@@ -164,14 +215,17 @@ maildir_list( store_t *gctx, string_list
- 		const char *inbox = ((maildir_store_conf_t *)gctx->conf)->inbox;
- 		int bl;
- 		struct stat st;
--		char buf[PATH_MAX];
-+ 		char buf[PATH_MAX], box[PATH_MAX];
- 
- 		if (*de->d_name == '.')
- 			continue;
- 		bl = nfsnprintf( buf, sizeof(buf), "%s%s/cur", gctx->conf->path, de->d_name );
- 		if (stat( buf, &st ) || !S_ISDIR(st.st_mode))
- 			continue;
--		add_string_list( retb, !memcmp( buf, inbox, bl - 4 ) && !inbox[bl - 4] ? "INBOX" : de->d_name );
-+ 
-+ 		decode_maildir_box(de->d_name, box, PATH_MAX);
-+  		add_string_list( retb,
-+ 		                 !memcmp( buf, inbox, bl - 4 ) && !inbox[bl - 4] ? "INBOX" : box );
- 	}
- 	closedir (dir);
- 
-@@ -717,8 +771,11 @@ maildir_prepare( store_t *gctx, int opts
- #endif /* USE_DB */
- 	if (!strcmp( gctx->name, "INBOX" ))
- 		gctx->path = nfstrdup( ((maildir_store_conf_t *)gctx->conf)->inbox );
--	else
--		nfasprintf( &gctx->path, "%s%s", gctx->conf->path, gctx->name );
-+ 	else {
-+ 		char box[_POSIX_PATH_MAX];
-+ 		encode_maildir_box(gctx->name, box, _POSIX_PATH_MAX);
-+ 		nfasprintf( &gctx->path, "%s%s", gctx->conf->path, box );
-+ 	}
- 	if (opts & OPEN_SETFLAGS)
- 		opts |= OPEN_OLD;
- 	if (opts & OPEN_EXPUNGE)
diff --git a/pkgs/tools/networking/mtr/edd425.patch b/pkgs/tools/networking/mtr/edd425.patch
deleted file mode 100644
index b950cacd2e5..00000000000
--- a/pkgs/tools/networking/mtr/edd425.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-diff --git a/asn.c b/asn.c
-index eac8d5e..33622ca 100644
---- a/asn.c
-+++ b/asn.c
-@@ -16,6 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
-+#include "config.h"
-+
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -35,7 +37,6 @@
- #include <sys/socket.h>
- #include <search.h>
- 
--#include "config.h"
- #include "mtr.h"
- #include "asn.h"
- 
-diff --git a/curses.c b/curses.c
-index eacc40d..b96daee 100644
---- a/curses.c
-+++ b/curses.c
-@@ -16,7 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <strings.h>
- #include <unistd.h>
- 
-diff --git a/display.c b/display.c
-index aa369ee..3545467 100644
---- a/display.c
-+++ b/display.c
-@@ -16,7 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/types.h>
-diff --git a/dns.c b/dns.c
-index e89fd4b..4076b71 100644
---- a/dns.c
-+++ b/dns.c
-@@ -22,7 +22,8 @@
-     Released under GPL, as above.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/select.h>
-diff --git a/getopt.c b/getopt.c
-index 3d43e26..e2f8758 100644
---- a/getopt.c
-+++ b/getopt.c
-@@ -27,7 +27,7 @@
- #endif
- 
- #ifdef HAVE_CONFIG_H
--#include <config.h>
-+#include "config.h"
- #endif
- 
- #if !defined (__STDC__) || !__STDC__
-diff --git a/getopt1.c b/getopt1.c
-index bccf8b2..0a2d405 100644
---- a/getopt1.c
-+++ b/getopt1.c
-@@ -16,7 +16,7 @@
-    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
- 
- #ifdef HAVE_CONFIG_H
--#include <config.h>
-+#include "config.h"
- #endif
- 
- #include "getopt.h"
-diff --git a/gtk.c b/gtk.c
-index 38ed507..7faa132 100644
---- a/gtk.c
-+++ b/gtk.c
-@@ -17,7 +17,7 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff --git a/mtr.c b/mtr.c
-index 50eb464..416b744 100644
---- a/mtr.c
-+++ b/mtr.c
-@@ -16,19 +16,21 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
-+#include "config.h"
-+
- #include <sys/types.h>
--#include <config.h>
--#include <netdb.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <netinet/in.h>
--#include <sys/socket.h>
- #include <unistd.h>
--#include <strings.h>
--#include <time.h>
- #include <errno.h>
- #include <string.h>
-+#include <strings.h>
-+
-+#include <netdb.h>
-+#include <netinet/in.h>
-+#include <sys/socket.h>
-+#include <time.h>
- #include <ctype.h>
- #include <assert.h>
- #include <fcntl.h>
-diff --git a/net.c b/net.c
-index 1c8d28f..d648804 100644
---- a/net.c
-+++ b/net.c
-@@ -16,7 +16,7 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
- 
- #if defined(HAVE_SYS_XTI_H)
- #include <sys/xti.h>
-@@ -1562,4 +1562,4 @@ void net_harvest_fds(void)
-   net_add_fds(&writefd, &maxfd);
-   select(maxfd, NULL, &writefd, NULL, &tv);
-   net_process_fds(&writefd);
--}
-\ No newline at end of file
-+}
-diff --git a/raw.c b/raw.c
-index 8b0df47..0e1f4f4 100644
---- a/raw.c
-+++ b/raw.c
-@@ -18,7 +18,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
-@@ -27,7 +28,6 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
--
- #include "mtr.h"
- #include "raw.h"
- #include "net.h"
-diff --git a/report.c b/report.c
-index 71040e4..39b2fb2 100644
---- a/report.c
-+++ b/report.c
-@@ -16,7 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <sys/types.h>
- #include <stdio.h>
- #include <netdb.h>
-diff --git a/select.c b/select.c
-index 31bfd5f..7553675 100644
---- a/select.c
-+++ b/select.c
-@@ -16,7 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <sys/types.h>
- #include <sys/time.h>
- #include <stdlib.h>
-diff --git a/split.c b/split.c
-index 642353e..5ead235 100644
---- a/split.c
-+++ b/split.c
-@@ -20,7 +20,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/pkgs/tools/networking/ntp/no-openssl.patch b/pkgs/tools/networking/ntp/no-openssl.patch
deleted file mode 100644
index 3a7784016ff..00000000000
--- a/pkgs/tools/networking/ntp/no-openssl.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-Fix ntp-keygen build without OpenSSL
-
-http://bk1.ntp.org/ntp-stable/?PAGE=patch&REV=5497b345z5MNTuNvJWuqPSje25NQTg
-
-Index: ntp-4.2.8/Makefile.am
-===================================================================
---- ntp-4.2.8.orig/Makefile.am
-+++ ntp-4.2.8/Makefile.am
-@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/lib
- 
- NULL =
- 
-+# moved sntp first to get libtool and libevent built.
-+
- SUBDIRS =		\
-+	sntp		\
- 	scripts		\
- 	include		\
- 	libntp		\
-@@ -17,7 +20,6 @@ SUBDIRS =		\
- 	clockstuff	\
- 	kernel		\
- 	util		\
--	sntp		\
- 	tests		\
- 	$(NULL)
- 
-@@ -64,7 +66,6 @@ BUILT_SOURCES =				\
- 	.gcc-warning			\
- 	libtool				\
- 	html/.datecheck			\
--	sntp/built-sources-only		\
- 	$(srcdir)/COPYRIGHT		\
- 	$(srcdir)/.checkChangeLog	\
- 	$(NULL)
-Index: ntp-4.2.8/configure.ac
-===================================================================
---- ntp-4.2.8.orig/configure.ac
-+++ ntp-4.2.8/configure.ac
-@@ -102,7 +102,7 @@ esac
- enable_nls=no
- LIBOPTS_CHECK_NOBUILD([sntp/libopts])
- 
--NTP_ENABLE_LOCAL_LIBEVENT
-+NTP_LIBEVENT_CHECK_NOBUILD([2], [sntp/libevent])
- 
- NTP_LIBNTP
- 
-@@ -771,6 +771,10 @@ esac
- 
- #### 
- 
-+AC_CHECK_FUNCS([arc4random_buf])
-+
-+#### 
-+
- saved_LIBS="$LIBS"
- LIBS="$LIBS $LDADD_LIBNTP"
- AC_CHECK_FUNCS([daemon])
-Index: ntp-4.2.8/libntp/ntp_crypto_rnd.c
-===================================================================
---- ntp-4.2.8.orig/libntp/ntp_crypto_rnd.c
-+++ ntp-4.2.8/libntp/ntp_crypto_rnd.c
-@@ -24,6 +24,21 @@
- int crypto_rand_init = 0;
- #endif
- 
-+#ifndef HAVE_ARC4RANDOM_BUF
-+static void
-+arc4random_buf(void *buf, size_t nbytes);
-+
-+void
-+evutil_secure_rng_get_bytes(void *buf, size_t nbytes);
-+
-+static void
-+arc4random_buf(void *buf, size_t nbytes)
-+{
-+	evutil_secure_rng_get_bytes(buf, nbytes);
-+	return;
-+}
-+#endif
-+
- /*
-  * As of late 2014, here's how we plan to provide cryptographic-quality
-  * random numbers:
-Index: ntp-4.2.8/sntp/configure.ac
-===================================================================
---- ntp-4.2.8.orig/sntp/configure.ac
-+++ ntp-4.2.8/sntp/configure.ac
-@@ -97,11 +97,14 @@ esac
- enable_nls=no
- LIBOPTS_CHECK
- 
--AM_COND_IF(
--    [BUILD_SNTP],
--    [NTP_LIBEVENT_CHECK],
--    [NTP_LIBEVENT_CHECK_NOBUILD]
--)
-+# From when we only used libevent for sntp:
-+#AM_COND_IF(
-+#    [BUILD_SNTP],
-+#    [NTP_LIBEVENT_CHECK],
-+#    [NTP_LIBEVENT_CHECK_NOBUILD]
-+#)
-+
-+NTP_LIBEVENT_CHECK([2])
- 
- # Checks for libraries.
- 
-Index: ntp-4.2.8/sntp/m4/ntp_libevent.m4
-===================================================================
---- ntp-4.2.8.orig/sntp/m4/ntp_libevent.m4
-+++ ntp-4.2.8/sntp/m4/ntp_libevent.m4
-@@ -1,4 +1,25 @@
--dnl NTP_ENABLE_LOCAL_LIBEVENT				     -*- Autoconf -*-
-+# SYNOPSIS						-*- Autoconf -*-
-+#
-+#  NTP_ENABLE_LOCAL_LIBEVENT
-+#  NTP_LIBEVENT_CHECK([MINVERSION [, DIR]])
-+#  NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]])
-+#
-+# DESCRIPTION
-+#
-+# AUTHOR
-+#
-+#  Harlan Stenn
-+#
-+# LICENSE
-+#
-+#  This file is Copyright (c) 2014 Network Time Foundation
-+# 
-+#  Copying and distribution of this file, with or without modification, are
-+#  permitted in any medium without royalty provided the copyright notice,
-+#  author attribution and this notice are preserved.  This file is offered
-+#  as-is, without any warranty.
-+
-+dnl NTP_ENABLE_LOCAL_LIBEVENT
- dnl
- dnl Provide only the --enable-local-libevent command-line option.
- dnl
-@@ -29,7 +50,7 @@ dnl If NOBUILD is provided as the 3rd ar
- dnl but DO NOT invoke DIR/configure if we are going to use our bundled
- dnl version.  This may be the case for nested packages.
- dnl
--dnl provide --enable-local-libevent .
-+dnl provides --enable-local-libevent .
- dnl
- dnl Examples:
- dnl
-Index: ntp-4.2.8/util/Makefile.am
-===================================================================
---- ntp-4.2.8.orig/util/Makefile.am
-+++ ntp-4.2.8/util/Makefile.am
-@@ -19,6 +19,7 @@ AM_LDFLAGS = $(LDFLAGS_NTP)
- LDADD=		../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
- tg2_LDADD=	../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
- ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
-+ntp_keygen_LDADD += $(LDADD_LIBEVENT)
- ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBM)
- ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
-