From 0b44d3f4e5a20b66d82b6346e9ec383e80f9a3fa Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Fri, 17 Jun 2016 10:06:51 +0000 Subject: Import Debian changes 1.23-1.1 mini-httpd (1.23-1.1) unstable; urgency=medium * Non-maintainer upload. * Add patch to fix FTBFS in kfreebsd-amd64. Closes: #825713 --- debian/changelog | 7 +++++++ debian/patches/fix-ftbfs-kfreebsd-amd64 | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/fix-ftbfs-kfreebsd-amd64 diff --git a/debian/changelog b/debian/changelog index 401915d..5dde5f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mini-httpd (1.23-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch to fix FTBFS in kfreebsd-amd64. Closes: #825713 + + -- Mattia Rizzolo Fri, 17 Jun 2016 10:06:51 +0000 + mini-httpd (1.23-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/fix-ftbfs-kfreebsd-amd64 b/debian/patches/fix-ftbfs-kfreebsd-amd64 new file mode 100644 index 0000000..863cd67 --- /dev/null +++ b/debian/patches/fix-ftbfs-kfreebsd-amd64 @@ -0,0 +1,17 @@ +Description: fix FTBFS in kfreebsd-amd64 where int64_t is already declared, but HAVE_INT64T is not defined +Author: Mattia Rizzolo +Bug-Debian: htts://bugs.debian.org/825713 +Last-Update: 2016-06-17 +Forwarded: no + +--- a/mini_httpd.c ++++ b/mini_httpd.c +@@ -100,7 +100,7 @@ + #define SIZE_T_MAX 2147483647L + #endif + +-#ifndef HAVE_INT64T ++#if !defined(_INT64_T_DECLARED) && !defined(HAVE_INT64T) + typedef long long int64_t; + #endif + diff --git a/debian/patches/series b/debian/patches/series index 3e290ff..7dfdbf3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ fix-change-index-document-root 03-cgi-php fix-makefile 05-manpage-hyphen +fix-ftbfs-kfreebsd-amd64 -- cgit v1.2.3