Sun Apr 8 05:11:13 2012 UTC ()
Third time's the charm. I hope. autoconf can bite me.


(dholland)
diff -r1.19 -r1.20 pkgsrc/net/wu-ftpd/distinfo
diff -r1.2 -r1.3 pkgsrc/net/wu-ftpd/patches/patch-ao
diff -r1.2 -r1.3 pkgsrc/net/wu-ftpd/patches/patch-ap
diff -r1.1 -r1.2 pkgsrc/net/wu-ftpd/patches/patch-configure_in
cvs diff -r1.19 -r1.20 pkgsrc/net/wu-ftpd/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/wu-ftpd/Attic/distinfo 2012/04/08 04:49:56 1.19
+++ pkgsrc/net/wu-ftpd/Attic/distinfo 2012/04/08 05:11:13 1.20
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.19 2012/04/08 04:49:56 dholland Exp $ 1$NetBSD: distinfo,v 1.20 2012/04/08 05:11:13 dholland Exp $
2 2
3SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271 3SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271
4RMD160 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 0b7451c185f80cf9a345f97b9642853e0323e3bd 4RMD160 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 0b7451c185f80cf9a345f97b9642853e0323e3bd
5Size (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 354784 bytes 5Size (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 354784 bytes
6SHA1 (wu-ftpd/realpath.patch) = a935197d880ab1ed4320e57e4790811df82e825e 6SHA1 (wu-ftpd/realpath.patch) = a935197d880ab1ed4320e57e4790811df82e825e
7RMD160 (wu-ftpd/realpath.patch) = f96c4c6a8739746ddfe56347dbb10351544a6a2f 7RMD160 (wu-ftpd/realpath.patch) = f96c4c6a8739746ddfe56347dbb10351544a6a2f
8Size (wu-ftpd/realpath.patch) = 533 bytes 8Size (wu-ftpd/realpath.patch) = 533 bytes
9SHA1 (wu-ftpd/connect-dos.patch) = 8d1131ee3d1bdcb780552ea2d32816989793ae0b 9SHA1 (wu-ftpd/connect-dos.patch) = 8d1131ee3d1bdcb780552ea2d32816989793ae0b
10RMD160 (wu-ftpd/connect-dos.patch) = 197994b4af91fd1a6c951b245313598eaa99e398 10RMD160 (wu-ftpd/connect-dos.patch) = 197994b4af91fd1a6c951b245313598eaa99e398
11Size (wu-ftpd/connect-dos.patch) = 2307 bytes 11Size (wu-ftpd/connect-dos.patch) = 2307 bytes
12SHA1 (patch-aa) = 0e11b95eb9ce697d48d3665d3bb5dc903b67d89b 12SHA1 (patch-aa) = 0e11b95eb9ce697d48d3665d3bb5dc903b67d89b
13SHA1 (patch-ab) = cd2f3f74508c2bd379a64b7ddebbd73015be7662 13SHA1 (patch-ab) = cd2f3f74508c2bd379a64b7ddebbd73015be7662
14SHA1 (patch-ac) = b5f6142045bb092e7dc6b1420d17c15d594d9350 14SHA1 (patch-ac) = b5f6142045bb092e7dc6b1420d17c15d594d9350
15SHA1 (patch-ad) = 3aafdad6da3ae50272d78c605f3bc2285b0ea085 15SHA1 (patch-ad) = 3aafdad6da3ae50272d78c605f3bc2285b0ea085
16SHA1 (patch-ae) = 9abb285c65bb3a764a838f22ee9bdc34371265e4 16SHA1 (patch-ae) = 9abb285c65bb3a764a838f22ee9bdc34371265e4
17SHA1 (patch-af) = 6f9fe289ea5af19ba4c85f63109e8e47e5b21bca 17SHA1 (patch-af) = 6f9fe289ea5af19ba4c85f63109e8e47e5b21bca
18SHA1 (patch-ag) = 59cc211f4770e5e447b2cd9ca7bd5ab3dc07fc3d 18SHA1 (patch-ag) = 59cc211f4770e5e447b2cd9ca7bd5ab3dc07fc3d
19SHA1 (patch-ah) = a5305d6b9f8d3e1145e6951eaf37f0cdd5c98edc 19SHA1 (patch-ah) = a5305d6b9f8d3e1145e6951eaf37f0cdd5c98edc
20SHA1 (patch-ai) = c5b95222c0c82ede156b1795153a920546fec345 20SHA1 (patch-ai) = c5b95222c0c82ede156b1795153a920546fec345
21SHA1 (patch-aj) = cce631c7b6c529de803c114e545dfb1f57aea258 21SHA1 (patch-aj) = cce631c7b6c529de803c114e545dfb1f57aea258
22SHA1 (patch-ak) = 8eca121c737498106a5e829cb166746436a87237 22SHA1 (patch-ak) = 8eca121c737498106a5e829cb166746436a87237
23SHA1 (patch-al) = b537901ac9e267a13247547d621215acd6595502 23SHA1 (patch-al) = b537901ac9e267a13247547d621215acd6595502
24SHA1 (patch-am) = 1b1cdf067382fce0cb6aa5e6ff605c15414b26ff 24SHA1 (patch-am) = 1b1cdf067382fce0cb6aa5e6ff605c15414b26ff
25SHA1 (patch-an) = fd1d50bd28b283df717c1ce5fe2f0d6f3eab4967 25SHA1 (patch-an) = fd1d50bd28b283df717c1ce5fe2f0d6f3eab4967
26SHA1 (patch-ao) = aa109f9d17e76207c3cae6dc33584c8b70f5092b 26SHA1 (patch-ao) = d64d90ec6d9b3cea66cdfe82e879c7d314551911
27SHA1 (patch-ap) = 13067ee5edade37774e406918d48adf1b63c8be2 27SHA1 (patch-ap) = 993e4dd93b9ff56aac43d3472bca01ae2f890b26
28SHA1 (patch-configure_in) = 497232480d162f510ef4c2ad1f8cc91416724ffe 28SHA1 (patch-configure_in) = 98cfb7718201651f7c6d7219c997bd853148435a
29SHA1 (patch-src_logwtmp_c) = c52a7950793dfed5a474e0d09a90bfc105a6dd4a 29SHA1 (patch-src_logwtmp_c) = c52a7950793dfed5a474e0d09a90bfc105a6dd4a
cvs diff -r1.2 -r1.3 pkgsrc/net/wu-ftpd/patches/Attic/patch-ao (expand / switch to unified diff)

--- pkgsrc/net/wu-ftpd/patches/Attic/patch-ao 2012/04/08 04:43:51 1.2
+++ pkgsrc/net/wu-ftpd/patches/Attic/patch-ao 2012/04/08 05:11:13 1.3
@@ -1,41 +1,45 @@ @@ -1,41 +1,45 @@
1$NetBSD: patch-ao,v 1.2 2012/04/08 04:43:51 dholland Exp $ 1$NetBSD: patch-ao,v 1.3 2012/04/08 05:11:13 dholland Exp $
2 2
3- support netbsd-6 libquota API 3- support netbsd-6 libquota API
4- support dragonfly quotas 4- support dragonfly quotas
5 5
6caution: the dragonfly patch isn't in the configure.in patch; don't regen 6caution: the dragonfly patch isn't in the configure.in patch; don't regen
7this patch without thinking. 7this patch without thinking.
8 8
9--- configure.orig 2001-11-29 23:54:27.000000000 +0000 9--- configure.orig 2001-11-29 23:54:27.000000000 +0000
10+++ configure 10+++ configure
11@@ -5223,7 +5223,7 @@ EOF 11@@ -5223,7 +5223,7 @@ EOF
12 fi 12 fi
13 if test $quota != no; then 13 if test $quota != no; then
14  14
15-for ac_header in sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h 15-for ac_header in sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h
16+for ac_header in quota.h sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h 16+for ac_header in quota.h sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h
17 do 17 do
18 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 18 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
19 echo "$as_me:5229: checking for $ac_header" >&5 19 echo "$as_me:5229: checking for $ac_header" >&5
20@@ -5271,7 +5271,7 @@ EOF 20@@ -5271,8 +5271,11 @@ EOF
21 fi 21 fi
22 done 22 done
23  23
24- if test $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then 24- if test $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then
25+ if test $ac_cv_header_quota.h = yes -o $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then 25+ if test $ac_cv_header_quota.h = yes -o $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then
26 quota=yes 26 quota=yes
 27+ if test $ac_cv_header_quota_h = yes; then
 28+ LIBS="$LIBS -lquota"
 29+ fi
27 else 30 else
28 if test $quota = yes; then 31 if test $quota = yes; then
29@@ -5333,6 +5333,12 @@ echo $ECHO_N "checking whether quota sup 32 { echo "$as_me:5278: WARNING: QUOTA not supported by OS - disabled" >&5
 33@@ -5333,6 +5336,12 @@ echo $ECHO_N "checking whether quota sup
30 #ifdef HAVE_UFS_UFS_QUOTA_H 34 #ifdef HAVE_UFS_UFS_QUOTA_H
31 #include <ufs/ufs/quota.h> 35 #include <ufs/ufs/quota.h>
32 #endif 36 #endif
33+#if defined(__DragonFly__) 37+#if defined(__DragonFly__)
34+# include <sys/param.h> 38+# include <sys/param.h>
35+# if __DragonFly_version >= 160000 39+# if __DragonFly_version >= 160000
36+# define dqblk ufs_dqblk 40+# define dqblk ufs_dqblk
37+# endif 41+# endif
38+#endif 42+#endif
39 struct dqblk quota; 43 struct dqblk quota;
40 int 44 int
41 main () 45 main ()
cvs diff -r1.2 -r1.3 pkgsrc/net/wu-ftpd/patches/Attic/patch-ap (expand / switch to unified diff)

--- pkgsrc/net/wu-ftpd/patches/Attic/patch-ap 2012/04/08 04:43:51 1.2
+++ pkgsrc/net/wu-ftpd/patches/Attic/patch-ap 2012/04/08 05:11:13 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ap,v 1.2 2012/04/08 04:43:51 dholland Exp $ 1$NetBSD: patch-ap,v 1.3 2012/04/08 05:11:13 dholland Exp $
2 2
3- support netbsd-6 libquota API 3- support netbsd-6 libquota API
4- avoid build failure on netbsd 5.99 proplib quotas 4- avoid build failure on netbsd 5.99 proplib quotas
5- support dragonfly quotas 5- support dragonfly quotas
6 6
7--- src/extensions.c.orig 2000-07-01 18:17:38.000000000 +0000 7--- src/extensions.c.orig 2000-07-01 18:17:38.000000000 +0000
8+++ src/extensions.c 8+++ src/extensions.c
9@@ -55,7 +55,9 @@ 9@@ -55,7 +55,9 @@
10 #include <sys/file.h> 10 #include <sys/file.h>
11 #include <sys/param.h> 11 #include <sys/param.h>
12  12
13-#ifdef HAVE_SYS_FS_UFS_QUOTA_H 13-#ifdef HAVE_SYS_FS_UFS_QUOTA_H
14+#if defined(HAVE_QUOTA_H) 14+#if defined(HAVE_QUOTA_H)
@@ -23,37 +23,38 @@ $NetBSD: patch-ap,v 1.2 2012/04/08 04:43 @@ -23,37 +23,38 @@ $NetBSD: patch-ap,v 1.2 2012/04/08 04:43
23  23
24+#ifdef HAVE_QUOTA_H 24+#ifdef HAVE_QUOTA_H
25+/* NetBSD quota_open() API and library */ 25+/* NetBSD quota_open() API and library */
26+#define HAVE_NETBSD_LIBQUOTA 26+#define HAVE_NETBSD_LIBQUOTA
27+#endif 27+#endif
28+ 28+
29+#if defined(__DragonFly__) && __DragonFly_version >= 160000 29+#if defined(__DragonFly__) && __DragonFly_version >= 160000
30+#define dqblk ufs_dqblk 30+#define dqblk ufs_dqblk
31+#endif 31+#endif
32+ 32+
33 #if defined(HAVE_STATVFS) 33 #if defined(HAVE_STATVFS)
34 #include <sys/statvfs.h> 34 #include <sys/statvfs.h>
35 #elif defined(HAVE_SYS_VFS) 35 #elif defined(HAVE_SYS_VFS)
36@@ -91,8 +102,17 @@ 36@@ -91,8 +102,18 @@
37 #include "support/ftw.h" 37 #include "support/ftw.h"
38 #endif 38 #endif
39  39
40+#if defined(HAVE_UFS_UFS_QUOTA_H) && defined(UFS_QUOTA_ENTRY_NAMES) 40+#if defined(HAVE_UFS_UFS_QUOTA_H) && defined(UFS_QUOTA_ENTRY_NAMES)
41+/* netbsd 5.99 proplib quota interface (march 2011-january 2012) - punt */ 41+/* netbsd 5.99 proplib quota interface (march 2011-january 2012) - punt */
42+#undef QUOTA 42+#undef QUOTA
43+#endif 43+#endif
44+ 44+
45 #ifdef QUOTA 45 #ifdef QUOTA
46+#ifdef HAVE_NETBSD_LIBQUOTA 46+#ifdef HAVE_NETBSD_LIBQUOTA
 47+#undef QUOTA_DEVICE
47+struct quotaval quota_blocks, quota_files; 48+struct quotaval quota_blocks, quota_files;
48+#else 49+#else
49 struct dqblk quota; 50 struct dqblk quota;
50+#endif 51+#endif
51 char *time_quota(long curstate, long softlimit, long timelimit, char *timeleft); 52 char *time_quota(long curstate, long softlimit, long timelimit, char *timeleft);
52 #endif 53 #endif
53  54
54@@ -252,6 +272,11 @@ void msg_massage(const char *inbuf, char 55@@ -252,6 +272,11 @@ void msg_massage(const char *inbuf, char
55 char *outptr = outbuf; 56 char *outptr = outbuf;
56 #ifdef QUOTA 57 #ifdef QUOTA
57 char timeleft[80]; 58 char timeleft[80];
58+#ifdef HAVE_NETBSD_LIBQUOTA 59+#ifdef HAVE_NETBSD_LIBQUOTA
59+ uint64_t quotaval; 60+ uint64_t quotaval;
@@ -194,44 +195,44 @@ $NetBSD: patch-ap,v 1.2 2012/04/08 04:43 @@ -194,44 +195,44 @@ $NetBSD: patch-ap,v 1.2 2012/04/08 04:43
194  195
195@@ -1888,12 +1949,35 @@ int path_to_device(char *pathname, char  196@@ -1888,12 +1949,35 @@ int path_to_device(char *pathname, char
196 } 197 }
197 return 1; 198 return 1;
198 } 199 }
199-#endif 200-#endif
200+#endif /* QUOTA_DEVICE */ 201+#endif /* QUOTA_DEVICE */
201  202
202 void get_quota(char *fs, int uid) 203 void get_quota(char *fs, int uid)
203 { 204 {
204 char mnt_fsname[MNTMAXSTR]; 205 char mnt_fsname[MNTMAXSTR];
205-#ifdef HAS_NO_QUOTACTL 206-#ifdef HAS_NO_QUOTACTL
206+ 207+
207+#if defined(HAS_NETBSD_LIBQUOTA) 208+#if defined(HAVE_NETBSD_LIBQUOTA)
208+ struct quotahandle *qh; 209+ struct quotahandle *qh;
209+ struct quotakey qk; 210+ struct quotakey qk;
210+ 211+
211+ qh = quota_open(fs); 212+ qh = quota_open(fs);
212+ if (qh == NULL) { 213+ if (qh == NULL) {
213+ quotaval_clear(&quota_blocks); 214+ quotaval_clear(&quota_blocks);
214+ quotaval_clear(&quota_files); 215+ quotaval_clear(&quota_files);
215+ return; 216+ return;
216+ } 217+ }
217+ qk.qk_idtype = QUOTA_IDTYPE_USER; 218+ qk.qk_idtype = QUOTA_IDTYPE_USER;
218+ qk.qk_id = uid; 219+ qk.qk_id = uid;
219+ qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS; 220+ qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
220+ if (quota_get(qh, &quota_blocks)) { 221+ if (quota_get(qh, &qk, &quota_blocks)) {
221+ quotaval_clear(&quota_blocks); 222+ quotaval_clear(&quota_blocks);
222+ } 223+ }
223+ qk.qk_objtype = QUOTA_OBJTYPE_FILES; 224+ qk.qk_objtype = QUOTA_OBJTYPE_FILES;
224+ if (quota_get(qh, &quota_files)) { 225+ if (quota_get(qh, &qk, &quota_files)) {
225+ quotaval_clear(&quota_files); 226+ quotaval_clear(&quota_files);
226+ } 227+ }
227+ quota_close(qh); 228+ quota_close(qh);
228+ 229+
229+#elif defined(HAS_NO_QUOTACTL) 230+#elif defined(HAS_NO_QUOTACTL)
230 int dirfd; 231 int dirfd;
231 struct quotctl qp; 232 struct quotctl qp;
232  233
233@@ -1905,19 +1989,18 @@ void get_quota(char *fs, int uid) 234@@ -1905,19 +1989,18 @@ void get_quota(char *fs, int uid)
234 ioctl(dirfd, Q_QUOTACTL, &qp); 235 ioctl(dirfd, Q_QUOTACTL, &qp);
235 close(dirfd); 236 close(dirfd);
236 } 237 }
237-#else 238-#else
cvs diff -r1.1 -r1.2 pkgsrc/net/wu-ftpd/patches/Attic/patch-configure_in (expand / switch to unified diff)

--- pkgsrc/net/wu-ftpd/patches/Attic/patch-configure_in 2012/04/08 04:43:51 1.1
+++ pkgsrc/net/wu-ftpd/patches/Attic/patch-configure_in 2012/04/08 05:11:13 1.2
@@ -1,20 +1,24 @@ @@ -1,20 +1,24 @@
1$NetBSD: patch-configure_in,v 1.1 2012/04/08 04:43:51 dholland Exp $ 1$NetBSD: patch-configure_in,v 1.2 2012/04/08 05:11:13 dholland Exp $
2 2
3- support netbsd-6 libquota API. 3- support netbsd-6 libquota API.
4 4
5caution: there's a dragonfly patch to configure in patch-ao that isn't 5caution: there's a dragonfly patch to configure in patch-ao that isn't
6reflected here. don't regen that from this without thinking. 6reflected here. don't regen that from this without thinking.
7 7
8--- configure.in~ 2001-11-29 17:10:58.000000000 +0000 8--- configure.in.orig 2001-11-29 17:10:58.000000000 +0000
9+++ configure.in 9+++ configure.in
10@@ -739,8 +739,8 @@ if test $paranoid = yes; then 10@@ -739,9 +739,12 @@ if test $paranoid = yes; then
11 AC_DEFINE(PARANOID) 11 AC_DEFINE(PARANOID)
12 fi 12 fi
13 if test $quota != no; then 13 if test $quota != no; then
14- AC_CHECK_HEADERS(sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h) 14- AC_CHECK_HEADERS(sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h)
15- if test $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then 15- if test $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then
16+ AC_CHECK_HEADERS(quota.h sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h) 16+ AC_CHECK_HEADERS(quota.h sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h)
17+ if test $ac_cv_header_quota.h = yes -o $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then 17+ if test $ac_cv_header_quota.h = yes -o $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then
18 quota=yes 18 quota=yes
 19+ if test $ac_cv_header_quota_h = yes; then
 20+ LIBS="$LIBS -lquota"
 21+ fi
19 else 22 else
20 if test $quota = yes; then 23 if test $quota = yes; then
 24 AC_MSG_WARN(QUOTA not supported by OS - disabled)