From root@master.network-asp.biz  Tue May  1 08:29:33 2007
Return-Path: <root@master.network-asp.biz>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3B2C416A402
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2007 08:29:33 +0000 (UTC)
	(envelope-from root@master.network-asp.biz)
Received: from master.network-asp.biz (master.network-asp.biz [212.26.159.10])
	by mx1.freebsd.org (Postfix) with ESMTP id C806913C457
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2007 08:29:32 +0000 (UTC)
	(envelope-from root@master.network-asp.biz)
Received: by master.network-asp.biz (Postfix, from userid 0)
	id E686768F006; Tue,  1 May 2007 11:29:22 +0300 (EEST)
Message-Id: <20070501082922.E686768F006@master.network-asp.biz>
Date: Tue,  1 May 2007 11:29:22 +0300 (EEST)
From: Sergey Prikhodko <sergey@network-asp.biz>
Reply-To: Sergey Prikhodko <sergey@network-asp.biz>
To: FreeBSD-gnats-submit@freebsd.org
Cc: vivek@khera.org
Subject: www/rt36: add missed patches for MULTIPLE_INSTANCES
X-Send-Pr-Version: 3.113
X-GNATS-Notify: vivek@khera.org

>Number:         112287
>Category:       ports
>Synopsis:       www/rt36: add missed patches for MULTIPLE_INSTANCES
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 01 08:30:02 GMT 2007
>Closed-Date:    Sun Jun 24 15:15:01 GMT 2007
>Last-Modified:  Sun Jun 24 15:20:08 GMT 2007
>Originator:     Sergey Prikhodko
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
Network-APS
>Environment:
System: FreeBSD master.network-asp.biz 5.4-STABLE FreeBSD 5.4-STABLE #2: Fri Nov 4 15:03:13 EET 2005 root@master.network-asp.biz:/usr/obj/usr/src/sys/ROUTER i386

>Description:
	Patches for instances was missed in ports/99660 but MULTIPLE_INSTANCES 
	configuration knob still exists.

>How-To-Repeat:
	Try to upgrade rt34->rt36 and look at broken ticket system instances.

>Fix:

--- patch-rt36 begins here ---
diff -ruN rt36.orig/Makefile rt36/Makefile
--- rt36.orig/Makefile	Fri Dec 22 19:07:38 2006
+++ rt36/Makefile	Mon Apr 30 23:04:03 2007
@@ -108,6 +108,9 @@
 		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
 .endif
 .endif
+.if defined(MULTIPLE_INSTANCES)
+EXTRA_PATCHES+=	${FILESDIR}/multiple*
+.endif
 
 DB_TYPE?=	mysql
 
diff -ruN rt36.orig/files/multiple-bin-webmux_pl_in rt36/files/multiple-bin-webmux_pl_in
--- rt36.orig/files/multiple-bin-webmux_pl_in	Thu Jan  1 03:00:00 1970
+++ rt36/files/multiple-bin-webmux_pl_in	Mon Apr 30 23:05:37 2007
@@ -0,0 +1,15 @@
+--- bin/webmux.pl.in.orig	Tue Sep 26 18:06:31 2006
++++ bin/webmux.pl.in	Mon Apr 30 23:04:45 2007
+@@ -63,6 +63,12 @@
+ }
+ 
+ use lib ( "@LOCAL_LIB_PATH@", "@RT_LIB_PATH@" );
++if ($ENV{RT_INSTANCE_PATH}) {
++    lib->import("$ENV{RT_INSTANCE_PATH}/local/lib");
++}
++if ($ENV{RT_VENDOR_PATH}) {
++    lib->import($ENV{RT_VENDOR_PATH});
++}
+ use RT;
+ 
+ package RT::Mason;
diff -ruN rt36.orig/files/multiple-lib-RT_pm_in rt36/files/multiple-lib-RT_pm_in
--- rt36.orig/files/multiple-lib-RT_pm_in	Thu Jan  1 03:00:00 1970
+++ rt36/files/multiple-lib-RT_pm_in	Mon Apr 30 23:07:18 2007
@@ -0,0 +1,63 @@
+--- lib/RT.pm.in.orig	Mon Nov  6 21:09:32 2006
++++ lib/RT.pm.in	Mon Apr 30 23:04:45 2007
+@@ -98,6 +98,60 @@
+ # via the web interface)
+ $MasonSessionDir = '@MASON_SESSION_PATH@';
+ 
++=item import
++
++Allow override of various internal paths.
++
++    RT->import (
++            RT_INSTANCE_PATH => '/usr/local/rt/stuff',
++            SITE_CONFIG_FILE => '/etc/stuff.pm',
++              ...
++    );
++
++If RT_INSTANCE_PATH is set in the arguments (or in %ENV)
++then it replaces the old value of $BasePath in the following
++variables:
++  $SITE_CONFIG_FILE
++  $LocalPath
++  $LocalEtcPath
++  $LocalLexiconPath
++  $MasonLocalComponentRoot
++  $MasonDataDir
++  $MasonSessionDir
++
++Beyond that, those individual values can be set explicitly
++by arguments.
++
++=cut
++
++sub import {
++no strict 'refs';
++    shift;
++    my %args = @_;
++    return unless ( scalar (keys %args) || $ENV{RT_INSTANCE_PATH} );
++
++    my @variables = qw (
++        SITE_CONFIG_FILE
++        LocalPath
++        LocalEtcPath
++        LocalLexiconPath
++        MasonLocalComponentRoot
++        MasonDataDir
++        MasonSessionDir
++    );
++
++    my $RT_INSTANCE_PATH = $args{RT_INSTANCE_PATH} || $ENV{RT_INSTANCE_PATH};
++    if ($RT_INSTANCE_PATH) {
++        foreach my $vref (@variables) {
++            $$vref =~ s/^\Q$BasePath\E/$RT_INSTANCE_PATH/;
++        }
++    }
++    foreach my $vref (@variables) {
++        $$vref = $args{$vref} if defined ( $args{$vref} );
++    }
++
++use strict 'refs';
++}
+ 
+ 
+ =head1 NAME
diff -ruN rt36.orig/files/multiple-sbin-rt-setup-database_in rt36/files/multiple-sbin-rt-setup-database_in
--- rt36.orig/files/multiple-sbin-rt-setup-database_in	Thu Jan  1 03:00:00 1970
+++ rt36/files/multiple-sbin-rt-setup-database_in	Mon Apr 30 23:30:39 2007
@@ -0,0 +1,21 @@
+--- sbin/rt-setup-database.in.orig	Fri Dec  1 20:59:26 2006
++++ sbin/rt-setup-database.in	Mon Apr 30 23:04:45 2007
+@@ -51,11 +51,17 @@
+ 
+ use lib "@LOCAL_LIB_PATH@";
+ use lib "@RT_LIB_PATH@";
++## RT_INSTANCE_PATH can be passed in environment.
++## Can change where RT_SiteConfig is read from.
++my $RT_INSTANCE_PATH;
++BEGIN {
++    $RT_INSTANCE_PATH = $ENV{RT_INSTANCE_PATH};
++}
+ 
+ #This drags in  RT's config.pm
+ # We do it in a begin block because RT::Handle needs to know the type to do its
+ # inheritance
+-use RT;
++use RT (RT_INSTANCE_PATH => $RT_INSTANCE_PATH);
+ use Carp;
+ use RT::User;
+ use RT::CurrentUser;
--- patch-rt36 ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue May 1 08:30:12 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112287 

From: Vivek Khera <vivek@khera.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/112287: www/rt36: add missed patches for MULTIPLE_INSTANCES
Date: Tue, 1 May 2007 15:44:21 -0400

 --Apple-Mail-4-25482924
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=US-ASCII;
 	delsp=yes;
 	format=flowed
 
 
 On May 1, 2007, at 4:30 AM, Edwin Groothuis wrote:
 
 > Maintainer of www/rt36,
 >
 > Please note that PR ports/112287 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 
 I accept these patches for the port.  Please commit them as time  
 permits.
 
 
 --Apple-Mail-4-25482924
 Content-Transfer-Encoding: base64
 Content-Type: application/pkcs7-signature;
 	name=smime.p7s
 Content-Disposition: attachment;
 	filename=smime.p7s
 
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIGlDCCAz8w
 ggKooAMCAQICAQ0wDQYJKoZIhvcNAQEFBQAwgdExCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0
 ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcx
 KDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0
 ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxA
 dGhhd3RlLmNvbTAeFw0wMzA3MTcwMDAwMDBaFw0xMzA3MTYyMzU5NTlaMGIxCzAJBgNVBAYTAlpB
 MSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUg
 UGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
 xKY8VXNV+065yplaHmjAdQRwnd/p/6Me7L3N9VvyGna9fww6YfK/Uc4B1OVQCjDXAmNaLIkVcI7d
 yfArhVqqP3FWy688Cwfn8R+RNiQqE88r1fOCdz0Dviv+uxg+B79AgAJk16emu59l0cUqVIUPSAR/
 p7bRPGEEQB5kGXJgt/sCAwEAAaOBlDCBkTASBgNVHRMBAf8ECDAGAQH/AgEAMEMGA1UdHwQ8MDow
 OKA2oDSGMmh0dHA6Ly9jcmwudGhhd3RlLmNvbS9UaGF3dGVQZXJzb25hbEZyZWVtYWlsQ0EuY3Js
 MAsGA1UdDwQEAwIBBjApBgNVHREEIjAgpB4wHDEaMBgGA1UEAxMRUHJpdmF0ZUxhYmVsMi0xMzgw
 DQYJKoZIhvcNAQEFBQADgYEASIzRUIPqCy7MDaNmrGcPf6+svsIXoUOWlJ1/TCG4+DYfqi2fNi/A
 9BxQIJNwPP2t4WFiw9k6GX6EsZkbAMUaC4J0niVQlGLH2ydxVyWN3amcOY6MIE9lX5Xa9/eH1sYI
 Tq726jTlEBpbNU1341YheILcIRk13iSx0x1G/11fZU8wggNNMIICtqADAgECAhA6sDoA4m3lcimf
 yUtGSQgmMA0GCSqGSIb3DQEBBAUAMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29u
 c3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNz
 dWluZyBDQTAeFw0wNjA1MDIxNDEyNDdaFw0wNzA1MDIxNDEyNDdaMIGKMR8wHQYDVQQDExZUaGF3
 dGUgRnJlZW1haWwgTWVtYmVyMR4wHAYJKoZIhvcNAQkBFg92aXZla0BraGVyYS5vcmcxIDAeBgkq
 hkiG9w0BCQEWEWtoZXJhQGtjaWxpbmsuY29tMSUwIwYJKoZIhvcNAQkBFhZ2aXZla0BtYWlsZXJt
 YWlsZXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq+zHKYq9vZ4Dq1itNqT/
 OeJvWDvQ5JdQlRzwsJlvtJBknXsnOaJNabmjnu2s6XFMcP2srBZQ/WPvhsClajLQOcxnarrfB66N
 DpMzXTxfYzX6m9TA/fEn64sNn+YnBZL6Dvid9kiAgP9LmqcTOIFdWUya3ZmQS5YTuLB+tkFSL8/h
 +inDPN6dcsna8TcM1SAk+3upxOR7kyFM9T3vy25w62Nh1zK7Stp0vUZLU6GzzC1VvHGZHKGticD6
 o3uHaMr2LCFjptoIcfZL75LO/UaR9o7smgboW4yJyW5g9ZasyYQUXyvkitfyZuVWATb8ZSHOkjWJ
 872Pyf5+HOevVUI0aQIDAQABo1cwVTBFBgNVHREEPjA8gQ92aXZla0BraGVyYS5vcmeBEWtoZXJh
 QGtjaWxpbmsuY29tgRZ2aXZla0BtYWlsZXJtYWlsZXIuY29tMAwGA1UdEwEB/wQCMAAwDQYJKoZI
 hvcNAQEEBQADgYEAYpaFKDj47pTQIUQi28MgtjKophopv4QJjvspXmy0qxd8t/M/zc7HuBy3i/9a
 PrXDgKyNBzzlFTasTazAY53ntVpqw9k1NOeHmH6o3j/DBVa49bC6bbWfp9UGOwYChlDR0tngQZyC
 MDMZEdYv4zpGfBTku5m1jb8Yz/qYqV4FWB4xggMQMIIDDAIBATB2MGIxCzAJBgNVBAYTAlpBMSUw
 IwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVy
 c29uYWwgRnJlZW1haWwgSXNzdWluZyBDQQIQOrA6AOJt5XIpn8lLRkkIJjAJBgUrDgMCGgUAoIIB
 bzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNzA1MDExOTQ0MjJa
 MCMGCSqGSIb3DQEJBDEWBBQHFTfUTlyK8yShXvl8Axrm8BoC1DCBhQYJKwYBBAGCNxAEMXgwdjBi
 MQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoG
 A1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3VpbmcgQ0ECEDqwOgDibeVyKZ/JS0ZJ
 CCYwgYcGCyqGSIb3DQEJEAILMXigdjBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENv
 bnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElz
 c3VpbmcgQ0ECEDqwOgDibeVyKZ/JS0ZJCCYwDQYJKoZIhvcNAQEBBQAEggEAb3T6Z/ACDjzgafMQ
 dbFUOiI6L2drysoJ4MX9lOwYJaddOdEc4y+we7J/wyvkM1eSMWHGKFFdShJywZvjCYGnz6BlEB3w
 B+AxmpTj77Xgiby116PNorfXkknTJKVgNZFQG/kSB3uz1VgofsfL69VJkvjKST6aO3V8PnSXr5VJ
 Tv90GCYBvJ7CVJIkKZQde7SkZP8JNQaKko5FnZkOQHzljyzjllryJ7KGyP73tqA+0sYXdZMkTHNL
 NVdQQ0IRrGoRAlWcsgvc7SfIQT/bLq6ZR5uI9wk/QtYrKRl3pPPqBLn3HJ3N57QpJlXZ8iGri6Ok
 1lGL/vUq/+XMrwTwHGbB7AAAAAAAAA==
 
 --Apple-Mail-4-25482924--
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Sun Jun 17 22:57:05 UTC 2007 
State-Changed-Why:  
maintainer approved 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112287 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sun Jun 24 15:14:58 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112287 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/112287: commit references a PR
Date: Sun, 24 Jun 2007 15:15:02 +0000 (UTC)

 rafan       2007-06-24 15:14:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/rt36             Makefile 
   Added files:
     www/rt36/files       multiple-bin-webmux_pl_in 
                          multiple-lib-RT_pm_in 
                          multiple-sbin-rt-setup-database_in 
   Log:
   - Add missing patch for MULTIPLE_INSTANCES
   
   PR:           ports/112287
   Submitted by: Sergey Prikhodko <sergey at network-asp.biz>
   Approved by:  Vivek Khera <vivek at khera.org> (maintainer)
   
   Revision  Changes    Path
   1.60      +3 -0      ports/www/rt36/Makefile
   1.3       +15 -0     ports/www/rt36/files/multiple-bin-webmux_pl_in (new)
   1.3       +63 -0     ports/www/rt36/files/multiple-lib-RT_pm_in (new)
   1.3       +21 -0     ports/www/rt36/files/multiple-sbin-rt-setup-database_in (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
