Attachment #153385 for bug #197961

View | Details | Raw Unified | Return to bug 197961
Collapse All | Expand All

Lines 2-26 Link Here

(-)b/sysutils/fusefs-s3fs/Makefile (-7 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= s3fs	4	PORTNAME= s3fs
5	DISTVERSION= 1.74	5	PORTVERSION= 1.78
		6	DISTVERSIONPREFIX= v
6	CATEGORIES= sysutils	7	CATEGORIES= sysutils
7	MASTER_SITES= GOOGLE_CODE	8	MASTER_SITES= GHR
8	PKGNAMEPREFIX= fusefs-	9	PKGNAMEPREFIX= fusefs-
9		10
10	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
11	COMMENT= FUSE-based file system backed by Amazon S3	12	COMMENT= FUSE-based file system backed by Amazon S3
12		13
		14	LICENSE= GPLv2
		15
13	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \	16	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
14	libxml2.so:${PORTSDIR}/textproc/libxml2	17	libxml2.so:${PORTSDIR}/textproc/libxml2
15		18
		19	WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${PORTVERSION}
		20
		21	USE_AUTOTOOLS= aclocal autoconf automake
		22	AUTOMAKE_ARGS= --add-missing
		23
		24	USE_GITHUB= yes
		25	GH_ACCOUNT= s3fs-fuse
		26	GH_PROJECT= ${GH_ACCOUNT}
		27
16	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
17	PLIST_FILES= bin/s3fs man/man1/s3fs.1.gz	29	PLIST_FILES= bin/s3fs man/man1/s3fs.1.gz
18	USES= fuse pkgconfig	30	USES= fuse pkgconfig
19	USE_OPENSSL= yes	31	USE_OPENSSL= yes
20		32
21	post-patch:
22	${REINPLACE_CMD} -e 's/libcrypto >= 0.9//g' ${WRKSRC}/configure
23	${REINPLACE_CMD} -e '/^DEPS_LIBS =/s/$$/ -lcrypto/' \
24	${WRKSRC}/src/Makefile.in
25
26	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/sysutils/fusefs-s3fs/distinfo (-2 / +2 lines)
1	SHA256 (s3fs-1.74.tar.gz) = d77d540582fe8287354fd3637e48064f81f6fe80c5f0e0f8253221c56b892b88	1	SHA256 (s3fs-v1.78.tar.gz) = 36c0b00a294d9676c462985c0c3f1362540e8ebc61c15bacb45e28a2f00297f5
2	SIZE (s3fs-1.74.tar.gz) = 199120	2	SIZE (s3fs-v1.78.tar.gz) = 99538

Added Link Here

(-)b/sysutils/fusefs-s3fs/files/patch-configure.ac (+11 lines)
1	--- configure.ac.orig 2014-09-15 13:30:51 UTC
2	+++ configure.ac
3	@@ -162,7 +162,7 @@ AC_MSG_CHECKING([compile s3fs with])
4	case "${auth_lib}" in
5	openssl)
6	AC_MSG_RESULT(OpenSSL)
7	- PKG_CHECK_MODULES([DEPS], [fuse >= 2.8.4 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9])
8	+ PKG_CHECK_MODULES([DEPS], [fuse >= 2.8.4 libcurl >= 7.0 libxml-2.0 >= 2.6])
9	;;
10	gnutls)
11	AC_MSG_RESULT(GnuTLS-gcrypt)

Added Link Here

(-)b/sysutils/fusefs-s3fs/files/patch-src_Makefile.am (+9 lines)
1	--- src/Makefile.am.orig 2015-02-22 20:55:50 UTC
2	+++ src/Makefile.am
3	@@ -35,5 +35,5 @@ if USE_SSL_NSS
4	s3fs_SOURCES += nss_auth.cpp
5	endif
6
7	-s3fs_LDADD = $(DEPS_LIBS)
8	+s3fs_LDADD = $(DEPS_LIBS) -lcrypto
9

Removed Link Here

(-)a/sysutils/fusefs-s3fs/files/patch-src__curl.h (-11 lines)
1	--- src/curl.h.orig 2015-01-18 22:44:00.232344078 +0800
2	+++ src/curl.h 2015-01-18 22:44:37.736341674 +0800
3	@@ -85,7 +85,7 @@ struct filepart
4	// for progress
5	struct case_insensitive_compare_func
6	{
7	- bool operator()(const std::string& a, const std::string& b){
8	+ bool operator()(const std::string& a, const std::string& b) const {
9	return strcasecmp(a.c_str(), b.c_str()) < 0;
10	}
11	};




--- src/openssl_auth.cpp.orig	2014-09-15 13:30:51 UTC
+++ src/openssl_auth.cpp
@@ -94,7 +94,9 @@ static void s3fs_crypt_mutex_lock(int mo
 
 static unsigned long s3fs_crypt_get_threadid(void)
 {
-  return static_cast<unsigned long>(pthread_self());
+  // For FreeBSD etc, some system's pthread_t is structure pointer.
+  // Then we use cast like C style(not C++) instead of ifdef.
+  return (unsigned long)(pthread_self());
 }
 
 static struct CRYPTO_dynlock_value* s3fs_dyn_crypt_mutex(const char* file, int line)

Return to bug 197961

Added Link Here

(-)b/sysutils/fusefs-s3fs/files/patch-src_openssl__auth.cpp (+13 lines)
1	--- src/openssl_auth.cpp.orig 2014-09-15 13:30:51 UTC
2	+++ src/openssl_auth.cpp
3	@@ -94,7 +94,9 @@ static void s3fs_crypt_mutex_lock(int mo
4
5	static unsigned long s3fs_crypt_get_threadid(void)
6	{
7	- return static_cast<unsigned long>(pthread_self());
8	+ // For FreeBSD etc, some system's pthread_t is structure pointer.
9	+ // Then we use cast like C style(not C++) instead of ifdef.
10	+ return (unsigned long)(pthread_self());
11	}
12
13	static struct CRYPTO_dynlock_value* s3fs_dyn_crypt_mutex(const char* file, int line)