Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
filesystems/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.37 2014/02/17 10:37:18 wiz Exp $
# $NetBSD: Makefile,v 1.38 2014/05/20 22:51:26 joerg Exp $
#
COMMENT= File systems, and file system related packages
@@ -31,6 +31,7 @@ SUBDIR+= fuse-unionfs
SUBDIR+= fuse-wdfs
SUBDIR+= fuse-wikipediafs
SUBDIR+= glusterfs
SUBDIR+= libntfs
SUBDIR+= openafs
SUBDIR+= openafs-devel
SUBDIR+= ori

4
filesystems/fuse-archivemount/Makefile
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.5 2012/10/03 16:08:30 asau Exp $
# $NetBSD: Makefile,v 1.6 2015/01/21 09:12:41 obache Exp $
#
DISTNAME= archivemount-0.5.3
PKGNAME= fuse-${DISTNAME}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= filesystems
MASTER_SITES= http://www.cybernoia.de/software/archivemount/

4
filesystems/fuse-ext2/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2012/10/03 16:08:31 asau Exp $
# $NetBSD: Makefile,v 1.6 2014/10/25 21:42:20 prlw1 Exp $
DISTNAME= fuse-ext2-0.0.7
PKGREVISION= 1
@@ -6,7 +6,7 @@ CATEGORIES= filesystems
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-ext2/fuse-ext2/${DISTNAME}/}
MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://alperakcan.org/projects/fuse-ext2/
HOMEPAGE= http://alperakcan.net/projects/fuse-ext2/
COMMENT= FUSE file-system to mount ext2 and ext3 file system
LICENSE= gnu-gpl-v2

4
filesystems/fuse-gmailfs/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:18 wiz Exp $
# $NetBSD: Makefile,v 1.10 2014/05/09 07:37:05 wiz Exp $
DISTNAME= gmailfs-0.7.2
PKGREVISION= 3
@@ -12,7 +12,7 @@ COMMENT= FUSE filesystem which uses Google mail for free space
NO_BUILD= yes
REPLACE_PYTHON= gmailfs.py mount.gmailfs
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-fuse-bindings
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-fuse-bindings
CONF_FILES= ${PREFIX}/share/examples/gmailfs/gmailfs.conf \
${PKG_SYSCONFDIR}/gmailfs.conf

2
filesystems/fuse-mp3fs/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2012/10/03 16:08:32 asau Exp $
# $NetBSD: Makefile,v 1.5 2014/11/26 22:31:41 wiz Exp $
#
DISTNAME= mp3fs-0.13

2
filesystems/fuse-mp3fs/PLIST
View File

@@ -1,3 +1,3 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2009/07/16 14:54:02 wiz Exp $
@comment $NetBSD: PLIST,v 1.3 2014/11/26 22:31:41 wiz Exp $
bin/mp3fs
share/doc/fuse-mp3fs/README

2
filesystems/fuse-mp3fs/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.5 2013/06/13 14:35:34 wiz Exp $
$NetBSD: distinfo,v 1.7 2014/11/26 22:31:41 wiz Exp $
SHA1 (mp3fs-0.13.tar.gz) = b246bd747a32256cb8364b7ac0cc8b7a4e1d3f74
RMD160 (mp3fs-0.13.tar.gz) = 6ad1126ee22b35fe4987dd6addbc41a25c74a508

2
filesystems/fuse-mp3fs/patches/patch-aa
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.3 2012/08/17 14:10:31 marino Exp $
$NetBSD: patch-aa,v 1.5 2014/11/26 22:31:41 wiz Exp $
--- src/mp3fs.c.orig 2008-12-14 06:17:35.000000000 +0100
+++ src/mp3fs.c

2
filesystems/fuse-mp3fs/patches/patch-ab
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.2 2013/06/13 14:35:34 wiz Exp $
$NetBSD: patch-ab,v 1.4 2014/11/26 22:31:41 wiz Exp $
Add inttypes.h for PRIu64.

2
filesystems/fuse-mp3fs/patches/patch-src_class.h
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-src_class.h,v 1.1 2012/03/29 11:40:19 wiz Exp $
$NetBSD: patch-src_class.h,v 1.3 2014/11/26 22:31:41 wiz Exp $
Fix build with clang-3.1.

26
filesystems/fuse-ntfs-3g/Makefile
View File

@@ -1,23 +1,19 @@
# $NetBSD: Makefile,v 1.16 2012/10/03 16:08:32 asau Exp $
#
# $NetBSD: Makefile,v 1.18 2014/09/10 12:15:15 joerg Exp $
DISTNAME= ntfs-3g-1.1120
PKGNAME= fuse-${DISTNAME}
.include "../../filesystems/libntfs/Makefile.common"
PKGNAME= fuse-${DISTNAME:S/_ntfsprogs//}
CATEGORIES= filesystems
MASTER_SITES= http://www.ntfs-3g.org/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.ntfs-3g.org/
COMMENT= NTFS driver for Linux/FreeBSD/NetBSD with read and write support
COMMENT= NTFS driver with read and write support
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --disable-ntfsprogs
CONFIGURE_ARGS+= --enable-mount-helper
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}
CONFIGURE_ARGS+= --disable-ldconfig
BUILD_DIRS= src
USE_TOOLS+= pkg-config
.include "../../filesystems/libntfs/buildlink3.mk"
.include "../../mk/fuse.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

44
filesystems/fuse-ntfs-3g/PLIST
View File

@@ -1,34 +1,14 @@
@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:51:59 joerg Exp $
bin/mount.ntfs-3g
@comment $NetBSD: PLIST,v 1.4 2014/05/19 12:22:06 adam Exp $
bin/lowntfs-3g
bin/ntfs-3g
man/man8/ntfs-3g.8
bin/ntfs-3g.probe
bin/ntfs-3g.secaudit
bin/ntfs-3g.usermap
man/man8/mount.lowntfs-3g.8
man/man8/mount.ntfs-3g.8
lib/libntfs-3g.la
include/ntfs-3g/attrib.h
include/ntfs-3g/attrlist.h
include/ntfs-3g/bitmap.h
include/ntfs-3g/bootsect.h
include/ntfs-3g/collate.h
include/ntfs-3g/compat.h
include/ntfs-3g/compress.h
include/ntfs-3g/debug.h
include/ntfs-3g/device.h
include/ntfs-3g/device_io.h
include/ntfs-3g/dir.h
include/ntfs-3g/endians.h
include/ntfs-3g/index.h
include/ntfs-3g/inode.h
include/ntfs-3g/layout.h
include/ntfs-3g/lcnalloc.h
include/ntfs-3g/logfile.h
include/ntfs-3g/logging.h
include/ntfs-3g/mft.h
include/ntfs-3g/mst.h
include/ntfs-3g/ntfstime.h
include/ntfs-3g/runlist.h
include/ntfs-3g/security.h
include/ntfs-3g/support.h
include/ntfs-3g/types.h
include/ntfs-3g/unistr.h
include/ntfs-3g/version.h
include/ntfs-3g/volume.h
man/man8/ntfs-3g.8
man/man8/ntfs-3g.probe.8
man/man8/ntfs-3g.secaudit.8
man/man8/ntfs-3g.usermap.8
sbin/mount.lowntfs-3g
sbin/mount.ntfs-3g

12
filesystems/fuse-ntfs-3g/buildlink3.mk
View File

@@ -1,12 +0,0 @@
# $NetBSD: buildlink3.mk,v 1.1 2013/05/04 12:17:04 dsainty Exp $
BUILDLINK_TREE+= fuse-ntfs-3g
.if !defined(FUSE_NTFS_3G_BUILDLINK3_MK)
FUSE_NTFS_3G_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.fuse-ntfs-3g+= fuse-ntfs-3g>=1.1120
BUILDLINK_PKGSRCDIR.fuse-ntfs-3g?= ../../filesystems/fuse-ntfs-3g
.endif # FUSE_NTFS_3G_BUILDLINK3_MK
BUILDLINK_TREE+= -fuse-ntfs-3g

7
filesystems/fuse-ntfs-3g/distinfo
View File

@@ -1,7 +0,0 @@
$NetBSD: distinfo,v 1.16 2012/08/17 13:39:06 marino Exp $
SHA1 (ntfs-3g-1.1120.tgz) = 203b6194e4dc531065b81c8f2ef72dd247e48a9b
RMD160 (ntfs-3g-1.1120.tgz) = ecaef2641e018364620507a0703546a62c2a7683
Size (ntfs-3g-1.1120.tgz) = 577005 bytes
SHA1 (patch-ab) = 9bc1480296f2306aac2b8f2eb67a16743372bced
SHA1 (patch-configure) = db38a4acf8af45f5755cdfdca9404da71efc72b6

13
filesystems/fuse-ntfs-3g/patches/patch-ab
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-ab,v 1.3 2009/07/08 16:34:40 joerg Exp $
--- src/Makefile.in.orig 2007-03-27 23:24:12.000000000 +0200
+++ src/Makefile.in 2007-04-13 11:16:54.000000000 +0200
@@ -585,7 +585,7 @@
install-exec-local:
$(INSTALL) -d $(DESTDIR)/sbin
- $(LN_S) -f $(bindir)/ntfs-3g $(DESTDIR)/sbin/mount.ntfs-3g
+ $(LN_S) -f $(bindir)/ntfs-3g $(DESTDIR)$(bindir)/mount.ntfs-3g
install-data-local:
$(INSTALL) -d $(DESTDIR)$(man8dir)

13
filesystems/fuse-ntfs-3g/patches/patch-configure
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-configure,v 1.1 2012/08/17 13:39:06 marino Exp $
--- configure.orig 2007-11-19 00:27:04.000000000 +0000
+++ configure
@@ -20066,7 +20066,7 @@ fi
case "$target_os" in
-linux*|darwin*|netbsd*)
+linux*|darwin*|netbsd*|dragonfly*)
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

4
filesystems/fuse-pod/Makefile
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.23 2013/10/17 07:56:41 wiz Exp $
# $NetBSD: Makefile,v 1.24 2014/05/05 00:47:50 ryoon Exp $
#
DISTNAME= fusepod-0.5.1
PKGNAME= fuse-pod-0.5.1
PKGREVISION= 20
PKGREVISION= 21
CATEGORIES= filesystems
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fusepod/}
EXTRACT_SUFX= .tar.bz2

4
filesystems/fuse-svnfs/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.25 2014/02/12 23:17:53 tron Exp $
# $NetBSD: Makefile,v 1.28 2014/10/07 16:47:25 adam Exp $
#
DISTNAME= svnfs-0.4
PKGREVISION= 20
PKGREVISION= 23
CATEGORIES= filesystems
MASTER_SITES= http://www.jmadden.eu/wp-content/uploads/svnfs/
EXTRACT_SUFX= .tgz

4
filesystems/fuse-wikipediafs/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2014/01/22 07:19:45 wiz Exp $
# $NetBSD: Makefile,v 1.14 2014/05/09 07:37:05 wiz Exp $
DISTNAME= wikipediafs-0.3
PKGNAME= fuse-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://wikipediafs.sourceforge.net/
COMMENT= FUSE filesystem for accessing the wikipedia
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-fuse-bindings
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-fuse-bindings
EGG_NAME= wikipediafs-0.1
SUBST_CLASSES+= config

6
filesystems/fuse/Makefile
View File

@@ -1,14 +1,14 @@
# $NetBSD: Makefile,v 1.9 2012/10/03 16:08:30 asau Exp $
# $NetBSD: Makefile,v 1.10 2014/11/24 13:19:12 mef Exp $
#
DISTNAME= fuse-2.8.4
PKGREVISION= 2
DISTNAME= fuse-2.9.3
CATEGORIES= filesystems
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://fuse.sourceforge.net/
COMMENT= Filesystem in Userspace
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
GNU_CONFIGURE= yes

7
filesystems/fuse/PLIST.common
View File

@@ -1,5 +1,6 @@
@comment $NetBSD: PLIST.common,v 1.1 2010/08/25 08:02:21 manu Exp $
@comment $NetBSD: PLIST.common,v 1.2 2014/11/24 13:23:10 mef Exp $
include/fuse.h
include/fuse/cuse_lowlevel.h
include/fuse/fuse.h
include/fuse/fuse_common.h
include/fuse/fuse_common_compat.h
@@ -7,8 +8,10 @@ include/fuse/fuse_compat.h
include/fuse/fuse_lowlevel.h
include/fuse/fuse_lowlevel_compat.h
include/fuse/fuse_opt.h
include/fuse/cuse_lowlevel.h
include/ulockmgr.h
lib/libfuse.la
lib/libulockmgr.la
lib/pkgconfig/fuse.pc
man/man1/fusermount.1
man/man1/ulockmgr_server.1
man/man8/mount.fuse.8

22
filesystems/fuse/distinfo
View File

@@ -1,18 +1,6 @@
$NetBSD: distinfo,v 1.3 2012/03/10 20:59:52 markd Exp $
$NetBSD: distinfo,v 1.4 2014/11/24 13:19:12 mef Exp $
SHA1 (fuse-2.8.4.tar.gz) = b1bc296c3e5b90b3658edb5d8d7aa0ee97c145d7
RMD160 (fuse-2.8.4.tar.gz) = 75093d0ddf8c4b9fc2e4764bdf86c43c5937c297
Size (fuse-2.8.4.tar.gz) = 500345 bytes
SHA1 (patch-aa) = 651517ebbc440cb84a7b21c45b48aa717babc227
SHA1 (patch-ab) = c53da5e8e9bd934ae9753b604c11d6a49b45731c
SHA1 (patch-ac) = f31f83ca7cd7f75845f90d00b4c62f28935b93f3
SHA1 (patch-ad) = e3e013137fbafca9a2944d23265e66553408b503
SHA1 (patch-ae) = b275cd57b8f7c331fb730c27a8f1c901c11a9d01
SHA1 (patch-af) = fdd24a2c94b31b4c3586e8ed56a78583e85f029d
SHA1 (patch-ag) = e3fa9eac0a8e6de91f43c43cd904f12a1eb3621a
SHA1 (patch-ai) = cc40e939f884c6c9b7b413021b9f18671507a2ab
SHA1 (patch-ak) = 222faa9b6549063428c89e65dfcb77e002dc798e
SHA1 (patch-al) = 358d734dbfa43e306bf0bb0a39b006be5822f1a3
SHA1 (patch-am) = 2abd07b403896bff5aad6cd865cb473553851a22
SHA1 (patch-an) = 3f119dae5f08996dd483a0fb4fa0365507be2070
SHA1 (patch-util_fusermount.c) = c65c377b917dc0c34cf5b8fb4d70e75075debcf9
SHA1 (fuse-2.9.3.tar.gz) = 94bd1974a9f2173ac3c2cf122f9fa3c35996b88e
RMD160 (fuse-2.9.3.tar.gz) = a81f350842a43aa82cff2cb75e0bf9f5b123ad5a
Size (fuse-2.9.3.tar.gz) = 572044 bytes
SHA1 (patch-aa) = 1179876c7a4f230d8df8a7a6724b90779c9fa0e3

19
filesystems/fuse/patches/patch-aa
View File

@@ -1,16 +1,15 @@
$NetBSD: patch-aa,v 1.2 2010/08/25 08:02:21 manu Exp $
$NetBSD: patch-aa,v 1.3 2014/11/24 13:19:12 mef Exp $
mount.fuse is a script, not a binary
--- util/Makefile.in.orig 2010-08-24 10:08:52.000000000 +0200
+++ util/Makefile.in 2010-08-24 10:08:59.000000000 +0200
@@ -591,9 +591,9 @@
fi
--- util/Makefile.in~ 2014-11-24 22:04:40.000000000 +0900
+++ util/Makefile.in 2014-11-24 22:05:24.000000000 +0900
@@ -684,7 +684,7 @@ install-exec-hook:
install-exec-local:
$(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH)
- $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ $(INSTALL_SCRIPT) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
$(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH)
- $(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ $(INSTALL_SCRIPT) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
$(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
$(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
@if test -x /usr/sbin/update-rc.d; then \
echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \

71
filesystems/fuse/patches/patch-ab
View File

@@ -1,71 +0,0 @@
$NetBSD: patch-ab,v 1.1 2010/08/25 08:02:21 manu Exp $
NetBSD has the same build oddities af FreeBSD.
--- ./lib/fuse.c.orig 2010-07-25 15:16:03.000000000 +0200
+++ ./lib/fuse.c 2010-08-07 03:25:21.000000000 +0200
@@ -953,9 +953,9 @@
if (f->conf.intr)
fuse_do_prepare_interrupt(req, d);
}
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
static int fuse_compat_open(struct fuse_fs *fs, const char *path,
struct fuse_file_info *fi)
{
@@ -1048,9 +1048,9 @@
}
return err;
}
-#else /* __FreeBSD__ */
+#else /* __FreeBSD__ || __NetBSD__ */
static inline int fuse_compat_open(struct fuse_fs *fs, char *path,
struct fuse_file_info *fi)
{
@@ -1074,9 +1074,9 @@
{
return fs->op.statfs(fs->compat == 25 ? "/" : path, buf);
}
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__ || __NetBSD__ */
int fuse_fs_getattr(struct fuse_fs *fs, const char *path, struct stat *buf)
{
fuse_get_context()->private_data = fs->user_data;
@@ -3720,9 +3720,9 @@
if (!f->conf.ac_attr_timeout_set)
f->conf.ac_attr_timeout = f->conf.attr_timeout;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
/*
* In FreeBSD, we always use these settings as inode numbers
* are needed to make getcwd(3) work.
*/
@@ -3896,9 +3896,9 @@
mod->next = fuse_modules;
fuse_modules = mod;
}
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
static struct fuse *fuse_new_common_compat(int fd, const char *opts,
const struct fuse_operations *op,
size_t op_size, int compat)
@@ -3953,9 +3953,9 @@
FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@");
FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@");
FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2");
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__ || __NetBSD__ */
struct fuse *fuse_new_compat25(int fd, struct fuse_args *args,
const struct fuse_operations_compat25 *op,
size_t op_size)

49
filesystems/fuse/patches/patch-ac
View File

@@ -1,49 +0,0 @@
$NetBSD: patch-ac,v 1.1 2010/08/25 08:02:21 manu Exp $
NetBSD has the same build oddities af FreeBSD. We also have this strange
problem with fuse_req_ctx_compat24
--- ./lib/fuse_lowlevel.c.orig 2010-07-25 15:18:20.000000000 +0200
+++ ./lib/fuse_lowlevel.c 2010-08-04 03:53:16.000000000 +0200
@@ -1366,9 +1366,11 @@
const struct fuse_ctx *fuse_req_ctx_compat24(fuse_req_t req)
{
return fuse_req_ctx(req);
}
+#ifndef __NetBSD__
FUSE_SYMVER(".symver fuse_req_ctx_compat24,fuse_req_ctx@FUSE_2.4");
+#endif
void fuse_req_interrupt_func(fuse_req_t req, fuse_interrupt_func_t func,
void *data)
@@ -1735,9 +1733,9 @@
return -ENOSYS;
}
#endif
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
static void fill_open_compat(struct fuse_open_out *arg,
const struct fuse_file_info_compat *f)
{
@@ -1837,17 +1835,17 @@
FUSE_SYMVER(".symver fuse_reply_statfs_compat,fuse_reply_statfs@FUSE_2.4");
FUSE_SYMVER(".symver fuse_reply_open_compat,fuse_reply_open@FUSE_2.4");
FUSE_SYMVER(".symver fuse_lowlevel_new_compat,fuse_lowlevel_new@FUSE_2.4");
-#else /* __FreeBSD__ */
+#else /* __FreeBSD__ || __NetBSD__ */
int fuse_sync_compat_args(struct fuse_args *args)
{
(void) args;
return 0;
}
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__ || __NetBSD__ */
struct fuse_session *fuse_lowlevel_new_compat25(struct fuse_args *args,
const struct fuse_lowlevel_ops_compat25 *op,
size_t op_size, void *userdata)

27
filesystems/fuse/patches/patch-ad
View File

@@ -1,27 +0,0 @@
$NetBSD: patch-ad,v 1.1 2010/08/25 08:02:21 manu Exp $
NetBSD has the same build oddities af FreeBSD.
--- ./lib/helper.c.orig 2010-07-25 15:25:28.000000000 +0200
+++ ./lib/helper.c 2010-07-29 18:05:33.000000000 +0200
@@ -356,9 +356,9 @@
}
#include "fuse_compat.h"
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
struct fuse *fuse_setup_compat22(int argc, char *argv[],
const struct fuse_operations_compat22 *op,
size_t op_size, char **mountpoint,
@@ -414,9 +414,9 @@
FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@");
FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@");
FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2");
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__ || __NetBSD__ */
struct fuse *fuse_setup_compat25(int argc, char *argv[],
const struct fuse_operations_compat25 *op,

69
filesystems/fuse/patches/patch-ae
View File

@@ -1,69 +0,0 @@
$NetBSD: patch-ae,v 1.1 2010/08/25 08:02:21 manu Exp $
NetBSD uses libperfuse(3). Also remap MNT_* flags to Linux MS_*, and
unmount(2) to umount2(2)
--- lib/mount.c.orig 2010-04-26 14:11:30.000000000 +0200
+++ lib/mount.c 2010-08-24 09:20:25.000000000 +0200
@@ -16,16 +16,30 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stddef.h>
+#include <string.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/poll.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/wait.h>
#include <sys/mount.h>
+#ifdef __NetBSD__
+#include <perfuse.h>
+
+#define MS_RDONLY MNT_RDONLY
+#define MS_NOSUID MNT_NOSUID
+#define MS_NODEV MNT_NODEV
+#define MS_NOEXEC MNT_NOEXEC
+#define MS_SYNCHRONOUS MNT_SYNCHRONOUS
+#define MS_NOATIME MNT_NOATIME
+
+#define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0)
+#endif
+
#define FUSERMOUNT_PROG "fusermount"
#define FUSE_COMMFD_ENV "_FUSE_COMMFD"
#ifndef HAVE_FORK
@@ -154,9 +168,11 @@
{"async", MS_SYNCHRONOUS, 0},
{"sync", MS_SYNCHRONOUS, 1},
{"atime", MS_NOATIME, 0},
{"noatime", MS_NOATIME, 1},
+#ifndef __NetBSD__
{"dirsync", MS_DIRSYNC, 1},
+#endif
{NULL, 0, 0}
};
static void set_mount_flag(const char *s, int *flags)
@@ -483,8 +499,9 @@
goto out_close;
}
+#ifndef __NetBSD__
if (geteuid() == 0) {
char *newmnt = fuse_mnt_resolve_path("fuse", mnt);
res = -1;
if (!newmnt)
@@ -495,8 +512,9 @@
free(newmnt);
if (res == -1)
goto out_umount;
}
+#endif /* __NetBSD__ */
free(type);
free(source);
return fd;

42
filesystems/fuse/patches/patch-af
View File

@@ -1,42 +0,0 @@
$NetBSD: patch-af,v 1.1 2010/08/25 08:02:21 manu Exp $
Do not check for inexistant /etc/mtab on NetBSD. Also remap umount2() to
unmount(2).
--- lib/mount_util.c.orig 2010-08-24 09:44:43.000000000 +0200
+++ lib/mount_util.c 2010-08-24 09:48:40.000000000 +0200
@@ -10,18 +10,25 @@
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <signal.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
+#ifndef __NetBSD__
#include <mntent.h>
+#endif
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/mount.h>
#include <sys/param.h>
+#ifdef __NetBSD__
+#define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0)
+#define mtab_needs_update(mnt) 0
+#else
static int mtab_needs_update(const char *mnt)
{
int res;
struct stat stbuf;
@@ -52,8 +59,9 @@
}
return 1;
}
+#endif /* __NetBSD__ */
static int add_mount_legacy(const char *progname, const char *fsname,
const char *mnt, const char *type, const char *opts)
{

23
filesystems/fuse/patches/patch-ag
View File

@@ -1,23 +0,0 @@
$NetBSD: patch-ag,v 1.1 2010/08/25 08:02:21 manu Exp $
NetBSD has the same build oddities af FreeBSD.
--- ./include/fuse_compat.h 2010-07-25 15:16:35.000000000 +0200
+++ ./include/fuse_compat.h.orig 2010-07-25 15:14:11.000000000 +0200
@@ -64,9 +64,9 @@
int *multithreaded, int *fd);
void fuse_teardown_compat22(struct fuse *fuse, int fd, char *mountpoint);
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
#include <sys/statfs.h>
struct fuse_operations_compat22 {
int (*getattr) (const char *, struct stat *);
@@ -197,5 +197,5 @@
void fuse_main_compat1(int argc, char *argv[],
const struct fuse_operations_compat1 *op);
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__ || __NetBSD__ */

27
filesystems/fuse/patches/patch-ai
View File

@@ -1,27 +0,0 @@
$NetBSD: patch-ai,v 1.1 2010/08/25 08:02:21 manu Exp $
NetBSD has the same build oddities af FreeBSD.
--- ./include/fuse_lowlevel_compat.h.orig 2010-07-25 15:21:50.000000000 +0200
+++ ./include/fuse_lowlevel_compat.h 2010-07-25 15:22:20.000000000 +0200
@@ -71,9 +71,9 @@
char *fuse_add_dirent(char *buf, const char *name, const struct stat *stbuf,
off_t off);
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
#include <sys/statfs.h>
struct fuse_lowlevel_ops_compat {
@@ -138,9 +138,9 @@
struct fuse_session *fuse_lowlevel_new_compat(const char *opts,
const struct fuse_lowlevel_ops_compat *op,
size_t op_size, void *userdata);
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__ || __NetBSD__ */
struct fuse_chan_ops_compat24 {
int (*receive)(struct fuse_chan *ch, char *buf, size_t size);
int (*send)(struct fuse_chan *ch, const struct iovec iov[],

25
filesystems/fuse/patches/patch-ak
View File

@@ -1,25 +0,0 @@
$NetBSD: patch-ak,v 1.1 2010/08/25 08:02:21 manu Exp $
Take care of NetBSD so that we can link with -lperfuse in makefile.
--- configure.in.orig 2010-08-24 09:26:08.000000000 +0200
+++ configure.in 2010-08-24 09:27:01.000000000 +0200
@@ -15,8 +15,9 @@
fi
case $target_os in
*linux*) arch=linux;;
+ *netbsd*) arch=netbsd;;
*bsd*) arch=bsd;;
*) arch=unknown;;
esac
@@ -90,8 +91,9 @@
AC_SUBST(subdirs2)
AM_CONDITIONAL(LINUX, test "$arch" = linux)
+AM_CONDITIONAL(NETBSD, test "$arch" = netbsd)
AM_CONDITIONAL(BSD, test "$arch" = bsd)
AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile])
AC_OUTPUT

59
filesystems/fuse/patches/patch-al
View File

@@ -1,59 +0,0 @@
$NetBSD: patch-al,v 1.1 2010/08/25 08:02:21 manu Exp $
Take care of NetBSD so that we can link with -lperfuse in makefile.
--- configure.orig 2010-08-24 09:28:13.000000000 +0200
+++ configure 2010-08-24 09:31:20.000000000 +0200
@@ -788,8 +788,10 @@
LTLIBOBJS
LIBOBJS
BSD_FALSE
BSD_TRUE
+NETBSD_FALSE
+NETBSD_TRUE
LINUX_FALSE
LINUX_TRUE
subdirs2
INIT_D_PATH
@@ -12082,8 +12084,9 @@
fi
case $target_os in
*linux*) arch=linux;;
+ *netbsd*) arch=netbsd;;
*bsd*) arch=bsd;;
*) arch=unknown;;
esac
@@ -13671,8 +13674,16 @@
LINUX_TRUE='#'
LINUX_FALSE=
fi
+ if test "$arch" = netbsd; then
+ NETBSD_TRUE=
+ NETBSD_FALSE='#'
+else
+ NETBSD_TRUE='#'
+ NETBSD_FALSE=
+fi
+
if test "$arch" = bsd; then
BSD_TRUE=
BSD_FALSE='#'
else
@@ -13822,8 +13833,15 @@
$as_echo "$as_me: error: conditional \"LINUX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${NETBSD_TRUE}" && test -z "${NETBSD_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"NETBSD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NETBSD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${BSD_TRUE}" && test -z "${BSD_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"BSD\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
$as_echo "$as_me: error: conditional \"BSD\" was never defined.

18
filesystems/fuse/patches/patch-am
View File

@@ -1,18 +0,0 @@
$NetBSD: patch-am,v 1.1 2010/08/25 08:02:21 manu Exp $
Link with -lperfuse on NetBSD
--- lib/Makefile.am.orig 2010-08-24 09:32:59.000000000 +0200
+++ lib/Makefile.am 2010-08-24 09:33:09.000000000 +0200
@@ -37,8 +37,12 @@
libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
+if NETBSD
+libfuse_la_LIBADD = -lperfuse -lpuffs
+endif
+
libulockmgr_la_SOURCES = ulockmgr.c
libulockmgr_la_LDFLAGS = -pthread -version-number 1:0:1
EXTRA_DIST = fuse_versionscript

16
filesystems/fuse/patches/patch-an
View File

@@ -1,16 +0,0 @@
$NetBSD: patch-an,v 1.1 2010/08/25 08:02:21 manu Exp $
Link with -lperfuse on NetBSD
--- lib/Makefile.in.orig 2010-08-24 09:33:40.000000000 +0200
+++ lib/Makefile.in 2010-08-24 09:35:20.000000000 +0200
@@ -263,8 +263,10 @@
libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
+@NETBSD_TRUE@libfuse_la_LIBADD = -lperfuse -lpuffs
+
libulockmgr_la_SOURCES = ulockmgr.c
libulockmgr_la_LDFLAGS = -pthread -version-number 1:0:1
EXTRA_DIST = fuse_versionscript
all: all-am

14
filesystems/fuse/patches/patch-util_fusermount.c
View File

@@ -1,14 +0,0 @@
$NetBSD: patch-util_fusermount.c,v 1.1 2012/03/10 20:59:52 markd Exp $
Fix error 'CLONE_NEWNS' undeclared on recent linux. From git.
--- util/fusermount.c.orig 2010-04-26 12:15:36.000000000 +0000
+++ util/fusermount.c
@@ -7,6 +7,7 @@
*/
/* This program does the mounting and unmounting of FUSE filesystems */
+#define _GNU_SOURCE /* for clone */
#include <config.h>
#include "mount_util.h"

19
filesystems/glusterfs/MESSAGE.NetBSD
View File

@@ -1,5 +1,5 @@
===========================================================================
$NetBSD: MESSAGE.NetBSD,v 1.14 2013/04/08 11:17:13 rodent Exp $
$NetBSD: MESSAGE.NetBSD,v 1.16 2014/11/20 16:12:48 wiz Exp $
*** GlusterFS clients ***
This is required in /etc/sysctl.conf in order to avoid hangs on I/O operations
@@ -8,7 +8,7 @@ This is required in /etc/sysctl.conf in order to avoid hangs on I/O operations
net.inet.tcp.recvbuf_max=1048576
In order to use mount -t glusterfs, please install this link
ln -s ${PREFIX}/sbin/mount.glusterfs /sbin/mount_glusterfs
ln -s ${PREFIX}/sbin/mount_glusterfs /sbin/mount_glusterfs
* Only for netbsd-5 branch (later NetBSD GENERIC kernels have it enabled):
A kernel with the following option is required:
@@ -18,17 +18,14 @@ A kernel with the following option is required:
*** GlusterFS servers ***
glusterfs servers will need extended attributes in exported filesystems.
This require a kernel with the following options:
options UFS_EXTATTR
You will need to create the directories below on exported filesystems' roots,
and then mount with -o extattr
This is currently only supported in UFS1 (newfs -O1). You will need to
create the directories below on exported filesystems' roots, and then
mount with -o extattr
.attribute/system
.attribute/user
* Only for netbsd-5 branch (later NetBSD version do not need that)
mount -o extattr shall not be used, but the kernel needs options below:
options UFS_EXTATTR_AUTOSTART
options UFS_EXTATTR_AUTOCREATE=1024
* For netbsd-6 branch and earlier (later NetBSD GENERIC kernels have it),
the kernel must have the following option enabled:
options UFS_EXTATTR
===========================================================================

99
filesystems/glusterfs/Makefile
View File

@@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.37 2013/10/04 08:07:23 manu Exp $
#
# $NetBSD: Makefile,v 1.48 2015/03/12 16:35:39 tnn Exp $
DISTNAME= glusterfs-3.4.1
PKGREVISION= 1
DISTNAME= glusterfs-3.6.0
#PKGREVISION= 1
CATEGORIES= filesystems
MASTER_SITES= http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/
MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gluster.org/
@@ -17,81 +16,99 @@ USE_TOOLS+= flex bison
CONFIGURE_ARGS+= --disable-fusermount
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= CFLAGS=${CFLAGS:M*:Q}\ -DDEBUG
# Make sure we do not attept to link with -lfl
# Only libfl.a is available, and libtool wants libfl.so
MAKE_FLAGS+= LEXLIB=""
MAKE_FLAGS+= libglusterfs_la_LIBADD=""
MAKE_ENV+= AM_MAKEFLAGS=${MAKE_FLAGS:Q}
SUBST_CLASSES+= py
SUBST_STAGE.py= post-build
SUBST_FILES.py= extras/volgen/glusterfs-volgen
SUBST_SED.py= -e "s,/usr/bin/python,${PYTHONBIN},g"
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # only 2.x supported as of 3.6.0
#REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py
#REPLACE_PYTHON+= gen-headers.py
#REPLACE_PYTHON+= tests/bugs/overlap.py
#REPLACE_PYTHON+= tests/utils/create-files.py
REPLACE_PYTHON+= geo-replication/syncdaemon/changelogagent.py
REPLACE_PYTHON+= geo-replication/syncdaemon/gsyncd.py
REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py
REPLACE_BASH+= extras/geo-rep/generate-gfid-file.sh
REPLACE_BASH+= extras/geo-rep/get-gfid.sh
REPLACE_BASH+= extras/post-upgrade-script-for-quota.sh
REPLACE_BASH+= extras/pre-upgrade-script-for-quota.sh
REPLACE_BASH+= extras/geo-rep/slave-upgrade.sh
REPLACE_BASH+= extras/geo-rep/gsync-upgrade.sh
REPLACE_BASH+= geo-replication/src/gverify.sh
REPLACE_BASH+= geo-replication/src/peer_add_secret_pub.in
REPLACE_BASH+= geo-replication/src/peer_gsec_create.in
REPLACE_BASH+= geo-replication/src/set_geo_rep_pem_keys.sh
SUBST_CLASSES+= bash
SUBST_STAGE.bash= post-build
SUBST_FILES.bash= xlators/mount/fuse/utils/mount.glusterfs
SUBST_SED.bash= -e "s,/bin/bash,/bin/sh,g"
SUBST_CLASSES+= mtab
SUBST_STAGE.mtab= post-build
SUBST_FILES.mtab= xlators/mount/fuse/utils/mount.glusterfs
SUBST_FILES.mtab= doc/mount.glusterfs.8
SUBST_FILES.mtab= libglusterfs/src/compat.h
SUBST_FILES.mtab= xlators/mount/fuse/utils/mount.glusterfs.in
SUBST_SED.mtab= -e "s,/etc/mtab,/proc/mounts,g"
SUBST_CLASSES+= etc
SUBST_STAGE.etc= pre-build
SUBST_FILES.etc+= cli/src/cli-rpc-ops.c
SUBST_FILES.etc+= libglusterfs/src/compat.h
SUBST_FILES.etc+= xlators/mgmt/glusterd/src/glusterd-op-sm.c
SUBST_FILES.etc+= xlators/mgmt/glusterd/src/glusterd.h
SUBST_FILES.etc+= doc/examples/replicate.vol
SUBST_FILES.etc+= doc/examples/protocol-server.vol
SUBST_FILES.etc+= doc/examples/unify.vol
SUBST_FILES.etc+= doc/examples/stripe.vol
SUBST_FILES.etc+= doc/glusterd.vol
SUBST_FILES.etc+= doc/glusterfsd.8
SUBST_FILES.etc+= doc/glusterfsd.vol.sample
SUBST_FILES.etc+= libglusterfs/src/logging.c
SUBST_FILES.etc+= extras/ocf/volume
SUBST_FILES.etc+= doc/glusterfsd.8
SUBST_SED.etc= -e "s,/etc/gluster,${PREFIX}/etc/gluster,g"
SUBST_CLASSES+= vol
SUBST_STAGE.vol= post-build
SUBST_FILES.vol= doc/Makefile
SUBST_SED.vol= -e "s/glusterd.vol/glusterd.vol.sample/g"
REPLACE_PYTHON+= ${WRKSRC}/extras/volgen/glusterfs-volgen
SUBST_FILES.vol= extras/Makefile
SUBST_SED.vol= -e "/^vol_DATA/s/glusterd.vol/glusterd.vol.sample/g"
EGDIR= ${PREFIX}/etc/glusterfs
CONF_FILES+= ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol
OWN_DIRS+= ${VARBASE}/log/glusterfs
BUILD_DEFS+= VARBASE
RCD_SCRIPTS= glusterfsd glusterd
RCD_SCRIPTS= glusterd
PLIST_SRC= ${PLIST_SRC_DFLT}
PLIST_SUBST+= VARBASE=${VARBASE}
PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
MESSAGE_SRC= ${PKGDIR}/MESSAGE.${OPSYS}
post-build:
cp ${WRKSRC}/doc/glusterd.vol ${WRKSRC}/doc/glusterd.vol.sample
pre-build:
cd ${WRKSRC}/extras && \
echo "glusterd.vol.sample: glusterd.vol" >> Makefile && \
echo " cp glusterd.vol glusterd.vol.sample" >> Makefile
post-install:
${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount.glusterfs \
${DESTDIR}/${PREFIX}/sbin/mount.glusterfs
${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount_glusterfs \
${DESTDIR}/${PREFIX}/sbin/mount_glusterfs
# Debug
CFLAGS+= -g
INSTALL_UNSTRIPPED= yes
.include "options.mk"
CONFIGURE_ARGS+= --enable-debug
#.include "../../devel/boehm-gc/buildlink3.mk"
#CFLAGS+=-DGC_DEBUG
#CFLAGS+=-include gc.h
#LIBS+=-lgc
.include "../../mk/bsd.prefs.mk"
PLIST_VARS+= mmx
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
PLIST.mmx= yes
.endif
#.include "../../devel/argp/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../lang/python/application.mk"
.if ${OPSYS} == "NetBSD"
#.include "../../filesystems/perfuse/buildlink3.mk"
.include "../../lang/python/extension.mk"
.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && exists(/usr/include/execinfo.h)
LIBS+= -lexecinfo
.endif
.include "../../mk/bsd.pkg.mk"

190
filesystems/glusterfs/PLIST
View File

@@ -1,63 +1,142 @@
@comment $NetBSD: PLIST,v 1.17 2014/03/11 14:05:01 jperkin Exp $
@comment $NetBSD: PLIST,v 1.21 2015/01/11 23:07:01 joerg Exp $
${PYSITELIB}/gluster/__init__.py
${PYSITELIB}/gluster/__init__.pyc
${PYSITELIB}/gluster/__init__.pyo
${PYSITELIB}/gluster/glupy.py
${PYSITELIB}/gluster/glupy.pyc
${PYSITELIB}/gluster/glupy.pyo
etc/glusterfs/gluster-rsyslog-5.8.conf
etc/glusterfs/gluster-rsyslog-7.2.conf
etc/glusterfs/glusterd.vol.sample
etc/glusterfs/glusterfs-georep-logrotate
etc/glusterfs/glusterfs-logrotate
etc/glusterfs/group-virt.example
etc/glusterfs/logger.conf.example
include/glusterfs/api/glfs-handles.h
include/glusterfs/api/glfs.h
lib/glusterfs/3.4.1/auth/addr.la
lib/glusterfs/3.4.1/auth/login.la
lib/glusterfs/3.4.1/rpc-transport/socket.la
lib/glusterfs/3.4.1/xlator/cluster/afr.la
lib/glusterfs/3.4.1/xlator/cluster/dht.la
lib/glusterfs/3.4.1/xlator/cluster/distribute.so
lib/glusterfs/3.4.1/xlator/cluster/nufa.la
lib/glusterfs/3.4.1/xlator/cluster/pump.la
lib/glusterfs/3.4.1/xlator/cluster/replicate.so
lib/glusterfs/3.4.1/xlator/cluster/stripe.la
lib/glusterfs/3.4.1/xlator/cluster/switch.la
lib/glusterfs/3.4.1/xlator/debug/error-gen.la
lib/glusterfs/3.4.1/xlator/debug/io-stats.la
lib/glusterfs/3.4.1/xlator/debug/trace.la
lib/glusterfs/3.4.1/xlator/encryption/rot-13.la
lib/glusterfs/3.4.1/xlator/features/access-control.so
lib/glusterfs/3.4.1/xlator/features/index.la
lib/glusterfs/3.4.1/xlator/features/locks.la
lib/glusterfs/3.4.1/xlator/features/mac-compat.la
lib/glusterfs/3.4.1/xlator/features/marker.la
lib/glusterfs/3.4.1/xlator/features/posix-locks.so
lib/glusterfs/3.4.1/xlator/features/quiesce.la
lib/glusterfs/3.4.1/xlator/features/quota.la
lib/glusterfs/3.4.1/xlator/features/read-only.la
lib/glusterfs/3.4.1/xlator/features/worm.la
lib/glusterfs/3.4.1/xlator/mgmt/glusterd.la
lib/glusterfs/3.4.1/xlator/mount/api.a
lib/glusterfs/3.4.1/xlator/mount/api.la
lib/glusterfs/3.4.1/xlator/mount/fuse.la
lib/glusterfs/3.4.1/xlator/nfs/server.la
lib/glusterfs/3.4.1/xlator/performance/io-cache.la
lib/glusterfs/3.4.1/xlator/performance/io-threads.la
lib/glusterfs/3.4.1/xlator/performance/md-cache.la
lib/glusterfs/3.4.1/xlator/performance/open-behind.a
lib/glusterfs/3.4.1/xlator/performance/open-behind.la
lib/glusterfs/3.4.1/xlator/performance/open-behind.so
lib/glusterfs/3.4.1/xlator/performance/quick-read.la
lib/glusterfs/3.4.1/xlator/performance/read-ahead.la
lib/glusterfs/3.4.1/xlator/performance/stat-prefetch.so
lib/glusterfs/3.4.1/xlator/performance/write-behind.la
lib/glusterfs/3.4.1/xlator/protocol/client.la
lib/glusterfs/3.4.1/xlator/protocol/server.la
lib/glusterfs/3.4.1/xlator/storage/posix.la
lib/glusterfs/3.4.1/xlator/system/posix-acl.la
lib/glusterfs/3.4.1/xlator/testing/performance/symlink-cache.la
lib/libgfapi.a
include/glusterfs/gfchangelog/changelog.h
lib/glusterfs/3.6.0/auth/addr.la
lib/glusterfs/3.6.0/auth/login.la
lib/glusterfs/3.6.0/rpc-transport/socket.la
lib/glusterfs/3.6.0/xlator/cluster/afr.la
lib/glusterfs/3.6.0/xlator/cluster/dht.la
${PLIST.mmx}lib/glusterfs/3.6.0/xlator/cluster/disperse.so
lib/glusterfs/3.6.0/xlator/cluster/distribute.so
${PLIST.mmx}lib/glusterfs/3.6.0/xlator/cluster/ec.la
lib/glusterfs/3.6.0/xlator/cluster/nufa.la
lib/glusterfs/3.6.0/xlator/cluster/pump.la
lib/glusterfs/3.6.0/xlator/cluster/replicate.so
lib/glusterfs/3.6.0/xlator/cluster/stripe.la
lib/glusterfs/3.6.0/xlator/cluster/switch.la
lib/glusterfs/3.6.0/xlator/debug/error-gen.la
lib/glusterfs/3.6.0/xlator/debug/io-stats.la
lib/glusterfs/3.6.0/xlator/debug/trace.la
lib/glusterfs/3.6.0/xlator/encryption/crypt.la
lib/glusterfs/3.6.0/xlator/encryption/rot-13.la
lib/glusterfs/3.6.0/xlator/features/access-control.so
lib/glusterfs/3.6.0/xlator/features/barrier.la
lib/glusterfs/3.6.0/xlator/features/cdc.la
lib/glusterfs/3.6.0/xlator/features/changelog.la
lib/glusterfs/3.6.0/xlator/features/gfid-access.la
lib/glusterfs/3.6.0/xlator/features/glupy.la
lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.py
lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.pyc
lib/glusterfs/3.6.0/xlator/features/glupy/debug-trace.pyo
lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.py
lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.pyc
lib/glusterfs/3.6.0/xlator/features/glupy/helloworld.pyo
lib/glusterfs/3.6.0/xlator/features/glupy/negative.py
lib/glusterfs/3.6.0/xlator/features/glupy/negative.pyc
lib/glusterfs/3.6.0/xlator/features/glupy/negative.pyo
lib/glusterfs/3.6.0/xlator/features/index.la
lib/glusterfs/3.6.0/xlator/features/locks.la
lib/glusterfs/3.6.0/xlator/features/mac-compat.la
lib/glusterfs/3.6.0/xlator/features/marker.la
lib/glusterfs/3.6.0/xlator/features/posix-locks.so
lib/glusterfs/3.6.0/xlator/features/prot_client.la
lib/glusterfs/3.6.0/xlator/features/prot_dht.la
lib/glusterfs/3.6.0/xlator/features/prot_server.la
lib/glusterfs/3.6.0/xlator/features/quiesce.la
lib/glusterfs/3.6.0/xlator/features/quota.la
lib/glusterfs/3.6.0/xlator/features/quotad.la
lib/glusterfs/3.6.0/xlator/features/read-only.la
lib/glusterfs/3.6.0/xlator/features/snapview-client.la
lib/glusterfs/3.6.0/xlator/features/snapview-server.la
lib/glusterfs/3.6.0/xlator/features/worm.la
lib/glusterfs/3.6.0/xlator/meta.la
lib/glusterfs/3.6.0/xlator/mgmt/glusterd.la
lib/glusterfs/3.6.0/xlator/mount/api.la
lib/glusterfs/3.6.0/xlator/mount/fuse.la
lib/glusterfs/3.6.0/xlator/nfs/server.la
lib/glusterfs/3.6.0/xlator/performance/io-cache.la
lib/glusterfs/3.6.0/xlator/performance/io-threads.la
lib/glusterfs/3.6.0/xlator/performance/md-cache.la
lib/glusterfs/3.6.0/xlator/performance/open-behind.la
lib/glusterfs/3.6.0/xlator/performance/quick-read.la
lib/glusterfs/3.6.0/xlator/performance/read-ahead.la
lib/glusterfs/3.6.0/xlator/performance/readdir-ahead.la
lib/glusterfs/3.6.0/xlator/performance/stat-prefetch.so
lib/glusterfs/3.6.0/xlator/performance/write-behind.la
lib/glusterfs/3.6.0/xlator/protocol/client.la
lib/glusterfs/3.6.0/xlator/protocol/server.la
lib/glusterfs/3.6.0/xlator/storage/posix.la
lib/glusterfs/3.6.0/xlator/system/posix-acl.la
lib/glusterfs/3.6.0/xlator/testing/features/template.la
lib/glusterfs/3.6.0/xlator/testing/performance/symlink-cache.la
lib/libgfapi.la
lib/libgfapi.so
lib/libgfapi.so.0
lib/libgfapi.so.0.0.0
lib/libgfchangelog.la
lib/libgfrpc.la
lib/libgfxdr.la
lib/libglusterfs.la
lib/ocf/resource.d/glusterfs/glusterd
lib/ocf/resource.d/glusterfs/volume
lib/pkgconfig/glusterfs-api.pc
lib/pkgconfig/libgfchangelog.pc
libexec/glusterfs/gsyncd
libexec/glusterfs/gverify.sh
libexec/glusterfs/peer_add_secret_pub
libexec/glusterfs/peer_gsec_create
libexec/glusterfs/python/syncdaemon/README.md
libexec/glusterfs/python/syncdaemon/__init__.py
libexec/glusterfs/python/syncdaemon/__init__.pyc
libexec/glusterfs/python/syncdaemon/__init__.pyo
libexec/glusterfs/python/syncdaemon/changelogagent.py
libexec/glusterfs/python/syncdaemon/changelogagent.pyc
libexec/glusterfs/python/syncdaemon/changelogagent.pyo
libexec/glusterfs/python/syncdaemon/configinterface.py
libexec/glusterfs/python/syncdaemon/configinterface.pyc
libexec/glusterfs/python/syncdaemon/configinterface.pyo
libexec/glusterfs/python/syncdaemon/gconf.py
libexec/glusterfs/python/syncdaemon/gconf.pyc
libexec/glusterfs/python/syncdaemon/gconf.pyo
libexec/glusterfs/python/syncdaemon/gsyncd.py
libexec/glusterfs/python/syncdaemon/gsyncd.pyc
libexec/glusterfs/python/syncdaemon/gsyncd.pyo
libexec/glusterfs/python/syncdaemon/ipaddr.py
libexec/glusterfs/python/syncdaemon/ipaddr.pyc
libexec/glusterfs/python/syncdaemon/ipaddr.pyo
libexec/glusterfs/python/syncdaemon/libcxattr.py
libexec/glusterfs/python/syncdaemon/libcxattr.pyc
libexec/glusterfs/python/syncdaemon/libcxattr.pyo
libexec/glusterfs/python/syncdaemon/libgfchangelog.py
libexec/glusterfs/python/syncdaemon/libgfchangelog.pyc
libexec/glusterfs/python/syncdaemon/libgfchangelog.pyo
libexec/glusterfs/python/syncdaemon/master.py
libexec/glusterfs/python/syncdaemon/master.pyc
libexec/glusterfs/python/syncdaemon/master.pyo
libexec/glusterfs/python/syncdaemon/monitor.py
libexec/glusterfs/python/syncdaemon/monitor.pyc
libexec/glusterfs/python/syncdaemon/monitor.pyo
libexec/glusterfs/python/syncdaemon/repce.py
libexec/glusterfs/python/syncdaemon/repce.pyc
libexec/glusterfs/python/syncdaemon/repce.pyo
libexec/glusterfs/python/syncdaemon/resource.py
libexec/glusterfs/python/syncdaemon/resource.pyc
libexec/glusterfs/python/syncdaemon/resource.pyo
libexec/glusterfs/python/syncdaemon/syncdutils.py
libexec/glusterfs/python/syncdaemon/syncdutils.pyc
libexec/glusterfs/python/syncdaemon/syncdutils.pyo
libexec/glusterfs/set_geo_rep_pem_keys.sh
man/man8/gluster.8
man/man8/glusterd.8
man/man8/glusterfs.8
@@ -67,7 +146,8 @@ sbin/gluster
sbin/glusterd
sbin/glusterfs
sbin/glusterfsd
sbin/mount.glusterfs
sbin/mount_glusterfs
sbin/umountd
share/doc/glusterfs/benchmarking/README
share/doc/glusterfs/benchmarking/glfs-bm.c
share/doc/glusterfs/benchmarking/launch-script.sh
@@ -75,4 +155,12 @@ share/doc/glusterfs/benchmarking/local-script.sh
share/doc/glusterfs/benchmarking/rdd.c
share/doc/glusterfs/glusterfs-mode.el
share/doc/glusterfs/glusterfs.vim
share/examples/rc.d/glusterd
share/glusterfs/scripts/generate-gfid-file.sh
share/glusterfs/scripts/get-gfid.sh
share/glusterfs/scripts/gsync-sync-gfid
share/glusterfs/scripts/gsync-upgrade.sh
share/glusterfs/scripts/post-upgrade-script-for-quota.sh
share/glusterfs/scripts/pre-upgrade-script-for-quota.sh
share/glusterfs/scripts/slave-upgrade.sh
@exec test -d ${PKG_SYSCONFDIR}/glusterd -a ! -d ${VARBASE}/lib/glusterd && ${MKDIR} -p ${VARBASE}/lib/ && mv ${PKG_SYSCONFDIR}/glusterd ${VARBASE}/lib/glusterd && ${LN} -s ${VARBASE}/lib/glusterd ${PKG_SYSCONFDIR}/glusterd

35
filesystems/glusterfs/PLIST.georeplication
View File

@@ -1,35 +0,0 @@
@comment $NetBSD: PLIST.georeplication,v 1.6 2013/10/01 00:30:26 manu Exp $
libexec/glusterfs/python/syncdaemon/README.md
libexec/glusterfs/python/syncdaemon/__init__.py
libexec/glusterfs/python/syncdaemon/__init__.pyc
libexec/glusterfs/python/syncdaemon/__init__.pyo
libexec/glusterfs/python/syncdaemon/configinterface.py
libexec/glusterfs/python/syncdaemon/configinterface.pyc
libexec/glusterfs/python/syncdaemon/configinterface.pyo
libexec/glusterfs/python/syncdaemon/gconf.py
libexec/glusterfs/python/syncdaemon/gconf.pyc
libexec/glusterfs/python/syncdaemon/gconf.pyo
libexec/glusterfs/python/syncdaemon/gsyncd.py
libexec/glusterfs/python/syncdaemon/gsyncd.pyc
libexec/glusterfs/python/syncdaemon/gsyncd.pyo
libexec/glusterfs/python/syncdaemon/ipaddr.py
libexec/glusterfs/python/syncdaemon/ipaddr.pyc
libexec/glusterfs/python/syncdaemon/ipaddr.pyo
libexec/glusterfs/python/syncdaemon/libcxattr.py
libexec/glusterfs/python/syncdaemon/libcxattr.pyc
libexec/glusterfs/python/syncdaemon/libcxattr.pyo
libexec/glusterfs/python/syncdaemon/master.py
libexec/glusterfs/python/syncdaemon/master.pyc
libexec/glusterfs/python/syncdaemon/master.pyo
libexec/glusterfs/python/syncdaemon/monitor.py
libexec/glusterfs/python/syncdaemon/monitor.pyc
libexec/glusterfs/python/syncdaemon/monitor.pyo
libexec/glusterfs/python/syncdaemon/repce.py
libexec/glusterfs/python/syncdaemon/repce.pyc
libexec/glusterfs/python/syncdaemon/repce.pyo
libexec/glusterfs/python/syncdaemon/resource.py
libexec/glusterfs/python/syncdaemon/resource.pyc
libexec/glusterfs/python/syncdaemon/resource.pyo
libexec/glusterfs/python/syncdaemon/syncdutils.py
libexec/glusterfs/python/syncdaemon/syncdutils.pyc
libexec/glusterfs/python/syncdaemon/syncdutils.pyo

23
filesystems/glusterfs/distinfo
View File

@@ -1,9 +1,16 @@
$NetBSD: distinfo,v 1.32 2013/10/04 08:07:23 manu Exp $
$NetBSD: distinfo,v 1.36 2014/12/11 22:08:22 joerg Exp $
SHA1 (glusterfs-3.4.1.tar.gz) = 3c940cc864abd5402f0f70197085cb17212fc9cb
RMD160 (glusterfs-3.4.1.tar.gz) = cb05c769eaaa72cf7f79c9dd7580d5a40c850fe7
Size (glusterfs-3.4.1.tar.gz) = 3811931 bytes
SHA1 (patch-argp-standalone_argp-fmtstream.c) = 241873f41bb774e1de4f777227c38b0dcae4ac59
SHA1 (patch-argp-standalone_argp-fmtstream.h) = 9f2ead2a11c35fcc6347977082fa347343fccab2
SHA1 (patch-cg) = ebb691ddaa56bd8368cc9a0458a8caeec64d2b8e
SHA1 (patch-xlators_mount_fuse_src_fuse-helpers.c) = a770d557191c91a731da15e95caf5acd7ed567ff
SHA1 (glusterfs-3.6.0.tar.gz) = fe19bf7128c955207f633261b9f0f87ac7341cfc
RMD160 (glusterfs-3.6.0.tar.gz) = a0078c5a08617f981e09e96eed6eaa2f622dc4b5
Size (glusterfs-3.6.0.tar.gz) = 5924875 bytes
SHA1 (patch-9006) = 18ac4e9d58b587bd202f94323a2fb9a168aade80
SHA1 (patch-9010) = 8d46f4c32c3a14da0724b65c9592196a2439dbea
SHA1 (patch-9045) = 93cb986d8a2675a714ded956269ffa73f9495827
SHA1 (patch-9080) = a5be37a2834859afc4cf2daab3bd8c68581ab221
SHA1 (patch-9084) = bc24386464df02e2e6e7d0f42892881dd5d9ef3a
SHA1 (patch-configure) = 51de89ba391cb699f34f11882dca0ca67c98e0a6
SHA1 (patch-rpc_rpc-lib_src_rpcsvc.c) = a174a78d3daec9b784966b4c4502b335e4561558
SHA1 (patch-xlator_cluster_dht_src_dht-common.c) = 835a240358948f310205c19514088cf93930b888
SHA1 (patch-xlator_features_glupy_src_Makefile.in) = b338b98789d70f7c896ee29534a8dbae0ee93f08
SHA1 (patch-xlator_storage_posix_src_posix.c) = 1ca56830afac7cda2fb4fc119fdd6161134eb8b5
SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = 48f2cbb46ad9d08c3500e23ce93586b265e1f5f5

25
filesystems/glusterfs/files/glusterd.sh
View File

@@ -1,29 +1,36 @@
#!/bin/sh
#
# $NetBSD: glusterd.sh,v 1.10 2012/10/19 04:15:21 manu Exp $
# $NetBSD: glusterd.sh,v 1.12 2014/11/18 14:38:15 manu Exp $
#
# PROVIDE: glusterd
# REQUIRE: rpcbind
# BEFORE: glusterfsd
$_rc_subr_loaded . /etc/rc.subr
glusterd_precmd()
{
test -d @VARBASE@/lib/glusterd && return
test -d @PREFIX@/etc/glusterd || return
mv @PREFIX@/etc/glusterd @VARBASE@/lib/glusterd && \
ln -s @VARBASE@/lib/glusterd @PREFIX@/etc/glusterd
fatal=0
for d in /var/lib/glusterd /usr/pkg/etc/glusterd ; do
if test -d /var/lib/glusterd ; then
echo "Please migrate $d to /var/db/glusterd" >&2
fatal=1
fi
done
if [ $fatal -eq 1 ] ; then
exit 1;
fi
}
name="glusterd"
rcvar=$name
command="@PREFIX@/sbin/${name}"
start_precmd="glusterd_precmd"
command="/usr/pkg/sbin/${name}"
#start_precmd="glusterd_precmd"
pidfile="/var/run/${name}.pid"
command_args="-p ${pidfile}"
required_files="@PREFIX@/etc/glusterfs/${name}.vol"
required_files="/usr/pkg/etc/glusterfs/${name}.vol"
load_rc_config $name
run_rc_command "$1"

19
filesystems/glusterfs/files/glusterfsd.sh
View File

@@ -1,19 +0,0 @@
#!/bin/sh
#
# $NetBSD: glusterfsd.sh,v 1.9 2011/12/09 16:57:44 manu Exp $
#
# PROVIDE: glusterfsd
# REQUIRE: rpcbind
$_rc_subr_loaded . /etc/rc.subr
name="glusterfsd"
rcvar=$name
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
command_args="-p ${pidfile}"
required_files="@PREFIX@/etc/glusterfs/${name}.vol"
load_rc_config $name
run_rc_command "$1"

67
filesystems/glusterfs/files/xattr-init.sh
View File

@@ -1,67 +0,0 @@
#!/bin/sh
# $NetBSD: xattr-init.sh,v 1.8 2011/08/09 07:15:42 manu Exp $
GLUSTERFS_XATTR="
trusted.distribute.linkinfo
trusted.distribute.fix.layout
trusted.glusterfs.pathinfo
trusted.glusterfs.volume-mark
trusted.glusterfs.test
trusted.posix1.gen
trusted.gfid
trusted.afr
glusterfs.open-fd-count
glusterfs.inodelk-count
glusterfs.entrylk-count
glusterfs.posixlk-count
"
test $# -ne 1 && {
echo "usage: $0 /export/volume/path"
exit 1
}
VOLUME=$1
test -d ${VOLUME} || {
echo "$0: ${VOLUME} is not a directory"
exit 1
}
mkdir -p ${VOLUME}/.attribute/user || {
echo "$0: cannot create ${VOLUME}/.attribute/user"
exit 1
}
mkdir -p ${VOLUME}/.attribute/system || {
echo "$0: cannot create ${VOLUME}/.attribute/system"
exit 1
}
extattrctl start ${VOLUME} || {
echo "$0: cannot start extended attributes on ${VOLUME}"
exit 1
}
for attr in ${GLUSTERFS_XATTR} ; do
ns="user";
echo ${attr} | egrep -q '^(trusted|system|security)\.' && ns="system"
attrfile=${VOLUME}/.attribute/${ns}/${attr}
test -e ${attrfile} && {
echo "$0: ${attrfile} exists."
exit 1
}
extattrctl initattr 1024 ${attrfile} || {
echo "$0: cannot initialize ${attrfile}"
exit 1
}
extattrctl enable ${VOLUME} ${ns} ${attr} ${attrfile} || {
echo "$0: cannot enable ${attr} backed by ${attrfile}"
exit 1
}
done

13
filesystems/glusterfs/options.mk
View File

@@ -1,13 +0,0 @@
# $NetBSD: options.mk,v 1.8 2013/04/08 11:17:13 rodent Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.glusterfs
PKG_SUPPORTED_OPTIONS= georeplication
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgeoreplication)
CONFIGURE_ARGS+= --enable-georeplication
PLIST_SRC+= ${PKGDIR}/PLIST.georeplication
.else
CONFIGURE_ARGS+= --disable-georeplication
.endif

55
filesystems/glusterfs/patches/patch-9006 Normal file
View File

@@ -0,0 +1,55 @@
$NetBSD: patch-9006,v 1.1 2014/11/18 14:38:15 manu Exp $
From 4f97f9e26663f03da1ca675b16943544e39399a3 Mon Sep 17 00:00:00 2001
From: Emmanuel Dreyfus <manu@netbsd.org>
Date: Thu, 30 Oct 2014 09:50:41 +0100
Subject: [PATCH] Lazy umount emulation: deal with stopped volumes
On non Linux systems, lazy umount is emulated using contrib/umountd.
It first check that the path given to unmount exists, but it should
not give up on ENOTCONN as it is what happens when a volume is mounted
but stopped.
This lets NetBSD pass tests/bugs/bug-1049323.t
Backport of: http://review.gluster.org/8991
BUG: 1138897
Change-Id: I39941577021c0b39f545f9777fe75cd39637427b
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
---
contrib/umountd/umountd.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git contrib/umountd/umountd.c contrib/umountd/umountd.c
index 42f867d..0d2c6f2 100644
--- contrib/umountd/umountd.c
+++ contrib/umountd/umountd.c
@@ -49,14 +49,20 @@ sanity_check (char *path, dev_t *devp)
if (path == NULL)
usage ();
- if (stat (path, &st) != 0) {
- gf_log ("umountd", GF_LOG_ERROR,
- "Cannot access %s\n", path, strerror (errno));
- goto out;
+ if ((ret = stat (path, &st)) != 0) {
+ switch (errno) {
+ case ENOTCONN:
+ /* volume is stopped */
+ break;
+ default:
+ gf_log ("umountd", GF_LOG_ERROR,
+ "Cannot access %s\n", path, strerror (errno));
+ goto out;
+ }
}
/* If dev was not specified, get it from path */
- if (*devp == -1)
+ if (*devp == -1 && ret == 0)
*devp = st.st_dev;
strncpy (pathtmp, path, PATH_MAX);
--
1.8.2.3

72
filesystems/glusterfs/patches/patch-9010 Normal file
View File

@@ -0,0 +1,72 @@
$NetBSD: patch-9010,v 1.1 2014/11/18 14:38:15 manu Exp $
From 70e4f2935ac858f2e83d0c3887b584af8fa0bd5b Mon Sep 17 00:00:00 2001
From: Emmanuel Dreyfus <manu@netbsd.org>
Date: Thu, 30 Oct 2014 10:54:24 +0100
Subject: [PATCH] Use F_CLOSEM if available
Use F_CLOSEM to close all file descriptors if available.
Backport of Ib3c682825b89c163ebb152848f2533b3cb62cdce
BUG: 1138897
Change-Id: Ie44c8e07c77ca5509766e0addbb17c1979df68e7
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
---
contrib/uuid/gen_uuid.c | 7 +++++++
libglusterfs/src/run.c | 8 ++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git contrib/uuid/gen_uuid.c contrib/uuid/gen_uuid.c
index 79923cd..e69995a 100644
--- contrib/uuid/gen_uuid.c
+++ contrib/uuid/gen_uuid.c
@@ -465,6 +465,12 @@ static ssize_t read_all(int fd, char *buf, size_t count)
#if defined(USE_UUIDD) && defined(HAVE_SYS_UN_H)
static void close_all_fds(void)
{
+#ifdef F_CLOSEM
+ (void)fcntl(0, F_CLOSEM);
+ (void)open("/dev/null", O_RDWR); /* stdin */
+ (void)open("/dev/null", O_RDWR); /* stdout */
+ (void)open("/dev/null", O_RDWR); /* stderr */
+#else /* F_CLOSEM */
int i, max;
#if defined(HAVE_SYSCONF) && defined(_SC_OPEN_MAX)
@@ -485,6 +491,7 @@ static void close_all_fds(void)
if (i <= 2)
open("/dev/null", O_RDWR);
}
+#endif /* F_CLOSEM */
}
#endif
diff --git libglusterfs/src/run.c libglusterfs/src/run.c
index 4fd2a3a..93fe12a 100644
--- libglusterfs/src/run.c
+++ libglusterfs/src/run.c
@@ -289,7 +289,10 @@ runner_start (runner_t *runner)
closedir (d);
} else
ret = -1;
-#else
+#else /* !GF_LINUX_HOST_OS */
+#ifdef F_CLOSEM /* NetBSD */
+ (void)fcntl(3, F_CLOSEM);
+#else /* !F_CLOSEM */
struct rlimit rl;
ret = getrlimit (RLIMIT_NOFILE, &rl);
GF_ASSERT (ret == 0);
@@ -298,7 +301,8 @@ runner_start (runner_t *runner)
if (i != xpi[1])
close (i);
}
-#endif
+#endif /* !F_CLOSEM */
+#endif /* !GF_LINUX_HOST_OS */
}
if (ret != -1) {
--
1.8.2.3

43
filesystems/glusterfs/patches/patch-9045 Normal file
View File

@@ -0,0 +1,43 @@
$NetBSD: patch-9045,v 1.1 2014/11/18 14:38:15 manu Exp $
From fb36dbea2f492317a744b828d8ba8bdaab78ae3a Mon Sep 17 00:00:00 2001
From: Emmanuel Dreyfus <manu@netbsd.org>
Date: Tue, 4 Nov 2014 15:57:59 +0100
Subject: [PATCH] Portability fix: mount.glusterfs
Remove bash-specific syntax from mount.glusterfs
This is a backport of Iec3a52686f7cee1825ac5a06c11fb8ac4d3e5d65
BUG: 1138897
Change-Id: I3149cd4d94c862a3857709c00cf0ed0377976f40
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
---
xlators/mount/fuse/utils/mount_glusterfs.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git xlators/mount/fuse/utils/mount_glusterfs.in xlators/mount/fuse/utils/mount_glusterfs.in
index e0a06ea..dc326b4 100755
--- xlators/mount/fuse/utils/mount_glusterfs.in
+++ xlators/mount/fuse/utils/mount_glusterfs.in
@@ -449,7 +449,7 @@ without_options()
parse_options()
{
local optarg=${1}
- for pair in $(echo ${optarg//,/ }); do
+ for pair in $(echo $optarg | sed 's/,/ /g'); do
key=$(echo "$pair" | cut -f1 -d'=');
value=$(echo "$pair" | cut -f2- -d'=');
if [ "$key" = "$value" ]; then
@@ -463,7 +463,8 @@ parse_options()
main ()
{
## `mount` on OSX specifies options as first argument
- if [[ $1 =~ "-o" ]]; then
+ echo $1|grep -q -- "-o"
+ if [ $? -eq 0 ]; then
volfile_loc=$3
mount_point=$4
else
--
1.8.2.3

264
filesystems/glusterfs/patches/patch-9080 Normal file
View File

@@ -0,0 +1,264 @@
$NetBSD: patch-9080,v 1.1 2014/11/18 14:38:15 manu Exp $
From db7e7d493f763e0128c879280c9cec01bdea4260 Mon Sep 17 00:00:00 2001
From: Emmanuel Dreyfus <manu@netbsd.org>
Date: Thu, 30 Oct 2014 01:43:32 +0100
Subject: [PATCH] glupy: portability fixes
Fixes portability problems so that NetBSD passes tests/features/glupy.t
- Use python-config to detect python build environment on all systems,
not just Linux and Darwin.
- Get the site-package directory from python and make sure we install
glupy.py there, Previously we installed within glusterfs prefix,
which caused a problem if it was different that python's prefix.
- Set PYTHONPATH for tests so that the detected site-packages is used
in python's search path. This should be useless, but let us have it
just in case.
- Pass glupy.so path from glusterfsd to glupy.py through an
environment variable and use it in CDLL instead of "", as the
later seems not portable (at least it fails on NetBSD).
- Use gil_init_key pthread_getspecific to avoid deadlocks (that
code was #ifdef out, perhaps because it was not needed on Linux,
but it seems to be required for NetBSD.
- Recover the error message from Python and send it to the logs
to help debugging problems.
Backport of: http://review.gluster.org/8978
BUG: 1138897
Change-Id: I1e23ba5cc18f129ee1032f905cb053953b683a81
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
---
configure.ac | 18 +++++----------
tests/env.rc.in | 5 ++++-
tests/features/glupy.t | 1 +
xlators/features/glupy/src/Makefile.am | 4 ++--
xlators/features/glupy/src/glupy.c | 40 +++++++++++++++++++++++++---------
xlators/features/glupy/src/glupy.py | 3 ++-
6 files changed, 45 insertions(+), 26 deletions(-)
diff --git configure.ac configure.ac
index ddc2cc5..dfcd976 100644
--- configure.ac
+++ configure.ac
@@ -217,6 +217,7 @@ AC_CANONICAL_HOST
AC_PROG_CC
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+AC_SUBST([shrext_cmds])
AC_CHECK_PROG([RPCGEN], [rpcgen], [yes], [no])
@@ -967,18 +968,9 @@ saved_CFLAGS=$CFLAGS
saved_CPPFLAGS=$CPPFLAGS
saved_LDFLAGS=$LDFLAGS
-case $host_os in
- linux*)
- CFLAGS="`${PYTHON}-config --cflags`"
- CPPFLAGS=$CFLAGS
- LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
- ;;
- darwin*)
- CFLAGS="`${PYTHON}-config --cflags`"
- CPPFLAGS=$CFLAGS
- LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
- ;;
-esac
+CFLAGS="`${PYTHON}-config --cflags`"
+CPPFLAGS=$CFLAGS
+LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
AC_CHECK_HEADERS([python$PYTHON_VERSION/Python.h],[have_Python_h=yes],[])
AC_ARG_ENABLE([glupy],
@@ -1029,12 +1021,14 @@ case $host_os in
esac
if test "x$BUILD_GLUPY" = "xyes"; then
+ BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'`
BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
BUILD_PYTHON_LIB=python$PYTHON_VERSION
GLUPY_SUBDIR=glupy
GLUPY_SUBDIR_MAKEFILE=xlators/features/glupy/Makefile
GLUPY_SUBDIR_SRC_MAKEFILE=xlators/features/glupy/src/Makefile
echo "building glupy with -isystem $BUILD_PYTHON_INC -l $BUILD_PYTHON_LIB"
+ AC_SUBST(BUILD_PYTHON_SITE_PACKAGES)
AC_SUBST(BUILD_PYTHON_INC)
AC_SUBST(BUILD_PYTHON_LIB)
AC_SUBST(GLUPY_SUBDIR)
diff --git tests/env.rc.in tests/env.rc.in
index 000a80f..1850b7a 100644
--- tests/env.rc.in
+++ tests/env.rc.in
@@ -8,4 +8,7 @@ LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
GLUSTERD_WORKDIR=@GLUSTERD_WORKDIR@
-export GLUSTERD_WORKDIR
\ No newline at end of file
+export GLUSTERD_WORKDIR
+
+PYTHONPATH=@BUILD_PYTHON_SITE_PACKAGES@:$PYTHON_PATH
+export PYTHONPATH
diff --git tests/features/glupy.t tests/features/glupy.t
index a34e48f..8b79a14 100755
--- tests/features/glupy.t
+++ tests/features/glupy.t
@@ -3,6 +3,7 @@
. $(dirname $0)/../include.rc
. $(dirname $0)/../volume.rc
+echo $PYTHON_PATH >&2
cleanup;
TEST mkdir -p $B0/glupytest
diff --git xlators/features/glupy/src/Makefile.am xlators/features/glupy/src/Makefile.am
index d9361a5..de8b0de 100644
--- xlators/features/glupy/src/Makefile.am
+++ xlators/features/glupy/src/Makefile.am
@@ -4,7 +4,7 @@ xlator_LTLIBRARIES = glupy.la
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
glupydir = $(xlatordir)/glupy
AM_CPPFLAGS = $(PYTHONDEV_CPPFLAGS) $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -isystem $(BUILD_PYTHON_INC)
-AM_CFLAGS = $(PYTHONDEV_CFLAGS) -Wall -fno-strict-aliasing -DGLUSTER_PYTHON_PATH=\"$(glupydir)\" $(GF_CFLAGS)
+AM_CFLAGS = $(PYTHONDEV_CFLAGS) -Wall -fno-strict-aliasing -DGLUSTER_PYTHON_PATH=\"$(glupydir)\" -DPATH_GLUSTERFS_GLUPY_MODULE=\"${xlatordir}/glupy${shrext_cmds}\" $(GF_CFLAGS)
# Flags to build glupy.so with
glupy_la_LDFLAGS = $(PYTHONDEV_LDFLAGS) -module -avoid-version -shared -nostartfiles
@@ -15,7 +15,7 @@ glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
noinst_HEADERS = glupy.h
# Install glupy.py into the Python site-packages area
-pyglupydir = $(pythondir)/gluster
+pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster
pyglupy_PYTHON = glupy.py __init__.py
CLEANFILES =
diff --git xlators/features/glupy/src/glupy.c xlators/features/glupy/src/glupy.c
index 292f5b7..7bb88c0 100644
--- xlators/features/glupy/src/glupy.c
+++ xlators/features/glupy/src/glupy.c
@@ -31,12 +31,10 @@ pthread_key_t gil_init_key;
PyGILState_STATE
glupy_enter (void)
{
-#if 0
if (!pthread_getspecific(gil_init_key)) {
PyEval_ReleaseLock();
(void)pthread_setspecific(gil_init_key,(void *)1);
}
-#endif
return PyGILState_Ensure();
}
@@ -2333,6 +2331,9 @@ init (xlator_t *this)
PyObject *py_args = NULL;
PyObject *syspath = NULL;
PyObject *path = NULL;
+ PyObject *error_type = NULL;
+ PyObject *error_msg = NULL;
+ PyObject *error_bt = NULL;
static gf_boolean_t py_inited = _gf_false;
void * err_cleanup = &&err_return;
@@ -2349,12 +2350,20 @@ init (xlator_t *this)
err_cleanup = &&err_free_priv;
if (!py_inited) {
+ /*
+ * This must be done before Py_Initialize(),
+ * because it will duplicate the environment,
+ * and fail to see later environment updates.
+ */
+ setenv("PATH_GLUSTERFS_GLUPY_MODULE",
+ PATH_GLUSTERFS_GLUPY_MODULE, 1);
+
Py_Initialize();
PyEval_InitThreads();
-#if 0
+
(void)pthread_key_create(&gil_init_key,NULL);
(void)pthread_setspecific(gil_init_key,(void *)1);
-#endif
+
/* PyEval_InitThreads takes this "for" us. No thanks. */
PyEval_ReleaseLock();
py_inited = _gf_true;
@@ -2370,7 +2379,9 @@ init (xlator_t *this)
if (!py_mod_name) {
gf_log (this->name, GF_LOG_ERROR, "could not create name");
if (PyErr_Occurred()) {
- PyErr_Print();
+ PyErr_Fetch (&error_type, &error_msg, &error_bt);
+ gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
+ PyString_AsString(error_msg));
}
goto *err_cleanup;
}
@@ -2379,9 +2390,12 @@ init (xlator_t *this)
priv->py_module = PyImport_Import(py_mod_name);
Py_DECREF(py_mod_name);
if (!priv->py_module) {
- gf_log (this->name, GF_LOG_ERROR, "Python import failed");
+ gf_log (this->name, GF_LOG_ERROR, "Python import of %s failed",
+ module_name);
if (PyErr_Occurred()) {
- PyErr_Print();
+ PyErr_Fetch (&error_type, &error_msg, &error_bt);
+ gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
+ PyString_AsString(error_msg));
}
goto *err_cleanup;
}
@@ -2392,7 +2406,9 @@ init (xlator_t *this)
if (!py_init_func || !PyCallable_Check(py_init_func)) {
gf_log (this->name, GF_LOG_ERROR, "missing init func");
if (PyErr_Occurred()) {
- PyErr_Print();
+ PyErr_Fetch (&error_type, &error_msg, &error_bt);
+ gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
+ PyString_AsString(error_msg));
}
goto *err_cleanup;
}
@@ -2402,7 +2418,9 @@ init (xlator_t *this)
if (!py_args) {
gf_log (this->name, GF_LOG_ERROR, "could not create args");
if (PyErr_Occurred()) {
- PyErr_Print();
+ PyErr_Fetch (&error_type, &error_msg, &error_bt);
+ gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
+ PyString_AsString(error_msg));
}
goto *err_cleanup;
}
@@ -2414,7 +2432,9 @@ init (xlator_t *this)
if (!priv->py_xlator) {
gf_log (this->name, GF_LOG_ERROR, "Python init failed");
if (PyErr_Occurred()) {
- PyErr_Print();
+ PyErr_Fetch (&error_type, &error_msg, &error_bt);
+ gf_log (this->name, GF_LOG_ERROR, "Python error: %s",
+ PyString_AsString(error_msg));
}
goto *err_cleanup;
}
diff --git xlators/features/glupy/src/glupy.py xlators/features/glupy/src/glupy.py
index eda8aeb..b9fc370 100644
--- xlators/features/glupy/src/glupy.py
+++ xlators/features/glupy/src/glupy.py
@@ -9,9 +9,10 @@
##
import sys
+import os
from ctypes import *
-dl = CDLL("",RTLD_GLOBAL)
+dl = CDLL(os.getenv("PATH_GLUSTERFS_GLUPY_MODULE", ""),RTLD_GLOBAL)
class call_frame_t (Structure):
--
1.8.2.3

350
filesystems/glusterfs/patches/patch-9084 Normal file
View File

@@ -0,0 +1,350 @@
$NetBSD: patch-9084,v 1.1 2014/11/18 14:38:15 manu Exp $
From 23b7ead5de0f21abdcf5440a4a43dcf3a42c3822 Mon Sep 17 00:00:00 2001
From: Emmanuel Dreyfus <manu@netbsd.org>
Date: Mon, 10 Nov 2014 10:01:00 +0100
Subject: [PATCH] telldir()/seekdir() portability fixes
POSIX says that an offset obtained from telldir() can only be used
on the same DIR *. Linux is abls to reuse the offset accross
closedir()/opendir() for a given directory, but this is not portable
and such a behavior should be fixed.
An incomplete fix for the posix xlator was merged in
http://review.gluster.org/8933
This change set completes it.
- Perform the same fix index xlator.
- Use appropriate casts and variable types so that 32 bit signed
offsets obtained by telldir() do not get clobbered when copied into
64 bit signed types.
- modify afr-self-heald.c so that it does not use anonymous fd,
since this will cause closedir()/opendir() between each
syncop_readdir(). On failure we fallback to anonymous fs
only for Linux so that we can cope with updated client vs not
updated brick.
- Avoid sending an EINVAL when the client request for the EOF offset.
Here we fix an error in previous fix for posix xlator: since we
fill each directory entry with the offset of the next entry, we
must consider as EOF the offset of the last entry, and not the
value of telldir() after we read it.
This is a backport of I59fb7f06a872c4f98987105792d648141c258c6a
BUG: 1138897
Change-Id: I1e9f3e4a7d780b98adf6d9f197ee2198d43ef94d
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
---
xlators/cluster/afr/src/afr-self-heald.c | 46 +++++++++++++++++++++++++++-----
xlators/features/index/src/index.c | 42 ++++++++++++++++++++---------
xlators/features/index/src/index.h | 1 +
xlators/storage/posix/src/posix.c | 26 +++++++++++-------
4 files changed, 87 insertions(+), 28 deletions(-)
diff --git xlators/cluster/afr/src/afr-self-heald.c xlators/cluster/afr/src/afr-self-heald.c
index 10e1996..6ce52aa 100644
--- xlators/cluster/afr/src/afr-self-heald.c
+++ xlators/cluster/afr/src/afr-self-heald.c
@@ -276,6 +276,8 @@ afr_shd_index_opendir (xlator_t *this, int child)
#ifdef GF_LINUX_HOST_OS
fd_unref (fd);
fd = fd_anonymous (inode);
+ if (!fd)
+ goto out;
#else /* GF_LINUX_HOST_OS */
gf_log(this->name, GF_LOG_ERROR,
"opendir of %s for %s failed: %s",
@@ -429,7 +431,7 @@ afr_shd_index_sweep (struct subvol_healer *healer)
fd_t *fd = NULL;
xlator_t *subvol = NULL;
afr_private_t *priv = NULL;
- off_t offset = 0;
+ uint64_t offset = 0;
gf_dirent_t entries;
gf_dirent_t *entry = NULL;
uuid_t gfid;
@@ -503,11 +505,12 @@ afr_shd_index_sweep (struct subvol_healer *healer)
int
afr_shd_full_sweep (struct subvol_healer *healer, inode_t *inode)
{
+ loc_t loc = {0, };
fd_t *fd = NULL;
xlator_t *this = NULL;
xlator_t *subvol = NULL;
afr_private_t *priv = NULL;
- off_t offset = 0;
+ uint64_t offset = 0;
gf_dirent_t entries;
gf_dirent_t *entry = NULL;
int ret = 0;
@@ -516,9 +519,38 @@ afr_shd_full_sweep (struct subvol_healer *healer, inode_t *inode)
priv = this->private;
subvol = priv->children[healer->subvol];
- fd = fd_anonymous (inode);
- if (!fd)
- return -errno;
+ uuid_copy (loc.gfid, inode->gfid);
+ loc.inode = inode_ref(inode);
+
+ fd = fd_create (inode, GF_CLIENT_PID_AFR_SELF_HEALD);
+ if (!fd) {
+ gf_log(this->name, GF_LOG_ERROR,
+ "fd_create of %s failed: %s",
+ uuid_utoa (loc.gfid), strerror(errno));
+ ret = -errno;
+ goto out;
+ }
+
+ ret = syncop_opendir (subvol, &loc, fd);
+ if (ret) {
+#ifdef GF_LINUX_HOST_OS /* See comment in afr_shd_index_opendir() */
+ fd_unref(fd);
+ fd = fd_anonymous (inode);
+ if (!fd) {
+ gf_log(this->name, GF_LOG_ERROR,
+ "fd_anonymous of %s failed: %s",
+ uuid_utoa (loc.gfid), strerror(errno));
+ ret = -errno;
+ goto out;
+ }
+#else /* GF_LINUX_HOST_OS */
+ gf_log(this->name, GF_LOG_ERROR,
+ "opendir of %s failed: %s",
+ uuid_utoa (loc.gfid), strerror(errno));
+ ret = -errno;
+ goto out;
+#endif /* GF_LINUX_HOST_OS */
+ }
INIT_LIST_HEAD (&entries.list);
@@ -560,6 +592,8 @@ afr_shd_full_sweep (struct subvol_healer *healer, inode_t *inode)
break;
}
+out:
+ loc_wipe (&loc);
if (fd)
fd_unref (fd);
return ret;
@@ -949,7 +983,7 @@ afr_shd_gather_index_entries (xlator_t *this, int child, dict_t *output)
fd_t *fd = NULL;
xlator_t *subvol = NULL;
afr_private_t *priv = NULL;
- off_t offset = 0;
+ uint64_t offset = 0;
gf_dirent_t entries;
gf_dirent_t *entry = NULL;
uuid_t gfid;
diff --git xlators/features/index/src/index.c xlators/features/index/src/index.c
index c342da8..50e2e0a 100644
--- xlators/features/index/src/index.c
+++ xlators/features/index/src/index.c
@@ -268,10 +268,11 @@ check_delete_stale_index_file (xlator_t *this, char *filename)
}
static int
-index_fill_readdir (fd_t *fd, DIR *dir, off_t off,
+index_fill_readdir (fd_t *fd, index_fd_ctx_t *fctx, DIR *dir, off_t off,
size_t size, gf_dirent_t *entries)
{
off_t in_case = -1;
+ off_t last_off = 0;
size_t filled = 0;
int count = 0;
char entrybuf[sizeof(struct dirent) + 256 + 8];
@@ -286,11 +287,11 @@ index_fill_readdir (fd_t *fd, DIR *dir, off_t off,
} else {
seekdir (dir, off);
#ifndef GF_LINUX_HOST_OS
- if (telldir(dir) != off) {
+ if ((u_long)telldir(dir) != off && off != fctx->dir_eof) {
gf_log (THIS->name, GF_LOG_ERROR,
- "seekdir(%ld) failed on dir=%p: "
+ "seekdir(0x%llx) failed on dir=%p: "
"Invalid argument (offset reused from "
- "another DIR * structure?)", (long)off, dir);
+ "another DIR * structure?)", off, dir);
errno = EINVAL;
count = -1;
goto out;
@@ -299,7 +300,7 @@ index_fill_readdir (fd_t *fd, DIR *dir, off_t off,
}
while (filled <= size) {
- in_case = telldir (dir);
+ in_case = (u_long)telldir (dir);
if (in_case == -1) {
gf_log (THIS->name, GF_LOG_ERROR,
@@ -335,12 +336,13 @@ index_fill_readdir (fd_t *fd, DIR *dir, off_t off,
if (this_size + filled > size) {
seekdir (dir, in_case);
#ifndef GF_LINUX_HOST_OS
- if (telldir(dir) != in_case) {
+ if ((u_long)telldir(dir) != in_case &&
+ in_case != fctx->dir_eof) {
gf_log (THIS->name, GF_LOG_ERROR,
- "seekdir(%ld) failed on dir=%p: "
+ "seekdir(0x%llx) failed on dir=%p: "
"Invalid argument (offset reused from "
"another DIR * structure?)",
- (long)in_case, dir);
+ in_case, dir);
errno = EINVAL;
count = -1;
goto out;
@@ -357,7 +359,14 @@ index_fill_readdir (fd_t *fd, DIR *dir, off_t off,
entry->d_name, strerror (errno));
goto out;
}
- this_entry->d_off = telldir (dir);
+ /*
+ * we store the offset of next entry here, which is
+ * probably not intended, but code using syncop_readdir()
+ * (glfs-heal.c, afr-self-heald.c, pump.c) rely on it
+ * for directory read resumption.
+ */
+ last_off = (u_long)telldir(dir);
+ this_entry->d_off = last_off;
this_entry->d_ino = entry->d_ino;
list_add_tail (&this_entry->list, &entries->list);
@@ -366,9 +375,12 @@ index_fill_readdir (fd_t *fd, DIR *dir, off_t off,
count ++;
}
- if ((!readdir (dir) && (errno == 0)))
+ if ((!readdir (dir) && (errno == 0))) {
/* Indicate EOF */
errno = ENOENT;
+ /* Remember EOF offset for later detection */
+ fctx->dir_eof = last_off;
+ }
out:
return count;
}
@@ -581,6 +593,7 @@ __index_fd_ctx_get (fd_t *fd, xlator_t *this, index_fd_ctx_t **ctx)
fctx = NULL;
goto out;
}
+ fctx->dir_eof = -1;
ret = __fd_ctx_set (fd, this, (uint64_t)(long)fctx);
if (ret) {
@@ -949,7 +962,7 @@ index_readdir_wrapper (call_frame_t *frame, xlator_t *this,
goto done;
}
- count = index_fill_readdir (fd, dir, off, size, &entries);
+ count = index_fill_readdir (fd, fctx, dir, off, size, &entries);
/* pick ENOENT to indicate EOF */
op_errno = errno;
@@ -1270,8 +1283,11 @@ index_releasedir (xlator_t *this, fd_t *fd)
goto out;
fctx = (index_fd_ctx_t*) (long) ctx;
- if (fctx->dir)
- closedir (fctx->dir);
+ if (fctx->dir) {
+ ret = closedir (fctx->dir);
+ if (ret)
+ gf_log (this->name, GF_LOG_ERROR, "closedir error: %s", strerror (errno));
+ }
GF_FREE (fctx);
out:
diff --git xlators/features/index/src/index.h xlators/features/index/src/index.h
index 661dcdb..206d280 100644
--- xlators/features/index/src/index.h
+++ xlators/features/index/src/index.h
@@ -34,6 +34,7 @@ typedef struct index_inode_ctx {
typedef struct index_fd_ctx {
DIR *dir;
+ off_t dir_eof;
} index_fd_ctx_t;
typedef struct index_priv {
diff --git xlators/storage/posix/src/posix.c xlators/storage/posix/src/posix.c
index 3e3d14f..5d37c9f 100644
--- xlators/storage/posix/src/posix.c
+++ xlators/storage/posix/src/posix.c
@@ -4839,6 +4839,7 @@ posix_fill_readdir (fd_t *fd, DIR *dir, off_t off, size_t size,
gf_dirent_t *entries, xlator_t *this, int32_t skip_dirs)
{
off_t in_case = -1;
+ off_t last_off = 0;
size_t filled = 0;
int count = 0;
char entrybuf[sizeof(struct dirent) + 256 + 8];
@@ -4874,11 +4875,11 @@ posix_fill_readdir (fd_t *fd, DIR *dir, off_t off, size_t size,
} else {
seekdir (dir, off);
#ifndef GF_LINUX_HOST_OS
- if (telldir(dir) != (long)off && off != pfd->dir_eof) {
+ if ((u_long)telldir(dir) != off && off != pfd->dir_eof) {
gf_log (THIS->name, GF_LOG_ERROR,
- "seekdir(%ld) failed on dir=%p: "
+ "seekdir(0x%llx) failed on dir=%p: "
"Invalid argument (offset reused from "
- "another DIR * structure?)", (long)off, dir);
+ "another DIR * structure?)", off, dir);
errno = EINVAL;
count = -1;
goto out;
@@ -4887,7 +4888,7 @@ posix_fill_readdir (fd_t *fd, DIR *dir, off_t off, size_t size,
}
while (filled <= size) {
- in_case = telldir (dir);
+ in_case = (u_long)telldir (dir);
if (in_case == -1) {
gf_log (THIS->name, GF_LOG_ERROR,
@@ -4947,13 +4948,13 @@ posix_fill_readdir (fd_t *fd, DIR *dir, off_t off, size_t size,
if (this_size + filled > size) {
seekdir (dir, in_case);
#ifndef GF_LINUX_HOST_OS
- if (telldir(dir) != (long)in_case &&
+ if ((u_long)telldir(dir) != in_case &&
in_case != pfd->dir_eof) {
gf_log (THIS->name, GF_LOG_ERROR,
- "seekdir(%ld) failed on dir=%p: "
+ "seekdir(0x%llx) failed on dir=%p: "
"Invalid argument (offset reused from "
"another DIR * structure?)",
- (long)in_case, dir);
+ in_case, dir);
errno = EINVAL;
count = -1;
goto out;
@@ -4970,7 +4971,14 @@ posix_fill_readdir (fd_t *fd, DIR *dir, off_t off, size_t size,
entry->d_name, strerror (errno));
goto out;
}
- this_entry->d_off = telldir (dir);
+ /*
+ * we store the offset of next entry here, which is
+ * probably not intended, but code using syncop_readdir()
+ * (glfs-heal.c, afr-self-heald.c, pump.c) rely on it
+ * for directory read resumption.
+ */
+ last_off = (u_long)telldir(dir);
+ this_entry->d_off = last_off;
this_entry->d_ino = entry->d_ino;
this_entry->d_type = entry->d_type;
@@ -4984,7 +4992,7 @@ posix_fill_readdir (fd_t *fd, DIR *dir, off_t off, size_t size,
/* Indicate EOF */
errno = ENOENT;
/* Remember EOF offset for later detection */
- pfd->dir_eof = telldir (dir);
+ pfd->dir_eof = (u_long)last_off;
}
out:
return count;
--
1.8.2.3

19
filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
View File

@@ -1,19 +0,0 @@
$NetBSD: patch-argp-standalone_argp-fmtstream.c,v 1.5 2013/10/04 08:07:23 manu Exp $
--- argp-standalone/argp-fmtstream.c.orig 2013-07-12 17:43:25.000000000 +0000
+++ argp-standalone/argp-fmtstream.c
@@ -389,6 +389,7 @@ __argp_fmtstream_printf (struct argp_fmt
weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
#endif
+#if __STDC_VERSION__ - 199900L < 1
/* Duplicate the inline definitions in argp-fmtstream.h, for compilers
* that don't do inlining. */
size_t
@@ -471,5 +472,6 @@ __argp_fmtstream_point (argp_fmtstream_t
__argp_fmtstream_update (__fs);
return __fs->point_col >= 0 ? __fs->point_col : 0;
}
+#endif
#endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */

48
filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
View File

@@ -1,48 +0,0 @@
$NetBSD: patch-argp-standalone_argp-fmtstream.h,v 1.5 2013/10/04 08:07:23 manu Exp $
--- argp-standalone/argp-fmtstream.h.orig 2013-07-12 17:43:25.000000000 +0000
+++ argp-standalone/argp-fmtstream.h
@@ -153,6 +153,7 @@ extern ssize_t argp_fmtstream_printf (ar
__const char *__fmt, ...)
PRINTF_STYLE(2,3);
+#if 0
extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
@@ -163,6 +164,7 @@ extern size_t __argp_fmtstream_write (ar
__const char *__str, size_t __len);
extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
__const char *__str, size_t __len);
+#endif
/* Access macros for various bits of state. */
#define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
@@ -172,6 +174,7 @@ extern size_t argp_fmtstream_write (argp
#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
+#if 0
/* Set __FS's left margin to LMARGIN and return the old value. */
extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
size_t __lmargin);
@@ -193,6 +196,7 @@ extern size_t __argp_fmtstream_set_wmarg
/* Return the column number of the current output point in __FS. */
extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
+#endif
/* Internal routines. */
extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
@@ -216,7 +220,11 @@ extern int __argp_fmtstream_ensure (argp
#endif
#ifndef ARGP_FS_EI
+#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
#define ARGP_FS_EI extern inline
+#else
+#define ARGP_FS_EI inline
+#endif
#endif
ARGP_FS_EI size_t

24
filesystems/glusterfs/patches/patch-cg
View File

@@ -1,24 +0,0 @@
$NetBSD: patch-cg,v 1.1 2013/10/01 00:30:26 manu Exp $
--- xlators/cluster/afr/src/afr.c.orig 2013-09-30 16:51:57.000000000 +0200
+++ xlators/cluster/afr/src/afr.c 2013-09-30 17:23:03.000000000 +0200
@@ -673,9 +675,19 @@
.description = "Enabling this option logs entry lock/unlocks"
},
{ .key = {"eager-lock"},
.type = GF_OPTION_TYPE_BOOL,
+#ifdef __NetBSD__
+ /*
+ * eager-locks are broken on NetBSD, and cause spurious
+ * split brain with all NULL pending matrix, as described
+ * in https://bugzilla.redhat.com/show_bug.cgi?id=1005526
+ * We therefore disable them for now
+ */
+ .default_value = "off",
+#else
.default_value = "on",
+#endif
.description = "Lock phase of a transaction has two sub-phases. "
"First is an attempt to acquire locks in parallel by "
"broadcasting non-blocking lock requests. If lock "
"aquistion fails on any server, then the held locks "

61
filesystems/glusterfs/patches/patch-configure Normal file
View File

@@ -0,0 +1,61 @@
$NetBSD: patch-configure,v 1.1 2014/11/18 14:38:15 manu Exp $
autoconf output after patch-9080
--- configure.orig 2014-11-04 17:06:43.000000000 +0100
+++ configure 2014-11-04 17:09:32.000000000 +0100
@@ -822,8 +822,9 @@
GLUPY_SUBDIR_MAKEFILE
GLUPY_SUBDIR
BUILD_PYTHON_LIB
BUILD_PYTHON_INC
+BUILD_PYTHON_SITE_PACKAGES
PYTHONDEV_LDFLAGS
PYTHONDEV_CPPFLAGS
PYTHONDEV_CFLAGS
ENABLE_SYSLOG_FALSE
@@ -889,8 +890,9 @@
systemddir
mountutildir
pkgconfigdir
RPCGEN
+shrext_cmds
CPP
OTOOL64
OTOOL
LIPO
@@ -19501,21 +19503,11 @@
saved_CFLAGS=$CFLAGS
saved_CPPFLAGS=$CPPFLAGS
saved_LDFLAGS=$LDFLAGS
-case $host_os in
- linux*)
- CFLAGS="`${PYTHON}-config --cflags`"
- CPPFLAGS=$CFLAGS
- LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
- ;;
- darwin*)
- CFLAGS="`${PYTHON}-config --cflags`"
- CPPFLAGS=$CFLAGS
- LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
- ;;
-esac
-
+CFLAGS="`${PYTHON}-config --cflags`"
+CPPFLAGS=$CFLAGS
+LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
for ac_header in python$PYTHON_VERSION/Python.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -19721,8 +19713,9 @@
;;
esac
if test "x$BUILD_GLUPY" = "xyes"; then
+ BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'`
BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
BUILD_PYTHON_LIB=python$PYTHON_VERSION
GLUPY_SUBDIR=glupy
GLUPY_SUBDIR_MAKEFILE=xlators/features/glupy/Makefile

17
filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-rpc_rpc-lib_src_rpcsvc.c,v 1.3 2014/11/18 14:38:15 manu Exp $
Shut up log-filling message
--- rpc/rpc-lib/src/rpcsvc.c.orig 2014-11-04 14:27:15.000000000 +0100
+++ rpc/rpc-lib/src/rpcsvc.c 2014-11-04 14:28:46.000000000 +0100
@@ -611,9 +611,9 @@
goto err_reply;
if (0 == svc->allow_insecure && unprivileged && !actor->unprivileged) {
/* Non-privileged user, fail request */
- gf_log (GF_RPCSVC, GF_LOG_ERROR,
+ gf_log (GF_RPCSVC, GF_LOG_DEBUG,
"Request received from non-"
"privileged port. Failing request");
rpcsvc_request_destroy (req);
return -1;

17
filesystems/glusterfs/patches/patch-xlator_cluster_dht_src_dht-common.c Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-xlator_cluster_dht_src_dht-common.c,v 1.1 2014/11/18 14:38:15 manu Exp $
Shut up log-filling message
--- xlators/cluster/dht/src/dht-common.c.orig 2014-11-07 16:45:47.000000000 +0100
+++ xlators/cluster/dht/src/dht-common.c 2014-11-07 16:46:09.000000000 +0100
@@ -1817,9 +1817,9 @@
"fresh_lookup returned for %s with op_ret %d and "
"op_errno %d", loc->path, op_ret, op_errno);
if (ENTRY_MISSING (op_ret, op_errno)) {
- gf_log (this->name, GF_LOG_INFO, "Entry %s missing on subvol"
+ gf_log (this->name, GF_LOG_DEBUG, "Entry %s missing on subvol"
" %s", loc->path, prev->this->name);
if (conf->search_unhashed == GF_DHT_LOOKUP_UNHASHED_ON) {
local->op_errno = ENOENT;
dht_lookup_everywhere (frame, this, loc);

28
filesystems/glusterfs/patches/patch-xlator_features_glupy_src_Makefile.in Normal file
View File

@@ -0,0 +1,28 @@
$NetBSD: patch-xlator_features_glupy_src_Makefile.in,v 1.1 2014/11/18 14:38:15 manu Exp $
automake output after patch-9006
--- xlators/features/glupy/src/Makefile.in.orig 2014-11-04 16:37:44.000000000 +0100
+++ xlators/features/glupy/src/Makefile.in 2014-11-04 16:44:25.000000000 +0100
@@ -314,9 +314,9 @@
# Ensure GLUSTER_PYTHON_PATH is passed to glupy.so
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
glupydir = $(xlatordir)/glupy
AM_CPPFLAGS = $(PYTHONDEV_CPPFLAGS) $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -isystem $(BUILD_PYTHON_INC)
-AM_CFLAGS = $(PYTHONDEV_CFLAGS) -Wall -fno-strict-aliasing -DGLUSTER_PYTHON_PATH=\"$(glupydir)\" $(GF_CFLAGS)
+AM_CFLAGS = $(PYTHONDEV_CFLAGS) -Wall -fno-strict-aliasing -DGLUSTER_PYTHON_PATH=\"$(glupydir)\" -DPATH_GLUSTERFS_GLUPY_MODULE=\"${xlatordir}/glupy${shrext_cmds}\" $(GF_CFLAGS)
# Flags to build glupy.so with
glupy_la_LDFLAGS = $(PYTHONDEV_LDFLAGS) -module -avoid-version -shared -nostartfiles
glupy_la_SOURCES = glupy.c
@@ -325,9 +325,9 @@
noinst_HEADERS = glupy.h
# Install glupy.py into the Python site-packages area
-pyglupydir = $(pythondir)/gluster
+pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster
pyglupy_PYTHON = glupy.py __init__.py
CLEANFILES =
all: all-am

17
filesystems/glusterfs/patches/patch-xlator_storage_posix_src_posix.c Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-xlator_storage_posix_src_posix.c,v 1.1 2014/11/18 14:38:15 manu Exp $
Shut up log-filling message
--- xlators/storage/posix/src/posix.c.orig 2014-11-04 14:29:56.000000000 +0100
+++ xlators/storage/posix/src/posix.c 2014-11-04 14:30:49.000000000 +0100
@@ -3431,9 +3431,9 @@
&nlink_samepgfid,
sizeof(nlink_samepgfid));
if (op_ret == -1) {
*op_errno = errno;
- gf_log (this->name, GF_LOG_ERROR,
+ gf_log (this->name, GF_LOG_DEBUG,
"getxattr failed on "
"%s: key = %s (%s)",
leaf_path,
key,

13
filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-xlators_mgmt_glusterd_src_Makefile.in,v 1.1 2014/12/11 22:08:22 joerg Exp $
--- xlators/mgmt/glusterd/src/Makefile.in.orig 2014-12-10 15:18:18.000000000 +0000
+++ xlators/mgmt/glusterd/src/Makefile.in
@@ -356,7 +356,7 @@ noinst_HEADERS = glusterd.h glusterd-uti
glusterd-mgmt.h glusterd-messages.h glusterd-peer-utils.h
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
- -I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \
+ -I$(CONTRIBDIR)/rbtree \
-I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \
-I$(CONTRIBDIR)/uuid -I$(CONTRIBDIR)/mount \
-DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \

15
filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-xlators_mount_fuse_src_fuse-helpers.c,v 1.3 2013/10/04 08:07:23 manu Exp $
--- xlators/mount/fuse/src/fuse-helpers.c.orig 2013-09-17 13:41:20.000000000 +0000
+++ xlators/mount/fuse/src/fuse-helpers.c
@@ -7,6 +7,10 @@
later), or the GNU General Public License, version 2 (GPLv2), in all
cases as published by the Free Software Foundation.
*/
+#ifdef __NetBSD__
+#define _KMEMUSER
+#endif
+
#include "fuse-bridge.h"
#if defined(GF_SOLARIS_HOST_OS)
#include <sys/procfs.h>

5
filesystems/libntfs/DESCR Normal file
View File

@@ -0,0 +1,5 @@
The Linux-NTFS project aims to bring full support for the NTFS filesystem to the
Linux operating system. The ntfsprogs package currently consists of a static
library and utilities such as mkntfs, ntfscat, ntfsls, ntfsresize, and
ntfsundelete (for a full list of included utilities see man 8 ntfsprogs after
installation).

13
filesystems/libntfs/Makefile Normal file
View File

@@ -0,0 +1,13 @@
# $NetBSD: Makefile,v 1.1 2014/05/19 12:22:06 adam Exp $
.include "Makefile.common"
PKGNAME= lib${DISTNAME:S/-3g_ntfsprogs//}
CATEGORIES= sysutils
COMMENT= Linux-NTFS project utilities for the Windows NT Filesystem
CONFIGURE_ARGS+= --disable-ntfs-3g
CONFIGURE_ARGS+= --disable-ntfsprogs
.include "../../mk/bsd.pkg.mk"

21
filesystems/libntfs/Makefile.common Normal file
View File

@@ -0,0 +1,21 @@
# $NetBSD: Makefile.common,v 1.1 2014/05/19 12:22:06 adam Exp $
# used by filesystems/fuse-ntfs-3g/Makefile
# used by sysutils/ntfsprogs/Makefile
DISTNAME= ntfs-3g_ntfsprogs-2014.2.15
CATEGORIES= sysutils
MASTER_SITES= http://tuxera.com/opensource/
EXTRACT_SUFX= .tgz
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tuxera.com/community/ntfs-3g-download/
LICENSE= gnu-gpl-v2
DISTINFO_FILE= ${.CURDIR}/../../filesystems/libntfs/distinfo
PATCHDIR= ${.CURDIR}/../../filesystems/libntfs/patches
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-posix-acls
CONFIGURE_ARGS+= --enable-xattr-mappings

39
filesystems/libntfs/PLIST Normal file
View File

@@ -0,0 +1,39 @@
@comment $NetBSD: PLIST,v 1.1 2014/05/19 12:22:06 adam Exp $
include/ntfs-3g/acls.h
include/ntfs-3g/attrib.h
include/ntfs-3g/attrlist.h
include/ntfs-3g/bitmap.h
include/ntfs-3g/bootsect.h
include/ntfs-3g/cache.h
include/ntfs-3g/collate.h
include/ntfs-3g/compat.h
include/ntfs-3g/compress.h
include/ntfs-3g/debug.h
include/ntfs-3g/device.h
include/ntfs-3g/device_io.h
include/ntfs-3g/dir.h
include/ntfs-3g/efs.h
include/ntfs-3g/endians.h
include/ntfs-3g/index.h
include/ntfs-3g/inode.h
include/ntfs-3g/layout.h
include/ntfs-3g/lcnalloc.h
include/ntfs-3g/logfile.h
include/ntfs-3g/logging.h
include/ntfs-3g/mft.h
include/ntfs-3g/misc.h
include/ntfs-3g/mst.h
include/ntfs-3g/ntfstime.h
include/ntfs-3g/object_id.h
include/ntfs-3g/param.h
include/ntfs-3g/realpath.h
include/ntfs-3g/reparse.h
include/ntfs-3g/runlist.h
include/ntfs-3g/security.h
include/ntfs-3g/support.h
include/ntfs-3g/types.h
include/ntfs-3g/unistr.h
include/ntfs-3g/volume.h
include/ntfs-3g/xattrs.h
lib/libntfs-3g.la
lib/pkgconfig/libntfs-3g.pc

12
filesystems/libntfs/buildlink3.mk Normal file
View File

@@ -0,0 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.1 2014/05/19 12:22:06 adam Exp $
BUILDLINK_TREE+= libntfs
.if !defined(LIBNTFS_BUILDLINK3_MK)
LIBNTFS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libntfs+= libntfs>=2014.2.15
BUILDLINK_PKGSRCDIR.libntfs?= ../../filesystems/libntfs
.endif # LIBNTFS_BUILDLINK3_MK
BUILDLINK_TREE+= -libntfs

13
filesystems/libntfs/distinfo Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: distinfo,v 1.1 2014/05/19 12:22:06 adam Exp $
SHA1 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = c9836f340b508f5d7776156e5afb02434d3f0174
RMD160 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 32418b98e60a483173352eb22cc101ed82c92ebf
Size (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 1143575 bytes
SHA1 (patch-Makefile.in) = 874ba5084b5eea312a24d7a6b339f83a3f7896d8
SHA1 (patch-include_ntfs-3g_compat.h) = 78ea127359416c9106eef7025a2ccc84fd0b4447
SHA1 (patch-include_ntfs-3g_types.h) = b6731cee8e1cd72dfe1ef485f4f997e8dfa6e928
SHA1 (patch-libntfs-3g_Makefile.in) = 50a318a1c9a0a68d42e5cac2557e781f8c728094
SHA1 (patch-libntfs-3g_device.c) = 3ad49d69b03cdd500246f77d9f6e30ca3d2e2ec6
SHA1 (patch-ntfsprogs_Makefile.in) = 9acd073006c54009cedeafc766c964e9b5f11468
SHA1 (patch-ntfsprogs_ntfsclone.c) = 3306b501e94ce71a709f394516829a727aa743ad
SHA1 (patch-src_Makefile.in) = 78d107a3ba0e9e0b39a4c5e4eaad2fd58bb9ade2

15
filesystems/libntfs/patches/patch-Makefile.in Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
Don't install README.
--- Makefile.in.orig 2014-05-19 07:53:27.000000000 +0000
+++ Makefile.in
@@ -754,7 +754,7 @@ info: info-recursive
info-am:
-install-data-am: install-docDATA
+install-data-am:
install-dvi: install-dvi-recursive

16
filesystems/libntfs/patches/patch-include_ntfs-3g_compat.h Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-include_ntfs-3g_compat.h,v 1.1 2014/05/19 12:22:06 adam Exp $
NetBSD-1.6.2 does not know about ENOTSUP.
--- include/ntfs-3g/compat.h.orig 2013-01-13 06:46:35.000000000 +0000
+++ include/ntfs-3g/compat.h
@@ -71,5 +71,9 @@ extern char *strsep(char **stringp, cons
#endif /* defined WINDOWS */
+#ifndef ENOTSUP
+#define ENOTSUP EINVAL
+#endif
+
#endif /* defined _NTFS_COMPAT_H */

21
filesystems/libntfs/patches/patch-include_ntfs-3g_types.h Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: patch-include_ntfs-3g_types.h,v 1.1 2014/05/19 12:22:06 adam Exp $
--- include/ntfs-3g/types.h.orig 2013-01-13 06:46:35.000000000 +0000
+++ include/ntfs-3g/types.h
@@ -68,6 +68,16 @@ typedef sle64 leVCN;
typedef s64 LCN;
typedef sle64 leLCN;
+/* XXX For some reason, including sys/mount.h on osx defines TRUE and FALSE
+ * so clear them here.
+ */
+#ifdef FALSE
+#undef FALSE
+#endif
+#ifdef TRUE
+#undef TRUE
+#endif
+
/*
* The NTFS journal $LogFile uses log sequence numbers which are signed 64-bit
* values. We define our own type LSN, to allow for type checking and better

12
filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-libntfs-3g_Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
--- libntfs-3g/Makefile.in.orig 2014-02-15 14:08:00.000000000 +0000
+++ libntfs-3g/Makefile.in
@@ -849,7 +849,6 @@ install-dvi-am:
install-exec-am: install-libLTLIBRARIES
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-am
install-html-am:

39
filesystems/libntfs/patches/patch-libntfs-3g_device.c Normal file
View File

@@ -0,0 +1,39 @@
$NetBSD: patch-libntfs-3g_device.c,v 1.1 2014/05/19 12:22:06 adam Exp $
--- libntfs-3g/device.c.orig 2014-02-15 14:07:52.000000000 +0000
+++ libntfs-3g/device.c
@@ -95,6 +95,10 @@
# define BLKBSZSET _IOW(0x12,113,size_t) /* Set device block size in bytes. */
#endif
+#if defined(__NetBSD__)
+#include <sys/disklabel.h> /* XXX autoconf this ? */
+#endif
+
/**
* ntfs_device_alloc - allocate an ntfs device structure and pre-initialize it
* @name: name of the device (must be present)
@@ -596,6 +600,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
}
}
#endif
+#ifdef DIOCGPART
+ {
+ struct stat st;
+ if (dev->d_ops->stat(dev, &st) >= 0) {
+ struct disklabel disklabel;
+ int secsize;
+ s64 psize;
+ if (dev->d_ops->ioctl(dev, DIOCGDINFO, &disklabel) >= 0) {
+ secsize = disklabel.d_secsize;
+ psize = disklabel.d_partitions[DISKPART(st.st_rdev)].p_size;
+ ntfs_log_debug("DIOCGPART nr %d byte blocks = %lld (0x%llx)\n",
+ secsize, psize, psize);
+ return psize * secsize / block_size;
+ }
+ }
+ }
+#endif
/*
* We couldn't figure it out by using a specialized ioctl,
* so do binary search to find the size of the device.

33
filesystems/libntfs/patches/patch-ntfsprogs_Makefile.in Normal file
View File

@@ -0,0 +1,33 @@
$NetBSD: patch-ntfsprogs_Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
Link against already built and installed libntfs.
--- ntfsprogs/Makefile.in.orig 2014-02-15 14:08:00.000000000 +0000
+++ ntfsprogs/Makefile.in
@@ -89,8 +89,7 @@ am__mkntfs_SOURCES_DIST = attrdef.c attr
@ENABLE_NTFSPROGS_TRUE@ mkntfs-utils.$(OBJEXT)
mkntfs_OBJECTS = $(am_mkntfs_OBJECTS)
am__DEPENDENCIES_1 =
-@REALLYSTATIC_FALSE@am__DEPENDENCIES_2 = \
-@REALLYSTATIC_FALSE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
+am__DEPENDENCIES_2 =
@REALLYSTATIC_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/libntfs-3g/.libs/libntfs-3g.a \
@REALLYSTATIC_TRUE@ $(am__DEPENDENCIES_1)
@ENABLE_NTFSPROGS_TRUE@mkntfs_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -454,7 +453,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@REALLYSTATIC_FALSE@AM_LIBS = $(top_builddir)/libntfs-3g/libntfs-3g.la
+@REALLYSTATIC_FALSE@AM_LIBS = -lntfs-3g
@REALLYSTATIC_TRUE@AM_LIBS = $(top_builddir)/libntfs-3g/.libs/libntfs-3g.a $(NTFSPROGS_STATIC_LIBS)
@REALLYSTATIC_FALSE@AM_LFLAGS = $(all_libraries)
# older builds may need -static instead of newer -all-static
@@ -1104,7 +1103,6 @@ install-dvi-am:
install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-am
install-html-am:

55
filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c Normal file
View File

@@ -0,0 +1,55 @@
$NetBSD: patch-ntfsprogs_ntfsclone.c,v 1.1 2014/05/19 12:22:06 adam Exp $
--- ntfsprogs/ntfsclone.c.orig 2014-02-15 14:07:52.000000000 +0000
+++ ntfsprogs/ntfsclone.c
@@ -68,6 +68,19 @@
*/
#define NTFS_DO_NOT_CHECK_ENDIANS
+#ifdef __NetBSD__
+# include <sys/param.h>
+ /* NetBSD versions later than 2.99.9 have statvfs(2) instead of statfs(2) */
+# if __NetBSD_Version__ >= 299000900
+# include <sys/statvfs.h>
+# define F_TYPE f_fsid
+# else
+# define F_TYPE f_type
+# endif
+#else
+# define F_TYPE f_type
+#endif
+
#include "debug.h"
#include "types.h"
#include "support.h"
@@ -161,8 +174,12 @@ static struct {
char *output;
char *volume;
#ifndef NO_STATFS
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
+ struct statvfs stfs;
+#else
struct statfs stfs;
#endif
+#endif
} opt;
struct bitmap {
@@ -818,7 +835,7 @@ static void copy_cluster(int rescue, u64
#ifndef NO_STATFS
int err = errno;
perr_printf("Write failed");
- if (err == EIO && opt.stfs.f_type == 0x517b)
+ if (err == EIO && opt.stfs.F_TYPE == 0x517b)
Printf("Apparently you tried to clone to a remote "
"Windows computer but they don't\nhave "
"efficient sparse file handling by default. "
@@ -2238,7 +2255,7 @@ static void set_filesize(s64 filesize)
Printf("WARNING: Couldn't get filesystem type: "
"%s\n", strerror(errno));
else
- fs_type = opt.stfs.f_type;
+ fs_type = opt.stfs.F_TYPE;
if (fs_type == 0x52654973)
Printf("WARNING: You're using ReiserFS, it has very poor "

114
filesystems/libntfs/patches/patch-src_Makefile.in Normal file
View File

@@ -0,0 +1,114 @@
$NetBSD: patch-src_Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
Link against already built and installed libntfs.
Install binaries into PREFIX, not the root directory.
--- src/Makefile.in.orig 2014-02-15 14:08:01.000000000 +0000
+++ src/Makefile.in
@@ -68,8 +68,7 @@ lowntfs_3g_OBJECTS = $(am_lowntfs_3g_OBJ
am__DEPENDENCIES_1 =
@FUSE_INTERNAL_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@FUSE_INTERNAL_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/libfuse-lite/libfuse-lite.la
-@ENABLE_NTFS_3G_TRUE@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
+@ENABLE_NTFS_3G_TRUE@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2)
lowntfs_3g_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lowntfs_3g_CFLAGS) \
$(CFLAGS) $(lowntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
@@ -77,8 +76,7 @@ am__ntfs_3g_SOURCES_DIST = ntfs-3g.c ntf
@ENABLE_NTFS_3G_TRUE@am_ntfs_3g_OBJECTS = ntfs_3g-ntfs-3g.$(OBJEXT) \
@ENABLE_NTFS_3G_TRUE@ ntfs_3g-ntfs-3g_common.$(OBJEXT)
ntfs_3g_OBJECTS = $(am_ntfs_3g_OBJECTS)
-@ENABLE_NTFS_3G_TRUE@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
+@ENABLE_NTFS_3G_TRUE@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2)
ntfs_3g_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(ntfs_3g_CFLAGS) $(CFLAGS) \
$(ntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
@@ -86,8 +84,7 @@ am__ntfs_3g_probe_SOURCES_DIST = ntfs-3g
@ENABLE_NTFS_3G_TRUE@am_ntfs_3g_probe_OBJECTS = \
@ENABLE_NTFS_3G_TRUE@ ntfs_3g_probe-ntfs-3g.probe.$(OBJEXT)
ntfs_3g_probe_OBJECTS = $(am_ntfs_3g_probe_OBJECTS)
-@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_DEPENDENCIES = \
-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
+@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_DEPENDENCIES =
ntfs_3g_probe_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_probe_CFLAGS) \
$(CFLAGS) $(ntfs_3g_probe_LDFLAGS) $(LDFLAGS) -o $@
@@ -95,8 +92,7 @@ am__ntfs_3g_secaudit_SOURCES_DIST = seca
@ENABLE_NTFS_3G_TRUE@am_ntfs_3g_secaudit_OBJECTS = \
@ENABLE_NTFS_3G_TRUE@ ntfs_3g_secaudit-secaudit.$(OBJEXT)
ntfs_3g_secaudit_OBJECTS = $(am_ntfs_3g_secaudit_OBJECTS)
-@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_DEPENDENCIES = \
-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
+@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_DEPENDENCIES =
ntfs_3g_secaudit_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_secaudit_CFLAGS) \
$(CFLAGS) $(ntfs_3g_secaudit_LDFLAGS) $(LDFLAGS) -o $@
@@ -104,8 +100,7 @@ am__ntfs_3g_usermap_SOURCES_DIST = userm
@ENABLE_NTFS_3G_TRUE@am_ntfs_3g_usermap_OBJECTS = \
@ENABLE_NTFS_3G_TRUE@ ntfs_3g_usermap-usermap.$(OBJEXT)
ntfs_3g_usermap_OBJECTS = $(am_ntfs_3g_usermap_OBJECTS)
-@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_DEPENDENCIES = \
-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
+@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_DEPENDENCIES =
ntfs_3g_usermap_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_usermap_CFLAGS) \
$(CFLAGS) $(ntfs_3g_usermap_LDFLAGS) $(LDFLAGS) -o $@
@@ -287,9 +282,9 @@ pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-rootbindir = @rootbindir@
-rootlibdir = @rootlibdir@
-rootsbindir = @rootsbindir@
+rootbindir = @bindir@
+rootlibdir = @libdir@
+rootsbindir = @sbindir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -313,7 +308,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
@ENABLE_NTFS_3G_TRUE@ ntfs-3g.usermap.8 \
@ENABLE_NTFS_3G_TRUE@ ntfs-3g.secaudit.8
-@ENABLE_NTFS_3G_TRUE@ntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la
+@ENABLE_NTFS_3G_TRUE@ntfs_3g_LDADD = $(FUSE_LIBS) -lntfs-3g
@ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static
@ENABLE_NTFS_3G_TRUE@ntfs_3g_CFLAGS = \
@ENABLE_NTFS_3G_TRUE@ $(AM_CFLAGS) \
@@ -322,7 +317,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
@ENABLE_NTFS_3G_TRUE@ -I$(top_srcdir)/include/ntfs-3g
@ENABLE_NTFS_3G_TRUE@ntfs_3g_SOURCES = ntfs-3g.c ntfs-3g_common.c
-@ENABLE_NTFS_3G_TRUE@lowntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la
+@ENABLE_NTFS_3G_TRUE@lowntfs_3g_LDADD = $(FUSE_LIBS) -lntfs-3g
@ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@lowntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static
@ENABLE_NTFS_3G_TRUE@lowntfs_3g_CFLAGS = \
@ENABLE_NTFS_3G_TRUE@ $(AM_CFLAGS) \
@@ -331,9 +326,9 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
@ENABLE_NTFS_3G_TRUE@ -I$(top_srcdir)/include/ntfs-3g
@ENABLE_NTFS_3G_TRUE@lowntfs_3g_SOURCES = lowntfs-3g.c ntfs-3g_common.c
-@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
-@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
-@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
+@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_LDADD = -lntfs-3g
+@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_LDADD = -lntfs-3g
+@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_LDADD = -lntfs-3g
@ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static
@ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_usermap_LDFLAGS = $(AM_LDFLAGS) -all-static
@ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_secaudit_LDFLAGS = $(AM_LDFLAGS) -all-static
@@ -921,9 +916,9 @@ uninstall-man: uninstall-man8
@ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@ $(LDCONFIG)
@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local: install-rootbinPROGRAMS
-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(MKDIR_P) "$(DESTDIR)/sbin"
-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
+@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(MKDIR_P) "$(DESTDIR)/$(sbindir)"
+@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/$(sbindir)/mount.ntfs-3g"
+@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/$(sbindir)/mount.lowntfs-3g"
@ENABLE_NTFS_3G_TRUE@install-data-local: install-man8
@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"

4
filesystems/openafs-devel/DESCR
View File

@@ -12,5 +12,5 @@ To build the kernel module
$ cp MakefileProto.NBSD Makefile
$ make obj && make && make install
For instructions how to create a cell:
http://wiki.openafs.org/AFSLore/FedoraAFSInstall/
The OpenAFS Quick-Start Guide for UNIX can be found at:
http://docs.openafs.org/QuickStartUnix/index.html

6
filesystems/openafs/Makefile
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.6 2014/02/21 21:33:51 gendalia Exp $
# $NetBSD: Makefile,v 1.8 2014/06/12 23:44:04 gendalia Exp $
DISTNAME= openafs-1.6.6-src
DISTNAME= openafs-1.6.9-src
PKGNAME= ${DISTNAME:C/-src//}
CATEGORIES= filesystems net sysutils
MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.6/
MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.9/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= gendalia@NetBSD.org

8
filesystems/openafs/distinfo
View File

@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.6 2014/02/21 21:33:51 gendalia Exp $
$NetBSD: distinfo,v 1.8 2014/06/12 23:44:04 gendalia Exp $
SHA1 (openafs-1.6.6-src.tar.bz2) = 819abbb4d639f8f671837e258314710b548bf21d
RMD160 (openafs-1.6.6-src.tar.bz2) = ee51e249021acf9d19ca0053ff9d7f83019862cb
Size (openafs-1.6.6-src.tar.bz2) = 14582006 bytes
SHA1 (openafs-1.6.9-src.tar.bz2) = 563368f33552cd1cfd1711676aea0e2f1cf2fd1b
RMD160 (openafs-1.6.9-src.tar.bz2) = 03a6f5dcd704c7c840839cee426a048160d7e206
Size (openafs-1.6.9-src.tar.bz2) = 14598147 bytes
SHA1 (patch-src_comerr_Makefile.in) = dd5e996481d7ef908710868aa9dc1b65feb98717

8
filesystems/ori/distinfo
View File

@@ -1,5 +1,11 @@
$NetBSD: distinfo,v 1.1 2014/02/17 10:36:51 wiz Exp $
$NetBSD: distinfo,v 1.2 2015/03/18 10:26:53 joerg Exp $
SHA1 (ori-0.8.1.tar.xz) = 4362159f6e24781724122d2927a2d45389b8b65d
RMD160 (ori-0.8.1.tar.xz) = 03378e5d63059562d5a82314981b410c073077fd
Size (ori-0.8.1.tar.xz) = 296216 bytes
SHA1 (patch-ori_SConscript) = e2eba2c01f2b6d4b7f3edea5eafc39656e047894
SHA1 (patch-ori__httpd_SConscript) = 8b8ba3a1545a87e9a3c150fec8c1e7c271cc8603
SHA1 (patch-oridbg_SConscript) = 36e6c4a8c08315412bdac2fa7a50113f216949ad
SHA1 (patch-orilocal_SConscript) = be9cfffc40c5591831129dfa392849d376bd95a1
SHA1 (patch-oris3_SConscript) = c4f908ecac6ad86a5767e8a1f117a97ed01d96f6
SHA1 (patch-orisync_SConscript) = 4e12bce34f0f7d7827f47278a344645f42fa26fc

14
filesystems/ori/patches/patch-ori_SConscript Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-ori_SConscript,v 1.1 2015/03/18 10:26:53 joerg Exp $
--- ori/SConscript.orig 2015-03-18 00:34:23.000000000 +0000
+++ ori/SConscript
@@ -41,9 +41,6 @@ src = [
libs = [
"crypto",
- "stdc++",
- "event_core",
- "event_extra",
]
if sys.platform != "darwin":

14
filesystems/ori/patches/patch-ori__httpd_SConscript Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-ori__httpd_SConscript,v 1.1 2015/03/18 10:26:53 joerg Exp $
--- ori_httpd/SConscript.orig 2015-03-18 00:34:25.000000000 +0000
+++ ori_httpd/SConscript
@@ -8,9 +8,6 @@ src = [
libs = [
"crypto",
- "stdc++",
- "event_core",
- "event_extra",
]
if sys.platform == "darwin":

14
filesystems/ori/patches/patch-oridbg_SConscript Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-oridbg_SConscript,v 1.1 2015/03/18 10:26:53 joerg Exp $
--- oridbg/SConscript.orig 2015-03-18 00:34:27.000000000 +0000
+++ oridbg/SConscript
@@ -40,9 +40,6 @@ src = [
libs = [
"crypto",
- "stdc++",
- "event_core",
- "event_extra",
]
if sys.platform != "darwin":

14
filesystems/ori/patches/patch-orilocal_SConscript Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-orilocal_SConscript,v 1.1 2015/03/18 10:26:53 joerg Exp $
--- orilocal/SConscript.orig 2015-03-18 00:34:30.000000000 +0000
+++ orilocal/SConscript
@@ -40,9 +40,6 @@ src = [
libs = [
"crypto",
- "stdc++",
- "event_core",
- "event_extra",
]
if sys.platform != "darwin":

14
filesystems/ori/patches/patch-oris3_SConscript Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-oris3_SConscript,v 1.1 2015/03/18 10:26:53 joerg Exp $
--- oris3/SConscript.orig 2015-03-18 00:34:32.000000000 +0000
+++ oris3/SConscript
@@ -9,9 +9,6 @@ src = [
libs = [
"crypto",
- "stdc++",
- "event_core",
- "event_extra",
"libs3",
"libxml2",
"curl",

14
filesystems/ori/patches/patch-orisync_SConscript Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-orisync_SConscript,v 1.1 2015/03/18 10:26:53 joerg Exp $
--- orisync/SConscript.orig 2015-03-18 00:34:37.000000000 +0000
+++ orisync/SConscript
@@ -23,9 +23,6 @@ libs = [
"ori",
"fastlz",
"crypto",
- "stdc++",
- "event_core",
- "event_extra",
]
if sys.platform != "darwin":

9
filesystems/p5-Module-Path/Makefile
View File

@@ -1,20 +1,17 @@
# $NetBSD: Makefile,v 1.1 2013/07/03 15:06:36 sno Exp $
#
# $NetBSD: Makefile,v 1.6 2015/02/18 12:19:18 mef Exp $
DISTNAME= Module-Path-0.09
DISTNAME= Module-Path-0.18
PKGNAME= p5-${DISTNAME}
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Module/}
MAINTAINER= pkgsrc-p5-people@NetBSD.org
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Module-Path/
COMMENT= Perl5 module to get the full path to a locally installed module
LICENSE= ${PERL5_LICENSE}
REPLACE_PERL+= bin/mpath
PKG_INSTALLATION_TYPES= overwrite pkgviews
PERL5_PACKLIST= auto/Module/Path/.packlist
BUILD_DEPENDS+= p5-Devel-FindPerl-[0-9]*:../../devel/p5-Devel-FindPerl

8
filesystems/p5-Module-Path/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.1 2013/07/03 15:06:36 sno Exp $
$NetBSD: distinfo,v 1.3 2015/02/18 12:19:18 mef Exp $
SHA1 (Module-Path-0.09.tar.gz) = 860723625e9d90b7b17857920d5b1046976d97f1
RMD160 (Module-Path-0.09.tar.gz) = f643de4b9fd0b389cf231fefa7188da5785aa690
Size (Module-Path-0.09.tar.gz) = 11423 bytes
SHA1 (Module-Path-0.18.tar.gz) = 85db98ba3f9741c75be1ae467c98811ddc2d56b2
RMD160 (Module-Path-0.18.tar.gz) = f87838c78f546e9e800c6d0132149a6c059c8013
Size (Module-Path-0.18.tar.gz) = 13877 bytes

4
filesystems/p5-MooseX-Types-Path-Tiny/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.1 2013/07/03 15:39:48 sno Exp $
# $NetBSD: Makefile,v 1.3 2015/02/18 12:23:24 mef Exp $
#
DISTNAME= MooseX-Types-Path-Tiny-0.006
DISTNAME= MooseX-Types-Path-Tiny-0.011
PKGNAME= p5-${DISTNAME}
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MooseX/}

8
filesystems/p5-MooseX-Types-Path-Tiny/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.1 2013/07/03 15:39:48 sno Exp $
$NetBSD: distinfo,v 1.2 2015/02/18 12:23:24 mef Exp $
SHA1 (MooseX-Types-Path-Tiny-0.006.tar.gz) = 84bff811e0c64ae7e0e937d07cc0bdbb129baf10
RMD160 (MooseX-Types-Path-Tiny-0.006.tar.gz) = b76cb14705d715ac1cc63428ce9c595211815624
Size (MooseX-Types-Path-Tiny-0.006.tar.gz) = 15906 bytes
SHA1 (MooseX-Types-Path-Tiny-0.011.tar.gz) = 066282ce0d78a9f6c298053ce92205aa4384a3f4
RMD160 (MooseX-Types-Path-Tiny-0.011.tar.gz) = e12b805d14bf5e8d1fcf9807fa44ac207e14b524
Size (MooseX-Types-Path-Tiny-0.011.tar.gz) = 25140 bytes

9
filesystems/p5-Path-Tiny/Makefile
View File

@@ -1,18 +1,15 @@
# $NetBSD: Makefile,v 1.6 2014/01/12 10:20:12 wen Exp $
#
# $NetBSD: Makefile,v 1.11 2015/02/18 12:25:47 mef Exp $
DISTNAME= Path-Tiny-0.051
DISTNAME= Path-Tiny-0.061
PKGNAME= p5-${DISTNAME}
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DA/DAGOLDEN/}
MAINTAINER= pkgsrc-p5-people@NetBSD.org
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Path-Tiny/
COMMENT= Perl5 file path utility
LICENSE= apache-2.0
PKG_INSTALLATION_TYPES= overwrite pkgviews
PERL5_PACKLIST= auto/Path/Tiny/.packlist
DEPENDS+= {perl>=5.18.0,p5-PathTools>=3.40}:../../devel/p5-PathTools

8
filesystems/p5-Path-Tiny/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.6 2014/01/12 10:20:12 wen Exp $
$NetBSD: distinfo,v 1.8 2015/02/18 12:25:47 mef Exp $
SHA1 (Path-Tiny-0.051.tar.gz) = 9eadcc9437f2c207a37a74e9680531d9091fbbb1
RMD160 (Path-Tiny-0.051.tar.gz) = f7e325b711243248708f7e6c5518546ec1ac8b64
Size (Path-Tiny-0.051.tar.gz) = 51376 bytes
SHA1 (Path-Tiny-0.061.tar.gz) = 914a866c085f57c2874e2cde69a0c72ea8bdf10e
RMD160 (Path-Tiny-0.061.tar.gz) = 50e1e640a26594c2ad6f7ffdee4e1eabe5cd1ab1
Size (Path-Tiny-0.061.tar.gz) = 71937 bytes

4
filesystems/py-filesystem/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:07 wiz Exp $
# $NetBSD: Makefile,v 1.9 2014/05/09 07:37:05 wiz Exp $
VERSION= 0.4.0
DISTNAME= fs-${VERSION}
@@ -15,7 +15,7 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
PYTHON_SELF_CONFLICT= yes
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4.0
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 0.4.0
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"

5
filesystems/py-fuse-bindings/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:07 wiz Exp $
# $NetBSD: Makefile,v 1.11 2014/12/31 13:57:27 wiz Exp $
VERSION= 0.2.1
DISTNAME= fuse-python-${VERSION}
@@ -11,12 +11,11 @@ HOMEPAGE= http://sourceforge.net/apps/mediawiki/fuse/index.php?title=FusePython
COMMENT= Python bindings for FUSE and refuse
LICENSE= gnu-lgpl-v2.1
EGG_NAME= fuse_python-${VERSION}
PYDISTUTILSPKG= yes
PY_PATCHLIST= yes
USE_TOOLS+= pkg-config
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.1
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 0.2.1
INSTALLATION_DIRS= share/examples/fuse-python

5
filesystems/tahoe-lafs/Makefile
View File

@@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.21 2014/01/27 18:41:12 wiz Exp $
# $NetBSD: Makefile,v 1.23 2014/12/31 13:57:27 wiz Exp $
VERSION= 1.10.0
PKGREVISION= 2
DISTNAME= allmydata-tahoe-${VERSION}
EGG_NAME= allmydata_tahoe-${VERSION}
PKGNAME= tahoe-lafs-${VERSION}
CATEGORIES= filesystems
MASTER_SITES= https://tahoe-lafs.org/source/tahoe-lafs/releases/
@@ -44,7 +43,7 @@ DEPENDS+= ${PYPKGPREFIX}-cryptopp-[0-9]*:../../security/py-cryptopp
DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
DEPENDS+= ${PYPKGPREFIX}-nevow-[0-9]*:../../www/py-nevow
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted, py-xml via py-nevow, py-zbase32, py-cryptopp
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-twisted, py-xml via py-nevow, py-zbase32, py-cryptopp
# Note that there is an upstream (inherited from setuptools) bug
# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that