--- libapache2-mod-lisp-1.3.1.orig/Makefile +++ libapache2-mod-lisp-1.3.1/Makefile @@ -0,0 +1,19 @@ + +builddir=. +top_srcdir=/usr/share/apache2 +top_builddir=/usr/share/apache2 +include /usr/share/apache2/build/special.mk + +APXS=apxs + +all: local-shared-build + +install: install-modules-yes + +clean: + -rm -f mod_lisp.o mod_lisp.lo mod_lisp.slo mod_lisp.la + +.deps: + touch .deps + +.PHONY: all install clean --- libapache2-mod-lisp-1.3.1.orig/modules.mk +++ libapache2-mod-lisp-1.3.1/modules.mk @@ -0,0 +1,4 @@ +mod_lisp.la: mod_lisp.slo + $(SH_LINK) -rpath $(libexecdir) -module -avoid-version mod_lisp.lo +DISTCLEAN_TARGETS = modules.mk +shared = mod_lisp.la --- libapache2-mod-lisp-1.3.1.orig/mod_lisp.c +++ libapache2-mod-lisp-1.3.1/mod_lisp.c @@ -154,12 +154,6 @@ #include module AP_MODULE_DECLARE_DATA lisp_module; -/* Work out the version of the apache portable runtime (APR) we're - * compiling against... with version 1.2.2 some of the interfaces - * changed a bit. */ -#if (APR_MAJOR_VERSION==1 && APR_MINOR_VERSION==2 && APR_PATCH_VERSION>=2) -#define HAVE_APR_1_2_2 1 -#endif #define RELAY_ERROR(expr) do \ @@ -382,17 +376,9 @@ (apr_sockaddr_info_get ((&addr), (cfg->server_address), APR_UNSPEC, (cfg->server_port), 0, socket_pool)); -#if (HAVE_APR_1_2_2) RELAY_ERROR (apr_socket_create ((&socket), AF_INET, SOCK_STREAM, APR_PROTO_TCP, socket_pool)); -#else - RELAY_ERROR (apr_socket_create ((&socket), AF_INET, SOCK_STREAM, socket_pool)); -#endif -#if (HAVE_APR_1_2_2) RELAY_ERROR (apr_socket_connect (socket, addr)); -#else - RELAY_ERROR (apr_connect (socket, addr)); -#endif { input_buffer_t * buffer = (apr_palloc (socket_pool, (sizeof (input_buffer_t)))); @@ -425,11 +411,7 @@ while (1) { apr_size_t n2 = n1; -#if (HAVE_APR_1_2_2) RELAY_ERROR (apr_socket_send (socket, p, (&n2))); -#else - RELAY_ERROR (apr_send (socket, p, &n2)); -#endif if (n2 == n1) return (APR_SUCCESS); p += n2; @@ -487,15 +469,9 @@ apr_size_t length; RELAY_ERROR (get_input_buffer (socket, (&buffer))); -#if (HAVE_APR_1_2_2) RELAY_ERROR (((length = (sizeof (buffer->data))), (apr_socket_recv (socket, (buffer->data), (&length))))); -#else - RELAY_ERROR - (((length = (sizeof (buffer->data))), - (apr_recv (socket, (buffer->data), (&length))))); -#endif (buffer->start) = (buffer->data); (buffer->end) = ((buffer->data) + length); if (length == 0) --- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.README.Debian +++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.README.Debian @@ -0,0 +1,55 @@ +libapache2-mod-lisp for Debian +----------------------------- + +Please visit http://www.fractalconcept.com/asp/mod_lisp for more +information. + +The package does not do any automatic configuration. Please configure +Apache2 appropriately, according to the following instructions. + +Configuration +------------- + +In the Apache2 config file "/etc/apache2/apache2.conf": + +Add a LispServer directive: + + LispServer IP-ADDRESS IP-PORT USER-DEFINED-NAME + +where + + IP-ADDRESS is the ip address of the computer where the Lisp + process is. + + IP-PORT is the ip port of the computer where the Lisp process is. + + USER-DEFINED-NAME is a string that will be passed from Apache to + the Lisp process. It is useful when you have several virtual + servers or directories, defined within an Apache server, to be + processed by mod_lisp. + +For example: + + LispServer 127.0.0.1 3000 "fractal" + +Then add a SetHandler directive: + + + SetHandler lisp-handler + + +All of the URLs located in /asp (e.g. "/asp/index.html") will be sent to +the Lisp process. + +It is recommended that you wrap the above directives in an IfModule +block, like this: + + + LispServer 127.0.0.1 3000 "fractal" + ... + + SetHandler lisp-handler + + + +After you having finished configuration, restart Apache2. --- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.prerm +++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.prerm @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +exit 0 --- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.dirs +++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.dirs @@ -0,0 +1,2 @@ +usr/lib/apache2/modules +etc/apache2/mods-available --- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.postinst +++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.postinst @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +exit 0 --- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.preinst +++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.preinst @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +exit 0 --- libapache2-mod-lisp-1.3.1.orig/debian/rules +++ libapache2-mod-lisp-1.3.1/debian/rules @@ -0,0 +1,57 @@ +#!/usr/bin/make -f + +configure: configure-stamp +configure-stamp: + dh_quilt_patch + dh_testdir + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) clean + dh_clean + dh_quilt_unpatch + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-lisp + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdebconf -a + dh_apache2 -a + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a + dh_installcron -a + dh_installinfo -a + dh_installchangelogs -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- libapache2-mod-lisp-1.3.1.orig/debian/lisp.load +++ libapache2-mod-lisp-1.3.1/debian/lisp.load @@ -0,0 +1 @@ +LoadModule lisp_module /usr/lib/apache2/modules/mod_lisp.so --- libapache2-mod-lisp-1.3.1.orig/debian/compat +++ libapache2-mod-lisp-1.3.1/debian/compat @@ -0,0 +1 @@ +5 --- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.debhelper.log +++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.debhelper.log @@ -0,0 +1 @@ +dh_quilt_unpatch --- libapache2-mod-lisp-1.3.1.orig/debian/copyright +++ libapache2-mod-lisp-1.3.1/debian/copyright @@ -0,0 +1,42 @@ +This package was debianized by Chris Hanson on +Sat, 26 Aug 2006 12:49:27 -0400 + +It was downloaded from the Subversion repository at + + +Upstream Authors: + Marc Battyani + Chris Hanson + +Copyright: + + Copyright 2000-2005 Marc Battyani. + Copyright 2003,2004 Massachusetts Institute of Technology + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + 3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. --- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.postrm +++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.postrm @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +exit 0 --- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.apache2 +++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.apache2 @@ -0,0 +1 @@ +mod debian/lisp.load --- libapache2-mod-lisp-1.3.1.orig/debian/control +++ libapache2-mod-lisp-1.3.1/debian/control @@ -0,0 +1,16 @@ +Source: libapache2-mod-lisp +Section: devel +Priority: optional +Maintainer: Chris Hanson +Build-Depends: debhelper (>> 5.0.0), apache2-dev, dh-apache2, quilt +Standards-Version: 3.7.3 + +Package: libapache2-mod-lisp +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: An Apache2 module that interfaces with Lisp environments + Establishes a link between the Apache2 web server and a Lisp environment + that allows a Lisp program to generate dynamic content while letting + Apache2 take care of the dirty details of HTTP serving. The protocol + between Lisp and Apache2 is simple, making it easy to create WWW- + accessible applications quickly. --- libapache2-mod-lisp-1.3.1.orig/debian/changelog +++ libapache2-mod-lisp-1.3.1/debian/changelog @@ -0,0 +1,28 @@ +libapache2-mod-lisp (1.3.1-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Port to apache2.4 (Closes: #666821) + + -- Arno Töll Sat, 06 Jul 2013 18:54:32 +0200 + +libapache2-mod-lisp (1.3.1-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "Dropping the apache2-dev virtual package" by replacing the removed + build-dependency adequately (Closes: #667628) + + -- Arno Töll Sun, 01 Jul 2012 19:28:09 +0200 + +libapache2-mod-lisp (1.3.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove bogus test on APR version: we have more recent version than + 1.2.2; fix FTBFS, patch by Antonio Radici. (Closes: #521964) + + -- Stefano Zacchiroli Fri, 27 Nov 2009 09:35:30 +0100 + +libapache2-mod-lisp (1.3.1-1) unstable; urgency=low + + * New package. (closes: Bug#432053) + + -- Chris Hanson Sun, 17 Feb 2008 17:14:30 -0500 --- libapache2-mod-lisp-1.3.1.orig/debian/patches/apache2.4-fixes.patch +++ libapache2-mod-lisp-1.3.1/debian/patches/apache2.4-fixes.patch @@ -0,0 +1,24 @@ +--- a/mod_lisp.c ++++ b/mod_lisp.c +@@ -169,8 +169,8 @@ + } while (0) + + #define ML_LOG_ERROR(status, r, msg) \ +- (ap_log_error (APLOG_MARK, APLOG_ERR, (status), \ +- ((r) -> server), (msg))) ++ ap_log_error (APLOG_MARK, APLOG_ERR, (status), \ ++ ((r) -> server), (msg)) + + #define ML_LOG_PERROR(r, msg) \ + ML_LOG_ERROR ((APR_FROM_OS_ERROR (apr_get_os_error ())), (r), (msg)) +@@ -184,8 +184,8 @@ + + #if ENABLE_DEBUG + # define ML_LOG_DEBUG(r, msg) \ +- (ap_log_error (APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, \ +- ((r) -> server), (msg))) ++ ap_log_error (APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, \ ++ ((r) -> server), (msg)) + #else + # define ML_LOG_DEBUG(r, msg) + #endif --- libapache2-mod-lisp-1.3.1.orig/debian/patches/series +++ libapache2-mod-lisp-1.3.1/debian/patches/series @@ -0,0 +1 @@ +apache2.4-fixes.patch