From owner-svn-ports-head@freebsd.org Mon Jan 29 18:32:33 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00BFFED6C91; Mon, 29 Jan 2018 18:32:33 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A81E07FD57; Mon, 29 Jan 2018 18:32:32 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A326D416F; Mon, 29 Jan 2018 18:32:32 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0TIWWme007361; Mon, 29 Jan 2018 18:32:32 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0TIWW9S007355; Mon, 29 Jan 2018 18:32:32 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201801291832.w0TIWW9S007355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Mon, 29 Jan 2018 18:32:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460320 - in head/sysutils/fusefs-smbnetfs: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: in head/sysutils/fusefs-smbnetfs: . files X-SVN-Commit-Revision: 460320 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jan 2018 18:32:33 -0000 Author: mi Date: Mon Jan 29 18:32:31 2018 New Revision: 460320 URL: https://svnweb.freebsd.org/changeset/ports/460320 Log: Upgrade from 0.6.0 to 0.6.1. Samba >= 3.5 is now required and the use of gnome-ring was replaced with use of libsecret (now off by default). Make sure to use our native iconv-implementation and only use glib20 at build-time for its built-in atomic macros. Claim maintainership for now to deal with any fallout... Added: head/sysutils/fusefs-smbnetfs/files/patch-src_function.c (contents, props changed) head/sysutils/fusefs-smbnetfs/files/patch-src_list.h (contents, props changed) Modified: head/sysutils/fusefs-smbnetfs/Makefile head/sysutils/fusefs-smbnetfs/distinfo head/sysutils/fusefs-smbnetfs/files/pkg-message.in Modified: head/sysutils/fusefs-smbnetfs/Makefile ============================================================================== --- head/sysutils/fusefs-smbnetfs/Makefile Mon Jan 29 18:32:04 2018 (r460319) +++ head/sysutils/fusefs-smbnetfs/Makefile Mon Jan 29 18:32:31 2018 (r460320) @@ -2,32 +2,40 @@ # $FreeBSD$ PORTNAME= smbnetfs -PORTVERSION= 0.6.0 -PORTREVISION= 3 +PORTVERSION= 0.6.1 CATEGORIES= sysutils net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION} PKGNAMEPREFIX= fusefs- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mi@aldan.algebra.com COMMENT= Mount smb shares (Fuse filesystem) LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= DOCS GNOME_KEYRING -OPTIONS_DEFAULT=GNOME_KEYRING +OPTIONS_DEFINE= DOCS LIBSECRET -GNOME_KEYRING_DESC= Build with gnome-keyring support -GNOME_KEYRING_CONFIGURE_WITH= gnome-keyring -GNOME_KEYRING_LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring +LIBSECRET_DESC= Use libsecret to store credentials +LIBSECRET_CONFIGURE_WITH= libsecret +LIBSECRET_LIB_DEPENDS= libsecret-*.so:security/libsecret DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} USES= fuse iconv pkgconfig samba:lib tar:bzip2 -USE_GNOME= glib20 +USE_GNOME= glib20:build GNU_CONFIGURE= yes -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +# A hack to disable gratuitous linking with -lglib-2.0 +CONFIGURE_ENV+= GLIB_LIBS=-L/var/empty +CFLAGS+= -I${SAMBAINCLUDES} +LDFLAGS+= -L${SAMBALIBS} SUB_FILES= pkg-message -.include +.include + +.if ${ICONV_LIB} == "" +CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes +CONFIGURE_ARGS+=--with-libiconv=native +.endif + +.include Modified: head/sysutils/fusefs-smbnetfs/distinfo ============================================================================== --- head/sysutils/fusefs-smbnetfs/distinfo Mon Jan 29 18:32:04 2018 (r460319) +++ head/sysutils/fusefs-smbnetfs/distinfo Mon Jan 29 18:32:31 2018 (r460320) @@ -1,2 +1,3 @@ -SHA256 (smbnetfs-0.6.0.tar.bz2) = 6dd20bf01201f8be4b5d20cfbfba627f6825bcb60fe71f54d8c8de18509e519b -SIZE (smbnetfs-0.6.0.tar.bz2) = 147946 +TIMESTAMP = 1517243562 +SHA256 (smbnetfs-0.6.1.tar.bz2) = 848b8ee4c1b5cc4c83ee35736cb28e1ddcd5789cca948f060e8cb76baa95380a +SIZE (smbnetfs-0.6.1.tar.bz2) = 171032 Added: head/sysutils/fusefs-smbnetfs/files/patch-src_function.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-smbnetfs/files/patch-src_function.c Mon Jan 29 18:32:31 2018 (r460320) @@ -0,0 +1,12 @@ +--- src/function.c 2018-01-04 20:59:38 UTC ++++ src/function.c +@@ -8,7 +8,9 @@ + #include + #include + #include ++#ifdef __linux__ + #include ++#endif + #include + #include + #include Added: head/sysutils/fusefs-smbnetfs/files/patch-src_list.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-smbnetfs/files/patch-src_list.h Mon Jan 29 18:32:31 2018 (r460320) @@ -0,0 +1,38 @@ +--- src/list.h 2018-01-04 20:59:38 UTC ++++ src/list.h +@@ -23,7 +23,7 @@ static inline LIST* last_list_elem(LIST + + static inline void add_to_list(LIST *list, LIST *elem){ + /* Yes, i want SIGSEGV for debug */ +- if ((elem->next != NULL) || (elem->prev != NULL)) *((char*)NULL) = '\0'; ++ if ((elem->next != NULL) || (elem->prev != NULL)) __builtin_trap(); + + elem->next = list->next; + elem->prev = list; +@@ -33,7 +33,7 @@ static inline void add_to_list(LIST *lis + + static inline void add_to_list_back(LIST *list, LIST *elem){ + /* Yes, i want SIGSEGV for debug */ +- if ((elem->next != NULL) || (elem->prev != NULL)) *((char*)NULL) = '\0'; ++ if ((elem->next != NULL) || (elem->prev != NULL)) __builtin_trap(); + + elem->next = list; + elem->prev = list->prev; +@@ -45,7 +45,7 @@ static inline void insert_to_list_after( + (void)list; + + /* Yes, i want SIGSEGV for debug */ +- if ((new_elem->next != NULL) || (new_elem->prev != NULL)) *((char*)NULL) = '\0'; ++ if ((new_elem->next != NULL) || (new_elem->prev != NULL)) __builtin_trap(); + + new_elem->next = elem->next; + new_elem->prev = elem; +@@ -57,7 +57,7 @@ static inline void insert_to_list_before + (void)list; + + /* Yes, i want SIGSEGV for debug */ +- if ((new_elem->next != NULL) || (new_elem->prev != NULL)) *((char*)NULL) = '\0'; ++ if ((new_elem->next != NULL) || (new_elem->prev != NULL)) __builtin_trap(); + + new_elem->next = elem; + new_elem->prev = elem->prev; Modified: head/sysutils/fusefs-smbnetfs/files/pkg-message.in ============================================================================== --- head/sysutils/fusefs-smbnetfs/files/pkg-message.in Mon Jan 29 18:32:04 2018 (r460319) +++ head/sysutils/fusefs-smbnetfs/files/pkg-message.in Mon Jan 29 18:32:31 2018 (r460320) @@ -1,23 +1,21 @@ ===> Basic Instructions: -After kldload fuse.ko (see sysutils/fusefs-kmod documentation) and setting - +After kldload fuse.ko and setting # sysctl vfs.usermount=1 you should make .smb directory in your homedir: - % mkdir ~/.smb Copy your smb.conf (usually in %%PREFIX%%/etc/) and %%DOCSDIR%%/smbnetfs.conf to this directory: - % cp %%PREFIX%%/etc/smb.conf %%DOCSDIR%%/smbnetfs.conf ~/.smb/ Make mountpoint for smb network and mount it: - % mkdir ~/mountpoint % smbnetfs ~/mountpoint Now you can get access to smb shares in your network, for example: - % cd ~/mountpoint/ip-addr + +XXX Note, use of Gnome keyring was replaced in version 0.6.1 with +XXX libsecret, which this port no longer enables by default.