Date: Sun, 28 Mar 2010 18:55:52 +0200 (CEST) From: olli hauer <ohauer@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ohauer@gmx.de Subject: ports/145114: [patch] port devel/subversion add svnauthz-validate as option Message-ID: <20100328165552.9769F261CE@u18-124.dsl.vianetworks.de> Resent-Message-ID: <201003281700.o2SH0Dtr077854@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145114
>Category: ports
>Synopsis: [patch] port devel/subversion add svnauthz-validate as option
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 28 17:00:13 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: olli hauer <ohauer@gmx.de>
>Release:
>Organization:
>Environment:
>Description:
svnauthz-validate is a small tool for testing svn authz files.
Usage: svnauthz-validate PATH
Loads the authz file at PATH and validates its syntax.
Returns:
0 when syntax is OK.
1 when syntax is invalid.
2 operational error
>How-To-Repeat:
>Fix:
--- patch_devel_subversion.txt begins here ---
--- subversion/Makefile
+++ subversion/Makefile
@@ -27,6 +27,7 @@
ASVN "Build and install Archive SVN (asvn)" off \
MAINTAINER_DEBUG "Build debug version" off \
SVNSERVE_WRAPPER "Enable svnserve wrapper" off \
+ SVNAUTHZ_VALIDATE "install svnauthz-validate" off \
STATIC "Build static version (no shared libs)" off \
BOOK "Install the Subversion Book" off
@@ -52,6 +53,12 @@
SUB_LIST+= SVNSERVE_BIN_EXT=""
.endif
+.if defined(WITH_SVNAUTHZ_VALIDATE)
+PLIST_SUB+= SVNAUTHZ_VALIDATE=""
+.else
+PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment "
+.endif
+
.if !defined(NOPORTDOCS) && defined(WITH_BOOK)
BOOK_HTML= svn-book-html.tar.bz2
BOOK_PDF= svn-book.pdf
@@ -121,6 +128,16 @@
@${ECHO_MSG} "svnserve wrapper enabled."
@${ECHO_MSG} ""
.endif
+.if defined(WITH_SVNAUTHZ_VALIDATE)
+.if defined(WITH_STATIC)
+ @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ @${ECHO_MSG} "!!! svnauthz-validate and static build are not compatible !!!"
+ @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ @${FALSE}
+.endif
+ @${ECHO_MSG} "svnauthz-validate enabled."
+ @${ECHO_MSG} ""
+.endif
.if defined(WITH_REPOSITORY_CREATION)
@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
@${ECHO_MSG} "Make sure that all committers are its members."
@@ -172,13 +189,21 @@
${FALSE} ; \
fi
.endif
+.if defined(WITH_SVNAUTHZ_VALIDATE)
+APR_INCLUDE_DIR!= ${APR_APU_DIR}/${APU_CONFIG} --includedir
+.endif
-.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT)
post-build:
+.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT)
cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c
.endif
+.if defined(WITH_SVNAUTHZ_VALIDATE)
+ cd ${WRKSRC}/tools/server-side && \
+ ${CC} svnauthz-validate.c -o ../../svnauthz-validate -I${WRKSRC}/subversion/include -I${APR_INCLUDE_DIR} \
+ -L${WRKSRC}/subversion/libsvn_repos/.libs -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_repos-1 -lsvn_subr-1
+.endif
.if defined(WITH_MOD_DAV_SVN)
pre-install:
@@ -193,6 +218,9 @@
${APXS} -i -n dontdothat mod_dontdothat.la
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
+.if defined(WITH_SVNAUTHZ_VALIDATE)
+ ${INSTALL_PROGRAM} ${WRKSRC}/svnauthz-validate ${PREFIX}/bin
+.endif
.endif
@${MKDIR} ${DATADIR}
cd ${WRKSRC}/tools ; \
--- subversion/pkg-plist
+++ subversion/pkg-plist
@@ -6,6 +6,7 @@
bin/svnserve
bin/svnsync
%%ASVN%%bin/asvn
+%%SVNAUTHZ_VALIDATE%%bin/svnauthz-validate
%%SVNSERVE_WRAPPER%%bin/svnserve.bin
bin/svnversion
include/subversion-1/mod_authz_svn.h
--- patch_devel_subversion.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100328165552.9769F261CE>