--- courier-0.47.orig/configure.in
+++ courier-0.47/configure.in
@@ -15,7 +15,7 @@
 
 AC_PROG_MAKE_SET
 AC_PROG_CXX
-AC_PROG_SYSCONFTOOL
+m4_pattern_allow(AC_PROG_SYSCONFTOOL)
 AC_PATH_PROGS(SETENV, env)
 
 AC_ARG_ENABLE(root-check, [  --disable-root-check    Allow build as root (make check will fail)],
--- courier-0.47.orig/config.guess
+++ courier-0.47/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-06-17'
+timestamp='2003-01-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,7 +106,6 @@
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 dummy=$tmp/dummy ;
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
@@ -136,13 +135,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-## for Red Hat Linux
-if test -f /etc/redhat-release ; then
-    VENDOR=redhat ;
-else
-    VENDOR= ;
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -243,56 +235,74 @@
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:MicroBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 	fi
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
+	eval $set_cc_for_build
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+	if test "$?" = 0 ; then
+		case `$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+			3-1307)
+				UNAME_MACHINE="alphaev7"
+				;;
+		esac
+	fi
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -331,9 +341,6 @@
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -758,7 +765,7 @@
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+    *:FreeBSD:*:*)
 	# Determine whether the default compiler uses glibc.
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -781,8 +788,8 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:3*)
+	echo i586-pc-interix3
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -811,11 +818,8 @@
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -859,10 +863,10 @@
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR:-unknown}-linux-gnu
+	echo powerpc-unknown-linux-gnu
 	exit 0 ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR:-unknown}-linux-gnu
+	echo powerpc64-unknown-linux-gnu
 	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -890,10 +894,7 @@
 	echo hppa64-unknown-linux-gnu
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -902,7 +903,7 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR:-unknown}-linux-gnu
+	echo x86_64-unknown-linux-gnu
 	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -954,7 +955,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
@@ -1053,7 +1054,7 @@
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1209,9 +1210,6 @@
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
--- courier-0.47.orig/config.sub
+++ courier-0.47/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-06-18'
+timestamp='2003-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -229,7 +229,7 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
+	| clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
@@ -257,12 +257,11 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -297,7 +296,7 @@
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
 	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -330,14 +329,11 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
+	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -375,9 +371,6 @@
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -773,24 +766,18 @@
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -833,6 +820,12 @@
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -843,10 +836,6 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -854,9 +843,6 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -931,16 +917,12 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
+        tic4x | c4x*)
+		basic_machine=tic4x-unknown
 		os=-coff
 		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
 		os=-coff
 		;;
 	tx39)
@@ -1045,7 +1027,7 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
 	sh64)
@@ -1136,7 +1118,7 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -microbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1245,12 +1227,6 @@
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-none)
 		;;
 	*)
@@ -1282,9 +1258,6 @@
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
--- courier-0.47.orig/rfc1035/spf.c
+++ courier-0.47/rfc1035/spf.c
@@ -771,7 +771,7 @@
 
 		free(domain_spec);
 
-		if (rc < 0)
+		if (rc != 0)
 		{
 			set_err_msg(info->errmsg_buf, info->errmsg_buf_size,
 				    "IP address lookup failed.\n");
--- courier-0.47.orig/maildir/config.guess
+++ courier-0.47/maildir/config.guess
@@ -0,0 +1,1409 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-01-10'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MicroBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
+	exit 0 ;;
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	eval $set_cc_for_build
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+	if test "$?" = 0 ; then
+		case `$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+			3-1307)
+				UNAME_MACHINE="alphaev7"
+				;;
+		esac
+	fi
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit 0;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+	exit 0 ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit 0 ;;
+    x86:Interix*:3*)
+	echo i586-pc-interix3
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit 0 ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Darwin:*:*)
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit 0 ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit 0 ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit 0 ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit 0 ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit 0 ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
--- courier-0.47.orig/maildir/config.sub
+++ courier-0.47/maildir/config.sub
@@ -0,0 +1,1473 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-01-03'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| msp430 \
+	| ns16k | ns32k \
+	| openrisc | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* \
+	| m32r-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2)
+		basic_machine=i686-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+        tic4x | c4x*)
+		basic_machine=tic4x-unknown
+		os=-coff
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+		basic_machine=sh-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -microbsd*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
--- courier-0.47.orig/userdb/userdb.pl.in
+++ courier-0.47/userdb/userdb.pl.in
@@ -73,7 +73,7 @@
 else
 {
 	die "Invalid name: $name\n"
-		unless $name =~ /^[\@a-zA-Z0-9\.\-]+$/;
+		unless $name =~ /^[\@a-zA-Z0-9+:_\.\-]+$/;
 }
 
 grep( (/[\|\n]/ && die "Invalid field or value.\n"), @ARGV);
--- courier-0.47.orig/authlib/Makefile.in
+++ courier-0.47/authlib/Makefile.in
@@ -715,7 +715,7 @@
 	../rfc2045/librfc2045.a ../random128/librandom128.a
 
 authtest_LDADD = libauth.a libauthmod.a\
-	../rfc2045/librfc2045.a ../random128/librandom128.a `cat libauth1.dep`
+	../rfc2045/librfc2045.a ../random128/librandom128.a `cat libauth.dep`
 
 authenumerate_SOURCES = authenumerate.c
 authenumerate_DEPENDENCIES = libauth.a libauthmod.a ../numlib/libnumlib.a libauth.dep\
--- courier-0.47.orig/authlib/authpam.c
+++ courier-0.47/authlib/authpam.c
@@ -124,13 +124,13 @@
 		if (retval != PAM_SUCCESS) dprintf("pam_setcred failed, result %d", retval);
 	}
 #endif
+#endif
 
 	if (retval == PAM_SUCCESS)
 	{
 		retval=pam_acct_mgmt(*pamh, 0);
 		if (retval != PAM_SUCCESS) dprintf("pam_acct_mgmt failed, result %d", retval);
 	}
-#endif
 	if (retval == PAM_SUCCESS)
 		dprintf("dopam successful");
 
--- courier-0.47.orig/imap/imapscanclient.c
+++ courier-0.47/imap/imapscanclient.c
@@ -137,8 +137,11 @@
 
 	if (scaninfo->watcher == NULL &&
 	    (scaninfo->watcher=maildirwatch_alloc(maildir)) == NULL)
-		imapscanfail("maildirwatch");
-
+	{
+	/* we don't report this problem any longer */
+	/* imapscanfail("maildirwatch"); */
+	}
+	
 	if ((newname=maildir_lock(maildir, scaninfo->watcher, &tryAnyway))
 	    == NULL)
 	{
--- courier-0.47.orig/maildrop/mailbot.c
+++ courier-0.47/maildrop/mailbot.c
@@ -356,7 +356,7 @@
 
 	if (argn >= argc)
 	{
-		static char *sendmail_argv[]={"sendmail", "-f", ""};
+		static char *sendmail_argv[]={"/usr/sbin/sendmail", "-f", ""};
 
 		argn=0;
 		argc=3;
--- courier-0.47.orig/webmail/configure.in
+++ courier-0.47/webmail/configure.in
@@ -42,6 +42,8 @@
 eval "bindir=$bindir"
 eval "localstatedir=$localstatedir"
 
+AC_ARG_WITH(piddir, [  --with-piddir         Directory where sqwebmail socket/pid files are located ], piddir="$withval", piddir="${locatestatedir}/tmp/")
+
 if test -d ${srcdir}/../courier
 then
 	htmldir="$datadir/sqwebmail/html"
@@ -54,6 +56,7 @@
 AC_ARG_WITH(htmldir, [], , ac_configure_args="--with-htmldir=$htmldir $ac_configure_args")
 AC_SUBST(htmldir)
 AC_SUBST(scriptdir)
+AC_SUBST(piddir)
 
 AC_ARG_WITH(mailer,
 [  --with-mailer=prog  Your mail submission program],
--- courier-0.47.orig/webmail/Makefile.am
+++ courier-0.47/webmail/Makefile.am
@@ -118,7 +118,7 @@
 	echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
 	echo '#define IMGPATH "@imageurl@"' >>htmllibdir.h
 	echo '#define NODSN "$(sysconfdir)/nodsn"' >>htmllibdir.h
-	echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h
+	echo '#define SOCKDIR "@piddir@"' >>htmllibdir.h
 	echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h
 	if test -d $(srcdir)/../courier \
 		; then \
--- courier-0.47.orig/webmail/folder.c
+++ courier-0.47/webmail/folder.c
@@ -1,5 +1,5 @@
 /*
-** Copyright 1998 - 2004 Double Precision, Inc.  See COPYING for
+** Copyright 1998 - 2005 Double Precision, Inc.  See COPYING for
 ** distribution information.
 */
 
@@ -2234,13 +2234,19 @@
 	if (strcmp(cgi("form"), "print") == 0)
 	{
 		showattname(getarg("ATTSTUB"), dummy, content_type);
+
+		printf("&nbsp;(");
+		output_attrencoded(content_type);
+		printf(")");
 	}
 	else
 	{
 		printf("<div align=\"center\"><span class=\"message-attachment-header\">");
 		showattname(getarg("ATTACHMENT"), dummy, content_type);
 
-		printf("&nbsp;(%s)</span></div>",
+		printf("&nbsp;(");
+		output_attrencoded(content_type);
+		printf("; %s)</span></div>",
 		       showsize(end_pos - start_body));
 		printf("<br /><div align=\"center\">");
 
--- courier-0.47.orig/webmail/html.c
+++ courier-0.47/webmail/html.c
@@ -187,9 +187,16 @@
 					if (tai)	++tai->tagvaluelen;
 				}
 				if (*p)	p++;
+				else
+				{
+					memset(tagbuf, ' ', strlen(tagbuf));
+				}
 			}
 			else
 			{
+				if (c == 0)
+					memset(tagbuf, ' ', strlen(tagbuf));
+
 				if (tai)
 				{
 					tai->tagvalue=p;
@@ -222,6 +229,31 @@
 	while ((p=strchr(tagbuf, '<')) != NULL)
 		*p=' ';
 
+	for (p=tagbuf; *p; p++)
+	{
+		char *q;
+
+		if (*p != '&')
+			continue;
+
+		q=p;
+
+		++p;
+
+		while (*p)
+		{
+			if (strchr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", *p) == NULL)
+				break;
+			++p;
+		}
+
+		if (*p != ';')
+		{
+			*q=0;
+		}
+		--p;
+	}
+
         tagattrlen=parseattr(0);
         if ( tagattrlen > tagattrsize)
         {
@@ -285,7 +317,9 @@
 	incomment,		/* <!--, in a comment, have not seen any
 				dashes */
 	incommentseendash,	/* In a comment, seen - */
-	incommentseendashdash	/* In a comment, seen -- */
+	incommentseendashdash,	/* In a comment, seen -- */
+
+	skiptag			/* Ignore <!tag> */
 	} ;
 
 static enum htmlstate cur_state;
@@ -385,7 +419,7 @@
 		case intag:
 			/* We're in a tag (not a <!-- comment)
 			collect the contents in tagbuf, until > is seen */
-do_intag:
+
 			cur_state=intag;
 			if (p[l] == '>')
 			{
@@ -397,9 +431,21 @@
 			addtagbuf(p[l]);
 			continue;
 
+		case skiptag:
+			if (p[l] == '>')
+			{
+				start=l+1;
+				cur_state=intext;
+			}
+			continue;
 		case seenltbang:
 			/* We have <!.  If - is not here, this is a SGML tag */
-			if (p[l] != '-')	goto do_intag;
+			if (p[l] != '-')
+			{
+				cur_state=skiptag;
+				continue;
+			}
+
 			addtagbuf(p[l]);
 			cur_state=seenltbangdash;
 			continue;
@@ -410,9 +456,12 @@
 			otherweise we're in a comment, which we can pass
 			along */
 
-			if (p[l] != '-')	goto do_intag;
-			if (!skipping())
-				(*htmlfiltered_func)("<!--", 4);
+			if (p[l] != '-')
+			{
+				cur_state=skiptag;
+				continue;
+			}
+
 			start=l+1;
 			cur_state=incomment;
 			continue;
@@ -433,8 +482,6 @@
 				cur_state=incomment;
 				continue;
 			}
-			if (!skipping())
-				(*htmlfiltered_func)(p+start, l+1-start);
 			cur_state=intext;
 			start=l+1;
 			continue;
@@ -446,9 +493,6 @@
 
 	switch (cur_state)	{
 	case intext:
-	case incomment:
-	case incommentseendash:
-	case incommentseendashdash:
 		if (!skipping())
 			(*htmlfiltered_func)(p+start, l-start);
 	default:
--- courier-0.47.orig/courier/Makefile.in
+++ courier-0.47/courier/Makefile.in
@@ -1820,7 +1820,7 @@
 		$(INSTALL_DATA) $(srcdir)/smtpaccess.config \
 			$(DESTDIR)$(sysconfdir)/smtpaccess/default
 	rm -f $(DESTDIR)$(bindir)/rmail
-	$(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
+	$(LN_S) sendmail $(DESTDIR)$(sbindir)/rmail
 	. ../authlib/authdaemonrc ; \
 		test "$$authdaemonvar" != "" || exit 0 ; \
 		$(mkinstalldirs) $(DESTDIR)$$authdaemonvar
--- courier-0.47.orig/courier/ldapaliasdrc.h
+++ courier-0.47/courier/ldapaliasdrc.h
@@ -21,9 +21,9 @@
 void ldapaliasd_configchanged();
 
 #define	LDAPALIASDCONFIGFILE	SYSCONFDIR	"/ldapaliasrc"
-#define	SOCKETFILE		LOCALSTATEDIR	"/tmp/ldapaliasd"
-#define	LOCKFILE		LOCALSTATEDIR	"/tmp/ldapaliasd.lock"
-#define	PIDFILE			LOCALSTATEDIR	"/tmp/ldapaliasd.pid"
+#define	SOCKETFILE		"/var/run/courier/ldapaliasd"
+#define	LOCKFILE		"/var/run/courier/ldapaliasd.lock"
+#define	PIDFILE			"/var/run/courier/ldapaliasd.pid"
 
 #ifdef __cplusplus
 }
--- courier-0.47.orig/courier/cmlm.h
+++ courier-0.47/courier/cmlm.h
@@ -51,8 +51,9 @@
 #define	MSGSEPARATOR	"===="
 
 #include	"bindir.h"
+#include    "sbindir.h"
 
-#define	SENDMAIL	BINDIR "/sendmail"
+#define	SENDMAIL	SBINDIR "/sendmail"
 #define	REFORMIME	BINDIR "/reformime"
 #define	MAXRCPTS	20
 
--- courier-0.47.orig/courier/doc/Makefile.in
+++ courier-0.47/courier/doc/Makefile.in
@@ -229,7 +229,8 @@
 	esmtpd.8 makeacceptmailfor.8 makehosteddomains.8\
 	mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
 	makealiases.8 makepercentrelay.8 makesmtpaccess.8 makeuserdb.8 \
-	pop3d.8 submit.8 userdb.8 userdbpw.8 imapd.8
+	pop3d.8 submit.8 userdb.8 userdbpw.8 imapd.8 \
+	courier-mtaconfig.8 courieresmtpd.8
 
 BUILT_SOURCES = \
 	cancelmsg.html cancelmsg.1 \
@@ -1134,6 +1135,12 @@
 preline.1: preline.1.in
 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+courieresmtpd.8: courieresmtpd.8.in
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+courier-mtaconfig.8: courier-mtaconfig.8.in
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 install-man-extra:
 	cd $(DESTDIR)$(man8dir) ; \
 		rm -f courierpop3login.8 pw2userdb.8 vchkpw2userdb.8 makesmtpaccess-msa.8 esmtpd-msa.8; \
--- courier-0.47.orig/courier/doc/esmtpd.8.in
+++ courier-0.47/courier/doc/esmtpd.8.in
@@ -9,7 +9,7 @@
 .TH "ESMTPD" "8" "27 August 2004" "Double Precision, Inc." ""
 
 .SH NAME
-esmtpd \- Courier mail server ESMTP daemon
+esmtpd, esmtpd-ssl, esmtpd-msa \- Courier mail server ESMTP daemon
 .SH SYNOPSIS
 
 \fBesmtpd\fR \fBstart\fR
@@ -21,6 +21,15 @@
 \fBesmtpd\fR \fBrestart\fR
 
 
+\fBesmtpd-ssl\fR \fBstart\fR
+
+
+\fBesmtpd-ssl\fR \fBstop\fR
+
+
+\fBesmtpd-ssl\fR \fBrestart\fR
+
+
 \fBesmtpd-msa\fR \fBstart\fR
 
 
@@ -42,6 +51,10 @@
 \fBcouriertcpd\fR
 daemon, shutting down the ESMTP service.
 .PP
+The command "\fBesmtpd-ssl start\fR" starts the server on the
+ESMTP-over-SSL port, port 465.
+"\fBesmtpd-ssl stop\fR" stops it.
+.PP
 The command "\fBesmtpd-msa start\fR" starts the server on the
 message submission port, port 587.
 "\fBesmtpd-msa stop\fR" stops it.
@@ -58,6 +71,9 @@
 \fI@sysconfdir@/smtpaccess.dat\fR
 access file, so you don't have to do
 it manually, yourself. Similarly,
+\fBmakesmtpaccess-ssl\fR(8)
+automatically runs \fBesmtpd-ssl restart\fR
+and
 \fBmakesmtpaccess-msa\fR(8)
 automatically runs \fBesmtpd-msa restart\fR
 .SH "FILES"
@@ -66,6 +82,17 @@
 This configuration file initializes
 various settings for \fBcourieresmtpd\fR\&.
 .TP
+\fB\fI@sysconfdir@/esmtpd-ssl\fB\fR
+This configuration file
+initializes the settings for \fBcourieresmtpd\fR when invoked by
+\fBesmtpd-ssl\fR.  Note that this file is used to override the
+settings \fI@sysconfdir@/esmtpd\fR.
+The command "\fBesmtpd-ssl
+start\fR" first reads \fI@sysconfdir@/esmtpd\fR, then
+afterwards \fI@sysconfdir@/esmtpd-ssl\fR. Any settings in
+\fIesmtpd-ssl\fR override the corresponding settings in
+\fIesmtpd\fR
+.TP
 \fB\fI@sysconfdir@/esmtpd-msa\fB\fR
 This configuration file
 initializes the settings for \fBcourieresmtpd\fR when invoked by
--- courier-0.47.orig/courier/doc/courier-mtaconfig.8.in
+++ courier-0.47/courier/doc/courier-mtaconfig.8.in
@@ -0,0 +1,21 @@
+.\"<!-- $Id: missing-manpages.patch,v 1.1 2003/12/08 14:59:20 racke Exp $ -->
+.\"<!-- Copyright 1998 - 2001 Double Precision, Inc.  See COPYING for -->
+.\"<!-- distribution information. -->
+.\" This manpage has been automatically generated by docbook2man 
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "COURIER-MTACONFIG" "8" "21 April 2003" "Double Precision, Inc." ""
+
+.SH NAME
+courier-mtaconfig \- Show configuration parameters for the Courier MTA
+
+.SH "DESCRIPTION"
+.PP
+This command displays configuration parameters for the currently running
+instance of the Courier MTA (mail transfer agent).
+.SH "SEE ALSO"
+.PP
+\fBcourier\fR(8),
+\fBesmtpd\fR(8).
--- courier-0.47.orig/courier/doc/courieresmtpd.8.in
+++ courier-0.47/courier/doc/courieresmtpd.8.in
@@ -0,0 +1,27 @@
+.\"<!-- $Id: missing-manpages.patch,v 1.1 2003/12/08 14:59:20 racke Exp $ -->
+.\"<!-- Copyright 1998 - 2001 Double Precision, Inc.  See COPYING for -->
+.\"<!-- distribution information. -->
+.\" This manpage has been automatically generated by docbook2man 
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "COURIERESMTPD" "8" "21 April 2003" "Double Precision, Inc." ""
+
+.SH NAME
+courieresmtpd \- Courier mail server ESMTP daemon
+
+.SH "DESCRIPTION"
+.PP
+The actual Courier ESMTP daemon (mail transfer agent) is called
+\fBcourieresmtpd\fR.
+Normally,
+\fBcourieresmtpd\fR
+is run from 
+\fBcouriertcpd\fR,
+which is in turn run from \fBesmtpd start\fR or a similar command.
+You should not have to run courieresmtpd manually.
+.SH "SEE ALSO"
+.PP
+\fBcouriertcpd\fR(8),
+\fBesmtpd\fR(8).
--- courier-0.47.orig/courier/module.esmtp/Makefile.in
+++ courier-0.47/courier/module.esmtp/Makefile.in
@@ -68,7 +68,7 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = esmtpd esmtpd-ssl esmtpd.dist esmtpd-msa.dist \
 	esmtpd-ssl.dist makesmtpaccess makeacceptmailfor \
-	makepercentrelay staticlist.c mkesmtpdcert esmtpd.cnf
+	makepercentrelay mkesmtpdcert esmtpd.cnf
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 librewrite_la_LIBADD =
 am_librewrite_la_OBJECTS = esmtp.lo
--- courier-0.47.orig/courier/module.fax/new_fax.in
+++ courier-0.47/courier/module.fax/new_fax.in
@@ -8,6 +8,7 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 bindir="@bindir@"
+sbindir="@sbindir@"
 sysconfdir="@sysconfdir@"
 
 . $sysconfdir/faxnotifyrc
@@ -109,7 +110,7 @@
 echo "--courierfax--"
 }
 
-makemessage "$@" | $bindir/sendmail -f "$MAILFROM" "$RCPTTO"
+makemessage "$@" | $sbindir/sendmail -f "$MAILFROM" "$RCPTTO"
 
 if test $? = 0
 then
--- courier-0.47.orig/courier/module.local/preline.c
+++ courier-0.47/courier/module.local/preline.c
@@ -42,6 +42,12 @@
 		usage();
 	}
 
+	if (argc == 1)
+	 {
+		fprintf(stderr, "%s: commandline parameter 'program' needed\n", argv[0]);
+	 	exit (1);
+	 }
+ 
 	if (pipe(pipefd) < 0)
 	{
 		perror("pipe");
--- courier-0.47.orig/debian/changelog
+++ courier-0.47/debian/changelog
@@ -0,0 +1,1011 @@
+courier (0.47-4sarge4) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied patch by David Härdeman to fix unauthorised access
+    [authlib/authpam.c, CVE-2005-3532, Bug#211920]
+
+ -- Martin Schulze <joey@infodrom.org>  Sun, 20 Nov 2005 11:21:55 +0100
+
+courier (0.47-4sarge3) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied extended patch for cross-side scripting issues in sqwebmail
+    to filter out certain MSIE-only scripting constructs [webmail/html.c,
+    Bug#327181, CAN-2005-2820]
+  * Also fixes the issue described in [CAN-2005-2769, Bug#327727)
+
+ -- Martin Schulze <joey@infodrom.org>  Tue, 13 Sep 2005 11:53:47 +0200
+
+courier (0.47-4sarge2) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patch to fix cross-site scripting in sqwebmail
+    [webmail/html.c, webmail/folder.c, CAN-2005-2724, Bug#325631]
+
+ -- Martin Schulze <joey@infodrom.org>  Tue, 30 Aug 2005 20:30:45 +0200
+
+courier (0.47-4sarge1) stable-security; urgency=high
+
+  * added patch to avoid potential DoS when handling DNS failures while
+    looking up SPF records [CAN-2005-2151] (Closes: #320290, thanks to
+    Micah Anderson <micah@riseup.net> for the report and Willi Mann
+    <willi@wm1.at> for the patch)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 28 Jul 2005 13:10:01 +0200
+
+courier (0.47-4) unstable; urgency=low
+
+  * more logcheck fixes:
+    - fix typo in courier-pop file
+    - changed "DISCONNECTED" regular expression in courier-imap file
+  * added libmysqlclient-dev as preferred alternative to Build-Depends
+  * changed default permissions for /var/run/courier to 0755
+  	(Closes: #284062, thanks to Grzegorz Janoszka
+    <Grzegorz.Janoszka@pro.onet.pl> for the report)
+  * backout patch to cope with maildrop bug #265399, it causes overquota
+    deliveries to be deferred instead of bounced (Closes: #291441, thanks
+    to Marcus Pereira <marcus@task.net.br> for the report)
+  * added missing temporary directory for fax mails (thanks to Juergen
+    Beurskens <juergen@beurskens.biz> for the report)
+  * suggest courier-filter-perl for courier-mta package
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 26 Jan 2005 23:04:19 +0100
+
+courier (0.47-3) unstable; urgency=medium
+
+  * fix stupid typo in courier-pop init script (Closes: #276774, thanks to
+    Michael Hummel <mhummel@debian.org> for the report)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat, 16 Oct 2004 19:54:47 +0200
+
+courier (0.47-2) unstable; urgency=medium
+
+  * enhanced logcheck regular expressions (Closes: #275415,
+    thanks to Sam Snow <sam.snow@christianheritageschool.org> for the report) 
+  * suggest courier-doc for almost all packages (Closes: #275977, thanks
+    to Moritz Muehlenhoff <jmm@informatik.uni-bremen.de> for the report)
+  * fix courier-pop init script to allow STLS (Closes: #244096, thanks to
+    Lehel Bernadt <lehel@pmc-services.hu> for the report)
+  * fix sendmail location in new_fax script (Closes: #276453, thanks to
+    Mario Peschel <mario@twc.de> for the report)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 14 Oct 2004 15:27:32 +0200
+
+courier (0.47-1) unstable; urgency=medium
+
+  * new upstream release
+  * install symlinks for imapd-ssl and pop3d-ssl manual pages 
+  	(Closes: #234647, #234648)
+  * added manual pages provided by Willi Mann <willi@wm1.at>:
+    sharedindexsplit, sharedindexinstall, webmaild
+  * updated logcheck files
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 27 Sep 2004 23:06:37 +0200
+
+courier (0.46-0.12) experimental; urgency=low
+
+  * file permissions where broken, only affects builds with uid 0
+  	(Closes: #268220)
+  * authenumerate manual page provided by Willi Mann <willi@wm1.at> added
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 10 Sep 2004 20:18:14 +0200
+
+courier (0.46-0.11) experimental; urgency=low
+
+  * new upstream release
+  * init script for courier-pcp is a dummy now (Closes: #266087)
+  * rewrote handling of file permissions (Closes: #253250, #253251,
+    thanks to Andreas Metzler <ametzler@downhill.at.eu.org> for reporting
+    and Willi Mann <willi@wm1.at> for the implementation)
+  * raise default MAXPERIP limit for imapd to 20 (Closes: #269743)
+  * fixed insecure regular expressions in logcheck files
+    (Closes: #262384, #262386, #262388, #262389, thanks to Joel Smith
+    <js-debianbugs@jk1.net> for the report)
+  * update sqwebmail description with requirement for Maildir format
+    (Closes: #267776, thanks to Baruch Even <baruch@ev-en.org>)
+  * updated Brazilian Portuguese translation of debconf templates 
+    (Closes: #264095, thanks to Andre Luis Lopes <andrelop@debian.org>)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon,  6 Sep 2004 16:00:49 +0200
+
+courier (0.45.6.20040712-1) unstable; urgency=low
+
+  * new upstream release:
+  	- needs automake1.8 to build
+    - IMAP outbox feature has been fixed (Closes: #241965, thanks to Dann
+      Franzier <dannf@debian.org> for the report and investigation of the
+      problem)
+  * removed debconf repackaging notice (Closes: #164910, thanks to Mark
+    Brown <broonie@sirena.org.uk> for the report)
+  * removed leftover sqwebmail suid debconf question (Closes: #259519,
+    thanks to Marc Haber <mh+debian-bugs@zugschlus.de> for the report)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 15 Jul 2004 15:18:40 +0200
+
+courier (0.45.6-1) unstable; urgency=low
+
+  * new upstream release (/etc/courier/authmodulelist has been deprecated)
+  * backed out patch to quell FAM error messages, we just suppress them
+    now as suggested by upstream (Closes: #253304)
+  * install authdaemon.passwd for changing passwords with courierauthtest
+    (Closes: #256565, thanks to Mohammed Sameer <uniball@gmx.net> for the
+    report)
+  * changed sample path for MySQL socket in /etc/courier/authmysqlrc to
+    default location in Debian (Closes: #258619, thanks to Mike O'Connor
+    <stew@vireo.org> for the report)
+  * removed old ChangeLog from courier-base
+  * use environment variable LDFLAGS to pass -lcyrpt to ./configure
+    instead of CFLAGS
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 12 Jul 2004 00:14:44 +0200
+
+courier (0.45.4-4) unstable; urgency=low
+
+  * fix for SqWebMail cross-site scripting vulnerability according to
+    CAN-2004-0591 (Closes: #255878, thanks to Willi Mann <willi@wm1.at>
+    for the report) 
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 23 Jun 2004 23:07:36 +0200
+
+courier (0.45.4-3) unstable; urgency=low
+
+  * alternative for maildirquota manual page added to help solving
+    conflict with maildrop (Closes: #252948, thanks to Brian May
+    <bam@debian.org> for reporting)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon,  7 Jun 2004 22:13:27 +0200
+
+courier (0.45.4-2) unstable; urgency=low
+
+  * quell FAM error messages (Closes: #191007, #206626, 
+    thanks to Steve Langasek <vorlon@debian.org> for the patch)
+  * accept nonexistent debconf entries in postrm scripts (Closes: #238822,
+    thanks to Marc Haber <mh+debian-bugs@zugschlus.de> for bug report and
+    patch)
+  * removed obsolete AUTHMODULES check (Closes: #244206, thanks to Carlo
+    Contavalli <ccontavalli@commedia.it> for the bug report)
+  * move maildirquota manual page into courier-base package because it is
+    referenced by the maildirmake manual page, added depend for
+    courier-base to courier-maildrop
+  * added Turkish translation of debconf templates (Closes: #252029)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat,  5 Jun 2004 15:49:40 +0200
+
+courier (0.45.4-1) unstable; urgency=medium
+
+  * new upstream release (Closes: #242354, fixes corrupted return
+    addresses in sqwebmail)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue,  6 Apr 2004 14:15:39 +0200
+
+courier (0.45.2-2) unstable; urgency=low
+
+  * added courier-mta-ssl postinst scripts which generates a SSL
+    certificate if necessary and ensures the correct ownership of this
+    certificate (Closes: #238814, thanks to Charles Fry
+    <debian@frogcircus.org> for the report)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 19 Mar 2004 15:40:33 +0100
+
+courier (0.45.2-1) unstable; urgency=low
+
+  * new upstream release (replaces monkeys.com blacklist with
+    spamhaus.org, Closes: #238232, thanks to Charles Fry
+    <debian@frogcircus.org> for the report)
+  * added Japanese translation of debconf templates (Closes: #238642,
+    thanks to Hideki Yamane <henrich@samba.gr.jp>)
+  * fixed dangling symlink /usr/sbin/pop3d-ssl (Closes: #238708, thanks to
+    Charles Fry <debian@frogcircus.org>)
+  * added Build-Conflicts for automake1.4
+  * incorrect code for retrieving AUTHMODULES setting in
+    courier-mta.config fixed (Closes: #238244, thanks to Jon Nelson
+    <jnelson@jamponi.net> for the report and to Denis Barbier
+    <barbier@debian.org> for the help in tracking the bug down)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 19 Mar 2004 03:55:25 +0100
+
+courier (0.45.1-2) unstable; urgency=low
+
+  * removed checks for AUTHMODULES configuration from courier-pop-ssl and
+    courier-imap-ssl packages (Closes: #238234, #238233, thanks to 
+    Charles Fry <debian@frogcircus.org>)
+  * updated Dutch translation of debconf templates (Closes: #238371,
+    thanks to Tim Dijkstra <tim@famdijkstra.org>)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 16 Mar 2004 13:39:27 +0100
+
+courier (0.45.1-1) unstable; urgency=high
+
+  * new upstream release (fixes remote buffer overflow vulnerabilities
+    according to CAN-2004-0224, Closes: #238101)
+  * updated French translation of debconf templates (Closes: #237099,
+    thanks to Christian Perrier <bubulle@debian.org>)
+  * updated German translation of debconf templates
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 15 Mar 2004 16:17:26 +0100
+
+courier (0.44.2-3) unstable; urgency=low
+
+  * updated Brazilian Portuguese translation of debconf templates 
+    (Closes: #235334, thanks to Andre Luis Lopes <andrelop@debian.org>)
+  * updated French translation of debconf templates (Closes: #235573,
+    thanks to Christian Perrier <bubulle@debian.org>)
+  * accidentally removed courier-authmysql.conffiles restored 
+    (Closes: #235616, thanks to Thomas Oppel <listen@arenfels.de> for the
+    bug report)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon,  1 Mar 2004 15:45:49 +0100
+
+courier (0.44.2-2) unstable; urgency=low
+
+  * libtool build dependency added (Closes: #235102, thanks to Hervé
+    <herve@oursours.net> for the bug report)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 27 Feb 2004 21:51:39 +0100
+
+courier (0.44.2-1) unstable; urgency=low
+
+  * new upstream release (Closes: #213454, #219326, #231965) which adds a
+    sqwebmail daemon as backend to the sqwebmail CGI script
+  * fixed a bug in courier-mta triggered by reiserfs on 2.6.x
+    kernels (Closes: #226796)
+  * removed excess spaces from courier-mta's description
+  * bashisms removed from courier-mta init script (Closes: #214663,
+    thanks to Sebastian Bleikamp <Sebastian.Bleikamp@web.de> for the
+    bug report)
+  * added installation destination of sqwebmail CGI script to debconf
+    template (Closes: #217407)
+  * patched userdb script to accept email addresses containing the
+    characters + : _ (Closes: #160768, #164637)
+  * courier-mtaconfig and courieresmtpd manual pages added 
+  	(Closes: #93383, #135219), removed corresponding
+    dh_undocumented call (Closes: #223467)
+  * updated patches section in README.Debian and added a note about
+    required values for virtual user authentication
+  * removed unnecessary libraries from courierauthtest binary 
+    (Closes: #223260), migrated courierauthtest to courier-base and
+    removed courier-debug package
+  * various changes to accomodate problems with courier-webadmin: added
+    debconf note about configuration files vs. configuration directories
+    to courier-mta, courier-mta creates configuration directories if
+    necessary (Closes: #133618, #149306, #226428), use a link to the
+    courier-imap/courier-imap-ssl initscripts within /usr/sbin
+    (Closes: #227324), README.Debian added
+  * remove courierwebadmin CGI program in postrm script if
+    installed by the postinst script
+  * rmail relocated to /usr/sbin (Closes: #220397)
+  * applied changes to build system from Michael K. Edwards
+    <mkedeb@sane.net>
+  * modified courier-base Debconf templates after an review on 
+    debian-l10n-english@lists.debian.org (thanks to Era for his help)
+  * depend on exim4 instead of exim (Closes: #228579)
+  * added Dutch translation of debconf templates (Closes: #231231, thanks
+    to Tim Dijkstra <tim@famdijkstra.org>)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 26 Feb 2004 13:55:24 +0100
+
+courier (0.42.2-11) unstable; urgency=high
+
+  * updated Brazilian Portuguese translation of debconf templates 
+    (Closes: #227440, thanks to Andre Luis Lopes <andrelop@debian.org>)
+  * intended to replace broken hppa build (see #227076)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat, 17 Jan 2004 11:31:20 +0100
+
+courier (0.42.2-10) unstable; urgency=low
+
+  * updated French translation of debconf templates (Closes: #213816,
+    thanks to Christian Perrier <bubulle@debian.org>)
+  * updated Russian translation of debconf templates (Closes: #214346,
+    thanks to Ilgiz Kalmetev <ilgiz@bashtelecom.ru>)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon,  6 Oct 2003 21:30:09 +0200
+
+courier (0.42.2-9) unstable; urgency=low
+
+  * addcr manual page written by Willi Mann <willi@wm1.at> added (Closes: #135218)
+  * switched to gettext-based debconf templates and added French
+    translation, minor wording change (Closes: #205780, #207114, 
+    thanks to Christian Perrier <bubulle@debian.org>)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 30 Sep 2003 10:59:38 +0200
+
+courier (0.42.2-8) unstable; urgency=low
+
+  * removed duplicate entry from authldap.schema (Closes: #210670)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 26 Sep 2003 17:53:27 +0200
+
+courier (0.42.2-7) unstable; urgency=low
+
+  * moved /usr/lib/courier/courier/modules/fax/courierfax and
+    /etc/courier/module.fax into courier-mta package, added kludge to
+    stop the Courier mail server if /etc/courier/module.fax is missing to
+    avoid failures on upgrades (Closes: #154328, #167279, #207267)
+  * /usr/sbin/filterctl uses the correct PID file location now, install
+    perlfilter-wrapper.pl in the correct location - really not an example
+    (Closes: #149669)
+  * /etc/courier/ldapaliasrc now has group read permissions 
+    (Closes: #207512, thanks to James McOrmond <jam@jammys.net> for the report)
+  * revised package descriptions to comply with policy section 2.3.3
+    (Closes: #193776, #209453, #209460, #209474, #209513) among other things
+  * /etc/courier/ldapaliasrc now has group read permissions (Closes: #207512)
+  * message queues are removed on purge of courier-mta now
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 11 Sep 2003 20:49:18 +0200
+
+courier (0.42.2-6) unstable; urgency=low
+
+  * fixed dangling symlink /usr/bin/rmail (Closes: #203505, thanks to Remi
+    Paulmier <remi@shtouff.org> for the bug report)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat,  2 Aug 2003 02:15:11 +0200
+
+courier (0.42.2-5) unstable; urgency=low
+
+  * force usage of /bin/bash for courier-imap init script
+    (Closes: #200709, thanks to Tatsuki Sugiura <sugi@nemui.org> for
+    reporting problems with ash shell)
+  * remove alternative for maildir.5 manpage properly in courier-base
+    prerm script
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 10 Jul 2003 23:19:39 +0200
+
+courier (0.42.2-4) unstable; urgency=medium
+
+  * check for existence of imapd-ssl configuration file in the
+    courier-imap startup code as well (Closes: #200570, thanks to Manoj
+    Srivastava <srivasta@debian.org> for reporting the problem)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed,  9 Jul 2003 11:10:52 +0200
+
+courier (0.42.2-3) unstable; urgency=low
+
+  * add final newline to courier-pcp-conffiles to avoid failure of
+    installation (Closes: #197104)
+  * Russian debconf template translations added 
+    (Closes: #135833, #135834, #135835, #135836, #135837)
+    thanks to Ilgiz Kalmetev <ilgiz@bashtelecom.ru>) 
+  * rewrote courier-imap init script to resemble the one shipped with the
+    sources, allows STARTTLS and forcing STARTTLS now by reading imapd-ssl
+    configuration file (Closes: #117446, #152861, #199904, #200089)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue,  8 Jul 2003 01:12:56 +0200
+
+courier (0.42.2-2) unstable; urgency=medium
+
+  * creates a symlink /etc/courier/maildroprc => /etc/maildroprc if only
+    the latter file exists
+  * courier-pcp does contain /etc/courier/calendar now (Closes: #138275)
+  * prefer libgdbm-dev to libgdbmg1-dev (Closes: #196932)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 10 Jun 2003 22:33:47 +0200
+
+courier (0.42.2-1) unstable; urgency=low
+
+  * new upstream release (Closes: #193279, thanks to Devin Carraway
+    <devin@debian.org> for the bug report)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 15 May 2003 22:10:20 +0200
+
+courier (0.42.0-6) unstable; urgency=low
+
+  * refined patch for build with SASL2 (Closes: #191950 again)
+  * added missing bindir variable to courier-imap init script 
+    (Closes: #192363, thanks to Marek Habersack <grendel@debian.org> for
+    the bug report)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu,  8 May 2003 14:24:25 +0200
+
+courier (0.42.0-5) unstable; urgency=low
+
+  * use defined directory variables in init scripts (Closes: #190703,
+  	thanks to Emmanuel Lacour <elacour@home-dn.net> for the patch)
+  * allow to be build with SASL2 (Closes: #191950, thanks to 
+    LaMont Jones <lamont@hp.com> for the bug report)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed,  7 May 2003 00:17:15 +0200
+
+courier (0.42.0-4) unstable; urgency=low
+
+  * updated config.guess and config.sub files in maildir subdirectory
+    too (Closes: #186986 again)
+  * fixed segmentation fault caused by preline binary that happens if
+    called without parameters (Closes: #169770, thanks to Oliver Thuns
+    <oliver.thuns@web.de> for the bug report)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat,  5 Apr 2003 01:49:57 +0200
+
+courier (0.42.0-3) unstable; urgency=low
+
+  * added alternative for maildir.5 manpage (thanks to Petr Balá
+    <petr@balas.cz> for the bug report)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri,  4 Apr 2003 00:05:12 +0200
+
+courier (0.42.0-2) unstable; urgency=low
+
+  * updated config.guess and config.sub files (Closes: #186986, thanks to
+    Ryan Murray <rmurray@debian.org>)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue,  1 Apr 2003 01:27:12 +0200
+
+courier (0.42.0-1) unstable; urgency=low
+
+  * new upstream release
+  * fixed mode on logcheck files (Closes: #186689, thanks to Russell Coker
+    <russell@coker.com.au>)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun, 30 Mar 2003 18:19:39 +0200
+
+courier (0.40.2-4) unstable; urgency=low
+
+  * added a few patches and a cleanup script to finally get the
+    build/clean cycle working as required (Closes: #157267)
+  * updated Spanish templates translations (Closes: #179003, thanks to
+    Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>)
+  * added logcheck configuration files for courier-imap, courier-imap-ssl,
+    courier-pop and courier-pop-ssl supplied by martin f krafft
+    <madduck@debian.org> (Closes: #181416)
+  * added note about runtime configuration files to sqwebmail's
+    README.Debian 
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 26 Feb 2003 15:46:52 +0100
+
+courier (0.40.2-3) unstable; urgency=critical
+
+  * applied patch to fix potential remote exploit via SQL 
+    injection in courier-authpostgresql package
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 24 Jan 2003 15:14:52 +0100
+
+courier (0.40.2-2) unstable; urgency=medium
+
+  * added README.authmysql.html to courier-authpostgresql docs as well so
+    that the link in README.authpostgresql.html works (Closes: #176203)
+  * courier-imap depends now on libfam0c102 in sid builds 
+    (Closes: #177389)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun, 19 Jan 2003 22:46:16 +0100
+
+courier (0.40.2-1) unstable; urgency=low
+
+  * new upstream release (incorporates ancient patch to makealiases.in)
+  * build courier-doc package in binary-indep target (Closes: #170564,
+    thanks to Bdale Garbee <bdale@gag.com> for reporting)
+  * use doc section for courier-doc package again
+  * note about vpopmail support added to README.debian
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 31 Dec 2002 16:14:19 +0100
+
+courier (0.40.1-2) unstable; urgency=medium
+
+  * define bindir variable in courier-imap-ssl.init which is referenced
+    in the configuration file (Closes: #170594)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 25 Nov 2002 10:28:02 +0100
+
+courier (0.40.1-1) unstable; urgency=low
+
+  * merged SSL stuff in (Closes: #159099), upstream authors explicitly
+    allowed linking against OpenSSL libraries
+  * URL for information about how to advise Postfix to deliver into
+    maildir's added to README.debian
+  * applied patch to avoid a security issue on IMAP server debug file
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 19 Nov 2002 17:02:10 +0100
+
+courier (0.40.0-3) unstable; urgency=low
+
+  * accidentally removed courier-authmysql.conffiles restored (Closes: #169472)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun, 17 Nov 2002 15:19:25 +0100
+
+courier (0.40.0-2) unstable; urgency=low
+
+  * updated config.guess and config.sub (Closes: #167767)
+  * libssl-dev added to Build-Depends
+  * adjusted courier-imap's version number
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon,  4 Nov 2002 23:39:27 +0100
+
+courier (0.40.0-1) unstable; urgency=critical
+
+  * applied security patch to fix a local exploit where a local shell user
+    can trick sqwebmail into reading any file on the local system.
+  * new upstream release which fixes POP login problems (Closes: #162263)
+    and obsolete AC_SUBST(LIBOBJS) in webmail/configure.in (Closes: #162324)
+  * courier-webadmin install-cgi template rewritten
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 30 Oct 2002 14:09:26 +0100
+
+courier (0.39.3.20020921-1) unstable; urgency=low
+
+  * new upstream release (replaces dotlock with lockmail)
+  * install sqwebmail CGI binary whether the user allows the suid bit to
+    be set or not (Closes: #154183)
+  * remove sqwebmail CGI binary on remove instead on purge
+  * check umask in debian/rules because Courier requires umask 022 for
+    installation (Closes: #157149)
+  * --enable-unicode ./configure option added (Closes: #159821)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 23 Sep 2002 14:10:43 +0200
+
+courier (0.39.1-1) unstable; urgency=high
+
+  * new upstream release (Closes: #141878, #149928), includes courierfax module
+    packaged as courier-faxmail
+  * handling of --with-mailer ./configure option changed due to upstream
+    changes 
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun,  7 Jul 2002 23:04:56 +0200
+
+courier (0.37.3-7) unstable; urgency=low
+
+  * check if /etc/courier exists before creating
+    /etc/courier/authmodulelist (Closes: #148659, thanks to Mikhail
+    Sobolev <mss@mawhrin.net>  for reporting the problem)
+  * remove ispell configuration file on purge
+  * remove authdaemon runtime files on purge
+  * remove automatically generated files in /etc/courier and empty
+    configuration directories on purge on courier-mta
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun,  2 Jun 2002 15:52:12 +0200
+
+courier (0.37.3-6) unstable; urgency=low
+
+  * ensure that /etc/courier/authmodulelist exists (Closes: #147285,
+    thanks to Marcus Pereira <marcus@task.com.br> for reporting)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 28 May 2002 17:04:44 +0200
+
+courier (0.37.3-5) unstable; urgency=low
+
+  * fix permissions on directories utilized by the courierfilter daemon
+    (Closes: #147052, thanks to Hilko Bengen <bengen@vdst-ka.inka.de>)
+  * added priorities for courier-pop, courier-mta and courier-imap to get
+    in sync with the Debian override files, changed section for
+    courier-doc to mail
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 15 May 2002 11:06:57 +0200
+
+courier (0.37.3-4) unstable; urgency=low
+
+  * protect /etc/courier/ldapaliasrc against prying eyes too (Closes: #146939)
+  * courier-ldap starts Courier LDAP alias server (Closes: #144724, thanks
+  	to Mark Anthony Lisher <markal@markal.net>, please read courier-ldap's
+  	README.Debian for more information)
+  * change default LDAP server in authldaprc and ldapaliasrc configuration
+    files to localhost
+  * force runtime files of the Courier LDAP alias server to
+    /var/run/courier
+  * add version number to information to README.debian files of the
+    sqwebmail and courier-maildrop packages (Closes: #139548)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 14 May 2002 16:49:14 +0200
+
+courier (0.37.3-3) unstable; urgency=low
+
+  * invocation of the courier-mta and courier-authdaemon init scripts
+    with a relative path and the restart parameter failed 
+    (Closes: #142812, thanks to Andrew Shugg <andrew@neep.com.au> for
+  	reporting this problem)
+  * updated Brazilian Portuguese templates (Closes: #141559, thanks
+    to Andre Luis Lopes <andrelop@ig.com.br>)
+  * added configure option --enable-userdb to include userdb support in
+    the maildrop binary
+  * added configure option --enable-syslog so maildrop errors are logged
+    via syslog
+  * added README.Debian for courier-maildrop 
+  * made maildrop binary suid root
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 24 Apr 2002 12:04:21 +0200
+
+courier (0.37.3-2) unstable; urgency=medium
+
+  * fix permissions of /etc/courier/esmtpauthclient (Closes: #139992,
+    thanks to Torsten Knodt <tk-debian@datas-world.de> for reporting this
+    problem)
+  * create /var/run/courier/calendar/localcache and ensure correct
+    permissions on the directories used by the pcp daemon (Closes: #138262,
+    thanks to Anton Ivanov <ai1@ipaccess.com> for reporting this problem
+    and providing sufficient information to fix it)
+  * sqwebmail uses now /usr/bin/ldapsearch instead of
+    /usr/local/bin/ldapsearch (Closes: #136794, thanks to Karl M. Hegbloom
+    <karlheg@microsharp.com> for reporting this problem)
+  * fixed wrong path for sendmail in the maildrop binary (thanks to
+    Mark Anthony Lisher <markal@markal.net> for the patch)
+  * fixed wrong path for sendmail in the couriermlm binary 
+    (Closes: #139390, thanks to Antti-Juhani Kaijanaho <gaia@iki.fi> for
+    reporting this problem)
+  * throw an error if first argument to init scripts is wrong
+    (Closes: #139257, thanks to Daniel Freedman for reporting this problem)
+  * use the restart option of the courier-mta daemons in the courier-mta
+    init script (Closes: #139571, thanks to Marcus Felipe Pereira
+    <marcus@task.com.br> for his suggestion)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat,  6 Apr 2002 17:19:22 +0200
+
+courier (0.37.3-1) unstable; urgency=low
+
+  * new upstream release
+  * moved maildirquota manpage to courier-maildrop (Closes: #134639)
+  * moved a bunch of files/directories out of courier-base to courier-mta
+    resp. courier-authdaemon
+  * missing manpages for courier-config and webgpg added (Closes: #93382,
+    #93384) 
+  * missing manpage for courierlogger added
+  * added README.Debian link to SqWebMail documentation page
+  * added check to courier-mta init script testing the existence of the
+    esmtpd configuration file
+  * new package courier-debug containing the courierauthtest binary
+  * use debconf value of courier-mta/defaultdomain for courier-mta/dsnfrom
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 26 Feb 2002 09:47:40 +0100
+
+courier (0.37.2.20020131-1) unstable; urgency=low
+
+  * new upstream release, which adds the BOFHBADMIME configuration option
+    to the MTA (Closes: #130033), new courier-pcp package for groupware
+    calendaring mode (Closes: #128461)
+  * authmodulelist is now a conffile (Closes: #132829)
+  * added Courier's LDAP schema to the documentation of the courier-ldap
+    package 
+  * add dots to the output of the init scripts (Closes: #109054)
+  * revised description of courier-base package
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 11 Feb 2002 17:00:01 +0100
+
+courier (0.37.2-1) unstable; urgency=high
+
+  * new upstream release, which fixes a local exploit in the courier-mta
+    package resulting in memory corruption (Closes: #130321)
+  * spelling errors fixed (Closes: #124516, #124517, #124519, #124520)
+  * install changelog for courier-maildrop package
+  * copy debian/newaliases rather than moving it to allow multiple
+    calls of dpkg-buildpackage (thanks to Mark Constable <markc@renta.net>
+    for the hint)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 21 Jan 2002 18:33:59 -0500
+
+courier (0.37.0-1) unstable; urgency=low
+
+  * new upstream release (Closes: #127967)
+  * package courier-maildrop added on which courier-mlm and sqwebmail
+    depend upon (Closes: #111154, #112599)
+  * proper index for sqwebmail documentation added
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun,  6 Jan 2002 00:19:38 -0500
+
+courier (0.36.1-2) unstable; urgency=low
+
+  * init files for courier-pop and courier-imap check for couriertcpd now 
+    (Closes: #112928, #112929)
+  * templates translations to brazilian portuguese added
+    (Closes: #120934, #120936, thanks to Andre Luis Lopes <andrelop@ig.com.br>)
+  * templates translations to Spanish added
+    (Closes: #106365, #106599, thanks to Carlos Valdivia Yagüe
+    <valyag@teleline.es>)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri,  7 Dec 2001 21:52:32 +0100
+
+courier (0.36.1-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri,  7 Dec 2001 16:32:21 +0100
+
+courier (0.36.0-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 12 Nov 2001 15:13:31 +0100
+
+courier (0.35.1.20011103-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun,  4 Nov 2001 10:09:59 +0100
+
+courier (0.35.1.20011029-1) unstable; urgency=low
+
+  * new upstream release
+  * courierfilter PID file is now located in /var/run/courier 
+  	(Closes: #109423) 
+  * removed courierauthtest, because it causes dependencies
+    on LDAP and MySQL for the base package
+  * duplicates removed from courier-doc package
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 30 Oct 2001 10:36:05 +0100
+
+courier (0.35.0.20010828-2) unstable; urgency=low
+
+  * replaced chown 4550 authstart by chmod 4550, a silly error breaking
+    SMTP authentification (Closes: #111375, thanks to Steve J. Kondik
+    <shade@chemlab.org>)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu,  6 Sep 2001 10:28:13 +0200
+
+courier (0.35.0.20010828-1) unstable; urgency=low
+
+  * new upstream release
+  * versioned dependencies to courier-base and courier-authdaemon
+    (Closes: #110843)
+  * newaliases script added which creates aliases database based
+    on /etc/aliases (instead of the Courier default /etc/courier/aliases,
+    Closes: #109885)
+  * /etc/dsn* files are now part of the courier-mta package
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun,  2 Sep 2001 16:34:17 +0200
+
+courier (0.35.0.20010807-1) unstable; urgency=medium
+
+  * new upstream release (includes web administration tool, various
+    patches, reworked to compile with gcc 3.0, 
+    so it should Closes: #90655, #100114, #104899, #107460)
+  * disabled EXPN and VRFY commands in the default configuration
+  * produce configuration file /etc/courier/defaultdomain 
+    during installation
+  * use /var/cache/sqwebmail as cache directory for the webmail
+    server, added cron script to cleanse this directory
+  * templates translations to brazilian portuguese added
+    (Closes: #106133, #106137, thanks to Andre Luis Lopes <andrelop@ig.com.br>)
+  * template translation to German added (Closes: #95005)
+  * templates translations to spanish added
+  	(Closes: #106598, thanks to Carlos Valdivia Yagüe <valyag@teleline.es>)
+  * use authdaemon exclusively now (Closes: #100821, #104318)
+  * added authentification test utility as /usr/sbin/courierauthtest
+  * dependency to expect added for the sake of the webmail password script
+  * document about GnuPG support in sqwebmail added to 
+  	sqwebmail docs
+  * excess slash in sqwebmail stylesheet URL fixed (Closes: #106674,
+  	thanks to Darik Horn <dajhorn@student.math.uwaterloo.ca>)
+  * courier-doc is now in the doc section
+  * remove runtime files on purge (/var/run/courier)
+  * /etc/courier/aliases/system moved to courier-mta package
+  * authcram authentification enabled
+  * make sure that /etc/courier/dsnfrom and /etc/courier/locales exists  
+  * changed permissions for /usr/sbin/sendmail to 4511 so that local
+    delivery works
+  * use localhost as default MYSQL_SERVER
+  * create /etc/mailname if necessary
+  * close /dev/console (Closes: #92277, thanks to Russell Coker <russell@coker.com.au>)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 24 Aug 2001 04:09:53 +0200
+
+courier (0.34.1-2) unstable; urgency=low
+
+  * added current config.guess and config.sub files to help
+    Debian porters
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 10 Jul 2001 13:14:10 +0200
+
+courier (0.34.1-1) unstable; urgency=low
+
+  * new upstream release
+  * courier-pop and courier-imap init scripts do now an explicit
+    stop/start
+  * sqwebmail depends on ispell-dictionary now
+  * /usr/share/sqwebmail/html/en-us/ISPELLDICT is a symlink to 
+    /etc/courier/ispelldict and contains a proper dictionary
+    now (Closes: #98248)
+  * german description added to courier-imap.templates (Closes: #95003)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat, 23 Jun 2001 14:29:43 +0200
+
+courier (0.34.0-4) unstable; urgency=low
+
+  * Fixed makeauthmodulelist so that dpkg temporary files are ignored
+    (Closes: #99495, thanks to Mark Constable <markc@renta.net>)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun,  3 Jun 2001 18:18:36 +0200
+
+courier (0.34.0-3) unstable; urgency=low
+
+  * Build-Depends to procps added (Closes: #99500, thanks to Philip
+    Blundell <philb@gnu.org>)
+  * patch added to enable LDAP passwords with and without {crypt}
+    (Closes: #99306, 
+    thanks to Piotr Roszatycki <Piotr_Roszatycki@netia.net.pl>)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat,  2 Jun 2001 13:01:50 +0200
+
+courier (0.34.0-2) unstable; urgency=medium
+
+  * set permissions for ESMTP modules in courier-mta.postinst
+  * set permissions for various binaries in courier-mta.postinst
+  * added configure option --enable-webpass=no
+  * revised installation/deinstallation of sqwebmail images (Closes: #98379)
+  * bogus courier-base.postrm script removed
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 30 May 2001 20:18:16 +0200
+
+courier (0.34.0-1) unstable; urgency=low
+
+  * new upstream release 
+  * patch to fix the creation of INBOX.drafts included
+  * description of courier-base package revised (Closes: #93299)
+  * LDAP support enabled, which brings in authdaemon too
+  * Install sqwebmail CGI script if desired by the user (Closes: #94497)
+  * no longer uses shell functions in init scripts (Closes: #95771, #96426)
+  * installation of sqwebmail images fixed (Closes: #94498)
+  * sqwebmail HTML data files moved to /usr/share/sqwebmail
+  * /etc/courier/authmodulelist will be (re)generated automatically
+    during postinst of courier-base, courier-authdaemon and courier-authmysql
+  * added configure option --without-certdb to allow builds without
+    openssl installed
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 18 May 2001 20:51:31 +0200
+
+courier (0.33.0-3) unstable; urgency=low
+
+  * moved mkimapdcert from courier-imap to courier-imap-ssl
+  * revised dh_undocumented calls
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon,  9 Apr 2001 16:17:28 +0200
+
+courier (0.33.0-2) unstable; urgency=low
+
+  * remove binaries/manpages which belongs to maildrop (Closes: #93002, #90797)
+  * moved showconfig to courier-mta and renamed it to
+    courier-showconfig
+  * removed showmodules so we get rid courier-base's libmysqlclient
+    dependency (Closes: #63400)  
+  * moved logger to courierlogger (Closes: #87587)
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun,  8 Apr 2001 18:06:02 +0200
+
+courier (0.33.0-1) unstable; urgency=low
+
+  * new upstream release (Debian patches for imap/mainloop.c
+    and imap/imaptoken.c included, new gnupg stuff for sqwebmail)
+  * set correct permissions for courier-mta stuff (Closes: #92069)
+  * move some directories from courier-base to courier-mta
+  * run makesmtpaccess from courier-mta.postinst
+  * start/stop courier from courier-mta.init (Closes: #91991)
+  * bashism removed (Closes: #92824)
+  * force use of GDBM instead of libdb2
+  * pass MySQL library path to ./configure script
+  * suggest SSL versions of courier-pop and courier-imap
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu,  5 Apr 2001 00:10:19 +0200
+
+courier (0.32.0-3) unstable; urgency=low
+
+  * fixed deliverquota alternative (Closes: #75459)
+  * install ChangeLogs with dh_installchangelogs for policy's sake
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 22 Mar 2001 18:46:52 +0100
+
+courier (0.32.0-2) unstable; urgency=low
+
+  * removed README.debian from courier-base.docs
+  * install ChangeLogs (Closes: #89550)
+  * courier-authmysql overrides old package courier-imap-authmysql now
+  * detects debian release number for courier-imap version
+  * move configuration files of the old courier-imap package(s) 
+    to /etc/courier on demand (Closes: #88246)
+  * remove LDAP alias files after build
+  * note about LDAP support added to README.debian
+  * added error message on leftover files in build directory
+    
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 15 Mar 2001 19:51:06 -0500
+
+courier (0.32.0-1) unstable; urgency=low
+
+  * upstream release
+  * ensure that debian/fixlinks is executable (Closes: #87967,
+    thanks to Tommy Virtanen <tv@debian.org> and 
+    Paul Slootman <paul@debian.org>)
+  * use own PAM files instead of the Courier ones
+  * pass existing authentification modules only
+  * fix init files for courier-pop and courier-imap in respect
+    to the Mail directory (both Closes: #88075)
+  * moved /usr/bin/preline to courier-mta and setup the
+    appropriate alternatives (Closes: #87955)
+  
+ -- Stefan Hornburg <racke@linuxia.de>  Thu,  8 Mar 2001 20:36:56 -0800
+
+courier (0.31.1-2) unstable; urgency=low
+
+  * first release as official Debian package
+  * removed dh_suidregister and dh_testversion from rules (thanks to
+    Tommy Virtanen <tv@debian.org>)
+  * provide a concrete package for dependencies on virtual packages (thanks to
+    Tommy Virtanen <tv@debian.org>)
+  * check static buffer overrun in imap command input, and die if
+    this happens (thanks to Tommy Virtanen <tv@debian.org>)
+  * removed /etc/courier/filters/active from courier-mta conffiles
+    (thanks to Tommy Virtanen <tv@debian.org>)
+  * don't produce maildrop package yet, it is no match for 
+    the standalone package
+  * alternatives introduced for deliverquota, maildirmake and dotlock
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun, 25 Feb 2001 02:07:57 +0100
+
+courier (0.31.1-1) unstable; urgency=low
+
+  * upstream release
+  * dropped epoch
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 19 Feb 2001 10:02:26 +0100
+
+courier (0.31.0-2) unstable; urgency=low
+
+  * SSL split off 
+  * excess blank lines removed from *.conffiles
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri,  2 Feb 2001 22:39:18 +0100
+
+courier (0.31.0-1) unstable; urgency=low
+
+  * upstream release (includes esmtpd-msa)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 30 Jan 2001 12:24:36 +0100
+
+courier (0.30.0-3) unstable; urgency=low
+
+  * courierd config file moved from courier-base to courier-mta
+  * sqwebmail depends on Perl
+    
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 17 Jan 2001 11:07:02 +0100
+
+courier (0.30.0-2) unstable; urgency=low
+
+  * lintian errors fixed
+  * IMAP/IMAPS startup removed from courier-base init script
+  * MySQL authentification module added again
+  * no longer remove /usr/bin/imapd
+  * courier-pop/courier-imap init scripts rewritten (thanks to Marc Haber)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu,  4 Jan 2001 16:55:08 +0100
+
+courier (0.30.0-1) unstable; urgency=low
+
+  * upstream update (includes new target install-configure, patch to
+    perms.sh.in no longer needed)
+  * MySQL authentification module removed temporarily
+  * various stuff moved to courier-mta
+  * removed configure option --with-userdb which broke userdb stuff
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed,  3 Jan 2001 23:45:12 +0100
+
+courier (0.29.1-5) unstable; urgency=low
+
+  * epoch added to override standalone courier-imap package
+  * tried to improved package relations
+  * IMAP and IMAP/SSL daemons enabled, init scripts added
+    and configuration files sorted
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed,  6 Dec 2000 09:49:12 +0100
+
+courier (0.29.1-4) unstable; urgency=low
+
+  * pop3d.cnf configuration file moved into courier-pop-ssl package
+  * marked courier-pop/courier-pop-ssl init scripts
+    as configuration files
+  * moved couriermlm man page into courier-mlm package
+  * authmysql README added to courier-authmysql documentation
+  * fixed authmysql man page link
+  * extended description for courier-pop-ssl package added
+  * spurious /usr/bin/imapd removed
+  * HTML documentation files removal fixed
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon,  4 Dec 2000 02:06:00 +0100
+
+courier (0.29.1-3) unstable; urgency=low
+
+  * init file for courier-pop-ssl added
+  * configuration for courier-pop-ssl moved from courier-base
+  * dependencies for courier-pop-ssl fixed
+  * courier-mlm package introduced
+  
+ -- Stefan Hornburg <racke@linuxia.de>  Fri,  1 Dec 2000 11:23:37 +0100
+
+courier (0.29.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Stefan Hornburg <racke@linuxia.de>  Wed, 22 Nov 2000 02:31:47 +0100
+
+
--- courier-0.47.orig/debian/CREDITS.debian
+++ courier-0.47/debian/CREDITS.debian
@@ -0,0 +1,277 @@
+Dennis Schön (dennis@cobolt.net) for:
+- making the initial effort to package the whole Courier suite
+
+Marc Haber (mh+debian-bugs@zugschlus.de) for:
+- rewrite of courier-pop init script
+- rewrite of courier-imap init script
+- complaining about hardcoded debian release number for courier-imap
+- complaining about failing build with LDAP support installed
+- reporting bug #100114 (RFC1939 violation) and helping fix the bug upstream
+- reporting problems with nonexistent debconf entries in postrm scripts and 
+  providing a patch
+
+Tommi Virtanen (tv@debian.org) for:
+- removal of dh_suidregister and dh_testversion
+- provide a concrete package for dependencies on virtual packages
+- check static buffer overrun in imap command input, and die if
+  this happens
+- removed /etc/courier/filters/active from courier-mta conffiles
+- fix for debian/fixlinks permissions
+
+Paul Slootman (paul@debian.org) for:
+- reporting bug #87967 (permissions of debian/fixlinks)
+
+Michael S. Fischer (<michael@dynamine.net>) for:
+- reporting bug #88075 (PAM login broken)
+
+Saku Ytti (<ytti@ytti.fi>) for:
+- reporting bug #87955 (missing alternative for /usr/bin/preline)
+
+Michael Meskes (<Michael.Meskes@credativ.de>) for:
+- reporting bug #88246 (ignoring old configuration files)
+
+Erich Schubert (<erich@erich.xmldesign.de>) for:
+- reporting bug #89550 (missing upstream changelogs)
+
+Marc Martinez (<lastxit@technogeeks.org>) for:
+- complaining about the missing error message on leftover files
+- complaining about failing build with LDAP support installed
+
+Martin Pauley <marty@kasei.com> for:
+- reporting that /usr/sbin/sendmail didn't work for non-root users
+  (#92069)
+
+Joost van Baal (<joostvb@debian.org>) for:
+- patch to removing bashism, complain about missing dependencies
+  courier-imap-ssl => courier-imap and courier-pop-ssl => courier-pop
+  (#92824)
+
+Philip Blundell (<philb@gnu.org>) for:
+- complaining about missing Build-Depends on procps (#99500)
+
+Mark Constable (<markc@renta.net>) for:
+- discovering the problem with makeauthmodulelist and dpkg's 
+  temporary files and sending a patch (#99495)
+
+Matthew Wilcox (<willy@debian.org>) for:
+- complaining about outdated config.sub and config.guess 
+  files (#104121)
+- reporting that courier didn't compile with g++ 3.0 (#104263)
+
+Andre Luis Lopes (<andrelop@ig.com.br>) for:
+- templates translations brazilian portuguese (#106133, #106137, #120934,
+  #120936)
+
+Mark Anthony Lisher <markal@markal.net> for:
+- discovering the problems with courier-mta and
+  courier-authdaemon (#100821)
+- suggesting to add the LDAP schema to the courier-ldap package
+- supplying patch that fixed the wrong path for sendmail 
+  in the maildrop binary
+- suggesting to start Courier LDAP alias server (#144724)
+
+Carlos Valdivia Yagüe (<valyag@teleline.es>) for:
+- templates translations to spanish (#106365, #106598, #106599)
+
+Darik Horn (<dajhorn@student.math.uwaterloo.ca>) for:
+- complaining about excess slash in URL of sqwebmail stylesheet (#106674)
+
+Russell Coker (<russell@coker.com.au>) for:
+- sending patch for SAK problem (#92277)
+- reporting problem with wrong file modes on the logcheck files (#186689)
+
+Tor Slettnes (<tor@slett.net>) for:
+- reporting bug #90655 (problems with IPv6-over-IPv4 interface)
+
+Jose Carlos Garcia Sogo (<jose@jaimedelamo.eu.org>)
+- reporting bug #110843 (courier-imap install problem)
+
+Eric Gillespie Jr. (<epg@pobox.com>)
+- reporting bug #109885 (handling of aliases not compliant with
+  Debian policy)
+
+Steve J. Kondik (<shade@chemlab.org>)
+- reporting bug #111375 (broken permissions of authstart module)
+
+Carlos Valdivia Yagüe <valyag@teleline.es>
+- templates translations to Spanish (#106365, #106599)
+
+David Schmitt <david@heureka.co.at> for:
+- courier-imap init scripts not POSIX conformant (#95771)
+- complaining about missing dependency for sqwebmail on maildrop (#111154)
+
+Tim Hunter <tim@brokenbits.com> for:
+- complaining about missing dependency for courier-mlm on maildrop (#112599)
+
+Matt Zimmerman <mdz@debian.org> for:
+- mass spelling check which teached me the correct spelling of authentication
+  (#124516, #124517, #124519, #124520)
+
+Mark Constable <markc@renta.net> for:
+- noting that moving debian/newaliases doesn't work well with multiple
+  calls of dpkg-buildpackage
+
+B. Gajdos <brian@linuxee.sk> for:
+- complaining about missing dots in init script output
+
+Marcus Felipe Pereira <marcus@task.net.br> for:
+- detecting a init script bug in the first implementation
+  of the courier-pcp package
+- reporting problem with missing /etc/courier/authmodulelist file (#147285)
+- reporting problems with maildrop patch (#291441)
+
+Karl M. Hegbloom <karlheg@microsharp.com> for:
+- detecting that sqwebmail calls /usr/local/bin/ldapsearch
+  instead of /usr/bin/ldapsearch
+
+Torsten Knodt <tk-debian@datas-world.de> for:
+- reporting bad permissions of /etc/courier/esmtpauthclient (#139992)
+
+Marcus Felipe Pereira <marcus@task.com.br> for:
+- suggesting to use the restart option of the courier-mta daemons in the 
+  courier-mta init script
+
+Antti-Juhani Kaijanaho <gaia@iki.fi> for:
+- reporting that couriermlm uses the wrong path for sendmail (#139390)
+
+Anton Ivanov <ai1@ipaccess.com> for:
+- reporting that courier-pcp needs /var/run/courier/calendar/localcache
+  with the correct permissions (#138262)
+
+Andrew Shupp <andrew@neep.com.au> for:
+- reporting that of the courier-mta and courier-authdaemon init scripts
+  with a relative path and the restart parameter failed (#142812)
+
+Hilko Bengen <bengen@vdst-ka.inka.de> for:
+- reporting that the courierfilter daemon didn't work due to wrong
+  permissions (#147052)
+
+Mikhail Sobolev <mss@mawhrin.net> for:
+- reporting installation failure if /etc/courier is missing 
+  on the system (#148659)
+
+Nicolas Raspail <fireball@shadowland.dnsalias.org> for:
+- reporting failure of courier-imap-ssl startup (#170594)
+
+Bdale Garbee <bdale@gag.com> for:
+- complaining that courier-doc has been build in the binary-arch
+  target instead of binary-indep (#170564)
+
+martin f krafft <madduck@debian.org> for:
+- supplying logcheck configuration files for courier-imap, courier-imap-ssl,
+  courier-pop and courier-pop-ssl (#181416)
+  
+Ryan Murray <rmurray@debian.org> for:
+- complaining about outdated config.guess/config.sub files (#186986)
+
+Petr Balá <petr@balas.cz> for:
+- reporting maildir manpage conflict with maildrop (#187256)
+
+Oliver Thuns <oliver.thuns@web.de> for:
+- reporting segmentation fault caused by preline binary (#169770)
+
+Emmanuel Lacour <elacour@home-dn.net> for:
+- init scripts patch to use defined directory variables (#190703)
+
+LaMont Jones <lamont@hp.com> for:
+- reporting that dependency to libsasl-dev causes build in unstable to 
+  fail (#191950)
+
+Marek Habersack <grendel@debian.org> for:
+- reporting missing bindir variable in courier-imap init script (#192363)
+
+Devin Carraway <devin@debian.org> for:
+- reporting wrong command names in makeuserdb manpage (#193279)
+
+Ilgiz Kalmetev <ilgiz@bashtelecom.ru> for:
+- providing Russian debconf template translation (#135833-#135837)
+
+Manoj Srivastava <srivasta@debian.org> for:
+- reporting installation failure if imapd-ssl configuration file 
+  is missing (#200570)
+
+Tatsuki Sugiura <sugi@nemui.org> for:
+- reporting problems of courier-imap init script with ash shell (#200709)
+
+Remi Paulmier <remi@shtouff.org> for:
+- reporting dangling symlink /usr/bin/rmail (#203505)
+
+James McOrmond <jam@jammys.net> for:
+- reporting wrong permissions for /etc/courier/ldapaliasrc (#207512)
+
+Cory Petkovsek <cory@adaptableit.com> for:
+- reporting duplicate entry in authldap.schema (#210670)
+
+Willi Mann <willi@wm1.at> for:
+- writing manual page for addcr (#135218), authenumerate, sharedindexsplit, 
+  sharedindexinstall, webmaild
+- bug status investigation (#127204, #169467, #212761, #213454, #219326, #223371, #231965)
+- patch for courier-doc suggests' (#275977)
+
+Christian Perrier <bubulle@debian.org> for:
+- patch to switch to gettext-based debconf templates (#205780)
+- French translation (#207114)
+- template fixes
+
+John V. Belmonte <jvb@prairienet.org> for:
+- patch to enable esmtpd-msa daemon (#202711)
+
+Sebastian Bleikamp <Sebastian.Bleikamp@web.de> for:
+- reporting problems with bashisms in courier-mta.init (#214663)
+
+Michael K. Edwards <mkedebian@sane.net> for:
+- patches for 0.44.2 release (integration of sqwebmail daemon)
+
+Auke Jilderda <auke@jilderda.net> for:
+- reporting problem with imapd manpage (#227551)
+
+Giacomo A. Catenazzi <cate@pixelized.ch> for:
+- reviewing courier-mta bugs
+
+Charles Fry <debian@frogcircus.org> for:
+- reporting problems with courier-pop-ssl/courier-imap-ssl config script
+  (#238234, #238233)
+- reporting problems with Monkeys.com blacklist (#238232)
+- reporting problem with dangling symlink /usr/sbin/pop3d-ssl (#238708)
+- reporting problem with esmtpd SSL certificate (#238814)
+
+Hideki Yamane <henrich@samba.gr.jp> for:
+- Japanese translation of debconf templates
+
+Carlo Contavalli <ccontavalli@commedia.it> for:
+- reporting problems with AUTHMODULES check (#244206)
+
+Brian May <bam@debian.org> for:
+- reporting conflict with maildrop (#252948)
+
+Mohammed Sameer <uniball@gmx.net> for:
+- reporting problems with courierauthtest due to missing authdaemon.passwd
+  (#256565)
+
+Mike O'Connor <stew@vireo.org> for:
+- reporting inappropriate sample path for MySQL socket in 
+  /etc/courier/authmysqlrc (#258619)
+
+Dann Frazier <dannf@debian.org> for:
+- reporting and investigating broken IMAP outbox feature (#241965)
+
+Mark Brown <broonie@sirena.org.uk> for:
+- complaining about the repackaging notice on new installs (#164910)
+
+Moritz Muehlenhoff <jmm@informatik.uni-bremen.de> for:
+- suggesting suggests on courier-doc (#275977)
+
+Lehel Bernadt <lehel@pmc-services.hu> for:
+- reporting problem with STLS (#244096)
+
+Mario Peschel <mario@twc.de> for:
+- reporting wrong location of sendmail in new_fax script (#276453)
+
+Michael Hummel <mhummel@debian.org> for:
+- reporting stupid typo in courier-pop init script (#276774)
+
+Grzegorz Janoszka <Grzegorz.Janoszka@pro.onet.pl> for:
+- reporting problems with sqwebmail (#284062)
+
+Juergen Beurskens <juergen@beurskens.biz> for:
+- reporting problems with courier-faxmail
--- courier-0.47.orig/debian/README.debian
+++ courier-0.47/debian/README.debian
@@ -0,0 +1,56 @@
+Debian-specific Changes
+***********************
+
+I renamed some binaries because their names are way to generic:
+
+/usr/sbin/showconfig => /usr/sbin/courier-mtaconfig
+
+Patches
+*******
+
+I added a patch from Piotr Roszatycki <Piotr_Roszatycki@netia.net.pl>
+to enable LDAP passwords with and without {crypt}.
+
+To avoid an unneeded dependency on FAM messages about failed connections
+to FAM have been suppressed.
+
+Vpopmail
+********
+
+There is no support for vpopmail in the Debian packages, because
+this would cause Courier to be removed from the main distribution.
+See Debian bugs #182040 and #248319 for more information.
+
+Maildir setup
+*************
+
+All the mail servers integrated into the Courier suite are using
+the maildir storage format instead of the mbox format (refer to
+the maildir(5) manual page for more information).
+
+The default maildir for a given user is ~/Maildir, although you
+can change it by editing /etc/default/courier or running
+dpkg-reconfigure -plow courier-base.
+
+To create a maildir, just run as the email user:
+racke@linuxia.de:~# maildirmake Maildir
+
+Postfix
+=======
+
+See http://www.postfix.org/faq.html#maildir for information about
+how to advise Postfix to deliver into maildir's.
+
+Virtual Users
+*************
+
+For virtual users specified in userdb, SQL or LDAP the following
+values are required: home,uid,gid and password.
+
+History
+*******
+
+0.44.2-1
+========
+
+moved courierauthtest to courier-base and removed courier-debug package
--- courier-0.47.orig/debian/addcr.pod
+++ courier-0.47/debian/addcr.pod
@@ -0,0 +1,26 @@
+=head1 NAME
+
+addcr - converts 0x0a to 0x0d 0x0a
+
+=head1 SYNOPSIS
+
+addcr
+
+=head1 DESCRIPTION
+
+B<addcr> converts all rest-of-the-world newlines to windows-style newlines. Data
+is expected on standard input and returned on standard output. If windows-style 
+newlines already exist, nothing is changed. 
+
+B<addcr> is used inside the Courier Mail Server but it might also be useful for 
+interactive use. 
+
+=head1 SEE ALSO
+
+recode(1)
+
+=head1 AUTHOR
+
+This manual page was written by Willi Mann <willi@wm1.at>
+for the Debian GNU/Linux system.
+
--- courier-0.47.orig/debian/control
+++ courier-0.47/debian/control
@@ -0,0 +1,211 @@
+Source: courier
+Section: mail
+Priority: optional
+Maintainer: Stefan Hornburg (Racke) <racke@linuxia.de>
+Standards-Version: 3.5.6.0
+Build-Depends: libmysqlclient-dev | libmysqlclient10-dev, libpam0g-dev, libgdbm-dev | libgdbmg1-dev, libperl-dev, zlib1g-dev, debhelper (>= 4.1.16), mime-support, libldap-dev, procps, libsasl2-dev | libsasl-dev, expect, groff-base, gs | gs-aladdin, mgetty-fax, netpbm, libfam-dev, libssl-dev, openssl (>= 0.9.6), postgresql-dev, automake1.8, libtool
+Build-Conflicts: automake1.4
+
+Package: courier-base
+Architecture: any
+Depends: ${shlibs:Depends}, ${perl:Depends}, debconf (>= 0.5.00)
+Replaces: courier-debug (<< 0.44.2)
+Conflicts: courier-imap (<= 1.3.3), courier-debug (<< 0.44.2), sqwebmail (<< 0.45.6)
+Description: Courier Mail Server - Base system
+ The Courier mail transfer agent (MTA) is an integrated mail/groupware
+ server based on open commodity protocols, such as ESMTP, IMAP, POP3, LDAP,
+ SSL, and HTTP. Courier provides ESMTP, IMAP, POP3, webmail, and mailing list
+ services within a single, consistent, framework.
+ .
+ This package provides the functionality needed by all Debian courier packages
+ like some configuration files, helper programs and the Courier TCP server 
+ daemon.
+
+Package: courier-maildrop
+Architecture: any
+Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), exim4 | mail-transport-agent
+Suggests: courier-doc
+Replaces: maildrop
+Conflicts: maildrop
+Description: Courier Mail Server - Mail delivery agent
+ maildrop is a replacement for your local mail delivery agent.
+ maildrop reads a mail message from standard input, then delivers the
+ message to your mailbox. maildrop knows how to deliver mail to
+ mbox-style mailboxes and maildirs.
+ .
+ maildrop will optionally read instructions from a file, which
+ describes how to filter incoming mail. Instructions can be provided having
+ mail delivered to alternate mailboxes, or forwarded somewhere else. maildrop 
+ uses a structured filtering language.
+ .
+ The installation of this package is recommended only for using it in
+ conjunction with the sqwebmail package.
+ Please use the standalone maildrop package otherwise.
+
+Package: courier-mlm
+Architecture: any
+Depends: courier-base (>= ${RELUP}), courier-maildrop (>= ${RELUP})
+Suggests: courier-doc
+Description: Courier Mail Server - Mailing list manager
+ The couriermlm command sets up, maintains, and runs a mailing list. 
+ couriermlm automatically handles subscribe and unsubscribe requests, 
+ and removes undeliverable addresses from the subscription rolls. 
+ Mailing lists managed by couriermlm require zero human administrative 
+ oversight. couriermlm supports digests, write-only posting aliases, 
+ and moderated mailing lists.
+
+Package: courier-mta
+Architecture: any
+Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), courier-authdaemon (>= ${RELUP})
+Conflicts: courier-faxmail (<= 0.42.2-6), mail-transport-agent
+Provides: mail-transport-agent
+Replaces: mail-transport-agent
+Suggests: mail-reader, courier-doc, courier-filter-perl
+Priority: extra
+Description: Courier Mail Server - ESMTP daemon
+ This ESMTP daemon uses an efficient maildir format as its native storage
+ format, supports IPv6, implements SMTP extensions for mailing list 
+ management and features integrated mail filtering. It can function as an 
+ intermediate mail relay, relaying mail between an internal LAN and the 
+ Internet, or perform final delivery to mailboxes.
+
+Package: courier-faxmail
+Architecture: any
+Depends: courier-mta (>= ${RELUP}), groff-base, gs | gs-aladdin, mgetty-fax
+Suggests: courier-doc
+Conflicts: courier-mta (<= 0.42.2-6)
+Recommends: netpbm
+Description: Courier Mail Server - Faxmail gateway
+ The courierfax module implements a faxmail gateway, which faxes a printed
+ copy of an email message to the phone number specified in the email address
+ (e.g. 5558888@fax).
+
+Package: courier-webadmin
+Architecture: any
+Depends: courier-base (>= ${RELUP}), apache | httpd
+Suggests: courier-doc
+Description: Courier Mail Server - Web-based administration frontend
+ The web-based administration and configuration tool for the Courier 
+ Mail Server is capable of changing the settings of the MTA, IMAP, POP
+ and Webmail servers and the LDAP, MySQL and PostgreSQL authentication
+ modules. Only the installed parts of the Courier Mail Server show up
+ in the administration frontend.
+
+Package: sqwebmail
+Architecture: any
+Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, courier-base (>= ${RELUP}), courier-authdaemon (>= ${RELUP}), ispell, iamerican | ispell-dictionary, apache | httpd, cron, expect, courier-maildrop (>= ${RELUP})
+Suggests: courier-doc, gnupg, courier-pcp
+Description: Courier Mail Server - Webmail server
+ This package contains the SqWebMail webmail server, which
+ provides access to local mailboxes in Maildir format.
+
+Package: courier-pcp
+Architecture: any
+Depends: ${shlibs:Depends}, sqwebmail
+Suggests: courier-doc
+Description: Courier Mail Server - PCP server
+ This package contains the PCP (Personal Calendaring Protocol) server
+ needed for the groupware calendaring mode of SqWebMail.
+
+Package: courier-pop
+Architecture: any
+Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, courier-base (>= ${RELUP}), courier-authdaemon (>= ${RELUP})
+Provides: pop3-server
+Conflicts: pop3-server
+Replaces: pop3-server
+Suggests: courier-doc, mail-reader, courier-pop-ssl
+Priority: extra
+Description: Courier Mail Server - POP3 server
+ The POP3 daemon from the Courier Mail Server supports only email
+ stored in the maildir format.
+
+Package: courier-imap
+Architecture: any
+Depends: ${shlibs:Depends}, exim4 | mail-transport-agent, courier-base (>= ${RELUP}), courier-authdaemon (>= ${RELUP})
+Suggests: courier-doc, imap-client, courier-imap-ssl
+Provides: imap-server
+Conflicts: imap-server
+Replaces: imap-server
+Priority: extra
+Description: Courier Mail Server - IMAP server
+ The Courier IMAP server provides access to email stored in Maildirs.
+ This server has an extremely small footprint, provides shared and
+ virtual shared folders.
+
+Package: courier-ldap
+Architecture: any
+Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), courier-authdaemon (>= ${RELUP})
+Suggests: courier-doc
+Replaces: courier-imap-authldap
+Conflicts: courier-imap-authldap
+Description: Courier Mail Server - LDAP support
+ This package contains support for LDAP authentication and 
+ LDAP-based mail aliasing.
+
+Package: courier-authdaemon
+Architecture: any
+Depends: ${shlibs:Depends}, courier-base (>= ${RELUP})
+Description: Courier Mail Server - Authentication daemon
+ This package contains the authentication daemon for the
+ Courier Mail Server.
+
+Package: courier-authmysql
+Architecture: any
+Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), courier-authdaemon (>= ${RELUP})
+Suggests: courier-doc
+Replaces: courier-imap-authmysql
+Conflicts: courier-imap-authmysql
+Description: Courier Mail Server - MySQL authentication 
+ This package contains the MySQL authentication module for
+ the Courier Mail Server.
+
+Package: courier-doc
+Section: doc
+Architecture: all
+Description: Courier Mail Server - Additional documentation
+ This package contains additional documentation for the Courier
+ Mail Server.
+
+Package: courier-ssl
+Architecture: any
+Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), openssl
+Description: Courier Mail Server - SSL/TLS Support
+ The Courier Mail Server employs the SSL/TLS wrapper application
+ couriertls instead of equipping the different applications with 
+ SSL/TLS support. Additionally, this package contains a default set
+ of trusted X.509 root CA certs.
+
+Package: courier-mta-ssl
+Architecture: any
+Depends: courier-mta, courier-ssl (>= ${RELUP})
+Suggests: courier-doc
+Priority: extra
+Description: Courier Mail Server - ESMTP over SSL
+ ESMTP over SSL is handled by the regular ESMTP daemon from courier-mta
+ in conjunction with the SSL/TLS wrapper supplied by courier-ssl.
+
+Package: courier-pop-ssl
+Architecture: any
+Depends: courier-pop, courier-ssl (>= ${RELUP})
+Suggests: courier-doc
+Description: Courier Mail Server - POP3 over SSL
+ POP3 over SSL is handled by the regular POP3 daemon from courier-pop
+ in conjunction with the SSL/TLS wrapper supplied by courier-ssl.
+
+Package: courier-imap-ssl
+Architecture: any
+Depends: courier-imap (>= 1.3.7-3), courier-ssl (>= ${RELUP}), openssl
+Suggests: courier-doc
+Suggests: imap-client
+Priority: extra
+Description: Courier Mail Server - IMAP over SSL
+ IMAP over SSL is handled by the regular IMAP daemon from courier-imap
+ in conjunction with the SSL/TLS wrapper supplied by courier-ssl.
+
+Package: courier-authpostgresql
+Architecture: any
+Depends: ${shlibs:Depends}, courier-base (>= ${RELUP}), courier-authdaemon (>= ${RELUP})
+Suggests: courier-doc
+Description: Courier Mail Server - PostgreSQL Authentication
+ This package contains the PostgreSQL authentication module for
+ the Courier Mail Server.
--- courier-0.47.orig/debian/copyright
+++ courier-0.47/debian/copyright
@@ -0,0 +1,24 @@
+This package was debianized by Dennis Schoen <dennis@debian.org> on
+Sat,  7 Oct 2000 14:04:43 +0200.
+
+It was downloaded from:
+ftp://courier.sourceforge.net/pub/courier/courier/
+
+Upstream Author:
+
+Sam Varshavchik <mrsam@courier-mta.com>
+Double Precision, Inc.
+PO Box 668
+Greenwood Lake, NY 10925
+
+Copyright:
+
+This software is released under the GPL, version 2.
+Additionally, compiling, linking, and/or using the OpenSSL toolkit in
+conjunction with this software is allowed.
+
+A copy of the GNU General Public License is available as
+/usr/share/common-licenses/GPL in the Debian GNU/Linux distribution or on the
+World Wide Web at http://www.gnu.org/copyleft/gpl.html.  You can also
+obtain it by writing to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA.
--- courier-0.47.orig/debian/courier-authdaemon.conffiles
+++ courier-0.47/debian/courier-authdaemon.conffiles
@@ -0,0 +1,2 @@
+/etc/init.d/courier-authdaemon
+/etc/courier/authdaemonrc
--- courier-0.47.orig/debian/courier-authdaemon.dirs
+++ courier-0.47/debian/courier-authdaemon.dirs
@@ -0,0 +1 @@
+/var/run/courier/authdaemon
--- courier-0.47.orig/debian/courier-authdaemon.files
+++ courier-0.47/debian/courier-authdaemon.files
@@ -0,0 +1,14 @@
+/etc/courier/authdaemonrc
+/usr/lib/courier/authlib/authdaemon
+/usr/lib/courier/authlib/authdaemond
+/usr/lib/courier/authlib/authdaemond.plain
+/usr/share/man/man7/authcram.7
+/usr/share/man/man7/authdaemon.7
+/usr/share/man/man7/authdaemond.7
+/usr/share/man/man7/authlib.7
+/usr/share/man/man7/authpam.7
+/usr/share/man/man7/authpwd.7
+/usr/share/man/man7/authshadow.7
+/usr/share/man/man7/authuserdb.7
+/usr/share/man/man7/authvchkpw.7
+/var/run/courier/authdaemon
--- courier-0.47.orig/debian/courier-authdaemon.init
+++ courier-0.47/debian/courier-authdaemon.init
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+
+prefix="/usr"
+exec_prefix=${prefix}
+sysconfdir="/etc/courier"
+sbindir="${exec_prefix}/sbin"
+libexecdir="${prefix}/lib/courier"
+
+case "$1" in
+start)
+        # Start daemons.
+		cd /
+        if test -x ${libexecdir}/authlib/authdaemond
+        then
+				echo -n "Starting Courier authdaemon: "
+                ${libexecdir}/authlib/authdaemond start
+                echo "done."
+        fi
+	;;
+stop)
+		# Stop daemons.
+		cd /
+        if test -x ${libexecdir}/authlib/authdaemond
+        then
+				echo -n "Stopping Courier authdaemon: "
+                ${libexecdir}/authlib/authdaemond stop
+                echo "done."
+        fi
+        ;;
+restart | reload | force-reload)
+        $0 stop
+        $0 start
+        ;;
+*)
+		echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+		exit 1
+		;;
+esac
+exit 0
--- courier-0.47.orig/debian/rules
+++ courier-0.47/debian/rules
@@ -0,0 +1,349 @@
+#!/usr/bin/make -f
+#
+# Copyright 2000,2001,2002,2003,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+BUILD=$(shell pwd)/debian/tmp
+RELUP=$(shell dpkg-parsechangelog | perl -ne 'print $$1 if /^Version: (.*?)-(.*)$$/')
+
+# Uncomment this to turn on verbose mode. 
+# export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=2
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# Common configuration options
+NONSSL_CONFOPTS=--without-certdb --without-authpgsql
+
+COMMON_CONFOPTS=--prefix=/usr --mandir=\$${prefix}/share/man \
+		--with-piddir=/var/run/courier \
+		--sysconfdir=/etc/courier \
+		--libexecdir=\$${prefix}/lib/courier \
+		--datadir=\$${prefix}/lib/courier \
+		--localstatedir=/var/lib/courier \
+		--sbindir=\$${exec_prefix}/sbin \
+		--with-mailuser=daemon \
+		--with-mailgroup=daemon \
+		--without-socks \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-authpam \
+		--without-authpwd \
+		--with-authmysql \
+		--with-mysql-includes=/usr/include/mysql \
+		--with-mysql-libs=/usr/lib \
+		--with-authpgsql \
+		--with-pgsql-includes=/usr/include/postgresql \
+		--with-pgsql-libs=/usr/lib \
+		--without-authshadow \
+		--without-authvchkpw \
+		--with-authdaemonvar=/var/run/courier/authdaemon \
+		--with-authldap \
+		--with-authcram \
+		--with-db=gdbm \
+		--without-fcgi \
+		--with-htmllibdir=/usr/share/sqwebmail \
+		--with-ispell=/usr/bin/ispell \
+		--enable-imageurl=/sqwebmail \
+		--with-mailer="/usr/sbin/sendmail" \
+		--enable-sendmail="/usr/sbin/sendmail" \
+		--with-cachedir=/var/cache/sqwebmail \
+		--with-calendardir=/var/run/courier/calendar \
+		--with-webadmindir=/usr/share/courier/webadmin \
+		--enable-userdb \
+		--enable-syslog=1 \
+		--enable-unicode \
+		--disable-root-check
+
+check:
+	dh_testdir
+
+# check for openssl
+	if [ ! -x /usr/bin/openssl ]; then \
+		echo "You need to install openssl first"; \
+		exit 1; \
+	fi
+
+# check umask
+	if [ `umask` != "0022" ]; then echo "You need to set umask to 022 in order to compile/build courier"; exit 1; fi
+	chmod +x debian/fixlinks
+	chmod +x debian/courier_perms
+	chmod +x debian/correctpermissions.pl
+
+build: check
+# create a list of files that currently exists
+	chmod +x debian/srcmgr
+	if [ ! -f srcmgr.list ]; then debian/srcmgr > srcmgr.list; fi
+	if [ ! -f stamp-build ]; then \
+		LDFLAGS=-lcrypt ./configure $(COMMON_CONFOPTS) \
+		&& $(MAKE) && touch stamp-build; \
+	fi
+
+stamp-build: build
+
+clean: check
+	dh_testroot
+	rm -f stamp-build stamp-install
+
+# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	dh_clean
+	if [ -f srcmgr.list ]; then debian/srcmgr cleanse < srcmgr.list; rm srcmgr.list; fi
+#can be removed later
+	rm -f debian/permissions
+
+install: check stamp-build
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+# Add here commands to install the package into debian/tmp.
+	$(MAKE) DESTDIR=$(BUILD) install 
+	$(MAKE) DESTDIR=$(BUILD) install-perms
+	perl -i -pe 's%/usr/bin/sendmail%/usr/sbin/sendmail%; s%^/%$(BUILD)/% unless m%/debian/tmp/%' permissions.dat
+	/usr/bin/perl sysconftool `awk ' $$5 == "config" && $$1 ~ /\.dist$$/ { print $$1 }' <permissions.dat`
+	debian/correctpermissions.pl < permissions.dat > debian/permissions
+# This was missing
+	echo "/var/run/courier 755 daemon daemon" >> debian/permissions
+# Change absolute link made by make install to a relative one 
+	debian/fixlinks $(BUILD)/usr/sbin
+
+	(cd $(BUILD)/usr/bin/; ln -fs ../lib/courier/courier/modules/esmtp/addcr ./addcr)
+	(cd $(BUILD)/usr/bin/; ln -fs ../lib/courier/makedat ./makedat)
+	(cd $(BUILD)/usr/lib/courier/authlib/changepwd; ln -fs ../../authsystem.passwd ./authsystem.passwd)
+
+# We use update-alternatives to manage these, because they're shared
+# by other packages, notably qmail, maildrop, mutt, mush
+	for i in maildirmake deliverquota lockmail preline; do \
+	  (cd $(BUILD)/usr/bin && mv $$i $$i.courier); done
+	cd $(BUILD)/usr/share/man/man5 && mv maildir.5 maildir.courier.5
+	cd $(BUILD)/usr/share/man/man1 && mv maildirmake.1 maildirmake.courier.1
+	cd $(BUILD)/usr/share/man/man7 && mv maildirquota.7 maildirquota.courier.7
+	cd $(BUILD)/usr/share/man/man8 && mv deliverquota.8 deliverquota.courier.8
+	cd $(BUILD)/usr/share/man/man1 && mv lockmail.1 lockmail.courier.1
+	cd $(BUILD)/usr/share/man/man1 && mv preline.1 preline.courier.1
+
+# Install authentification test program
+	cp authlib/authtest $(BUILD)/usr/sbin/courierauthtest
+
+# Move programs with too generic names
+	cd $(BUILD)/usr/sbin && mv showconfig courier-mtaconfig
+
+# Install "sendmail" into the right places
+	mv $(BUILD)/usr/bin/sendmail $(BUILD)/usr/sbin
+	(cd $(BUILD)/usr/lib; ln -fs ../sbin/sendmail .)
+
+# Install "newaliases" stuff
+	cp -p debian/newaliases $(BUILD)/usr/sbin
+	chmod +x $(BUILD)/usr/sbin/newaliases
+
+# Install "logcheck" stuff
+	install -d $(BUILD)/etc/logcheck/ignore.d.server
+	install -m 0644 debian/logcheck/courier-* $(BUILD)/etc/logcheck/ignore.d.server
+	install -d $(BUILD)/etc/logcheck/violations.ignore.d
+	install -m 0644 debian/logcheck/violations/courier-* $(BUILD)/etc/logcheck/violations.ignore.d
+# Additional manpages
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/addcr.pod > $(BUILD)/usr/share/man/man8/addcr.8
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/authenumerate.pod > $(BUILD)/usr/share/man/man8/authenumerate.8
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/courierauthtest.pod > $(BUILD)/usr/share/man/man8/courierauthtest.8
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=1 debian/courier-config.pod > $(BUILD)/usr/share/man/man1/courier-config.1
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/newaliases.pod > $(BUILD)/usr/share/man/man8/newaliases.8
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/sharedindexinstall.pod > $(BUILD)/usr/share/man/man8/sharedindexinstall.8
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/sharedindexsplit.pod > $(BUILD)/usr/share/man/man8/sharedindexsplit.8
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/webgpg.pod > $(BUILD)/usr/share/man/man8/webgpg.8
+	pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/webmaild.pod > $(BUILD)/usr/share/man/man8/webmaild.8
+
+# Move sqwebmail images
+	mv $(BUILD)/usr/lib/courier/sqwebmail/images $(BUILD)/usr/share/sqwebmail
+
+# Ispell dictionary configuration will be produced by postinst
+	rm $(BUILD)/usr/lib/courier/sqwebmail/html/en-us/ISPELLDICT
+	(cd $(BUILD)/usr/lib/courier/sqwebmail/html/en-us; ln -s /etc/courier/ispelldict ISPELLDICT)
+
+# Remove examples
+	rm $(BUILD)/usr/lib/courier/perlfilter-example.pl
+	rm $(BUILD)/etc/courier/quotawarnmsg.example
+
+# Fix Perl paths in webadmin stuff
+	perl -i -pe 's%^#!\s?perl%#!/usr/bin/perl%' $(BUILD)/usr/share/courier/webadmin/*.pl
+
+# Fix ldapsearch path
+	perl -i -pe 's%/usr/local/%/usr/%' $(BUILD)/usr/lib/courier/sqwebmail/ldapsearch
+
+# Fix sendit.sh
+	perl -i -pe 's%sendmail%sendmail -oi -t%' $(BUILD)/usr/lib/courier/sqwebmail/sendit.sh
+
+# Remove showmodules so we get rid of the libmysqlclient dependency
+	rm $(BUILD)/usr/sbin/showmodules
+
+# Ensure that a valid symlink is used for some manpages
+	(cd $(BUILD)/usr/share/man/man7; rm authldap.7; ln -sf authlib.7.gz authldap.7.gz)
+	(cd $(BUILD)/usr/share/man/man7; rm authmysql.7; ln -sf authlib.7.gz authmysql.7.gz)
+	(cd $(BUILD)/usr/share/man/man8; rm makeuucpneighbors.8; ln -sf courieruucp.8.gz makeuucpneighbors.8.gz)
+	(cd $(BUILD)/usr/share/man/man8; rm -f esmtpd-ssl.8; ln -sf esmtpd.8.gz esmtpd-ssl.8.gz)
+	(cd $(BUILD)/usr/share/man/man8; ln -sf pop3d.8.gz pop3d-ssl.8.gz)
+	(cd $(BUILD)/usr/share/man/man8; ln -sf imapd.8.gz imapd-ssl.8.gz)
+
+	dh_installdocs
+# Install documentation where dh_installdocs doesn't fit our needs
+	mkdir -p $(BUILD)/usr/share/doc/sqwebmail
+	cp -p debian/sqwebmail.html $(BUILD)/usr/share/doc/sqwebmail
+	cp -p gpglib/README.html $(BUILD)/usr/share/doc/sqwebmail/GPG.html
+	cp -p pcp/README.html $(BUILD)/usr/share/doc/sqwebmail/PCP.html
+
+# Delete docs so that they don't end in courier-base
+	rm -rf debian/tmp/usr/lib/courier/htmldoc
+
+
+# Adapt configuration files to our needs
+# - security: disable EXPN and VRFY
+	perl -i -pe 's/^BOFHNO(EXPN|VRFY)=0/BOFHNO$$1=1/' $(BUILD)/etc/courier/esmtpd
+# - start daemon by default
+	perl -i -pe 's/^ESMTPDSTART=NO/ESMTPDSTART=YES/;' $(BUILD)/etc/courier/esmtpd
+# - fix PID location
+	perl -i -pe 's%^PIDFILE=.*%PIDFILE=/var/run/courier/esmtpd.pid%' $(BUILD)/etc/courier/esmtpd
+	perl -i -pe 's%^PIDFILE=.*%PIDFILE=/var/run/courier/esmtpd-msa.pid%' $(BUILD)/etc/courier/esmtpd-msa
+# - fix location for certificate
+	perl -i -pe 's%^TLS_CERTFILE=.*%TLS_CERTFILE=/etc/courier/esmtpd.pem%' $(BUILD)/etc/courier/esmtpd
+# - start daemons by default
+	perl -i -pe 's/^POP3DSTART=NO/POP3DSTART=YES/' $(BUILD)/etc/courier/pop3d
+	perl -i -pe 's/^MAXPERIP=\d+/MAXPERIP=20/; s/^IMAPDSTART=NO/IMAPDSTART=YES/' $(BUILD)/etc/courier/imapd
+# - change authentification default settings
+	perl -i -pe 's/^authmodulelist=".*?"/authmodulelist="authpam"/' $(BUILD)/etc/courier/authdaemonrc
+# - change default LDAP server
+	perl -i -pe 's/^(LDAP_SERVER\s+)ldap.example.com/$$1localhost/' $(BUILD)/etc/courier/authldaprc $(BUILD)/etc/courier/ldapaliasrc
+# - change default MySQL server
+	perl -i -pe 's/^(MYSQL_SERVER\s+)mysql.example.com/$$1localhost/;s%^(#?\s*MYSQL_SOCKET\s+)/.*%$$1/var/run/mysqld/mysqld.sock%' $(BUILD)/etc/courier/authmysqlrc
+	perl -i -pe 's/^POP3DSSLSTART=NO/POP3DSSLSTART=YES/' $(BUILD)/etc/courier/pop3d-ssl
+	perl -i -pe 's%^TLS_CERTFILE=.*%TLS_CERTFILE=/etc/courier/pop3d.pem%' $(BUILD)/etc/courier/pop3d-ssl
+	perl -i -pe 's/^IMAPDSSLSTART=NO/IMAPDSSLSTART=YES/' $(BUILD)/etc/courier/imapd-ssl
+	perl -i -pe 's%^TLS_CERTFILE=.*%TLS_CERTFILE=/etc/courier/imapd.pem%' $(BUILD)/etc/courier/imapd-ssl
+	perl -i -pe 's%^SSLPIDFILE=.*%SSLPIDFILE=/var/run/courier/esmtpd-ssl.pid%' $(BUILD)/etc/courier/esmtpd-ssl
+	perl -i -pe 's/^ESMTPDSSLSTART=NO/ESMTPDSSLSTART=YES/' $(BUILD)/etc/courier/esmtpd-ssl
+	perl -i -pe 's%^TLS_CERTFILE=.*%TLS_CERTFILE=/etc/courier/esmtpd.pem%' $(BUILD)/etc/courier/esmtpd-ssl
+	rm $(BUILD)/etc/courier/*.dist
+
+# Links for the certificates
+	cd $(BUILD)/usr/lib/courier && ln -s /etc/courier/pop3d.pem .
+	cd $(BUILD)/usr/lib/courier && ln -s /etc/courier/imapd.pem .
+	cd $(BUILD)/usr/lib/courier && ln -s /etc/courier/esmtpd.pem .
+
+# Replace scripts with symlinks to startup scripts
+	rm $(BUILD)/usr/sbin/imapd 
+	cd $(BUILD)/usr/sbin && ln -s /etc/init.d/courier-imap imapd
+
+	rm $(BUILD)/usr/lib/courier/pop3d-ssl
+	rm $(BUILD)/usr/sbin/pop3d-ssl
+	cd $(BUILD)/usr/sbin && ln -s /etc/init.d/courier-pop-ssl pop3d-ssl
+
+	rm $(BUILD)/usr/lib/courier/imapd-ssl
+	rm $(BUILD)/usr/sbin/imapd-ssl
+	cd $(BUILD)/usr/sbin && ln -s /etc/init.d/courier-imap-ssl imapd-ssl
+
+# Replace PAM files with our versions
+	rm $(BUILD)/etc/courier/*.authpam
+	mkdir $(BUILD)/etc/pam.d
+	cp debian/courier-mta.pam $(BUILD)/etc/pam.d/esmtp
+	cp debian/courier-imap.pam $(BUILD)/etc/pam.d/imap
+	cp debian/courier-pop.pam $(BUILD)/etc/pam.d/pop3
+	cp debian/sqwebmail.pam $(BUILD)/etc/pam.d/webmail
+	cp debian/sqwebmail.pam $(BUILD)/etc/pam.d/calendar
+
+# This seems to be necessary for building in fakeroot 
+# environment (otherwise dh_strip fails)
+# set all binaries to 755, by checking if user has x-bit
+# debian/courier_perms will set the right permissions
+	find $(BUILD) -perm +u+x -type f | xargs chmod u+rwx,go+rx
+
+	dh_movefiles
+
+# Check if all files have moved out
+	if [ `find $(BUILD) -not -type d | wc -l` -ne 0 ]; then find $(BUILD) -not -type d; echo "File(s) found not belonging to any package, please contact maintainer"; exit 1; fi
+
+	touch stamp-install
+
+stamp-install: install
+
+# Build architecture-independent files here.
+binary-indep: stamp-build stamp-install
+	dh_testdir
+	dh_testroot
+	dh_installdebconf -i
+	dh_installexamples -i
+	dh_installmenu -i
+	dh_installinit -i
+	dh_installinfo -i
+	dh_installchangelogs -p courier-doc
+	dh_strip -i
+	dh_link -i
+	dh_compress -i 
+	dh_fixperms -i
+	debian/courier_perms -i
+	dh_installdeb -i
+	dh_perl -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: stamp-build stamp-install
+	dh_testdir
+	dh_testroot
+	dh_installdebconf -a
+	dh_installexamples -a
+	dh_installmenu -a
+	dh_installinit -a
+	dh_installcron -a
+	dh_installinfo -a
+	dh_installchangelogs -p courier-authdaemon
+	dh_installchangelogs -p courier-authmysql
+	dh_installchangelogs -p courier-authpostgresql
+	dh_installchangelogs -p courier-base ChangeLog
+	dh_installchangelogs -p courier-faxmail
+	dh_installchangelogs -p courier-imap imap/ChangeLog
+	dh_installchangelogs -p courier-imap-ssl
+	dh_installchangelogs -p courier-ldap
+	dh_installchangelogs -p courier-maildrop
+	dh_installchangelogs -p courier-mlm
+	dh_installchangelogs -p courier-mta
+	dh_installchangelogs -p courier-mta-ssl
+	dh_installchangelogs -p courier-pcp
+	dh_installchangelogs -p courier-pop
+	dh_installchangelogs -p courier-pop-ssl
+	dh_installchangelogs -p courier-ssl
+	dh_installchangelogs -p courier-webadmin
+	dh_installchangelogs -p sqwebmail webmail/ChangeLog
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+	debian/courier_perms -a
+	dh_installdeb -a
+	dh_perl -a
+	dh_shlibdeps -a
+	dh_gencontrol -a -Ncourier-imap -Ncourier-imap-ssl -- -VRELUP="$(RELUP)"
+	dh_gencontrol -pcourier-imap -- -VRELUP="$(RELUP)" -v3.0.8-$(shell dpkg-parsechangelog | perl -ne 'print $$2 if /^Version: (.*?)-(.*)$$/')
+	dh_gencontrol -pcourier-imap-ssl -- -VRELUP="$(RELUP)" -v3.0.8-$(shell dpkg-parsechangelog | perl -ne 'print $$2 if /^Version: (.*?)-(.*)$$/')
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+
+.PHONY: check build clean binary-indep binary-arch binary install
--- courier-0.47.orig/debian/courier-authdaemon.postrm
+++ courier-0.47/debian/courier-authdaemon.postrm
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+if [ "$1" = "purge" ]; then
+	# remove runtime files
+	rm -rf /var/run/courier/authdaemon
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-authmysql.docs
+++ courier-0.47/debian/courier-authmysql.docs
@@ -0,0 +1 @@
+authlib/README.authmysql.html
--- courier-0.47.orig/debian/courier-authmysql.files
+++ courier-0.47/debian/courier-authmysql.files
@@ -0,0 +1,5 @@
+etc/courier/authmysqlrc
+usr/lib/courier/authlib/authdaemond.mysql
+usr/share/courier/webadmin/admin-15mysql.html
+usr/share/courier/webadmin/admin-15mysql.pl
+usr/share/man/man7/authmysql.7.gz
--- courier-0.47.orig/debian/courier-authmysql.postinst
+++ courier-0.47/debian/courier-authmysql.postinst
@@ -0,0 +1,30 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+
+if [ "$1" = "configure" ]; then
+	if [ -z "$2" ]; then
+		# initial install of authmysql, we need to restart authdaemon
+		if [ -x /usr/lib/courier/authlib/authdaemond ]; then
+			/usr/lib/courier/authlib/authdaemond restart
+		fi
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-authmysql.postrm
+++ courier-0.47/debian/courier-authmysql.postrm
@@ -0,0 +1,20 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-authmysql.prerm
+++ courier-0.47/debian/courier-authmysql.prerm
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+#
+# Copyright 2000 by Stefan Hornburg <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# we need to restart authdaemon
+if [ -x /usr/lib/courier/authlib/authdaemond ]; then
+	/usr/lib/courier/authlib/authdaemond restart
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-authpostgresql.conffiles
+++ courier-0.47/debian/courier-authpostgresql.conffiles
@@ -0,0 +1 @@
+/etc/courier/authpgsqlrc
--- courier-0.47.orig/debian/courier-authpostgresql.docs
+++ courier-0.47/debian/courier-authpostgresql.docs
@@ -0,0 +1,2 @@
+authlib/README.authmysql.html
+authlib/README.authpostgres.html
--- courier-0.47.orig/debian/courier-authpostgresql.files
+++ courier-0.47/debian/courier-authpostgresql.files
@@ -0,0 +1,4 @@
+etc/courier/authpgsqlrc
+usr/lib/courier/authlib/authdaemond.pgsql
+usr/share/courier/webadmin/admin-15pgsql.html
+usr/share/courier/webadmin/admin-15pgsql.pl
--- courier-0.47.orig/debian/courier-authpostgresql.postinst
+++ courier-0.47/debian/courier-authpostgresql.postinst
@@ -0,0 +1,30 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+
+if [ "$1" = "configure" ]; then
+	if [ -z "$2" ]; then
+		# initial install of authpostgresql, we need to restart authdaemon
+		if [ -x /usr/lib/courier/authlib/authdaemond ]; then
+			/usr/lib/courier/authlib/authdaemond restart
+		fi
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-authpostgresql.prerm
+++ courier-0.47/debian/courier-authpostgresql.prerm
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# we need to restart authdaemon
+if [ -x /usr/lib/courier/authlib/authdaemond ]; then
+	/usr/lib/courier/authlib/authdaemond restart
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-base.config
+++ courier-0.47/debian/courier-base.config
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+#
+# Copyright 2001,2002,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+# Get settings from /etc/default/courier
+if [ -f /etc/default/courier ]; then
+	. /etc/default/courier
+	if [ -n "$MAILDIR" ]; then
+	   db_set courier-base/maildir $MAILDIR
+	   db_fset courier-base/maildir seen true
+	fi
+fi
+
+# Question about configuration file mode
+db_subst courier-base/webadmin-configmode courieruser daemon
+db_input high courier-base/webadmin-configmode || [ $? -eq 30 ]
+db_go
+
+db_input low courier-base/maildir || [ $? -eq 30 ]
+db_go
--- courier-0.47.orig/debian/courier-base.dirs
+++ courier-0.47/debian/courier-base.dirs
@@ -0,0 +1,3 @@
+/var/lib/courier
+/var/run/courier
+
--- courier-0.47.orig/debian/courier-base.docs
+++ courier-0.47/debian/courier-base.docs
@@ -0,0 +1,5 @@
+debian/CREDITS.debian
+authlib/README.authdebug.html
+maildir/README.maildirquota.txt
+maildir/README.sharedfolders.txt
+
--- courier-0.47.orig/debian/courier-base.examples
+++ courier-0.47/debian/courier-base.examples
@@ -0,0 +1 @@
+courier/quotawarnmsg.example
--- courier-0.47.orig/debian/courier-base.files
+++ courier-0.47/debian/courier-base.files
@@ -0,0 +1,45 @@
+/usr/bin/courier-config
+/usr/bin/deliverquota.courier
+/usr/bin/maildiracl
+/usr/bin/maildirkw
+/usr/bin/maildirmake.courier
+/usr/bin/makedat
+/usr/bin/testmxlookup
+/usr/lib/courier/authlib/changepwd/authdaemon.passwd
+/usr/lib/courier/courier/makedatprog
+/usr/lib/courier/makedat
+/usr/lib/courier/makeuserdb
+/usr/lib/courier/pw2userdb
+/usr/lib/courier/userdb
+/usr/lib/courier/vchkpw2userdb
+/usr/sbin/authenumerate
+/usr/sbin/courierauthtest
+/usr/sbin/courierlogger
+/usr/sbin/couriertcpd
+/usr/sbin/makeuserdb
+/usr/sbin/pw2userdb
+/usr/sbin/sharedindexinstall
+/usr/sbin/sharedindexsplit
+/usr/sbin/userdb
+/usr/sbin/userdbpw
+/usr/sbin/vchkpw2userdb
+/usr/share/man/man1/courier-config.1
+/usr/share/man/man1/courierlogger.1
+/usr/share/man/man1/couriertcpd.1
+/usr/share/man/man1/maildiracl.1
+/usr/share/man/man1/maildirkw.1
+/usr/share/man/man1/maildirmake.courier.1
+/usr/share/man/man1/makedat.1
+/usr/share/man/man1/testmxlookup.1
+/usr/share/man/man5/maildir.courier.5
+/usr/share/man/man7/maildirquota.courier.7
+/usr/share/man/man8/authenumerate.8
+/usr/share/man/man8/courierauthtest.8
+/usr/share/man/man8/deliverquota.courier.8
+/usr/share/man/man8/makeuserdb.8
+/usr/share/man/man8/pw2userdb.8
+/usr/share/man/man8/sharedindexinstall.8
+/usr/share/man/man8/sharedindexsplit.8
+/usr/share/man/man8/userdb.8
+/usr/share/man/man8/userdbpw.8
+/usr/share/man/man8/vchkpw2userdb.8
--- courier-0.47.orig/debian/courier-base.postinst
+++ courier-0.47/debian/courier-base.postinst
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001,2003,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ]; then
+	# alternative for deliverquota
+	update-alternatives --install /usr/bin/deliverquota deliverquota /usr/bin/deliverquota.courier 10 \
+                      --slave /usr/share/man/man8/deliverquota.8.gz deliverquota.8.gz /usr/share/man/man8/deliverquota.courier.8.gz
+	# alternative for maildir
+	update-alternatives --install /usr/share/man/man5/maildir.5.gz maildir.5 /usr/share/man/man5/maildir.courier.5.gz 5
+	# alternative for maildirmake
+    update-alternatives --install /usr/bin/maildirmake maildirmake /usr/bin/maildirmake.courier 5 \
+                      --slave /usr/share/man/man1/maildirmake.1.gz maildirmake.1.gz /usr/share/man/man1/maildirmake.courier.1.gz
+	# alternative for maildirquota
+	update-alternatives --install /usr/share/man/man7/maildirquota.7.gz maildirquota.7 /usr/share/man/man7/maildirquota.courier.7.gz 5
+fi
+
+db_get courier-base/maildir
+MAILDIR="$RET"
+
+cat >/etc/default/courier <<EOF
+# This file is automatically generated by maintainer scripts.
+# You may modifiy this file, but additional values and format
+# modifications will not be preserved.
+MAILDIR="$MAILDIR"
+EOF
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-base.postrm
+++ courier-0.47/debian/courier-base.postrm
@@ -0,0 +1,27 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+if [ "$1" = "purge" ]; then
+	# Remove runtime files for courier
+	rm -rf /var/run/courier
+	# Remove files created by maintainer scripts
+	rm -f /etc/default/courier
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-base.preinst
+++ courier-0.47/debian/courier-base.preinst
@@ -0,0 +1,27 @@
+#! /bin/sh -e
+#
+# Copyright 2002 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# We need this file 
+if [ -d /etc/courier ]; then
+	if [ ! -f /etc/courier/authmodulelist ]; then
+		echo authdaemon > /etc/courier/authmodulelist
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-base.prerm
+++ courier-0.47/debian/courier-base.prerm
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+#
+# Copyright 2000,2001,2003,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+if [ "$1" = "upgrade" -o "$1" = "remove" ]; then
+  for binary in maildirmake deliverquota; do
+      update-alternatives --remove $binary /usr/bin/$binary.courier
+  done
+  update-alternatives --remove maildir.5 /usr/share/man/man5/maildir.courier.5.gz
+  update-alternatives --remove maildirquota.7 /usr/share/man/man7/maildirquota.courier.7.gz
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-base.templates
+++ courier-0.47/debian/courier-base.templates
@@ -0,0 +1,23 @@
+Template: courier-base/webadmin-configmode
+Type: boolean
+Default: false
+_Description: Create directories for web-based administration ?
+ Courier uses several configuration files which are located in
+ /etc/courier. Some configuration files can be replaced by a subdirectory
+ where all files insides this directory are concatenated and considered
+ to be a single, consolidated, configuration file.
+ .
+ The web-based administration provided by the courier-webadmin package
+ relies on configuration directories instead of configuration files. 
+ If you agree, any directories needed for the web-based
+ administration tool will be created unless there is already a
+ plain file in place.
+
+Template: courier-base/maildir
+Type: string
+Default: Maildir
+_Description: Path to user's Maildir directory
+ This is a relative path name from each user's home directory to the
+ Maildir directory where the Courier servers store and access the
+ user's email. Please refer to the maildir(5) manual page if you are
+ unfamiliar with the mail storage format used by Courier.
--- courier-0.47.orig/debian/courier-config.pod
+++ courier-0.47/debian/courier-config.pod
@@ -0,0 +1,16 @@
+=head1 NAME
+
+courier-config - displays build configuration of the Courier Mail Server
+
+=head1 SYNOPSIS
+
+courier-config
+
+=head1 DESCRIPTION
+
+B<courier-config> displays build configuration of the Courier Mail Server.
+
+=head1 AUTHOR
+
+This manual page was written by Stefan Hornburg (Racke) <racke@linuxia.de>
+for the Debian GNU/Linux system.
--- courier-0.47.orig/debian/courier-doc.docs
+++ courier-0.47/debian/courier-doc.docs
@@ -0,0 +1,8 @@
+AUTHORS
+README
+authlib/README.authdebug.html
+maildir/README.maildirquota.html
+maildir/README.sharedfolders.html
+imap/BUGS
+maildir/README.imapkeywords.html
+debian/tmp/usr/lib/courier/htmldoc
--- courier-0.47.orig/debian/courier-faxmail.conffiles
+++ courier-0.47/debian/courier-faxmail.conffiles
@@ -0,0 +1,3 @@
+/etc/courier/faxcoverpage.tr
+/etc/courier/faxnotifyrc
+/etc/courier/faxrc
--- courier-0.47.orig/debian/courier-faxmail.dirs
+++ courier-0.47/debian/courier-faxmail.dirs
@@ -0,0 +1,2 @@
+/usr/lib/courier/faxmail/
+/var/lib/courier/faxtmp/
\ No newline at end of file
--- courier-0.47.orig/debian/courier-faxmail.files
+++ courier-0.47/debian/courier-faxmail.files
@@ -0,0 +1,18 @@
+/etc/courier/faxcoverpage.tr
+/etc/courier/faxnotifyrc 
+/etc/courier/faxrc
+/usr/lib/courier/faxmail/init
+/usr/lib/courier/faxmail/application-postscript.filter
+/usr/lib/courier/faxmail/application-pdf.filter
+/usr/lib/courier/faxmail/coverpage
+/usr/lib/courier/faxmail/image-gif.filter
+/usr/lib/courier/faxmail/image-jpeg.filter
+/usr/lib/courier/faxmail/image-png.filter
+/usr/lib/courier/faxmail/new_fax
+/usr/lib/courier/faxmail/text-plain.filter
+/usr/share/courier/webadmin/admin-34fax.html
+/usr/share/courier/webadmin/admin-34fax.pl
+/usr/share/courier/webadmin/admin-35fax.html
+/usr/share/courier/webadmin/admin-35fax.pl
+/usr/share/man/man8/courierfax.8
+
--- courier-0.47.orig/debian/courier-imap-ssl.conffiles
+++ courier-0.47/debian/courier-imap-ssl.conffiles
@@ -0,0 +1,5 @@
+/etc/courier/imapd.cnf
+/etc/courier/imapd-ssl
+/etc/init.d/courier-imap-ssl
+/etc/logcheck/ignore.d.server/courier-imap-ssl
+/etc/logcheck/violations.ignore.d/courier-imap-ssl
--- courier-0.47.orig/debian/NEWS
+++ courier-0.47/debian/NEWS
@@ -0,0 +1,9 @@
+courier (0.45.6-1) unstable; urgency=low
+
+  * /etc/courier/authmodulelist has been deprecated, you can remove this file
+  * backed out patch to quell FAM error messages, we just suppress them
+    now as suggested by upstream. If you want to use FAM for the IMAP IDLE
+    command, please make sure that it works. You wouldn't get any notice 
+    about that in the logs.
+  
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 12 Jul 2004 00:14:44 +0200
\ No newline at end of file
--- courier-0.47.orig/debian/webmaild.pod
+++ courier-0.47/debian/webmaild.pod
@@ -0,0 +1,20 @@
+=head1 NAME
+
+webmaild - wrapper script for the sqwebmail daemon
+
+=head1 SYNOPSIS
+
+webmaild
+
+=head1 DESCRIPTION
+
+B<webmaild> is a wrapper script that starts the sqwebmail daemon. It 
+takes no options. 
+
+The sqwebmail daemon is the backend server for the frontend located in  
+F</usr/lib/cgi-bin/sqwebmail>.
+
+=head1 AUTHOR
+
+This manual page was written by Willi Mann <willi@wm1.at>
+for the Debian GNU/Linux system.
--- courier-0.47.orig/debian/courier-imap-ssl.files
+++ courier-0.47/debian/courier-imap-ssl.files
@@ -0,0 +1,10 @@
+etc/courier/imapd.cnf
+etc/courier/imapd-ssl
+etc/logcheck/ignore.d.server/courier-imap-ssl
+etc/logcheck/violations.ignore.d/courier-imap-ssl
+usr/lib/courier/imapd.pem
+usr/lib/courier/mkimapdcert
+usr/sbin/imapd-ssl
+usr/sbin/mkimapdcert
+usr/share/man/man8/imapd-ssl.8.gz
+usr/share/man/man8/mkimapdcert.8
--- courier-0.47.orig/debian/courier-imap-ssl.init
+++ courier-0.47/debian/courier-imap-ssl.init
@@ -0,0 +1,100 @@
+#! /bin/sh
+
+prefix="/usr"
+exec_prefix=${prefix}
+sysconfdir="/etc/courier"
+sbindir="${exec_prefix}/sbin"
+bindir="${exec_prefix}/bin"
+libexecdir="${prefix}/lib/courier"
+TCPD=${sbindir}/couriertcpd
+DAEMONPROG=${sbindir}/imapd
+DAEMON=imapd-ssl
+PROGRAM="Courier IMAP-SSL server"
+
+test -f $DAEMONPROG || exit 0
+
+if ! [ -x $TCPD ]; then
+  echo "ERR: $TCPD missing"
+  exit 1
+fi
+
+if ! [ -f ${sysconfdir}/imapd ]; then
+  echo "ERR: config file missing"
+  exit 1
+fi
+if ! [ -f ${sysconfdir}/imapd-ssl ]; then
+  echo "ERR: config file missing"
+  exit 1
+fi
+
+# read/set defaults
+if [ -f /etc/default/courier ]; then
+	. /etc/default/courier
+fi
+if [ -z "$MAILDIR" ]; then
+	MAILDIR=Maildir
+fi
+
+. ${sysconfdir}/imapd
+. ${sysconfdir}/imapd-ssl
+
+if ! [ -x $COURIERTLS ]; then
+  echo "ERR: $COURIERTLS missing"
+  exit 1
+fi
+
+START=no
+case "$IMAPDSSLSTART" in
+	[yY]*)START=yes;;
+esac
+
+if [ "$START" = "no" ]; then
+	exit 0
+fi
+
+case "$1" in
+start)
+    echo -n "Starting $PROGRAM:"
+    AUTHMODULELIST=""
+    for f in $AUTHMODULES
+    do
+      if [ -e $libexecdir/authlib/$f ]; then
+          AUTHMODULELIST="$AUTHMODULELIST $libexecdir/authlib/$f"
+	  fi
+    done
+    AUTHMODULELIST="`echo $AUTHMODULELIST`"
+
+    ulimit -d $IMAP_ULIMITD
+    /usr/bin/env - /bin/sh -c " . ${sysconfdir}/imapd ; \
+		. ${sysconfdir}/imapd-ssl ; \
+		IMAP_TLS=1 ; export IMAP_TLS ; \
+		`sed -n '/^#/d;/=/p' <${sysconfdir}/imapd | \
+			sed 's/=.*//;s/^/export /;s/$/;/'`
+		`sed -n '/^#/d;/=/p' <${sysconfdir}/imapd-ssl | \
+			sed 's/=.*//;s/^/export /;s/$/;/'`
+		$TCPD -address=$SSLADDRESS \
+			-stderrlogger=${sbindir}/courierlogger \
+			-stderrloggername=imapd-ssl \
+			-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+			-pid=$SSLPIDFILE $TCPDOPTS \
+			$SSLPORT $COURIERTLS -server -tcpd \
+			${libexecdir}/courier/imaplogin $AUTHMODULELIST \
+				${bindir}/imapd $MAILDIR"
+    echo " $DAEMON."
+	;;
+stop)
+  echo -n "Stopping $PROGRAM:"
+  $TCPD -pid=$SSLPIDFILE -stop
+  echo " $DAEMON."
+	;;
+restart | reload | force-reload)
+  echo -n "Restarting $PROGRAM: "
+  $TCPD -pid=$SSLPIDFILE -restart
+  echo "done."
+	;;
+*)
+  echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+  exit 1
+  ;;
+esac
+exit 0
--- courier-0.47.orig/debian/courier-imap-ssl.postinst
+++ courier-0.47/debian/courier-imap-ssl.postinst
@@ -0,0 +1,29 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ]; then
+	if [ ! -f /etc/courier/imapd.pem ]; then
+		/usr/sbin/mkimapdcert
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-imap-ssl.postrm
+++ courier-0.47/debian/courier-imap-ssl.postrm
@@ -0,0 +1,24 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+if [ "$1" = "purge" ]; then
+	rm -rf /etc/courier/imapd.pem
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-imap.conffiles
+++ courier-0.47/debian/courier-imap.conffiles
@@ -0,0 +1,5 @@
+/etc/courier/imapd
+/etc/init.d/courier-imap
+/etc/logcheck/ignore.d.server/courier-imap
+/etc/logcheck/violations.ignore.d/courier-imap
+/etc/pam.d/imap
--- courier-0.47.orig/debian/courier-imap.config
+++ courier-0.47/debian/courier-imap.config
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+CONFFILE=/etc/courier/imapd
+if [ -f /etc/courier-imap.config ]; then
+	db_input high courier-imap/moveconfig || [ $? -eq 30 ]
+	db_go
+	db_get courier-imap/moveconfig
+	if [ "$RET" = true ]; then
+		CONFFILE=/etc/courier-imap.config
+	fi
+fi
+
--- courier-0.47.orig/debian/courier-imap.docs
+++ courier-0.47/debian/courier-imap.docs
@@ -0,0 +1,4 @@
+maildir/README.imapkeywords.html
+
+
+
--- courier-0.47.orig/debian/courier-imap.files
+++ courier-0.47/debian/courier-imap.files
@@ -0,0 +1,11 @@
+etc/courier/imapd
+etc/logcheck/ignore.d.server/courier-imap
+etc/logcheck/violations.ignore.d/courier-imap
+etc/pam.d/imap
+usr/bin/imapd
+usr/lib/courier/imapd
+usr/lib/courier/courier/imaplogin
+usr/sbin/imapd
+usr/share/courier/webadmin/admin-40imap.html
+usr/share/courier/webadmin/admin-40imap.pl
+usr/share/man/man8/imapd.8
--- courier-0.47.orig/debian/courier-imap.init
+++ courier-0.47/debian/courier-imap.init
@@ -0,0 +1,86 @@
+#! /bin/bash -e
+
+prefix="/usr"
+exec_prefix=${prefix}
+sysconfdir="/etc/courier"
+bindir="${exec_prefix}/bin"
+sbindir="${exec_prefix}/sbin"
+libexecdir="${prefix}/lib/courier"
+TCPD="${sbindir}/couriertcpd"
+DAEMON="imapd"
+PROGRAM="Courier IMAP server"
+SSLCONFIG=
+
+if ! [ -x $TCPD ]; then
+  echo "ERR: $TCPD missing"
+  exit 1
+fi
+
+if ! [ -f ${sysconfdir}/$DAEMON ]; then
+  echo "ERR: config file missing"
+  exit 1
+fi
+
+# read/set defaults
+if [ -f /etc/default/courier ]; then
+	. /etc/default/courier
+fi
+if [ -z "$MAILDIR" ]; then
+	MAILDIR=Maildir
+fi
+
+if [ -f "${sysconfdir}/imapd-ssl" ]; then
+	. "${sysconfdir}/imapd-ssl"
+	SSLCONFIG=1
+fi
+. ${sysconfdir}/$DAEMON
+
+START=no
+case "$IMAPDSTART" in
+	[yY]*)START=yes;;
+esac
+
+case "$1" in
+start)
+  if [ "$START" = "yes" ]; then
+    echo -n "Starting $PROGRAM:"
+    AUTHMODULELIST=""
+    for f in $AUTHMODULES
+    do
+      if [ -e $libexecdir/authlib/$f ]; then
+          AUTHMODULELIST="$AUTHMODULELIST $libexecdir/authlib/$f"
+	  fi
+    done
+    AUTHMODULELIST="`echo $AUTHMODULELIST`"
+
+    ulimit -v $IMAP_ULIMITD
+    /usr/bin/env - /bin/sh -c " set -a; \
+		bindir=${bindir}; \
+		. ${sysconfdir}/imapd; \
+		if [ "$SSLCONFIG" ]; then . ${sysconfdir}/imapd-ssl; fi; \
+		IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \
+		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
+		$TCPD -address=$ADDRESS \
+			-stderrlogger=${sbindir}/courierlogger \
+			-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+			-pid=$PIDFILE $TCPDOPTS \
+			$PORT ${libexecdir}/courier/imaplogin $AUTHMODULELIST \
+				${bindir}/imapd $MAILDIR"
+    echo " $DAEMON."
+  fi
+	;;
+stop)
+  echo -n "Stopping $PROGRAM:"
+  $TCPD -pid=$PIDFILE -stop
+  echo " $DAEMON."
+	;;
+restart | reload | force-reload)
+  $0 stop
+  $0 start
+	;;
+*)
+  echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+  exit 1
+  ;;
+esac
+exit 0
--- courier-0.47.orig/debian/courier-imap.pam
+++ courier-0.47/debian/courier-imap.pam
@@ -0,0 +1,4 @@
+auth		required       pam_unix.so	nullok
+account		required       pam_unix.so
+password	required       pam_unix.so
+session		required       pam_unix.so
--- courier-0.47.orig/debian/courier-imap.postinst
+++ courier-0.47/debian/courier-imap.postinst
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+# Check if we have to move configuration files
+db_get courier-imap/moveconfig
+if [ "$RET" = true ]; then
+    if [ -f /etc/courier-imap.config ]; then
+		echo "Moving /etc/courier-imap.config to /etc/courier/imapd ..."
+		mv /etc/courier-imap.config /etc/courier/imapd
+		if grep '^TCPDOPTS=.*-forcebind' /etc/courier/imapd > /dev/null; then
+			echo "Removing obsolete couriertcpd option -forcebind ..."
+			perl -i -pe 's/^(TCPDOPTS=.*?)-forcebind/$1/' /etc/courier/imapd
+		fi
+	fi
+    if [ -f /etc/courier-imap-ssl.config ]; then
+		echo "Moving /etc/courier-imap-ssl.config to /etc/courier/imapd-ssl ..."
+		mv /etc/courier-imap-ssl.config /etc/courier/imapd-ssl
+	fi
+	if [ -f /etc/courier-imap.authmysqlrc ]; then
+		echo "Moving /etc/courier-imap.authmysqlrc to /etc/courier/authmysqlrc .."
+		mv /etc/courier-imap.authmysqlrc /etc/courier/authmysqlrc
+	fi
+	if [ -f /etc/courier-imap.authldaprc ]; then
+		echo "Moving /etc/courier-imap.authldaprc to /etc/courier/authldaprc .."
+		mv /etc/courier-imap.authldaprc /etc/courier/authldaprc
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-imap.templates
+++ courier-0.47/debian/courier-imap.templates
@@ -0,0 +1,10 @@
+Template: courier-imap/moveconfig
+Type: boolean
+Default: true
+_Description: Move old configuration files to /etc/courier ?
+ On your system are courier-imap configuration files within /etc.
+ From now on all configuration files related to Courier are located within
+ /etc/courier. If you like, we move the configuration files to the new
+ location. However, we cannot guarantee that they will work as before.
+ Please refer to the Courier documentation and tell the maintainer about
+ your experiences with the conversion.
--- courier-0.47.orig/debian/courier-ldap.README.debian
+++ courier-0.47/debian/courier-ldap.README.debian
@@ -0,0 +1,5 @@
+The init script issues a message "Starting Courier LDAP alias daemon" 
+without considering the LDAP_ALIAS setting in /etc/courier/ldapaliasrc.
+
+In fact, the Courier LDAP alias daemon stops automatically if LDAP_ALIAS
+isn't set to 1 in /etc/courier/ldapaliasrc.
--- courier-0.47.orig/debian/courier-ldap.conffiles
+++ courier-0.47/debian/courier-ldap.conffiles
@@ -0,0 +1,4 @@
+/etc/courier/authldaprc
+/etc/courier/ldapaliasrc
+/etc/courier/ldapaddressbook
+/etc/init.d/courier-ldap
--- courier-0.47.orig/debian/courier-ldap.docs
+++ courier-0.47/debian/courier-ldap.docs
@@ -0,0 +1,2 @@
+authlib/README.ldap
+authlib/authldap.schema
--- courier-0.47.orig/debian/courier-ldap.files
+++ courier-0.47/debian/courier-ldap.files
@@ -0,0 +1,11 @@
+etc/courier/authldaprc
+etc/courier/ldapaliasrc
+etc/courier/ldapaddressbook
+usr/lib/courier/authlib/authdaemond.ldap
+usr/sbin/courierldapaliasd
+usr/share/courier/webadmin/admin-15ldap.html
+usr/share/courier/webadmin/admin-15ldap.pl
+usr/share/courier/webadmin/admin-15ldapa.html
+usr/share/courier/webadmin/admin-15ldapa.pl
+usr/share/man/man7/authldap.7.gz
+usr/share/man/man8/courierldapaliasd.8
--- courier-0.47.orig/debian/courier-ldap.init
+++ courier-0.47/debian/courier-ldap.init
@@ -0,0 +1,55 @@
+#! /bin/sh -e
+#
+# Copyright 2002 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+CONFFILE=/etc/courier/ldapaliasrc
+DAEMON=/usr/sbin/courierldapaliasd
+
+# stop if the courier-ldap package has been removed
+if ! [ -x $DAEMON ]; then
+	exit 0
+fi
+
+# stop if the configuration file is missing
+if ! [ -f $CONFFILE ]; then
+	exit 0
+fi
+
+case "$1" in
+start)
+	# Start Courier LDAP alias daemon
+	echo -n "Starting Courier LDAP alias daemon: "
+	$DAEMON start
+    echo "done."
+	;;
+stop)
+	# Stop PCP daemon
+	echo -n "Stopping Courier LDAP alias daemon: "
+	$DAEMON stop
+	echo "done."
+	;;
+restart | reload | force-reload)
+	echo -n "Restarting Courier LDAP alias daemon: "
+	$DAEMON restart
+	echo "done."
+    ;;
+*)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
--- courier-0.47.orig/debian/courier-ldap.postinst
+++ courier-0.47/debian/courier-ldap.postinst
@@ -0,0 +1,27 @@
+#! /bin/sh -e
+#
+# Copyright 2002,2003 by Stefan Hornburg <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+##THIS FILE CAN BE REMOVED##
+
+#chown daemon.daemon /etc/courier/authldaprc /etc/courier/ldapaliasrc
+#chmod 600 /etc/courier/authldaprc
+# needs to be readable by sendmail invoked by non-root users
+#chmod 640 /etc/courier/ldapaliasrc
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-maildrop.conffiles
+++ courier-0.47/debian/courier-maildrop.conffiles
@@ -0,0 +1 @@
+/etc/courier/maildrop
--- courier-0.47.orig/debian/courier-maildrop.README.Debian
+++ courier-0.47/debian/courier-maildrop.README.Debian
@@ -0,0 +1,17 @@
+Debian Packaging Issues
+***********************
+
+Please read /usr/share/doc/courier-base/README.Debian for more
+information about the packaging of the Courier Mail Server suite.
+
+The maildrop binary is compiled with support for userdb and
+logging via syslog (facility mail, priority info).
+
+Version Number
+**************
+
+The version number of the courier-maildrop Debian package is derived from
+the version number of the complete Courier Mail Server suite.
+There is a separate maildrop source package available with a
+much higher version number than the version number of the Courier
+source package, so don't get confused.
--- courier-0.47.orig/debian/courier-maildrop.files
+++ courier-0.47/debian/courier-maildrop.files
@@ -0,0 +1,14 @@
+/etc/courier/maildrop
+/usr/bin/mailbot
+/usr/bin/maildrop
+/usr/bin/makemime
+/usr/bin/reformail
+/usr/bin/reformime
+/usr/share/man/man1/mailbot.1
+/usr/share/man/man1/maildrop.1
+/usr/share/man/man1/makemime.1
+/usr/share/man/man1/reformail.1
+/usr/share/man/man1/reformime.1
+/usr/share/man/man7/maildropex.7
+/usr/share/man/man7/maildropfilter.7
+/usr/share/man/man7/maildropgdbm.7
--- courier-0.47.orig/debian/courier-maildrop.postinst
+++ courier-0.47/debian/courier-maildrop.postinst
@@ -0,0 +1,29 @@
+#! /bin/sh -e
+#
+# Copyright 2002,2003 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+
+# Check for existing /etc/maildroprc and create a symlink
+# /etc/courier/maildroprc if latter file doesn't exist
+if [ ! -e /etc/courier/maildroprc ]; then
+    if [ -f /etc/maildroprc ]; then
+	    ln -s ../maildroprc /etc/courier
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-maildrop.postrm
+++ courier-0.47/debian/courier-maildrop.postrm
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+#
+# Copyright 2003 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Remove /etc/courier/maildroprc on purge
+if [ "$1" = "purge" ]; then
+	rm -f /etc/courier/maildroprc
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-mlm.files
+++ courier-0.47/debian/courier-mlm.files
@@ -0,0 +1,3 @@
+/usr/bin/couriermlm
+/usr/lib/courier/couriermlm
+/usr/share/man/man1/couriermlm.1
--- courier-0.47.orig/debian/courier-mta-ssl.conffiles
+++ courier-0.47/debian/courier-mta-ssl.conffiles
@@ -0,0 +1,2 @@
+/etc/courier/esmtpd-ssl
+/etc/init.d/courier-mta-ssl
--- courier-0.47.orig/debian/courier-mta-ssl.files
+++ courier-0.47/debian/courier-mta-ssl.files
@@ -0,0 +1,5 @@
+etc/courier/esmtpd-ssl
+usr/lib/courier/esmtpd.pem
+usr/lib/courier/esmtpd-ssl
+usr/sbin/esmtpd-ssl
+usr/share/man/man8/esmtpd-ssl.8.gz
--- courier-0.47.orig/debian/courier-mta-ssl.init
+++ courier-0.47/debian/courier-mta-ssl.init
@@ -0,0 +1,53 @@
+#! /bin/sh -e
+
+sysconfdir="/etc/courier"
+sbindir="/usr/sbin"
+TCPD=${sbindir}/couriertcpd
+DAEMONPROG=${sbindir}/esmtpd-ssl
+
+test -f $DAEMONPROG || exit 0
+
+# check for couriertcpd
+if ! [ -x $TCPD ]; then
+  exit 0
+fi
+
+# check for couriertls
+if ! [ -x $COURIERTLS ]; then
+  exit 0
+fi
+
+# check for esmtpd configuration file
+if ! [ -f ${sysconfdir}/esmtpd ]; then
+  exit 0
+fi
+
+# check for esmtpd-ssl configuration file
+if ! [ -f ${sysconfdir}/esmtpd-ssl ]; then
+  exit 0
+fi
+
+. ${sysconfdir}/esmtpd
+. ${sysconfdir}/esmtpd-ssl
+
+case "$1" in
+start)
+	echo -n "Starting Courier SMTP/SSL server:"
+	${sbindir}/esmtpd-ssl start
+	echo " done."
+	;;
+stop)
+	echo -n "Stopping Courier SMTP/SSL server:"
+   	${sbindir}/esmtpd-ssl stop
+   	echo " done."
+	;;
+restart | reload | force-reload)
+    $0 stop
+    $0 start
+    ;;
+*)
+  echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+  exit 1
+  ;;
+esac
+exit 0
--- courier-0.47.orig/debian/courier-mta.README.Debian
+++ courier-0.47/debian/courier-mta.README.Debian
@@ -0,0 +1,25 @@
+COURIER-MTA README
+
+This document describes Debian-specific changes which has been
+applied to the courier-mta package.
+
+Please read /usr/share/doc/courier-base/README.Debian first
+for information about general changes applied to the Courier
+suite.
+
+MODULE.FAX
+
+The Courier SMTP server(s) absolutely require the existence
+of /etc/courier/module.fax. An empty file suffices. Therefore
+the init script will refuse to start/stop/restart the SMTP
+server(s) if this file is missing for any reason.
+
+NEWALIASES
+
+I added a /usr/sbin/newaliases shell script for compliance
+with the Debian Policy (Section "Mail transport, delivery and user agents").
+Please note that the default location for source alias file(s)
+is /etc/courier/aliases. The script reads /etc/aliases instead.
+
+
+
--- courier-0.47.orig/debian/courier-mta.conffiles
+++ courier-0.47/debian/courier-mta.conffiles
@@ -0,0 +1,27 @@
+/etc/courier/aliases/system
+/etc/courier/courierd
+/etc/courier/dsndelayed.txt
+/etc/courier/dsndelivered.txt
+/etc/courier/dsnfailed.txt
+/etc/courier/dsnrelayed.txt
+/etc/courier/dsnfooter.txt
+/etc/courier/dsnsubjectnotice.txt
+/etc/courier/dsnsubjectwarn.txt
+/etc/courier/dsnheader.txt
+/etc/courier/enablefiltering
+/etc/courier/esmtpd.cnf
+/etc/courier/esmtpd
+/etc/courier/esmtpd-msa
+/etc/courier/esmtpauthclient
+/etc/courier/module.dsn
+/etc/courier/module.esmtp
+/etc/courier/module.fax
+/etc/courier/module.local
+/etc/courier/module.uucp
+/etc/courier/rfcerr2045.txt
+/etc/courier/rfcerr2046.txt
+/etc/courier/rfcerr2047.txt
+/etc/courier/rfcerrheader.txt
+/etc/courier/smtpaccess/default
+/etc/init.d/courier-mta
+/etc/pam.d/esmtp
--- courier-0.47.orig/debian/courier-mta.config
+++ courier-0.47/debian/courier-mta.config
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+#
+# Copyright 2001,2002,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+do_config () {
+	FILENAME=$1
+	DEFAULT=$2
+
+	if [ -f /etc/courier/$FILENAME ]; then
+		# read current value from configuration file
+		VALUE=`head -n 1 /etc/courier/$FILENAME`
+		if [ "$VALUE" ]; then
+			db_set courier-mta/$FILENAME "$VALUE"
+		fi
+	fi
+
+	db_get courier-mta/$FILENAME
+	if [ ! "$RET" ]; then
+		# enforce default
+		db_set courier-mta/$FILENAME "$DEFAULT"
+	fi
+	
+	db_input medium courier-mta/$FILENAME || [ $? -eq 30 ]
+	db_go
+}
+
+do_config defaultdomain `hostname --fqdn`
+db_get courier-mta/defaultdomain
+do_config dsnfrom "mailer-daemon@$RET"
+
--- courier-0.47.orig/debian/courier-mta.dirs
+++ courier-0.47/debian/courier-mta.dirs
@@ -0,0 +1,8 @@
+/etc/courier/filters
+/etc/courier/filters/active
+/var/lib/courier/tmp
+/var/lib/courier/tmp/broken
+/var/lib/courier/msgs
+/var/lib/courier/msgq
+/var/lib/courier/allfilters
+/var/lib/courier/filters
--- courier-0.47.orig/debian/courier-mta.examples
+++ courier-0.47/debian/courier-mta.examples
@@ -0,0 +1,2 @@
+courier/filters/perlfilter/perlfilter-example.pl
+
--- courier-0.47.orig/debian/courier-mta.files
+++ courier-0.47/debian/courier-mta.files
@@ -0,0 +1,121 @@
+/etc/courier/aliases/system
+/etc/courier/courierd
+/etc/courier/dsndelayed.txt
+/etc/courier/dsndelivered.txt
+/etc/courier/dsnfailed.txt
+/etc/courier/dsnrelayed.txt
+/etc/courier/dsnfooter.txt
+/etc/courier/dsnsubjectnotice.txt
+/etc/courier/dsnsubjectwarn.txt
+/etc/courier/dsnheader.txt
+/etc/courier/enablefiltering
+/etc/courier/esmtpd.cnf
+/etc/courier/esmtpd
+/etc/courier/esmtpd-msa
+/etc/courier/esmtpauthclient
+/etc/courier/module.dsn
+/etc/courier/module.esmtp
+/etc/courier/module.fax
+/etc/courier/module.local
+/etc/courier/module.uucp
+/etc/courier/rfcerr2045.txt
+/etc/courier/rfcerr2046.txt
+/etc/courier/rfcerr2047.txt
+/etc/courier/rfcerrheader.txt
+/etc/courier/smtpaccess/default
+/etc/pam.d/esmtp
+/usr/bin/addcr
+/usr/bin/cancelmsg
+/usr/bin/dotforward
+/usr/bin/lockmail.courier
+/usr/bin/preline.courier
+/usr/bin/mailq
+/usr/lib/courier/courierctl.start
+/usr/lib/courier/makeuucpneighbors
+/usr/lib/courier/courier/aliasexp
+/usr/lib/courier/courier/aliascombine
+/usr/lib/courier/courier/aliascreate
+/usr/lib/courier/courier/courierd
+/usr/lib/courier/courier/modules/dsn/courierdsn
+/usr/lib/courier/courier/modules/esmtp/courieresmtp
+/usr/lib/courier/courier/modules/esmtp/courieresmtpd
+/usr/lib/courier/courier/modules/esmtp/addcr
+/usr/lib/courier/courier/modules/esmtp/authstart
+/usr/lib/courier/courier/modules/esmtp/authend
+/usr/lib/courier/courier/modules/fax/courierfax
+/usr/lib/courier/courier/modules/local/courierdeliver
+/usr/lib/courier/courier/modules/local/courierlocal
+/usr/lib/courier/courier/modules/modules.ctl
+/usr/lib/courier/courier/modules/uucp/courieruucp
+/usr/lib/courier/courier/submit
+/usr/lib/courier/courier/submitmkdir
+/usr/lib/courier/esmtpd
+/usr/lib/courier/filterctl
+/usr/lib/courier/filters
+/usr/lib/courier/makeacceptmailfor
+/usr/lib/courier/makealiases
+/usr/lib/courier/makehosteddomains
+/usr/lib/courier/makepercentrelay
+/usr/lib/courier/makesmtpaccess
+/usr/lib/courier/mkesmtpdcert
+/usr/lib/courier/perlfilter-wrapper.pl
+/usr/lib/sendmail
+/usr/sbin/courier
+/usr/sbin/courier-mtaconfig
+/usr/sbin/courieresmtpd
+/usr/sbin/courierfilter
+/usr/sbin/esmtpd
+/usr/sbin/esmtpd-msa
+/usr/sbin/filterctl
+/usr/sbin/makeacceptmailfor
+/usr/sbin/makealiases
+/usr/sbin/makehosteddomains
+/usr/sbin/makepercentrelay
+/usr/sbin/makesmtpaccess
+/usr/sbin/makesmtpaccess-msa
+/usr/sbin/makeuucpneighbors
+/usr/sbin/mkesmtpdcert
+/usr/sbin/newaliases
+/usr/sbin/rmail
+/usr/sbin/sendmail
+/usr/share/courier/webadmin/admin-05local.html
+/usr/share/courier/webadmin/admin-05local.pl
+/usr/share/courier/webadmin/admin-30esmtp.html
+/usr/share/courier/webadmin/admin-30esmtp.pl
+/usr/share/courier/webadmin/admin-30xspf.html
+/usr/share/courier/webadmin/admin-30xspf.pl
+/usr/share/courier/webadmin/admin-31esmtp.html
+/usr/share/courier/webadmin/admin-31esmtp.pl
+/usr/share/courier/webadmin/admin-50bofh.html
+/usr/share/courier/webadmin/admin-50bofh.pl
+/usr/share/man/man1/cancelmsg.1
+/usr/share/man/man1/dotforward.1
+/usr/share/man/man1/dot-forward.1
+/usr/share/man/man1/lockmail.courier.1
+/usr/share/man/man1/mailq.1
+/usr/share/man/man1/preline.courier.1
+/usr/share/man/man1/rmail.1
+/usr/share/man/man1/sendmail.1
+/usr/share/man/man5/dot-courier.5
+/usr/share/man/man7/localmailfilter.7
+/usr/share/man/man8/addcr.8
+/usr/share/man/man8/courier.8
+/usr/share/man/man8/courier-mtaconfig.8
+/usr/share/man/man8/courieresmtpd.8
+/usr/share/man/man8/courierfilter.8
+/usr/share/man/man8/courierperlfilter.8
+/usr/share/man/man8/courieruucp.8
+/usr/share/man/man8/dupfilter.8
+/usr/share/man/man8/esmtpd.8
+/usr/share/man/man8/esmtpd-msa.8
+/usr/share/man/man8/filterctl.8
+/usr/share/man/man8/mkesmtpdcert.8
+/usr/share/man/man8/makeacceptmailfor.8
+/usr/share/man/man8/makealiases.8
+/usr/share/man/man8/makehosteddomains.8
+/usr/share/man/man8/makepercentrelay.8
+/usr/share/man/man8/makesmtpaccess.8
+/usr/share/man/man8/makesmtpaccess-msa.8
+/usr/share/man/man8/makeuucpneighbors.8.gz
+/usr/share/man/man8/newaliases.8
+/usr/share/man/man8/submit.8
--- courier-0.47.orig/debian/courier-mta.init
+++ courier-0.47/debian/courier-mta.init
@@ -0,0 +1,110 @@
+#! /bin/sh -e
+
+prefix="/usr"
+exec_prefix=${prefix}
+sysconfdir="/etc/courier"
+sbindir="${exec_prefix}/sbin"
+libexecdir="${prefix}/lib/courier"
+DAEMON=${sbindir}/esmtpd
+
+test -f $DAEMON || exit 0
+test -f "$sysconfdir/esmtpd" || exit 0
+test -f "$sysconfdir/esmtpd-msa" || exit 0
+
+# Check if SMTP server should be started
+. ${sysconfdir}/esmtpd
+START_MTA=no
+case "$ESMTPDSTART" in
+	[yY]*)START_MTA=yes;;
+esac
+
+START_MSA=no
+. ${sysconfdir}/esmtpd-msa
+case "$ESMTPDSTART" in
+	[yY]*)START_MSA=yes;;
+esac
+
+if [ "$START_MTA" = "no" ] && [ $START_MSA = "no" ]; then
+	exit 0
+fi
+
+case "$1" in
+start)
+	cd /
+
+	echo -n "Starting Courier mail server:"
+	${sbindir}/courier start
+	echo " done."
+
+	echo -n "Starting Courier mail filter:"
+    ${sbindir}/courierfilter start
+    echo " done."
+
+	if [ "$START_MTA" = "yes" ]; then
+		echo -n "Starting Courier SMTP server:"
+		${sbindir}/esmtpd start
+		echo " done."
+	fi
+
+	if [ "$START_MSA" = "yes" ]; then
+		echo -n "Starting Courier SMTP MSA server:"
+		${sbindir}/esmtpd-msa start
+		echo " done."
+	fi
+	;;
+stop)
+	cd /
+
+	if [ "$START_MSA" = "yes" ]; then
+		echo -n "Stopping Courier SMTP MSA server:"
+		${sbindir}/esmtpd-msa stop
+		echo " done."
+	fi
+
+	if [ "$START_MTA" = "yes" ]; then
+		echo -n "Stopping Courier SMTP server:"
+		${sbindir}/esmtpd stop
+		echo " done."
+	fi
+
+	echo -n "Stopping Courier mail filter:"
+	${sbindir}/courierfilter stop
+    echo " done."
+
+	echo -n "Stopping Courier mail server:"
+	${sbindir}/courier stop
+	echo " done."
+	;;
+reload | force-reload)
+	cd /
+
+	if [ "$START_MSA" = "yes" ]; then
+		echo -n "Restarting Courier SMTP MSA server:"
+		${sbindir}/esmtpd-msa restart
+		echo " done."
+	fi
+
+	if [ "$START_MTA" = "yes" ]; then
+		echo -n "Restarting Courier SMTP server:"
+		${sbindir}/esmtpd restart
+		echo " done."
+	fi
+
+	echo -n "Restarting Courier mail filter:"
+	${sbindir}/courierfilter restart
+    echo " done."
+
+	echo -n "Restarting Courier mail server:"
+	${sbindir}/courier restart
+	echo " done."
+    ;;
+restart)
+	$0 stop
+	$0 start
+	;;
+*)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+exit 0
--- courier-0.47.orig/debian/courier-mta.pam
+++ courier-0.47/debian/courier-mta.pam
@@ -0,0 +1,4 @@
+auth		required       pam_unix.so	nullok
+account		required       pam_unix.so
+password	required       pam_unix.so
+session		required       pam_unix.so
--- courier-0.47.orig/debian/courier-mta.postinst
+++ courier-0.47/debian/courier-mta.postinst
@@ -0,0 +1,67 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001,2002,2003,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+USER=daemon
+GROUP=daemon
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ]; then
+	# write default domain file
+	db_get courier-mta/defaultdomain 
+	echo $RET > /etc/courier/defaultdomain
+
+	# generate locals file if necessary
+	if [ ! -f /etc/courier/locals ]; then
+		echo -e "localhost\n$RET" > /etc/courier/locals
+	fi
+
+	# generate configuration directories if necessary
+	db_get courier-base/webadmin-configmode
+	if [ "$RET" = true ]; then
+		for dir in aliasdir esmtpacceptmailfor.dir hosteddomains; do
+			if [ ! -e /etc/courier/$dir ]; then
+				mkdir /etc/courier/$dir
+			fi
+		done
+	fi
+
+	# generate /etc/mailname if necessary
+	if [ ! -f /etc/mailname ]; then
+		echo -e "$RET" > /etc/mailname
+	fi
+	
+	# write file with From: header for delivery notifications
+	db_get courier-mta/dsnfrom
+	echo $RET > /etc/courier/dsnfrom
+
+
+
+	# Update Alternatives
+	update-alternatives --install /usr/bin/lockmail lockmail /usr/bin/lockmail.courier 5 \
+                      --slave /usr/share/man/man1/lockmail.1.gz lockmail.1.gz /usr/share/man/man1/lockmail.courier.1.gz
+	update-alternatives --install /usr/bin/preline preline /usr/bin/preline.courier 5 \
+                      --slave /usr/share/man/man1/preline.1.gz preline.1.gz /usr/share/man/man1/preline.courier.1.gz
+
+	# run makesmtpaccess
+	/usr/sbin/makesmtpaccess
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-mta.postrm
+++ courier-0.47/debian/courier-mta.postrm
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+#
+# Copyright 2001,2002,2003,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+if [ "$1" = "purge" ]; then
+	# Removes possibly automatically produced files
+	rm -f /etc/courier/aliases.dat /etc/courier/defaultdomain /etc/courier/dsnfrom /etc/courier/esmtpacceptmailfor.dat /etc/courier/hosteddomains.dat /etc/courier/locals /etc/courier/smtpaccess.dat
+	# Remove configuration directories if empty
+	for dir in aliasdir aliases esmtpacceptmailfor.dir hosteddomains smtpaccess; do
+		if [ -d /etc/courier/$dir ]; then
+			FILES=`find /etc/courier/$dir -type f`
+			if [ -z "$FILES" ]; then 
+				rm -rf /etc/courier/$dir
+			fi
+		fi
+	done
+	# Remove message queues
+	rm -rf /var/lib/courier/msgq 
+	rm -rf /var/lib/courier/msgs
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-mta.prerm
+++ courier-0.47/debian/courier-mta.prerm
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+#
+# Copyright 2000,2001,2003 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+if [ "$1" = "upgrade" -o "$1" = "remove" ]; then
+	for binary in lockmail preline; do
+		update-alternatives --remove $binary /usr/bin/$binary
+	done
+fi
+
+if [ ! -f /etc/courier/module.fax ]; then
+	# fax module configuration file is missing, courier
+	# will not shutdown properly, therefore we are using
+	# this kludge
+	start-stop-daemon --stop --oknodo --exec /usr/lib/courier/courier/courierd 
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-mta.templates
+++ courier-0.47/debian/courier-mta.templates
@@ -0,0 +1,12 @@
+Template: courier-mta/defaultdomain
+Type: string
+_Description: Default domain
+ Please specify a valid email domain. Most header rewriting functions will
+ append this domain to all email addresses which do not specify a domain,
+ e.g. emails from accounts on this machine.
+
+Template: courier-mta/dsnfrom
+Type: string
+_Description: "From" Header for Delivery Notifications
+ Please specify a valid value for the "From" Header for mail delivery
+ notifications. Otherwise these cannot be send.
--- courier-0.47.orig/debian/courier-pcp.README.Debian
+++ courier-0.47/debian/courier-pcp.README.Debian
@@ -0,0 +1,12 @@
+Debian Packaging Issues
+***********************
+
+Please read /usr/share/doc/courier-base/README.Debian for more
+information about the packaging of the Courier Mail Server suite.
+
+Further Documentation
+*********************
+
+Please refer to the documentation of the sqwebmail package
+(especially /usr/share/doc/sqwebmail/PCP.html) for more
+information.
--- courier-0.47.orig/debian/courier-pcp.conffiles
+++ courier-0.47/debian/courier-pcp.conffiles
@@ -0,0 +1,2 @@
+/etc/init.d/courier-pcp
+/etc/pam.d/calendar
--- courier-0.47.orig/debian/courier-pcp.files
+++ courier-0.47/debian/courier-pcp.files
@@ -0,0 +1,6 @@
+etc/pam.d/calendar
+usr/lib/courier/courier/pcpd
+var/run/courier/calendar
+var/run/courier/calendar/public
+var/run/courier/calendar/private
+var/run/courier/calendar/localcache
--- courier-0.47.orig/debian/courier-pcp.init
+++ courier-0.47/debian/courier-pcp.init
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+#
+# Copyright 2002,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Former versions of this init script were used to start
+# and stop the PCP daemon. This is now handled by the
+# SqWebMail daemon automatically.
+
+case "$1" in
+start)
+	;;
+stop)
+	;;
+restart | reload | force-reload)
+    $0 stop
+    $0 start
+    ;;
+*)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
--- courier-0.47.orig/debian/courier-pcp.postrm
+++ courier-0.47/debian/courier-pcp.postrm
@@ -0,0 +1,28 @@
+#! /bin/sh -e
+#
+# Copyright 2002 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "purge" ]; then
+	# remove other calendar stuff too
+	rm -rf /var/run/courier/calendar/localcache
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-pop-ssl.conffiles
+++ courier-0.47/debian/courier-pop-ssl.conffiles
@@ -0,0 +1,5 @@
+/etc/logcheck/ignore.d.server/courier-pop-ssl
+/etc/logcheck/violations.ignore.d/courier-pop-ssl
+/etc/courier/pop3d-ssl
+/etc/courier/pop3d.cnf
+/etc/init.d/courier-pop-ssl
--- courier-0.47.orig/debian/courier-mta-ssl.postinst
+++ courier-0.47/debian/courier-mta-ssl.postinst
@@ -0,0 +1,30 @@
+#! /bin/sh -e
+#
+# Copyright 2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ]; then
+	if [ ! -f /etc/courier/esmtpd.pem ]; then
+		/usr/sbin/mkesmtpdcert
+		chown daemon /etc/courier/esmtpd.pem
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-pop-ssl.files
+++ courier-0.47/debian/courier-pop-ssl.files
@@ -0,0 +1,11 @@
+etc/logcheck/ignore.d.server/courier-pop-ssl
+etc/logcheck/violations.ignore.d/courier-pop-ssl
+etc/courier/pop3d.cnf
+etc/courier/pop3d-ssl
+usr/lib/courier/mkpop3dcert
+usr/lib/courier/pop3d.pem
+usr/sbin/mkpop3dcert
+usr/sbin/pop3d-ssl
+usr/share/man/man8/mkpop3dcert.8
+usr/share/man/man8/pop3d-ssl.8.gz
+
--- courier-0.47.orig/debian/courier-pop-ssl.init
+++ courier-0.47/debian/courier-pop-ssl.init
@@ -0,0 +1,99 @@
+#! /bin/sh -e
+
+prefix="/usr"
+exec_prefix=${prefix}
+sysconfdir="/etc/courier"
+sbindir="${exec_prefix}/sbin"
+bindir="${exec_prefix}/bin"
+libexecdir="${prefix}/lib/courier"
+TCPD=${sbindir}/couriertcpd
+DAEMONPROG=${sbindir}/pop3d
+DAEMON=pop3d-ssl
+PROGRAM="Courier POP3-SSL server"
+
+test -f $DAEMONPROG || exit 0
+
+if ! [ -x $TCPD ]; then
+  echo "ERR: $TCPD missing"
+  exit 1
+fi
+
+if ! [ -f ${sysconfdir}/pop3d ]; then
+  echo "ERR: config file missing"
+  exit 1
+fi
+if ! [ -f ${sysconfdir}/pop3d-ssl ]; then
+  echo "ERR: config file missing"
+  exit 1
+fi
+
+# read/set defaults
+if [ -f /etc/default/courier ]; then
+	. /etc/default/courier
+fi
+if [ -z "$MAILDIR" ]; then
+	MAILDIR=Maildir
+fi
+
+. ${sysconfdir}/pop3d
+. ${sysconfdir}/pop3d-ssl
+
+if ! [ -x $COURIERTLS ]; then
+  echo "ERR: $COURIERTLS missing"
+  exit 1
+fi
+
+START=no
+case "$POP3DSSLSTART" in
+	[yY]*)START=yes;;
+esac
+
+if [ "$START" = "no" ]; then
+	exit 0
+fi
+
+case "$1" in
+start)
+    echo -n "Starting $PROGRAM:"
+    AUTHMODULELIST=""
+    for f in $AUTHMODULES
+    do
+      if [ -e $libexecdir/authlib/$f ]; then
+          AUTHMODULELIST="$AUTHMODULELIST $libexecdir/authlib/$f"
+	  fi
+    done
+    AUTHMODULELIST="`echo $AUTHMODULELIST`"
+
+    /usr/bin/env - PATH="$PATH" SHELL="$SHELL" \
+		/bin/sh -c " . ${sysconfdir}/pop3d ; \
+		. ${sysconfdir}/pop3d-ssl ; \
+		POP3_TLS=1 ; export POP3_TLS ; \
+		`sed -n '/^#/d;/=/p' <${sysconfdir}/pop3d | \
+			sed 's/=.*//;s/^/export /;s/$/;/'`
+		`sed -n '/^#/d;/=/p' <${sysconfdir}/pop3d-ssl | \
+			sed 's/=.*//;s/^/export /;s/$/;/'`
+      $TCPD -pid=$SSLPIDFILE \
+	  -stderrlogger=${sbindir}/courierlogger \
+	  -stderrloggername=pop3d-ssl \
+      -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+      $TCPDOPTS -address=$SSLADDRESS $SSLPORT $COURIERTLS -server -tcpd \
+      ${libexecdir}/courier/courierpop3login $AUTHMODULELIST \
+      ${libexecdir}/courier/courierpop3d $MAILDIR"
+    echo " $DAEMON."
+	;;
+stop)
+  echo -n "Stopping $PROGRAM:"
+  $TCPD -pid=$SSLPIDFILE -stop
+  echo " $DAEMON."
+	;;
+restart | reload | force-reload)
+  echo -n "Restarting $PROGRAM: "
+  $TCPD -pid=$SSLPIDFILE -restart
+  echo "done."
+	;;
+*)
+  echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+  exit 1
+  ;;
+esac
+exit 0
--- courier-0.47.orig/debian/courier-pop-ssl.postinst
+++ courier-0.47/debian/courier-pop-ssl.postinst
@@ -0,0 +1,29 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ]; then
+	if [ ! -f /etc/courier/pop3d.pem ]; then
+		/usr/sbin/mkpop3dcert
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-pop-ssl.postrm
+++ courier-0.47/debian/courier-pop-ssl.postrm
@@ -0,0 +1,24 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+if [ "$1" = "purge" ]; then
+	rm -rf /etc/courier/pop3d.pem
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-pop.conffiles
+++ courier-0.47/debian/courier-pop.conffiles
@@ -0,0 +1,5 @@
+/etc/courier/pop3d
+/etc/init.d/courier-pop
+/etc/logcheck/ignore.d.server/courier-pop
+/etc/logcheck/violations.ignore.d/courier-pop
+/etc/pam.d/pop3
--- courier-0.47.orig/debian/courier-pop.config
+++ courier-0.47/debian/courier-pop.config
@@ -0,0 +1,23 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+CONFFILE=/etc/courier/pop3d
--- courier-0.47.orig/debian/courier-pop.files
+++ courier-0.47/debian/courier-pop.files
@@ -0,0 +1,13 @@
+etc/courier/pop3d
+etc/logcheck/ignore.d.server/courier-pop
+etc/logcheck/violations.ignore.d/courier-pop
+etc/pam.d/pop3
+usr/lib/courier/courier/courierpop3login
+usr/lib/courier/courier/courierpop3d
+usr/lib/courier/pop3d
+usr/sbin/pop3d
+usr/share/courier/webadmin/admin-45pop3.html
+usr/share/courier/webadmin/admin-45pop3.pl
+usr/share/man/man8/courierpop3login.8
+usr/share/man/man8/pop3d.8
+usr/share/man/man8/courierpop3d.8
--- courier-0.47.orig/debian/courier-pop.init
+++ courier-0.47/debian/courier-pop.init
@@ -0,0 +1,86 @@
+#! /bin/sh -e
+
+prefix="/usr"
+exec_prefix=${prefix}
+sysconfdir="/etc/courier"
+sbindir="${exec_prefix}/sbin"
+libexecdir="${prefix}/lib/courier"
+TCPD="${sbindir}/couriertcpd"
+DAEMON=${sbindir}/pop3d
+PROGRAM="Courier POP3 server"
+PROG="pop3d"
+SSLCONFIG=
+
+test -f $DAEMON || exit 0
+
+if ! [ -x $TCPD ]; then
+  echo "ERR: $TCPD missing"
+  exit 1
+fi
+
+if ! [ -f ${sysconfdir}/pop3d ]; then
+  echo "ERR: config file missing"
+  exit 1
+fi
+
+# read/set defaults
+if [ -f /etc/default/courier ]; then
+	. /etc/default/courier
+fi
+if [ -z "$MAILDIR" ]; then
+	MAILDIR=Maildir
+fi
+
+if [ -f "${sysconfdir}/pop3d-ssl" ]; then
+	. "${sysconfdir}/pop3d-ssl"
+	SSLCONFIG=1
+fi
+. ${sysconfdir}/pop3d
+
+START=no
+case "$POP3DSTART" in
+  [yY]*)START=yes;;
+esac
+
+case "$1" in
+start)
+  if [ "$START" = "yes" ]; then
+    echo -n "Starting $PROGRAM:"
+    AUTHMODULELIST=""
+    for f in $AUTHMODULES
+    do
+      if [ -e $libexecdir/authlib/$f ]; then
+          AUTHMODULELIST="$AUTHMODULELIST $libexecdir/authlib/$f"
+	  fi
+    done
+    AUTHMODULELIST="`echo $AUTHMODULELIST`"
+
+    /usr/bin/env - /bin/sh -c " set -a; \
+		. ${sysconfdir}/pop3d; \
+		if [ "$SSLCONFIG" ]; then . ${sysconfdir}/pop3d-ssl; fi; \
+		POP3_STARTTLS=$POP3_STARTTLS; export POP3_STARTTLS; \
+		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL; \
+	    $TCPD -pid=$PIDFILE -stderrlogger=${sbindir}/courierlogger \
+		-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+		$TCPDOPTS -address=$ADDRESS $PORT \
+		${libexecdir}/courier/courierpop3login $AUTHMODULELIST \
+		${libexecdir}/courier/courierpop3d $MAILDIR"
+    echo " $PROG."
+  fi
+    ;;
+stop)
+  echo -n "Stopping $PROGRAM:"
+  $TCPD -pid=$PIDFILE -stop
+  echo " $PROG."
+    ;;
+restart | reload | force-reload)
+  $0 stop
+  $0 start
+    ;;
+*)
+  echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+  exit 1
+  ;;
+esac
+
+exit 0
--- courier-0.47.orig/debian/courier-pop.pam
+++ courier-0.47/debian/courier-pop.pam
@@ -0,0 +1,4 @@
+auth		required       pam_unix.so	nullok
+account		required       pam_unix.so
+password	required       pam_unix.so
+session		required       pam_unix.so
--- courier-0.47.orig/debian/courier-ssl.config
+++ courier-0.47/debian/courier-ssl.config
@@ -0,0 +1,24 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+db_input high courier-ssl/certnotice || true
+db_go
--- courier-0.47.orig/debian/courier-ssl.docs
+++ courier-0.47/debian/courier-ssl.docs
@@ -0,0 +1 @@
+debian/CREDITS.debian
--- courier-0.47.orig/debian/courier-ssl.files
+++ courier-0.47/debian/courier-ssl.files
@@ -0,0 +1,3 @@
+/usr/bin/couriertls
+/usr/lib/courier/rootcerts
+/usr/share/man/man1/couriertls.1
--- courier-0.47.orig/debian/courier-ssl.postinst
+++ courier-0.47/debian/courier-ssl.postinst
@@ -0,0 +1,23 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-ssl.templates
+++ courier-0.47/debian/courier-ssl.templates
@@ -0,0 +1,10 @@
+Template: courier-ssl/certnotice
+Type: note
+_Description: SSL certificate required
+ POP and IMAP over SSL requires a valid, signed, X.509 certificate. During
+ the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed
+ X.509 certificate will be generated if necessary. For production use the
+ X.509 certificate must be signed by a recognized certificate authority, in
+ order for mail clients to accept the certificate. The default locations
+ for this certificate is /etc/courier/pop3d.pem resp.
+ /etc/courier/imapd.pem.
--- courier-0.47.orig/debian/courier-webadmin.README.Debian
+++ courier-0.47/debian/courier-webadmin.README.Debian
@@ -0,0 +1,30 @@
+README for courier-webadmin, web-based administration tool for the Courier Mail Server
+
+COURIER CONFIGURATION AND WEB-BASED ADMINISTRATION
+
+Courier uses several configuration files which are located in
+/etc/courier. Some configuration files can be replaced by a subdirectory 
+where all files insides this directory are concatenated and considered 
+to be a single, consolidated, configuration file.
+
+To control and administer the Courier configuration through the
+web-based administration frontend provided by the courier-webadmin
+package, the directories and files need to be readable and writable by
+the user daemon.
+
+Furthermore, the frontend relies on configuration directories instead of 
+configuration files. If you agreed to the corresponding question on 
+initial setup, any directories needed for the web-based
+administration tool will be created unless there is already a
+plain file in place. Otherwise, the frontend won't work very well.
+
+ACCESSING COURIER-WEBADMIN
+
+If your web server has been installed and configured according the
+Debian policy, the administration tool can be accessed with the
+following URL:
+
+	http://localhost/cgi-bin/courierwebadmin
+
+
+
--- courier-0.47.orig/debian/courier-webadmin.config
+++ courier-0.47/debian/courier-webadmin.config
@@ -0,0 +1,27 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+db_input high courier-webadmin/install-cgi || [ $? -eq 30 ]
+db_go
+
+db_input critical courier-webadmin/password || [ $? -eq 30 ]
+db_go
--- courier-0.47.orig/debian/courier-webadmin.dirs
+++ courier-0.47/debian/courier-webadmin.dirs
@@ -0,0 +1,3 @@
+etc/courier/webadmin
+etc/courier/webadmin/added
+etc/courier/webadmin/removed
--- courier-0.47.orig/debian/courier-webadmin.files
+++ courier-0.47/debian/courier-webadmin.files
@@ -0,0 +1,18 @@
+usr/lib/courier/courier/webmail/webadmin
+usr/share/courier/webadmin/admin-00machine.html
+usr/share/courier/webadmin/admin-00machine.pl
+usr/share/courier/webadmin/admin-10password.html
+usr/share/courier/webadmin/admin-10password.pl
+usr/share/courier/webadmin/admin-20aliases.html
+usr/share/courier/webadmin/admin-20aliases.pl
+usr/share/courier/webadmin/admin-cancel.pl
+usr/share/courier/webadmin/admin-main.html
+usr/share/courier/webadmin/admin-main.pl
+usr/share/courier/webadmin/admin-save.html
+usr/share/courier/webadmin/admin-save.pl
+usr/share/courier/webadmin/dumpenv.pl
+usr/share/courier/webadmin/login.html
+usr/share/courier/webadmin/notsupp.html
+usr/share/courier/webadmin/unsecure.html
+usr/share/courier/webadmin/webadmin.pl
+usr/share/courier/webadmin/webadmin.pm
--- courier-0.47.orig/debian/courier-webadmin.postinst
+++ courier-0.47/debian/courier-webadmin.postinst
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+#
+# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ]; then
+	# install CGI script for Courier web administration
+	db_get courier-webadmin/install-cgi
+	if [ "$RET" = "true" ]; then
+		cp -p /usr/lib/courier/courier/webmail/webadmin /usr/lib/cgi-bin/courierwebadmin
+		chmod 4555 /usr/lib/cgi-bin/courierwebadmin
+	fi
+
+	# fix permissions
+	chown -R daemon.daemon /etc/courier/webadmin
+
+	# record password for Courier web administration
+	db_get courier-webadmin/password
+	if [ "$RET" ]; then
+		touch /etc/courier/webadmin/password
+		chmod 400 /etc/courier/webadmin/password
+		chown daemon.daemon /etc/courier/webadmin/password
+		echo $RET > /etc/courier/webadmin/password
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-webadmin.postrm
+++ courier-0.47/debian/courier-webadmin.postrm
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+#
+# Copyright 2001,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+if [ "$1" = "purge" ]; then
+	# Remove remains of web administration
+	rm -rf /etc/courier/webadmin
+else 
+	# Remove CGI script if installed by this package
+	. /usr/share/debconf/confmodule
+
+	db_get courier-webadmin/install-cgi || [ $? -eq 10 ]
+	if [ "$RET" = "true" ]; then
+		rm -f /usr/lib/cgi-bin/courierwebadmin
+	fi
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/courier-webadmin.templates
+++ courier-0.47/debian/courier-webadmin.templates
@@ -0,0 +1,21 @@
+Template: courier-webadmin/install-cgi
+Type: boolean
+Default: false
+_Description: Activate CGI Program ?
+ To allow courier-webadmin to work out of the box, we need to copy the CGI
+ program from /usr/lib/courier/courier/webmail/webadmin to
+ /usr/lib/cgi-bin/courierwebadmin and set the SUID bit.
+ .
+ There are two reasons why this is not done by default during the
+ installation. First it has serious security implications, because
+ courierwebadmin runs as root. Second it is not guaranteed to work
+ depending on your web server software and its configuration.
+ .
+ If you agree here and your web server setup is compliant with
+ the Debian policy, you can access the administration frontend
+ through http://localhost/cgi-bin/courierwebadmin. 
+
+Template: courier-webadmin/password
+Type: password
+_Description: Password for the Courier Administration
+ To access the Courier administration a password is needed.
--- courier-0.47.orig/debian/courierauthtest.pod
+++ courier-0.47/debian/courierauthtest.pod
@@ -0,0 +1,17 @@
+=head1 NAME
+
+courierauthtest - Authentication Test Program
+
+=head1 SYNOPSIS
+
+courierauthtest [-s SERVICE] [ -m MODULE ] USERID [ PASSWORD [ NEWPASSWORD ] ]
+
+=head1 DESCRIPTION
+
+B<courierauthtest> is an authentication test program for the Courier Mail 
+Server.
+
+=head1 AUTHOR
+
+This manual page was written by Stefan Hornburg (Racke) <racke@linuxia.de>
+for the Debian GNU/Linux system.
--- courier-0.47.orig/debian/fixlinks
+++ courier-0.47/debian/fixlinks
@@ -0,0 +1,41 @@
+#! /usr/bin/perl -w
+#
+# fixlinks - script to make symlinks compliant to Debian policy
+#
+# Copyright 2000, Stefan Hornburg <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later
+# version. 
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+use strict;
+use File::Find;
+
+find (\&fixlinks, shift);
+
+sub fixlinks {
+	my $direction;
+	
+	return unless -l $_;
+	unless ($direction = readlink ($_)) {
+		die "$0: Bogus symbolic link $_: $!\n";
+	}
+	if ($direction =~ s%^/usr%..%) {
+		unlink ($_)
+			|| die "$0: Couldn't remove symbolic link $_: $!\n";
+		symlink ($direction, $_)
+			|| die "$0: Couldn't create symbolic link $_: $!\n";
+	}
+}
--- courier-0.47.orig/debian/newaliases
+++ courier-0.47/debian/newaliases
@@ -0,0 +1,21 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+/usr/sbin/makealiases -src=/etc/aliases
+
--- courier-0.47.orig/debian/newaliases.pod
+++ courier-0.47/debian/newaliases.pod
@@ -0,0 +1,28 @@
+=head1 NAME
+
+newaliases - rebuild mail aliases database
+
+=head1 SYNOPSIS
+
+newaliases
+
+=head1 DESCRIPTION
+
+This is a simple shell script calling B</usr/sbin/makealiases -src=/etc/aliases>.
+We need this to fulfil the Debian policy, which requires a newaliases
+binary and mail aliases stored in F</etc/aliases>. The default location for the
+source of the Courier mail alias database is F</etc/courier/aliases> (either
+file or directory).
+
+=head1 FILES
+
+F</etc/aliases>
+
+=head1 SEE ALSO
+
+L<makealiases>(8)
+
+=head1 AUTHOR
+
+This manual page was written by Stefan Hornburg (Racke) <racke@linuxia.de>
+for the Debian GNU/Linux system.
--- courier-0.47.orig/debian/sqwebmail.README.Debian
+++ courier-0.47/debian/sqwebmail.README.Debian
@@ -0,0 +1,43 @@
+Debian Packaging Issues
+***********************
+
+Please read /usr/share/doc/courier-base/README.Debian for more
+information about the packaging of the Courier Mail Server suite.
+
+To use the groupware calendaring mode, you have to install
+the courier-pcp package.
+
+The file containing the ispell dictionary used by SqWebMail
+has been moved to /etc/courier/ispelldict.
+
+Version Number
+**************
+
+The version number of the sqwebmail Debian package is derived from
+the version number of the complete Courier Mail Server suite.
+There is a separate SqWebMail source package available with a
+much higher version number than the version number of the Courier
+source package, so don't get confused.
+
+Using a Different Set of Templates
+**********************************
+
+You can make up your own template set from scratch or copy the
+existing set within /usr/lib/courier/sqwebmail/html to, e.g.
+/home/mywebmail.
+
+Then you need to advise your webserver to set the environment
+variable SQWEBMAIL_TEMPLATEDIR to name of the directory
+containing the templates.
+
+If you're using Apache, try this:
+
+SetEnv SQWEBMAIL_TEMPLATEDIR /home/mywebmail
+
+Runtime Configuration
+*********************
+
+sqwebmail reads runtime configuration files from /etc/courier,
+e.g. /etc/courier/logindomainlist.
+
+
--- courier-0.47.orig/debian/sqwebmail.conffiles
+++ courier-0.47/debian/sqwebmail.conffiles
@@ -0,0 +1,4 @@
+/etc/courier/sqwebmaild
+/etc/cron.d/sqwebmail
+/etc/init.d/sqwebmail
+/etc/pam.d/webmail
--- courier-0.47.orig/debian/sqwebmail.config
+++ courier-0.47/debian/sqwebmail.config
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+#
+# Copyright 2001,2002,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+db_get sqwebmail/install-www
+db_set sqwebmail/install-www-backup "$RET"
+
+db_input medium sqwebmail/install-www || [ $? -eq 30 ]
+db_go
+
+db_input medium sqwebmail/calendarmode || [ $? -eq 30 ]
+db_go
+
+# determine available dictionaries
+DICTS=default
+for file in /usr/lib/ispell/*.hash; do
+	DICT=`basename $file .hash`
+	if [ "$DICT" != "default" ]; then
+		DICTS="$DICTS, $DICT"
+ 	fi
+done
+db_subst sqwebmail/dictionary DICTS $DICTS
+db_input low sqwebmail/dictionary || [ $? -eq 30 ]
+db_go
--- courier-0.47.orig/debian/sqwebmail.cron.d
+++ courier-0.47/debian/sqwebmail.cron.d
@@ -0,0 +1,4 @@
+# /etc/cron.d/sqwebmail: crontab fragment for sqwebmail
+
+# Remove stale cache records every hour
+16 * * * * bin [ -x /usr/lib/courier/sqwebmail/cleancache.pl ] && /usr/lib/courier/sqwebmail/cleancache.pl
--- courier-0.47.orig/debian/sqwebmail.dirs
+++ courier-0.47/debian/sqwebmail.dirs
@@ -0,0 +1,2 @@
+var/cache/sqwebmail
+var/lib/courier/calendar
--- courier-0.47.orig/debian/sqwebmail.doc-base
+++ courier-0.47/debian/sqwebmail.doc-base
@@ -0,0 +1,9 @@
+Document: sqwebmail
+Title: SqWebMail
+Author: Sam Varshavchik
+Abstract: SqWebMail Documentation
+Section: Apps/Mail
+
+Format: HTML
+Files: /usr/share/doc/sqwebmail/sqwebmail.html
+Index: /usr/share/doc/sqwebmail/sqwebmail.html
--- courier-0.47.orig/debian/sqwebmail.docs
+++ courier-0.47/debian/sqwebmail.docs
@@ -0,0 +1,7 @@
+webmail/BUGS
+webmail/BUGS.html
+webmail/SECURITY
+webmail/SECURITY.html
+webmail/TODO
+webmail/TODO.html
+
--- courier-0.47.orig/debian/sqwebmail.files
+++ courier-0.47/debian/sqwebmail.files
@@ -0,0 +1,23 @@
+etc/courier/sqwebmaild
+etc/pam.d/webmail
+usr/bin/mimegpg
+usr/lib/courier/authsystem.passwd
+usr/lib/courier/authlib/changepwd/authsystem.passwd
+usr/lib/courier/courier/sqwebmaild
+usr/lib/courier/courier/webmail
+usr/lib/courier/sqwebmail/cleancache.pl
+usr/lib/courier/sqwebmail/html
+usr/lib/courier/sqwebmail/ldapsearch
+usr/lib/courier/sqwebmail/sendit.sh
+usr/lib/courier/sqwebmail/webgpg
+usr/sbin/webmaild
+usr/sbin/webgpg
+usr/share/courier/webadmin/admin-47webmail.html
+usr/share/courier/webadmin/admin-47webmail.pl
+usr/share/doc/sqwebmail/GPG.html
+usr/share/doc/sqwebmail/PCP.html
+usr/share/doc/sqwebmail/sqwebmail.html
+usr/share/man/man1/mimegpg.1
+usr/share/man/man8/webgpg.8
+usr/share/man/man8/webmaild.8
+usr/share/sqwebmail
--- courier-0.47.orig/debian/po/POTFILES.in
+++ courier-0.47/debian/po/POTFILES.in
@@ -0,0 +1,6 @@
+[type: gettext/rfc822deb] courier-base.templates
+[type: gettext/rfc822deb] courier-imap.templates
+[type: gettext/rfc822deb] courier-mta.templates
+[type: gettext/rfc822deb] courier-ssl.templates
+[type: gettext/rfc822deb] courier-webadmin.templates
+[type: gettext/rfc822deb] sqwebmail.templates
--- courier-0.47.orig/debian/po/pt_BR.po
+++ courier-0.47/debian/po/pt_BR.po
@@ -0,0 +1,435 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: courier\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-27 00:36+0100\n"
+"PO-Revision-Date: 2004-08-06 22:02-0300\n"
+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr "Criar diretórios para a administração baseada na Web ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+"O Courier utiliza diversos arquivos de configuração localizados em /etc/"
+"courier. Alguns arquivos de configuração podem ser substituídos por um "
+"subdiretório onde todos os arquivos existentes serão concatenados e "
+"considerados como um único arquivo de configuração consolidado."
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+"A administração baseada na Web fornecida pelo pacote courier-webadmin se "
+"baseia em diretórios de configuração ao invés de em arquivos de "
+"configuração. Caso você concorde, todos os diretórios necessários para a "
+"ferramenta de administração baseada na Web serão criados a menos que um "
+"arquivo puro já exista no local."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr "Empacotamento do Courier foi completamente revisado"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+"Anteriormente, o(s) pacote(s) courier-imap era(m) gerado(s) a partir de "
+"fontes Courier IMAP distribuídos separadamente. Isso mudou e, a partir de "
+"agora, a suíte completa é empacotada para o Debian. Por isso, a "
+"infraestrutura mudou bastante; por exemplo, todos os arquivos de "
+"configuração foram movidos para /etc/courier."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr ""
+"Por favor reporte ao mantenedor suas experiências com a nova infraestrutura."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr "Método de autenticação \"authdaemon\" é agora mandatório"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+"EM seu arquivo de configuração ${conffile}, AUTHMODULES está definido como "
+"\"${authmodules}\". Isto não funcionará mais devido ao authdaemon ser o "
+"único método de autenticação disponível para os pacotes Debian do Courier na "
+"versão 0.35 e superiores."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr ""
+"Por favor arrume seu arquivo de configuração ou sua configuração não mais "
+"funcionará. no longer work."
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr "Caminho para o diretório Maildir do usuário"
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+"Indique um nome de caminho relativo a partir de cada diretório pessoal de "
+"usuário para o diretório Maildir onde os servidores Courier armazenam e "
+"acessam as mensagens dos usuários. Por favor, consulte a página de manual "
+"maildir(5) caso você não esteja familiarizado com o formato de armazenamento "
+"de mensagens usado pelo Courier."
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr "Mover seus arquivos de configuração  para /etc/courier ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+"Existem arquivos de configuração do courier-imap sob o diretório /etc em seu "
+"sistema. A partir de agora, todos os arquivos de configuração relacionados "
+"ao Courier estarão localizados sob o diretório /etc/courier. Caso deseje, os "
+"arquivos de configuração podem ser movidos para o novo local. Porém, não é "
+"garantido que tais arquivos irão funcionar como anteriormente. Por favor, "
+"consulte a documentação do Courier e informe o mantenedor do Courier sobre "
+"suas experiências com a conversão."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr "Domínio padrão"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+"Por favor especifique um domínio de e-mail válido. A maioria das funções de "
+"reescrita de cabeçalhos incluirão este domínio em todos os endereços de e-"
+"mail os quais não especificarem um domínio, por exemplo, e-mails de contas "
+"nesta máquina."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr "Cabeçalho \"From\" para Notificações de Entrega"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+"Por favor especifique um valor válido para o cabeçalho \"From\" para "
+"notificações de entrega de mensagens. De outra forma as notificações não "
+"poderão ser enviadas."
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr "Certificado SSL requerido"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+"POP e IMAP sob SSL requerem um certificado X.509 válido e assinado. Durante "
+"a instalação do courier-pop-ssl e do courier-imap-ssl um certificado X.509 "
+"auto-assinado será gerado caso seja necessário. Para uso em produção o "
+"certificado X.509 deve ser assinado por uma autoridade certificadora "
+"reconhecida para que clientes de e-mail aceitem o certificado. As "
+"localizações padrão para este certificado são /etc/courier/pop3d.pem e /etc/"
+"courier/imapd.pem."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr "Ativar Programa CGI ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+"Para permitir que o courier-webadmin funcione sem maiores configurações "
+"adicionais, é necessário copiar o programa /usr/lib/courier/webmail/webadmin "
+"para /usr/lib/cgi-bin/courierwebadmin e ligar o bit SUID."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+"Isto não é feito por padrão durante a instalação por duas razões. A primeira "
+"é que isso possui implicações de segurança, devido ao courierwebadmin ser "
+"executado como root. A segunda é que é possível que isso não funcione "
+"dependendo de seu software de servidor Web e de sua configuração."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+"Caso você concorde e a configuração de seu servidor Web seja compatível com "
+"as políticas Debian, você poderá acessar o frontend de administração através "
+"do endereço http://localhost/cgi-bin/courierwebadmin."
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr "Senha para a Administração Courier"
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr "Para acessar a administração Courier, uma senha é necessária."
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr "local, rede, desabilitado"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr "Habilitar Calendaring ?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+"Por favor, especifique se você gostaria de habilitar calendaring em modo "
+"local (escolha local), modo groupware (escolha rede) ou não deseja habilitar "
+"esse recurso (escolha desabilitado). Para realmente usar o modo groupware, "
+"você precisará instalar o pacote courier-pcp."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+"O modo local implica em pouco overhead (carga) comparado a não usar o "
+"recurso de calendaring, ao contrário do modo groupware, o qual requer um "
+"substancial quantidade adicional de recursos do servidor. Caso você opte "
+"pelo modo groupware, um processo daemon separado será executado."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr ""
+"Para maiores informações, por favor consulte o arquivo /usr/share/doc/"
+"sqwebmail/PCP.html."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr "Dicionário Ispell"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+"O SqWebMail lhe permite fazer a checagem ortográfica de suas mensagens. Por "
+"favor, selecione um dicionário apripriado para o ispell."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr "Deseja instalar programa de troca de senhas do Webmail SUID root ?"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr ""
+"Para que a troca de senhas através da interface do Webmail funcione, um "
+"programa para trocar as senhas (do sistema) precisa ser instalado com o bit "
+"SUID ligado. Devido a esse programa ser executado como root, isso pode gerar "
+"sérias implicações de segurança."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+"(O programa CGI Webmail não precisa mais ser instalado SETUID root, uma vez "
+"que os acessos às mensagens e as configurações dos usuários são agora "
+"mediados por um daemon iniciado durante a inicialização do sistema em /etc/"
+"init.d/sqwebmail.)"
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr "ligação simbólica, cópia, personalizada"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr ""
+"Como você deseja instalar os documentos HTML e as imagens para o sqwebmail ?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+"As opções são criar uma ligação simbólica /var/www/sqwebmail, copiar todos "
+"os arquivos de /usr/share/sqwebmail para /var/www/sqwebmail ou deixar o /var/"
+"www sem ser mexido. Por razões de segurança, a segunda opção é recomendada. "
+"Porém, caso você já possua as diretivas FollowSymLinks ou "
+"SymLinksIfOwnerMatch habilitadas em sua configuração do Apache, você pode "
+"também escolher a primeira opção. A opção personalizada implica em você "
+"configurar seu servidor Web manualmente."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
+"Por favor note que /var/www/sqwebmail será removido caso o pacote seja "
+"expurgado (removido completamente), a menos que você selecione a opção "
+"personalizada."
+
+#~ msgid "Which is the directory name of the user's maildir ?"
+#~ msgstr "Qual é o nome do diretório do maildir do usuário ?"
+
+#~ msgid ""
+#~ "You change the setting for the directory name in the user's home "
+#~ "directory where the Courier POP and IMAP servers locate the user's "
+#~ "maildir."
+#~ msgstr ""
+#~ "Você pudou a configuração para o nome do diretório localizado sob o "
+#~ "diretório pessoal do usuário onde os servidores Courier POP e IMAP "
+#~ "localizam o maildir do usuário."
+
--- courier-0.47.orig/debian/po/ja.po
+++ courier-0.47/debian/po/ja.po
@@ -0,0 +1,406 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: courier 0.44.2-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-27 00:36+0100\n"
+"PO-Revision-Date: 2004-03-08 22:02+0900\n"
+"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr "web ¥Ù¡¼¥¹¤Ç¤Î´ÉÍý¤Î¤¿¤á¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+"Courier ¤Ï /etc/courier ¤Ë¤¢¤ëÊ£¿ô¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò»ÈÍÑ¤·¤Þ¤¹¡£´ö¤Ä¤«¤ÎÀßÄê"
+"¥Õ¥¡¥¤¥ë¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤ÎÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬·Ò¤²¤é¤ì¤Æ°ì¤Ä¤ÎÅý¹ç¤µ¤ì¤¿Àß"
+"Äê¥Õ¥¡¥¤¥ë¤Ë¸«¤Ê¤µ¤ì¤ë¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÇÛÃÖ¤·¤Ê¤ª¤»¤Þ¤¹¡£"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+"courier-webadmin ¤Ë¤è¤Ã¤ÆÄó¶¡¤µ¤ì¤ë web ¥Ù¡¼¥¹¤Î´ÉÍý¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¯Àß"
+"Äê¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÍÂ¸¤·¤Þ¤¹¡£¤â¤·Æ±°Õ¤¹¤ì¤Ð¡¢¤¹¤Ç¤Ë¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤¾ì"
+"¹ç web ¥Ù¡¼¥¹¤Î´ÉÍý¥Ä¡¼¥ë¤ËÉ¬Í×¤Ê¥Ç¥£¥ì¥¯¥È¥ê¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr "Courier ¤Î¥Ñ¥Ã¥±¡¼¥¸ÊýË¡¤¬´°Á´¤ËÊÑ¹¹¤µ¤ì¤Þ¤·¤¿"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+"°ÊÁ°¡¢courier-imap ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÏÊ¬³ä¤·¤ÆÇÛÉÛ¤µ¤ì¤Æ¤¤¤¿ Courier IMAP ¤Î¥½¡¼¥¹"
+"¥³¡¼¥É¤«¤éÀ¸À®¤µ¤ì¤Æ¤¤¤Þ¤·¤¿¡£¤³¤ì¤¬ÊÑ¹¹¤µ¤ì¡¢courier ¥¹¥¤¡¼¥È¤¬Á´¤Æ¤Þ¤È¤á¤Æ "
+"Debian ÍÑ¤Ë¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¤µ¤ì¤Þ¤¹¡£¤³¤Î¤è¤¦¤ÊÍýÍ³¤Ë¤è¤ê¡¢¹½Â¤¤¬ÂçÉý¤ËÊÑ¹¹¤µ¤ì"
+"¤Æ¤¤¤Þ¤¹¡£Îã¤¨¤ÐÁ´¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬ /etc/courier ¤Ë°ÜÆ°¤·¤Æ¤¤¤Þ¤¹¡£"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr "¥á¥ó¥Æ¥Ê¤Ë¿·¤·¤¤¹½Â¤¤Ë¤Ä¤¤¤Æ¤Î´¶ÁÛ¤ò¶µ¤¨¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr "¤³¤ì¤è¤êÇ§¾ÚÊý¼°¤Ï \"authdaemon\" ¤¬¶¯À©¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+"ÀßÄê¥Õ¥¡¥¤¥ë ${conffile} Ãæ¤Ç¤Ï AUTHMODULES ¤Ï \"${authmodules}\" ¤ËÀßÄê¤µ¤ì"
+"¤Æ¤¤¤Þ¤¹¡£Courier ¤Î Debian ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¥Ð¡¼¥¸¥ç¥ó 0.35 °Ê¾å¤Ç¤³¤ÎÀßÄê¤Ï¤â"
+"¤Ï¤äÆ°ºî¤»¤º¡¢authdaemon ¤Î¤ß¤¬Ç§¾ÚÊý¼°¤È¤·¤ÆÍøÍÑ²ÄÇ½¤Ç¤¹¡£"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤ò½¤Àµ¤·¤Ê¤¤¸Â¤ê¡¢Æ°ºî¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£"
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr "¥æ¡¼¥¶¤Î Maildir ¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥Ñ¥¹"
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+"¤³¤ì¤Ï³Æ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤«¤é Courier ¥µ¡¼¥Ð¤¬¥æ¡¼¥¶¤Î¥á¡¼¥ë¤òÊÝÂ¸¡¦"
+"¥¢¥¯¥»¥¹¤¹¤ë Maildir ¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÁêÂÐ¥Ñ¥¹Ì¾¤Ç¤¹¡£Courier ¤Ë¤è¤Ã¤ÆÍøÍÑ¤µ¤ì"
+"¤ë¥á¡¼¥ëÊÝÂ¸·Á¼°¤Ë¤Ä¤¤¤Æ¤¢¤Þ¤ê¾Ü¤·¤¯¤Ê¤¤¤È¤¤¤¦¾ì¹ç¤Ï maildir(5) ¥Þ¥Ë¥å¥¢¥ë"
+"¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr "²áµî¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò /etc/courier ¤Ë°ÜÆ°¤·¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+"¥·¥¹¥Æ¥à¾å¤Ç courier-imap ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ï /etc ¤Ë¤¢¤ê¤Þ¤¹¡£¤³¤ì¤è¤ê Courier "
+"¤Ë´ØÏ¢¤¹¤ëÁ´¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ï /etc/courier ¤ËÇÛÃÖ¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤è¤í"
+"¤·¤±¤ì¤ÐÀßÄê¥Õ¥¡¥¤¥ë¤ò¿·¤·¤¤°ÌÃÖ¤Ë°ÜÆ°¤·¤Þ¤¹¤¬¡¢°ÊÁ°Æ±ÍÍ¤ËÆ°ºî¤¹¤ë¤Î¤ÏÊÝ¾Ú¤Ç"
+"¤­¤Þ¤»¤ó¡£Courier ¤Î¥É¥­¥å¥á¥ó¥È¤ò»²¾È¤·¤Æ¥á¥ó¥Æ¥Ê¤Ë¤³¤ÎÊÑ¹¹¤Î´¶ÁÛ¤ò¶µ¤¨¤Æ¤¯"
+"¤À¤µ¤¤¡£"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr "¥Ç¥Õ¥©¥ë¥È¥É¥á¥¤¥óÌ¾"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+"Àµ¤·¤¤¥á¡¼¥ë¥É¥á¥¤¥óÌ¾¤ò»ØÄê¤·¤Æ¤¯¤À¤µ¤¤¡£ËØ¤É¤Î¥Ø¥Ã¥À½ñ¤­´¹¤¨µ¡Ç½¤Ï¥É¥á¥¤¥ó"
+"Ì¾¤¬»ØÄê¤µ¤ì¤Æ¤¤¤Ê¤¤Á´¤Æ¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤Ë¤³¤Î¥É¥á¥¤¥óÌ¾¤òÉÕ²Ã¤·¤Þ¤¹¡£Îã¤¨"
+"¤Ð¡¢¤³¤Î¥Þ¥·¥ó¤Î¥¢¥«¥¦¥ó¥È¤«¤é¤Î¥á¡¼¥ë¤ËÂÐ¤·¤Æ¡¢¤Ê¤É¤Ë¤Ê¤ê¤Þ¤¹¡£"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr "Delivery Notification ¤ËÍøÍÑ¤¹¤ë \"From\"¥Ø¥Ã¥À"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+"Mail Delivery Notification ¤ÎºÝ¤Ë \"From\" ¥Ø¥Ã¥À¤Ë»ÈÍÑ¤¹¤ëÍ­¸ú¤ÊÃÍ¤ò»ØÄê¤·¤Æ"
+"¤¯¤À¤µ¤¤¡£»ØÄê¤ò¹Ô¤ï¤Ê¤¤¾ì¹ç¤Ï Delivery Notification ¤ÏÁ÷¤é¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr "SSL ¾ÚÌÀ½ñ¤¬É¬Í×¤Ç¤¹"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+"POP/IMAP over SSL ¤Ë¤ÏÍ­¸ú¤Ê¡¢½ðÌ¾¤µ¤ì¤¿ X.509 ¾ÚÌÀ½ñ¤¬É¬Í×¤È¤Ê¤ê¤Þ¤¹¡£¤½¤ì¤¾"
+"¤ì courier-pop-ssl/courier-imap-ssl ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î´Ö¡¢É¬Í×¤Ç¤¢¤ì¤Ð¼«¸Ê½ðÌ¾ "
+"X.509 ¾ÚÌÀ½ñ¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¼ÂÌ³¤Ç¤Î»ÈÍÑ¤ËºÝ¤·¤Æ¤Ï¡¢¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤¬¾ÚÌÀ"
+"½ñ¤ò¼õÍý¤¹¤ë°Ù¤Ë X.509 ¾ÚÌÀ½ñ¤ËÂÐ¤·¤ÆÃøÌ¾¤Ê¾ÚÌÀ¶É¤Ë¤è¤ë½ðÌ¾¤¬É¬Í×¤Ç¤¹¡£¤³¤Î¾Ú"
+"ÌÀ½ñ¤ÎÉ¸½à¤Î¾ì½ê¤Ï /etc/courier/pop3d.pem ¤ª¤è¤Ó /etc/courier/imapd.pem ¤Ç"
+"¤¹¡£"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr "CGI ¥×¥í¥°¥é¥à¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+"courier-webadmin ¤Ë¼ê¤ò²Ã¤¨¤Ê¤¯¤ÆÎÉ¤¤¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢/usr/lib/courier/"
+"courier/webmail/webadmin ¤«¤é /usr/lib/cgi-bin/courierwebadmin ¤Ë CGI ¥×¥í¥°"
+"¥é¥à¤ò¥³¥Ô¡¼¤·¤Æ SUID ¥Ó¥Ã¥È¤ò¥»¥Ã¥È¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¡£"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+"¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë¤³¤ì¤é¤Îºî¶È¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ë¤ÏÆó¤Ä¤ÎÍýÍ³¤¬¤¢¤ê¤Þ¤¹¡£¤Þ¤º"
+"»Ï¤á¤Ë courierwebadmin ¤Ï root ¤È¤·¤ÆÆ°ºî¤¹¤ë¤Î¤Ç¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÀøºßÅª¤Ê¶¼°Ò"
+"¤¬¤¢¤ë¤³¤È¡£¼¡¤Ë web ¥µ¡¼¥Ð¥½¥Õ¥È¤È¤½¤ÎÀßÄê¤Ë°ÍÂ¸¤¹¤ë¤Î¤ÇÆ°ºî¤¬ÊÝ¾Ú¤µ¤ì¤Ê¤¤¤³"
+"¤È¤Ç¤¹¡£"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+"¤³¤³¤ÇÆ±°Õ¤·¤Æ web ¥µ¡¼¥Ð¤ÎÀßÄê¤¬ Debian ¥Ý¥ê¥·¡¼ ¤ËÅ¬¹ç¤·¤Æ¤¤¤ë¾ì¹ç¡¢http://"
+"localhost/cgi-bin/courierwebadmin ¤«¤é´ÉÍýÍÑ¤Î¥Õ¥í¥ó¥È¥¨¥ó¥É¤Ø¥¢¥¯¥»¥¹¤Ç¤­¤Þ"
+"¤¹¡£"
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr "Courier ´ÉÍýÍÑ¥Ñ¥¹¥ï¡¼¥É"
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr "Courier ¤Î´ÉÍý²èÌÌ¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¤¬É¬Í×¤Ç¤¹¡£"
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr "¥í¡¼¥«¥ë, ¥Í¥Ã¥È¥ï¡¼¥¯, Ìµ¸ú¤Ë¤¹¤ë"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr "¥«¥ì¥ó¥À¡¼µ¡Ç½¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+"¥í¡¼¥«¥ë¥â¡¼¥É (¡Ö¥í¡¼¥«¥ë¡×)¤«¥°¥ë¡¼¥×¥¦¥§¥¢¥â¡¼¥É (¡Ö¥Í¥Ã¥È¥ï¡¼¥¯¡×)¤òÁª¤ó"
+"¤Ç¥«¥ì¥ó¥À¡¼µ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤«¡¢Á´¤¯»È¤ï¤Ê¤¤(¡ÖÌµ¸ú¤Ë¤¹¤ë¡×) ¤«¤ò·è¤á¤Æ¤¯¤À¤µ"
+"¤¤¡£¼ÂºÝ¤Ë¥°¥ë¡¼¥×¥¦¥§¥¢¥â¡¼¥É¤ò»È¤¦¤Ë¤Ï¡¢courier-pcp ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼"
+"¥ë¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¡£"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+"¥í¡¼¥«¥ë¥â¡¼¥É¤Ç¤Ï¥«¥ì¥ó¥À¡¼µ¡Ç½¤ò»È¤ï¤Ê¤¤¤Î¤ÈÈæ³Ó¤·¤ÆÂ¿¾¯¤Î¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤Ë"
+"¤Ê¤ê¤Þ¤¹¤¬¡¢¥°¥ë¡¼¥×¥¦¥§¥¢¥â¡¼¥É¤Ç¤ÏÁêÅöÂçÎÌ¤Î¥µ¡¼¥Ð»ñ¸»¤¬ÄÉ²Ã¤ÇÉ¬Í×¤È¤Ê¤ê¤Þ"
+"¤¹¡£¥°¥ë¡¼¥×¥¦¥§¥¢¥â¡¼¥É¤òÁªÂò¤·¤¿¾ì¹ç¤Ï¡¢¥Ç¡¼¥â¥ó¥×¥í¥»¥¹¤òÊ¬Î¥¤·¤ÆÆ°ºî¤µ¤»"
+"¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr ""
+"¤è¤ê¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢/usr/share/doc/sqwebmail/PCP.html ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr "ispell ¼­½ñ"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+"SqWebMail ¤Ç¤Ï¥á¡¼¥ë¤Î¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤¬¤Ç¤­¤Þ¤¹¡£ispell ÍÑ¤ÎÅ¬ÀÚ¤Ê¼­½ñ¤òÁª¤ó¤Ç"
+"¤¯¤À¤µ¤¤¡£"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr "web ¥á¡¼¥ë¤Î¥Ñ¥¹¥ï¡¼¥ÉÊÑ¹¹µ¡Ç½¥×¥í¥°¥é¥à¤ò root ¤Ë SUID ¤·¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr ""
+"web ¥á¡¼¥ë¤Î¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ÎÊÑ¹¹¤ò¹Ô¤¦¤Ë¤Ï¡¢¥×¥í¥°¥é¥à¤¬ (¥·"
+"¥¹¥Æ¥à¤Î) ¥Ñ¥¹¥ï¡¼¥É¤òÊÑ¹¹¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë SUID ¥Ó¥Ã¥È¤ò¥»¥Ã¥È¤·¤Æ¥¤¥ó"
+"¥¹¥È¡¼¥ë¤µ¤ì¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£¤³¤ì¤é¤Î¥×¥í¥°¥é¥à¤Ï root ¤È¤·¤ÆÆ°ºî¤¹¤ë¤Î"
+"¤Ç¡¢¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÀøºßÅª¤Ê¶¼°Ò¤È¤Ê¤ê¤Þ¤¹¡£"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+"(¥æ¡¼¥¶¤Î¥á¡¼¥ë¤ÈÀßÄê¤Ø¤Î¥¢¥¯¥»¥¹¤Ï¥·¥¹¥Æ¥àµ¯Æ°»þ¤Ë /etc/init.d/sqwebmail ¤«"
+"¤é¥Ç¡¼¥â¥ó¤¬µ¯Æ°¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ²ò·è¤¹¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¤Î¤Ç¡¢web ¥á¡¼¥ë¤Î CGI ¥×"
+"¥í¥°¥é¥à¤½¤ì¼«ÂÎ¤Ï¤â¤Ï¤ä root ¤Ë setuid ¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤»¤ó¡£)"
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯, ¥³¥Ô¡¼¤¹¤ë, ¥«¥¹¥¿¥à"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr ""
+"¤É¤Î¤è¤¦¤Ë¤·¤Æ sqwebmail ÍÑ¤Î HTML ¥É¥­¥å¥á¥ó¥È¤È²èÁü¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤«?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+"ÁªÂò»è¤È¤·¤Æ¤Ï¡¢/var/www/sqwebmail ¤Ø¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òºî¤ë¡¢/usr/share/"
+"sqwebmail ¤«¤é /var/www/sqwebmail ¤ØÁ´¤Æ¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤¹¤ë¡¢/var/www ¤ò¤½¤Î"
+"¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¯¡¢¤Ç¤¹¡£¥»¥­¥å¥ê¥Æ¥£Åª¤ÊÍýÍ³¤«¤é¤ÏÆóÈÖÌÜ¤ÎÊýË¡¤¬¤ª´«¤á¤Ë¤Ê¤ê¤Þ"
+"¤¹¡£¤·¤«¤·¡¢¤¹¤Ç¤Ë Apache ¤ÎÀßÄê¤Ç FollowSymLinks ¤« SymLinksIfOwnerMatch ¤ò"
+"Í­¸ú¤Ë¤·¤Æ¤¤¤ì¤Ð¡¢ºÇ½é¤ÎÊýË¡¤òÁª¤Ö¤Î¤âÎÉ¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£¡Ö¥«¥¹¥¿¥à¡×¤òÁª¤Ö"
+"¤È web ¥µ¡¼¥Ð¤ò¼êÆ°¤ÇÀßÄê¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
+"¡Ö¥«¥¹¥¿¥à¡×¤òÁª¤Ð¤Ê¤¤¤È¡¢¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ëºï½ü (purge) ¤µ¤ì¤Æ¤â /var/www/"
+"sqwebmail ¤Ïºï½ü¤µ¤ì¤Ê¤¯¤Ê¤ë¤Î¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£"
+
--- courier-0.47.orig/debian/po/es.po
+++ courier-0.47/debian/po/es.po
@@ -0,0 +1,396 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2004-02-27 00:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr "Se ha restructurado completamente el paquete Courier"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+#, fuzzy
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+"Anteriormente los paquetes courier-imap se generaban a partir de unas "
+"fuentes de Courier IMAP distribuidas de forma independiente. De ahora en "
+"adelante, Debian empaquetará Courier en su conjunto. Por eso, la "
+"infraestructura ha cambiado bastante y los ficheros de configuración se han "
+"movido a /etc/courier."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr ""
+"Hágale saber al mantenedor sus experiencias con esta nueva infraestructura."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr "«authdaemon» es ahora el método de autentificación obligatorio"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+#, fuzzy
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+"Se ha verificado el fichero de configuración ${conffile}, donde AUTHMODULES "
+"está definido como \"${authmodules}\". Esto ya no funciona, ya que "
+"«authdaemon» es el único método de autentificación disponible en los "
+"paquetes Debian de Courier a partir de la versión 0.35."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr ""
+"Por favor, modifique su configuración o el programa no funcionará "
+"correctamente."
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr "¿Mover los ficheros de configuración antiguos a /etc/courier?"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+#, fuzzy
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+"Se han detectado ficheros de configuración de courier-imap en /etc. De ahora "
+"en adelante todos los ficheros de configuración relacionados con Courier se "
+"encuentran en /etc/courier. Si quiere, puedo moverlos automáticamente a su "
+"nueva ubicación. Sin embargo, no hay garantía de que funcionen como antes. "
+"Por favor, lea la documentación de Courier y hágale saber al mantenedor sus "
+"experiencias con la conversión de estos ficheros."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr "Se necesita un certificado SSL"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+"Para utilizar POP e IMAP sobre SSL necesitan un certificado X.509 válido y "
+"firmado. Si es necesario, durante la instalación de courier-pop-ssl y "
+"courier-imap-ssl respectivamente se generará un certicado X.509. Para usarlo "
+"en producción el certificado debe ser firmado por una autoridad "
+"certificadora reconocida, de forma que los clientes de correo lo acepten. "
+"Las ubicaciones predeterminadas para este certificado son /etc/courier/pop3d."
+"pem y /etc/courier/imapd.pem respectivamente."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr "Diccionario ispell"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+"SqWebMail le permite repasar la ortografía de sus correos electrónicos. Por "
+"favor, elija el diccionario que quiera usar con ispell."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+#, fuzzy
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr "¿Quiere instalar el script CGI webmail setuid root?"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+#, fuzzy
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr ""
+"Para que el CGI webmail funcione correctamente tiene que instalarse setuid "
+"root (ejecución con permisos de root). Puesto que webmail funcionará como "
+"root, esto tiene importantes implicaciones de seguridad."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr "enlace simbólico, copia, personalizar"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr "¿Cómo desea instalar los archivos HTML e imágenes de sqwebmail?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+"Las opciones son: crear el enlace simbólico /var/www/sqwebmail que apunte a /"
+"usr/share/sqwebmail, copiar todos los ficheros de /usr/share/sqwebmail en /"
+"var/www/sqwebmail o dejarlos en /var/www. Por razones de seguridad se "
+"recomienda elegir la segunda opción. Sin embargo si ya tiene activadas las "
+"opciones FollowSymLinks o SymLinksIfOwnerMatch en su configuración de Apache "
+"puede elegir la primera opción. La opción de personalizar puede serle de "
+"ayuda si desea configurar su servidor web manualmente."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
+"Si purga este paquete se borrará /var/www/sqwebmail, a menos que haya "
+"elegido la opción de personalizar."
+
+#~ msgid "Which is the directory name of the user's maildir ?"
+#~ msgstr "¿Cuál es el nombre del directorio de correo del usuario?"
+
+#~ msgid ""
+#~ "You change the setting for the directory name in the user's home "
+#~ "directory where the Courier POP and IMAP servers locate the user's "
+#~ "maildir."
+#~ msgstr ""
+#~ "Proporcione el nombre del directorio de la cuenta del usuario donde los "
+#~ "servidores POP e IMAP podrán encontrar el directorio de correo."
+
+#~ msgid "default"
+#~ msgstr "por defecto"
+
+#~ msgid "symlink"
+#~ msgstr "enlace simbólico"
--- courier-0.47.orig/debian/po/fr.po
+++ courier-0.47/debian/po/fr.po
@@ -0,0 +1,418 @@
+#
+#
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: courier (0.42.2-9)\n"
+"POT-Creation-Date: 2004-02-27 00:36+0100\n"
+"PO-Revision-Date: 2004-03-09 18:11+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr "Faut-il créer les répertoires nécessaires à l'administration web ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+"Courier utilise de nombreux fichiers de configuration placés dans /etc/"
+"courier. Certains de ces fichiers peuvent être remplacés par un sous-"
+"répertoire contenant des fichiers qui seront concaténés et seront considérés "
+"ensemble comme un seul fichier de configuration."
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+"L'outil d'administration par le web fourni par le paquet courier-webadmin "
+"n'utilise pas de fichiers pour la configuration, mais des répertoires. Si "
+"vous le souhaitez, tous les répertoires nécessaires pour cet outil seront "
+"créés, sauf si un fichier est déjà présent."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr "L'organisation des paquets de Courier a été totalement refondue"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+"Jusqu'ici, le(s) paquet(s) courier-imap étai(en)t généré(s) à partir des "
+"sources de Courier IMAP, disponibles séparément. Désormais, l'ensemble des "
+"logiciels de la suite Courier est mis en paquets pour Debian. De ce fait, "
+"l'infrastructure a notablement changé : l'ensemble des fichiers de "
+"configuration a été déplacé vers /etc/courier."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr ""
+"N'hésitez pas à faire parvenir au responsable du paquet votre avis sur la "
+"nouvelle infrastructure."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr "La méthode d'authentification « authdaemon » est désormais obligatoire"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+"Dans votre fichier de configuration ${conffile}, AUTHMODULES est réglé sur "
+"« ${authmodules} ». Ce réglage ne fonctionnera plus car depuis la version "
+"0.35 des paquets Debian de Courier, « authdaemon » est la seule méthode "
+"d'autentification disponible."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr ""
+"Veuillez corriger votre fichier de configuration sinon Courier ne "
+"fonctionnera plus."
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr "Chemin des répertoires de courriel (« Maildir ») des utilisateurs :"
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+"Ce chemin est relatif au répertoire personnel des utilisateurs. Il "
+"correspond au répertoire « Maildir » où les serveurs Courier enregistrent "
+"les courriels des utilisateurs. Veuillez consulter la page de manuel de "
+"maildir(5) si vous n'avez pas l'habitude du format de stockage des courriels "
+"qu'utilise Courier."
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr ""
+"Faut-il déplacer les anciens fichiers de configuration vers /etc/courier ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+"Des fichiers de configuration de courier-imap existent sous /etc. Désormais, "
+"tous les fichiers de configuration de Courier sont placés dans /etc/courier. "
+"Si vous le souhaitez, ces fichiers peuvent être déplacés pour vous. "
+"Cependant, rien ne garantit qu'ils fonctionneront comme avant. Veuillez "
+"consulter la documentation de Courier et exprimer au responsable du paquet "
+"ce que vous pensez de la conversion."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr "Domaine par défaut :"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+"Veuillez indiquer un domaine de courriel valide. La plupart des fonctions de "
+"réécriture d'en-têtes ajouteront ce domaine à toutes les adresses "
+"électroniques dans lesquelles aucun domaine n'est indiqué. Les comptes "
+"locaux de cette machine en sont un exemple."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr "En-tête « origine » (« From ») pour les notifications d'envoi :"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+"Veuillez indiquez une adresse valide pour l'en-tête « origine » des "
+"notifications d'envoi de courriel (« mail delivery notifications ») sinon "
+"celles-ci ne pourront pas être envoyées."
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr "Un certificat SSL est requis"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+"L'utilisation des protocoles POP et IMAP avec SSL nécessite de posséder un "
+"certificat X.509 valide et signé. Lors de l'installation de courier-pop-ssl "
+"et courier-imap-ssl, un certificat X.509 auto-signé sera généré si "
+"nécessaire. Sur un site de production, le certificat X.509 doit être signé "
+"par une autorité de certification reconnue afin que les clients de courriel "
+"acceptent le certificat. Les emplacements par défaut de ces certificats sont "
+"respectivement /etc/courier/pop3d.pem et /etc/courier/imapd.pem."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr "Faut-il activer le programme CGI ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+"Pour que courier-webadmin fonctionne sans modifications, il faut copier le "
+"programme CGI de /usr/lib/courier/courier/webmail/webadmin vers /usr/lib/cgi-"
+"bin/courierwebadmin et activer le bit SUID."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+"Cette tâche n'est pas réalisée par défaut pour deux raisons :\n"
+" - ce choix a des implications sérieuses sur la sécurité car\n"
+"   courierwebadmin s'exécute avec les droits du super-utilisateur ;\n"
+" - rien ne garantit que cela fonctionne car tout dépend du\n"
+"   type de serveur web et de sa configuration."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+"Si vous acceptez et si la configuration de votre serveur web est conforme à "
+"la charte Debian, vous pourrez accéder à l'interface d'administration à "
+"l'adresse http://localhost/cgi-bin/courierwebadmin."
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr "Mot de passe pour l'administration de Courier :"
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr "Un mot de passe est nécessaire pour pouvoir administrer Courier."
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr "local, réseau, désactivé"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr "Faut-il activer la gestion de calendrier (« Calendaring ») ?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+"Veuillez indiquer si vous souhaitez activer la gestion de calendrier en mode "
+"local, en mode travail de groupe (choisissez alors « réseau ») ou la "
+"désactiver. Pour pouvoir utiliser le mode travail de groupe, vous devez "
+"installer le paquet courier-pcp."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+"Le mode local est relativement peu coûteux en ressources par rapport au "
+"fonctionnement sans gestion de calendrier. Par contre, le mode travail de "
+"groupe utilise nettement plus les ressources du serveur. Si vous choisissez "
+"le mode travail de groupe, un démon sera lancé séparément."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr ""
+"Veuillez consulter le fichier /usr/share/doc/sqwebmail/PCP.html pour plus "
+"d'informations."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr "Dictionnaire pour ispell :"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+"SqWebMail permet la vérification orthographique des courriels. Veuillez "
+"choisir le dictionnaire qu'utilisera ispell."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr ""
+"L'outil de changement des mots de passe webmail doit-il fonctionner avec les "
+"privilèges du super-utilisateur ?"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr ""
+"Pour que le changement des mots de passe webmail puisse fonctionner "
+"correctement, un programme permettant de changer les mots de passe du "
+"système a été installé avec le bit SUID. Comme ce programme fonctionne avec "
+"les privilèges du super-utilisateur, cela peut avoir de sérieuses "
+"conséquences sur la sécurité."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+"Le programme CGI webmail n'a désormais plus besoin de fonctionner avec les "
+"privilèges du super-utilisateur (« setuid root »), les accès aux courriels "
+"et aux configurations des utilisateurs étant désormais gérés par un démon "
+"lancé au démarrage du système par la commande /etc/init.d/sqwebmail."
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr "lien symbolique, copie, aucune"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr ""
+"Méthode d'installation des documents HTML et des images pour sqwebmail :"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+"Vous pouvez :\n"
+" - créer un lien symbolique /var/www/sqwebmail ;\n"
+" - copier tous les fichiers de /usr/share/sqwebmail vers\n"
+"   /var/www/sqwebmail ;\n"
+" - ne rien faire de particulier et laisser /var/www intact.\n"
+"Pour des raisons de sécurité, la deuxième option est recommandée. Cependant, "
+"si vous avez déjà activé « FollowSymlinks » ou « SymLinksOwnerMatch » dans "
+"la configuration de votre serveur Apache, vous pouvez également choisir la "
+"première option. Si vous choisissez la dernière option, vous devrez "
+"configurer votre serveur web vous-même."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
+"Veuillez noter que /var/www/sqwebmail sera supprimé si le paquet est purgé, "
+"sauf si l'option « aucune » est choisie."
--- courier-0.47.orig/debian/po/de.po
+++ courier-0.47/debian/po/de.po
@@ -0,0 +1,414 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Courier 0.43.2-1\n"
+"POT-Creation-Date: 2004-02-27 00:36+0100\n"
+"PO-Revision-Date: 2004-03-17 00:36+0100\n"
+"Last-Translator: Stefan Hornburg (Racke) <racke@linuxia.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr "Verzeichnisse für WWW-Administration anlegen ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+"Courier benutzt verschiedene Konfigurationsdateien in /etc/courier. Einige "
+"davon können durch ein Unterverzeichnis ersetzt werden, dann werden alle "
+"Dateien in diesem Unterverzeichnis aneinandergehängt und als einzelne, "
+"vereinigte Konfigurationsdatei betrachtet."
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+"Die von dem courier-webadmin Paket zur Verfügung gestellte WWW-"
+"Administration ist angewiesen auf Konfigurationsverzeichnisse statt "
+"Konfigurationsdateien. Wenn Sie zustimmen, werden alle vom "
+"Administrationstool benötigten Verzeichnis erzeugt, außer es existiert "
+"bereits eine gleichnamige Konfigurationsdatei."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr "Paketstruktur von Courier wurde komplett überarbeitet"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+"Früher wurden die Courier-IMAP-Pakete aus den separat erhältlichen Courier-"
+"IMAP-Quellen erstellt. Nun ist die gesamte Courier-Software als Debianpakete "
+"erhältlich. Deshalb hat sich der Aufbau der Pakete wesentlich geändert, z.B. "
+"wurden alle Konfigurationsdateien nach /etc/courier verlagert."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr ""
+"Bitte teilen Sie Ihre Erfahrungen mit der Umstellung dem Maintainer mit."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr "Authentifizierungsmethode \"authdaemon\" ist jetzt zwingend notwendig"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+"In Ihrer Konfigurationsdatei ${conffile} haben Sie AUTHMODULES den Wert "
+"\"${authmodules}\" zugewiesen. Diese Einstellung wird nicht mehr "
+"funktionieren, da authdaemon die einzig verfügbare Authentifizierungmethode "
+"für Courier-Debianpakete Version 0.35 und höher ist."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr ""
+"Bitte passen Sie Ihre Konfigurationsdatei an oder Ihr Courier-Server ist "
+"nicht länger einsatzfähig."
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr "Pfad zum Maildir-Verzeichnis des Benutzers"
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+"Dies ist ein relativer Pfadname zum Maildir-Verzeichnis des jeweiligen "
+"Benutzers, in dem die Courier-Server die Email des Benutzers speichern und "
+"lesen. Bitte lesen Sie die maildir(5) Manpage, wenn Sie mit Courier's Format "
+"zum Speichern von Emails nicht vertraut sind."
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr "Alte Konfigurationsdateien nach /etc/courier verschieben ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+"Konfigurationsdateien für courier-imap wurden im Verzeichnis /etc gefunden. "
+"Ab jetzt werden alle Konfigurationsdateien, die mit Courier im Zusammenhang "
+"stehen, unter /etc/courier aufbewahrt. Wenn Sie es wünschen, werden die alte "
+"Konfigurationsdateien in das neue Verzeichnis verschoben. Es kann jedoch "
+"nicht garantiert werden, daß sie wie vorher funktionieren. Bitte informieren "
+"Sie sich in der Courier-Dokumentation und teilen dem Maintainer dieses "
+"Paketes ihre Erfahrungen mit der Umstellung mit."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr "Standarddomain"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+"Bitte geben Sie eine gültige Emaildomain ein. Die meisten Funktionen zum "
+"Bearbeiten von Emailheadern hängen diese Domain an Emailadressen an, die "
+"keine Domain enthalten. Dies ist z.B. bei Emails von Benutzern dieser "
+"Maschine möglich."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr "\"From\"-Header für Zustellungsbenachrichtigungen"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+"Bitte geben Sie einen gültigen Wert für den \"From\"-Header für Email-"
+"Zustellungsbenachrichtigungen. Andernfalls können diese nicht verschickt "
+"werden."
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr "SSL-Zertifikat erforderlich"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+"Für POP und IMAP mittels SSL ist ein gültiges und signiertes X.509-"
+"Zertifikat erforderlich. Während der Installation von courier-pop-ssl bzw. "
+"courier-imap-ssl wird ein selbst signiertes X.509-Zertifikat erstellt wenn "
+"nicht bereits ein Zertifikat vorhanden ist. Für den Produktionsbetrieb muß "
+"das X.509-Zertifikat von einer anerkannte Zertifizierungsstelle vorgenommen "
+"werden, damit das Zertifikat von Mailprogrammern akzeptiert wird. Das "
+"Zertifikat wird in /etc/courier/pop3d.pem bzw. in /etc/courier/imapd.pem "
+"abgelegt."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr "Wollen Sie das CGI-Programm aktivieren ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+"Damit courier-webadmin ohne weitere Eingriffe funktioniert, ist es "
+"erforderlich das CGI-Programm von /usr/lib/courier/courier/webmail/webadmin "
+"nach /usr/lib/cgi-bin/courierwebadmin zu kopieren und das SUID-Bit zu setzen."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+"Aus zwei Gründen wird dies nicht automatisch gemacht. Erstens kann das "
+"ernsthafte Auswirkungen auf die Sicherheit des Systems haben, das "
+"courierwebadmin als root ausgeführt wird. Außerdem kann in Abhängigkeit von "
+"der verwendeten Webserversoftware und deren Konfiguration die Funktion nicht "
+"garantiert werden."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+"Wenn Sie hier zustimmen und Ihre Webserverkonfiguration der Debian-Policy "
+"entspricht, können Sie auf das Administrations-Frontend mit der URL http://"
+"localhost/cgi-bin/courierwebadmin zugreifen."
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr "Passwort für die Courier-Administration"
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr ""
+"Für den Zugriff auf die Courier-Administration wird ein Passwort benötigt."
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr "lokal, netzwerkweit, deaktiviert"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr "Kalendarfunktionen aktivieren ?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr ""
+"Für mehr Informationen lesen Sie bitte /usr/share/doc/sqwebmail/PCP.html."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr "Ispell Wörterbuch"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+"SqWebMail ermöglicht eine Rechtschreibprüfung der Emails. Bitte wählen Sie "
+"ein passendes Wörterbuch aus."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr ""
+"Wollen Sie das Webmailprogramm zum Ändern von Passwörtern SUID root "
+"installieren ?"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr "Um Passwörter durch die Webmail-Schnittstelle ändern zu können, muß ein Programm zum Ändern der Passwörter mit gesetzten SUID bit installiert werden. Da dieses Programm als root ausgeführt wird, kann dies ernstafte Auswirkungen auf die Sicherheit des Systems haben."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+"(Das Webmail-CGI-Programm braucht nicht länger das Setuid-Bit für root "
+"gesetzt zu haben, da alle Zugriffe auf die Email von Benutzern und die "
+"Konfiguration durch einen Dämon erfolgen. Dieser Dämon wird beim Systemstart "
+"durch /etc/init.d/sqwebmail gestartet.)"
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr "symbolischer Link, Kopie, benutzerdefiniert"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr ""
+"Wie sollen die HTML-Dokumente und Bilder für sqwebmail installiert werden ?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+"Zur Auswahl stehen das Anlegen eines symbolischen Links /var/www/sqwebmail, "
+"das Kopieren aller Dateien von /usr/share/sqwebmail nach /var/www/sqwebmail "
+"oder /var/www unverändert zu lassen. Aus Sicherheitsgründen ist die zweite "
+"Möglichkeit zu bevorzugen. Wenn jedoch bereits FollowSymLinks oder "
+"SymLinksIfOwnerMatch in der Apachekonfiguration aktiviert ist, kann auch die "
+"erste Option gewählt werden. Bei Auswahl von \"custom\" ist manuell für die "
+"korrekte Konfiguration des Webservers zu sorgen."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
+"Bitte beachten Sie, daß /var/www/sqwebmail gelöscht wird, wenn dieses Paket "
+"komplett entfernt wird."
+
+#~ msgid "symlink"
+#~ msgstr "symbolischer Link"
--- courier-0.47.orig/debian/po/nl.po
+++ courier-0.47/debian/po/nl.po
@@ -0,0 +1,414 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: courier 0.42.2-10\n"
+"POT-Creation-Date: 2004-02-27 00:36+0100\n"
+"PO-Revision-Date: 2004-03-17 00:34+0100\n"
+"Last-Translator: Tim Dijkstra <tim@famdijkstra.org>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr "Mappen voor web-gebaseerd beheer aanmaken?"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+"Courier gebruikt verschillende configuratiebestanden die zich in /etc/"
+"courier bevinden. Sommige configuratiebestanden kunnen worden vervangen door "
+"een submap. De bestanden in zo'n map worden achterelkaar geplakt en "
+"beschouwd als één groot configuratiebestand."
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+"Het web-gebaseerd beheer, verzorgd door het courier-webadmin pakket, werkt "
+"alleen met configuratiemappen in plaats van configuratiebestanden. Als u "
+"toestemt worden alle mappen die nodig zijn voor web-gebaseerd beheer "
+"aangemaakt, tenzij het corresponderende gewone bestand al aanwezig is."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr ""
+"De manier van Debian-pakketten maken voor Courier is volledig veranderd"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+"Voorheen werden de courier-imap pakketten gemaakt van de broncode voor "
+"Courier-IMAP die afzonderlijk wordt verspreid. Dit is veranderd, vanaf nu "
+"worden er Debian-pakketten gemaakt voor de hele Courier-suite. De "
+"infrastructuur is daarom sterk veranderd; zo zijn bijvoorbeeld alle "
+"configuratiebestanden verplaatst naar /etc/courier."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr ""
+"Vertel de Debian-ontwikkelaar alstublieft over uw ervaringen met de nieuwe "
+"infrastructuur."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr "Aanmeldingsmethode \"authdaemon\" is nu verplicht."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+"In uw configuratiebestand ${conffile} heeft AUTHMODULES de waarde "
+"\"${authmodules}\". Dit zal niet meer werken omdat authdaemon de enige "
+"beschikbare aanmeldmethode is voor Courier Debian-pakketten van versie 0.35 "
+"en hoger."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr ""
+"U dient uw configuratiebestand aan te passen, anders zal uw configuratie "
+"niet meer werken."
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr "Pad naar de gebruikers Maildir-map"
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+"Dit is een relatief pad van de persoonlijke map van elke gebruiker  naar de "
+"Maildir-map waarin Courier-servers de e-mail van de gebruiker vinden en "
+"opslaan. Zie de maildir(5) man-pagina als u niet bekend bent met het e-mail "
+"opslagformaat dat gebruikt wordt door Courier."
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr "Oude configuratiebestanden naar /etc/courier verplaatsen?"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+"Op uw systeem bevinden zich configuratiebestanden in /etc. Vanaf nu behoren "
+"alle configuratiebestanden gerelateerd aan Courier zich in /etc/courier te "
+"bevinden. Als u dat wilt, worden uw configuratiebestanden verplaatst naar de "
+"nieuwe locatie. We kunnen echter niet garanderen dat ze zullen werken als "
+"tevoren. Lees alstublieft de Courier-documentatie en vertel de Debian-"
+"ontwikkelaar over uw bevindingen met betrekking tot de omzetting."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr "Standaard domein"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+"Geeft u alstublieft een geldige domeinnaam. De meeste functies die headers "
+"herschrijven zullen dit domein toevoegen aan alle e-mailadressen die geen "
+"domeinnaam bevatten, bijvoorbeeld e-mails van accounts op deze machine."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr "\"Van\"-kop voor bezorgingsmededelingen"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+"Geef een geldige waarde voor de \"Van\"-kop voor bezorgingsmededelingen; "
+"anders kunnen ze niet verstuurd worden."
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr "Een SSL-certificaat is vereist"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+"Voor POP en IMAP over SSL is er een geldig, getekend X.509-certificaat "
+"nodig. Tijdens de installatie van courier-pop-ssl respectievelijk courier-"
+"imap-ssl zal, als dat nodig is, een zelf-getekend X.509 certificaat "
+"aangemaakt worden. Voor zakelijk gebruik dient het X.509-certificaat "
+"getekend te worden door een erkende certificaatautoriteit, wil het "
+"geaccepteerd worden door e-mailprogramma's. De standaard locatie voor dit "
+"certificaat is /etc/courier/pop3d.pem respectievelijk /etc/courier/imapd.pem."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr "CGI-programma activeren?"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+"Om het mogelijk te maken dat courier-webadmin direct na installatie werkt, "
+"moeten we het CGI-programma van /usr/lib/courier/courier/webmail/webadmin "
+"naar /usr/lib/cgi-bin/courierwebadmin kopiëren en het SUID-bit aanzetten."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+"Er zijn twee redenen waarom dit niet standaard tijdens de installatie gedaan "
+"wordt. Ten eerste heeft het belangrijke beveiligingsimplicaties, omdat "
+"courierwebadmin draait als root. Ten tweede is er geen garantie dat het "
+"werkt met uw webserver-software en -configuratie."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+"Als u toestemt en uw webserver voldoet aan het Debian-beleid, kunt toegang "
+"krijgen tot het beheer via http://localhost/cgi-bin/courierwebadmin."
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr "Wachtwoord voor het Courier-beheer"
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr "Om toegang te krijgen tot het Courier-beheer is een wachtwoord nodig."
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr "lokaal, netwerk, uitgeschakeld"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr "De kalenderfunctie aanzetten?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+"Geef aan of u de kalenderfunctie op lokale wijze (kies lokaal), groupware "
+"wijze (kies netwerk) of helemaal niet (kies uitgeschakeld) wilt gebruiken. "
+"Om de kalenderfunctie daadwerkelijk op groupware wijze te gebruiken, dient u "
+"het courier-pcp pakket te installeren."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+"De kalenderfunctie gebruiken op lokale wijze heeft maar heel weinig extra "
+"nodig bovenop wat nodig is als u hem niet zou gebruiken;  de groupware-wijze "
+"daarentegen, behoeft een behoorlijke hoeveelheid extra server-middelen."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr "Voor meer informatie, zie /usr/share/doc/sqwebmail/PCP.html."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr "Ispell woordenboek"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+"Het is mogelijk om met SqWebMail uw e-mails te controleren op spelfouten. "
+"Selecteer een geschikt woordenboek voor ispell."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr ""
+"Wilt u dat het programma voor het veranderen van wachtwoorden via webmail "
+"geïnstalleerd wordt met het SUID-bit aan?"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr ""
+"Om het veranderen van wachtwoorden via de webmail-interface mogelijk te "
+"maken moet het programma voor het veranderen van (systeem-)wachtwoorden "
+"geïnstalleerd worden met het SUID-bit aangezet. Omdat deze programma's "
+"uitgevoerd worden als root, heeft dit belangrijke beveiligingsimplicaties."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+"(Het webmail CGI-programma hoeft niet langer setuid root te zijn, omdat de "
+"toegang tot de e-mail en configuratie van de gebruikers nu wordt bemiddeld "
+"door een demon die tijdens opstarten van het systeem door /etc/init.d/"
+"sqwebmail word gestart.)"
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr "koppeling, kopie, aangepast"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr "Hoe wilt u de HTML documenten en plaatjes voor sqwebmail installeren?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+"U kunt kiezen tussen het maken van een symbolische koppeling naar /var/www/"
+"sqwebmail, het kopiëren van alle bestanden van /usr/share/sqwebmail naar /"
+"var/www/sqwebmail en het volledig met rust laten van /var/www. Om "
+"beveiligingsredenen wordt de tweede optie aangeraden. Echter, als u "
+"FollowSymLinks of SymLinksIfOwnerMatch in uw Apache-configuratie al aan "
+"heeft staan, kunt u de eerste optie kiezen. De 'aangepast' optie houd in dat "
+"u uw webserver handmatig moet instellen."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
+"Merk op dat, behalve als u aangepast heeft gekozen, /var/www/sqwebmail zal "
+"worden verwijderd op het moment dat dit pakket wordt gewist (purged)."
--- courier-0.47.orig/debian/po/ru.po
+++ courier-0.47/debian/po/ru.po
@@ -0,0 +1,405 @@
+# translation of courier_0.42.2-9.po to russian
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: courier_0.42.2-9\n"
+"POT-Creation-Date: 2004-02-27 00:36+0100\n"
+"PO-Revision-Date: 2003-10-04 22:45+0600\n"
+"Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
+"Language-Team: russian <debian-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
+"X-Generator: KBabel 1.0.1\n"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Courier ÂÙÌÁ ÐÏÌÎÏÓÔØÀ ÐÅÒÅÓÍÏÔÒÅÎÁ"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+#, fuzzy
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+"÷ ÎÁÞÁÌÅ ÐÁËÅÔ(Ù) courier-imap ÇÅÎÅÒÉÒÏ×ÁÌÉÓØ ÉÚ ÒÁÓÐÒÏÓÔÒÁÎÑÅÍÏÇÏ ÏÔÄÅÌØÎÏ "
+"ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ Courier IMAP. óÅÊÞÁÓ Courier ×ËÌÀÞÅÎ × DebianÃÅÌÉËÏÍ. ÷ "
+"Ó×ÑÚÉ Ó ÜÔÉÍ × ÉÎÆÒÁÓÔÒÕËÔÕÒÅ ÐÒÏÉÚÏÛÌÏ ÍÎÏÖÅÓÔ×Ï ÉÚÍÅÎÅÎÉÊ, ÎÁÐÒÉÍÅÒ, ×ÓÅ "
+"ÆÁÊÌÙ ÎÁÓÔÒÏÅË ÂÙÌÉ ÐÅÒÅÍÅÝÅÎÙ × /etc/courier."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr ""
+"ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÅÌÉÔÅÓØ Ó ×ÅÄÕÝÉÍ ÐÁËÅÔÁ ÷ÁÛÉÍ ÍÎÅÎÉÅÍ Ï ÎÏ×ÏÊ ÉÎÆÒÁÓÔÒÕËÔÕÒÅ "
+"ÐÁËÅÔÏ×."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr "íÅÔÏÄ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ \"authdaemon\" ÓÅÊÞÁÓ ÏÂÑÚÁÔÅÌÅÎ"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+#, fuzzy
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+"÷ ×ÁÛÅÍ ÆÁÊÌÅ ÎÁÓÔÒÏÅË ${conffile} ÚÎÁÞÅÎÉÅ AUTHMODULES ÕÓÔÁÎÏ×ÌÅÎÏ × "
+"\"${authmodules}\". üÔÏ ÂÏÌØÛÅ ÎÅ ÒÁÂÏÔÁÅÔ, ÔÁË ËÁË ÄÌÑ Debian-ÐÁËÅÔÏ× "
+"Courier ×ÅÒÓÉÉ 0.35 É ×ÙÛÅ ÄÏÓÔÕÐÅÎ ÔÏÌØËÏ ÍÅÔÏÄ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ authdaemon."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr ""
+"ðÏÐÒÁ×ØÔÅ ÆÁÊÌ ÎÁÓÔÒÏÅË, ÉÎÁÞÅ ÷ÁÛÉ ÕÓÔÁÎÏ×ËÉ ÂÏÌØÛÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ."
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr "õÄÁÌÉÔØ ÓÔÁÒÙÅ ÆÁÊÌÙ ÎÁÓÔÒÏÅË × /etc/courier?"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+"íÙ ÏÐÒÅÄÅÌÉÌÉ, ÞÔÏ × /etc ÅÓÔØ ÓÔÁÒÙÅ ÆÁÊÌÙ ÎÁÓÔÒÏÅË courier-imap. ÷ ÄÁÎÎÏÍ "
+"ÐÁËÅÔÅ ×ÓÅ ÆÁÊÌÙ ÎÁÓÔÒÏÅË Courier ÒÁÚÍÅÝÁÀÔÓÑ × /etc/courier. åÓÌÉ ×Ù "
+"ÈÏÔÉÔÅ, ÍÙ ÐÅÒÅÍÅÓÔÉÍ ÆÁÊÌÙ ÎÁÓÔÒÏÅË × ÎÏ×ÏÅ ÍÅÓÔÏ. ïÄÎÁËÏ, ÍÙ ÎÅ "
+"ÇÁÒÁÎÔÉÒÕÅÍ, ÞÔÏ ÏÎÉ ÎÅ ÎÁÒÕÛÁÔ ÒÁÂÏÔÕ. ïÂÒÁÔÉÔÅÓØ Ë ÄÏËÕÍÅÎÔÁÃÉÉ ÐÏ  "
+"Courier É ÐÏÏÂÝÁÊÔÅÓØ Ó ÓÏÐÒÏ×ÏÖÄÁÀÝÉÍ ÐÁËÅÔÁ ÎÁ ÔÅÍÕ ×ÁÛÉÈ ÜËÓÐÅÒÉÍÅÎÔÏ× ÐÏ "
+"ÐÒÅÏÂÒÁÚÏ×ÁÎÉÀ ÓÔÁÒÙÈ ÆÁÊÌÏ× ÎÁÓÔÒÏÅË."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr "äÏÍÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+"ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÐÒÁ×ÉÌØÎÙÊ ÐÏÞÔÏ×ÙÊ ÄÏÍÅÎ. âÏÌØÛÉÎÓÔ×Ï ÆÕÎËÃÉÊ "
+"ÐÅÒÅÚÁÐÉÓÉ ÚÁÇÏÌÏ×ËÏ× ÂÕÄÕÔ ÄÏÂÁ×ÌÑÔØ ÜÔÏÔ ÄÏÍÅÎ ËÏ ×ÓÅÍ ÁÄÒÅÓÁÍ ÜÌÅËÔÒÏÎÎÏÊ "
+"ÐÏÞÔÙ, × ËÏÔÏÒÙÈ ÄÏÍÅÎ ÎÅ ÕËÁÚÁÎ, ÎÁÐÒ., Ë ÐÏÞÔÅ, ÏÔÐÒÁ×ÌÑÅÍÏÊ Ó ÕÞÅÔÎÙÈ "
+"ÚÁÐÉÓÅÊ ÎÁ ÜÔÏÊ ÍÁÛÉÎÅ."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr "úÁÇÏÌÏ×ÏË \"From\" ÄÌÑ Õ×ÅÄÏÍÌÅÎÉÊ Ï ÄÏÓÔÁ×ËÅ"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+"õËÁÖÉÔÅ   ÐÒÁ×ÉÌØÎÏÅ  ÚÎÁÞÅÎÉÅ  ÚÁÇÏÌÏ×ËÁ  \"From\"  ÄÌÑ  Õ×ÅÄÏÍÌÅÎÉÊ  Ï "
+"ÄÏÓÔÁ×ËÅ ÐÏÞÔÙ. ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÏÎÉ ÎÅ ÂÕÄÕÔ ÄÏÓÔÁ×ÌÑÔØÓÑ."
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr "ôÒÅÂÕÅÔÓÑ ÓÅÒÔÉÆÉËÁÔ SSL"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+"POP É IMAP ÐÏ×ÅÒÈ SSL ÔÒÅÂÕÀÔ ×ÁÌÉÄÎÙÊ É ÐÏÄÐÉÓÁÎÎÙÊ ÓÅÒÔÉÆÉËÁÔ X.509. ÷   "
+"ÔÅÞÅÎÉÅ ÕÓÔÁÎÏ×ËÉ courier-pop-ssl É courier-imap-ssl ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÂÕÄÅÔ "
+"ÓÇÅÎÅÒÉÒÏ×ÁÎ ÓÅÒÔÉÆÉËÁÔ X.509. ïÄÎÁËÏ, ÞÔÏÂÙ ÐÏÞÔÏ×ÙÅ ËÌÉÅÎÔÙ ÐÒÉÎÑÌÉ "
+"ÓÅÒÔÉÆÉËÁÔ, ÏÎ ÄÏÌÖÅÎ ÂÙÔØ ÐÏÄÐÉÓÁÎ ÉÚ×ÅÓÔÎÙÍ ÕÚÌÏÍ Á×ÔÏÒÉÚÁÃÉÉ. ðÏ "
+"ÕÍÏÌÞÁÎÉÀ ÓÅÒÔÉÆÉËÁÔÙ ÒÁÚÍÅÝÁÀÔÓÑ × /etc/courier/pop3d.pem ÉÌÉ /etc/courier/"
+"imapd.pem."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr "áËÔÉ×ÉÒÏ×ÁÔØ CGI-ÓÃÅÎÁÒÉÉ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+"äÌÑ ÐÒÁ×ÉÌØÎÏÊ ÒÁÂÏÔÙ courier-webadmin ÎÕÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ ÅÇÏ ÉÚ ËÁÔÁÌÏÇÁ /"
+"usr/lib/courier/courier/webmail/webadmin × ËÁÔÁÌÏÇ /usr/lib/cgi-bin Ó "
+"ÕÓÔÁÎÏ×ÌÅÎÎÙÍ ÂÉÔÏÍ SUID."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+"åÓÔØ Ä×Å ÐÒÉÞÉÎÙ, ÐÏ ËÏÔÏÒÙÍ ÜÔÏ ÎÅ ÄÅÌÁÅÔÓÑ ×Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ. ÷Ù-ÐÅÒ×ÙÈ, "
+"ÜÔÏ ÓÅÒØÅÚÎÁÑ ÕÇÒÏÚÁ ÂÅÚÏÐÁÓÎÏÓÔÉ, ÐÏÓËÏÌØËÕ courierwebadmin ÒÁÂÏÔÁÅÔ ÏÔ "
+"root. ÷Ï-×ÔÏÒÙÈ, ÒÁÂÏÔÏÓÐÏÓÏÂÎÏÓÔØ ÎÅ ÇÁÒÁÎÔÉÒÕÅÔÓÑ, ÐÏÓËÏÌØËÕ ÚÁ×ÉÓÉÔ ÏÔ ðï "
+"×ÅÂ-ÓÅÒ×ÅÒÁ É ÅÇÏ ÎÁÓÔÒÏÊËÉ."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr "ðÁÒÏÌØ ÄÌÑ ÁÄÍÉÎÉÓÔÒÁÔÏÒÁ Courier"
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr "äÌÑ ÁÄÍÉÎÉÓÔÒÉÒÏ×ÁÎÉÑ Courier ÎÕÖÎÏ ÚÁÄÁÔØ ÐÁÒÏÌØ ÁÄÍÉÎÉÓÔÒÁÔÏÒÁ."
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr "ÌÏËÁÌØÎÙÊ, ÓÅÔÅ×ÏÊ, ÚÁÐÒÅÝÅÎ"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr "òÁÚÒÅÛÉÔØ ËÁÌÅÎÄÁÒØ?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+"õËÁÖÉÔÅ, ÈÏÔÉÔÅ ÌÉ ÷Ù ÚÁÐÕÓËÁÔØ ËÁÌÅÎÄÁÒØ × ÌÏËÁÌØÎÏÍ ÒÅÖÉÍÅ (ÕËÁÖÉÔÅ "
+"ÌÏËÁÌØÎÙÊ), ÇÒÕÐÐÏ×ÏÍ ÒÅÖÉÍÅ (ÕËÁÖÉÔÅ ÓÅÔÅ×ÏÊ) ÉÌÉ ÎÅ ÄÌÑ ×ÓÅÈ (ÕËÁÖÉÔÅ "
+"ÚÁÐÒÅÝÅÎ). þÔÏÂÙ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÇÒÕÐÐÏ×ÙÍ ÒÅÖÉÍÏÍ, ÎÕÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ "
+"courier-pcp."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+"ìÏËÁÌØÎÙÊ ÒÅÖÉÍ ÐÏ ÓÒÁ×ÎÅÎÉÀ Ó ÒÅÖÉÍÏÍ ÎÅ ÄÌÑ ×ÓÅÈ ÓÏÚÄÁÅÔ ÎÅÍÎÏÇÏ ÂÏÌØÛÕÀ "
+"ÎÁÇÒÕÚËÕ, ÎÏ ÇÒÕÐÐÏ×ÏÊ ÒÅÖÉÍ ÐÏÒÅÂÌÑÅÔ ÓÕÝÅÓÔ×ÅÎÎÏ ÂÏÌØÛÅ ÒÅÓÕÒÓÏ×. åÓÌÉ ÷Ù "
+"×ÙÂÒÁÌÉ ÇÒÕÐÐÏ×ÏÊ ÒÅÖÉÍ, ÔÏ ÂÄÅÔ ÚÁÐÕÝÅÎ ÄÅÍÏÎ × ÏÔÄÅÌØÎÏÍ ÐÒÏÃÅÓÓÅ."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr "ðÏÄÒÏÂÎÏÓÔÉ × /usr/share/doc/sqwebmail/PCP.html."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr "óÌÏ×ÁÒØ Ispell "
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+"SqWebMail ÐÏÚ×ÏÌÑÅÔ ÐÒÏ×ÅÒÑÔØ ÏÒÆÏÇÒÁÆÉÀ × ÷ÁÛÉÈ ÐÉÓØÍÁÈ. ÷ÙÂÅÒÉÔÅ "
+"ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ÓÌÏ×ÁÒØ ÄÌÑ ispell."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+#, fuzzy
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr "èÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ ÂÉÔ SUID ÄÌÑ ÐÒÏÇÒÁÍÍÙ ×ÅÂ-ÐÏÞÔÙ?"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+#, fuzzy
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr ""
+"äÌÑ ËÏÒÅËÔÎÏÊ ÒÁÂÏÔÙ CGI-ÐÒÏÇÒÁÍÍÁ ×ÅÂ-ÐÏÞÔÙ É ÐÒÏÇÒÁÍÍÁ ÉÚÍÅÎÅÎÉÑ "
+"(ÓÉÓÔÅÍÎÙÈ) ÐÁÒÏÌÅÊ ÄÏÌÖÎÙ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÙ Ó ÂÉÔÏÍ SUID. ðÏÓËÏÌØËÕ "
+"ÐÒÏÇÒÁÍÍÙ ×ÙÐÏÌÎÑÀÔÓÑ ÏÔ root, ÜÔÏ ÓÅÒØÅÚÎÁÑ ÕÇÒÏÚÁ ÂÅÚÏÐÁÓÎÏÓÔÉ."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr "ÓÉÍÌÉÎË, ËÏÐÉÒÏ×ÁÔØ, ÐÏ Ó×ÏÅÍÕ"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr "ëÁË ÕÓÔÁÎÏ×ÉÔØ ÄÏËÕÍÅÎÔÙ HTML É ËÁÒÔÉÎËÉ ÄÌÑ sqwebmail ?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+"÷ÙÂÅÒÉÔÅ, ÓÏÚÄÁÔØ ÌÉ ÓÉÍ×ÏÌÉÞÅÓËÕÀ ÓÓÙÌËÕ ÎÁ /var/www/sqwebmail, ÓËÏÐÉÒÏ×ÁÔØ "
+"×ÓÅ ÆÁÊÌÙ ÉÚ /usr/share/sqwebmail × /var/www/sqwebmail ÉÌÉ ÏÓÔÁ×ÉÔØ /var/www "
+"ËÁË ÅÓÔØ. ðÏ ÓÏÏÂÒÁÖÅÎÉÑÍ ÂÅÚÏÐÁÓÎÏÓÔÉ ÒÅËÏÍÅÎÄÕÅÔÓÑ ×ÔÏÒÏÅ. ïÄÎÁËÏ, ÅÓÌÉ ÷Ù "
+"×ËÌÀÞÉÌÉ ÏÐÃÉÉ FollowSymLinksÉÌÉ SymLinksIfOwnerMatch × ×ÁÛÅÊ ÎÁÓÔÒÏÊËÅ "
+"Apache, ÔÏ ÍÏÖÅÔÅ ×ÙÂÒÁÔØ ÐÅÒ×ÕÀ ÏÐÃÉÀ. ïÐÃÉÑ \"ÐÏ Ó×ÏÅÍÕ\" ÐÏÄÒÁÚÕÍÅ×ÁÅÔ, "
+"ÞÔÏ ÷Ù ÎÁÓÔÒÏÉÔÅ Ó×ÏÊ ×ÅÂ-ÓÅÒ×ÅÒ ×ÒÕÞÎÕÀ."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
+"ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ËÁÔÁÌÏÇ /var/www/sqwebmail ÂÕÄÅÔ ÕÄÁÌÅÎ, ÅÓÌÉ ÜÔÏÔ ÐÁËÅÔ "
+"ÕÎÉÞÔÏÖÁÅÔÓÑ, ÚÁ ÉÓËÌÀÞÅÎÉÅÍ ÷ÁÛÉÈ ÉÚÍÅÎÅÎÉÊ."
+
+#~ msgid "Which is the directory name of the user's maildir ?"
+#~ msgstr "ëÁËÏ×Ï ÉÍÑ ËÁÔÁÌÏÇÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÇÏ maildir ?"
+
+#~ msgid ""
+#~ "You change the setting for the directory name in the user's home "
+#~ "directory where the Courier POP and IMAP servers locate the user's "
+#~ "maildir."
+#~ msgstr ""
+#~ "÷Ù ÉÚÍÅÎÑÅÔÅ ÎÁÓÔÒÏÊËÉ ÄÌÑ ÉÍÅÎÉ ËÁÔÁÌÏÇÁ × ÄÏÍÁÛÎÅÍ ËÁÔÁÌÏÇÅ "
+#~ "ÐÏÌØÚÏ×ÁÔÅÌÑ, ÇÄÅ ÓÅÒ×ÅÒÁ Courier POP É IMAP ÒÁÚÍÅÝÁÀÔ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ "
+#~ "maildir."
--- courier-0.47.orig/debian/po/templates.pot
+++ courier-0.47/debian/po/templates.pot
@@ -0,0 +1,335 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-27 00:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
--- courier-0.47.orig/debian/po/tr.po
+++ courier-0.47/debian/po/tr.po
@@ -0,0 +1,399 @@
+# Turkish translation of courier.
+# This file is distributed under the same license as the courier package.
+# Mehmet TÃ¼rker <mturker@innova.com.tr>, 2004. 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: courier\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-11 11:27+0000\n"
+"PO-Revision-Date: 2004-06-01 09:42+0300\n"
+"Last-Translator: Mehmet TÃ¼rker <mturker@innova.com.tr>\n"
+"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=1; plural=0;"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid "Create directories for web-based administration ?"
+msgstr "Web-tabanlÄ± yÃ¶netim iÃ§in dizinler yaratÄ±lsÄ±n mÄ±?"
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"Courier uses several configuration files which are located in /etc/courier. "
+"Some configuration files can be replaced by a subdirectory where all files "
+"insides this directory are concatenated and considered to be a single, "
+"consolidated, configuration file."
+msgstr ""
+"Courier, /etc/courier iÃ§inde bulunan birden fazla yapÄ±landÄ±rma dosyasÄ± "
+"kullanÄ±r. BazÄ± yapÄ±landÄ±rma dosyalarÄ± bÃ¼tÃ¼nleÅŸtirilmiÅŸ tek bir yapÄ±landÄ±rma "
+"dosyasÄ±na sahip bulunan tek bir alt dizin ile deÄŸiÅŸtirilebilir."
+
+#. Type: boolean
+#. Description
+#: ../courier-base.templates:4
+msgid ""
+"The web-based administration provided by the courier-webadmin package relies "
+"on configuration directories instead of configuration files.  If you agree, "
+"any directories needed for the web-based administration tool will be created "
+"unless there is already a plain file in place."
+msgstr ""
+"courier-webadmin paketi tarafÄ±ndan saÄŸlanan web-tabanlÄ± yÃ¶netim sistemi, "
+"yapÄ±landÄ±rma dosyalarÄ± yerine yapÄ±landÄ±rma dizinleri kullanÄ±r. EÄŸer bunu "
+"onaylarsanÄ±z, web-tabanlÄ± yÃ¶netim aracÄ± iÃ§in gerekli olan dizinler (halihazÄ±rda "
+"bunlarÄ±n yerinde bir dosya yok ise) yaratÄ±lacak."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid "Packaging of Courier has been completely revised"
+msgstr "Courier'in paketlenmesi tamamen gÃ¶zden geÃ§irilip dÃ¼zeltildi."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Formerly the courier-imap package(s) are generated from the separately "
+"distributed Courier IMAP sources. This has changed, and now the entire "
+"Courier suite gets packaged for Debian. For this reason, the infrastructure "
+"has changed a lot; for example, all configuration files have been moved to /"
+"etc/courier."
+msgstr ""
+"Eskiden courier-imap paket(ler)i ayrÄ± ayrÄ± daÄŸÄ±tÄ±lan Courier IMAP kaynaklarÄ±ndan "
+"Ã¼retilirdi. Bu deÄŸiÅŸti ve artÄ±k bÃ¼tÃ¼n Courier suiti Debian iÃ§in paketleniyor. "
+"Bu sebeple, altyapÄ± sistemi Ã§ok deÄŸiÅŸti, Ã¶rnek olarak bÃ¼tÃ¼n yapÄ±landÄ±rma dosyalarÄ± "
+"/etc/courier dizinine taÅŸÄ±ndÄ±."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:18
+msgid ""
+"Please tell the maintainer about your experiences with the new "
+"infrastructure."
+msgstr ""
+"LÃ¼tfen yeni altyapÄ± sistemiyle ilgili deneyimlerinizi paket "
+"geliÅŸtiricisine bildirin."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid "Authentification method \"authdaemon\" is mandatory now"
+msgstr "Yetkilendirme yÃ¶ntemi \"authdaemon\" artÄ±k zorunlu"
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"In your configuration file ${conffile} AUTHMODULES is set to \"${authmodules}"
+"\". This will no longer work as authdaemon is the only available "
+"authentication method for Courier Debian packages version 0.35 and above."
+msgstr ""
+"YapÄ±landÄ±rma dosyanÄ±z ${conffile} iÃ§inde AUTHMODULES \"${authmodules}\" olarak "
+"ayarlanmÄ±ÅŸ. SÃ¼rÃ¼m 0.35 ve Ã¼zeri Courier Debian paketleri iÃ§in mevcut olan "
+"yetkilendirme yÃ¶ntemi sadece authdaemon olduÄŸundan bu ayar artÄ±k Ã§alÄ±ÅŸmayacak."
+
+#. Type: note
+#. Description
+#: ../courier-base.templates:30
+msgid ""
+"Please fix your configuration file, otherwise your setup will no longer work."
+msgstr ""
+"LÃ¼tfen yapÄ±landÄ±rma dosyanÄ±zÄ± dÃ¼zeltin, yoksa yaptÄ±ÄŸÄ±nÄ±z ayar artÄ±k Ã§alÄ±ÅŸmayacak."
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid "Path to user's Maildir directory"
+msgstr "KullanÄ±cÄ±nÄ±n Maildir dizinini tanÄ±mlayan dosya yolu (path)"
+
+#. Type: string
+#. Description
+#: ../courier-base.templates:42
+msgid ""
+"This is a relative path name from each user's home directory to the Maildir "
+"directory where the Courier servers store and access the user's email. "
+"Please refer to the maildir(5) manual page if you are unfamiliar with the "
+"mail storage format used by Courier."
+msgstr ""
+"Bu, Courier sunucularÄ±nÄ±n, kullanÄ±cÄ±nÄ±n e-postasÄ±na ulaÅŸacaÄŸÄ± ve saklayacaÄŸÄ± "
+"Maildir dizinine her kullanÄ±cÄ±nÄ±n ev dizininden ulaÅŸÄ±lan gÃ¶receli dosya yoludur. "
+"EÄŸer Courier'Ä±n kullandÄ±ÄŸÄ± posta saklama dÃ¼zenine alÄ±ÅŸÄ±k deÄŸilseniz lÃ¼tfen "
+"maildir(5) kÄ±lavuz sayfasÄ±na baÅŸvurun."
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid "Move old configuration files to /etc/courier ?"
+msgstr "Eski yapÄ±landÄ±rma dosyalarÄ± /etc/courier'a taÅŸÄ±nsÄ±n mÄ±?"
+
+#. Type: boolean
+#. Description
+#: ../courier-imap.templates:4
+msgid ""
+"On your system are courier-imap configuration files within /etc. From now on "
+"all configuration files related to Courier are located within /etc/courier. "
+"If you like, we move the configuration files to the new location. However, "
+"we cannot guarantee that they will work as before. Please refer to the "
+"Courier documentation and tell the maintainer about your experiences with "
+"the conversion."
+msgstr ""
+"Sisteminizde courier-imap yapÄ±landÄ±rma dosyalarÄ± /etc iÃ§inde. Åžu andan itibaren "
+"Courier ile ilgili tÃ¼m yapÄ±landÄ±rma dosyalarÄ± /etc/courier dizininde bulunacak. "
+"EÄŸer isterseniz yapÄ±landÄ±rma dosyalarÄ±nÄ± yeni yerine taÅŸÄ±rÄ±z. Bununla beraber daha "
+"Ã¶nceki gibi Ã§alÄ±ÅŸacaklarÄ±nÄ± garanti edemeyiz. LÃ¼tfen Courier belgelerine baÅŸvurun "
+"ve paket geliÅŸtiricisini deÄŸiÅŸiklikle ilgili deneyimleriniz hakkÄ±nda bilgilendirin."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid "Default domain"
+msgstr "Ã–ntanÄ±mlÄ± etki alanÄ±"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:3
+msgid ""
+"Please specify a valid email domain. Most header rewriting functions will "
+"append this domain to all email addresses which do not specify a domain, e."
+"g. emails from accounts on this machine."
+msgstr ""
+"LÃ¼tfen geÃ§erli bir e-posta etki alanÄ± belirtin. Etki alanÄ± belirtilmemiÅŸ bÃ¼tÃ¼n "
+"e-posta adresleri (Ã¶r. bu makinedeki hesaplar) bu etki alanÄ± ile kullanÄ±lacaktÄ±r."
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid "\"From\" Header for Delivery Notifications"
+msgstr "Teslimat uyarÄ±larÄ± iÃ§in \"Kimden\" BaÅŸlÄ±ÄŸÄ±"
+
+#. Type: string
+#. Description
+#: ../courier-mta.templates:10
+msgid ""
+"Please specify a valid value for the \"From\" Header for mail delivery "
+"notifications. Otherwise these cannot be send."
+msgstr ""
+"LÃ¼tfen teslimat uyarÄ±larÄ± iÃ§in geÃ§erli bir \"Kimden\" BaÅŸlÄ±ÄŸÄ± belirtin. "
+"Yoksa bunlar gÃ¶nderilemez."
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid "SSL certificate required"
+msgstr "SSL sertifikasÄ± gerekli"
+
+#. Type: note
+#. Description
+#: ../courier-ssl.templates:3
+msgid ""
+"POP and IMAP over SSL requires a valid, signed, X.509 certificate. During "
+"the installation of courier-pop-ssl resp. courier-imap-ssl a self-signed "
+"X.509 certificate will be generated if necessary. For production use the "
+"X.509 certificate must be signed by a recognized certificate authority, in "
+"order for mail clients to accept the certificate. The default locations for "
+"this certificate is /etc/courier/pop3d.pem resp. /etc/courier/imapd.pem."
+msgstr ""
+"POP ve SSL Ã¼zerinden IMAP, geÃ§erli ve imzalanmÄ±ÅŸ bir X.509 sertifikasÄ± gerektirir. "
+"Courier-pop-ssl kurulumu sÄ±rasÄ±nda eÄŸer gerekliyse bir self-signed X.509 sertifikasÄ± "
+"Ã¼retilecektir. GerÃ§ek ortam kullanÄ±mÄ± iÃ§in X.509 sertifikasÄ± (e-posta istemcileri "
+"tarafÄ±ndan kabul edilebilmesi iÃ§in) tanÄ±nmÄ±ÅŸ bir sertifika otoritesi tarafÄ±ndan "
+"imzalanmÄ±ÅŸ olmalÄ±dÄ±r. Bu sertifika iÃ§in Ã¶ntanÄ±mlÄ± dizin /etc/courier/pop3d.pem ve "
+"/etc/courier/imapd.pem dizinleridir."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid "Activate CGI Program ?"
+msgstr "CGI UygulamasÄ± etkin kÄ±lÄ±nsÄ±n mÄ± ?"
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"To allow courier-webadmin to work out of the box, we need to copy the CGI "
+"program from /usr/lib/courier/courier/webmail/webadmin to /usr/lib/cgi-bin/"
+"courierwebadmin and set the SUID bit."
+msgstr ""
+"Courier-webadmin'in dÄ±ÅŸarÄ±dan Ã§alÄ±ÅŸabilmesi iÃ§in CGI uygulamasÄ±nÄ±n "
+"/usr/lib/courier/webmail/webadmin dizininden /usr/lib/cgi-bin/courierwebadmin "
+"dizinine taÅŸÄ±nmasÄ± ve SUID bitinin etkinleÅŸtirilmesi gerekmektedir."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"There are two reasons why this is not done by default during the "
+"installation. First it has serious security implications, because "
+"courierwebadmin runs as root. Second it is not guaranteed to work depending "
+"on your web server software and its configuration."
+msgstr ""
+"Bunun Ã¶ntanÄ±mlÄ± olarak kurulum sÄ±rasÄ±nda gerÃ§ekleÅŸtirilmemesinin iki nedeni var. "
+"Birincisi, bu gÃ¼venlik aÃ§Ä±sÄ±ndan ciddi sonuÃ§lar doÄŸurur; Ã§Ã¼nkÃ¼ courierwebadmin "
+"root olarak Ã§alÄ±ÅŸtÄ±rÄ±lÄ±r. Ä°kincisi ise kullandÄ±ÄŸÄ±nÄ±z web sunucusu ve bunun "
+"yapÄ±landÄ±rmasÄ±na baÄŸlÄ± olarak Ã§alÄ±ÅŸmasÄ± garanti deÄŸildir."
+
+#. Type: boolean
+#. Description
+#: ../courier-webadmin.templates:4
+msgid ""
+"If you agree here and your web server setup is compliant with the Debian "
+"policy, you can access the administration frontend through http://localhost/"
+"cgi-bin/courierwebadmin."
+msgstr ""
+""
+"EÄŸer bu yapÄ±landÄ±rma seÃ§eneÄŸini onaylamÄ±ÅŸ ve web sunucunuz Debian ilkelerine uygun "
+"ÅŸekilde yapÄ±landÄ±rÄ±lmÄ±ÅŸ durumdaysa, yÃ¶netim Ã¶nyÃ¼zÃ¼ne http://localhost/cgi-bin/"
+"courierwebadmin Ã¼zerinden ulaÅŸabilirsiniz."
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "Password for the Courier Administration"
+msgstr "Courier YÃ¶netimi iÃ§in parola"
+
+#. Type: password
+#. Description
+#: ../courier-webadmin.templates:20
+msgid "To access the Courier administration a password is needed."
+msgstr "Courier yÃ¶netimine ulaÅŸmak iÃ§in parola gereklidir."
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:3
+msgid "local, net, disabled"
+msgstr "yerel, aÄŸ, etkisiz"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid "Enable Calendaring ?"
+msgstr "Takvim etkin kÄ±lÄ±nsÄ±n mÄ±?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Please specify if you would like to enable calendaring in local mode (choose "
+"local), groupware mode (choose net) or not at all (choose disabled). To "
+"actually using the groupware mode, you need to install the courier-pcp "
+"package."
+msgstr ""
+"LÃ¼tfen takvimlendirmeyi etkinleÅŸtirmek istediÄŸiniz kipi seÃ§in: yerel kip "
+"(yerel seÃ§eneÄŸi), grup kipi (aÄŸ seÃ§eneÄŸi), ya da hiÃ§biri (etkisiz seÃ§eneÄŸi). "
+"Grup kipini kullanmak iÃ§in courier-pcp paketini kurmanÄ±z gerekir."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"Local mode requires very little overhead compared to not using calendaring "
+"at all, but groupware mode requires a substantial additional amount of "
+"server resources. If you select the groupware mode, a separate daemon "
+"process will be run."
+msgstr ""
+"Yerel kip takvimlendirmeye gÃ¶re Ã§ok az iÅŸ gerektirir, fakat grup kipi Ã¶nemli "
+"Ã¶lÃ§Ã¼de ek sunucu kaynaÄŸÄ± gerektirir. EÄŸer grup kipini seÃ§erseniz, ayrÄ± bir "
+"sunucu sÃ¼reci Ã§alÄ±ÅŸtÄ±rÄ±lacaktÄ±r."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:5
+msgid ""
+"For more information, please refer to /usr/share/doc/sqwebmail/PCP.html."
+msgstr ""
+"Daha fazla bilgi iÃ§in, lÃ¼tfen /usr/share/doc/sqwebmail/PCP.html'ye bakÄ±n."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid "Ispell Dictionary"
+msgstr "Ispell SÃ¶zlÃ¼ÄŸÃ¼"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:22
+msgid ""
+"SqWebMail allows you to spellcheck your emails. Please select an appropriate "
+"dictionary for ispell."
+msgstr ""
+"SqWebMail e-postalarÄ±nÄ±za yazÄ±m denetimi yapmanÄ±zÄ± saÄŸlar. LÃ¼tfen ispell iÃ§in "
+"uygun bir sÃ¶zlÃ¼k seÃ§in."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid "Do you want the webmail password changer to be installed SUID root ?"
+msgstr "Webmail parola deÄŸiÅŸtiricisinin SUID root olarak kurulmasÄ±nÄ± ister misiniz?"
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"For changing passwords through the webmail interface to work, a program to "
+"change (system) passwords has to be installed with the SUID bit set. Because "
+"this program runs as root, this has serious security implications."
+msgstr ""
+"Webmail Ã¼zerinden parola deÄŸiÅŸtirme iÅŸleminin Ã§alÄ±ÅŸabilmesi iÃ§in sistem parolalarÄ±nÄ± "
+"deÄŸiÅŸtirmek iÃ§in gereken uygulama SUID biti etkinleÅŸtirilmiÅŸ ÅŸekilde kurulmalÄ±dÄ±r. "
+"Ã‡Ã¼nkÃ¼ bu uygulama root olarak Ã§alÄ±ÅŸÄ±r ve bu da ciddi anlamda gÃ¼venlik gerektirir."
+
+#. Type: boolean
+#. Description
+#: ../sqwebmail.templates:29
+msgid ""
+"(The webmail CGI program itself no longer has to be setuid root, since "
+"accesses to users' mail and configs are now mediated by a daemon started "
+"during system startup by /etc/init.d/sqwebmail.)"
+msgstr ""
+"(Webmail CGI uygulamasÄ±nÄ±n kendisi artÄ±k root olarak Ã§alÄ±ÅŸmak zorunda deÄŸildir. "
+"Ã‡Ã¼nkÃ¼ kullanÄ±cÄ±nÄ±n e-posta ve yapÄ±landÄ±rma dosyalarÄ±na eriÅŸimler artÄ±k sistem "
+"baÅŸlangÄ±cÄ±nda /etc/init.d/sqwebmail tarafÄ±ndan baÅŸlatÄ±lan bir sunucu tarafÄ±ndan "
+"yÃ¶netilmektedir."
+
+#. Type: select
+#. Choices
+#: ../sqwebmail.templates:40
+msgid "symlink, copy, custom"
+msgstr "sembolik baÄŸla, kopyala, Ã¶zel"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"How to you want to install the HTML documents and images for sqwebmail ?"
+msgstr ""
+"Sqwebmail iÃ§in HTML belgeleri ve gÃ¶rÃ¼ntÃ¼lerinin nasÄ±l kurulmasÄ±nÄ± istersiniz?"
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"The choices are to create a symbolic link /var/www/sqwebmail, copy all files "
+"from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www alone. For "
+"security reasons the second option is recommended. However, if you have "
+"already enabled FollowSymLinks or SymLinksIfOwnerMatch in your Apache "
+"configuration, you may as well chose the first option. The custom option "
+"implies that you configure your web server manually."
+msgstr ""
+"SeÃ§enekler ÅŸu ÅŸekildedir: /var/www/sqwebmail'a sembolik baÄŸ yarat, bÃ¼tÃ¼n "
+"dosyalarÄ± /usr/share/sqwebmail dizininden /var/www/sqwebmail dizinine kopyala "
+"veya /var/www'yi kendi baÅŸÄ±na bÄ±rak. GÃ¼venlik gerekÃ§eleriyle ikinci seÃ§enek "
+"tavsiye edilir. Bununla beraber eÄŸer Apache yapÄ±landÄ±rmanÄ±zda FollowSymLinks'i "
+"veya SymLinksIfOwnerMatch'i etkin kÄ±ldÄ±ysanÄ±z, ilk seÃ§eneÄŸi de seÃ§ebilirsiniz. "
+"\"Ã¶zel\" seÃ§eneÄŸi web sunucunuzu elle yapÄ±landÄ±racaÄŸÄ±nÄ±z anlamÄ±na gelmektedir."
+
+#. Type: select
+#. Description
+#: ../sqwebmail.templates:42
+msgid ""
+"Please note that /var/www/sqwebmail will be removed if this package is "
+"purged except you choose custom."
+msgstr ""
+"Kurulumda \"Ã¶zel\"i seÃ§miÅŸ olmanÄ±z durumu hariÃ§, bu paket kaldÄ±rÄ±lÄ±rken "
+"/var/www/sqwebmail'in silineceÄŸini unutmayÄ±n."
+
--- courier-0.47.orig/debian/sqwebmail.html
+++ courier-0.47/debian/sqwebmail.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>SqWebMail Documentation</title>
+</head>
+
+<body text="#000000" bgcolor="#FFFFFF" link="#0000EE" vlink="#551A8B"
+alink="#FF0000" lang="en">
+
+<h1>SqWebMail Documentation</h1>
+
+<ul>
+<li><a href="SECURITY.html">SqWebMail Security</a>
+<li><a href="GPG.html">GnuPG support in SqWebMail</a>
+<li><a href="PCP.html">Calendaring in SqWebMail</a>
+<li><a href="README.Debian">Debian Specific Notes</a>
+</ul>
+</body>
+</html>
--- courier-0.47.orig/debian/sqwebmail.init
+++ courier-0.47/debian/sqwebmail.init
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+#
+# Copyright 2003,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+DAEMON=/usr/sbin/webmaild
+
+# stop if the sqwebmail package has been removed
+if ! [ -x $DAEMON ]; then
+	exit 0
+fi
+
+case "$1" in
+start)
+	# Start webmail daemon
+	echo -n "Starting Courier webmail daemon: "
+	$DAEMON start
+    echo "done."
+	;;
+stop)
+	# Stop webmail daemon
+	echo -n "Stopping Courier webmail daemon: "
+	$DAEMON stop
+	echo "done."
+	;;
+restart | reload | force-reload)
+    $0 stop
+    $0 start
+    ;;
+*)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
--- courier-0.47.orig/debian/sqwebmail.pam
+++ courier-0.47/debian/sqwebmail.pam
@@ -0,0 +1,4 @@
+auth		required       pam_unix.so	nullok
+account		required       pam_unix.so
+password	required       pam_unix.so
+
--- courier-0.47.orig/debian/sqwebmail.postinst
+++ courier-0.47/debian/sqwebmail.postinst
@@ -0,0 +1,62 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001,2002,2003,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ]; then
+	
+	#Seems that this should be done at compile time?
+	cp -p /usr/lib/courier/courier/webmail/webmail /usr/lib/cgi-bin/sqwebmail
+
+	db_get sqwebmail/install-www
+	if [ "$RET" = "symlink" ]; then
+		db_get sqwebmail/install-www-backup
+		if [ "$RET" = "copy" ]; then
+			rm -rf /var/www/sqwebmail
+		elif [ "$RET" = "symlink" ]; then
+			rm -f /var/www/sqwebmail
+		fi
+		ln -sf /usr/share/sqwebmail /var/www/sqwebmail
+	elif [ "$RET" = "copy" ]; then
+		if [ "$RET" = "copy" ]; then
+			rm -rf /var/www/sqwebmail
+		elif [ "$RET" = "symlink" ]; then
+			rm -f /var/www/sqwebmail
+		fi
+		mkdir -p /var/www/sqwebmail
+		cp -a /usr/share/sqwebmail/* /var/www/sqwebmail
+	fi
+
+	# configure calendarmode
+	db_get sqwebmail/calendarmode
+	CALFILE=/etc/courier/calendarmode
+	if [ "$RET" = "local" ]; then
+		echo local > $CALFILE
+	elif [ "$RET" = "net" ]; then
+		echo net > $CALFILE
+	else
+		echo > $CALFILE
+	fi
+	# create ispelldict configuration
+	db_get sqwebmail/dictionary
+	echo -n "$RET" > /etc/courier/ispelldict
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/sqwebmail.postrm
+++ courier-0.47/debian/sqwebmail.postrm
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+#
+# Copyright 2000,2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+# Remove CGI script
+rm -f /usr/lib/cgi-bin/sqwebmail
+
+if [ "$1" = "purge" ]; then
+	# remove cache with authentification info
+	rm -rf /var/cache/sqwebmail
+
+	db_get sqwebmail/install-www || [ $? -eq 10 ]
+	if [ "$RET" = "symlink" ]; then
+		rm -f /var/www/sqwebmail
+	elif [ "$RET" = "copy" ]; then
+		rm -rf /var/www/sqwebmail
+	fi
+
+	# remove calendar mode configuration file
+	rm -f /etc/courier/calendarmode
+
+	# remove ispelldict configuration
+	rm -f /etc/courier/ispelldict 
+fi
+
+#DEBHELPER#
--- courier-0.47.orig/debian/sqwebmail.templates
+++ courier-0.47/debian/sqwebmail.templates
@@ -0,0 +1,44 @@
+Template: sqwebmail/calendarmode
+Type: select
+_Choices: local, net, disabled
+Default: local
+_Description: Enable Calendaring ?
+ Please specify if you would like to enable calendaring in local mode
+ (choose local), groupware mode (choose net) or not at all (choose
+ disabled). To actually using the groupware mode, you need to install the
+ courier-pcp package.
+ .
+ Local mode requires very little overhead compared to not using calendaring
+ at all, but groupware mode requires a substantial additional amount of
+ server resources. If you select the groupware mode, a separate daemon
+ process will be run.
+ .
+ For more information, please refer to /usr/share/doc/sqwebmail/PCP.html.
+
+Template: sqwebmail/dictionary
+Type: select
+Choices: ${DICTS}
+Default: default
+_Description: Ispell Dictionary
+ SqWebMail allows you to spellcheck your emails. Please select an
+ appropriate dictionary for ispell.
+
+Template: sqwebmail/install-www
+Type: select
+_Choices: symlink, copy, custom
+Default: symlink
+_Description: How to you want to install the HTML documents and images for sqwebmail ?
+ The choices are to create a symbolic link /var/www/sqwebmail, copy all
+ files from /usr/share/sqwebmail to /var/www/sqwebmail or let /var/www
+ alone. For security reasons the second option is recommended. However, if
+ you have already enabled FollowSymLinks or SymLinksIfOwnerMatch in your
+ Apache configuration, you may as well chose the first option. The custom
+ option implies that you configure your web server manually.
+ .
+ Please note that /var/www/sqwebmail will be removed if this package is
+ purged except you choose custom.
+
+Template: sqwebmail/install-www-backup
+Type: string
+Description: Here we record the value of install-www before configuration
+ This is just a dummy. You doesn't need to translate it.
--- courier-0.47.orig/debian/srcmgr
+++ courier-0.47/debian/srcmgr
@@ -0,0 +1,69 @@
+#! /usr/bin/perl
+#
+# Copyright 2003 by Stefan Hornburg (Racke) <racke@linuxia.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+use strict;
+use warnings;
+
+use Cwd;
+use File::Find;
+
+my (@files, @dirs, %fmap);
+my $topdir = cwd();
+my $command = shift || '';
+
+if ($command eq 'cleanse') {
+	# read list of files to be preserved from stdin
+	while (<>) {
+		chomp();
+		$fmap{$_} = 1;
+	}
+	# call routine to remove files and symlinks, collects obsolete dirs too
+	find (\&cleanse_files, $topdir);
+	# the obsolete dirs are empty too, remove them
+	for (@dirs) {
+		next unless -d $_;
+		rmdir ($_)
+			|| die "Couldn't remove directory $_: $!\n";
+	}
+} else {
+	# collect existing files and write them to stdou
+	find (\&collect_files, $topdir);
+	print join("\n", @files);
+}
+
+sub collect_files {
+	return if -d $_ && $_ eq '.';
+	my $f = substr($File::Find::name, length($topdir) + 1);
+	push (@files, $f);
+}
+
+sub cleanse_files {
+	return if -d $_ && $_ eq '.';
+	my $f = substr($File::Find::name, length($topdir) + 1);
+	unless (exists ($fmap{$f})) {
+		if (-f $_ || -l $_) {
+			unlink ($_)
+				|| die "couldn't remove file $File::Find::name: $!\n";
+		}
+		if (-d $_) {
+			push (@dirs, $f);
+		}
+	}
+}
+
--- courier-0.47.orig/debian/webgpg.pod
+++ courier-0.47/debian/webgpg.pod
@@ -0,0 +1,24 @@
+=head1 NAME
+
+webgpg - initializes maildir subdirectory gpg
+
+=head1 SYNOPSIS
+
+webgpg MAILDIR
+
+=head1 DESCRIPTION
+
+B<webgpg> creates a new subdirectory in the given MAILDIR and initializes
+it. Once that subdirectory is created, encryption/decryption in SqWebMail will
+become available for that account.
+
+B<webgpg> must be executed by the same UID and GID which owns the MAILDIR.
+
+=head1 SEE ALSO
+
+L<gpg>(1), F</usr/share/doc/sqwebmail/GPG.html>
+
+=head1 AUTHOR
+
+This manual page was written by Stefan Hornburg (Racke) <racke@linuxia.de>
+for the Debian GNU/Linux system.
--- courier-0.47.orig/debian/courier-pcp.dirs
+++ courier-0.47/debian/courier-pcp.dirs
@@ -0,0 +1,4 @@
+var/run/courier/calendar
+var/run/courier/calendar/public
+var/run/courier/calendar/private
+var/run/courier/calendar/localcache
--- courier-0.47.orig/debian/courier-authmysql.conffiles
+++ courier-0.47/debian/courier-authmysql.conffiles
@@ -0,0 +1 @@
+/etc/courier/authmysqlrc
--- courier-0.47.orig/debian/correctpermissions.pl
+++ courier-0.47/debian/correctpermissions.pl
@@ -0,0 +1,124 @@
+#!/usr/bin/perl -w
+#
+# Copyright 2004 by Willi Mann <willi@wm1.at>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA.
+
+
+
+use strict;
+
+while (my $line = <STDIN>)
+{
+	if (( my $file, my $perms, my $user, my $group, my $type) = 
+		( $line =~ /^([^\s]+)\s([^\s]+)\s([^\s]+)\s([^\s]+)(:?\s([^\s]+)|)/ ))
+	{
+		my $isdir = 0;
+		my $isexecbyuser = 0;
+		my $isexecbyother = 0;
+		my $issymlink = 0;
+		my $issetuid = 0;
+		my $isreadablebyother = 0;
+		my $pathtofile = $file;
+		$pathtofile =~ s/^.*\/debian\/tmp//;
+
+		#remove .dist from some config-files
+		$pathtofile =~ s/\.dist$//;
+		$perms = oct($perms);
+		$isdir = 1 if -d $file;
+		$isexecbyuser = 1 if $perms & 0100;
+		$isexecbyother = 1 if $perms & 0001;
+		$isreadablebyother = 1 if $perms & 0004;
+		$issymlink = 1 if -l $file;
+		$issetuid = 1 if $perms & 04000;
+
+		
+		if( $issymlink) 
+		{
+			# do nothing 
+			$perms = "-";
+			$user = "-";
+			$group = "-";
+		}
+		#Deal with directories
+		elsif( $isdir )
+		{
+			if (not $pathtofile =~ /\/usr/ )
+			{
+				#trust
+			}
+			else
+			{
+				# change to 755 root:root (dh_fixperms ?)
+				$perms = 0755;
+				$user = "root";
+				$group = "root";
+			}
+		}
+		#Now non-exec files
+		elsif ( not $isexecbyuser )
+		{
+			if ( $pathtofile =~ /\/usr/ )
+			{
+				#change to 644 root:root (dh_fixperms ?)
+				$perms = 0644;
+				$user = "root";
+				$group = "root";
+			}
+			else 
+			{
+				if ( $isreadablebyother )
+				{	
+					#set to 644 root:root 
+					$perms = 0644;
+					$user = "root";
+					$group = "root";
+				}
+				else
+				{
+					#trust
+				}
+			}
+		}
+		#Now with executeables
+		else
+		{
+			if ( $issetuid )
+			{
+				if ( $isexecbyother )
+				{
+					# set to 4755, trust for owner:group
+					$perms = 04755;
+				}
+				else
+				{
+					# set to 4754, trust for owner:group
+					$perms = 04754;
+				}
+			}
+			else 
+			{	
+				# set to 755 root:root
+				$perms = 0755;
+				$user = "root";
+				$group = "root";
+			}
+		}
+		next if $perms eq "-" and $user eq "-" and $group eq "-";
+		printf "%s %o %s %s\n", $pathtofile, $perms, $user, $group;
+		
+	}
+}
--- courier-0.47.orig/debian/courier_perms
+++ courier-0.47/debian/courier_perms
@@ -0,0 +1,102 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_perms - set some special permissions after dh_fixperms
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_perms> [S<I<debhelper options>>]
+
+=head1 DESCRIPTION
+
+dh_perms is a debhelper program that is responsible for setting the
+permissions of files and directories according to the information in 
+debian/permissions. It is intended to be run after dh_fixperms.
+
+The file debian/permissions is a tab seperated file where the first column 
+contains a filename, the second one the permissions in octal format, the 
+third one the owner and the fourth one the group. A dash in columns 2 to 4
+means that this information will not be modified.
+
+=head1 OPTIONS
+
+=over 4
+
+None except the standard debhelper options.
+
+=back
+
+=cut
+
+init();
+
+my %perms;
+my %owners;
+my %groups;
+
+# TODO: There should be a way to change this by command-line
+my $permfile = "debian/permissions";
+
+open PERMFILE, $permfile or exit 0; #print "could not open permfile\n";
+while (my $curline = <PERMFILE>)
+{
+	#NOTE: Broken lines are not always detected. (e.g. not defining anything valid)
+	
+	next if $curline =~ /^#/;
+	(my $filename, my $octmode, my $owner, my $group) = split (/\s+/, $curline);
+	
+	die "could not accept $curline: wrong octmode $octmode" unless $octmode =~ /^[0-7]{3,4}$/;
+	$perms{$filename} = $octmode unless $octmode eq "-" or not defined $octmode;
+	
+	$owner = getpwnam($owner) if defined getpwnam($owner);
+	$owners{$filename} = $owner unless $owner eq "-" or not defined $owner;
+	
+	$group = getgrnam($group) if defined getpwnam($group);
+	$groups{$filename} = $group unless $group eq "-" or not defined $group;
+
+}
+close PERMFILE;	
+
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+	my $tmp=tmpdir($package);
+	foreach my $file (keys %owners)
+	{
+		next unless -e $tmp.$file;
+		chown $owners{$file}, -1, $tmp.$file or die "failed to chown $file";
+		verbose_print "chowned file $file to $owners{$file}";
+	}
+	foreach my $file (keys %groups)
+	{
+		next unless -e $tmp.$file;
+		chown -1, $groups{$file}, $tmp.$file or die "failed to chgrp $file";
+		verbose_print "chgrped file $file to $groups{$file}";
+	}
+	foreach my $file (keys %perms)
+	{
+		next unless -e $tmp.$file;
+		my $nummod = oct("0".$perms{$file});
+		chmod $nummod, $tmp.$file or die "failed to chmod $file";
+		verbose_print "chmoded file $file to ".sprintf("0%o", $nummod);
+	}
+
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is not yet part of debhelper.
+
+=head1 AUTHOR
+
+Willi Mann <willi@wm1.at>
+
+=cut
+
--- courier-0.47.orig/debian/courier-imap.README.Debian
+++ courier-0.47/debian/courier-imap.README.Debian
@@ -0,0 +1,14 @@
+Debian Packaging Issues
+***********************
+
+Please read /usr/share/doc/courier-base/README.Debian for more
+information about the packaging of the Courier Mail Server suite.
+
+Default Settings 
+****************
+
+The default value for maximum number of connections from the same
+IP address (MAXPERIP in /etc/courier/imapd) has been raised to 20. 
+This helps to avoid mysterious errors with current IMAP clients
+(e.g., saving sent mails into the Sent folder fails). 
+For example, Mozilla Thunderbird uses 5 connections by default.
--- courier-0.47.orig/debian/authenumerate.pod
+++ courier-0.47/debian/authenumerate.pod
@@ -0,0 +1,24 @@
+=head1 NAME
+
+authenumerate - Fetches all known users from the authentication modules
+
+=head1 SYNOPSIS
+
+authenumerate [ -m MODULE ]
+
+=head1 DESCRIPTION
+
+B<authenumerate> lists all known users from the authentication modules, 
+including uid, gid and home directory. Its use is documented in 
+F</usr/share/doc/courier-base/README.sharedfolders.txt.gz>.
+It may also be useful to test the authentication modules. 
+
+=head1 SEE ALSO
+
+L<courierauthtest>(8)
+
+=head1 AUTHOR
+
+This manual page was written by Willi Mann <willi@wm1.at>
+for the Debian GNU/Linux system.
+
--- courier-0.47.orig/debian/sharedindexinstall.pod
+++ courier-0.47/debian/sharedindexinstall.pod
@@ -0,0 +1,25 @@
+=head1 NAME
+
+sharedindexinstall - Installs the shared index files
+
+=head1 SYNOPSIS
+
+sharedindexinstall
+
+=head1 DESCRIPTION
+
+B<sharedindexinstall> installs the shared index files from 
+F</etc/courier/shared.tmp/> to F</etc/courier/shared/>. 
+The full documentation of shared folders with courier-imap 
+and sqwebmail is located at 
+F</usr/share/doc/courier-base/README.sharedfolders.txt.gz>.
+
+=head1 SEE ALSO
+
+L<authenumerate>(8), L<sharedindexsplit>(8)
+
+=head1 AUTHOR
+
+This manual page was written by Willi Mann <willi@wm1.at>
+for the Debian GNU/Linux system.
+
--- courier-0.47.orig/debian/sharedindexsplit.pod
+++ courier-0.47/debian/sharedindexsplit.pod
@@ -0,0 +1,38 @@
+=head1 NAME
+
+sharedindexsplit - Splits a shared index file into multiple ones
+
+=head1 SYNOPSIS
+
+sharedindexsplit I<directory> [ I<number> ]
+
+=head1 OPTIONS
+
+=item I<directory>
+
+The directory where the shared index files should be created.
+
+=item I<number>
+
+The number of characters to consider when splitting the index file. 
+
+=head1 DESCRIPTION
+
+B<sharedindexsplit> takes a list of accounts from standard input
+and splits them into multiple shared index files based on the first 
+character of the username or, if the second argument is given, on 
+that number of characters. 
+
+The full documentation of shared folders with courier-imap 
+and sqwebmail is located at 
+F</usr/share/doc/courier-base/README.sharedfolders.txt.gz>.
+
+=head1 SEE ALSO
+
+L<authenumerate>(8), L<sharedindexinstall>(8)
+
+=head1 AUTHOR
+
+This manual page was written by Willi Mann <willi@wm1.at>
+for the Debian GNU/Linux system.
+
--- courier-0.47.orig/debian/logcheck/courier-imap
+++ courier-0.47/debian/logcheck/courier-imap
@@ -0,0 +1,7 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imaplogin: Connection, ip=\[[.:[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imaplogin: LOGIN, user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\], protocol=IMAP$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imaplogin: LOGOUT, user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\], headers=[0-9]+, body=[0-9]+, time=[0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imaplogin: LOGOUT, ip=\[[.:[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imaplogin: DISCONNECTED, user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\], headers=[0-9]+, body=[0-9]+, time=[0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imaplogin: DISCONNECTED, ip=\[[.:[:alnum:]]+\], time=[0-9]+$
+
--- courier-0.47.orig/debian/logcheck/courier-imap-ssl
+++ courier-0.47/debian/logcheck/courier-imap-ssl
@@ -0,0 +1,7 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd-ssl: Connection, ip=\[[.:[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd-ssl: LOGIN, user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\], protocol=IMAP$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd-ssl: LOGOUT, user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\], headers=[0-9]+, body=[0-9]+, time=[0-9]+, starttls=[01]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd-ssl: LOGOUT, ip=\[[.:[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd-ssl: DISCONNECTED, user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\], headers=[0-9]+, body=[0-9]+, time=[0-9]+, starttls=[01]$
+
+
--- courier-0.47.orig/debian/logcheck/courier-pop
+++ courier-0.47/debian/logcheck/courier-pop
@@ -0,0 +1,3 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ courierpop3login: Connection, ip=\[[.:[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ courierpop3login: LOGIN, user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ courierpop3login: (LOGOUT|TIMEOUT|DISCONNECTED), user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\], top=[0-9]+, retr=[0-9]+, time=[0-9]+(, stls=1)?$
--- courier-0.47.orig/debian/logcheck/courier-pop-ssl
+++ courier-0.47/debian/logcheck/courier-pop-ssl
@@ -0,0 +1,4 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ pop3d-ssl: Connection, ip=\[[.:[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ pop3d-ssl: LOGIN, user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ pop3d-ssl: (LOGOUT|TIMEOUT), user=[-_.@[:alnum:]]+, ip=\[[.:[:alnum:]]+\], top=[0-9]+, retr=[0-9]+$
+
--- courier-0.47.orig/debian/logcheck/README
+++ courier-0.47/debian/logcheck/README
@@ -0,0 +1,10 @@
+Explanation of the messages:
+
+imaplogin: DISCONNECTED, ip=[::ffff:127.0.0.1], time=25
+
+This connection to the IMAP server has been closed without
+login.
+
+imaplogin: DISCONNECTED, user=racke@linuxia.de, ip=[::ffff:127.0.0.1], headers=0, body=0, time=17
+
+This connection to the IMAP server has been closed.
--- courier-0.47.orig/debian/logcheck/violations/courier-pop-ssl
+++ courier-0.47/debian/logcheck/violations/courier-pop-ssl
@@ -0,0 +1 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ pop3d-ssl: Unexpected SSL connection shutdown\.$
\ No newline at end of file
--- courier-0.47.orig/debian/logcheck/violations/courier-pop
+++ courier-0.47/debian/logcheck/violations/courier-pop
@@ -0,0 +1 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ courierpop3login: Unexpected SSL connection shutdown\.$
\ No newline at end of file
--- courier-0.47.orig/debian/logcheck/violations/courier-imap
+++ courier-0.47/debian/logcheck/violations/courier-imap
@@ -0,0 +1 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imaplogin: Unexpected SSL connection shutdown\.$
\ No newline at end of file
--- courier-0.47.orig/debian/logcheck/violations/courier-imap-ssl
+++ courier-0.47/debian/logcheck/violations/courier-imap-ssl
@@ -0,0 +1 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ imapd-ssl: Unexpected SSL connection shutdown\.$
\ No newline at end of file
