diff options
author | agc <agc@pkgsrc.org> | 2004-09-10 10:41:59 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2004-09-10 10:41:59 +0000 |
commit | 753fad1fe4e1ee4ed8113051a7e06f27e313234d (patch) | |
tree | f1a179d51f0c3291c15f5439eaece1f30ba4fa59 /mail/yatsvrs | |
parent | 8f4fc4cf744d96f3232a8f99cca6eada22cbfc7c (diff) | |
download | pkgsrc-753fad1fe4e1ee4ed8113051a7e06f27e313234d.tar.gz |
Make this package a bit more statvfs-friendly, enables build on
NetBSD-current systems.
Diffstat (limited to 'mail/yatsvrs')
-rw-r--r-- | mail/yatsvrs/distinfo | 4 | ||||
-rw-r--r-- | mail/yatsvrs/patches/patch-as | 31 |
2 files changed, 23 insertions, 12 deletions
diff --git a/mail/yatsvrs/distinfo b/mail/yatsvrs/distinfo index 6ef1b4c6fa5..435fe27b98e 100644 --- a/mail/yatsvrs/distinfo +++ b/mail/yatsvrs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2003/11/13 07:02:39 taca Exp $ +$NetBSD: distinfo,v 1.6 2004/09/10 10:41:59 agc Exp $ SHA1 (yatsvrs-5.00p6.tar.gz) = be94b29c8631acc1d7b3c4313501b6d674e6b43f Size (yatsvrs-5.00p6.tar.gz) = 210067 bytes @@ -18,7 +18,7 @@ SHA1 (patch-ao) = f697fe18121dcee1a279b5e4e8d318789cef8211 SHA1 (patch-ap) = f42ade29527d1910f271c10797f6bd8d9f3710cc SHA1 (patch-aq) = a09b4f8869e2231b3715155b85b690901926a4e5 SHA1 (patch-ar) = 8f26f7a180790070e1137c9840c1e0edcfc02a66 -SHA1 (patch-as) = f02a1402188c9def494dbea60b874bfdd04a7c50 +SHA1 (patch-as) = e6c5d58794a283a285bb54d1792ccb2b84bb9495 SHA1 (patch-at) = cecd3a6c32e225cb55046dee951bd0b09660fdc7 SHA1 (patch-au) = 63aa76a7a9c55c9877fe2a336903828d193c3658 SHA1 (patch-av) = 4c87a76438f97fcafa29083c37d3a225bd219cc2 diff --git a/mail/yatsvrs/patches/patch-as b/mail/yatsvrs/patches/patch-as index 5d1d5a389fe..c599a4523b9 100644 --- a/mail/yatsvrs/patches/patch-as +++ b/mail/yatsvrs/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ +$NetBSD: patch-as,v 1.3 2004/09/10 10:42:00 agc Exp $ --- yatd/dfree.c.orig 2001-07-09 12:32:52.000000000 +0900 +++ yatd/dfree.c -@@ -72,12 +72,6 @@ quota_get_inode_current __P(( struct dqb +@@ -72,12 +72,6 @@ #define DEBUG_LOCAL @@ -15,7 +15,7 @@ $NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ int DFreeCheck(pPath, pSizFree, pNodFree) char * pPath; /* ユーザーのホームディレクトリの位置 */ OFF_T * pSizFree; /* 空きブロック数 */ -@@ -99,7 +93,7 @@ int DFreeCheck(pPath, pSizFree, pNodFree +@@ -99,7 +93,7 @@ nodLimit = *pNodFree; /* リミットのノード数を指定する */ #ifdef DEBUG_LOCAL @@ -24,15 +24,22 @@ $NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ sizLimit, nodLimit, sizeof (OFF_T)); #endif /* DEBUG_LOCAL */ -@@ -123,22 +117,21 @@ int DFreeCheck(pPath, pSizFree, pNodFree +@@ -122,23 +116,30 @@ + #ifdef DEBUG_LOCAL # ifdef BSD44 LogDEBUG("statfs() returns:"); ++# ifdef HAVE_STATVFS ++ LogDEBUG(" flags: 0x%lx", statfsBuf.f_flag); ++# else LogDEBUG(" type: %d", statfsBuf.f_type); - LogDEBUG(" flags: 0x%x", statfsBuf.f_flags); +-# ifdef __NetBSD__ + LogDEBUG(" flags: 0x%lx", statfsBuf.f_flags); - # ifdef __NetBSD__ ++# ifdef __NetBSD__ LogDEBUG(" oflags: 0x%x", statfsBuf.f_oflags); - # endif +-# endif ++# endif /* __NetBSD__ */ ++# endif /* HAVE_STATVFS */ # ifdef BSDOS1 LogDEBUG(" fsize: %d", statfsBuf.f_fsize); # endif @@ -52,11 +59,15 @@ $NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ + LogDEBUG(" bavail: %ld", statfsBuf.f_bavail); + LogDEBUG(" files: %ld", statfsBuf.f_files); + LogDEBUG(" ffree: %ld", statfsBuf.f_ffree); ++# ifdef HAVE_STATVFS ++ LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsidx.__fsid_val[0], statfsBuf.f_fsidx.__fsid_val[1]); ++# else + LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsid.val[0], statfsBuf.f_fsid.val[1]); ++# endif /* HAVE_STATVFS */ #ifdef STRUCT_STATFS_HAVE_F_FSTYPENAME LogDEBUG(" fstypename: %.256s", statfsBuf.f_fstypename); #endif -@@ -311,7 +304,7 @@ int FuncDFree() +@@ -311,7 +312,7 @@ nodFree = SysData.nodLimitFree; #ifdef DEBUG_LOCAL @@ -65,7 +76,7 @@ $NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ sizFree, nodFree); #endif -@@ -325,7 +318,7 @@ int FuncDFree() +@@ -325,7 +326,7 @@ if (DFreeCheck(SysData.szUserFldrDir, &sizFree, &nodFree)){ return FAILURE; } @@ -74,7 +85,7 @@ $NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ #endif /* DONT_CHECKDFREE */ return SUCCESS; } -@@ -427,7 +420,7 @@ static inline quota_size_t quota_get_ino +@@ -427,7 +428,7 @@ #ifdef STRUCT_DQBLK_CURRENT_FILES retval = (quota_size_t)quota_block->dqb_curfiles; @@ -83,7 +94,7 @@ $NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ return retval; } -@@ -449,12 +442,12 @@ static int quotactl_wrapper(pPath,quota_ +@@ -449,12 +450,12 @@ switch( status ){ case SUCCESS: LogDEBUG("quotactl() returns:"); |