From nobody@FreeBSD.org  Tue Jun 17 15:15:17 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 296AD1065678
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Jun 2008 15:15:17 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 1265B8FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Jun 2008 15:15:17 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m5HFFGP3028350
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Jun 2008 15:15:16 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m5HFFGAd028349;
	Tue, 17 Jun 2008 15:15:16 GMT
	(envelope-from nobody)
Message-Id: <200806171515.m5HFFGAd028349@www.freebsd.org>
Date: Tue, 17 Jun 2008 15:15:16 GMT
From: Sven Klose <pixel@copei.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] www/mod_lisp2: FIX: Generates incorrect LoadModule directive in apache22's httpd.conf
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: viktor.leis@googlemail.com

>Number:         124674
>Category:       ports
>Synopsis:       [patch] www/mod_lisp2: FIX: Generates incorrect LoadModule directive in apache22's httpd.conf
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 17 15:20:03 UTC 2008
>Closed-Date:    Sat Jun 21 12:37:10 UTC 2008
>Last-Modified:  Sat Jun 21 12:40:03 UTC 2008
>Originator:     Sven Klose
>Release:        FreeBSD 7.0-RELEASE-p1 #3 amd64
>Organization:
Softwarearchitekturbuero Sven Klose
>Environment:
>Description:
The following line is inserted into httpd.conf

#LoadModule lisp2_module       libexec/apache22/mod_lisp2.so

which is incorrect, because the symbol 'lisp_module' is used in mod_lisp2.c instead of 'lisp2_module'.

The attached version adds a patch to fix the symbol name in the source file.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	mod_lisp2
#	mod_lisp2/Makefile
#	mod_lisp2/distinfo
#	mod_lisp2/pkg-descr
#	mod_lisp2/files
#	mod_lisp2/files/patch-aa
#
echo c - mod_lisp2
mkdir -p mod_lisp2 > /dev/null 2>&1
echo x - mod_lisp2/Makefile
sed 's/^X//' >mod_lisp2/Makefile << 'END-of-mod_lisp2/Makefile'
X# Ports collection makefile for:	mod_lisp2
X# Date created:				Tue Jul 17 2007
X# Whom:					vl
X#
X# $FreeBSD: ports/www/mod_lisp2/Makefile,v 1.1 2007/07/29 11:54:15 pav Exp $
X#
X
XPORTNAME=	mod_lisp2
XPORTVERSION=	1.3.1
XCATEGORIES=	www
XMASTER_SITES=	http://freebsd.minira.nl/
X
XMAINTAINER=	viktor.leis@googlemail.com
XCOMMENT=	Apache2 module for use with Common Lisp
X
XUSE_APACHE=	20+
XAP_FAST_BUILD=	YES
XAP_GENPLIST=	YES
X
X.include <bsd.port.mk>
END-of-mod_lisp2/Makefile
echo x - mod_lisp2/distinfo
sed 's/^X//' >mod_lisp2/distinfo << 'END-of-mod_lisp2/distinfo'
XMD5 (mod_lisp2-1.3.1.tar.gz) = a5cb746e793b65e5801c8b77dbde023d
XSHA256 (mod_lisp2-1.3.1.tar.gz) = 5af4bb8fd46b5f62266e46fcf037015ddc9d24ed4d212cc08fd383110a4d6c20
XSIZE (mod_lisp2-1.3.1.tar.gz) = 7972
END-of-mod_lisp2/distinfo
echo x - mod_lisp2/pkg-descr
sed 's/^X//' >mod_lisp2/pkg-descr << 'END-of-mod_lisp2/pkg-descr'
Xmod_lisp is an Apache 2 module for writing web applications in Common
XLisp. It is distributed with a BSD-style license.
X
XWWW: http://www.fractalconcept.com/asp/html/mod_lisp.html
END-of-mod_lisp2/pkg-descr
echo c - mod_lisp2/files
mkdir -p mod_lisp2/files > /dev/null 2>&1
echo x - mod_lisp2/files/patch-aa
sed 's/^X//' >mod_lisp2/files/patch-aa << 'END-of-mod_lisp2/files/patch-aa'
X--- mod_lisp2.c.orig	2008-06-17 17:00:04.000000000 +0200
X+++ mod_lisp2.c	2008-06-17 17:00:20.000000000 +0200
X@@ -942,7 +942,7 @@
X   ap_hook_handler (lisp_handler, 0, 0, APR_HOOK_MIDDLE);
X }
X 
X-module AP_MODULE_DECLARE_DATA lisp_module =
X+module AP_MODULE_DECLARE_DATA lisp2_module =
X {
X   STANDARD20_MODULE_STUFF,
X   lisp_create_dir_config,	/* create per-directory config structures */
END-of-mod_lisp2/files/patch-aa
exit



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Jun 17 15:20:13 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: viktor.leis@googlemail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/124674: [patch] www/mod_lisp2: FIX: Generates incorrect LoadModule directive in apache22's httpd.conf
Date: Tue, 17 Jun 2008 15:20:11 UT

 Maintainer of www/mod_lisp2,
 
 Please note that PR ports/124674 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.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/124674
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Viktor Leis <viktor.leis@stud.fh-regensburg.de>
To: bug-followup@FreeBSD.org, pixel@copei.de
Cc:  
Subject: Re: ports/124674: [patch] www/mod_lisp2: FIX: Generates incorrect
 LoadModule directive in apache22's httpd.conf
Date: Tue, 17 Jun 2008 19:07:59 +0200

 bugfix is ok.
 
 --
 Viktor Leis

From: "Viktor Leis" <viktor.leis@googlemail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/124674: [patch] www/mod_lisp2: FIX: Generates incorrect LoadModule directive in apache22's httpd.conf
Date: Tue, 17 Jun 2008 19:11:04 +0200

 I approve the patch.
 
 Viktor Leis

From: Sven Klose <pixel@copei.de>
To: edwin@FreeBSD.org
Cc: freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/124674: [patch] www/mod_lisp2: FIX: Generates incorrect
 LoadModule directive in apache22's httpd.conf
Date: Tue, 17 Jun 2008 18:00:27 +0200

 This is a multi-part message in MIME format.
 --------------010407000409050009080701
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 I messed up. Here's a more sane version of the fix.
 
 --------------010407000409050009080701
 Content-Type: text/plain;
  name="mod_lisp2.shar.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="mod_lisp2.shar.txt"
 
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #	mod_lisp2
 #	mod_lisp2/Makefile
 #	mod_lisp2/distinfo
 #	mod_lisp2/pkg-descr
 #	mod_lisp2/files
 #	mod_lisp2/files/patch-aa
 #
 echo c - mod_lisp2
 mkdir -p mod_lisp2 > /dev/null 2>&1
 echo x - mod_lisp2/Makefile
 sed 's/^X//' >mod_lisp2/Makefile << 'END-of-mod_lisp2/Makefile'
 X# Ports collection makefile for:	mod_lisp2
 X# Date created:				Tue Jul 17 2007
 X# Whom:					vl
 X#
 X# $FreeBSD: ports/www/mod_lisp2/Makefile,v 1.1 2007/07/29 11:54:15 pav Exp $
 X#
 X
 XPORTNAME=	mod_lisp2
 XPORTVERSION=	1.3.1
 XCATEGORIES=	www
 XMASTER_SITES=	http://freebsd.minira.nl/
 X
 XMAINTAINER=	viktor.leis@googlemail.com
 XCOMMENT=	Apache2 module for use with Common Lisp
 X
 XUSE_APACHE=	20+
 XAP_FAST_BUILD=	YES
 XAP_GENPLIST=	YES
 X
 X.include <bsd.port.mk>
 END-of-mod_lisp2/Makefile
 echo x - mod_lisp2/distinfo
 sed 's/^X//' >mod_lisp2/distinfo << 'END-of-mod_lisp2/distinfo'
 XMD5 (mod_lisp2-1.3.1.tar.gz) = a5cb746e793b65e5801c8b77dbde023d
 XSHA256 (mod_lisp2-1.3.1.tar.gz) = 5af4bb8fd46b5f62266e46fcf037015ddc9d24ed4d212cc08fd383110a4d6c20
 XSIZE (mod_lisp2-1.3.1.tar.gz) = 7972
 END-of-mod_lisp2/distinfo
 echo x - mod_lisp2/pkg-descr
 sed 's/^X//' >mod_lisp2/pkg-descr << 'END-of-mod_lisp2/pkg-descr'
 Xmod_lisp is an Apache 2 module for writing web applications in Common
 XLisp. It is distributed with a BSD-style license.
 X
 XWWW: http://www.fractalconcept.com/asp/html/mod_lisp.html
 END-of-mod_lisp2/pkg-descr
 echo c - mod_lisp2/files
 mkdir -p mod_lisp2/files > /dev/null 2>&1
 echo x - mod_lisp2/files/patch-aa
 sed 's/^X//' >mod_lisp2/files/patch-aa << 'END-of-mod_lisp2/files/patch-aa'
 X--- mod_lisp2.c.orig	2008-06-17 17:51:40.000000000 +0200
 X+++ mod_lisp2.c	2008-06-17 17:53:20.000000000 +0200
 X@@ -153,7 +153,7 @@
 X #include <stdlib.h>
 X #include <string.h>
 X 
 X-module AP_MODULE_DECLARE_DATA lisp_module;
 X+module AP_MODULE_DECLARE_DATA lisp2_module;
 X /* Work out the version of the apache portable runtime (APR) we're
 X  * compiling against... with version 1.2.2 some of the interfaces
 X  * changed a bit. */
 X@@ -576,7 +576,7 @@
 X lisp_handler (request_rec * r)
 X {
 X   lisp_cfg_t * cfg
 X-    = (ap_get_module_config ((r->per_dir_config), (&lisp_module)));
 X+    = (ap_get_module_config ((r->per_dir_config), (&lisp2_module)));
 X   int content_length = (-1);
 X   int keep_socket_p = 0;
 X   apr_socket_t * socket;
 X@@ -942,7 +942,7 @@
 X   ap_hook_handler (lisp_handler, 0, 0, APR_HOOK_MIDDLE);
 X }
 X 
 X-module AP_MODULE_DECLARE_DATA lisp_module =
 X+module AP_MODULE_DECLARE_DATA lisp2_module =
 X {
 X   STANDARD20_MODULE_STUFF,
 X   lisp_create_dir_config,	/* create per-directory config structures */
 END-of-mod_lisp2/files/patch-aa
 exit
 
 
 --------------010407000409050009080701--
 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Jun 21 12:37:09 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/124674: commit references a PR
Date: Sat, 21 Jun 2008 12:36:48 +0000 (UTC)

 miwi        2008-06-21 12:36:42 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/mod_lisp2        Makefile 
   Added files:
     www/mod_lisp2/files  patch-mod_lisp2.c 
   Log:
   - Fix generates incorrect LoadModule directive in apache22's httpd.conf
   
   PR:             124674
   Submitted by:   Sven Klose <pixel@copei.de>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.2       +1 -0      ports/www/mod_lisp2/Makefile
   1.1       +29 -0     ports/www/mod_lisp2/files/patch-mod_lisp2.c (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:
