From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 4 13:00:17 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F54F10656C0 for ; Sat, 4 Jul 2009 13:00:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7667B8FC16 for ; Sat, 4 Jul 2009 13:00:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n64D0HC2024811 for ; Sat, 4 Jul 2009 13:00:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n64D0HZd024810; Sat, 4 Jul 2009 13:00:17 GMT (envelope-from gnats) Resent-Date: Sat, 4 Jul 2009 13:00:17 GMT Resent-Message-Id: <200907041300.n64D0HZd024810@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, "Alexey V. Degtyarev" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 210E6106564A for ; Sat, 4 Jul 2009 12:55:58 +0000 (UTC) (envelope-from alexey@hs-6.renatasystems.org) Received: from hs-6.renatasystems.org (hs-6.renatasystems.org [81.177.157.122]) by mx1.freebsd.org (Postfix) with ESMTP id 8C4E38FC08 for ; Sat, 4 Jul 2009 12:55:57 +0000 (UTC) (envelope-from alexey@hs-6.renatasystems.org) Received: from hs-6.renatasystems.org (localhost [127.0.0.1]) by hs-6.renatasystems.org (8.14.2/8.14.2) with ESMTP id n63KoNJb040042 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 4 Jul 2009 00:50:24 +0400 (MSD) (envelope-from alexey@hs-6.renatasystems.org) Received: (from root@localhost) by hs-6.renatasystems.org (8.14.2/8.14.2/Submit) id n63KoNbi040041; Sat, 4 Jul 2009 00:50:23 +0400 (MSD) (envelope-from alexey) Message-Id: <200907032050.n63KoNbi040041@hs-6.renatasystems.org> Date: Sat, 4 Jul 2009 00:50:23 +0400 (MSD) From: "Alexey V. Degtyarev" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/136318: [patch] ports-mgmt/tinderbox-devel incorrect WEBUI option handling X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Alexey V. Degtyarev" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jul 2009 13:00:17 -0000 >Number: 136318 >Category: ports >Synopsis: [patch] ports-mgmt/tinderbox-devel incorrect WEBUI option handling >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jul 04 13:00:16 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Alexey V. Degtyarev >Release: FreeBSD 6.3-RELEASE i386 >Organization: >Environment: System: FreeBSD renatasystems.org 6.3-RELEASE FreeBSD 6.3-RELEASE #2: Sat May 24 23:23:42 MSD 2008 root@renatasystems.org:/usr/obj/usr/src/sys/alexey i386 >Description: tinderbox-devel port has a number of patches files/patch-webui* which can not be applied with WEBUI option turned off: ===> Found saved configuration for tinderbox-devel-3.2_4 ===> Extracting for tinderbox-devel-3.2_4 => MD5 Checksum OK for tinderbox/tinderbox-3.2.tar.gz. => SHA256 Checksum OK for tinderbox/tinderbox-3.2.tar.gz. ===> Patching for tinderbox-devel-3.2_4 ===> Applying FreeBSD patches for tinderbox-devel-3.2_4 File to patch: ^C=> Patch patch-webui__core__TinderboxDS.php failed to apply cleanly. => Patch(es) patch-lib__buildscript patch-lib__tc_command.pl patch-lib__tc_command.sh patch-lib__tinderlib.sh patch-sql__schema.mysql.pre patch-sql__schema.pgsql.pre patch-sql__values.pfp patch-sql__values.pfr applied cleanly. This happens due to premature removing of the whole webui directory: .if !defined(WITH_WEBUI) post-extract: @${RM} -R ${WRKSRC}/webui .endif Secondly, pkg-message after port was installed shows notes about tinderbox webui configuration, which is rather confusing as soon as webui was completely disabled. Probably this also should be fixed in ports-mgmt/tinderbox port too. >How-To-Repeat: Just try to install ports-mgmt/tinderbox-devel having WEBUI option tunded off. >Fix: --- tinderbox-devel.patch begins here --- diff -u -rN tinderbox-devel.orig/Makefile tinderbox-devel/Makefile --- tinderbox-devel.orig/Makefile 2009-05-11 10:19:40.000000000 +0400 +++ tinderbox-devel/Makefile 2009-07-04 00:21:43.000000000 +0400 @@ -29,7 +29,6 @@ NO_BUILD= yes WANT_PERL= yes -SUB_FILES= pkg-message MAN1= tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \ tc-configJail.1 tc-configTinderd.1 tc-init.1 @@ -47,8 +46,10 @@ WANT_PHP_WEB= yes USE_PHP= session PLIST_SUB+= WEBUI="" +SUB_FILES+= pkg-message .else PLIST_SUB+= WEBUI="@comment " +SUB_FILES+= pkg-message-nowebui .endif .if defined(WITH_PGSQL) @@ -90,11 +91,6 @@ @${FALSE} .endif -.if !defined(WITH_WEBUI) -post-extract: - @${RM} -R ${WRKSRC}/webui -.endif - post-patch: .ifdef WITHOUT_CHECK_FOR_ROOT ${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \ @@ -102,6 +98,10 @@ .endif @cd ${WRKSRC} && ${FIND} . -name '*.orig' -exec ${RM} {} \; +.if !defined(WITH_WEBUI) + @${RM} -R ${WRKSRC}/webui +.endif + do-install: @${MKDIR} ${PREFIX}/tinderbox/scripts @${ECHO_CMD} "Installing man pages ..." diff -u -rN tinderbox-devel.orig/files/pkg-message-nowebui.in tinderbox-devel/files/pkg-message-nowebui.in --- tinderbox-devel.orig/files/pkg-message-nowebui.in 1970-01-01 03:00:00.000000000 +0300 +++ tinderbox-devel/files/pkg-message-nowebui.in 2009-07-04 00:16:50.000000000 +0400 @@ -0,0 +1,10 @@ + +=============================================================================== +ports-mgmt/tinderbox is now installed, but it requires some additional setup. + +**************************************************** +Please do read: %%PREFIX%%/tinderbox/scripts/README +**************************************************** + +============================================================================= + --- tinderbox-devel.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: