tag 388647 patch tag 375017 patch usertag 388647 supplied-patch usertag 375017 supplied-patch thanks
Hi, I have prepared a NMU for these two bugs. As I am no DD I can not do the upload myself, but here is the patch anyway. Greetings Arjan
diff -u proftpd-1.3.0/config.sub proftpd-1.3.0/config.sub
--- proftpd-1.3.0/config.sub
+++ proftpd-1.3.0/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -274,11 +276,11 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
@@ -286,9 +288,6 @@
| z8k)
basic_machine=$basic_machine-unknown
;;
- m32c)
- basic_machine=$basic_machine-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -318,7 +317,7 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+ | avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
@@ -329,7 +328,7 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,11 +357,11 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
@@ -373,8 +372,6 @@
| ymp-* \
| z8k-*)
;;
- m32c-*)
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -1128,7 +1125,7 @@
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1217,7 +1214,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1369,6 +1366,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1378,9 +1378,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
diff -u proftpd-1.3.0/debian/control proftpd-1.3.0/debian/control
--- proftpd-1.3.0/debian/control
+++ proftpd-1.3.0/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Francesco Paolo Lovergine <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
-Build-Depends: libmysqlclient15-dev (>= 5.0.16) | libmysqlclient14-dev | libmysqlclient12-dev (>= 4.0.23) , libpam-dev, debhelper (>=4.1.16), zlib1g-dev, libpq-dev | postgresql-dev (>= 7.2), libldap2-dev, libssl-dev, libwrap0-dev, libcap-dev, autotools-dev, libncurses5-dev, dpatch, libacl1-dev
+Build-Depends: libmysqlclient15-dev (>= 5.0.16) | libmysqlclient14-dev | libmysqlclient12-dev (>= 4.0.23) , libpam-dev, debhelper (>=4.1.16), zlib1g-dev, libpq-dev | postgresql-dev (>= 7.2), libldap2-dev, libssl-dev, libwrap0-dev, libcap-dev | not+linux-gnu, autotools-dev, libncurses5-dev, dpatch, libacl1-dev
Package: proftpd
Architecture: any
diff -u proftpd-1.3.0/debian/changelog proftpd-1.3.0/debian/changelog
--- proftpd-1.3.0/debian/changelog
+++ proftpd-1.3.0/debian/changelog
@@ -1,3 +1,14 @@
+proftpd (1.3.0-9.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Call update-inetd during remove and disappear and not during
+ purge. (Closes: #388647)
+ * Make dependency on libcap-dev conditional to fix FTBFS on GNU/kFreeBSD
+ (Closes: #375017)
+ * Deregister /etc/init.d script on purge as requested by lintian.
+
+ -- Arjan Oosting <[EMAIL PROTECTED]> Fri, 29 Sep 2006 18:06:14 +0200
+
proftpd (1.3.0-9) unstable; urgency=low
* Missing examples added to proftpd-doc: moved proftpd.examples to proftpd-doc.examples
diff -u proftpd-1.3.0/debian/proftpd.postrm proftpd-1.3.0/debian/proftpd.postrm
--- proftpd-1.3.0/debian/proftpd.postrm
+++ proftpd-1.3.0/debian/proftpd.postrm
@@ -1,6 +1,6 @@
#!/bin/sh -e
-if [ "$1" = "purge" -o "$1" = "remove" ]
+if [ "$1" = "remove" -o "$1" = "disappear" ]
then
update-inetd --disable ftp
fi
@@ -9,6 +9,7 @@
then
rm -rf /etc/proftpd
rm -rf /var/run/proftpd
+ update-rc.d proftpd remove || true
fi
#DEBHELPER#
signature.asc
Description: Dit berichtdeel is digitaal ondertekend
