kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove patches no more needed (all imported upstream).

Browse source
This commit is contained in:
Leonardo Taccari 2014-08-15 21:07:37 +00:00 committed by Thomas Klausner
parent b656e41769
commit 3264d784f4
5 changed files with 0 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
torsocks/patches/patch-src_common_compat.c
View file

@ -1,21 +0,0 @@
$NetBSD: patch-src_common_compat.c,v 1.1 2013/11/05 14:56:42 thomasklausner Exp $
Handle NetBSD like FreeBSD.
--- src/common/compat.c.orig 2013-11-03 18:24:51.000000000 +0000
+++ src/common/compat.c
@@ -19,7 +19,7 @@
#include "compat.h"
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__))
+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
/*
* Initialize a pthread mutex. This never fails.
@@ -71,4 +71,4 @@ void tsocks_mutex_unlock(tsocks_mutex_t
assert(!ret);
}
-#endif /* __GLIBC__, __darwin__, __FreeBSD__ */
+#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */

48
torsocks/patches/patch-src_common_compat.h
View file

@ -1,48 +0,0 @@
$NetBSD: patch-src_common_compat.h,v 1.2 2013/11/05 14:56:43 thomasklausner Exp $
Handle NetBSD like FreeBSD.
--- src/common/compat.h.orig 2013-11-03 18:24:51.000000000 +0000
+++ src/common/compat.h
@@ -22,7 +22,7 @@
#define __darwin__ 1
#endif
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__))
+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
#define RTLD_NEXT ((void *) -1)
@@ -43,7 +43,7 @@ void tsocks_mutex_unlock(tsocks_mutex_t
#else
#error "OS not supported."
-#endif /* __GLIBC__, __darwin__, __FreeBSD__ */
+#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
#if defined(__linux__)
@@ -84,17 +84,21 @@ void tsocks_mutex_unlock(tsocks_mutex_t
#endif /* __linux__ */
-#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__darwin__))
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__darwin__) || defined(__NetBSD__))
#include <sys/syscall.h>
#include <unistd.h>
+#if defined(__NetBSD__)
+#define SYS_socket SYS___socket30
+#endif
+
#define TSOCKS_NR_SOCKET SYS_socket
#define TSOCKS_NR_CONNECT SYS_connect
#define TSOCKS_NR_CLOSE SYS_close
#define TSOCKS_NR_MMAP SYS_mmap
#define TSOCKS_NR_MUNMAP SYS_munmap
-#endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__ */
+#endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__, __NetBSD__ */
#endif /* TORSOCKS_COMPAT_H */

15
torsocks/patches/patch-src_common_ref.h
View file

@ -1,15 +0,0 @@
$NetBSD: patch-src_common_ref.h,v 1.1 2013/11/04 00:23:47 thomasklausner Exp $
Handle NetBSD like FreeBSD.
--- src/common/ref.h.orig 2013-11-03 18:24:51.000000000 +0000
+++ src/common/ref.h
@@ -26,7 +26,7 @@ struct ref {
long count;
};
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__))
+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
/*
* Get a reference by incrementing the refcount.

42
torsocks/patches/patch-src_lib_torsocks.h
View file

@ -1,42 +0,0 @@
$NetBSD: patch-src_lib_torsocks.h,v 1.1 2013/11/05 14:56:43 thomasklausner Exp $
Handle NetBSD like FreeBSD.
--- src/lib/torsocks.h.orig 2013-11-03 18:24:51.000000000 +0000
+++ src/lib/torsocks.h
@@ -33,7 +33,7 @@
#define TSOCKS_DECL(name, type, sig) \
extern type tsocks_##name(sig);
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__))
+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
/* connect(2) */
#include <sys/types.h>
@@ -171,7 +171,7 @@ struct hostent **__result, int *__h_errn
#else
#error "OS not supported."
-#endif /* __GLIBC__ , __FreeBSD__, __darwin__ */
+#endif /* __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */
#if (defined(__linux__))
@@ -186,7 +186,7 @@ struct hostent **__result, int *__h_errn
#endif /* __linux__ */
-#if (defined(__FreeBSD__) || defined(__darwin__))
+#if (defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
/* syscall(2) */
#define LIBC_SYSCALL_NAME syscall
@@ -195,7 +195,7 @@ struct hostent **__result, int *__h_errn
#define LIBC_SYSCALL_SIG int __number, ...
#define LIBC_SYSCALL_ARGS __number
-#endif /* __FreeBSD__, __darwin__ */
+#endif /* __FreeBSD__, __darwin__, __NetBSD__ */
#if defined(__GLIBC__) && defined(__FreeBSD_kernel__)

16
torsocks/patches/patch-tests_utils_tap_tap.c
View file

@ -1,16 +0,0 @@
$NetBSD: patch-tests_utils_tap_tap.c,v 1.1 2013/11/05 14:56:43 thomasklausner Exp $
isdigit() only accepts unsigned chars and -1.
NetBSD's version is quite picky about this.
--- tests/utils/tap/tap.c.orig 2013-11-03 18:24:51.000000000 +0000
+++ tests/utils/tap/tap.c
@@ -94,7 +94,7 @@ _gen_result(int ok, const char *func, ch
if(local_test_name) {
name_is_digits = 1;
for(c = local_test_name; *c != '\0'; c++) {
- if(!isdigit(*c) && !isspace(*c)) {
+ if(!isdigit((unsigned char)*c) && !isspace((unsigned char)*c)) {
name_is_digits = 0;
break;
}