From serge@quenix1.dyndns.org  Sun Aug 21 17:39:21 2005
Return-Path: <serge@quenix1.dyndns.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0551716A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 17:39:21 +0000 (GMT)
	(envelope-from serge@quenix1.dyndns.org)
Received: from relais.videotron.ca (relais.videotron.ca [24.201.245.36])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7F32243D48
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 17:39:18 +0000 (GMT)
	(envelope-from serge@quenix1.dyndns.org)
Received: from quenix2.dyndns.org ([66.131.244.21])
 by VL-MO-MR007.ip.videotron.ca
 (iPlanet Messaging Server 5.2 HotFix 1.21 (built Sep  8 2003))
 with ESMTP id <0ILL00A6I2DHGV@VL-MO-MR007.ip.videotron.ca> for
 FreeBSD-gnats-submit@freebsd.org; Sun, 21 Aug 2005 13:39:17 -0400 (EDT)
Received: from [192.168.0.11] (helo=quenix1.dyndns.org)
	by quenix2.dyndns.org with esmtp (Exim 4.52 (FreeBSD))
	id 1E7GIP-00027O-80; Mon, 22 Aug 2005 13:41:17 -0400
Received: from serge by quenix1.dyndns.org with local (Exim 4.52 (FreeBSD))
	id 1E6toV-000GN5-Qr; Sun, 21 Aug 2005 13:40:55 -0400
Message-Id: <E1E6toV-000GN5-Qr@quenix1.dyndns.org>
Date: Sun, 21 Aug 2005 13:40:55 -0400
From: Serge Gagnon <serge.gagnon@b2b2c.ca>
Sender: Serge Gagnon <serge@quenix1.dyndns.org>
Reply-To: Serge Gagnon <serge.gagnon@b2b2c.ca>
To: FreeBSD-gnats-submit@freebsd.org
Cc: frank@opengroupware.org
Subject: [PATCH] misc/linux-opengroupware
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         85191
>Category:       ports
>Synopsis:       [PATCH] misc/linux-opengroupware
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 21 17:40:07 GMT 2005
>Closed-Date:    Thu Nov 10 23:32:51 GMT 2005
>Last-Modified:  Thu Nov 10 23:32:51 GMT 2005
>Originator:     Serge Gagnon
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix1.dyndns.org 5.4-STABLE FreeBSD 5.4-STABLE #0: Sat Aug 6 12:15:25 EDT 2005 root@quenix1.dyndns.org:/usr/obj/usr/src/sys/OCEAN i386


>Description:

	- Fix MASTER_SITES (Makefile)
	- Add two missing symlink in ${LINUXBASE}/lib/ (Makefile)
	- Now load graphic with apache (scripts/patch_apache_version.pl)
	- Administrator must change/comment out a line in ${LOCALBASE}/etc/rc.d/ogo.sh in order to
	start OpenGroupware without an error message

>How-To-Repeat:
>Fix:


--- patch-linux-opengroupware begins here ---
diff -urN misc/linux-opengroupware.orig/Makefile misc/linux-opengroupware/Makefile
--- misc/linux-opengroupware.orig/Makefile	Mon Aug 22 12:43:20 2005
+++ misc/linux-opengroupware/Makefile	Mon Aug 22 13:14:18 2005
@@ -8,8 +8,8 @@
 PORTVERSION=	1.0
 PORTREVISION=	4
 CATEGORIES=	misc www linux
-MASTER_SITES=	http://download.opengroupware.org/packages/freebsd/linux-opengroupware/RPMS/:ogo \
-		http://download.opengroupware.org/packages/freebsd/linux-opengroupware/NGOBJWEB/:ngo \
+MASTER_SITES=	http://download.opengroupware.org/nightly/packages/freebsd/linux-opengroupware/RPMS/:ogo \
+		http://download.opengroupware.org/nightly/packages/freebsd/linux-opengroupware/NGOBJWEB/:ngo \
 		${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR= updates/8.0/en/os/${MACHINE_ARCH}
 PKGNAMEPREFIX=	linux-
@@ -204,6 +204,8 @@
 	@${ECHO} '/opt/opengroupware.org/Libraries/ix86/linux-gnu/gnu-fd-nil' >>${LINUXBASE}/etc/ld.so.conf
 	@${ECHO} '/usr/kerberos/lib' >>${LINUXBASE}/etc/ld.so.conf
 	@${LN} -sf ${LINUXBASE}/usr/lib/libpq.so.2 ${LINUXBASE}/usr/lib/libpq.so.3
+	@${LN} -sf ${LINUXBASE}/lib/libssl.so.0.9.6b ${LINUXBASE}/lib/libssl.so.9.6
+	@${LN} -sf ${LINUXBASE}/lib/ibcrypto.so.0.9.6b ${LINUXBASE}/lib/libcrypto.so.2
 	@${PREFIX}/sbin/ldconfig
 	@${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
 	@${CHOWN} -Rh ogo:skyrix ${LINUXBASE}/opt/skyrix
diff -urN misc/linux-opengroupware.orig/files/ogo.sh.sample misc/linux-opengroupware/files/ogo.sh.sample
--- misc/linux-opengroupware.orig/files/ogo.sh.sample	Mon Aug 22 13:18:48 2005
+++ misc/linux-opengroupware/files/ogo.sh.sample	Mon Aug 22 13:22:42 2005
@@ -25,7 +25,8 @@
 
 	[ -x ${OGO_BIN} ] && {
 		su -l ${OGO_USER} -c \
-			"./WOApps/OpenGroupware.woa/ix86/linux-gnu/gnu-fd-nil/OpenGroupware >>${LOG} 2>&1 &"
+# the next line must be comment out and modified to reflect your configuration in order to start OpenGroupware
+#			"./WOApps/OpenGroupware.woa/ix86/linux-gnu/gnu-fd-nil/OpenGroupware -WOHttpAllowHost '(localhost, you.yourdomain.org)' >>${LOG} 2>&1 &"
 		echo 'OpenGroupware started.'
 		echo "**** RECEIVED 'start' from STARTSCRIPT at `date` ****" >>${LOG}
 	}
diff -urN misc/linux-opengroupware.orig/scripts/patch_apache_version.pl misc/linux-opengroupware/scripts/patch_apache_version.pl
--- misc/linux-opengroupware.orig/scripts/patch_apache_version.pl	Mon Aug 22 12:47:57 2005
+++ misc/linux-opengroupware/scripts/patch_apache_version.pl	Mon Aug 22 13:01:55 2005
@@ -38,6 +38,12 @@
 	print AI "</LocationMatch>\n";
 	print AI "\n";
 	print AI "Alias /OpenGroupware.woa/WebServerResources/ \"/compat/linux/opt/opengroupware.org/WebServerResources/\"\n";
+	print AI "<Directory \"/compat/linux/opt/opengroupware.org/WebServerRessources/\">\n";
+	print AI "\tOptions Indexes Multiviews\n";
+	print AI "\tAllowOverride None\n";
+	print AI "\tOrder allow,deny\n";
+	print AI "\tAllow from all\n";
+	print AI "</Directory>\n";
 		print AI "Alias /ArticleImages \"/compat/linux/opt/opengroupware.org/news\"\n";
 	close(AI);
 } else {
--- patch-linux-opengroupware ends here ---


>Release-Note:
>Audit-Trail:

From: serge.gagnon@b2b2c.ca
To: bug-followup@FreeBSD.org
Cc: frank@opengroupware.org
Subject: Re: ports/85191: [PATCH] misc/linux-opengroupware
Date: Sun, 21 Aug 2005 21:38:47 -0400 (EDT)

 This message is in MIME format
 
 --Boundary_(ID_uGpuhRm+2weRNovnWZQwfw)
 Content-type: text/plain; charset=iso-8859-1
 Content-transfer-encoding: 7BIT
 
 fix a typo
 
 you must apply this patch after the one above
 
 sorry...
 
 -- 
 GAGNON serge <serge.gagnon@b2b2c.ca>
 
 --Boundary_(ID_uGpuhRm+2weRNovnWZQwfw)
 Content-type: text/plain; charset=iso-8859-1;
  name=patch-patch_apache_version.pl; SizeOnDisk=659
 Content-transfer-encoding: 7BIT
 Content-disposition: attachment; filename=patch-patch_apache_version.pl
 Content-description: patch-patch_apache_version.pl
 
 --- misc/linux-opengroupware/scripts/patch_apache_version.pl.orig	Mon Aug 22 21:
 31:36 2005
 +++ misc/linux-opengroupware/scripts/patch_apache_version.pl	Mon Aug 22 21:31:52
  2005
 @@ -38,7 +38,7 @@
  	print AI "</LocationMatch>\n";
  	print AI "\n";
  	print AI "Alias /OpenGroupware.woa/WebServerResources/ \"/compat/linux/opt/ope
 ngroupware.org/WebServerResources/\"\n";
 -	print AI "<Directory \"/compat/linux/opt/opengroupware.org/WebServerRessources
 /\">\n";
 +	print AI "<Directory \"/compat/linux/opt/opengroupware.org/WebServerResources\
 ">\n";
  	print AI "\tOptions Indexes Multiviews\n";
  	print AI "\tAllowOverride None\n";
  	print AI "\tOrder allow,deny\n";
 
 --Boundary_(ID_uGpuhRm+2weRNovnWZQwfw)--

From: serge.gagnon@b2b2c.ca
To: bug-followup@FreeBSD.org
Cc: frank@opengroupware.org
Subject: Re: ports/85191: [PATCH] misc/linux-opengroupware
Date: Sun, 21 Aug 2005 22:37:37 -0400 (EDT)

 My mua cut the lines the first time
 
 --- misc/linux-opengroupware/scripts/patch_apache_version.pl.orig       Mon Aug 22 21:31:36 2005
 +++ misc/linux-opengroupware/scripts/patch_apache_version.pl    Mon Aug 22 21:31:52 2005
 @@ -38,7 +38,7 @@
         print AI "</LocationMatch>\n";
         print AI "\n";
         print AI "Alias /OpenGroupware.woa/WebServerResources/ \"/compat/linux/opt/opengroupware.org/WebServerResources/\"\n";
 -       print AI "<Directory \"/compat/linux/opt/opengroupware.org/WebServerRessources/\">\n";
 +       print AI "<Directory \"/compat/linux/opt/opengroupware.org/WebServerResources\">\n";
         print AI "\tOptions Indexes Multiviews\n";
         print AI "\tAllowOverride None\n";
         print AI "\tOrder allow,deny\n";
 
 -- 
 GAGNON serge <serge.gagnon@b2b2c.ca>
State-Changed-From-To: open->feedback 
State-Changed-By: linimon 
State-Changed-When: Tue Oct 11 19:39:26 GMT 2005 
State-Changed-Why:  
To maintainer: do you approve of this update? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85191 
State-Changed-From-To: feedback->open 
State-Changed-By: mnag 
State-Changed-When: Sun Nov 6 00:30:19 GMT 2005 
State-Changed-Why:  
Feedback timeout. 

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

From: Frank Reppin <fr@skyrix.com>
To: bug-followup@FreeBSD.org, serge.gagnon@b2b2c.ca
Cc:  
Subject: Re: ports/85191: [PATCH] misc/linux-opengroupware
Date: Mon, 07 Nov 2005 17:42:11 +0100

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Hello,
 
 beeing quite late... but yes - I approve the suggested patches from Serge.
 Thankyou!
 
 cheers,
 
 Frank Reppin
 
 - --
 
 http://www.opengroupware.org
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFDb4Pi9Atrv5KxwOwRAt0nAJ43QSL2XRByP59frmbSH33YND+IZgCePwk7
 gTpodC5S1WevyWUuAkrtk0U=
 =G1tD
 -----END PGP SIGNATURE-----
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Nov 10 23:32:06 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85191 
>Unformatted:
