teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

torsocks: fix musl build (alpine patch)

Browse Source
This commit is contained in:
Michael Gehring 2016-02-26 10:30:24 +00:00
parent bc8f55b56b
commit b9cacf38aa
2 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
srcpkgs/torsocks/patches/musl-fix.patch Normal file
View File

@ -0,0 +1,84 @@
diff -u -r torsocks-2.1.0.orig/src/common/compat.c torsocks-2.1.0/src/common/compat.c
--- torsocks-2.1.0.orig/src/common/compat.c 2015-12-06 19:44:47.251991190 +0100
+++ torsocks-2.1.0/src/common/compat.c 2015-12-06 19:44:58.871959984 +0100
@@ -19,8 +19,6 @@
#include "compat.h"
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
-
/*
* Initialize a pthread mutex. This never fails.
*/
@@ -95,5 +93,3 @@
}
tsocks_mutex_unlock(&o->mutex);
}
-
-#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
diff -u -r torsocks-2.1.0.orig/src/common/compat.h torsocks-2.1.0/src/common/compat.h
--- torsocks-2.1.0.orig/src/common/compat.h 2015-12-06 19:44:47.251991190 +0100
+++ torsocks-2.1.0/src/common/compat.h 2015-12-06 19:44:51.538646345 +0100
@@ -22,8 +22,6 @@
#define __darwin__ 1
#endif
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
-
#define RTLD_NEXT ((void *) -1)
#include <pthread.h>
@@ -53,10 +51,6 @@
void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
-#else
-#error "OS not supported."
-#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
-
#if defined(__linux__)
#include <unistd.h>
#include <sys/syscall.h>
diff -u -r torsocks-2.1.0.orig/src/common/ref.h torsocks-2.1.0/src/common/ref.h
--- torsocks-2.1.0.orig/src/common/ref.h 2015-12-06 19:44:47.251991190 +0100
+++ torsocks-2.1.0/src/common/ref.h 2015-12-06 19:44:51.538646345 +0100
@@ -26,8 +26,6 @@
long count;
};
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
-
/*
* Get a reference by incrementing the refcount.
*/
@@ -55,8 +53,4 @@
}
}
-#else
-#error "OS not supported"
-#endif /* __GLIBC__, __FreeBSD__, __darwin__ */
-
#endif /* TORSOCKS_REF_H */
diff -u -r torsocks-2.1.0.orig/src/lib/torsocks.h torsocks-2.1.0/src/lib/torsocks.h
--- torsocks-2.1.0.orig/src/lib/torsocks.h 2015-12-06 19:44:47.251991190 +0100
+++ torsocks-2.1.0/src/lib/torsocks.h 2015-12-06 19:44:51.538646345 +0100
@@ -33,8 +33,6 @@
#define TSOCKS_DECL(name, type, sig) \
extern type tsocks_##name(sig);
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
-
/* connect(2) */
#include <sys/types.h>
#include <sys/socket.h>
@@ -205,9 +203,6 @@
int sockfd, int backlog
#define LIBC_LISTEN_ARGS sockfd, backlog
-#else
-#error "OS not supported."
-#endif /* __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */
#if (defined(__linux__))

3
srcpkgs/torsocks/template
View File

@ -1,7 +1,7 @@
# Template file for 'torsocks'
pkgname=torsocks
version=2.1.0
revision=1
revision=2
hostmakedepends="automake libtool pkg-config"
build_style=gnu-configure
configure_args="--disable-static --prefix=/usr"
@ -12,6 +12,7 @@ license="GPL-3"
homepage="https://gitweb.torproject.org/torsocks.git"
distfiles="https://github.com/dgoulet/${pkgname}/archive/v${version}.tar.gz"
checksum=a72c3ea757f5fe81d1ab91e0d5f0d83f195e235aae66d4df2f88a20db7028104
patch_args="-Np1"
pre_configure() {
autoreconf -fi