1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Update to 1.6.11.

Make new pkg-install/pkg-deinstall scripts, disabled if here is no mod_dav_svn.
  Add option to build and install svnauthz-validate, a tool to test authz files.

PR:		ports/145809, with some changes
Submitted by:	olli hauer <ohauer@gmx.de>
This commit is contained in:
Lev A. Serebryakov 2010-04-19 10:39:12 +00:00
parent e0c2c65795
commit 7db76e2b98
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=252905
14 changed files with 216 additions and 26 deletions

View File

@ -27,6 +27,7 @@ OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
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
@ -35,6 +36,9 @@ OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
SVNREPOS?= /home/svn/repos
SVNFSTYPE?= fsfs
SUB_FILES= pkg-install \
pkg-deinstall
.if make(repository)
WITH_REPOSITORY_CREATION= yes
.endif
@ -121,6 +125,16 @@ pre-everything::
@${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."
@ -173,16 +187,23 @@ pre-configure:
fi
.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)
# place binary in ${WRKDIR}, else we install it twice
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:
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav ${PREFIX}/${APACHEMODDIR}/mod_dav.so
.if defined(WITH_MOD_DAV_SVN)
# activate dav_module now in pkg-install to prevent double activation.
# workaround for apxs bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47397
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.endif
post-install: ${MKREPOS_TARGET}
@ -193,6 +214,9 @@ post-install: ${MKREPOS_TARGET}
${APXS} -i -n dontdothat mod_dontdothat.la
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
.endif
.if defined(WITH_SVNAUTHZ_VALIDATE)
${INSTALL_PROGRAM} ${WRKSRC}/svnauthz-validate ${PREFIX}/bin
.endif
@${MKDIR} ${DATADIR}
cd ${WRKSRC}/tools ; \

View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
PORTVERSION= 1.6.9
PORTVERSION= 1.6.11
#PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --without-sasl
PLIST_SUB+= SASL="@comment "
.endif
# Default us "on"
# Default is "on"
.if !defined(WITHOUT_BDB)
USE_BDB= 42+
PLIST_SUB+= BDB=""
@ -70,6 +70,7 @@ PLIST_SUB+= BDB="@comment "
WITH_APACHE2_APR= yes
CONFIGURE_ARGS+= --with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
SVNGROUP?= www
SVNUSER?= www
.if defined(WITH_MOD_DONTDOTHAT)
@ -80,7 +81,7 @@ PLIST_SUB+= MOD_DONTDOTHAT="@comment "
.else
PLIST_SUB+= MOD_DAV_SVN="@comment "
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
PKGDEINSTALL= NONEXISTENT
SUB_LIST+= MOD_DAV_SVN_INSTALL="NO"
SVNGROUP?= svn
SVNUSER?= svn
.endif
@ -109,6 +110,15 @@ APU_CONFIG= apu-1-config
CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
.if defined(WITH_SVNAUTHZ_VALIDATE)
.if exists(${APR_APU_DIR}/${APR_CONFIG})
APR_INCLUDE_DIR!= ${APR_APU_DIR}/${APR_CONFIG} --includedir
.endif
PLIST_SUB+= SVNAUTHZ_VALIDATE=""
.else
PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment "
.endif
.if defined(WITH_SERF)
LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf
CONFIGURE_ARGS+= --with-serf=${LOCALBASE}

View File

@ -1,6 +1,6 @@
MD5 (subversion/subversion-1.6.9.tar.bz2) = 9c30a47b1d48664e7afef68bb4834c53
SHA256 (subversion/subversion-1.6.9.tar.bz2) = 05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c
SIZE (subversion/subversion-1.6.9.tar.bz2) = 5478554
MD5 (subversion/subversion-1.6.11.tar.bz2) = 75419159b50661092c4137449940b5cc
SHA256 (subversion/subversion-1.6.11.tar.bz2) = 64bd000ae30470d343c0725758bdd8288143393308eedc511c7826bb6731e59c
SIZE (subversion/subversion-1.6.11.tar.bz2) = 5486069
MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
SIZE (subversion/svn-book-html.tar.bz2) = 406484

View File

@ -3,9 +3,13 @@
# Try to de-activate mod_dav_svn in the installed httpd.conf and warn
# if this fails.
#
# $FreeBSD$
# $FreeBSD: /tmp/pcvs/ports/devel/subversion/files/pkg-deinstall.in,v 1.1 2010-04-19 10:39:12 lev Exp $
#
if [ "%%MOD_DAV_SVN_INSTALL%%" != "YES" ] ; then
exit 0
fi
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi

View File

@ -0,0 +1,57 @@
#!/bin/sh
#
# Date created: 18 Apr 2010
# Whom: ohauer@gmx.de
#
# Try to activate mod_dav.so in httpd.conf only if the module is not already active.
# This script is a workaround for apxs bug:
# https://issues.apache.org/bugzilla/show_bug.cgi?id=47397
#
# $FreeBSD$
#
if [ "%%MOD_DAV_SVN_INSTALL%%" != "YES" ] ; then
exit 0
fi
if [ "$2" != "PRE-INSTALL" ]; then
exit 0
fi
APXSCMD=${PKG_PREFIX}/sbin/apxs
if [ ! -x ${APXSCMD} ]; then
echo Can\'t find the apxs program: ${APXSCMD}.
exit 1
fi
SYSCONFDIR=`${APXSCMD} -q SYSCONFDIR`
LIBEXECDIR=`${APXSCMD} -q LIBEXECDIR`
if [ ! -d "${SYSCONFDIR}" ]; then
echo Can\'t find Apache conf dir: ${SYSCONFDIR}
exit 1
fi
if [ -f "${SYSCONFDIR}/httpd.conf" ]; then
CONFFILE=httpd.conf
fi
if [ -z "${CONFFILE}" ]; then
echo "Can\'t find ${SYSCONFDIR}/${CONFFILE}"
exit 1
fi
# use only 'egrep -e' else the check works not correct
if [ ! -n "`egrep -e '^(Load|Add)Module.*dav_module' ${SYSCONFDIR}/${CONFFILE}`" ]; then
if [ -f ${LIBEXECDIR}/mod_dav.so ]; then
${APXSCMD} -e -S LIBEXECDIR=${LIBEXECDIR} -a -n dav ${LIBEXECDIR}/mod_dav.so
else
echo "cannot find ${LIBEXECDIR}/mod_dav.so"
exit 1
fi
else
echo "dav_module already active in ${SYSCONFDIR}/${CONFFILE}"
fi
exit 0

View File

@ -1,4 +1,4 @@
Subversion is a version control system designed to be as similar to cvs(1)
as possible, while fixing many outstanding problems with cvs(1).
WWW: http://subversion.tigris.org/
WWW: http://subversion.apache.org/

View File

@ -6,6 +6,7 @@ bin/svnlook
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
@ -289,7 +290,6 @@ lib/libsvn_wc-1.la
%%DATADIR%%/xslt/svnindex.xsl
%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so
%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n authz_svn libexec/%%APACHEDIR%%/mod_authz_svn.so
%%MOD_DONTDOTHAT%%%%APACHEMODDIR%%/mod_dontdothat.so

View File

@ -27,6 +27,7 @@ OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
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
@ -35,6 +36,9 @@ OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
SVNREPOS?= /home/svn/repos
SVNFSTYPE?= fsfs
SUB_FILES= pkg-install \
pkg-deinstall
.if make(repository)
WITH_REPOSITORY_CREATION= yes
.endif
@ -121,6 +125,16 @@ pre-everything::
@${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."
@ -173,16 +187,23 @@ pre-configure:
fi
.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)
# place binary in ${WRKDIR}, else we install it twice
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:
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav ${PREFIX}/${APACHEMODDIR}/mod_dav.so
.if defined(WITH_MOD_DAV_SVN)
# activate dav_module now in pkg-install to prevent double activation.
# workaround for apxs bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47397
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.endif
post-install: ${MKREPOS_TARGET}
@ -193,6 +214,9 @@ post-install: ${MKREPOS_TARGET}
${APXS} -i -n dontdothat mod_dontdothat.la
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
.endif
.if defined(WITH_SVNAUTHZ_VALIDATE)
${INSTALL_PROGRAM} ${WRKSRC}/svnauthz-validate ${PREFIX}/bin
.endif
@${MKDIR} ${DATADIR}
cd ${WRKSRC}/tools ; \

View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
PORTVERSION= 1.6.9
PORTVERSION= 1.6.11
#PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --without-sasl
PLIST_SUB+= SASL="@comment "
.endif
# Default us "on"
# Default is "on"
.if !defined(WITHOUT_BDB)
USE_BDB= 42+
PLIST_SUB+= BDB=""
@ -70,6 +70,7 @@ PLIST_SUB+= BDB="@comment "
WITH_APACHE2_APR= yes
CONFIGURE_ARGS+= --with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
SVNGROUP?= www
SVNUSER?= www
.if defined(WITH_MOD_DONTDOTHAT)
@ -80,7 +81,7 @@ PLIST_SUB+= MOD_DONTDOTHAT="@comment "
.else
PLIST_SUB+= MOD_DAV_SVN="@comment "
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
PKGDEINSTALL= NONEXISTENT
SUB_LIST+= MOD_DAV_SVN_INSTALL="NO"
SVNGROUP?= svn
SVNUSER?= svn
.endif
@ -109,6 +110,15 @@ APU_CONFIG= apu-1-config
CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
.if defined(WITH_SVNAUTHZ_VALIDATE)
.if exists(${APR_APU_DIR}/${APR_CONFIG})
APR_INCLUDE_DIR!= ${APR_APU_DIR}/${APR_CONFIG} --includedir
.endif
PLIST_SUB+= SVNAUTHZ_VALIDATE=""
.else
PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment "
.endif
.if defined(WITH_SERF)
LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf
CONFIGURE_ARGS+= --with-serf=${LOCALBASE}

View File

@ -1,6 +1,6 @@
MD5 (subversion/subversion-1.6.9.tar.bz2) = 9c30a47b1d48664e7afef68bb4834c53
SHA256 (subversion/subversion-1.6.9.tar.bz2) = 05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c
SIZE (subversion/subversion-1.6.9.tar.bz2) = 5478554
MD5 (subversion/subversion-1.6.11.tar.bz2) = 75419159b50661092c4137449940b5cc
SHA256 (subversion/subversion-1.6.11.tar.bz2) = 64bd000ae30470d343c0725758bdd8288143393308eedc511c7826bb6731e59c
SIZE (subversion/subversion-1.6.11.tar.bz2) = 5486069
MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
SIZE (subversion/svn-book-html.tar.bz2) = 406484

View File

@ -3,9 +3,13 @@
# Try to de-activate mod_dav_svn in the installed httpd.conf and warn
# if this fails.
#
# $FreeBSD$
# $FreeBSD: /tmp/pcvs/ports/devel/subversion16/files/pkg-deinstall.in,v 1.1 2010-04-19 10:39:12 lev Exp $
#
if [ "%%MOD_DAV_SVN_INSTALL%%" != "YES" ] ; then
exit 0
fi
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi

View File

@ -0,0 +1,57 @@
#!/bin/sh
#
# Date created: 18 Apr 2010
# Whom: ohauer@gmx.de
#
# Try to activate mod_dav.so in httpd.conf only if the module is not already active.
# This script is a workaround for apxs bug:
# https://issues.apache.org/bugzilla/show_bug.cgi?id=47397
#
# $FreeBSD$
#
if [ "%%MOD_DAV_SVN_INSTALL%%" != "YES" ] ; then
exit 0
fi
if [ "$2" != "PRE-INSTALL" ]; then
exit 0
fi
APXSCMD=${PKG_PREFIX}/sbin/apxs
if [ ! -x ${APXSCMD} ]; then
echo Can\'t find the apxs program: ${APXSCMD}.
exit 1
fi
SYSCONFDIR=`${APXSCMD} -q SYSCONFDIR`
LIBEXECDIR=`${APXSCMD} -q LIBEXECDIR`
if [ ! -d "${SYSCONFDIR}" ]; then
echo Can\'t find Apache conf dir: ${SYSCONFDIR}
exit 1
fi
if [ -f "${SYSCONFDIR}/httpd.conf" ]; then
CONFFILE=httpd.conf
fi
if [ -z "${CONFFILE}" ]; then
echo "Can\'t find ${SYSCONFDIR}/${CONFFILE}"
exit 1
fi
# use only 'egrep -e' else the check works not correct
if [ ! -n "`egrep -e '^(Load|Add)Module.*dav_module' ${SYSCONFDIR}/${CONFFILE}`" ]; then
if [ -f ${LIBEXECDIR}/mod_dav.so ]; then
${APXSCMD} -e -S LIBEXECDIR=${LIBEXECDIR} -a -n dav ${LIBEXECDIR}/mod_dav.so
else
echo "cannot find ${LIBEXECDIR}/mod_dav.so"
exit 1
fi
else
echo "dav_module already active in ${SYSCONFDIR}/${CONFFILE}"
fi
exit 0

View File

@ -1,4 +1,4 @@
Subversion is a version control system designed to be as similar to cvs(1)
as possible, while fixing many outstanding problems with cvs(1).
WWW: http://subversion.tigris.org/
WWW: http://subversion.apache.org/

View File

@ -6,6 +6,7 @@ bin/svnlook
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
@ -289,7 +290,6 @@ lib/libsvn_wc-1.la
%%DATADIR%%/xslt/svnindex.xsl
%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so
%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n authz_svn libexec/%%APACHEDIR%%/mod_authz_svn.so
%%MOD_DONTDOTHAT%%%%APACHEMODDIR%%/mod_dontdothat.so