diff options
author | bouyer <bouyer@pkgsrc.org> | 2011-03-26 18:45:51 +0000 |
---|---|---|
committer | bouyer <bouyer@pkgsrc.org> | 2011-03-26 18:45:51 +0000 |
commit | f334c0872fc77afb62be16765fe12e280124dfd2 (patch) | |
tree | c552bc66173bf2ea21d9251a46fa4c7bafab4eec /net | |
parent | 146edf8bd050e2ae898a8a9d50837aa2f5ff787d (diff) | |
download | pkgsrc-f334c0872fc77afb62be16765fe12e280124dfd2.tar.gz |
Add CVS Id where missing
Fix patch to quota-check.m4 so that the autoconf'ed configure will
define HAVE_LIBQUOTA too
Use QL_STATUS(quota_check_limit()) instead of quota_check_limit(). This is
the only visible change in binaries.
Do not bump PKGREVISION as the previous code has been there for only a few
hours.
Diffstat (limited to 'net')
-rw-r--r-- | net/netatalk/distinfo | 10 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ar | 7 | ||||
-rw-r--r-- | net/netatalk/patches/patch-as | 2 | ||||
-rw-r--r-- | net/netatalk/patches/patch-at | 6 | ||||
-rw-r--r-- | net/netatalk/patches/patch-au | 2 |
5 files changed, 17 insertions, 10 deletions
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo index 5da879f1cc0..29aee11e425 100644 --- a/net/netatalk/distinfo +++ b/net/netatalk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2011/03/26 13:46:19 bouyer Exp $ +$NetBSD: distinfo,v 1.38 2011/03/26 18:45:51 bouyer Exp $ SHA1 (netatalk-2.1.5.tar.bz2) = 689856ed96ccf34f2f7b83d70c97d30213638a70 RMD160 (netatalk-2.1.5.tar.bz2) = 9265b34f303a21b89c78401c24ed464c61041ff3 @@ -16,8 +16,8 @@ SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4 SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9 SHA1 (patch-ap) = 642051a6b4ab5336c334ef00b19d1e0091e33f06 SHA1 (patch-aq) = 15eea1ce4d9721cfa29959990ee014f623f816a0 -SHA1 (patch-ar) = 6e6bbdd8a50ba1456787be6a5df621f2f94c1939 -SHA1 (patch-as) = b1cd57bd2564493d1bd5032735c253ae5dfdaa68 -SHA1 (patch-at) = 8a61cb4d3dbbc8dbf62017949dc9fa3afb9f44aa -SHA1 (patch-au) = b7b9409afee8ad3c723f0073ea4eed178e6b5155 +SHA1 (patch-ar) = 42e58ab5b4fb4f79b6dfbc6f0f56e4f00821739c +SHA1 (patch-as) = db1b120beb2311959b9d012a3d2e13231f59f137 +SHA1 (patch-at) = 02946db1ffc6eccc1f7925461c39000c0d0845f2 +SHA1 (patch-au) = cff38d7d61af4ee260cead2c741f6aae07be3ddd SHA1 (patch-bj) = e1e0fc2be101554a2e0d53c24d113b593556eb41 diff --git a/net/netatalk/patches/patch-ar b/net/netatalk/patches/patch-ar index 25945ccd4cd..b74be161035 100644 --- a/net/netatalk/patches/patch-ar +++ b/net/netatalk/patches/patch-ar @@ -1,12 +1,13 @@ -$NetBSD: patch-ar,v 1.4 2011/03/26 13:46:19 bouyer Exp $ +$NetBSD: patch-ar,v 1.5 2011/03/26 18:45:52 bouyer Exp $ --- macros/quota-check.m4.orig 2011-03-23 21:42:43.000000000 +0100 +++ macros/quota-check.m4 2011-03-23 21:44:10.000000000 +0100 -@@ -15,6 +15,7 @@ +@@ -15,6 +15,8 @@ netatalk_cv_quotasupport="no" AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled]) ]) -+ AC_CHECK_LIB(quota, getfsquota, [QUOTA_LIBS="-lquota -lprop -lrpcsvc"], [], [-lprop -lrpcsvc]) ++ AC_CHECK_LIB(quota, getfsquota, [QUOTA_LIBS="-lquota -lprop -lrpcsvc" ++ AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lprop -lrpcsvc]) else netatalk_cv_quotasupport="no" AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled]) diff --git a/net/netatalk/patches/patch-as b/net/netatalk/patches/patch-as index 3c4b4784840..80ffc282e14 100644 --- a/net/netatalk/patches/patch-as +++ b/net/netatalk/patches/patch-as @@ -1,3 +1,5 @@ +$NetBSD: patch-as,v 1.5 2011/03/26 18:45:52 bouyer Exp $ + --- etc/afpd/nfsquota.c.orig 2010-06-29 17:30:04.000000000 +0200 +++ etc/afpd/nfsquota.c 2011-03-24 15:42:56.000000000 +0100 @@ -18,7 +18,7 @@ diff --git a/net/netatalk/patches/patch-at b/net/netatalk/patches/patch-at index c53801066de..c8e21fb5e8f 100644 --- a/net/netatalk/patches/patch-at +++ b/net/netatalk/patches/patch-at @@ -1,3 +1,5 @@ +$NetBSD: patch-at,v 1.5 2011/03/26 18:45:52 bouyer Exp $ + --- etc/afpd/quota.c.orig 2011-03-24 15:43:48.000000000 +0100 +++ etc/afpd/quota.c 2011-03-24 17:56:34.000000000 +0100 @@ -47,6 +47,96 @@ @@ -34,10 +36,10 @@ + if (retq < 1) + return retq; + -+ switch(quota_check_limit(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_cur, 1, ++ switch(QL_STATUS(quota_check_limit(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_cur, 1, + ufsq[QUOTA_LIMIT_BLOCK].ufsqe_softlimit, + ufsq[QUOTA_LIMIT_BLOCK].ufsqe_hardlimit, -+ ufsq[QUOTA_LIMIT_BLOCK].ufsqe_time, now)) { ++ ufsq[QUOTA_LIMIT_BLOCK].ufsqe_time, now))) { + case QL_S_DENY_HARD: + case QL_S_DENY_GRACE: + *bfree = 0; diff --git a/net/netatalk/patches/patch-au b/net/netatalk/patches/patch-au index bbb18233f23..34416c27187 100644 --- a/net/netatalk/patches/patch-au +++ b/net/netatalk/patches/patch-au @@ -1,3 +1,5 @@ +$NetBSD: patch-au,v 1.5 2011/03/26 18:45:53 bouyer Exp $ + --- etc/afpd/unix.h.orig 2011-03-24 16:40:15.000000000 +0100 +++ etc/afpd/unix.h 2011-03-24 16:43:15.000000000 +0100 @@ -59,6 +59,7 @@ |