diff options
| -rw-r--r-- | net/arla/Makefile | 6 | ||||
| -rw-r--r-- | net/arla/distinfo | 15 | ||||
| -rw-r--r-- | net/arla/patches/patch-ac | 16 | ||||
| -rw-r--r-- | net/arla/patches/patch-ak | 14 | ||||
| -rw-r--r-- | net/arla/patches/patch-al | 12 | ||||
| -rw-r--r-- | net/arla/patches/patch-aw | 90 |
6 files changed, 94 insertions, 59 deletions
diff --git a/net/arla/Makefile b/net/arla/Makefile index 6fedf14f414..a37ca4b438d 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2006/04/06 03:20:54 jlam Exp $ +# $NetBSD: Makefile,v 1.59 2006/08/24 13:25:41 wennmach Exp $ -DISTNAME= arla-0.41 -PKGREVISION= 3 +DISTNAME= arla-0.43 +#PKGREVISION= 1 CATEGORIES= net security MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/ diff --git a/net/arla/distinfo b/net/arla/distinfo index 37a68be630f..90b5c393e01 100644 --- a/net/arla/distinfo +++ b/net/arla/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.21 2006/04/06 02:41:44 jlam Exp $ +$NetBSD: distinfo,v 1.22 2006/08/24 13:25:41 wennmach Exp $ -SHA1 (arla-0.41.tar.gz) = ee343833649924d829f547a6fddc88da4f3a3c83 -RMD160 (arla-0.41.tar.gz) = a4c7cdc17559d900b6ac2ede5f0f3cb29fa08b23 -Size (arla-0.41.tar.gz) = 2200301 bytes -SHA1 (patch-ac) = abee32015e06033a22eebcd914463a3776db7127 +SHA1 (arla-0.43.tar.gz) = b11130912a14ec469a3fde46b1993f4ad6386f31 +RMD160 (arla-0.43.tar.gz) = 68b953a2591b115b2a5842a6c7fc6fae2ee2f088 +Size (arla-0.43.tar.gz) = 2852591 bytes SHA1 (patch-ah) = b2929d05940aa54d4544ea7ae8d95ef5cd5472a1 -SHA1 (patch-ak) = 7cf6a36acc9107458c8165a4c5ff4821fc8a946f -SHA1 (patch-al) = 6d7af2b8fe990232a5aa684c039dfc565ecebdf8 -SHA1 (patch-aw) = 0d93bece3c221590b1ca2fb3133128266b460820 +SHA1 (patch-ak) = d316e7c827b906005113ac2ea3565621ef00133d +SHA1 (patch-al) = eefe11aa1cee81c03fa42c2363c445212c8201dd +SHA1 (patch-aw) = bf2e6f31ed07b4492e1be2246438dd8306c68535 SHA1 (patch-az) = 072c2d9c8a2fea61fc04bff5d0d9fb211bbb67d6 SHA1 (patch-bi) = 2e8201964c64b128025a752ee7354f0cc8305b1b SHA1 (patch-bj) = e98877cce457c01f76680f74ef9107bbed0a9654 diff --git a/net/arla/patches/patch-ac b/net/arla/patches/patch-ac deleted file mode 100644 index 36b5fa6e621..00000000000 --- a/net/arla/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2005/03/25 17:40:25 wennmach Exp $ - -NetBSD-1.6.x doesn't have kqfilter. - ---- nnpfs/bsd/nnpfs_vnodeops-netbsd.c.orig Mon Mar 14 15:13:51 2005 -+++ nnpfs/bsd/nnpfs_vnodeops-netbsd.c Mon Mar 14 15:35:55 2005 -@@ -416,7 +416,9 @@ - {&vop_strategy_desc, (vop_t *) nnpfs_netbsd_strategy }, - {&vop_print_desc, (vop_t *) nnpfs_print}, - {&vop_advlock_desc, (vop_t *) nnpfs_advlock }, -+#if __NetBSD_Version__ >= 200000000 - {&vop_kqfilter_desc, (vop_t *) genfs_kqfilter }, -+#endif - {(struct vnodeop_desc *) NULL, (int (*) (void *)) NULL} - }; - diff --git a/net/arla/patches/patch-ak b/net/arla/patches/patch-ak index 50bae8e91c3..190c44861b9 100644 --- a/net/arla/patches/patch-ak +++ b/net/arla/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.7 2005/03/25 17:40:25 wennmach Exp $ +$NetBSD: patch-ak,v 1.8 2006/08/24 13:25:41 wennmach Exp $ Building afsdir_check exposes a buildlink3 bug. Since we don't install afsdir_check, the simple work-around is not to build @@ -7,8 +7,8 @@ afsdir_check at all. Reorder libs: move libroken to the end. ---- arlad/Makefile.in.orig 2005-03-10 12:58:35.000000000 +0100 -+++ arlad/Makefile.in 2005-03-10 13:00:21.000000000 +0100 +--- arlad/Makefile.in.orig 2006-03-15 14:30:02.000000000 +0100 ++++ arlad/Makefile.in 2006-08-15 19:58:21.000000000 +0200 @@ -25,7 +25,7 @@ ARLA_SBIN = arla-cli @@ -29,12 +29,12 @@ Reorder libs: move libroken to the end. $(LIB_sl) @LIB_readline@ \ @@ -245,8 +245,8 @@ arla-cli: $(arla-cli_OBJS) $(LIBDEPENDS) - $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(arla-cli_OBJS) $(LIBS_arla-cli) + $(top_builddir)/libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(arla-cli_OBJS) $(LIBS_arla-cli) -afsdir_check: $(afsdir_check_OBJS) -- $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(afsdir_check_OBJS) $(LIBS_afsdir_check) +- $(top_builddir)/libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(afsdir_check_OBJS) $(LIBS_afsdir_check) +#afsdir_check: $(afsdir_check_OBJS) -+# $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(afsdir_check_OBJS) $(LIBS_afsdir_check) ++# $(top_builddir)/libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(afsdir_check_OBJS) $(LIBS_afsdir_check) dump_state: $(dump_state_OBJS) - $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(dump_state_OBJS) $(LIBS_dump_state) + $(top_builddir)/libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(dump_state_OBJS) $(LIBS_dump_state) diff --git a/net/arla/patches/patch-al b/net/arla/patches/patch-al index f895d13e68f..88171f72766 100644 --- a/net/arla/patches/patch-al +++ b/net/arla/patches/patch-al @@ -1,14 +1,12 @@ -$NetBSD: patch-al,v 1.4 2005/12/15 21:28:47 wennmach Exp $ +$NetBSD: patch-al,v 1.5 2006/08/24 13:25:41 wennmach Exp $ Add missing lib and reorder. ---- appl/amon/Makefile.in.orig 2005-12-08 22:56:34.000000000 +0100 -+++ appl/amon/Makefile.in 2005-12-08 22:57:57.000000000 +0100 -@@ -455,8 +455,10 @@ - amon_LDADD = \ - ../lib/libarlalib.la \ +--- appl/amon/Makefile.in.orig 2006-06-09 00:50:41.000000000 +0200 ++++ appl/amon/Makefile.in 2006-08-15 20:01:38.000000000 +0200 +@@ -459,7 +459,8 @@ ../../rxdef/librxdefclient.la \ -+ ../../rxdef/libkaclient.la \ + ../../rxdef/libkaclient.la \ ../../rx/librx.la \ - -L../../lwp -llwp @PLWP_LIB_FLAGS@ \ + ../../lwp/liblwp.a \ diff --git a/net/arla/patches/patch-aw b/net/arla/patches/patch-aw index 431e5366b46..57f2a8885e3 100644 --- a/net/arla/patches/patch-aw +++ b/net/arla/patches/patch-aw @@ -1,10 +1,10 @@ -$NetBSD: patch-aw,v 1.4 2005/12/15 21:28:48 wennmach Exp $ +$NetBSD: patch-aw,v 1.5 2006/08/24 13:25:41 wennmach Exp $ Don't build tests that won't compile (they're not installed anyway). Fiddle with libs. ---- tests/Makefile.in.orig 2005-03-11 10:03:00.000000000 +0100 -+++ tests/Makefile.in 2005-03-11 10:06:47.000000000 +0100 +--- tests/Makefile.in.orig 2006-03-29 15:09:59.000000000 +0200 ++++ tests/Makefile.in 2006-08-24 14:18:33.000000000 +0200 @@ -15,10 +15,10 @@ DEFS = @DEFS@ LDFLAGS = @LDFLAGS@ @@ -18,27 +18,81 @@ Fiddle with libs. ../lib/ko/libko.la ../util/libarlautil.la -@@ -30,17 +30,15 @@ - mmap-and-read large-dir large-dir2 large-dir3 mountpoint \ - test-setgroups test-setpag hardlink1 hardlink2 mkdir2 \ - create-files create-symlinks create-dirs dup2-and-unlog \ +@@ -26,72 +26,11 @@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ + +-TEST_PROGRAMS = write-ro-file hello-world read-vs-mmap read-vs-mmap2 \ +- mmap-and-read large-dir large-dir2 large-dir3 mountpoint \ +- test-setgroups test-setpag hardlink1 hardlink2 mkdir2 \ +- create-files create-symlinks create-dirs dup2-and-unlog \ - readdir-vs-lstat read-write ga-test create-remove \ - symlink echo-n test-parallel1 test-parallel2 create-stat \ - kill-softly kill-softer rm-rf apwd exit-wo-close \ -+ readdir-vs-lstat read-write create-remove \ -+ symlink echo-n test-parallel1 test-parallel2 \ - mmap-vs-read mmap-vs-read2 strange-characters-c pine \ - append-over-page write-ucc utime-dir mmap-shared-write \ +- mmap-vs-read mmap-vs-read2 strange-characters-c pine \ +- append-over-page write-ucc utime-dir mmap-shared-write \ - rename5 rename-under-feet write-closed write-closed2 \ - truncate fchmod fhbench make-page utime-file \ - invalidate-file write3 still-there-p \ - intr-read asu truncate-files mmap-cat blocks-new-file \ -+ rename5 rename-under-feet write-closed \ -+ truncate fchmod make-page utime-file \ -+ write3 still-there-p \ -+ intr-read asu blocks-new-file \ - read-past-eof \ +- read-past-eof \ - write-6G-file \ - mmap-and-fork +- macos-getattrlist-leak \ +- mtime-file \ +- mmap-and-fork \ +- write-error +- +-TEST_OBJS = write-ro-file.o read-vs-mmap.o read-vs-mmap2.o \ +- mmap-and-read.o large-dir.o large-dir2.o large-dir3.o \ +- test-setgroups.o test-setpag.o hardlink1.o hardlink2.o \ +- mkdir2.o create-files.o create-symlinks.o create-dirs.o \ +- dup2-and-unlog.o readdir-vs-lstat.o read-write.o ga-test.o \ +- create-remove.o symlink.o echo-n.o test-parallel1.o \ +- test-parallel1.o \ +- create-stat.o kill-softly.o kill-softer.o rm-rf.o apwd.o \ +- exit-wo-close.o mmap-vs-read.o mmap-vs-read2.o \ +- strange-characters-c.o pine.o append-over-page.o \ +- write-ucc.o utime-dir.o mmap-shared-write.o rename5.o \ +- rename-under-feet.o write-closed.o write-closed2.o \ +- truncate.o fchmod.o fhbench.o make-page.o utime-file.o \ +- invalidate-file.o write3.o still-there-p.o \ +- intr-read.o asu.o truncate-files.o mmap-cat.o \ +- blocks-new-file.o \ +- read-past-eof.o \ +- write-6G-file.o \ +- macos-getattrlist-leak.o \ +- mtime-file.o \ +- mmap-and-fork.o \ +- write-error +- +- +-TEST_SRCS = write-ro-file.c read-vs-mmap.c read-vs-mmap2.c \ +- mmap-and-read.c large-dir.c large-dir2.c large-dir3.c \ +- test-setgroups.c test-setpag.c hardlink1.c hardlink2.c \ +- mkdir2.c create-files.c create-symlinks.c create-dirs.c \ +- dup2-and-unlog.c readdir-vs-lstat.c read-write.c ga-test.c \ +- create-remove.c symlink.c echo-n.c test-parallel1.c \ +- test-parallel2.c \ \ +- create-stat.c kill-softly.c kill-softer.c rm-rf.c apwd.c \ +- exit-wo-close.c mmap-vs-read.c mmap-vs-read2.c \ +- strange-characters-c.c pine.c append-over-page.c \ +- write-ucc.c utime-dir.c mmap-shared-write.c rename5.c \ +- rename-under-feet.c write-closed.c write-closed2.c \ +- truncate.c fchmod.c fhbench.c make-page.c utime-file.c \ +- invalidate-file.c write3.c still-there-p.c \ +- intr-read.c asu.c truncate-files.c mmap-cat.c \ +- blocks-new-file.c \ +- read-past-eof.c \ +- write-6G-file.c \ +- macos-getattrlist-leak.c \ +- mtime-file.c \ +- mmap-and-fork.c \ +- write-error ++TEST_PROGRAMS = ++ ++TEST_OBJS = ++ ++TEST_SRCS = + + all: run-tests $(TEST_PROGRAMS) - TEST_OBJS = write-ro-file.o read-vs-mmap.o read-vs-mmap2.o \ |