diff -u mini-httpd-1.19/debian/mini-httpd.init.d mini-httpd-1.19/debian/mini-httpd.init.d --- mini-httpd-1.19/debian/mini-httpd.init.d +++ mini-httpd-1.19/debian/mini-httpd.init.d @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash ### BEGIN INIT INFO # Provides: mini-httpd # Required-Start: $local_fs diff -u mini-httpd-1.19/debian/compat mini-httpd-1.19/debian/compat --- mini-httpd-1.19/debian/compat +++ mini-httpd-1.19/debian/compat @@ -1 +1 @@ -4 +5 diff -u mini-httpd-1.19/debian/control mini-httpd-1.19/debian/control --- mini-httpd-1.19/debian/control +++ mini-httpd-1.19/debian/control @@ -2,13 +2,13 @@ Section: web Priority: optional Maintainer: Marvin Stark -Build-Depends: debhelper (>= 4), dpatch, libssl-dev +Build-Depends: debhelper (>= 5), dpatch, libssl-dev Homepage: http://www.acme.com/software/mini_httpd -Standards-Version: 3.8.0 +Standards-Version: 3.8.3 Package: mini-httpd Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, bash Provides: httpd, httpd-cgi Description: a small HTTP server mini-httpd implements all basic features of a HTTPD, including: GET,HEAD,POST diff -u mini-httpd-1.19/debian/changelog mini-httpd-1.19/debian/changelog --- mini-httpd-1.19/debian/changelog +++ mini-httpd-1.19/debian/changelog @@ -1,3 +1,13 @@ +mini-httpd (1.19-9ubuntu1) karmic; urgency=low + + * As currently written, the debianized init script cannot run if + /bin/sh is linked to dash; hence it depends on bash (LP: #403286) + This is a temporary fix until resolved upstream so it does not break + during Karmic install. + * Patch for htpasswd.c conflict with glibc getline() and stricter gcc 4.4 + + -- David Sugar Wed, 30 Sep 2009 17:00:44 +0000 + mini-httpd (1.19-9) unstable; urgency=low * Added kFreeBSD portin patch (Closes: #498368) diff -u mini-httpd-1.19/debian/patches/00list mini-httpd-1.19/debian/patches/00list --- mini-httpd-1.19/debian/patches/00list +++ mini-httpd-1.19/debian/patches/00list @@ -4,0 +5 @@ +05-htpasswd.dpatch only in patch2: unchanged: --- mini-httpd-1.19.orig/debian/README.source +++ mini-httpd-1.19/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. only in patch2: unchanged: --- mini-httpd-1.19.orig/debian/patches/05-htpasswd.dpatch +++ mini-httpd-1.19/debian/patches/05-htpasswd.dpatch @@ -0,0 +1,46 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 05-htpasswd.dpatch by David Sugar +## +## DP: Fix stricter gcc 4.4 and glibc conflict over getline() function. + +@DPATCH@ + +--- mini-httpd-1.19~/htpasswd.c 2001-12-19 00:08:10.000000000 +0000 ++++ mini-httpd-1.19/htpasswd.c 2009-09-30 17:17:56.350598459 +0000 +@@ -49,7 +49,7 @@ + while((line[y++] = line[x++])); + } + +-static int getline(char *s, int n, FILE *f) { ++static int fgetline(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -66,7 +66,7 @@ + } + } + +-static void putline(FILE *f,char *l) { ++static void fputline(FILE *f,char *l) { + int x; + + for(x=0;l[x];x++) fputc(l[x],f); +@@ -189,15 +189,15 @@ + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(fgetline(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { +- putline(tfp,line); ++ fputline(tfp,line); + continue; + } + strcpy(l,line); + getword(w,l,':'); + if(strcmp(user,w)) { +- putline(tfp,line); ++ fputline(tfp,line); + continue; + } + else {