diff -u proftpd-dfsg-1.3.1/debian/patches/00list proftpd-dfsg-1.3.1/debian/patches/00list --- proftpd-dfsg-1.3.1/debian/patches/00list +++ proftpd-dfsg-1.3.1/debian/patches/00list @@ -23,0 +24 @@ +mod_rewrite.c diff -u proftpd-dfsg-1.3.1/debian/changelog proftpd-dfsg-1.3.1/debian/changelog --- proftpd-dfsg-1.3.1/debian/changelog +++ proftpd-dfsg-1.3.1/debian/changelog @@ -1,3 +1,13 @@ +proftpd-dfsg (1.3.1-11ubuntu1) intrepid; urgency=low + + * mod_rewrite.c.dpatch: + - Added S_IRUSR|S_IWUSR to build with the new Compiler Flags + (https://wiki.ubuntu.com/CompilerFlags) + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Nicolas Valcárcel Sun, 13 Jul 2008 02:16:01 -0500 + proftpd-dfsg (1.3.1-11) unstable; urgency=medium * [PATCH] mod_dynmasq.dpatch diff -u proftpd-dfsg-1.3.1/debian/control proftpd-dfsg-1.3.1/debian/control --- proftpd-dfsg-1.3.1/debian/control +++ proftpd-dfsg-1.3.1/debian/control @@ -1,7 +1,8 @@ Source: proftpd-dfsg Section: net Priority: optional -Maintainer: Francesco Paolo Lovergine +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Francesco Paolo Lovergine Standards-Version: 3.7.3 Build-Depends: libmysqlclient15-dev (>= 5.0.16), libpam-dev, debhelper (>=5), zlib1g-dev, libpq-dev, libldap2-dev, libssl-dev, libwrap0-dev, libcap-dev|not+linux-gnu, only in patch2: unchanged: --- proftpd-dfsg-1.3.1.orig/debian/patches/mod_rewrite.c.dpatch +++ proftpd-dfsg-1.3.1/debian/patches/mod_rewrite.c.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## mod_rewrite.c.patch.dpatch by Nicolas Valcárcel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad proftpd-dfsg-1.3.1~/contrib/mod_rewrite.c proftpd-dfsg-1.3.1/contrib/mod_rewrite.c +--- proftpd-dfsg-1.3.1~/contrib/mod_rewrite.c 2007-06-06 19:30:04.000000000 -0500 ++++ proftpd-dfsg-1.3.1/contrib/mod_rewrite.c 2008-07-13 02:12:05.000000000 -0500 +@@ -865,7 +865,7 @@ + FALSE); + if (fifo_lockname != NULL) { + /* Make sure the file exists. */ +- fifo_lockfd = open(fifo_lockname, O_CREAT); ++ fifo_lockfd = open(fifo_lockname, O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); + if (fifo_lockfd < 0) { + rewrite_log("rewrite_subst_maps_fifo(): error creating '%s': %s", + fifo_lockname, strerror(errno));