Attachment 153385 Details for Bug 197961 – 1.78 patch

[patch] 1.78 patch

fusefs-s3fs-1.78.patch (text/plain), 3.95 KB, created by Jim Riggs on 2015-02-23 20:26:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Riggs

Created: 2015-02-23 20:26:06 UTC

Size: 3.95 KB

patch

obsolete

>diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
>index 3c2412b..02e1a9b 100644
>--- a/sysutils/fusefs-s3fs/Makefile
>+++ b/sysutils/fusefs-s3fs/Makefile
>@@ -2,25 +2,32 @@
> # $FreeBSD$
> 
> PORTNAME=	s3fs
>-DISTVERSION=	1.74
>+PORTVERSION=	1.78
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	sysutils
>-MASTER_SITES=	GOOGLE_CODE
>+MASTER_SITES=	GHR
> PKGNAMEPREFIX=	fusefs-
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	FUSE-based file system backed by Amazon S3
> 
>+LICENSE=	GPLv2
>+
> LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
> 		libxml2.so:${PORTSDIR}/textproc/libxml2
> 
>+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTVERSION}
>+
>+USE_AUTOTOOLS=	aclocal autoconf automake
>+AUTOMAKE_ARGS=	--add-missing
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	s3fs-fuse
>+GH_PROJECT=	${GH_ACCOUNT}
>+
> GNU_CONFIGURE=	yes
> PLIST_FILES=	bin/s3fs man/man1/s3fs.1.gz
> USES=		fuse pkgconfig
> USE_OPENSSL=	yes
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's/libcrypto >= 0.9//g' ${WRKSRC}/configure
>-	${REINPLACE_CMD} -e '/^DEPS_LIBS =/s/$$/ -lcrypto/' \
>-		${WRKSRC}/src/Makefile.in
>-
> .include <bsd.port.mk>
>diff --git a/sysutils/fusefs-s3fs/distinfo b/sysutils/fusefs-s3fs/distinfo
>index f220aa3..84e3a04 100644
>--- a/sysutils/fusefs-s3fs/distinfo
>+++ b/sysutils/fusefs-s3fs/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (s3fs-1.74.tar.gz) = d77d540582fe8287354fd3637e48064f81f6fe80c5f0e0f8253221c56b892b88
>-SIZE (s3fs-1.74.tar.gz) = 199120
>+SHA256 (s3fs-v1.78.tar.gz) = 36c0b00a294d9676c462985c0c3f1362540e8ebc61c15bacb45e28a2f00297f5
>+SIZE (s3fs-v1.78.tar.gz) = 99538
>diff --git a/sysutils/fusefs-s3fs/files/patch-configure.ac b/sysutils/fusefs-s3fs/files/patch-configure.ac
>new file mode 100644
>index 0000000..f1abacc
>--- /dev/null
>+++ b/sysutils/fusefs-s3fs/files/patch-configure.ac
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2014-09-15 13:30:51 UTC
>++++ configure.ac
>+@@ -162,7 +162,7 @@ AC_MSG_CHECKING([compile s3fs with])
>+ case "${auth_lib}" in
>+ openssl)
>+   AC_MSG_RESULT(OpenSSL)
>+-  PKG_CHECK_MODULES([DEPS], [fuse >= 2.8.4 libcurl >= 7.0 libxml-2.0 >= 2.6 libcrypto >= 0.9])
>++  PKG_CHECK_MODULES([DEPS], [fuse >= 2.8.4 libcurl >= 7.0 libxml-2.0 >= 2.6])
>+   ;;
>+ gnutls)
>+   AC_MSG_RESULT(GnuTLS-gcrypt)
>diff --git a/sysutils/fusefs-s3fs/files/patch-src_Makefile.am b/sysutils/fusefs-s3fs/files/patch-src_Makefile.am
>new file mode 100644
>index 0000000..978a26d
>--- /dev/null
>+++ b/sysutils/fusefs-s3fs/files/patch-src_Makefile.am
>@@ -0,0 +1,9 @@
>+--- src/Makefile.am.orig	2015-02-22 20:55:50 UTC
>++++ src/Makefile.am
>+@@ -35,5 +35,5 @@ if USE_SSL_NSS
>+   s3fs_SOURCES += nss_auth.cpp
>+ endif
>+ 
>+-s3fs_LDADD = $(DEPS_LIBS)
>++s3fs_LDADD = $(DEPS_LIBS) -lcrypto
>+ 
>diff --git a/sysutils/fusefs-s3fs/files/patch-src__curl.h b/sysutils/fusefs-s3fs/files/patch-src__curl.h
>deleted file mode 100644
>index 7bae7de..0000000
>--- a/sysutils/fusefs-s3fs/files/patch-src__curl.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/curl.h.orig	2015-01-18 22:44:00.232344078 +0800
>-+++ src/curl.h	2015-01-18 22:44:37.736341674 +0800
>-@@ -85,7 +85,7 @@ struct filepart
>- // for progress
>- struct case_insensitive_compare_func
>- {
>--  bool operator()(const std::string& a, const std::string& b){
>-+  bool operator()(const std::string& a, const std::string& b) const {
>-     return strcasecmp(a.c_str(), b.c_str()) < 0;
>-   }
>- };
>diff --git a/sysutils/fusefs-s3fs/files/patch-src_openssl__auth.cpp b/sysutils/fusefs-s3fs/files/patch-src_openssl__auth.cpp
>new file mode 100644
>index 0000000..5ed8ad5
>--- /dev/null
>+++ b/sysutils/fusefs-s3fs/files/patch-src_openssl__auth.cpp
>@@ -0,0 +1,13 @@
>+--- 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)

Actions: View | Diff

Attachments on bug 197961: 153385