summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/radmind/Makefile29
-rw-r--r--sysutils/radmind/distinfo13
-rw-r--r--sysutils/radmind/patches/patch-aa8
-rw-r--r--sysutils/radmind/patches/patch-ab10
4 files changed, 29 insertions, 31 deletions
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index 4ba310cfffe..5dffa4b53e9 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/07/17 17:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/05 02:49:30 rillig Exp $
#
-DISTNAME= radmind-1.6.1
+DISTNAME= radmind-1.7.1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=radmind/}
@@ -9,25 +9,22 @@ MAINTAINER= hf@spg.tu-darmstadt.de
HOMEPAGE= http://rsug.itd.umich.edu/software/radmind/
COMMENT= Remote file administration and integrity tool
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+= --with-radminddir=${VARBASE}/radmind
+CONFIGURE_ARGS+= --with-radminddir=${RADMINDDIR}
CONFIGURE_ENV+= diffpath=${TOOLS_DIFF:Q}
USE_TOOLS+= diff
-BUILD_TARGET= all man rash
+BUILD_TARGET= all man rash
+RADMINDDIR= ${VARBASE}/radmind
+BUILD_DEFS+= VARBASE
-OWN_DIRS_PERMS+= ${VARBASE}/radmind \
- ${ROOT_USER} ${ROOT_GROUP} 0750
-OWN_DIRS_PERMS+= ${VARBASE}/radmind/client \
- ${ROOT_USER} ${ROOT_GROUP} 0750
-OWN_DIRS_PERMS+= ${VARBASE}/radmind/preapply \
- ${ROOT_USER} ${ROOT_GROUP} 0750
-OWN_DIRS_PERMS+= ${VARBASE}/radmind/postapply \
- ${ROOT_USER} ${ROOT_GROUP} 0750
-OWN_DIRS_PERMS+= ${VARBASE}/radmind/cert \
- ${ROOT_USER} ${ROOT_GROUP} 0700
-RCD_SCRIPTS= radmind
+OWN_DIRS_PERMS+= ${RADMINDDIR} ${ROOT_USER} ${ROOT_GROUP} 0750
+OWN_DIRS_PERMS+= ${RADMINDDIR}/client ${ROOT_USER} ${ROOT_GROUP} 0750
+OWN_DIRS_PERMS+= ${RADMINDDIR}/preapply ${ROOT_USER} ${ROOT_GROUP} 0750
+OWN_DIRS_PERMS+= ${RADMINDDIR}/postapply ${ROOT_USER} ${ROOT_GROUP} 0750
+OWN_DIRS_PERMS+= ${RADMINDDIR}/cert ${ROOT_USER} ${ROOT_GROUP} 0700
+RCD_SCRIPTS= radmind
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/radmind/distinfo b/sysutils/radmind/distinfo
index a1281e03c9f..fd7174eb74c 100644
--- a/sysutils/radmind/distinfo
+++ b/sysutils/radmind/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.8 2006/07/17 17:59:05 wiz Exp $
+$NetBSD: distinfo,v 1.9 2006/10/05 02:49:30 rillig Exp $
-SHA1 (radmind-1.6.1.tar.gz) = e5058aff8119ffa4915081c8dffa4b38e4cee1f8
-RMD160 (radmind-1.6.1.tar.gz) = 01cd361dd527ba77ae8b1c1c90fba726a5d51487
-Size (radmind-1.6.1.tar.gz) = 360036 bytes
-SHA1 (patch-aa) = 3c0467baeda68d1013ab09288c71bfc75c8738b9
-SHA1 (patch-ab) = e01889e50bb74759d997d19bcd85d3ae5ea8f0f1
+SHA1 (radmind-1.7.1.tar.gz) = b6c95e5c17eb8d2232988ec306959c120d5d48bf
+RMD160 (radmind-1.7.1.tar.gz) = 9ee6990f72a022e2c42380e6936462afb3191bb7
+Size (radmind-1.7.1.tar.gz) = 378163 bytes
+SHA1 (patch-aa) = 46c1e6b29980712382180c856f389357d6bbee70
+SHA1 (patch-ab) = 49f0efb9c3497aee8337b077cfc70ec5866ff78d
SHA1 (patch-ac) = c1ea9930b9c2fee94a0b0d43e8aeec1925e454e7
SHA1 (patch-ad) = 40974d0b41be44c2ebd0d29dca31bcc42837328a
SHA1 (patch-ae) = 58b15301aa1df00e6e5bab9f21db8ddc99461f2a
+SHA1 (patch-af) = fa7141a81abbfd05f094af1dd30d8810f73c948e
diff --git a/sysutils/radmind/patches/patch-aa b/sysutils/radmind/patches/patch-aa
index dadb353ff70..1ef6a7caca8 100644
--- a/sysutils/radmind/patches/patch-aa
+++ b/sysutils/radmind/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2006/01/18 13:11:56 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2006/10/05 02:49:30 rillig Exp $
---- Makefile.in.orig 2005-12-07 21:13:43.000000000 +0100
-+++ Makefile.in
+--- Makefile.in.orig 2006-05-24 19:45:15.000000000 +0200
++++ Makefile.in 2006-10-05 04:45:05.000000000 +0200
@@ -236,6 +236,8 @@ rash : FRC
-e 's@_RADMIND_MAIL_DOMAIN@${RADMIND_MAIL_DOMAIN}@g' \
-e 's@_RADMIND_COMMANDFILE@${COMMANDFILE}@g' \
- -e 's@_RADMIND_VERSION@${VERSION}@g' \
+ -e 's@_RADMIND_VERSION@$(shell cat VERSION)@g' \
+ -e 's@_PKG_SYSCONFDIR@${PKG_SYSCONFDIR}@g' \
+ -e 's@_LOCALBASE@${LOCALBASE}@g' \
${srcdir}/ra.sh > tmp/ra.sh;
diff --git a/sysutils/radmind/patches/patch-ab b/sysutils/radmind/patches/patch-ab
index 145ef4f1c94..2c1a9630e8c 100644
--- a/sysutils/radmind/patches/patch-ab
+++ b/sysutils/radmind/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2006/07/17 17:59:05 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2006/10/05 02:49:30 rillig Exp $
---- ra.sh.orig 2006-02-21 22:57:54.000000000 +0100
-+++ ra.sh
+--- ra.sh.orig 2006-07-19 22:17:51.000000000 +0200
++++ ra.sh 2006-10-05 04:45:56.000000000 +0200
@@ -25,7 +25,7 @@ SERVER="_RADMIND_HOST"
TLSLEVEL="_RADMIND_AUTHLEVEL"
EDITOR=${EDITOR:-vi}
@@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.4 2006/07/17 17:59:05 wiz Exp $
if [ -d ${PREAPPLY} ]; then
- SCRIPTS=`find ${PREAPPLY} -perm +u+x \! -type d | sort`
+ SCRIPTS=`find ${PREAPPLY} -perm -u+x \! -type d | sort`
- if [ ${SCRIPTS} ]; then
+ if [ "${SCRIPTS}" ]; then
for script in ${SCRIPTS}; do
${script} "$1"
@@ -100,7 +92,7 @@ dopreapply() {
@@ -50,6 +50,6 @@ $NetBSD: patch-ab,v 1.4 2006/07/17 17:59:05 wiz Exp $
if [ -d ${POSTAPPLY} ]; then
- SCRIPTS=`find ${POSTAPPLY} -perm +u+x \! -type d | sort`
+ SCRIPTS=`find ${POSTAPPLY} -perm -u+x \! -type d | sort`
- if [ ${SCRIPTS} ]; then
+ if [ "${SCRIPTS}" ]; then
for script in ${SCRIPTS}; do
${script} "$1"