Attachment 191153 Details for Bug 226313 – patch file

[patch] patch file

fusefs-s3fs-1.83.patch (text/plain), 6.83 KB, created by Dmitri Goutnik on 2018-03-02 21:14:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2018-03-02 21:14:31 UTC

Size: 6.83 KB

patch

obsolete

>Index: sysutils/fusefs-s3fs/Makefile
>===================================================================
>--- sysutils/fusefs-s3fs/Makefile	(revision 463402)
>+++ sysutils/fusefs-s3fs/Makefile	(working copy)
>@@ -3,11 +3,11 @@
> 
> PORTNAME=	s3fs
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.78
>+DISTVERSION=	1.83
> CATEGORIES=	sysutils
> PKGNAMEPREFIX=	fusefs-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	dg@syrec.org
> COMMENT=	FUSE-based file system backed by Amazon S3
> 
> LICENSE=	GPLv2
>@@ -15,13 +15,13 @@
> LIB_DEPENDS=	libcurl.so:ftp/curl \
> 		libxml2.so:textproc/libxml2
> 
>+USES=		autoreconf fuse pkgconfig ssl
>+GNU_CONFIGURE=	yes
>+
> USE_GITHUB=	yes
> GH_ACCOUNT=	s3fs-fuse
> GH_PROJECT=	s3fs-fuse
> 
>-USES=		autoreconf fuse pkgconfig ssl
>-GNU_CONFIGURE=	yes
>-
> PLIST_FILES=	bin/s3fs man/man1/s3fs.1.gz
> 
> post-patch:
>Index: sysutils/fusefs-s3fs/distinfo
>===================================================================
>--- sysutils/fusefs-s3fs/distinfo	(revision 463402)
>+++ sysutils/fusefs-s3fs/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1483466309
>-SHA256 (s3fs-fuse-s3fs-fuse-v1.78_GH0.tar.gz) = 36c0b00a294d9676c462985c0c3f1362540e8ebc61c15bacb45e28a2f00297f5
>-SIZE (s3fs-fuse-s3fs-fuse-v1.78_GH0.tar.gz) = 99538
>+TIMESTAMP = 1520013498
>+SHA256 (s3fs-fuse-s3fs-fuse-v1.83_GH0.tar.gz) = 8f060accef304c1e5adde0c9d6976a3a69fd9935444a4985517c6cefa86b34ef
>+SIZE (s3fs-fuse-s3fs-fuse-v1.83_GH0.tar.gz) = 150816
>Index: sysutils/fusefs-s3fs/files/patch-src_common.h
>===================================================================
>--- sysutils/fusefs-s3fs/files/patch-src_common.h	(nonexistent)
>+++ sysutils/fusefs-s3fs/files/patch-src_common.h	(working copy)
>@@ -0,0 +1,11 @@
>+Upstream PR: https://github.com/s3fs-fuse/s3fs-fuse/pull/729
>+--- src/common.h.orig	2018-03-02 20:49:09 UTC
>++++ src/common.h
>+@@ -21,6 +21,7 @@
>+ #ifndef S3FS_COMMON_H_
>+ #define S3FS_COMMON_H_
>+ 
>++#include <stdlib.h>
>+ #include "../config.h"
>+ 
>+ //
>
>Property changes on: sysutils/fusefs-s3fs/files/patch-src_common.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/fusefs-s3fs/files/patch-src_s3fs.cpp
>===================================================================
>--- sysutils/fusefs-s3fs/files/patch-src_s3fs.cpp	(nonexistent)
>+++ sysutils/fusefs-s3fs/files/patch-src_s3fs.cpp	(working copy)
>@@ -0,0 +1,23 @@
>+Upstream PR: https://github.com/s3fs-fuse/s3fs-fuse/pull/729
>+--- src/s3fs.cpp.orig	2017-12-17 07:53:49 UTC
>++++ src/s3fs.cpp
>+@@ -2973,15 +2973,19 @@ static int set_xattrs_to_header(headers_
>+ 
>+   headers_t::iterator iter;
>+   if(meta.end() == (iter = meta.find("x-amz-meta-xattr"))){
>++#if defined(XATTR_REPLACE)
>+     if(XATTR_REPLACE == (flags & XATTR_REPLACE)){
>+       // there is no xattr header but flags is replace, so failure.
>+       return -ENOATTR;
>+     }
>++#endif
>+   }else{
>++#if defined(XATTR_CREATE)
>+     if(XATTR_CREATE == (flags & XATTR_CREATE)){
>+       // found xattr header but flags is only creating, so failure.
>+       return -EEXIST;
>+     }
>++#endif
>+     strxattrs = iter->second;
>+   }
>+ 
>
>Property changes on: sysutils/fusefs-s3fs/files/patch-src_s3fs.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/fusefs-s3fs/files/patch-src_s3fs__util.cpp
>===================================================================
>--- sysutils/fusefs-s3fs/files/patch-src_s3fs__util.cpp	(nonexistent)
>+++ sysutils/fusefs-s3fs/files/patch-src_s3fs__util.cpp	(working copy)
>@@ -0,0 +1,81 @@
>+Upstream PR: https://github.com/s3fs-fuse/s3fs-fuse/pull/729
>+--- src/s3fs_util.cpp.orig	2017-12-17 07:53:49 UTC
>++++ src/s3fs_util.cpp
>+@@ -453,6 +453,7 @@ AutoLock::~AutoLock()
>+ string get_username(uid_t uid)
>+ {
>+   static size_t maxlen = 0;	// set once
>++  int result;
>+   char* pbuf;
>+   struct passwd pwinfo;
>+   struct passwd* ppwinfo = NULL;
>+@@ -461,9 +462,17 @@ string get_username(uid_t uid)
>+   if(0 == maxlen){
>+     long res = sysconf(_SC_GETPW_R_SIZE_MAX);
>+     if(0 > res){
>+-      S3FS_PRN_WARN("could not get max pw length.");
>+-      maxlen = 0;
>+-      return string("");
>++      // SUSv4tc1 says the following about _SC_GETGR_R_SIZE_MAX and
>++      // _SC_GETPW_R_SIZE_MAX:
>++      // Note that sysconf(_SC_GETGR_R_SIZE_MAX) may return -1 if
>++      // there is no hard limit on the size of the buffer needed to
>++      // store all the groups returned.
>++      if (errno != 0){
>++        S3FS_PRN_WARN("could not get max pw length.");
>++        maxlen = 0;
>++        return string("");
>++      }
>++      res = 1024; // default initial length
>+     }
>+     maxlen = res;
>+   }
>+@@ -471,12 +480,22 @@ string get_username(uid_t uid)
>+     S3FS_PRN_CRIT("failed to allocate memory.");
>+     return string("");
>+   }
>+-  // get group information
>+-  if(0 != getpwuid_r(uid, &pwinfo, pbuf, maxlen, &ppwinfo)){
>+-    S3FS_PRN_WARN("could not get pw information.");
>++  // get pw information
>++  while(ERANGE == (result = getpwuid_r(uid, &pwinfo, pbuf, maxlen, &ppwinfo))){
>++    free(pbuf);
>++    maxlen *= 2;
>++    if(NULL == (pbuf = (char*)malloc(sizeof(char) * maxlen))){
>++      S3FS_PRN_CRIT("failed to allocate memory.");
>++      return string("");
>++    }
>++  }
>++
>++  if(0 != result){
>++    S3FS_PRN_ERR("could not get pw information(%d).", result);
>+     free(pbuf);
>+     return string("");
>+   }
>++
>+   // check pw
>+   if(NULL == ppwinfo){
>+     free(pbuf);
>+@@ -498,10 +517,18 @@ int is_uid_include_group(uid_t uid, gid_
>+   // make buffer
>+   if(0 == maxlen){
>+     long res = sysconf(_SC_GETGR_R_SIZE_MAX);
>+-    if(0 > res){
>+-      S3FS_PRN_ERR("could not get max name length.");
>+-      maxlen = 0;
>+-      return -ERANGE;
>++    if(0 > res) {
>++      // SUSv4tc1 says the following about _SC_GETGR_R_SIZE_MAX and
>++      // _SC_GETPW_R_SIZE_MAX:
>++      // Note that sysconf(_SC_GETGR_R_SIZE_MAX) may return -1 if
>++      // there is no hard limit on the size of the buffer needed to
>++      // store all the groups returned.
>++      if (errno != 0) {
>++        S3FS_PRN_ERR("could not get max name length.");
>++        maxlen = 0;
>++        return -ERANGE;
>++      }
>++      res = 1024; // default initial length
>+     }
>+     maxlen = res;
>+   }
>
>Property changes on: sysutils/fusefs-s3fs/files/patch-src_s3fs__util.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

dmgk: maintainer-approval+

Actions: View | Diff

Attachments on bug 226313: 191153