diff options
author | joerg <joerg> | 2006-09-22 18:58:59 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-09-22 18:58:59 +0000 |
commit | db838c5722aa0b6cd1b30cbeaf865676817b6c54 (patch) | |
tree | ee4e1a52d312c6b3329584e0abf1bd588689f5d5 /mail/yatsvrs | |
parent | 0d08d23e4f3b363ed8356648273f98f8caa9237b (diff) | |
download | pkgsrc-db838c5722aa0b6cd1b30cbeaf865676817b6c54.tar.gz |
Fix build on DragonFly 1.6+.
Diffstat (limited to 'mail/yatsvrs')
-rw-r--r-- | mail/yatsvrs/distinfo | 4 | ||||
-rw-r--r-- | mail/yatsvrs/patches/patch-as | 32 |
2 files changed, 25 insertions, 11 deletions
diff --git a/mail/yatsvrs/distinfo b/mail/yatsvrs/distinfo index ab03fde3639..11a270f2c85 100644 --- a/mail/yatsvrs/distinfo +++ b/mail/yatsvrs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2006/02/24 19:12:18 joerg Exp $ +$NetBSD: distinfo,v 1.12 2006/09/22 18:58:59 joerg Exp $ SHA1 (yatsvrs-5.00p6.tar.gz) = be94b29c8631acc1d7b3c4313501b6d674e6b43f RMD160 (yatsvrs-5.00p6.tar.gz) = 9920ac63a2477100ddc54196c76d6d700b144642 @@ -20,7 +20,7 @@ SHA1 (patch-ao) = f697fe18121dcee1a279b5e4e8d318789cef8211 SHA1 (patch-ap) = f42ade29527d1910f271c10797f6bd8d9f3710cc SHA1 (patch-aq) = ea2d7d2f21ebe3aea163d6de0a95060be2ecc381 SHA1 (patch-ar) = 8f26f7a180790070e1137c9840c1e0edcfc02a66 -SHA1 (patch-as) = a91b38a9267f0aca96a644dbe9c16f124b5ddee8 +SHA1 (patch-as) = 5156e666d446cecf582aab900f911e568f7e8d8a SHA1 (patch-at) = 73704aa7d506c5a97f4fef3cc03e6ac8e983497e SHA1 (patch-au) = 63aa76a7a9c55c9877fe2a336903828d193c3658 SHA1 (patch-av) = 4c87a76438f97fcafa29083c37d3a225bd219cc2 diff --git a/mail/yatsvrs/patches/patch-as b/mail/yatsvrs/patches/patch-as index da048ee91ca..95a94e81f4c 100644 --- a/mail/yatsvrs/patches/patch-as +++ b/mail/yatsvrs/patches/patch-as @@ -1,8 +1,22 @@ -$NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $ +$NetBSD: patch-as,v 1.5 2006/09/22 18:58:59 joerg Exp $ --- yatd/dfree.c.orig 2001-07-09 03:32:52.000000000 +0000 +++ yatd/dfree.c -@@ -72,12 +72,6 @@ quota_get_inode_current __P(( struct dqb +@@ -39,6 +39,13 @@ typedef u_long quota_size_t; + # include <sys/quota.h> + #endif /* HAVE_SYS_QUOTA_H */ + ++#ifdef __DragonFly__ ++#include <sys/param.h> ++#if __DragonFly_version >= 160000 ++#define dqblk ufs_dqblk ++#endif ++#endif ++ + static int + quotactl_wrapper __P((const char *pPath, struct dqblk *quota_block)); + static int +@@ -72,12 +79,6 @@ quota_get_inode_current __P(( struct dqb #define DEBUG_LOCAL @@ -15,7 +29,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $ int DFreeCheck(pPath, pSizFree, pNodFree) char * pPath; /* ユーザーのホームディレクトリの位置 */ OFF_T * pSizFree; /* 空きブロック数 */ -@@ -99,7 +93,7 @@ int DFreeCheck(pPath, pSizFree, pNodFree +@@ -99,7 +100,7 @@ int DFreeCheck(pPath, pSizFree, pNodFree nodLimit = *pNodFree; /* リミットのノード数を指定する */ #ifdef DEBUG_LOCAL @@ -24,7 +38,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $ sizLimit, nodLimit, sizeof (OFF_T)); #endif /* DEBUG_LOCAL */ -@@ -122,23 +116,30 @@ int DFreeCheck(pPath, pSizFree, pNodFree +@@ -122,23 +123,30 @@ int DFreeCheck(pPath, pSizFree, pNodFree #ifdef DEBUG_LOCAL # ifdef BSD44 LogDEBUG("statfs() returns:"); @@ -67,7 +81,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $ #ifdef STRUCT_STATFS_HAVE_F_FSTYPENAME LogDEBUG(" fstypename: %.256s", statfsBuf.f_fstypename); #endif -@@ -311,7 +312,7 @@ int FuncDFree() +@@ -311,7 +319,7 @@ int FuncDFree() nodFree = SysData.nodLimitFree; #ifdef DEBUG_LOCAL @@ -76,7 +90,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $ sizFree, nodFree); #endif -@@ -325,7 +326,7 @@ int FuncDFree() +@@ -325,7 +333,7 @@ int FuncDFree() if (DFreeCheck(SysData.szUserFldrDir, &sizFree, &nodFree)){ return FAILURE; } @@ -85,7 +99,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $ #endif /* DONT_CHECKDFREE */ return SUCCESS; } -@@ -427,7 +428,7 @@ static inline quota_size_t quota_get_ino +@@ -427,7 +435,7 @@ static inline quota_size_t quota_get_ino #ifdef STRUCT_DQBLK_CURRENT_FILES retval = (quota_size_t)quota_block->dqb_curfiles; @@ -94,7 +108,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $ return retval; } -@@ -449,12 +450,12 @@ static int quotactl_wrapper(pPath,quota_ +@@ -449,12 +457,12 @@ static int quotactl_wrapper(pPath,quota_ switch( status ){ case SUCCESS: LogDEBUG("quotactl() returns:"); @@ -113,7 +127,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $ return SUCCESS; case FAILURE: return FAILURE; -@@ -494,7 +495,7 @@ static int quotactl_systemcall_support( +@@ -494,7 +502,7 @@ static int quotactl_systemcall_support( status = quotactl(QCMD(Q_GETQUOTA, USRQUOTA),SysData.szMntFrom, SysData.pPwd->pw_uid, (caddr_t)quota_block); |