diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-05-16 22:36:57 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-05-16 22:36:57 +0000 |
| commit | 448a00f1dc0d290be873e79a333906cddf3e0b4d (patch) | |
| tree | 51c9ad54fda7bc95efef9e745d805bb40fb9be71 /misc/e2fsprogs-libuuid | |
| parent | c424711199ee3e5bdaf98e7f9a4e1cb16f90070b (diff) | |
Notes
Diffstat (limited to 'misc/e2fsprogs-libuuid')
| -rw-r--r-- | misc/e2fsprogs-libuuid/Makefile | 9 | ||||
| -rw-r--r-- | misc/e2fsprogs-libuuid/files/uuidd.in | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile index f30c6ace903b..2b1179ea698b 100644 --- a/misc/e2fsprogs-libuuid/Makefile +++ b/misc/e2fsprogs-libuuid/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc devel PKGNAMESUFFIX= -libuuid @@ -38,14 +38,17 @@ PKGDIR= ${.CURDIR} post-patch:: ${REINPLACE_CMD} -e 's,/var/lib/libuuid,/var/run/libuuid,g' \ -e 's,/usr/sbin/uuidd,${PREFIX}/sbin/uuidd,' \ - ${WRKSRC}/lib/uuid/uuidd.h + ${WRKSRC}/lib/uuid/*.[ch] pre-build: ${MKDIR} ${WRKSRC}/lib/uuid/elfshared +# ulimit guards against runaway tests +# failure to launch uuidd is fine (one might be running, or we may lack +# privileges); if it works, it'll quit after 50 seconds post-build: cd ${WRKSRC}/misc && ${MAKE} uuidgen uuidgen.1 uuidd uuidd.8 - cd ${INSTALL_WRKSRC} && ${MAKE} check + ( ulimit -t 5 ; cd ${INSTALL_WRKSRC} && { ../../misc/uuidd -T50 || true ; ${MAKE} check ; } ) post-install: ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidgen ${PREFIX}/bin/ diff --git a/misc/e2fsprogs-libuuid/files/uuidd.in b/misc/e2fsprogs-libuuid/files/uuidd.in index ec933ee21e63..7660ff63122f 100644 --- a/misc/e2fsprogs-libuuid/files/uuidd.in +++ b/misc/e2fsprogs-libuuid/files/uuidd.in @@ -1,9 +1,13 @@ #!/bin/sh # # rcNG script to start uuidd at boot-time on rcNG-enabled systems, -# such as FreeBSD. +# such as FreeBSD. Note: Starting uuidd at boot-time is not strictly +# necessary, the library will - as of 1.41.5 - silently launch an +# instance of uuidd that exits after 300 seconds; for most accurate +# time-based uuids generated from unprivileged user accounts it may be +# useful to run it system-wide. # -# (C) 2008 by Matthias Andree. +# (C) 2008, 2009 by Matthias Andree. # Licensed under the modified (= 2-clause) BSD license. # PROVIDE: uuidd |