Attachment 121121 Details for Bug 164033 – patch_subversion.txt

patch_subversion.txt

patch_subversion.txt (text/plain), 4.06 KB, created by Olli Hauer on 2012-01-11 23:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2012-01-11 23:30:12 UTC

Size: 4.06 KB

patch

obsolete

>Index: subversion/files/pkg-deinstall.in
>===================================================================
>RCS file: /home/pcvs/ports/devel/subversion/files/pkg-deinstall.in,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-deinstall.in
>--- subversion/files/pkg-deinstall.in	19 Apr 2010 10:39:12 -0000	1.1
>+++ subversion/files/pkg-deinstall.in	11 Jan 2012 22:47:46 -0000
>@@ -51,15 +51,12 @@
> 
> for i in ${conffile}; do
> 	echo -n Removing dav_svn_module, authz_svn_module and dontdothat_module from $i in config dir: ${confdir}...
>-	awk '{if (!/^LoadModule dav_svn_module/    && 
>-		  !/^AddModule mod_dav_svn.c/      && \
>-		  !/^LoadModule authz_svn_module/  && \
>-		  !/^AddModule mod_authz_svn.c/    && \
>-		  !/^LoadModule dontdothat_module/ && \
>-		  !/^AddModule mod_dontdothat.c/    ) \
>+	awk '{if (!/LoadModule[[:blank:]]+dav_svn_module/    &&
>+		  !/LoadModule[[:blank:]]+authz_svn_module/  &&
>+		  !/LoadModule[[:blank:]]+dontdothat_module/ )
> 	    print $0}' < "${confdir}/$i" > "${tmpdir}/$i"
> 	AWKRC=$?
>-	diff "${confdir}/$i" "${tmpdir}/$i" | grep "^[<>]" | grep -Evq "^< (Load|Add)Module "
>+	diff "${confdir}/$i" "${tmpdir}/$i" | grep "^[<>]" | sed -e 's/#//g' | grep -Evq "^<[[:blank:]]+LoadModule"
> 	GREPRC=$?
> 	# last grep should not find anything
> 	if [ "x${AWKRC}" = "x0" -a "x${GREPRC}" = "x1"  ] ; then
>Index: subversion/files/pkg-install.in
>===================================================================
>RCS file: /home/pcvs/ports/devel/subversion/files/pkg-install.in,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-install.in
>--- subversion/files/pkg-install.in	19 Apr 2010 10:39:12 -0000	1.1
>+++ subversion/files/pkg-install.in	11 Jan 2012 22:47:46 -0000
>@@ -43,7 +43,7 @@
> fi
> 
> # use only 'egrep -e' else the check works not correct
>-if [ ! -n "`egrep -e '^(Load|Add)Module.*dav_module' ${SYSCONFDIR}/${CONFFILE}`" ]; then
>+if [ ! -n "`egrep -e '^LoadModule[[:blank:]]+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
>Index: subversion16/files/pkg-deinstall.in
>===================================================================
>RCS file: /home/pcvs/ports/devel/subversion16/files/pkg-deinstall.in,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-deinstall.in
>--- subversion16/files/pkg-deinstall.in	19 Apr 2010 10:39:12 -0000	1.1
>+++ subversion16/files/pkg-deinstall.in	11 Jan 2012 22:47:46 -0000
>@@ -51,15 +51,12 @@
> 
> for i in ${conffile}; do
> 	echo -n Removing dav_svn_module, authz_svn_module and dontdothat_module from $i in config dir: ${confdir}...
>-	awk '{if (!/^LoadModule dav_svn_module/    && 
>-		  !/^AddModule mod_dav_svn.c/      && \
>-		  !/^LoadModule authz_svn_module/  && \
>-		  !/^AddModule mod_authz_svn.c/    && \
>-		  !/^LoadModule dontdothat_module/ && \
>-		  !/^AddModule mod_dontdothat.c/    ) \
>+	awk '{if (!/LoadModule[[:blank:]]+dav_svn_module/    &&
>+		  !/LoadModule[[:blank:]]+authz_svn_module/  &&
>+		  !/LoadModule[[:blank:]]+dontdothat_module/ )
> 	    print $0}' < "${confdir}/$i" > "${tmpdir}/$i"
> 	AWKRC=$?
>-	diff "${confdir}/$i" "${tmpdir}/$i" | grep "^[<>]" | grep -Evq "^< (Load|Add)Module "
>+	diff "${confdir}/$i" "${tmpdir}/$i" | grep "^[<>]" | sed -e 's/#//g' | grep -Evq "^<[[:blank:]]+LoadModule"
> 	GREPRC=$?
> 	# last grep should not find anything
> 	if [ "x${AWKRC}" = "x0" -a "x${GREPRC}" = "x1"  ] ; then
>Index: subversion16/files/pkg-install.in
>===================================================================
>RCS file: /home/pcvs/ports/devel/subversion16/files/pkg-install.in,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-install.in
>--- subversion16/files/pkg-install.in	19 Apr 2010 10:39:12 -0000	1.1
>+++ subversion16/files/pkg-install.in	11 Jan 2012 22:47:46 -0000
>@@ -43,7 +43,7 @@
> fi
> 
> # use only 'egrep -e' else the check works not correct
>-if [ ! -n "`egrep -e '^(Load|Add)Module.*dav_module' ${SYSCONFDIR}/${CONFFILE}`" ]; then
>+if [ ! -n "`egrep -e '^LoadModule[[:blank:]]+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

Actions: View

Attachments on bug 164033: 121121