As we said on IRC yesterday on #debian-apache, I will propose an
apache-lingerd source tree for targetting an upload to experimental.
apache-lingerd is a new flavour because it needs a patched Apache to work.
I'll explain here most of the important changes.
------------------------------------------------------------------------------
1. debian/rules
------------------------------------------------------------------------------
Most of my work was to hack the debian/rules file in order to make the
-lingerd flavour possible.
First, there are new "configure", "build" and "install" targets for
apache-lingerd.
All of them are similar to the apache flavour exept the fact that we
build the lingerd binary at the same time.
The "source.make" target is also hacked in order to unpack the lingerd
upstream tarball (I updated the .orig tarball) and to patch the Apache
source tree. Note that I also hacked the lingerd patch itself, in order
to allow me to apply it _after_ the eapi patch:
#-lingerd
cp -rpv lingerd-$(LINGERD_MAJOR)/lingerd $(L)
cp -vp lingerd-$(LINGERD_MAJOR)/apache/ap_lingerd.c $(L)/src/main
cp -vp lingerd-$(LINGERD_MAJOR)/apache/li_config.h $(L)/src/main
patch -d $(L) -p0 < $(SOURCE_DIR)-apache/pkg.eapi/eapi.patch
patch -d $(L) -p0 < lingerd-$(LINGERD_MAJOR)/apache/lingerd.patch
------------------------------------------------------------------------------
2. apache-common
------------------------------------------------------------------------------
Adding a new flavour is possible only if we patch also the apache-common
package for it provides default configs for flavours and the
apache-modconf utility (which has to be aware of all the flavours).
That was done adding 'apache-lingerd' to the for loop.
------------------------------------------------------------------------------
3. Config files
------------------------------------------------------------------------------
3.1 httpd.conf
The lingerd httpd.conf file is the same as the classic apache one expect
from the fact that it disables the KeepAlive option as this is needed for
a correct behaviour of lingerd.
3.2 /etc/init.d/apache-lingerd
The startup init script for apache-lingerd takes care of launching first
the lingerd daemon _before_ apache-lingerd. I used a `sleep 1` directive
in order to be sure that lingerd is ready to serve apache when apache is
launched.
------------------------------------------------------------------------------
4. Lingerd
------------------------------------------------------------------------------
The lingerd binary will be installed in /usr/sbin and will use the
/var/run/lingerd directory to host its pid file and its socket:
# ls /var/run/lingerd/ -l
total 4
-rw-r--r-- 1 root root 6 2005-02-17 12:16 lingerd.pid
srwxr-xr-x 1 root root 0 2005-02-17 12:16 lingerd.sock
Example of use:
# /etc/init.d/apache-linger start
Starting lingerd daemon
Starting web server: apache-lingerd.
# ps fax |grep linger
24024 ? S 0:00 /usr/sbin/lingerd
24027 pts/0 S 0:00 /usr/sbin/apache-lingerd
24028 pts/0 S 0:00 \_ /usr/sbin/apache-lingerd
24029 pts/0 S 0:00 \_ /usr/sbin/apache-lingerd
24030 pts/0 S 0:00 \_ /usr/sbin/apache-lingerd
24031 pts/0 S 0:00 \_ /usr/sbin/apache-lingerd
24032 pts/0 S 0:00 \_ /usr/sbin/apache-lingerd
------------------------------------------------------------------------------
5. Grabbing the package
------------------------------------------------------------------------------
You will find attached to this mail a recursive unified diff between the
last apache Debian source tree (1.33.3-4) and my source tree.
You can also either grab the whole source tree on my repository:
deb-src http://www.sukria.net/debian ./
apt-get source apache
or test the binary itself:
deb http://www.sukria.net/debian ./
apt-get install apache-lingerd
--
Alexis Sukrieh <sukria@sukria.net>
http://www.sukria.net
« Quidquid latine dictum sit, altum sonatur. »
Whatever is said in Latin sounds profound.
Only in lingerd/apache-1.3.33/debian: README-lingerd.Debian
Only in lingerd/apache-1.3.33/debian: apache-lingerd.templates
Only in lingerd/apache-1.3.33/debian: apaci.append-lingerd
diff -ubBr unstable/apache-1.3.33/debian/control lingerd/apache-1.3.33/debian/control
--- unstable/apache-1.3.33/debian/control 2005-02-17 09:05:09.197682232 +0100
+++ lingerd/apache-1.3.33/debian/control 2005-02-17 09:10:03.979868528 +0100
@@ -73,6 +73,31 @@
Apache-SSL, and other common extensions. More information is available
at http://www.apache.org/.
+Package: apache-lingerd
+Architecture: any
+Depends: ${shlibs:Depends}, mime-support, apache-common (>= ${Source-Version}), perl (>= 5.8.4-2), logrotate (>= 3.5.4-1), dpkg (>> 1.9.0), libmagic1, debconf
+Suggests: apache-doc
+Conflicts: apache-modules, libapache-mod-perl (<= 1.17-1), jserv (<= 1.1-3)
+Replaces: apache-modules
+Provides: httpd-cgi, httpd, lingerd
+Priority: optional
+Description: versatile, high-performance HTTP server with lingerd support
+ The most popular server in the world, Apache features a modular
+ design and supports dynamic selection of extension modules at runtime.
+ Some of its strong points are its range of possible customization,
+ dynamic adjustment of the number of server processes, and a whole
+ range of available modules including many authentication mechanisms,
+ server-parsed HTML, server-side includes, access control, CERN httpd
+ metafiles emulation, proxy caching, etc. Apache also supports multiple
+ virtual homing.
+ .
+ This is the lingerd packaged version of Apache. It is recommended to use it
+ for serving dynamic pages.
+ .
+ Separate Debian packages are available for PHP, mod_perl, Java
+ Servlet support, Apache-SSL, and other common extensions. More
+ information is available at http://www.apache.org/.
+
Package: apache-doc
Architecture: all
Recommends: w3m | www-browser
Only in lingerd/apache-1.3.33/debian: lingerd.3
diff -ubBr unstable/apache-1.3.33/debian/modules-config lingerd/apache-1.3.33/debian/modules-config
--- unstable/apache-1.3.33/debian/modules-config 2005-02-17 08:58:20.758774000 +0100
+++ lingerd/apache-1.3.33/debian/modules-config 2005-02-17 09:03:10.485729192 +0100
@@ -23,9 +23,9 @@
case "$1" in
command)
echo "Error: $0 has been called with invalid parameters"
- echo "Usage: $0 apache|apache-perl|apache-ssl [enable <module_name>]"
- echo " $0 apache|apache-perl|apache-ssl [disable <module_name>] [quiet]"
- echo " $0 apache|apache-perl|apache-ssl [query <module_name]"
+ echo "Usage: $0 apache|apache-lingerd|apache-perl|apache-ssl [enable <module_name>]"
+ echo " $0 apache|apache-lingerd|apache-perl|apache-ssl [disable <module_name>] [quiet]"
+ echo " $0 apache|apache-lingerd|apache-perl|apache-ssl [query <module_name]"
;;
install)
echo "Error: $FLA appears not to be installed"
@@ -78,7 +78,7 @@
# the others are -ssl and !-ssl conflicts
case "$FLA" in
- apache)
+ apache|apache-lingerd)
BLACKLIST="mod_browser mod_auth_ssl mod_mime_ssl mod_log_config_ssl apache-ssl"
;;
apache-perl)
@@ -290,7 +290,7 @@
# and realligned to be similar
case "$FLA" in
- apache)
+ apache|apache-lingerd)
enabled="mod_log_config, mod_mime_magic, mod_mime, mod_negotiation, mod_status, mod_autoindex, mod_dir, mod_cgi, mod_userdir, mod_alias, mod_rewrite, mod_access, mod_auth, mod_expires, mod_setenvif"
;;
apache-perl)
@@ -315,7 +315,7 @@
FLA=$1
-if [ "$FLA" != "apache" ] && [ "$FLA" != "apache-perl" ] && [ "$FLA" != "apache-ssl" ]; then
+if [ "$FLA" != "apache" ] && [ "$FLA" != "apache-lingerd" ] && [ "$FLA" != "apache-perl" ] && [ "$FLA" != "apache-ssl" ]; then
go_out command
fi
Only in lingerd/apache-1.3.33/debian/pkgtemplates: apache-lingerd.dirs.post
Only in lingerd/apache-1.3.33/debian/pkgtemplates: apache-lingerd.httpd.conf.diff
Only in lingerd/apache-1.3.33/debian/pkgtemplates: apache-lingerd.init.diff
Only in lingerd/apache-1.3.33/debian/pkgtemplates: apache-lingerd.postinst.inc
diff -ubBr unstable/apache-1.3.33/debian/rules lingerd/apache-1.3.33/debian/rules
--- unstable/apache-1.3.33/debian/rules 2005-02-17 08:58:20.764773000 +0100
+++ lingerd/apache-1.3.33/debian/rules 2005-02-17 08:46:08.212138400 +0100
@@ -32,6 +32,9 @@
# current version of the apache-contrib tarball
CONTRIB_MAJOR= 1.0.8a
+# current version of the lingerd tarball
+LINGERD_MAJOR= 0.94
+
# ARCH
BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -43,6 +46,7 @@
S=$(SOURCE_DIR)-apache-ssl/apache_$(APACHE_MAJOR)
P=$(SOURCE_DIR)-apache-perl/apache_$(APACHE_MAJOR)
V=$(SOURCE_DIR)-apache/apache_$(APACHE_MAJOR)
+L=$(SOURCE_DIR)-apache-lingerd/apache_$(APACHE_MAJOR)
inc=usr/include/apache-1.3
lib=usr/lib/apache/1.3
@@ -104,6 +108,9 @@
$(CONFARGS) \
--disable-shared=perl
+# nothing particular to lingerd actually :)
+LINGERARGS = $(APACHEARGS)
+
## Rules
source.make: $(STAMP_DIR)/source.make
@@ -116,19 +123,30 @@
cp $(SOURCE_DIR)/pkg.eapi/*.c $(SOURCE_DIR)/apache_$(APACHE_MAJOR)/src/ap/
cp $(SOURCE_DIR)/apache-contrib-$(CONTRIB_MAJOR)/mod_macro/mod_macro.c $(SOURCE_DIR)/apache_$(APACHE_MAJOR)/src/modules/extra
mv $(SOURCE_DIR) $(SOURCE_DIR)-apache
- @echo -e "\n\n*** creating -ssl and -perl trees ***\n"
+ @echo -e "\n\n*** creating -lingerd, -ssl and -perl trees ***\n"
mv $(SOURCE_DIR)-apache/apache-contrib-* .
cp -rp $(SOURCE_DIR)-apache $(SOURCE_DIR)-apache-ssl
cp -rp $(SOURCE_DIR)-apache $(SOURCE_DIR)-apache-perl
+ cp -rp $(SOURCE_DIR)-apache $(SOURCE_DIR)-apache-lingerd
mv apache-contrib-* $(SOURCE_DIR)-apache/
@echo -e "\n\n*** unpackaing mod_perl ***\n"
tar zxvf upstream/flavours/mod_perl-$(PERL_MAJOR).tar.gz > /dev/null
mv mod_perl-$(PERL_MAJOR) libapache-mod-perl-$(PERL_MAJOR)
+
+ @echo -e "\n\n*** unpackaing lingerd ***\n"
+ tar zxvf upstream/flavours/lingerd-$(LINGERD_MAJOR).tar.gz > /dev/null
+
@echo -e "\n\n*** applying extra patches to specific trees ***\n"
#-apache
patch -d $(V) -p0 < $(SOURCE_DIR)-apache/pkg.eapi/eapi.patch
#-perl
patch -d $(P) -p0 < $(SOURCE_DIR)-apache-perl/pkg.eapi/eapi.patch
+ #-lingerd
+ cp -rpv lingerd-$(LINGERD_MAJOR)/lingerd $(L)
+ cp -vp lingerd-$(LINGERD_MAJOR)/apache/ap_lingerd.c $(L)/src/main
+ cp -vp lingerd-$(LINGERD_MAJOR)/apache/li_config.h $(L)/src/main
+ patch -d $(L) -p0 < $(SOURCE_DIR)-apache/pkg.eapi/eapi.patch
+ patch -d $(L) -p0 < lingerd-$(LINGERD_MAJOR)/apache/lingerd.patch
#-ssl
cd $(SOURCE_DIR)-apache-ssl && \
tar zxvf ../upstream/flavours/apache_$(SSL_MAJOR)+ssl_$(SSL_MINOR).tar.gz > /dev/null && \
@@ -141,7 +159,7 @@
patch -d $(D) -p1 < debian/patches/mod-perl/debian_libperl_debug_fix.diff
patch -d $(D) -p1 < debian/patches/mod-perl/r_dir_config_fix.diff
-$(STAMP_DIR)/configure-stamp: $(STAMP_DIR)/source.make $(STAMP_DIR)/configure-stamp-apache $(STAMP_DIR)/configure-stamp-ssl $(STAMP_DIR)/configure-stamp-perl $(STAMP_DIR)/configure-stamp-mod-perl
+$(STAMP_DIR)/configure-stamp: $(STAMP_DIR)/source.make $(STAMP_DIR)/configure-stamp-apache $(STAMP_DIR)/configure-stamp-ssl $(STAMP_DIR)/configure-stamp-perl $(STAMP_DIR)/configure-stamp-mod-perl $(STAMP_DIR)/configure-stamp-lingerd
touch $(STAMP_DIR)/configure-stamp
$(STAMP_DIR)/configure-stamp-apache: $(STAMP_DIR)/source.make
@@ -224,6 +242,49 @@
chmod +x debian/{apxs-ssl,local-apxs-ssl}
touch $(STAMP_DIR)/configure-stamp-ssl
+$(STAMP_DIR)/configure-stamp-lingerd: $(STAMP_DIR)/source.make
+ @echo -e "\n\n*** Building lingerd binary ***\n\n"
+
+ cd $(L)/lingerd && $(MAKE)
+
+ @echo -e "\n\n*** Configuring apache-lingerd ***\n\n"
+ cd $(L) && LDFLAGS="$(LDFLAGS)" CFLAGS="$(CONFLAGS)" ./configure $(LINGERARGS)
+
+ @echo -e "\n\n*** Creating apaci (apache-lingerd) *** \n\n"
+
+ sed -e "s,@PACKAGE@,apache-lingerd," debian/apaci.append.real > \
+ debian/apaci.append-lingerd
+ chmod +x debian/ubersed-lingerd
+ (debian/ubersed-lingerd $(L)/src/apaci; \
+ cat debian/apaci.append-lingerd) > debian/apaci-lingerd
+ install debian/apaci-lingerd $(L)/src/apaci
+
+ @echo -e "\n\n*** Buiding apxs (apache-lingerd) *** \n\n"
+
+ cd $(L)/src/support && $(MAKE) apxs
+ set -e; INCL=$$(echo $$(pwd)/$(L)/src/include); \
+ SBIN=$$(echo $$(pwd)/$(L)/src); sed \
+ -e "s;^#!/.*;#!/usr/bin/perl;" \
+ -e "s;\@prefix\@;/usr;" \
+ -e "s;\@sbindir\@;$$SBIN;" \
+ -e "s;\@libexecdir\@;/usr/lib/apache/1.3;" \
+ -e "s;\@includedir\@;$$INCL;" \
+ -e "s;\@sysconfdir\@;/etc/apache-lingerd;" \
+ -e "s;/httpd;/apache-lingerd;g" \
+ -e "s;-lm;-lc -lm;" \
+ -e "s;-ldbm -ldb;;" \
+ -e "s;-lndbm -ldb;;" \
+ -e "s;-DTARGET;-DEAPI -DTARGET;" \
+ -e "s;CFG_SYSCONFDIR/\$$CFG_TARGET;CFG_SYSCONFDIR/httpd;g" \
+ $(L)/src/support/apxs > debian/local-apxs-lingerd; \
+ set -e; INCL=$$(echo $$(pwd)/$(L)/src/include); \
+ SBIN=$$(echo $$(pwd)/$(L)/src); sed \
+ -e "s;$$INCL;/usr/include/apache-1.3;" \
+ -e "s;$$SBIN;/usr/sbin;" \
+ debian/local-apxs-lingerd > debian/apxs-lingerd
+ chmod +x debian/{apxs-lingerd,local-apxs-lingerd}
+ touch $(STAMP_DIR)/configure-stamp-lingerd
+
$(STAMP_DIR)/configure-stamp-perl: $(STAMP_DIR)/source.make
@echo -e "\n\n*** Configuring apache-perl ***\n\n"
@@ -288,9 +349,12 @@
INSTALLDIRS=vendor # PERL_DEBUG=1
touch $(STAMP_DIR)/configure-stamp-mod-perl
+
+build-lingerd: $(STAMP_DIR)/build-stamp-lingerd
+
build: $(STAMP_DIR)/build-stamp
+$(STAMP_DIR)/build-stamp: $(STAMP_DIR)/configure-stamp $(STAMP_DIR)/build-stamp-apache $(STAMP_DIR)/build-stamp-ssl $(STAMP_DIR)/build-stamp-perl $(STAMP_DIR)/build-stamp-mod-perl $(STAMP_DIR)/expand-debian $(STAMP_DIR)/build-stamp-lingerd
-$(STAMP_DIR)/build-stamp: $(STAMP_DIR)/configure-stamp $(STAMP_DIR)/build-stamp-apache $(STAMP_DIR)/build-stamp-ssl $(STAMP_DIR)/build-stamp-perl $(STAMP_DIR)/build-stamp-mod-perl $(STAMP_DIR)/expand-debian
$(STAMP_DIR)/build-stamp-apache: $(STAMP_DIR)/configure-stamp-apache
dh_testdir
@@ -327,6 +391,19 @@
| xargs -i ls -l --no-group {}; echo
touch $(STAMP_DIR)/build-stamp-ssl
+$(STAMP_DIR)/build-stamp-lingerd: $(STAMP_DIR)/configure-stamp-lingerd
+ dh_testdir
+
+ @echo -e "\n\n*** Compiling apache-lingerd daemon and modules ***\n\n"
+ cd $(L) && $(MAKE)
+
+ @echo -e "\n\n*** apache-lingerd modules sanity check ***\n\n"
+ find $(SOURCE_DIR)-apache-lingerd/ \
+ -name "*.so" -exec install -m 644 {} $(S) \;
+ @set -e; echo; cd $(L) && cat $(CURDIR)/debian/module-manifest-lingerd \
+ | xargs -i ls -l --no-group {}; echo
+ touch $(STAMP_DIR)/build-stamp-lingerd
+
$(STAMP_DIR)/build-stamp-perl: $(STAMP_DIR)/configure-stamp-perl
dh_testdir
@@ -372,7 +449,7 @@
touch $(STAMP_DIR)/expand-debian
install: build $(STAMP_DIR)/install-stamp
-$(STAMP_DIR)/install-stamp: $(STAMP_DIR)/pre-install-stamp-deb $(STAMP_DIR)/install-stamp-common $(STAMP_DIR)/install-stamp-dev $(STAMP_DIR)/install-stamp-dbg $(STAMP_DIR)/install-stamp-doc $(STAMP_DIR)/install-stamp-apache $(STAMP_DIR)/install-stamp-ssl $(STAMP_DIR)/install-stamp-perl $(STAMP_DIR)/install-stamp-mod-perl
+$(STAMP_DIR)/install-stamp: $(STAMP_DIR)/pre-install-stamp-deb $(STAMP_DIR)/install-stamp-utils $(STAMP_DIR)/install-stamp-common $(STAMP_DIR)/install-stamp-dev $(STAMP_DIR)/install-stamp-dbg $(STAMP_DIR)/install-stamp-doc $(STAMP_DIR)/install-stamp-apache $(STAMP_DIR)/install-stamp-ssl $(STAMP_DIR)/install-stamp-perl $(STAMP_DIR)/install-stamp-mod-perl $(STAMP_DIR)/install-stamp-lingerd
touch $(STAMP_DIR)/install-stamp
$(STAMP_DIR)/pre-install-stamp-deb:
@@ -388,8 +465,10 @@
dh_testroot
# from apache-ssl
+ install -d debian/apache-utils/usr/sbin
install $(S)/src/support/{check_forensic,logresolve,ab,rotatelogs} \
debian/apache-utils/usr/sbin
+ install -d debian/apache-utils/$(man)/man8
debian/ubersed < $(S)/src/support/logresolve.8 \
> debian/apache-utils/$(man)/man8/logresolve.8
debian/ubersed < $(S)/src/support/ab.8 \
@@ -399,8 +478,10 @@
install debian/check_forensic.8 debian/apache-utils/$(man)/man8/check_forensic.8
# from apache
+ install -d debian/apache-utils/usr/bin
install $(V)/src/support/{htpasswd,htdigest,dbmmanage} \
debian/apache-utils/usr/bin
+ install -d debian/apache-utils/$(man)/man1
debian/ubersed < $(V)/src/support/htpasswd.1 \
> debian/apache-utils/$(man)/man1/htpasswd.1
debian/ubersed < $(V)/src/support/htdigest.1 \
@@ -416,14 +497,17 @@
dh_testroot
# default configs
+ install -d apache-common/usr/share/apache/default-configs
cd debian && \
- for i in apache apache-ssl apache-perl; do \
+ for i in apache apache-lingerd apache-ssl apache-perl; do \
cp -a srm.conf access.conf apache-common/usr/share/apache/default-configs/$$i && \
cp -a $$i.httpd.conf apache-common/usr/share/apache/default-configs/$$i/httpd.conf && \
cp -a $$i.intro.html apache-common/usr/share/apache/default-configs/$$i/intro.html ; \
done
# modules
+ install -d debian/apache-common/$(lib)
+ install -d debian/apache-common/$(doc)-common
cp -a $$(find $(V) info/ -maxdepth 1 -name "*.info") \
$$(find $(V) -maxdepth 1 -name "*.so") \
debian/apache-common/$(lib)
@@ -437,6 +521,7 @@
rm -f debian/apache-common/$(doc)-common/README.mod_eaccess
cp $(C)/mod_eaccess/doc/index.html debian/apache-common/$(doc)-common/mod_eaccess.html
cp -v $(C)/*/*.html debian/apache-common/$(doc)-common/
+ install -d debian/apache-common/$(doc)-common/mod_auth_cache
cp $(C)/mod_auth_cache*/{ChangeLog,INSTALL,README,TODO} \
debian/apache-common/$(doc)-common/mod_auth_cache/
@@ -648,6 +733,61 @@
touch $(STAMP_DIR)/install-stamp-ssl
+$(STAMP_DIR)/install-stamp-lingerd: $(STAMP_DIR)/pre-install-stamp-deb
+ @echo -e "\n\n*** Installing apache-lingerd ***\n\n"
+ dh_testdir
+ dh_testroot
+
+
+ # apache-lingerd
+ install -d debian/apache-lingerd/usr/sbin
+ install -d debian/apache-lingerd/usr/share/man/man8
+ install -d debian/apache-lingerd/var/cache/apache-lingerd
+ chown www-data:www-data debian/apache-lingerd/var/cache/apache-lingerd
+ install $(L)/src/apache debian/apache-lingerd/usr/sbin/apache-lingerd
+ debian/ubersed-lingerd < $(L)/src/support/httpd.8 \
+ > debian/apache-lingerd/usr/share/man/man8/apache-lingerd.8
+
+ # apache-lingerdctl
+ debian/ubersed-lingerd < $(L)/src/support/apachectl \
+ > debian/apache-lingerd/usr/sbin/apache-lingerdctl
+ chmod +x debian/apache-lingerd/usr/sbin/apache-lingerdctl
+ debian/ubersed-lingerd < $(L)/src/support/apachectl.8 \
+ > debian/apache-lingerd/usr/share/man/man8/apache-lingerdctl.8
+
+ # suexec
+ install -d debian/apache-lingerd/usr/lib/apache-lingerd
+ install -m 4755 $(L)/src/support/suexec \
+ debian/apache-lingerd/usr/lib/apache-lingerd/suexec.disabled
+
+ # the lingerd manpage
+ install -d debian/apache-lingerd/$(man)/man3
+ mkdir -p debian/apache-lingerd/$(man)/man3/
+ cp debian/lingerd.3 debian/apache-lingerd/$(man)/man3
+
+ # misc
+ install -d debian/apache-lingerd/$(doc)-lingerd
+ install -d debian/apache-lingerd/$(doc)-lingerd/examples
+ install -d debian/apache-lingerd/usr/share/lintian/overrides/apache-lingerd
+ install -d debian/apache-lingerd/usr/share/bug/apache-lingerd/presubj
+ cd debian/apache-lingerd/usr/sbin/ && ln -sf apache-modconf apache-lingerdconfig
+ cd debian/apache-lingerd/$(man)/man8 && ln -sf apache-modconf.8.gz apache-lingerdconfig.8.gz
+ cp -a debian/README-lingerd.Debian debian/apache-lingerd/$(doc)-lingerd/README-lingerd.Debian
+ cp -a debian/apache-lingerd.httpd.conf debian/apache-lingerd/$(doc)-lingerd/examples/httpd.conf
+ cp -a debian/apache-lingerd.lintian \
+ debian/apache-lingerd/usr/share/lintian/overrides/apache-lingerd
+ cp -a debian/apache-lingerd.presubj \
+ debian/apache-lingerd/usr/share/bug/apache-lingerd/presubj
+
+
+ @echo -e "\n\n*** Installing lingerd binary ***\n\n"
+ install -m 755 $(L)/lingerd/lingerd debian/apache-lingerd/usr/sbin/lingerd
+
+ touch $(STAMP_DIR)/install-stamp-lingerd
+ install -d debian/apache-lingerd/var/cache/apache-lingerd
+ chown www-data:www-data debian/apache-lingerd/var/cache/apache-lingerd
+
+
$(STAMP_DIR)/install-stamp-perl:
@echo -e "\n\n*** Installing apache-perl ***\n\n"
dh_testdir
@@ -777,9 +917,9 @@
clean:
dh_testdir
dh_testroot
- rm -f debian/apache{,-ssl,-perl}.{presubj,init,conffiles,config,dirs,docs,examples,lintian,intro.html}
- rm -f debian/apache{,-ssl,-perl}.{logrotate,postinst,postrm,preinst,prerm,httpd.conf}
- rm -f debian/apaci{,-ssl,-perl,.append{,-ssl,-perl}}
+ rm -f debian/apache{,-ssl,-perl,-lingerd}.{presubj,init,conffiles,config,dirs,docs,examples,lintian,intro.html}
+ rm -f debian/apache{,-ssl,-perl,-lingerd}.{logrotate,postinst,postrm,preinst,prerm,httpd.conf}
+ rm -f debian/apaci{,-ssl,-lingerd,-perl,.append{,-ssl,-perl}}
rm -f debian/{apache-common.examples,apache-dev.docs,libapache-mod-perl.docs}
rm -f debian/{*.gz,local-apxs*,apxs*} o debian/o debian/buildinfo.Debian
rm -rf debian/logos debian/logos.ssl
@@ -787,6 +927,7 @@
$(MAKE) -f debian/sys-build.mk source.clean
rm -rf $(SOURCE_DIR)-*
rm -rf debian.diff debian/stampdir
+ rm -rf lingerd-*
rm -rf $(D)
dh_clean
diff -ubBr unstable/apache-1.3.33/debian/scripts/populate lingerd/apache-1.3.33/debian/scripts/populate
--- unstable/apache-1.3.33/debian/scripts/populate 2005-02-17 08:58:20.838762000 +0100
+++ lingerd/apache-1.3.33/debian/scripts/populate 2005-02-16 18:12:12.000000000 +0100
@@ -33,7 +33,7 @@
for i in `ls flavours.*`; do
target=`echo $i | sed -e 's/^flavours\.//g'`
- for x in apache apache-perl apache-ssl; do
+ for x in apache apache-perl apache-ssl apache-lingerd; do
echo -n "Generating $x.$target... "
if [ -e $x.$target.pre ]; then cat $x.$target.pre >> $dest/$x.$target; fi
if [ -e $x.$target.inc ]; then
Only in lingerd/apache-1.3.33/debian: ubersed-lingerd
Only in lingerd/apache-1.3.33/upstream/flavours: lingerd-0.94.tar.gz
Attachment:
signature.asc
Description: Digital signature