From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 16 14:50:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C4979C15 for ; Fri, 16 Aug 2013 14:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A11FB2BA3 for ; Fri, 16 Aug 2013 14:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7GEo0lg030320 for ; Fri, 16 Aug 2013 14:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7GEo0Wf030319; Fri, 16 Aug 2013 14:50:00 GMT (envelope-from gnats) Resent-Date: Fri, 16 Aug 2013 14:50:00 GMT Resent-Message-Id: <201308161450.r7GEo0Wf030319@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Warren Block Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 01343B2F for ; Fri, 16 Aug 2013 14:44:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E15C12B5F for ; Fri, 16 Aug 2013 14:44:52 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7GEiqse021888 for ; Fri, 16 Aug 2013 14:44:52 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7GEiqUP021877; Fri, 16 Aug 2013 14:44:52 GMT (envelope-from nobody) Message-Id: <201308161444.r7GEiqUP021877@oldred.freebsd.org> Date: Fri, 16 Aug 2013 14:44:52 GMT From: Warren Block To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181340: [patch] devel/subversion: don't overwrite modified svnserve script X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Aug 2013 14:50:00 -0000 >Number: 181340 >Category: ports >Synopsis: [patch] devel/subversion: don't overwrite modified svnserve script >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Aug 16 14:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Warren Block >Release: 9.2-PRERELEASE >Organization: >Environment: FreeBSD lightning 9.2-PRERELEASE FreeBSD 9.2-PRERELEASE #0 r254408: Fri Aug 16 07:38:51 MDT 2013 root@lightning:/usr/obj/usr/src/sys/LIGHTNING amd64 >Description: When the svnserve script is used, it must be modified to point to the repository directory with the --root= option. The port does not recognize that this script has been modified, deleting and rewriting every time the port is updated. >How-To-Repeat: Install devel/subversion with the SVNSERVE_WRAPPER option enabled. Modify /usr/local/bin/svnserve. Reinstall the port, and the modified /usr/local/bin/svnserve is overwritten. >Fix: Apply attached patch. (Thanks for assistance from nox@.) Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 324792) +++ Makefile (working copy) @@ -44,7 +44,7 @@ SUB_FILES= pkg-install \ pkg-deinstall - + BOOK_VERSION= 4515 .if make(repository) @@ -69,10 +69,12 @@ .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} PLIST_SUB+= SVNSERVE_WRAPPER="" +PLIST_SUB+= NO_SVNSERVE_WRAPPER="@comment " SUB_LIST+= SVNSERVE_BIN_EXT=".bin" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-svnserve-wrapper .else PLIST_SUB+= SVNSERVE_WRAPPER="@comment " +PLIST_SUB+= NO_SVNSERVE_WRAPPER="" SUB_LIST+= SVNSERVE_BIN_EXT="" .endif @@ -230,13 +232,13 @@ fi .endif .if ${PORT_OPTIONS:MSTATIC} - @if grep -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \ + @if ${GREP} -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "You can not build static subversion if your SQLite3 is built with ICU enabled."; \ ${ECHO_MSG} "Please, reinstall 'devel/sqlite3' port with disabled ICU support."; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ - fi + fi .endif # takes a long time, and will fail but gives maintainer a good oversight @@ -287,7 +289,10 @@ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin .endif .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} - @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve + @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve.sample + @if [ ! -f "${PREFIX}/bin/svnserve" ]; then \ + ${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve ; \ + fi .endif repository: _mkrepos Index: pkg-plist =================================================================== --- pkg-plist (revision 324792) +++ pkg-plist (working copy) @@ -5,8 +5,13 @@ bin/svnlook bin/svnmucc bin/svnrdump -bin/svnserve bin/svnsync +bin/svnversion +%%NO_SVNSERVE_WRAPPER%%bin/svnserve +%%SVNSERVE_WRAPPER%%@unexec if cmp -s %D/bin/svnserve.sample %D/bin/svnserve; then rm -r %D/bin/svnserve; fi +%%SVNSERVE_WRAPPER%%bin/svnserve.bin +%%SVNSERVE_WRAPPER%%bin/svnserve.sample +%%SVNSERVE_WRAPPER%%@exec if [ ! -f %D/bin/svnserve ] ; then cp -p %D/%F %B/bin/svnserve; fi %%ASVN%%bin/asvn %%TOOLS%%bin/fsfs-access-map %%TOOLS%%bin/fsfs-reorg @@ -17,8 +22,6 @@ %%TOOLS%%bin/svnauthz %%TOOLS%%bin/svnauthz-validate %%TOOLS%%bin/svnraisetreeconflict -%%SVNSERVE_WRAPPER%%bin/svnserve.bin -bin/svnversion include/subversion-1/mod_authz_svn.h include/subversion-1/mod_dav_svn.h include/subversion-1/svn-revision.txt >Release-Note: >Audit-Trail: >Unformatted: